Revbump to register the classes to package.env, so they can be used by java-config.

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

3 files changed, 127 insertions, 12 deletions

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index b766b82efb75..96ec8e77ca6e 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/gnu-classpath
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.92 2009/09/18 16:23:22 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.93 2009/11/08 20:33:09 caster Exp $
+
+*gnu-classpath-0.98-r1 (08 Nov 2009)
+
+  08 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  +gnu-classpath-0.98-r1.ebuild:
+  Revbump to register the classes to package.env, so they can be used by
+  java-config.
 
   18 Sep 2009; Torsten Veller <tove@gentoo.org>
   gnu-classpath-0.97-r1.ebuild, gnu-classpath-0.97.2.ebuild:
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 497d8827fb49..789160bccdf0 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.93-nsplugin.patch 1518 RMD160 b82f191cd788dce09745ca17042499f278d0b695 SHA1 3e7f7e77b30aa330abafc7f2d6d1a4fe4ce7d801 SHA256 6919f6291d674a7ebabb6e31fd5e3416394287be00a0cec2dbc8365b70302d97
 DIST classpath-0.97-gentoo.tar.gz 10261662 RMD160 01ef33c4e50b5c88bfe2f59d9249110072d3764e SHA1 22b2ac2444b73df841e07c36c4e6621ab9a06d3f SHA256 5f0619b26fe3e0cded3e76a09be4004db62f5bcd198c041da2bd619cc633200e
 DIST classpath-0.97.2.tar.gz 10318014 RMD160 a33667d2b692da22cb872c57265511115a543a76 SHA1 627e9781f9bb744b1a70e4aaff88d2d0440cbf1f SHA256 001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4
 DIST classpath-0.98.tar.gz 11021342 RMD160 9a20f4ca9379d90cbca644c0e9410df1c57575a5 SHA1 1d6e8d1b3542a35bbd1013c61fab3cfae083decb SHA256 501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f
 EBUILD gnu-classpath-0.97-r1.ebuild 3387 RMD160 9563a9828beb8ff75104d46efb4838ebf490576f SHA1 a3c2bd70d4444c79f734362e57db4e5db622776d SHA256 0fb90a78e0e56e3071bf62adbed80e4d031c18d5e2cd05c6a70b8adf5c74b680
 EBUILD gnu-classpath-0.97.2.ebuild 2527 RMD160 554ec06d1ed06578bee29ed4b4f5417e36dd1d24 SHA1 e2ba75d0cb2b06c07bbbb8134d4b74079d3d104d SHA256 853b3f413b5e04e7a03b56f959767cda2d9db0276311336b5c6f8a952822235e
+EBUILD gnu-classpath-0.98-r1.ebuild 3239 RMD160 a8734233b798247616f96a2631b269c694681e3c SHA1 51a68c11e4ea8268688d099662cb998b891119da SHA256 2ef91f23ccb4b3c55affafff1fedfce6864ea8aeb29b453c8065e0f4a62f5b85
 EBUILD gnu-classpath-0.98.ebuild 3033 RMD160 35971bad90131ad3a75358334403eca4f7941b14 SHA1 a23a64a1d894161f3e6ddaa861c5c375a5b82fe9 SHA256 a39d03678ebb23e4bcc513f258f3327d0bceccff3c356e489e7e6324145ad54c
