Updating media-gfx/gimp for virtual/poppler-glib update; cairo is the superior backend, always enable it anywhere it can be used.

Package-Manager: portage-2.2_rc28/cvs/Linux x86_64

9 files changed, 81 insertions, 68 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 068beaf82fd0..0be57e0f8a1b 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.290 2009/04/06 14:23:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.291 2009/04/10 23:19:10 loki_val Exp $
+
+  10 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> gimp-2.3.19.ebuild,
+  gimp-2.4.6.ebuild, gimp-2.4.7.ebuild, gimp-2.6.4.ebuild,
+  gimp-2.6.5.ebuild, gimp-2.6.6.ebuild, gimp-9999.ebuild:
+  Updating media-gfx/gimp for virtual/poppler-glib update; cairo is the
+  superior backend, always enable it anywhere it can be used.
 
   06 Apr 2009; Brent Baude <ranger@gentoo.org> gimp-2.6.4.ebuild:
   Marking gimp-2.6.4 ppc for bug 258344
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 343afed956f8..502e46929cf9 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -7,12 +7,12 @@ DIST gimp-2.4.7.tar.bz2 18977384 RMD160 79062e60db1fe172e2a91ff0601462462d3a61cb
 DIST gimp-2.6.4.tar.bz2 16012685 RMD160 64aa55def0e97cfc85f27dc7461f18455619ed41 SHA1 f68ca1e1dce7ef8c100ce74e0c1ee5c493a589a1 SHA256 86d27a45b45f3df3bf6de28718f691e8bedaf1de7dae287b39054eaddad797e2
 DIST gimp-2.6.5.tar.bz2 16043778 RMD160 1de4ffdf13d3edd47e150e4289a8d93677d3f538 SHA1 ee57298fe5572ecce17137ff879e4aad6509d289 SHA256 6209081f5c29fc22e0d376367b017618f7afb0b179f994b16b4cc68106cbe521
 DIST gimp-2.6.6.tar.bz2 16075908 RMD160 9a171baf6007d3a8acfce6ff5e880e412f4225ae SHA1 71aec5cd671a2431daa91dea91abb6d3822a896b SHA256 53c261fa5045f4ca4b5e887a1eb394d28ebb08d108f065ef55bde33c892f0751
