Revbump to apply changes from java-overlay: move from /opt to /usr, add missing deps, USE flag descriptions. Also move to ecj-3.5.

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

4 files changed, 115 insertions, 9 deletions

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index b5a90f792663..ac292766b5ea 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.104 2010/03/21 20:50:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.105 2010/03/21 22:36:49 caster Exp $
+
+*gnu-classpath-0.97.2-r1 (21 Mar 2010)
+
+  21 Mar 2010; Vlastimil Babka <caster@gentoo.org>
+  +gnu-classpath-0.97.2-r1.ebuild, metadata.xml:
+  Revbump to apply changes from java-overlay: move from /opt to /usr, add
+  missing deps, USE flag descriptions. Also move to ecj-3.5.
 
   21 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 efef8b13efd3..43e86428cc77 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -3,8 +3,9 @@ DIST classpath-0.97-gentoo.tar.gz 10261662 RMD160 01ef33c4e50b5c88bfe2f59d924911
 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 3148 RMD160 1789e3c84bbe8690b1a568f14c0ff8b8a48cb7e9 SHA1 20b55a2e841bcf01e2bf1a17b7ee4d54840d911c SHA256 2435e875350a6b210e836a03100796a600a0ee03ee16cfdfe0ae07158afb0ebe
+EBUILD gnu-classpath-0.97.2-r1.ebuild 2398 RMD160 7f4da0328ebcf98f8578eb725910fb65508f90d4 SHA1 4225f4a943126934b0ebb9949d16d632cbdfb32c SHA256 20c41550b5f9fffc45ff7e71a62953fec2d0a0c268e8e1615c1663d0426175cc
 EBUILD gnu-classpath-0.97.2.ebuild 2288 RMD160 d4ad49c7bf6509ed636316b956024780dfbdd12b SHA1 e3c1a60e804b177af00c64e41e5ae36479c7eb93 SHA256 dad3618b5b86a2c0e0ff9e596c1d5f0ccc2c613cab4ea310eb2e1d6a54ee2875
 EBUILD gnu-classpath-0.98-r1.ebuild 3196 RMD160 ad61b50943c1918cf1f41dca4d053b452378d1c3 SHA1 1f22fbe68f77e22341d3978de1c197f75512ba3c SHA256 50acc65a3ee097fdf8058a3a4afebe0dcae9a3cab43a3fb7aa1ad07037090932
 EBUILD gnu-classpath-0.98-r2.ebuild 3197 RMD160 50d8ba289072479c2dfb68f382bc6714995c8373 SHA1 f48a13d6c05802c6dbbfcf1a9a6e1062ae46522a SHA256 16e66d8a38ce6d1c3de85744a50d13ecbc0265c48535ab235fe8dc1aeae0b226