-MISC ChangeLog 13554 RMD160 0795aa9f49cca5a29877f2fbdaadd7f0ae8f24c0 SHA1 c787d9b76f1c0b5742ef3c75ab91aeb12beb2d5f SHA256 e27f4f657a21bc217b5c03d518864a831b25e280ea92287fbb01a917fc8515ba
+MISC ChangeLog 13767 RMD160 64c8d4fde50d0e058fa61250d55678ef9449498b SHA1 5f1067501c934f3b472943fe16b3eefec4fcfca5 SHA256 c0cd93ef4e9685b5a1bed7de0f9bb4c5dcf0bb3d3da92f5ebee6f899bff2faab
 MISC metadata.xml 456 RMD160 36f9f9619fd32cdfec79883a039433e4473f7f9f SHA1 4bd8e09e3b936882112ba76e7d8a820aa1c0d738 SHA256 ce74184ed34e49a121939077d436c7b73eff7b046f5367d2241d7d2d8f0a6061
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqztAAACgkQV3J2n04EauzLRgCeKp23kjupaGn/5Rl/5TqumDhs
-nj4AniWL8HRVxfSP3jd3dkVb2URCWGLZ
-=dIbM
------END PGP SIGNATURE-----
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild
new file mode 100644
index 000000000000..13263a8f88ca
--- /dev/null
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2009 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.98-r1.ebuild,v 1.1 2009/11/08 20:33:09 caster Exp $
+
+EAPI=2
+
+inherit eutils flag-o-matic java-pkg-2 base multilib
+
+MY_P=${P/gnu-/}
+DESCRIPTION="Free core class libraries for use with virtual machines and compilers for the Java language"
+SRC_URI="mirror://gnu/classpath/${MY_P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/classpath"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0.98"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="alsa debug doc dssi examples gconf gjdoc gmp gtk gstreamer nsplugin qt4 xml"
+
+# xulrunner: http://bugs.gentoo.org/show_bug.cgi?id=257803
+RDEPEND="alsa? ( media-libs/alsa-lib )
+		doc? ( >=dev-java/gjdoc-0.7.9 )
+		dssi? ( >=media-libs/dssi-0.9 )
+		gconf? ( gnome-base/gconf )
+		gjdoc? ( >=dev-java/antlr-2.7.1:0 )
+		gmp? ( >=dev-libs/gmp-4.2.4 )
+		gstreamer? (
+			>=media-libs/gstreamer-0.10.10
+			>=media-libs/gst-plugins-base-0.10.10
+			dev-libs/glib
+		)
+		gtk? (
+				>=x11-libs/gtk+-2.8
+				>=dev-libs/glib-2.0
+				media-libs/freetype
+				>=x11-libs/cairo-1.1.9
+				x11-libs/libICE
+				x11-libs/libSM
+				x11-libs/libX11
+				x11-libs/libXrandr
+				x11-libs/libXrender
+				x11-libs/libXtst
+				x11-libs/pango
+		)
+		nsplugin? (
+			>=x11-libs/gtk+-2.8
+			|| (
+				<net-libs/xulrunner-1.9.1
+				<www-client/mozilla-firefox-3.5
+				www-client/seamonkey
+			)
+		)
+		qt4? ( x11-libs/qt-gui:4 )
+		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )
+		dev-java/eclipse-ecj:3.3"
+
+# We should make the build not pickup the wrong antlr binary from pccts
+DEPEND="app-arch/zip
+		gjdoc? ( !!dev-util/pccts )
+		gtk? ( || (
+					x11-libs/libXrender
+					x11-proto/xextproto
+					x11-proto/xproto
+				)
+			)
+		>=virtual/jdk-1.5
+		${RDEPEND}"
+
+RDEPEND=">=virtual/jre-1.5
+	${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	# We require ecj anyway, so force it to avoid problems with bad versions of javac
+	export JAVAC="/usr/bin/ecj-3.3"
+	export JAVA="/usr/bin/java"
+	# build takes care of them itself, duplicate -source -target kills ecj
+	export JAVACFLAGS="-nowarn"
+
+	# don't use econf, because it ends up putting things under /usr, which may
+	# collide with other slots of classpath
+	local myconf
+	if use gjdoc; then
+		local antlr=$(java-pkg_getjar antlr antlr.jar)
+		myconf="--with-antlr-jar=${antlr}"
+	fi
+
+	ANTLR= ./configure \
+		$(use_enable alsa) \
+		$(use_enable debug ) \
+		$(use_enable examples) \
+		$(use_enable gconf gconf-peer) \
+		$(use_enable gjdoc) \
+		$(use_enable gmp) \
+		$(use_enable gtk gtk-peer) \
+		$(use_enable gstreamer gstreamer-peer) \
+		$(use_enable nsplugin plugin) \
+		$(use_enable qt4 qt-peer) \
+		$(use_enable xml xmlj) \
+		$(use_enable dssi ) \
+		$(use_with doc gjdoc) \
+		--enable-jni \
+		--disable-dependency-tracking \
+		--host=${CHOST} \
+		--prefix=/usr/${PN}-${SLOT} \
+		--with-ecj-jar=$(java-pkg_getjar eclipse-ecj:3.3 ecj.jar) \
+		--disable-Werror \
+		${myconf} \
+		|| die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO || die
+	java-pkg_regjar /usr/${P}/share/classpath/glibj.zip
+}