[gentoo-commits] proj/java:master commit in: dev-java/gnu-classpath/

["Andrew John Hughes" <gnu_andrew@member.fsf.org>]

commit:     fb4ade924f91765a291b372cde59273ccd8f3aad
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Tue Jun 23 03:54:28 2015 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Tue Jun 23 03:54:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=fb4ade92

Sync GNU Classpath 0.99 ebuild changes to live ebuild.

Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222

 dev-java/gnu-classpath/ChangeLog                 |  4 ++++
 dev-java/gnu-classpath/Manifest                  | 10 +++++-----
 dev-java/gnu-classpath/gnu-classpath-9999.ebuild | 15 ++++++---------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index 26b7da7..d1dd318 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.109 2010/04/29 19:50:01 caster Exp $
 
   23 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  gnu-classpath-9999.ebuild:
+  Sync GNU Classpath 0.99 ebuild changes to live ebuild.
+
+  23 Jun 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
   gnu-classpath-0.99-r1.ebuild, gnu-classpath-9999.ebuild:
   Fix slotting of dependencies and remove dead dependency
   <x11-proto/xextproto-7.1.

diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index cf514e2..7199940 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -6,13 +6,13 @@ AUX gjdoc_support.patch 384 SHA256 556d8372fefd8dcec1ab0cf497fa29f106341dbf94d55
 AUX pr55182.patch 3343 SHA256 b36a90086ba70402848339f9d0cdaa9c173d45b8bf9abae39e33ad8bede3b718 SHA512 b38a1e8618afea1243f604acc479a13a4d8abe5c3c6bdab651480fddcabbcaa3a5684a8e66a4f7c7b1d1bafb2637bd1b7a6675d2c17842970c8642b0167188ed WHIRLPOOL 96c98aa4c01740bb10593157206d1e3126a6cb02efd2a61e7639bc266b53791ba30e442f27e277130881df381347f6626ad522a8e504ad2aa3e56a746f52f436
 DIST classpath-0.99.tar.gz 11078232 SHA256 f929297f8ae9b613a1a167e231566861893260651d913ad9b6c11933895fecc8 SHA512 d8f38677ecc6a0f4b26197ab16e9888c51043364141675ad69684828e2d0ecb93122249672e2e7997aea817cc4aac68c17ccf59bf8913afe81e9536bee6b73ac WHIRLPOOL 259d0ac0649472ac58fe79ef2886407f2e455da39d43f425c1380f885ba755bd627a4138c051da8f70e3bb50a3c97abd0be3a01731869d2ff90c5b0fd5aca0af
 EBUILD gnu-classpath-0.99-r1.ebuild 3704 SHA256 98ec0f4f4f317b799daf317dfcb622ecde7ae820c15c98d5852d8a3126ff4ecb SHA512 45f8dfdfc55be59f7ff446faf1e92e01017be0e972e937227f0f1fad5ab90c48214a3ceefa578d3cd751c1b76aacf6a657154da85c70d463b2a7f55614c3d836 WHIRLPOOL 959e7584c01904bcc944df27021c038a129c32e762a69ede5a9a8ceeb3d74535f4533caf4606f49aa48ec2711d8953a7399b5c096d955c76f0948ea0ef2a8d7f
