media-gfx/gimp: Fix dependencies (bug #381389)

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 16 insertions, 13 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index bb9635ef9f88..a09653c6bd9f 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.332 2011/08/31 19:05:35 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.333 2011/09/02 15:58:38 sping Exp $
+
+  02 Sep 2011; Sebastian Pipping <sping@gentoo.org> gimp-2.7.3.ebuild,
+  gimp-9999.ebuild:
+  Fix dependencies (bug #381389)
 
   31 Aug 2011; Sebastian Pipping <sping@gentoo.org> gimp-9999.ebuild:
   Pass --disable-gtk-doc to autogen.sh in live ebuild (bug #346341)
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 0b4b059410fa..cba2df187868 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -10,14 +10,14 @@ DIST gimp-2.6.11.tar.bz2 16473561 RMD160 a116377499e58dc2bfe231ab3c057d0be94091f
 DIST gimp-2.7.3.tar.bz2 18206530 RMD160 5740b1b62b0fca255d0ca046477c21ab9c57a5ca SHA1 bea6edc3423774ace8dd86222314f4ef2278cdd8 SHA256 669811e66c6a5dffdca0df3f39f699b3a013aa5634447d9b90268f4068a8a4d9
 EBUILD gimp-2.6.11-r1.ebuild 3248 RMD160 324ff1505eeed9d839cc9695df3289dff0e5bf6e SHA1 b163b4ce5567abeb087b4f50eb4bfc2bb431a040 SHA256 07c2eafd3ce4e49f05a7b154b30be3f40a069e6617e1538c5e97d901dc424925
 EBUILD gimp-2.6.11-r2.ebuild 3259 RMD160 0f869b84f27b578b0c50da27545afc724ec236fc SHA1 4159ab5be4c896576ab9ca18d5b68b544665d23a SHA256 437a9aeff3e6c03814f0ce2912b8037e2005876aee294be79804a7765aa29180
-EBUILD gimp-2.7.3.ebuild 3221 RMD160 ef48c49f95326beb3e05cbb646b738da5016a5e9 SHA1 05587f53a1649199198ab628703326bcdbbfdd04 SHA256 171737d3c84cce5d83381b45a2c979e523c107854f75c880d379221a1a15d432
-EBUILD gimp-9999.ebuild 3452 RMD160 02c820633b618047403840e65f6c2720f9ada131 SHA1 a468625c2af16077ca15c94792c930f00aecf0c1 SHA256 e5bd61223185f1938e9f0a46bf38c2ae96f0568d5c9d795ff1efd5f497905b39
-MISC ChangeLog 45458 RMD160 34a802e3bcf023bc90f3123bdaacf0d9be568a6d SHA1 37e77ee4fa573ffad896cc14d09f0422b57aa518 SHA256 1bd2d56639ed200a1503b5e369643f2d8c3c232f9f59ce8e68e8f7dc4439407d
+EBUILD gimp-2.7.3.ebuild 3230 RMD160 6b38a0a065ec8425f8a4f148091d9592654df883 SHA1 ac744bc74f5f667dde7f81b51c2119e417bf2f8c SHA256 7158983e329c36765e33024aef0559640ea49a9f1e6bcca25508129d7663a2e4
+EBUILD gimp-9999.ebuild 3443 RMD160 b8468c1dd4625ab3267f66af056eac8a89596c53 SHA1 010d83b218f0ae999a81e683ea0e4ededf0fed00 SHA256 464b8c58ff4a11584d3eda30aa2c18be662e94a0cd7edac9532fc7b6e56cca4d
+MISC ChangeLog 45583 RMD160 95013ebf90c1b9992d1823d49c0b075ec4825df1 SHA1 56f642d106ace582fd9b45b045f755ddb0b84631 SHA256 6ca8fff6e0649fbf05aae9c1ece863138d085f81223d45e5b8791fd8e657799c
 MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce399814102ba9802439497439e2e00ecc3b82e SHA256 380bccccb72b527f81e02fd37b41b584316fcd7c802b959b8eae27fcef0c0db5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5ehf0ACgkQsAvGakAaFgCR3ACgx+pmcH3Df0G6VkkuaS10uyBp
-I68An0WeDBLCalVOz8aJ27xg3cegxhBE
-=xpCb
+iEYEARECAAYFAk5g/TEACgkQsAvGakAaFgDIxwCffboULhE34N8Wxz52AgnpCxpd
+2xgAoMrDc89fU+AW2J42fpV2Wc6Xe8aC
+=aDnY
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/gimp-2.7.3.ebuild b/media-gfx/gimp/gimp-2.7.3.ebuild
index cebd8b4e31cb..5b5b8b2bac71 100644
--- a/media-gfx/gimp/gimp-2.7.3.ebuild
+++ b/media-gfx/gimp/gimp-2.7.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.3.ebuild,v 1.1 2011/08/31 14:44:15 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.3.ebuild,v 1.2 2011/09/02 15:58:38 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -55,7 +55,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.22
 	>=dev-util/intltool-0.40.1
 	>=sys-devel/gettext-0.17
-	>=dev-util/gtk-doc-1"
+	doc? ( >=dev-util/gtk-doc-1 )"
 
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 335d26527cd6..916399bdfc5a 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.37 2011/08/31 19:05:35 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.38 2011/09/02 15:58:38 sping Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -57,11 +57,10 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.22
 	>=dev-util/intltool-0.40.1
 	>=sys-devel/gettext-0.17
-	>=dev-util/gtk-doc-1
+	doc? ( >=dev-util/gtk-doc-1 )
 	>=sys-devel/libtool-1.5
 	>=sys-devel/autoconf-2.54
-	>=sys-devel/automake-1.10
-	dev-libs/libxslt"
+	>=sys-devel/automake-1.10"
 
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"