Added modular X dependencies.

(Portage version: 2.1_pre4-r1)

4 files changed, 69 insertions, 30 deletions

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index ea9a4931393b..bfaa80e2c795 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/gnu-classpath
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.48 2006/02/04 18:13:29 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.49 2006/02/05 14:25:43 betelgeuse Exp $
+
+  05 Feb 2006; Petteri Räty <betelgeuse@gentoo.org>
+  gnu-classpath-0.19.ebuild, gnu-classpath-0.20.ebuild:
+  Added modular X dependencies.
 
   04 Feb 2006; Stephanie Lockwood-Childs <wormo@gentoo.org>
   gnu-classpath-0.19.ebuild, gnu-classpath-0.20.ebuild:
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 7694ba34395a..c131ffac4c07 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1,23 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4e98f49f77f65f00701bb16e4a577427 ChangeLog 6882
+MD5 6b2046c1316615ce306f5d5e4b34c073 ChangeLog 6997
+RMD160 a39603f60b552e86f143a86262da3beeda8476aa ChangeLog 6997
+SHA256 d870de352929fa95488d6f4d3ac282207981834abe33b699ea2d59a085ff949e ChangeLog 6997
 MD5 4c21037c9eaf2d9fe12e88ced8caab80 files/0.19-dssi.patch 1410
+RMD160 4cb4bcf9f35ab966e25ecca5e6b9d96dd5b0dae1 files/0.19-dssi.patch 1410
+SHA256 914528fd87325f949f11db8271410a14b2befd352ae0eecda8938818a8da7da9 files/0.19-dssi.patch 1410
 MD5 7e2cbdd8bd825a0e9b8fff8312f08c23 files/0.19-dssi_data.h 4174
+RMD160 dad018dfc4a2c5152237edb30144282bb9188b18 files/0.19-dssi_data.h 4174
+SHA256 5af6d1002557fa216db7d0f92aca4fc728dfe97c83b5015add0d33b31adef8a2 files/0.19-dssi_data.h 4174
 MD5 9b2c43cfbb9e8d325407a9ddd2068a5d files/digest-gnu-classpath-0.14 67
+RMD160 3bb8875a8b61cb7c06d03b10fc7e21232a684d7b files/digest-gnu-classpath-0.14 67
+SHA256 c2bc87da4fd0cdafc13e2a5b0cddf3686574ba0f23223f472400b73d50d6da69 files/digest-gnu-classpath-0.14 67
 MD5 e8174eff88cbeae8528507c699821eea files/digest-gnu-classpath-0.18 67
+RMD160 a922197e37202f5bb91ccc86d4a1aa052224c127 files/digest-gnu-classpath-0.18 67
+SHA256 7c012e05dda89b2e99725caafd7136f2a70c8bb06ec043cd0b7709550d2e6d31 files/digest-gnu-classpath-0.18 67
 MD5 2fa214c9b3ef402739df2a954d83c46e files/digest-gnu-classpath-0.19 67
+RMD160 4d7710f2b411ef1989a83002f612a071b3ebe86b files/digest-gnu-classpath-0.19 67
+SHA256 5e268db93cdaadc83c88601d1173806953c118409a3b64efb58725b07982abda files/digest-gnu-classpath-0.19 67
 MD5 18a746e3e78ba32a9bf81f152ccdeda0 files/digest-gnu-classpath-0.20 67
+RMD160 27da71151f9175763fd14e7f261158fa5dd6101c files/digest-gnu-classpath-0.20 67
+SHA256 5d9b10dfba47329de9afd26f441e7e97f250b4c2807232c538c916fe78cc28a0 files/digest-gnu-classpath-0.20 67
 MD5 887f044e4350323f1324cc1368943c1a files/gtk28.patch 1522
+RMD160 06b593568abfa7a757c6d805ca89e856be7bca7a files/gtk28.patch 1522
+SHA256 6005431e565f0cf3c5bd207601e227abb6f909b8fae558c450d06fcc94fba581 files/gtk28.patch 1522
 MD5 cbe91e42e7c549118a985d3aa0f81f15 gnu-classpath-0.14.ebuild 1190
+RMD160 11fdd80724cebe9b98e0bace9dfc55ab65b5bb83 gnu-classpath-0.14.ebuild 1190
+SHA256 91d59f5db78b3e0a83ec726538ff78d065968d6b70ad5e8472bc73bb75991f91 gnu-classpath-0.14.ebuild 1190
 MD5 6c9872b9933574fb5cc69813ae5f2c13 gnu-classpath-0.18.ebuild 1928