-EBUILD gnu-classpath-9999.ebuild 3562 SHA256 ef96261b34bc95c66a02566856a51d5ae60883910c60167f29e69c224cf247e6 SHA512 73e64794663c4970979ce2da458888059adb3b9ba8f4bd799f9041be37f340bb33aff8af8f6528960f9b6a5e0d680a4a9787629d0a62053b81dc9f79096bc49e WHIRLPOOL e8cd31eb92c01a87891cbfaad9ce71313e69611dc52c1a48befabaf688e6de37928bbb3a007e24ff4283ddc3cc897a5bee23b65ada28b924a45608c94cfff32b
-MISC ChangeLog 18762 SHA256 0fc648fc9d21c98d06ab2426ddd78c277c3ac70fab795286c3575dfe38572a04 SHA512 f6b8cc3c757857834e27a267e3f5368f8a7b166b9d5b709ea5b24d824e73a525c508a2c6af3a318af97e3b28dcd59c9f9012aa57d41837f92fae979b3b3cfc32 WHIRLPOOL b520e2bff170af8e71f09e3c1e3f0afee0a853ac5bcad9fcbb744c983c06216bcd0498c13ae3d9143e7ec051f67526e5a86dcb35aef4719f8d7a873b59cb68e8
+EBUILD gnu-classpath-9999.ebuild 3440 SHA256 b9d808a3d68606fd43da5f79331d67a644d6c818af07d5ff5f1431819a518841 SHA512 1bf0d24e8e1b9c8071a5ec9d00ed2127e1f8f86d11846cbd77f4fe97d2accd28871aa7aec2ad305f8f5c115db0284094c6c8b63c8131e5a993a7b5bdca3d7891 WHIRLPOOL 07dc4dfa6def952ca086dacf531c8b093f1b2eec35d5d2eb098cbcb73328efb0adc85a9ce8121ff019323b76b3d1e8e04aa8f1f33ad93497d809521c9129a7d6
+MISC ChangeLog 18911 SHA256 fb5741fdee383954e8ef04a667a0cd00137adfe0857fab7b72f1180f13eca5e3 SHA512 6be3303ac449b46baac1353914eac27f9f55a7e7740f7078fa0efeb19652cfa206fac86f51a54b65f5ab7c23087c9162f339b9ca00e2795690b59818b46b4788 WHIRLPOOL f2211433fd6908baab853ebea335755dad40ca56e09db03621318d3baa149c43f56aaa5389f76bf0c904dc242f11a9c2ee1106f112778026a2e71d6bb8846596
 MISC metadata.xml 759 SHA256 24e294a08d57473d495a67acdcc44c0f32747187531feeb72dfa678731cd51d2 SHA512 6539bdca43514371ed19072b06cb70fc097a8178f4066e832037836b3d5c4b778d23365b52dd53534503fcef8a4a9680d98f898c43382e6050d766ad958d2d16 WHIRLPOOL 59e6761a2c2c354cf81bc9d93a356f028402a0273e52b449e8df06d371c20518051c0c0c4a3c9b6ad7586ddaec0ab510d47e5b714d69126b59fb256c8b05d67d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EARYIAAYFAlWI19YACgkQz9oPmzWWQiI5zwEAnY1H0P4qFL/EWpyxyqoMsHMc
-a233pKjFi+Gbc5AyN9IA/1tuvd4PFFDrWKBncYFyO8ZuNx6W2lB00z6vvG4ZUM8P
-=hKrJ
+iF4EARYIAAYFAlWI2HQACgkQz9oPmzWWQiIoQgEA8rHC1YG1vTbzH05e1rIM5MQm
+mJ4sbROAdptYoTBUD0IBAPCVAR0PWo0BFt1qRpGIwVAWnuTi55PZddDKlPci7zwA
+=2Xo4
 -----END PGP SIGNATURE-----

diff --git a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
index d70e356..325125e 100644
--- a/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-9999.ebuild
@@ -12,10 +12,10 @@ EGIT_REPO_URI="git://git.savannah.gnu.org/classpath.git"
 HOMEPAGE="http://www.gnu.org/software/classpath"
 
 LICENSE="GPL-2-with-linking-exception"
-SLOT="0.99"
+SLOT="0"
 KEYWORDS=""
 
-IUSE="alsa debug doc dssi examples gconf gjdoc gmp gtk gstreamer qt4 xml"
+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 >=dev-java/gnu-classpath-0.98:* ) )
@@ -83,8 +83,6 @@ src_configure() {
 	# 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)
@@ -98,7 +96,7 @@ src_configure() {
 		ecj_pkg="ecj-gcj"
 	fi
 
-	ANTLR= ./configure \
+	ANTLR= econf \
 		$(use_enable alsa) \
 		$(use_enable debug ) \
 		$(use_enable examples) \
@@ -114,15 +112,14 @@ src_configure() {
 		--enable-jni \
 		--disable-dependency-tracking \
 		--disable-plugin \
-		--host=${CHOST} \
-		--prefix="${EPREFIX}"/usr/${PN}-${SLOT} \
+		--includedir="${EPREFIX}"/usr/include/classpath \
 		--with-ecj-jar=$(java-pkg_getjar --build-only ${ecj_pkg}-* ecj.jar) \
-		--disable-Werror \
 		${myconf}
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS BUGS ChangeLog* HACKING NEWS README THANKYOU TODO
-	java-pkg_regjar /usr/${PN}-${SLOT}/share/classpath/glibj.zip
+	java-pkg_regjar /usr/share/classpath/glibj.zip
+	java-pkg_regjar /usr/share/classpath/tools.zip
 }