-MISC ChangeLog 15619 RMD160 b596f4c88d66031005613c96e057725e4e5a85d5 SHA1 faf8eac2885d7d02717604d31e54cd06a7072660 SHA256 7d3ca79e9c15f2ca9bfe66703189ba9ffc0f65eb3dfaa0a3eb2a11ed36e2ee4a
-MISC metadata.xml 456 RMD160 36f9f9619fd32cdfec79883a039433e4473f7f9f SHA1 4bd8e09e3b936882112ba76e7d8a820aa1c0d738 SHA256 ce74184ed34e49a121939077d436c7b73eff7b046f5367d2241d7d2d8f0a6061
+MISC ChangeLog 15895 RMD160 688e24eaa35c406afed03c6cd4b2579d4bdaf09c SHA1 f66b6ee1c3af40249b8502ab278e8e052420a3ca SHA256 e2e56ddb1d0e94d7fe5265ad18857995b26a16fe5913b5000e7699b6862eff4c
+MISC metadata.xml 759 RMD160 c3f604690ab9414b5d0c58fb74e1d85be10723be SHA1 1a83518e46e13aba75a83f0793e7db52b725867a SHA256 24e294a08d57473d495a67acdcc44c0f32747187531feeb72dfa678731cd51d2
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild
new file mode 100644
index 000000000000..1b275b9cf035
--- /dev/null
+++ b/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild
@@ -0,0 +1,91 @@
+# 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.97.2-r1.ebuild,v 1.1 2010/03/21 22:36:49 caster Exp $
+
+EAPI=1
+
+inherit eutils flag-o-matic multilib java-pkg-2
+
+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.97"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="alsa debug doc dssi examples gconf gtk gstreamer qt4 xml"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+		doc? ( >=dev-java/gjdoc-0.7.8 )
+		dssi? ( >=media-libs/dssi-0.9 )
+		gconf? (
+			>=gnome-base/gconf-2.6.0
+			>=x11-libs/gtk+-2.8
+		)
+		gtk? (
+			>=x11-libs/gtk+-2.8
+			>=dev-libs/glib-2.0
+			media-libs/freetype
+			>=x11-libs/cairo-1.1.9
+			x11-libs/pango
+			x11-libs/libICE
+			x11-libs/libSM
+			x11-libs/libXrandr
+			x11-libs/libXrender
+			x11-libs/libXtst
+			x11-libs/libX11
+		)
+		qt4? ( x11-libs/qt-gui:4 )
+		xml? ( >=dev-libs/libxml2-2.6.8 >=dev-libs/libxslt-1.1.11 )
+		gstreamer? (
+			>=media-libs/gstreamer-0.10.10
+			>=media-libs/gst-plugins-base-0.10.10
+			dev-libs/glib
+		)
+		sys-apps/file"
+
+DEPEND="app-arch/zip
+		dev-java/eclipse-ecj:3.5
+		gtk? (
+			x11-libs/libXrender
+			x11-proto/xextproto
+			x11-proto/xproto
+		)
+		${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	export JAVAC="/usr/bin/ecj-3.5 -nowarn"
+
+	# don't use econf, because it ends up putting things under /usr, which may
+	# collide with other slots of classpath
+	./configure \
+		$(use_enable alsa) \
+		$(use_enable debug ) \
+		$(use_enable examples) \
+		$(use_enable gconf gconf-peer) \
+		$(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-Werror \
+		--disable-plugin \
+		--host=${CHOST} \
+		--prefix=/opt/${PN}-${SLOT} \
+		--with-ecj-jar=$(java-pkg_getjar --build-only eclipse-ecj:3.5 ecj.jar) \
+		--with-vm=java \
+		|| die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO || die
+}
diff --git a/dev-java/gnu-classpath/metadata.xml b/dev-java/gnu-classpath/metadata.xml
index ddce6d288624..4feb4c23be56 100644
--- a/dev-java/gnu-classpath/metadata.xml
+++ b/dev-java/gnu-classpath/metadata.xml
@@ -1,10 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>java</herd>
-  <use>
-    <flag name="dssi">Enable the DSSI midi synthesizer provider</flag>
-    <flag name="gconf">Enable the GConf based util.peers backend</flag>
-    <flag name="gjdoc">Build GNU Classpath's javadoc implementation. Formerly dev-java/gjdoc, now part of gnu-classpath upstream.</flag>
-  </use>
+	<herd>java</herd>
+	<use>
+		<flag name="alsa">Build with ALSA javax.sound.midi provider</flag>
+		<flag name="dssi">Build with DSSI javax.sound.midi provider</flag>
+		<flag name="gconf">Build with GConf preferences backend</flag>
+		<flag name="gmp">Build with GMP backend for java.math.BigInteger</flag>
+		<flag name="gjdoc">Build GJDoc, a documentation generator</flag>
+		<flag name="gtk">Build with Gtk+ AWT peers</flag>
+		<flag name="gstreamer">Build with GStreamer javax.sound.sampler provider</flag>
+		<flag name="qt4">Build with Qt4 AWT peers</flag>
+		<flag name="xml">Build with native XML backend</flag>
+	</use>
 </pkgmetadata>
+