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

(Portage version: 2.2_rc23/cvs/Linux i686)

3 files changed, 21 insertions, 34 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/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