Update not to rely on commons-collections classes being bundled in commons-beanutils and cleanup ebuild. Reported in bug #216265.

Package-Manager: portage-2.1.4.4

3 files changed, 67 insertions, 5 deletions

diff --git a/dev-java/commons-betwixt/ChangeLog b/dev-java/commons-betwixt/ChangeLog
index 983d05837510..06b0ee01b8f5 100644
--- a/dev-java/commons-betwixt/ChangeLog
+++ b/dev-java/commons-betwixt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-betwixt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.16 2008/04/06 16:06:27 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.17 2008/04/06 16:22:53 betelgeuse Exp $
+
+*commons-betwixt-0.7-r2 (06 Apr 2008)
+
+  06 Apr 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +commons-betwixt-0.7-r2.ebuild:
+  Update not to rely on commons-collections classes being bundled in
+  commons-beanutils and cleanup ebuild. Reported in bug #216265.
 
   06 Apr 2008; Petteri Räty <betelgeuse@gentoo.org>
   -commons-betwixt-0.6-r2.ebuild:
diff --git a/dev-java/commons-betwixt/Manifest b/dev-java/commons-betwixt/Manifest
index 6246e65ac3fa..ecd5477b5d11 100644
--- a/dev-java/commons-betwixt/Manifest
+++ b/dev-java/commons-betwixt/Manifest
@@ -5,12 +5,13 @@ AUX commons-betwixt-0.6-noget.patch 980 RMD160 4949187d6428dfc3798c8638cb709c8be
 AUX commons-betwixt-0.7-notests.patch 1171 RMD160 16aaa9d2789e38196f4f2390712a205bd46229bb SHA1 f6f3f4c1950a08e848ec7f33903d322398bfdf34 SHA256 9531b8d4d3b0a6df887bbb661899236c3d6d0411459799c7f6838052cb8b0ac9
 DIST commons-betwixt-0.7-src.tar.gz 278140 RMD160 f101052ed9851ab5284751ed76d8f2cc7f929185 SHA1 8d6fa530cf7cea97d55c197d68fc01e9f1ad0456 SHA256 6b1adcfb0f573fe29b2440e87733ef176c07c0193f3f69587481772b3af148e4
 EBUILD commons-betwixt-0.7-r1.ebuild 1514 RMD160 48360128f0df61fc371bc60c21b3ae6efea5d609 SHA1 0afc6d709924cb61739c3eefc66c1dfd15cebb6d SHA256 40a4016c034fad6ec4a121f88533735e59982cef520b14f7457c345f26698bca
-MISC ChangeLog 2631 RMD160 6261f17882cadfcc7429ebc571fe544eedbeb4b5 SHA1 7548fd985189faf8e9c06f4a49de9b820d4f842a SHA256 3326eb2a4a77c16c32588ee57ce603e79ce632ee187ab0a08c24e4fc177b9182
+EBUILD commons-betwixt-0.7-r2.ebuild 1439 RMD160 7ff81058f0ed9ce4dc3290184298050dd72fdd36 SHA1 c56b2780d236660063e702c145161e7f51006442 SHA256 4a13b1c5507f6be4e78225049ccb296bc6f9dd8b1d543be0801514899291d9f0
+MISC ChangeLog 2892 RMD160 bbd24a45cf3f0140b5ddb472c50aa951fa8bd2c7 SHA1 9b4ead84a1ea59dfbbc32a079366322c897f50fb SHA256 47c72158cb0a6f1966fd08cb41af23b12ea9347ae60d93c76f21aeab84da5e8f
 MISC metadata.xml 737 RMD160 b7634227bcc834bf0098f6d452e27d8e892bbdb1 SHA1 7c110757602c2388ed24c18cb469801a93c0143f SHA256 bfa7bd01e5bd7fabad8dbbef4ad43ec8c9afe870ddaa0f1ebc4c325800046d7b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH+PUHcxLzpIGCsLQRAnMCAJ9XsGO8BiOBEpQm3YjSbtUFi+iNTACfY+Rf
-qW4w5aAkZRKtSARuJUUixSo=
-=WNA2
+iD8DBQFH+PjicxLzpIGCsLQRAiZBAJsFXxSqCU5zwljhnoYwkloMn0ehMgCfTWaB
+TA8nhupMo2hNuXOeg3VC9lw=
+=CDLV
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.7-r2.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.7-r2.ebuild
new file mode 100644
index 000000000000..8977b659235a
--- /dev/null
+++ b/dev-java/commons-betwixt/commons-betwixt-0.7-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.7-r2.ebuild,v 1.1 2008/04/06 16:22:53 betelgeuse Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc test source"
+
+inherit base java-pkg-2 eutils java-ant-2
+
+DESCRIPTION="Introspective Bean to XML mapper"
+HOMEPAGE="http://commons.apache.org/betwixt/"
+SRC_URI="http://archive.apache.org/dist/${PN/-///}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0.7"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/commons-collections:0
+	>=dev-java/commons-logging-1.0.2
+	dev-java/commons-beanutils:1.7
+	>=dev-java/commons-digester-1.6"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEP}
+	test? (
+		dev-java/ant-junit
+		>=dev-java/xerces-2.7
+	)"
+
+S="${WORKDIR}/${P}-src/"
+
+PATCHES=( "${FILESDIR}/${P}-notests.patch" )
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections,commons-digester,commons-logging"
+EANT_BUILD_TARGET="init jar"
+
+src_test() {
+	java-pkg_jar-from --into target/lib xerces-2,junit
+	ANT_TASKS="ant-junit" eant test -DJunit.present=true
+}
+
+src_install() {
+	java-pkg_newjar target/${PN}*.jar ${PN}.jar
+
+	dodoc RELEASE-NOTES.txt README.txt || die
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
+