-EBUILD gimp-2.3.19.ebuild 3085 RMD160 25aaadca3a3099442ccfd8345c8787f5af6c2793 SHA1 451921a37fbfc7ca52a902023b15a0767a19b64c SHA256 307575758e4b831a7396ee781d71342aab5d313cb3d4a1251fa32ce425e8d2c3
-EBUILD gimp-2.4.6.ebuild 3614 RMD160 430e439c39f51797ba95b347ae25a5455f419178 SHA1 571d67813a731991ef54b94784948613d053dad9 SHA256 313c659617f610353302c97808446046f65e33b47813bf236a8e1362af6cc4c2
-EBUILD gimp-2.4.7.ebuild 3622 RMD160 f8e34b3890b040d53847cbf79c5cd4f631a73387 SHA1 91c1870df935b9f12f3152bcdbd2f8058959d38a SHA256 c5fe935f57d5e83d0be351f251da3b05154a4c2e65f12ac48db0fa32083d21d5
-EBUILD gimp-2.6.4.ebuild 2751 RMD160 b078f460f8fe6ad1a08c9759feb4b56cd5688386 SHA1 a72e90e09155bbee62a95901e887b6519def2b78 SHA256 a4125e059f9420fb835f775a2db2b1a2791805fe93d10c6ac299d6714a61af30
-EBUILD gimp-2.6.5.ebuild 2724 RMD160 8e25623833f71e122bc2ff83b815ffdc7d9c46e3 SHA1 c032266af72f60c0b3a6a41b2fb12457cb257d5b SHA256 6a641ff3260a3670152ad60d01256a4a84205df3865bb34a1d57c6b2159e0702
-EBUILD gimp-2.6.6.ebuild 2725 RMD160 ac2aac93d3a2d92a802fd8347158b8e052fca528 SHA1 533e82bef287461c70c63814f4af9b6da951c22c SHA256 22fdeb671236bfb67683c46d622df3434b9edcc20d812c44582a28aca033a86c
-EBUILD gimp-9999.ebuild 3536 RMD160 9621b387e6ef5e4e522e55061494b4d13a84f350 SHA1 8b7ef68c13bbfb6f338b34d3accb08d7d2737c3b SHA256 b0865f76c62c509c6dec04495eb9472c343bb747c677796d8ba11b975c001a41
-MISC ChangeLog 38863 RMD160 a7071db9b494fdbecec24dda67b329bb179671dc SHA1 6520096a5035b8c72ccc925e8ef2b8946c3ef560 SHA256 b502ad809051a1cc02311ccf6f365b7824531c63493f57ab97cc2c4d26dceb4d
+EBUILD gimp-2.3.19.ebuild 3171 RMD160 7d8bf94ec7282d239a5bc03259bf2596b51eef76 SHA1 e9c41f26ec1611ae5b8d60b3439e29108ab76bb3 SHA256 8b1497e7e7bdaa9a38780b89c7f920a4e3e90370c0874570b4f956fa1755f4ba
+EBUILD gimp-2.4.6.ebuild 3518 RMD160 678770aa2fc0e8c0932385636f0bddca107c6d72 SHA1 e622aa88f0c4eff05361b948b0136812209aa2d6 SHA256 6b1ccd4e7ce677355bb468e75eba0da33e67dbc1c625dd7c6d28c40b266bff7b
+EBUILD gimp-2.4.7.ebuild 3528 RMD160 d319e07cd52f651a5c82b1ef5ff242fed94a9d0c SHA1 6fcfb595afa3c166aa8ca9467fadfa406d7fecff SHA256 5029a76861eb7b79beb8c76b41b01e5761dd97a4fead3af9c04b098f98633bc1
+EBUILD gimp-2.6.4.ebuild 2561 RMD160 de2527afb4de83061144a660ab037eec525389f9 SHA1 5f63690c22a0f276fc410969b57792ce9431896d SHA256 80fa349537d9632ab31eaae9f779207fdafa243531f111aa7f324bc553670ada
+EBUILD gimp-2.6.5.ebuild 2532 RMD160 7942c3394410b649e94dab8e34e176d3c5317ccc SHA1 24918845adf06e4fafb5e6b97976b60056b62b71 SHA256 639879cb4cef6cdf05cc50683c3842f5f8ce6e8569aa55b950064c1ad4d3b6b0
+EBUILD gimp-2.6.6.ebuild 2538 RMD160 bad5bf73f5a0aabc833c7112af2b6174533a7724 SHA1 615fb1f0bcb15842056d883252b1ddc10c6eb010 SHA256 1614304d2d83148919de892885fce8b94afc68efccfcda54ecd31bf6e843566e
+EBUILD gimp-9999.ebuild 3399 RMD160 6d7f71d9245c03da79bb3f1a4f7afa68b862524d SHA1 a5f5245678e00ac6b6838f171f8819ea3d279a50 SHA256 9333e9c55cb5c990fc8a4bea2399ca7e33ebc4fa4514b9fd922ecaab4f1daf31
+MISC ChangeLog 39190 RMD160 7d3d109970f1ecce0fd2a5c3d09eeed8d3655413 SHA1 5692032cb36c8f29e144f7c91fb97416f03f6a32 SHA256 6e4ea3b52934a2ac1d35a2ec6be05308599de490546857efc1e6b05d79cc3edb
 MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce399814102ba9802439497439e2e00ecc3b82e SHA256 380bccccb72b527f81e02fd37b41b584316fcd7c802b959b8eae27fcef0c0db5
diff --git a/media-gfx/gimp/gimp-2.3.19.ebuild b/media-gfx/gimp/gimp-2.3.19.ebuild
index 1b6cd27bed0e..3032375f1660 100644
--- a/media-gfx/gimp/gimp-2.3.19.ebuild
+++ b/media-gfx/gimp/gimp-2.3.19.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-gfx/gimp/gimp-2.3.19.ebuild,v 1.8 2009/03/30 13:28:41 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.19.ebuild,v 1.9 2009/04/10 23:19:10 loki_val Exp $
+
+EAPI=2
 
 inherit fdo-mime flag-o-matic multilib python
 
