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

Package-Manager: portage-2.1.4.1

3 files changed, 66 insertions, 3 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/Manifest b/dev-java/commons-beanutils/Manifest
index 85a0287f4c47..8af48760cdb3 100644
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST commons-beanutils-1.6.1-src.tar.gz 148249 RMD160 ef18dd9abc81cdbe790318bfdaac6026d9a2570d SHA1 0545881bee6ee60248a3bbd2e2fdb87b88674751 SHA256 e35572613bd7141bcb64725e9f7c3f527ba5f11d4d12d5daff808f886e472bdd
 DIST commons-beanutils-1.7.0-src.tar.gz 258835 RMD160 1a9058a79cf6dfc8e5d384af2a5cdec3dcf3184b SHA1 3c1eceae87320fe7e0eec8573fd19b8ff283d1c5 SHA256 ffe3ff9208c3eb8a9c393ee244445fc1e70bb42213bee97dc86e71704fa40076
 EBUILD commons-beanutils-1.6.1-r3.ebuild 1157 RMD160 7184d43b63910f81f248474fd2b19469f7f9db52 SHA1 489bf187ece1bb54c9c16a0c35f02205aceaef2e SHA256 7d53ad92d304b4798d7d0bfefb1ce2d61f7f8f37ed11219c249c329f36cb4070
 EBUILD commons-beanutils-1.7.0-r2.ebuild 1283 RMD160 d0e57bebba4f7520eceeb62226bb20a20dcfc2e7 SHA1 d9737c7a11372c1610aaff7bef7358e16bf550a7 SHA256 e64139f9f8f358e9aba609951b91badad4d0357f0df9631d7d0f7193c0d86da8
-MISC ChangeLog 5927 RMD160 ee1a3dc12ef0a7602a68382074913e6bea0d2850 SHA1 6bda755d660f71cdbae05d1cdcb04894cae05af7 SHA256 0d5b976d1247c1165c40a9012543dff2b380b7d022f403be254648c8dcb91e8e
+EBUILD commons-beanutils-1.7.0-r3.ebuild 1208 RMD160 7f9f56b036c28a45e725d476f2f1450ae1ac74cc SHA1 899de49bac8de19e7b9afa8da29e708d473acd4e SHA256 ef73512dbebb1db31a3905d1b0d497d29b3faaec6e473088acd75a954858956f
+MISC ChangeLog 6172 RMD160 688d1ba4359df5ceee75f62699dd38e8fce33671 SHA1 8e0347772dbc15f122a46ef3a891ff0ce9b73425 SHA256 7eb4b76100ed162ba1e0bdbca585de78a1c3c20119c369df4eb37eeffc99efe0
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHszHicxLzpIGCsLQRArA7AJ9f06dLgn3JzfHRiEh5Czr8xP0aEQCcCv3P
+S9p9iaZCjUggUid0tUWkN9I=
+=9Hse
+-----END PGP SIGNATURE-----
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/*
+}