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

EAPI bump, use slot deps and java_prepare.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 3C5CF75A)

2 files changed, 70 insertions, 2 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/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/*
+}