Updated dependencies, thanks to Petr Novak in bug #139699.

Package-Manager: portage-2.1-r1

3 files changed, 21 insertions, 22 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 6a4d67f05a75..33d1ab988315 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.168 2006/07/09 08:52:05 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.169 2006/07/09 17:00:52 brix Exp $
+
+  09 Jul 2006; Henrik Brix Andersen <brix@gentoo.org> gimp-9999.ebuild:
+  Updated dependencies, thanks to Petr Novak in bug #139699.
 
   09 Jul 2006; Rene Nussbaumer <killerfox@gentoo.org> gimp-2.2.12.ebuild:
   Stable on hppa. See bug #139524.
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 833c7b8b37fb..1b75211c38f0 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -70,14 +70,14 @@ EBUILD gimp-2.3.9.ebuild 3459 RMD160 d4f0a317fe800945614566d209138793238d8283 SH
 MD5 ecbd8c8db2f3d2b4a2d453bf3ea329a9 gimp-2.3.9.ebuild 3459
 RMD160 d4f0a317fe800945614566d209138793238d8283 gimp-2.3.9.ebuild 3459
 SHA256 aea53b009d016e7004b3ab4c4231f806ad2b2ca8fc5190871a7c92af4a3b2324 gimp-2.3.9.ebuild 3459
-EBUILD gimp-9999.ebuild 3747 RMD160 966a6cddc7b66ef865e4e4bfe300e4cfc9f28530 SHA1 695bc45ef36450fd8dd6feee7fa9ad315ae404f2 SHA256 c89fc4b85a5f70b43a28d352edaffcc2ef2e52fd0a48817d9d5687213e8cf51b
-MD5 cb28e0f4fd31a202c20e3fa91b8b79b8 gimp-9999.ebuild 3747
-RMD160 966a6cddc7b66ef865e4e4bfe300e4cfc9f28530 gimp-9999.ebuild 3747
-SHA256 c89fc4b85a5f70b43a28d352edaffcc2ef2e52fd0a48817d9d5687213e8cf51b gimp-9999.ebuild 3747
-MISC ChangeLog 24321 RMD160 9ddc7998667e84769ab43d7137478810407c9474 SHA1 3195b4a1274acfe35852bd7145eaf212aba63f5f SHA256 2107dec31411f2b6bad861b34c8b179c2773575c074b16607cdb7e28bea537c0
-MD5 544dc6f91d67db44e8a9e5d948e52dc4 ChangeLog 24321
-RMD160 9ddc7998667e84769ab43d7137478810407c9474 ChangeLog 24321
-SHA256 2107dec31411f2b6bad861b34c8b179c2773575c074b16607cdb7e28bea537c0 ChangeLog 24321
+EBUILD gimp-9999.ebuild 3632 RMD160 517f291825842229964b3a6dbbabea7ac007f640 SHA1 09e1629d318a00ca47fa20e556e87e3461cf84df SHA256 c629881baf6f63d2ca19bc4ad472b7f561b74b818e9c96fbdc1bbccedca12572
+MD5 32810f821112d60d5d0b9ff89fec94ec gimp-9999.ebuild 3632
+RMD160 517f291825842229964b3a6dbbabea7ac007f640 gimp-9999.ebuild 3632
+SHA256 c629881baf6f63d2ca19bc4ad472b7f561b74b818e9c96fbdc1bbccedca12572 gimp-9999.ebuild 3632
+MISC ChangeLog 24450 RMD160 be96300c7b0b7e64d10a731152c7a7c71fa80eb8 SHA1 5d7fd49c5339c518163539cc40213f72f76caae3 SHA256 fcb9a5d36ea1acfd8a6ed9194820fb8c661d7c5907e10119825372578df4f4a8
+MD5 3ad5243eca64fd4d19b19c91c486a407 ChangeLog 24450
+RMD160 be96300c7b0b7e64d10a731152c7a7c71fa80eb8 ChangeLog 24450
+SHA256 fcb9a5d36ea1acfd8a6ed9194820fb8c661d7c5907e10119825372578df4f4a8 ChangeLog 24450
 MISC metadata.xml 369 RMD160 b71b3f982cd3a530df18bb05a2a32430e0c1daea SHA1 1c448e18bc74a560156318c4d9186b4e31ccba0c SHA256 4fbdad87f03de0aa7de4d07707a4d870d2c0cba55fc3cd563dae0945620d763d
 MD5 cda75d04f4767d3920ffc234e66d95c7 metadata.xml 369
 RMD160 b71b3f982cd3a530df18bb05a2a32430e0c1daea metadata.xml 369
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index d98f3ea91991..c2867ab77344 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.5 2006/06/25 00:29:26 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.6 2006/07/09 17:00:52 brix Exp $
 
 inherit alternatives cvs eutils fdo-mime flag-o-matic
 
@@ -19,16 +19,12 @@ LICENSE="GPL-2"
 SLOT="2"
 KEYWORDS="-*"
 
-# add 'print' when >=x11-libs/gtk+-2.9.3 hits portage
-IUSE="alsa aalib altivec debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
+IUSE="alsa aalib altivec debug doc gtkhtml gnome jpeg lcms mmx mng pdf png print python smp sse svg tiff wmf"
 
-# not yet in portage:
-#		print? ( >=x11-libs/gtk+-2.9.3 )
-RDEPEND=">=dev-libs/glib-2.8.2
-		>=x11-libs/gtk+-2.8.8
-		>=x11-libs/pango-1.4
+RDEPEND=">=dev-libs/glib-2.10.2
+		>=x11-libs/pango-1.12.2
 		>=media-libs/freetype-2.1.7
-		>=media-libs/fontconfig-2.2
+		>=media-libs/fontconfig-2.2.0
 		>=media-libs/libart_lgpl-2.3.8-r1
 		sys-libs/zlib
 		dev-libs/libxml2
@@ -47,10 +43,12 @@ RDEPEND=">=dev-libs/glib-2.8.2
 		mng? ( media-libs/libmng )
 		pdf? ( >=app-text/poppler-bindings-0.3.1 )
 		png? ( >=media-libs/libpng-1.2.2 )
+		print? ( >=x11-libs/gtk+-2.9.3 )
+		!print? ( >=x11-libs/gtk+-2.8.17 )
 		python?	( >=dev-lang/python-2.2.1
 				>=dev-python/pygtk-2 )
 		tiff? ( >=media-libs/tiff-3.5.7 )
-		svg? ( >=gnome-base/librsvg-2.2 )
+		svg? ( >=gnome-base/librsvg-2.8.0 )
 		wmf? ( >=media-libs/libwmf-0.2.8 )"
 DEPEND="${RDEPEND}
 		>=dev-util/pkgconfig-0.12.0
@@ -84,9 +82,6 @@ src_compile() {
 
 	"${S}"/autogen.sh $(use_enable doc gtk-doc) || die "autogen.sh failed"
 
-	# requires >=x11-libs/gtk+-2.9.3, which is not yet in portaqe
-	# $(use_with print) \
-
 	econf \
 		--disable-default-binary \
 		--with-x \
@@ -103,6 +98,7 @@ src_compile() {
 		$(use_with mng libmng) \
 		$(use_with png libpng) \
 		$(use_with pdf poppler) \
+		$(use_with print) \
 		$(use_enable python) \
 		$(use_enable smp mp) \
 		$(use_enable sse) \