Synced gwenview 4.2.1-r1

4 files changed, 12 insertions, 57 deletions

diff --git a/kde-base/gwenview/ChangeLog b/kde-base/gwenview/ChangeLog
index fa714c4d879..8e1ebed8fb7 100644
--- a/kde-base/gwenview/ChangeLog
+++ b/kde-base/gwenview/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+  gwenview-4.2.1-r1.ebuild, -gwenview-4.2.1.ebuild:
+  Synced some changes
+
   06 Mar 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   +kde-base/gwenview/files/gwenview-fix-version.diff:
   Bumped gwenview to add a patch sent to the kde packager ml by Aurélien
diff --git a/kde-base/gwenview/Manifest b/kde-base/gwenview/Manifest
index a16d97ffaf4..1a3f4dcd75f 100644
--- a/kde-base/gwenview/Manifest
+++ b/kde-base/gwenview/Manifest
@@ -1,9 +1,8 @@
 AUX gwenview-fix-version.diff 577 RMD160 85f1e3764dad8cbae3f00fce8598abdc174bf1e8 SHA1 6674073c3984b8ae6de31167033ca50312a7cc7e SHA256 de832ebb789ffa86388155c7c2f8cb34916b3e297b9c9cbbc2195fa1107f9bb0
 DIST kdegraphics-4.2.1.tar.bz2 3573763 RMD160 d37ed5a31ea8d22d6b3d15259985e5ff2bb2d600 SHA1 5c21e016c75a79a9499aac26ea1240d6024e700e SHA256 16e874ecb950235f2911bb63e93c61ae1a0d38a4f629d90d29b621a6aa57f03a
 DIST kdegraphics-4.2.65.tar.lzma 3322567 RMD160 c9ab65906c6d4d280da716ac755ec436ca49523e SHA1 7fba19fde35075d904246fb706336d577cad1823 SHA256 52e792bab3936120ee7967864904d6ac98a38f4ff4477832724fa27d1aadd578
-EBUILD gwenview-4.2.1-r1.ebuild 1210 RMD160 749118be644c383b1863151fcbf7d48f9ea9baf8 SHA1 b60dfe3c69c1e636562d5f69d8692cf65ce82f8c SHA256 6ee138a4dbfb1dd0598c25bb767fede22e14c57aed9e6e7c042d674c2cd6fe96
-EBUILD gwenview-4.2.1.ebuild 1102 RMD160 8d5749b7fbdc65259fb611e1d41f08b96afb0691 SHA1 9639105cf3a851b5f7f01e8b7638fdbf8306ad3c SHA256 33398602fd9ff0ecd703b5027927ffd572e32b15cf4d1e0f8e6f90d004d1565d
+EBUILD gwenview-4.2.1-r1.ebuild 1192 RMD160 e76292c1f8ecf7dd7d7ec6696f99e6e896d9c93f SHA1 5593874f2a387b391be1cab08113150e8572c1ba SHA256 0944da9a8b6c8a8d1927c71a9e9a223470b805e9561d5c1d6a5a5f7d2f086d74
 EBUILD gwenview-4.2.65.ebuild 1084 RMD160 8a81a13f4e4fe1fbed8e0c1bab60fae44685aa11 SHA1 c34ee45ab5619a4154d79ede41135819a8eb49bf SHA256 5cea1a9dea9678996e1a36aad78d1e6b6c6cf1a83c2a97dd7a4769682a25b335
 EBUILD gwenview-9999.ebuild 1073 RMD160 6950017352880ca7ead7697285bac14bf85a32d4 SHA1 4ad9ddead21440ab22ac21f01a04fe53b6929716 SHA256 1fe496c4eef4b6581feb9719d110717bddeb4f625bc6b5c64d06f745e28f5f24
-MISC ChangeLog 6118 RMD160 e7ff0e5628e69c29f129133fd8218ff575c63170 SHA1 9860be5c89bbe8fb6e61d75834ad70dfc11cf432 SHA256 f7f0001f8f8526ac6bd6a50d406f74c839f1b43d291210b4504fa2d1c9b0d3f2
+MISC ChangeLog 6257 RMD160 7fe43eb80f6e5cb30d1b94cd62ad59ca8e3266a7 SHA1 45de04e2594093398dbbb65ce3fc39065f03a3e7 SHA256 42c70adcb97de7f426de5db805977c1c2710ac56a28e4938e3c39db9465de769
 MISC metadata.xml 504 RMD160 bcbc6f1bca53c138ebf7daf9e8af85a8a0003d5e SHA1 02a36f7cc098fdcd008c91ca47172343a44daa7d SHA256 f90cea47e58f660e28d910ba26d56ff1d7807849a74132254ab55948b958a01a
diff --git a/kde-base/gwenview/gwenview-4.2.1-r1.ebuild b/kde-base/gwenview/gwenview-4.2.1-r1.ebuild
index bed53affdc3..d45f5604d89 100644
--- a/kde-base/gwenview/gwenview-4.2.1-r1.ebuild
+++ b/kde-base/gwenview/gwenview-4.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/gwenview/gwenview-4.2.1-r1.ebuild,v 1.1 2009/03/06 01:16:28 jmbsvicetto Exp $
+# $Header: $
 
 EAPI="2"
 
@@ -15,11 +15,12 @@ RESTRICT="test"
 DEPEND="
 	media-gfx/exiv2
 	media-libs/jpeg
-	kipi? ( >=kde-base/libkipi-${PV}:${SLOT} )
-	>=kde-base/kdelibs-${PV}:${SLOT}[semantic-desktop?]
+	kipi? ( >=kde-base/libkipi-${PV}:${SLOT}[kdeprefix=] )
+	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop?]
+"
+RDEPEND="${DEPEND}
+	semantic-desktop? ( >=kde-base/nepomuk-${PV}:${SLOT}[kdeprefix=] )
 "
-
-RDEPEND="${DEPEND}"
 
 PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${KDEDIR}/$(get_libdir)/pkgconfig"
 
diff --git a/kde-base/gwenview/gwenview-4.2.1.ebuild b/kde-base/gwenview/gwenview-4.2.1.ebuild
deleted file mode 100644
index 051cf052c46..00000000000
--- a/kde-base/gwenview/gwenview-4.2.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-KMNAME="kdegraphics"
-inherit kde4-meta
-
-DESCRIPTION="KDE image viewer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug htmlhandbook kipi +semantic-desktop"
-RESTRICT="test"
-
-DEPEND="
-	media-gfx/exiv2
-	media-libs/jpeg
-	kipi? ( >=kde-base/libkipi-${PV}:${SLOT}[kdeprefix=] )
-	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop?]
-"
-RDEPEND="${DEPEND}
-	semantic-desktop? ( >=kde-base/nepomuk-${PV}:${SLOT}[kdeprefix=] )
-"
-
-PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:${KDEDIR}/$(get_libdir)/pkgconfig"
-
-src_configure() {
-	mycmakeargs="${mycmakeargs}
-		$(cmake-utils_use_with semantic-desktop Soprano)
-		$(cmake-utils_use_with kipi Kipi)"
-
-	if use semantic-desktop; then
-		mycmakeargs="${mycmakeargs}
-			-DGWENVIEW_SEMANTICINFO_BACKEND=Nepomuk"
-	else
-		mycmakeargs="${mycmakeargs}
-			-DGWENVIEW_SEMANTICINFO_BACKEND=None"
-	fi
-
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-meta_pkg_postinst
-
-	echo
-	elog "If you want to have svg support, emerge kde-base/svgpart"
-	echo
-}