Fix bug #232056 and #236721. Switch to proper use dependencies.

Package-Manager: portage-2.2_rc23/cvs/Linux i686

4 files changed, 24 insertions, 37 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 3abb0fd3d5dd..159385a5dead 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.43 2009/02/11 19:45:26 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.44 2009/02/12 01:51:19 carlo Exp $
+
+  12 Feb 2009; Carsten Lohrke <carlo@gentoo.org>
+  kipi-plugins-0.1.4-r2.ebuild, kipi-plugins-0.1.7.ebuild:
+  Fix bug #232056 and #236721. Switch to proper use dependencies.
 
 *kipi-plugins-0.1.7 (11 Feb 2009)
 
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 5e47abc1da6e..046e05473e55 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -5,8 +5,8 @@ DIST kipi-plugins-0.1.4.tar.bz2 8529867 RMD160 bc8b6d0d9bc8b30afbaf5ac5ccbc4862a
 DIST kipi-plugins-0.1.6.tar.bz2 8838095 RMD160 040c1014998f1ed15c0b160a56503ba49f40f504 SHA1 786b5863079be5804792155b02543b7db107724a SHA256 ca3f86e34a6c77db25d0c0fa8219e618ee6320cdc417e9d5e83520ff0320ff75
 DIST kipi-plugins-0.1.7.tar.bz2 8836654 RMD160 f66473c11e66f9e06aa6772c7952b640b565def9 SHA1 520b6b9d36a8c5b8893c3a6b5a1a14f6b9cbd216 SHA256 3c8a73d0658935b75fc0e0ed48f66cd72225249152bce969f4c9676c7038124b
 EBUILD kipi-plugins-0.1.4-r1.ebuild 1600 RMD160 2f932ddd53bf80b8735370c8961b011ae611b140 SHA1 b3a4165121594108cbdafd129019e0b35665b176 SHA256 56feae0d2e837b4b5ea32f84b91737779e63b59ba22f23fcf60e040d3630934e
-EBUILD kipi-plugins-0.1.4-r2.ebuild 1552 RMD160 21987bf8fd2fc159f593bf574c3e69018c3160a1 SHA1 f4b1814b57cfb91d14227923f766591aa60938c6 SHA256 1f3ffaf163cecfd418d51463c4169a3ecbd5fdaf5ac867307bc2de40bc399865
+EBUILD kipi-plugins-0.1.4-r2.ebuild 1393 RMD160 9a6194ad1423dd10fd1f11429e429a71bddbb7a4 SHA1 77128db229ee3d49dde9c4bcee35a605780af5f2 SHA256 885d775abf7d4cc7c9394f622b967ec7b7626dcb2e1c14dd4b524a52dbc3d227
 EBUILD kipi-plugins-0.1.6.ebuild 2165 RMD160 4db73f83090ef5c4be7e48e633e63931bbda58e9 SHA1 e87b409222ea5d8b8e52f6d25cc360cb7c8ac613 SHA256 7c916f345eb327f919cc6a611422601532344310c7a06360416ef084bdf86dfe
-EBUILD kipi-plugins-0.1.7.ebuild 2204 RMD160 ce9adea7d1514ff7eb3288cd3665b7501ea19ebf SHA1 392d4594ac924984411bd3c75db2eaec732e867b SHA256 ac9bd33ae1b7055c39ebb43acaf3823de41cda5113b13b3764d132e64b7d1e81
-MISC ChangeLog 8138 RMD160 010bb56fbf5f874bef784e8cdc7e0bf7c73a1a74 SHA1 d179f4a8d73cc45025456f7e9f0350107a759825 SHA256 d75d5a321c1c3b24ee427349d4dbb5d14bf0d5cba47da6b5107a2b1642c3a29d
+EBUILD kipi-plugins-0.1.7.ebuild 1923 RMD160 53b0d451b55127419b62909cae545b0845f1beeb SHA1 4515b992a5edc36ee13524fa79ed480c0f1e2306 SHA256 c8e409728e765b064fab222852f0ee8a0d932a09865ac89fa7cee8b021c627ae
+MISC ChangeLog 8313 RMD160 fe5bd7a80d26d4e9ab0427ec4cf75a7467715bac SHA1 42f28d496422ab1f20468c8fed511fd9468d0bc7 SHA256 384883be69a9088280776f639add9d6bede2d1806236c5d8555c426fd9a0640c
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.1.4-r2.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.1.4-r2.ebuild
index d4940eac9c78..7464080db8ce 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-0.1.4-r2.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-0.1.4-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.4-r2.ebuild,v 1.4 2009/02/11 19:45:26 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.4-r2.ebuild,v 1.5 2009/02/12 01:51:19 carlo Exp $
+
+EAPI="2"
 
 ARTS_REQUIRED="never"
 
