Don't leak jre into DEPND, may confuse vm switching code. #432904

EAPI bump, use slot deps and java_prepare.

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

3 files changed, 86 insertions, 3 deletions

diff --git a/dev-java/xml-xmlbeans/ChangeLog b/dev-java/xml-xmlbeans/ChangeLog
index 1bec04621cd9..160a42392568 100644
--- a/dev-java/xml-xmlbeans/ChangeLog
+++ b/dev-java/xml-xmlbeans/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/xml-xmlbeans
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/ChangeLog,v 1.31 2012/04/15 18:13:45 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/ChangeLog,v 1.32 2013/01/13 17:28:27 sera Exp $
+
+*xml-xmlbeans-1.0.4_pre20041217-r1 (13 Jan 2013)
+
+  13 Jan 2013; Ralph Sennhauser <sera@gentoo.org>
+  +xml-xmlbeans-1.0.4_pre20041217-r1.ebuild:
+  Don't leak jre into DEPND, may confuse vm switching code. #432904
+  EAPI bump, use slot deps and java_prepare.
 
   15 Apr 2012; Mike Frysinger <vapier@gentoo.org>
   xml-xmlbeans-1.0.4_pre20041217.ebuild:
diff --git a/dev-java/xml-xmlbeans/Manifest b/dev-java/xml-xmlbeans/Manifest
index 412c0d380c27..4ee6f480790b 100644
--- a/dev-java/xml-xmlbeans/Manifest
+++ b/dev-java/xml-xmlbeans/Manifest
@@ -1,5 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX xml-xmlbeans-gentoo.patch 7484 SHA256 228a300b69307f4cba5281e5730ac3460cfc7697ba54e8b918c734b68f1258ef SHA512 086676e3802ba5e6c070dcedcbdc76557e8b2db19ae34450f8b16410b35bb1d29d2cd20a82695b09bd872b6224a460a95fa2efc20e751846bc2e2fd55486a8df WHIRLPOOL 405fedab7c17cc70e40119a3fa1589cb487629c5d1b546d96446d66e1503bd000a6b49f03121366c9f323c9886cec8355705c0b2588685a604c16e932eb1d2dc
 DIST xml-xmlbeans-20041217.tar.bz2 2436239 SHA256 c2a53c653c9f49e172e2c364fc8e111ad3d258f906bbd6b8c65ca0b3f0c57a68 SHA512 93f662a10a12948bace265a34a23e851c1210da8d8af5e699d0f51eb6d1959220eaee8f9072d1a33330217aec08321eac7bf91d8aaa160f56b751b0ab4408619 WHIRLPOOL 0fd5c098d5b1c2ca49d00b639f0a49c87f62f6c74bce1bdf4bcdfe3b77a833dbc9bd7ad99fc40ab2bfb5561ebfb253d0c74a13a03803ad8cfba9f2063e0016bb
+EBUILD xml-xmlbeans-1.0.4_pre20041217-r1.ebuild 1489 SHA256 9876a98360aa12db89412d5880dbc1d667cb6a878a2f80d95aecaf7b71b4c7f3 SHA512 7d6c87fb78ff9e65ad848b8016ca3f85d241af05d3f3322402031449155e16cad7ac84bd86556d2b2c95601e7ef0dd624486daba85aacf56786ed7dd1e856e30 WHIRLPOOL c03bae916e6c25363d8bbd8249ace5e01b3c4467b51dcb498af8b35c6b451e4cd766d11ff6fd99df801eaadb4e18de9700212b8d8cb7c077f635a276faa9a332
 EBUILD xml-xmlbeans-1.0.4_pre20041217.ebuild 1465 SHA256 563f453d7ba14c58aaa854d9e6d78d5b1b472bf7c98736115daaa7a40b166b28 SHA512 1f5d01414620fb38592d4178d9df253815c4ee395e9e91eb5bd5a0f92d77a6629eb94fc17bf28a4b5f18364db469019d39612c2fd995fda8110406fd79b1df07 WHIRLPOOL 4abb550ae3a6efb697f10bb0749c092e1e1321bd25afb4dba37219825f222c360c1b070091d5b7ffb820fbfd0cd2592b735319cf70c56262640a92cbadf9e015
