Version bump.

Package-Manager: portage-2.0.53_rc7

6 files changed, 113 insertions, 20 deletions

diff --git a/dev-java/commons-betwixt/ChangeLog b/dev-java/commons-betwixt/ChangeLog
index 0ad9e6888515..2a66caf98b42 100644
--- a/dev-java/commons-betwixt/ChangeLog
+++ b/dev-java/commons-betwixt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/commons-betwixt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.4 2005/06/12 19:24:39 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.5 2005/12/15 05:20:14 nichoj Exp $
+
+*commons-betwixt-0.7 (15 Dec 2005)
+
+  15 Dec 2005; Joshua Nichols <nichoj@gentoo.org>
+  +files/commons-betwixt-0.7-notests.patch, +commons-betwixt-0.7.ebuild:
+  Version bump.
 
   12 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
   commons-betwixt-0.6-r1.ebuild:
diff --git a/dev-java/commons-betwixt/Manifest b/dev-java/commons-betwixt/Manifest
index bb0f4ad4c14d..c52461b16ece 100644
--- a/dev-java/commons-betwixt/Manifest
+++ b/dev-java/commons-betwixt/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 5bc6b5f9cb9975bd3e1f667280e051ac ChangeLog 1154
 MD5 42497afa88c2cf81d6402ee3451bf7fc commons-betwixt-0.6-r1.ebuild 1462
-MD5 8cb658f6607db38744a63b8b626f96dd ChangeLog 981
-MD5 1eb638c237e8835b9fe6b49a60e42d9d metadata.xml 739
-MD5 c4db26920b75dccce46c479139741605 files/digest-commons-betwixt-0.6-r1 75
+MD5 99bc76040f49977d74d5afc8786d4bdf commons-betwixt-0.7.ebuild 1815
 MD5 3b892742ca91101232da276492fa254c files/commons-betwixt-0.6-noget.patch 980