@@ -18,14 +20,15 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="opengl gphoto2 ipod"
 
-DEPEND=">=media-libs/libkipi-0.1.5
+DEPEND="|| ( kde-base/libkcal:3.5 kde-base/kdepim:3.5 )
+		>=media-libs/libkipi-0.1.5
 		>=media-libs/libkexiv2-0.1.5
 		~media-libs/libkdcraw-0.1.1
 		gphoto2? ( >=media-libs/libgphoto2-2.3.1 )
-		>=media-libs/imlib2-1.1.0
+		>=media-libs/imlib2-1.1.0[X]
 		>=media-gfx/imagemagick-6.2.4
 		>=media-video/mjpegtools-1.6.0
-		opengl? ( virtual/opengl )
+		opengl? ( x11-libs/qt:3[opengl] )
 		>=media-libs/tiff-3.5
 		>=dev-libs/libxslt-1.1
 		ipod? ( =media-libs/libgpod-0.6* )"
@@ -35,24 +38,14 @@ RDEPEND="${DEPEND}
 
 need-kde 3.5
 
-PATCHES=(
-	"${FILESDIR}/${P}-ipod-191195.patch"
-	"${FILESDIR}/kipi-plugins-0.1.4-header.diff"
-	)
-
-pkg_setup(){
-	if ! built_with_use media-libs/imlib2 X ; then
-		eerror "X support is required in media-libs/imlib2 in order to be able"
-		eerror "to compile media-plugins/kipi-plugins. Please, re-emerge"
-		eerror "media-libs/imlib2 with the 'X' USE flag enabled."
-		die
-	fi
-	kde_pkg_setup
-}
-
 src_unpack() {
 	kde_src_unpack
 
+	# Fixes an automagic dependency on libgpod. cf bug 191195.
+	epatch "${FILESDIR}/${P}-ipod-191195.patch"
+
+	epatch "${FILESDIR}/kipi-plugins-0.1.4-header.diff"
+
 	rm -f "${S}"/configure
 }
 
diff --git a/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild b/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild
index 6994ddd13a01..f1f8659e9555 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild,v 1.1 2009/02/11 19:45:26 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-0.1.7.ebuild,v 1.2 2009/02/12 01:51:19 carlo Exp $
 
-EAPI=1
+EAPI=2
 
 ARTS_REQUIRED="never"
 
@@ -25,8 +25,8 @@ DEPEND="calendar? ( || ( kde-base/libkcal:3.5 kde-base/kdepim:3.5 ) )
 		>=media-libs/libkexiv2-0.1.5
 		>=media-libs/libkdcraw-0.1.4
 		gphoto2? ( >=media-libs/libgphoto2-2.3.1 )
-		>=media-libs/imlib2-1.1.0
-		opengl? ( virtual/opengl )
+		>=media-libs/imlib2-1.1.0[X]
+		opengl? ( x11-libs/qt:3[opengl] )
 		tiff? ( >=media-libs/tiff-3.6 )
 		>=dev-libs/libxslt-1.1
 		ipod? ( >=media-libs/libgpod-0.6.0 )"
@@ -46,16 +46,6 @@ for X in ${LANGS} ; do
 	IUSE="${IUSE} linguas_${X}"
 done
 
-pkg_setup(){
-	if ! built_with_use media-libs/imlib2 X ; then
-		eerror "X support is required in media-libs/imlib2 in order to be able"
-		eerror "to compile media-plugins/kipi-plugins. Please, re-emerge"
-		eerror "media-libs/imlib2 with the 'X' USE flag enabled."
-		die
-	fi
-	kde_pkg_setup
-}
-
 src_unpack() {
 	kde_src_unpack