-MISC ChangeLog 4201 SHA256 ada6bacb23e3a07d4dccb6e9a39b664c7e59bd398b17ffe97fadc395dc8dfaeb SHA512 ef5e6949f958dfb47061ce057afe34794a823119786560f5453c7f4714855752275e3ac7ae824382a2104975eab30c022c05df32945eeaf0972a5da22312e461 WHIRLPOOL eb3545b62cc7d701461fcab341bb52d786f5b95ae2bc9db29a1e2d8418e147fae8d36c9a5e8e95978fdfbb681508703a6a18b7fb9fd8b1eef76e534a67c34d95
+MISC ChangeLog 4458 SHA256 5e5289116f8f18ccc816773dc9ec45fc5a1644ed2cfd3797e7a9657d44f1c30b SHA512 2f5f7819d8935ce7ae5f2befb289efb721a2d7ecdae7e47b3dd1a85ed780bc96cf805b69b6e8cd0d107f9bef182fbc3caa5d8b6a583fd230cc016b378c5b00ee WHIRLPOOL ecac6f2e55c38a0f1caf26ca348270bd819672b63f3f438ba7184c624d0f331f1e77a6f79ccbbe11ca38e97d4b66d9f247fab847172aedc4bc5f215974411e49
 MISC metadata.xml 1111 SHA256 767522bfb4c752e9c8a6bd07bcf61429d5340554933cfd39634536d300c4ec7e SHA512 9b9205f9a53fd6c6ea9340346344a9abe5772eb5e8906f1057d9901a667337a9391f9a216c60a43660255d780944fcad5dec6bc6bffe4b771473b357431019c8 WHIRLPOOL 740682bff0b742d1f8ceab3d695413f2de91a59f1e39159e5f0d1cfbe403de93c2f2dc8feca772a15af590ac286d5f185046624284e83ab1d46f202b82e8ab20
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ8u+CAAoJELjwI6Q8XPdaBWoIALySDuDm90a1831Q42wb9bxD
+QSu7RxpSprC4pjNutj9SeE+/WdfaDSVT+74cRds6Yh30KOFDEoj4dEvAMqrkWwHt
+7Ilo589ofoTe1AhUjeVvTGxWVL8LRBq+R6AFQ/IG9lYgJ90hzJehPrnzOzcGqOBK
+mjRdrN1XQ/JhrI0aUAMyZn8eUuka2OzwUsTpY5Rrbx+eQ5rX83+ODPa02boVOTkg
+FYUiqhZfuB4PRHGNOKYeCb/Fxd3NRYtYYQD4UyaIBjdPO4Web/WV6iG5opuZWf+/
+qKgJ63BJN12XwoNLHX3Hs9d07EvbqzIr/tGIza4fUFO3vjJjljSja0eNeIU/gkA=
+=inf8
+-----END PGP SIGNATURE-----
diff --git a/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild
new file mode 100644
index 000000000000..f28ee16e9747
--- /dev/null
+++ b/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-xmlbeans/xml-xmlbeans-1.0.4_pre20041217-r1.ebuild,v 1.1 2013/01/13 17:28:27 sera Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="${PN}-20041217"
+
+DESCRIPTION="An XML-Java binding tool"
+HOMEPAGE="http://xmlbeans.apache.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-java/jaxen:1.1
+	dev-java/ant-core:0"
+RDEPEND="${COMMON_DEPEND}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/jdk-1.4"
+
+S="${WORKDIR}/${MY_P}/v1"
+
+java_prepare() {
+	epatch "${FILESDIR}/xml-xmlbeans-gentoo.patch"
+	java-ant_rewrite-classpath build.xml
+
+	cd "${S}"/external/lib
+	#TODO: includes and old copy named oldxbean.jar
+	#that probably should not be used
+	#rm -v *.jar
+
+	java-pkg_jar-from jaxen-1.1 jaxen.jar jaxen-1.1-beta-2.jar
+	java-pkg_filter-compiler jikes
+}
+
+src_compile() {
+	eant xbean.jar $(use_doc docs) \
+		-Dgentoo.classpath=$(java-pkg_getjars ant-core)
+}
+
+# Tests always seem to fail #100895
+
+src_install() {
+	java-pkg_dojar build/lib/xbean*.jar
+
+	dodoc CHANGES.txt NOTICE.txt README.txt
+	if use doc; then
+		java-pkg_dojavadoc build/docs/reference
+		java-pkg_dohtml -r docs
+	fi
+	use source && java-pkg_dosrc src/*
+}