+MD5 09366969e8959783230e9edd31dba372 files/commons-betwixt-0.7-notests.patch 1171
+MD5 c4db26920b75dccce46c479139741605 files/digest-commons-betwixt-0.6-r1 75
+MD5 0f3f6cf2fc69aa991b4f06a5c63bc0c4 files/digest-commons-betwixt-0.7 75
+MD5 1eb638c237e8835b9fe6b49a60e42d9d metadata.xml 739
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC05L8/rLF9B432nYRAnfqAJ9ZIBTg+RE5B+SfQNz0cUW55948kQCePj1y
-SuAQ9jTDFi7Dp63gR/pVhHw=
-=vneM
+iD8DBQFDoP0ondWRXhKOboURAk+dAJ9fzWeoqRwadV2/NlzLDzEDw7PEwACg6ZjA
+cOL9DRwkWOq4FYH25GKsULM=
+=EgBX
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.7.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.7.ebuild
new file mode 100644
index 000000000000..184fee6e11f0
--- /dev/null
+++ b/dev-java/commons-betwixt/commons-betwixt-0.7.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/12/15 05:20:14 nichoj Exp $
+
+inherit java-pkg eutils
+
+DESCRIPTION="Introspective Bean to XML mapper"
+HOMEPAGE="http://jakarta.apache.org/commons/betwixt/"
+SRC_URI="mirror://apache/jakarta/commons/betwixt/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0.7"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE="doc jikes test source"
+
+RDEPEND=">=virtual/jre-1.3
+	>=dev-java/commons-logging-1.0.2
+	=dev-java/commons-beanutils-1.7*
+	>=dev-java/commons-digester-1.6"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	dev-java/ant-core
+	jikes? ( >=dev-java/jikes-1.21 )
+	test? ( dev-java/ant-tasks >=dev-java/xerces-2.6 )
+	source? ( app-arch/zip )"
+
+S="${WORKDIR}/${P}-src/"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-notests.patch
+
+	cd ${S}
+	mkdir -p ${S}/target/lib && cd ${S}/target/lib
+	java-pkg_jar-from commons-beanutils-1.7
+	java-pkg_jar-from commons-digester
+	java-pkg_jar-from commons-logging
+	use test && java-pkg_jar-from xerces-2
+}
+
+src_compile() {
+	local antflags="init jar -Dnoget=true -Dnotest=true"
+	use doc && antflags="${antflags} javadoc"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	ant ${antflags} || die "compile failed"
+}
+
+src_install() {
+	java-pkg_newjar target/${PN}*.jar ${PN}.jar
+
+	dodoc RELEASE-NOTES.txt README.txt
+	if use doc; then
+		java-pkg_dohtml PROPOSAL.html STATUS.html userguide.html
+		java-pkg_dohtml -r dist/docs/
+	fi
+	use source && java-pkg_dosrc src/java/*
+}
+
+src_test() {
+	if ! use test; then
+		ewarn "You must USE=test in order to get the dependencies needed"
+		ewarn "to run tests"
+		ewarn "Skipping the tests"
+	else
+		ant test -Dnoget=true || die "tests failed"
+	fi
+}
diff --git a/dev-java/commons-betwixt/files/commons-betwixt-0.7-notests.patch b/dev-java/commons-betwixt/files/commons-betwixt-0.7-notests.patch
new file mode 100644
index 000000000000..b0581b23f40a
--- /dev/null
+++ b/dev-java/commons-betwixt/files/commons-betwixt-0.7-notests.patch
@@ -0,0 +1,25 @@
+diff -ru commons-betwixt-0.7-src/build.xml commons-betwixt-0.7-src-patched/build.xml
+--- commons-betwixt-0.7-src/build.xml	2005-07-25 17:24:03.000000000 -0400
++++ commons-betwixt-0.7-src-patched/build.xml	2005-12-14 23:53:30.000000000 -0500
+@@ -86,11 +86,11 @@
+       </fileset>
+     </copy>
+   </target>
+-  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test">
++  <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test" unless="notest">
+     <fail message="There were test failures.">
+     </fail>
+   </target>
+-  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
++  <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests" unless="notest">
+     <mkdir dir="${testreportdir}">
+     </mkdir>
+     <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
+@@ -185,4 +185,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+     </unjar>
+   </target>
+-</project>
+\ No newline at end of file
++</project>
+Only in commons-betwixt-0.7-src-patched: target
diff --git a/dev-java/commons-betwixt/files/digest-commons-betwixt-0.7 b/dev-java/commons-betwixt/files/digest-commons-betwixt-0.7
new file mode 100644
index 000000000000..c634f7d48822
--- /dev/null
+++ b/dev-java/commons-betwixt/files/digest-commons-betwixt-0.7
@@ -0,0 +1 @@
+MD5 fcaa0e85a10f395128093095e778a3f2 commons-betwixt-0.7-src.tar.gz 278140
diff --git a/dev-java/commons-httpclient/Manifest b/dev-java/commons-httpclient/Manifest
index 472d0dd2b7d9..2d2b4f3d6d68 100644
--- a/dev-java/commons-httpclient/Manifest
+++ b/dev-java/commons-httpclient/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 17bd33c3929f345e09f6b4a7742346b3 ChangeLog 3830
+MD5 e9342b6457bde8d62a1568eceb6907d4 ChangeLog 3962
 MD5 85a7cd05a7569930a02041ec5cda33ee commons-httpclient-2.0.1.ebuild 1692
 MD5 f4ff23536c978a54310fd4476af75770 commons-httpclient-2.0.2.ebuild 1703
-MD5 04223725dbac85a210eaddf314674afe commons-httpclient-3.0_rc4.ebuild 1442
+MD5 e89e5f7c086f9dc41c0292f549ea2590 commons-httpclient-3.0_rc4.ebuild 1414
 MD5 22c430c6bf50bc578f8095df5fd64cc4 files/digest-commons-httpclient-2.0.1 81
 MD5 63acee983ed2a9669cd20bc47743b8d3 files/digest-commons-httpclient-2.0.2 81
 MD5 d2322c9e0f16e39e0c351e74433faf6f files/digest-commons-httpclient-3.0_rc4 83
 MD5 35bcb566781a909ae25bac9979bf497c files/gentoo.diff 444
 MD5 20316ee59dc3bf35dd5c04778ae6882f files/jikes.diff 955
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDmB4eQiJ/wx066S4RAmumAJ0ftuLzazs23uIoPCh/VCrbJzapTgCeP2zq
-3Eg71XDeF71DI3XuG8owVrY=
-=9zWp
------END PGP SIGNATURE-----