@@ -37,7 +39,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
 		>=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
-	pdf? ( >=virtual/poppler-glib-0.3.1 )
+	pdf? ( >=virtual/poppler-glib-0.3.1[cairo] )
 	png? ( >=media-libs/libpng-1.2.2 )
 	python?	( >=dev-lang/python-2.2.1
 		>=dev-python/pygtk-2.10.4 )
@@ -49,7 +51,7 @@ DEPEND="${RDEPEND}
 		>=dev-util/intltool-0.31
 		doc? ( >=dev-util/gtk-doc-1 )"
 
-src_compile() {
+src_configure() {
 	# workaround portage variable leakage
 	local AA=
 
@@ -82,6 +84,11 @@ src_compile() {
 		$(use_with tiff libtiff) \
 		$(use_with wmf) \
 		|| die "econf failed"
+}
+
+src_compile() {
+	# workaround portage variable leakage
+	local AA=
 
 	emake || die "emake failed"
 }
diff --git a/media-gfx/gimp/gimp-2.4.6.ebuild b/media-gfx/gimp/gimp-2.4.6.ebuild
index 9f83296fb6a8..6cab67aed1c4 100644
--- a/media-gfx/gimp/gimp-2.4.6.ebuild
+++ b/media-gfx/gimp/gimp-2.4.6.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-gfx/gimp/gimp-2.4.6.ebuild,v 1.9 2009/03/30 13:28:41 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild,v 1.10 2009/04/10 23:19:10 loki_val Exp $
+
+EAPI=2
 
 inherit gnome2 fdo-mime flag-o-matic multilib python eutils autotools
 
@@ -27,7 +29,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
 	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1[midi] )
 	curl? ( net-misc/curl )
 	dbus? ( dev-libs/dbus-glib )
 	hal? ( sys-apps/hal )
@@ -39,7 +41,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
 	exif? ( >=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
-	pdf? ( >=virtual/poppler-glib-0.3.1 )
+	pdf? ( >=virtual/poppler-glib-0.3.1[cairo] )
 	png? ( >=media-libs/libpng-1.2.2 )
 	python?	( >=dev-lang/python-2.2.1
 		>=dev-python/pygtk-2.10.4 )
@@ -55,11 +57,6 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
 pkg_setup() {
-	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
-		eerror "This package requires media-libs/alsa-lib compiled with midi support."
-		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
-	fi
-
 	G2CONF="--enable-default-binary \
 		--with-x \
 		$(use_with aalib aa) \
@@ -85,8 +82,8 @@ pkg_setup() {
 		$(use_with wmf)"
 }
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
 	epatch "${FILESDIR}/gimp-web-browser.patch"
 
 	# Workaround for MIME-type, this is fixed in gimp trunk, so we can
@@ -96,7 +93,7 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# workaround portage variable leakage
 	local AA=
 
@@ -107,6 +104,12 @@ src_compile() {
 	if use ppc || use ppc64; then
 		append-flags "-fsigned-char"
 	fi
+	gnome2_src_configure
+}
+
+src_compile() {
+	# workaround portage variable leakage
+	local AA=
 
 	gnome2_src_compile
 }
diff --git a/media-gfx/gimp/gimp-2.4.7.ebuild b/media-gfx/gimp/gimp-2.4.7.ebuild
index dfef6a8797a5..c6297a06391e 100644
--- a/media-gfx/gimp/gimp-2.4.7.ebuild
+++ b/media-gfx/gimp/gimp-2.4.7.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-gfx/gimp/gimp-2.4.7.ebuild,v 1.2 2009/03/30 13:28:41 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.7.ebuild,v 1.3 2009/04/10 23:19:10 loki_val Exp $
+
+EAPI=2
 
 inherit gnome2 fdo-mime flag-o-matic multilib python eutils autotools
 
@@ -27,7 +29,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
 	x11-misc/xdg-utils
 	x11-themes/hicolor-icon-theme
 	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1[midi] )
 	curl? ( net-misc/curl )
 	dbus? ( dev-libs/dbus-glib )
 	hal? ( sys-apps/hal )
@@ -39,7 +41,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
 	exif? ( >=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
-	pdf? ( >=virtual/poppler-glib-0.3.1 )
+	pdf? ( >=virtual/poppler-glib-0.3.1[cairo] )
 	png? ( >=media-libs/libpng-1.2.2 )
 	python?	( >=dev-lang/python-2.2.1
 		>=dev-python/pygtk-2.10.4 )
@@ -55,10 +57,6 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
 pkg_setup() {
-	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
-		eerror "This package requires media-libs/alsa-lib compiled with midi support."
-		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
-	fi
 
 	G2CONF="--enable-default-binary \
 		--with-x \
@@ -85,8 +83,8 @@ pkg_setup() {
 		$(use_with wmf)"
 }
 
-src_unpack() {
-	gnome2_src_unpack
+src_prepare() {
+	gnome2_src_prepare
 	epatch "${FILESDIR}/gimp-web-browser.patch"
 
 	# Workaround for MIME-type, this is fixed in gimp trunk, so we can
@@ -96,7 +94,7 @@ src_unpack() {
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# workaround portage variable leakage
 	local AA=
 
@@ -108,9 +106,17 @@ src_compile() {
 		append-flags "-fsigned-char"
 	fi
 
+	gnome2_src_configure
+}
+
+src_compile() {
+	# workaround portage variable leakage
+	local AA=
+
 	gnome2_src_compile
 }
 
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 
diff --git a/media-gfx/gimp/gimp-2.6.4.ebuild b/media-gfx/gimp/gimp-2.6.4.ebuild
index f566a6fdd1cb..19f0985f6d8e 100644
--- a/media-gfx/gimp/gimp-2.6.4.ebuild
+++ b/media-gfx/gimp/gimp-2.6.4.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-gfx/gimp/gimp-2.6.4.ebuild,v 1.8 2009/04/06 14:23:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.4.ebuild,v 1.9 2009/04/10 23:19:10 loki_val Exp $
+
+EAPI=2
 
 inherit eutils gnome2 fdo-mime multilib python
 
@@ -27,7 +29,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
 	x11-themes/hicolor-icon-theme
 	>=media-libs/gegl-0.0.22
 	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1[midi] )
 	curl? ( net-misc/curl )
 	dbus? ( dev-libs/dbus-glib )
 	hal? ( sys-apps/hal )
@@ -37,7 +39,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
 	exif? ( >=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
-	pdf? ( >=virtual/poppler-glib-0.3.1 )
+	pdf? ( >=virtual/poppler-glib-0.3.1[cairo] )
 	png? ( >=media-libs/libpng-1.2.2 )
 	python?	( >=dev-lang/python-2.5.0
 		>=dev-python/pygtk-2.10.4 )
@@ -53,11 +55,6 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
 pkg_setup() {
-	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
-		eerror "This package requires media-libs/alsa-lib compiled with midi support."
-		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
-	fi
-
 	G2CONF="--enable-default-binary \
 		--with-x \
 		$(use_with aalib aa) \
diff --git a/media-gfx/gimp/gimp-2.6.5.ebuild b/media-gfx/gimp/gimp-2.6.5.ebuild
index c2fc476553d6..3a3466ed7d85 100644
--- a/media-gfx/gimp/gimp-2.6.5.ebuild
+++ b/media-gfx/gimp/gimp-2.6.5.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-gfx/gimp/gimp-2.6.5.ebuild,v 1.3 2009/03/30 13:28:41 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.5.ebuild,v 1.4 2009/04/10 23:19:10 loki_val Exp $
+
+EAPI=2
 
 inherit eutils gnome2 fdo-mime multilib python
 
@@ -26,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
 	x11-themes/hicolor-icon-theme
 	>=media-libs/gegl-0.0.22
 	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1[midi] )
 	curl? ( net-misc/curl )
 	dbus? ( dev-libs/dbus-glib )
 	hal? ( sys-apps/hal )
@@ -36,7 +38,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
 	exif? ( >=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
-	pdf? ( >=virtual/poppler-glib-0.3.1 )
+	pdf? ( >=virtual/poppler-glib-0.3.1[cairo] )
 	png? ( >=media-libs/libpng-1.2.2 )
 	python?	( >=dev-lang/python-2.5.0
 		>=dev-python/pygtk-2.10.4 )
@@ -52,11 +54,6 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
 pkg_setup() {
-	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
-		eerror "This package requires media-libs/alsa-lib compiled with midi support."
-		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
-	fi
-
 	G2CONF="--enable-default-binary \
 		--with-x \
 		$(use_with aalib aa) \
diff --git a/media-gfx/gimp/gimp-2.6.6.ebuild b/media-gfx/gimp/gimp-2.6.6.ebuild
index f7438ef7c386..bc49724212a4 100644
--- a/media-gfx/gimp/gimp-2.6.6.ebuild
+++ b/media-gfx/gimp/gimp-2.6.6.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-gfx/gimp/gimp-2.6.6.ebuild,v 1.3 2009/04/02 03:47:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.6.ebuild,v 1.4 2009/04/10 23:19:10 loki_val Exp $
+
+EAPI=2
 
 inherit eutils gnome2 fdo-mime multilib python
 
@@ -26,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
 	x11-themes/hicolor-icon-theme
 	>=media-libs/gegl-0.0.22
 	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1[midi] )
 	curl? ( net-misc/curl )
 	dbus? ( dev-libs/dbus-glib )
 	hal? ( sys-apps/hal )
@@ -36,7 +38,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
 	exif? ( >=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
-	pdf? ( >=virtual/poppler-glib-0.3.1 )
+	pdf? ( >=virtual/poppler-glib-0.3.1[cairo] )
 	png? ( >=media-libs/libpng-1.2.2 )
 	python?	( >=dev-lang/python-2.5.0
 		>=dev-python/pygtk-2.10.4 )
@@ -52,11 +54,6 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
 pkg_setup() {
-	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
-		eerror "This package requires media-libs/alsa-lib compiled with midi support."
-		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
-	fi
-
 	G2CONF="--enable-default-binary \
 		--with-x \
 		$(use_with aalib aa) \
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 05390a7a6b1a..600a94498266 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.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-gfx/gimp/gimp-9999.ebuild,v 1.18 2009/03/30 13:28:41 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.19 2009/04/10 23:19:10 loki_val Exp $
+
+EAPI=2
 
 inherit subversion fdo-mime flag-o-matic multilib python
 
@@ -27,7 +29,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
 	dev-libs/libxslt
 	x11-themes/hicolor-icon-theme
 	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.14a-r1[midi] )
 	curl? ( net-misc/curl )
 	dbus? ( dev-libs/dbus-glib
 		sys-apps/hal )
@@ -39,7 +41,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
 		>=media-libs/libexif-0.6.15 )
 	lcms? ( media-libs/lcms )
 	mng? ( media-libs/libmng )
-	pdf? ( >=virtual/poppler-glib-0.3.1 )
+	pdf? ( >=virtual/poppler-glib-0.3.1[cairo] )
 	png? ( >=media-libs/libpng-1.2.2 )
 	python?	( >=dev-lang/python-2.2.1
 		>=dev-python/pygtk-2.10.4 )
@@ -52,14 +54,7 @@ DEPEND="${RDEPEND}
 	>=sys-devel/gettext-0.17
 	doc? ( >=dev-util/gtk-doc-1 )"
 
-pkg_setup() {
-	if use alsa && ! built_with_use media-libs/alsa-lib midi; then
-		eerror "This package requires media-libs/alsa-lib compiled with midi support."
-		die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
-	fi
-}
-
-src_compile() {
+src_configure() {
 	# workaround portage variable leakage
 	local AA=
 
@@ -99,10 +94,15 @@ src_compile() {
 		$(use_with tiff libtiff) \
 		$(use_with wmf) \
 		|| die "econf failed"
+}
 
+src_compile() {
+	# workaround portage variable leakage
+	local AA=
 	emake || die "emake failed"
 }
 
+
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"