+RMD160 d15e09b5c7146b398cd7738020142aff89fc8797 gnu-classpath-0.18.ebuild 1928
+SHA256 022013f8d934ba8d3d32f6aa6179c3dff94024f4779ef133dde8c6d99a3672a3 gnu-classpath-0.18.ebuild 1928
 MD5 4ced42eb677b8c36afdb7367afd46057 gnu-classpath-0.19.ebuild 2307
-MD5 27b3fd820c0ae7d0d74a2d84c7d08019 gnu-classpath-0.20.ebuild 2310
+RMD160 0f575ded01ba84cad7056ed897f2d320e3c33bb0 gnu-classpath-0.19.ebuild 2307
+SHA256 aeca2502b634956e552f0b09640f190da8fa6a0257c89c7f39acdb73d2da6f0b gnu-classpath-0.19.ebuild 2307
+MD5 1f6ebc7b939de94f585ca2a0239cad9b gnu-classpath-0.20.ebuild 2383
+RMD160 18549f46e59bfd85863edd0ae256eccf464e3649 gnu-classpath-0.20.ebuild 2383
+SHA256 e37ce04ac4a244c9d7d5c3ee17f49582965e3d7bb2cb9744a3feaab85f92e68d gnu-classpath-0.20.ebuild 2383
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFD5PGJ/NoSW7FuNV8RAtZWAKCgRxnrf+5fiA7zQCBATNsPIrikLwCg2nAW
-rDWpwGyHE9NmwUqhJmgLyGI=
-=+sWS
------END PGP SIGNATURE-----
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild
index 5858338282dc..ccde90c46edd 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.19.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/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild,v 1.4 2006/02/04 18:13:29 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.19.ebuild,v 1.5 2006/02/05 14:25:43 betelgeuse Exp $
 
 inherit eutils autotools
 
@@ -22,13 +22,28 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 		dssi? ( >=media-libs/dssi-0.9 )
 		gtk? ( >=x11-libs/gtk+-2.4
 				>=dev-libs/glib-2.0
-				virtual/x11
+				|| ( (
+					   x11-libs/libICE
+					   x11-libs/libSM
+					   x11-libs/libX11
+					   x11-libs/libXtst
+					 )
+				     virtual/x11
+				   )
 				cairo? ( >=x11-libs/cairo-0.5.0 )
 		     )
 		xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
 
 DEPEND="app-arch/zip
 		dev-java/jikes
+		gtk? ( || ( (
+					  x11-libs/libXrender
+					  x11-proto/xextproto
+					  x11-proto/xproto
+					)
+					virtual/x11
+				  )
+			 )
 		${REPEND}"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.20.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.20.ebuild
index 9722680b667e..fa51a4e40f6a 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.20.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.20.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 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.20.ebuild,v 1.2 2006/02/04 18:13:29 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.20.ebuild,v 1.3 2006/02/05 14:25:43 betelgeuse Exp $
 
-inherit eutils autotools
+inherit eutils
 
 MY_P=${P/gnu-/}
 DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java programming language"
@@ -22,28 +22,32 @@ RDEPEND="alsa? ( media-libs/alsa-lib )
 		dssi? ( >=media-libs/dssi-0.9 )
 		gtk? ( >=x11-libs/gtk+-2.4
 				>=dev-libs/glib-2.0
-				virtual/x11
+				|| ( (
+					   x11-libs/libICE
+					   x11-libs/libSM
+					   x11-libs/libX11
+					   x11-libs/libXtst
+					 )
+				     virtual/x11
+				   )
 				cairo? ( >=x11-libs/cairo-0.5.0 )
 		     )
 		xml2? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
 
 DEPEND="app-arch/zip
 		dev-java/jikes
+		gtk? ( || ( (
+					  x11-libs/libXrender
+					  x11-proto/xextproto
+					  x11-proto/xproto
+					)
+					virtual/x11
+				  )
+			 )
 		${REPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-#	cp ${FILESDIR}/${PV}-dssi_data.h native/jni/midi-dssi/dssi_data.h \
-#		|| die "Copying dssi_data.h failed."
-
-#	epatch ${FILESDIR}/${PV}-dssi.patch
-	eautoconf
-}
-
 src_compile() {
 	# Note: This is written in a way to easily support GCJ and other compilers
 	# at a later point. Currently Gentoo uses mainly GCJ 3.3 (from the
@@ -69,7 +73,7 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die "einstall failed"
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
 }