Fixes to older versions for bug #106551. Classpath does not depend on gdk-pixbuf any more.

(Portage version: 2.0.52-r1)

4 files changed, 12 insertions, 18 deletions

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index 92931e05ad87..444045d2af5a 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/gnu-classpath
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.36 2005/09/23 22:07:26 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.37 2005/09/23 22:18:58 betelgeuse Exp $
+
+  23 Sep 2005; Petteri Räty <betelgeuse@gentoo.org>
+  gnu-classpath-0.14.ebuild, gnu-classpath-0.15-r1.ebuild:
+  Fixes to older versions for bug #106551. Classpath does not depend on
+  gdk-pixbuf any more.
 
 *gnu-classpath-0.18 (23 Sep 2005)
 
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index f0737d3142e7..7cea5ed38167 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b97f5a72d61bfe20d7683a2eceae0d66 gnu-classpath-0.15-r1.ebuild 1654
+MD5 67bc502962be2e3de0913ed0d43bc05a gnu-classpath-0.15-r1.ebuild 1632
 MD5 61749f9b6a523a9e3d95db83a13f2ff8 gnu-classpath-0.18.ebuild 1815
-MD5 5d7a0f180847456ca193b735042028a1 gnu-classpath-0.14.ebuild 1213
-MD5 1564061040f6974de61b65a24a06c476 ChangeLog 5296
+MD5 f27dd71f0ef2faeafae09634ed0eb964 gnu-classpath-0.14.ebuild 1189
+MD5 51dc0df36fe7400a86b7bc7228794773 ChangeLog 5504
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 2690159fdd3e679de05cd6daed73f4da files/digest-gnu-classpath-0.15-r1 67
 MD5 9b2c43cfbb9e8d325407a9ddd2068a5d files/digest-gnu-classpath-0.14 67
 MD5 e8174eff88cbeae8528507c699821eea files/digest-gnu-classpath-0.18 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDNHy2QiJ/wx066S4RAmcrAJsEVlrRT7gMSfmOZm3M2Ap2HM5kpACeOdS3
-MgciVvb9n1cNtTbpcqI8heU=
-=tkNs
------END PGP SIGNATURE-----
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild
index 36372051e59f..5e63d457fb6a 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild,v 1.4 2005/07/18 12:04:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.14.ebuild,v 1.5 2005/09/23 22:18:58 betelgeuse Exp $
 
 DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the java programming language"
 SRC_URI="ftp://ftp.gnu.org/gnu/classpath/classpath-${PV}.tar.gz"
@@ -13,7 +13,6 @@ IUSE="jikes gtk xml2"
 
 RDEPEND=">=virtual/jre-1.4
 	gtk? (
-		media-libs/gdk-pixbuf
 		>=x11-libs/gtk+-2
 		>=media-libs/libart_lgpl-2.1
 	)
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild
index 46bf77c02420..7e96f3e6ac46 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild,v 1.5 2005/07/18 12:04:45 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.15-r1.ebuild,v 1.6 2005/09/23 22:18:58 betelgeuse Exp $
 
 DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java programming language"
 SRC_URI="ftp://ftp.gnu.org/gnu/classpath/classpath-${PV}.tar.gz"
@@ -12,7 +12,7 @@ KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 IUSE="cairo gtk xml2"
 
 RDEPEND="cairo? ( >=x11-libs/cairo-0.3.0 )
-		 gtk? ( >=x11-libs/gtk+-2 >=media-libs/libart_lgpl-2.1 media-libs/gdk-pixbuf )
+		 gtk? ( >=x11-libs/gtk+-2 >=media-libs/libart_lgpl-2.1 )
 		 xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
 DEPEND="${RDEPEND}
 	app-arch/zip