Don't use bundled commons-collections classes. Compile to 1.4 bytecode instead of 1.3. Fixes bug #205999.

(Portage version: 2.1.4.1)

2 files changed, 54 insertions, 2 deletions

diff --git a/dev-java/commons-beanutils/ChangeLog b/dev-java/commons-beanutils/ChangeLog
index 314b02178a17..e15218288394 100644
--- a/dev-java/commons-beanutils/ChangeLog
+++ b/dev-java/commons-beanutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-beanutils
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.38 2007/05/17 21:36:46 betelgeuse Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/ChangeLog,v 1.39 2008/02/13 18:07:26 betelgeuse Exp $
+
+*commons-beanutils-1.7.0-r3 (13 Feb 2008)
+
+  13 Feb 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +commons-beanutils-1.7.0-r3.ebuild:
+  Don't use bundled commons-collections classes. Compile to 1.4 bytecode
+  instead of 1.3. Fixes bug #205999.
 
   17 May 2007; Petteri Räty <betelgeuse@gentoo.org>
   commons-beanutils-1.7.0-r2.ebuild:
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.7.0-r3.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r3.ebuild
new file mode 100644
index 000000000000..14768e97177c
--- /dev/null
+++ b/dev-java/commons-beanutils/commons-beanutils-1.7.0-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-beanutils/commons-beanutils-1.7.0-r3.ebuild,v 1.1 2008/02/13 18:07:26 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Provides easy-to-use wrappers around Reflection and Introspection APIs"
+HOMEPAGE="http://jakarta.apache.org/commons/beanutils/"
+SRC_URI="mirror://apache/jakarta/commons/beanutils/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.7"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="
+	>=dev-java/commons-collections-2.1
+	>=dev-java/commons-logging-1.0.2"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${P}-src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -vr src/java/org/apache/commons/collections/ || die
+	java-ant_rewrite-classpath
+}
+
+EANT_GENTOO_CLASSPATH="commons-logging,commons-collections"
+
+src_install() {
+	java-pkg_dojar dist/${PN}*.jar
+
+	dodoc RELEASE-NOTES.txt || die
+	dohtml STATUS.html PROPOSAL.html || die
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}