Revbump to remove ecj from RDEPEND as it's used only build-time. Also make the dep unversioned thanks to globbing in new java-config.

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

3 files changed, 122 insertions, 2 deletions

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index 2268a89e5429..67c93a08492a 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.108 2010/03/25 13:15:47 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.109 2010/04/29 19:50:01 caster Exp $
+
+*gnu-classpath-0.98-r3 (29 Apr 2010)
+
+  29 Apr 2010; Vlastimil Babka <caster@gentoo.org>
+  +gnu-classpath-0.98-r3.ebuild:
+  Revbump to remove ecj from RDEPEND as it's used only build-time. Also make
+  the dep unversioned thanks to globbing in new java-config.
 
   25 Mar 2010; Vlastimil Babka <caster@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 3e44bfd13525..162863a81a87 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -7,5 +7,6 @@ EBUILD gnu-classpath-0.97.2-r1.ebuild 2575 RMD160 e445f0a02803d7611f758479da74cc
 EBUILD gnu-classpath-0.97.2.ebuild 2466 RMD160 ce91f0c2b1ae1c587089c53de2f071d9c654b261 SHA1 3fd757ac28bc5ead5a2d26d91c07a17e704d7d25 SHA256 abdc1461b65a910e64f62a4bf31e1854301828d424a18bb616a1a4f5d5781f69
 EBUILD gnu-classpath-0.98-r1.ebuild 3202 RMD160 6127dee309aaa3eb7e4beba4e89d284340b858b8 SHA1 d92b319decc7437f86f4f5c6cc1f78e14c5ff3ed SHA256 af87a80c7fb3548c0b8b7230ea0c1372cccaada8c2f278d13177933d40cde311
 EBUILD gnu-classpath-0.98-r2.ebuild 3203 RMD160 b527a3034c1ff657f1d374041923541af1224854 SHA1 259576aed3cda3873a07ceea7b6047ec8ac15082 SHA256 8ebd3c113e341e5797f4f567818fad870a58a65125f06f815bb8037dffc47a10
-MISC ChangeLog 16696 RMD160 5f281d9830f147885e72abacb45f1177ff6e2fe9 SHA1 2a712f3c623ca8a552c2d2ccedd68347a1a68e87 SHA256 9778df7ef2fec42bb73a2ea6dbd490839e808a486aef3812b90feb47a9facb5c
+EBUILD gnu-classpath-0.98-r3.ebuild 3295 RMD160 0c9fce20af3848158e879f310ecfb716e2650d69 SHA1 41796bd1d4d0275190720abfc58eea6a91ad8858 SHA256 b0156228ee86fda8dcd1e0129894c11e01d9e0df7cdf0ac5c1218f4521629250
+MISC ChangeLog 16957 RMD160 504e9235857e9a5687e25ddef35313dc1f49bcd7 SHA1 0868d0cc35ce6c8c5c99ad21d02b8c0beb17edca SHA256 45c7f6c3652a8cdb3f87a0435957569f236c98319a0406268b21f60997fccba5
 MISC metadata.xml 759 RMD160 c3f604690ab9414b5d0c58fb74e1d85be10723be SHA1 1a83518e46e13aba75a83f0793e7db52b725867a SHA256 24e294a08d57473d495a67acdcc44c0f32747187531feeb72dfa678731cd51d2
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
new file mode 100644
index 000000000000..1e3e79565429
--- /dev/null
+++ b/dev-java/gnu-classpath/gnu-classpath-0.98-r3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2010 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-r3.ebuild,v 1.1 2010/04/29 19:50:01 caster Exp $
+
+EAPI=2
+
+inherit eutils 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 qt4 xml"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+		doc? ( >=dev-java/gjdoc-0.7.9-r2 )
+		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
+			x11-libs/gtk+
+		)
+		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
+		)
+		qt4? ( x11-libs/qt-gui:4 )
+		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )"
+
+# java-config >2.1.11 needed for ecj version globbing
+# We should make the build not pickup the wrong antlr binary from pccts
+DEPEND="app-arch/zip
+		dev-java/eclipse-ecj
+		>=dev-java/java-config-2.1.11
+		gjdoc? ( !!dev-util/pccts )
+		gtk? (
+			x11-libs/libXrender
+			|| ( >=x11-libs/libXtst-1.1.0 <x11-proto/xextproto-7.1 )
+			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"
+	export JAVA="/usr/bin/java"
+	# build takes care of them itself, duplicate -source -target kills ecj
+	export JAVACFLAGS="-nowarn"
+	# build system is passing -J-Xmx768M which ecj however ignores
+	# this will make the ecj launcher do it (seen case where default was not enough heap)
+	export gjl_java_args="-Xmx768M"
+
+	# 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 qt4 qt-peer) \
+		$(use_enable xml xmlj) \
+		$(use_enable dssi ) \
+		$(use_with doc gjdoc) \
+		--enable-jni \
+		--disable-dependency-tracking \
+		--disable-plugin \
+		--host=${CHOST} \
+		--prefix=/usr/${PN}-${SLOT} \
+		--with-ecj-jar=$(java-pkg_getjar --build-only eclipse-ecj-* 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
+}