Version bump, bug #214603.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 103 insertions, 3 deletions

diff --git a/dev-java/commons-configuration/ChangeLog b/dev-java/commons-configuration/ChangeLog
index 2c62758a5867..54521a3b08ca 100644
--- a/dev-java/commons-configuration/ChangeLog
+++ b/dev-java/commons-configuration/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/commons-configuration
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-configuration/ChangeLog,v 1.3 2008/04/13 08:16:50 dertobi123 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-configuration/ChangeLog,v 1.4 2009/02/14 23:35:00 caster Exp $
+
+*commons-configuration-1.6 (14 Feb 2009)
+
+  14 Feb 2009; Vlastimil Babka <caster@gentoo.org>
+  +files/commons-configuration-1.6-gentoo.patch,
+  +commons-configuration-1.6.ebuild:
+  Version bump, bug #214603.
 
   13 Apr 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   commons-configuration-1.4.ebuild:
diff --git a/dev-java/commons-configuration/Manifest b/dev-java/commons-configuration/Manifest
index b3fd7abbf841..e96d584962f8 100644
--- a/dev-java/commons-configuration/Manifest
+++ b/dev-java/commons-configuration/Manifest
@@ -1,5 +1,8 @@
 AUX commons-configuration-1.4-gentoo.patch 1177 RMD160 e56446ecc4ee3659fe296edd890dc6ba2a30dd01 SHA1 000eddff3424b1cfde322dbb5d109d5747c34be8 SHA256 05a7a92e4f64f54b444b8ef8c134c6f6afedc543214c093e779976dd76910f94
+AUX commons-configuration-1.6-gentoo.patch 979 RMD160 c3f5550b78066390d6f3a3d0a32fffd24e261080 SHA1 149f88b6cb2ab4b2b6817a6ce668c5ae7c4f7caf SHA256 b412760dd9ab98266f3ae3776bad7b2a1975f2abea79ad5767fcb64b704dccd7
 DIST commons-configuration-1.4-src.tar.gz 450503 RMD160 e39cb4baee6d2b7ba2a5e196fcd9bb243d9900a5 SHA1 b0e4685b65b9ae2add44386730932e9a2649070d SHA256 55a058fd5867c1286be0b415ef4d3ff6f13bf2cf13902fbd7eccad1d38d0a974
+DIST commons-configuration-1.6-src.tar.gz 559621 RMD160 948803b4f4139341ac1f6250544c7a55be4550ae SHA1 fc7656d0106a7096de8d41258936c2a8740549d2 SHA256 3874f0c7227874474e538c41f28e2d11584eff3c14323985a1f92da97841cf5b
 EBUILD commons-configuration-1.4.ebuild 1703 RMD160 708d7a1052ad6a84317e73dc4545695b8dc3c863 SHA1 1ff067bf581eff34e608d8c58e648d283a110275 SHA256 fa2a843d2e26da18e74da834aef051c375e6038054aaad79279b6e7c053b2fff
-MISC ChangeLog 725 RMD160 af110c8290744127b48f0466a91b68410d70a75d SHA1 f9ffbb65eefd671cfa07e2b0c4aff483038e6e69 SHA256 2cf2670a8628ac9124253522814593ea9b310d5bb28a8851f489ec1feaf99964
+EBUILD commons-configuration-1.6.ebuild 1865 RMD160 251611b9167077e37f5c89fd154ea3860d5bf311 SHA1 9004ba28c7ecfdc68596212bf1c4ecad5c866b1b SHA256 ccf8f8b8213417cf249b0683637e90b5ee5299f263666981e665858e11e3ef7f
+MISC ChangeLog 930 RMD160 29eb82dff1df80175db1e7a74507e795fdb55eb8 SHA1 4fc08749f5f26d343e5902a9bbe60e57cbb83d57 SHA256 7e925bb055a13871b9c088a843e989db70a8754f545d0edb2037e9c7dc86f893
 MISC metadata.xml 351 RMD160 3d447eb1cd98df48ca70974365493fa67c09f59a SHA1 e050f7dd22e6dd77f8a1142ba2980481ab234691 SHA256 17a87d190d83e2407c6b52330a051391f3f75946cb1abbf413f6757ac19a2482
diff --git a/dev-java/commons-configuration/commons-configuration-1.6.ebuild b/dev-java/commons-configuration/commons-configuration-1.6.ebuild
new file mode 100644
index 000000000000..a773925d5276
--- /dev/null
+++ b/dev-java/commons-configuration/commons-configuration-1.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-configuration/commons-configuration-1.6.ebuild,v 1.1 2009/02/14 23:35:00 caster Exp $
+
+EAPI=1
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Generic interface for reading configuration data from a variety of sources."
+HOMEPAGE="http://commons.apache.org/configuration/"
+SRC_URI="mirror://apache/commons/configuration/source/${P}-src.tar.gz"
+
+# it needs functionality from ant-core, although not providing an ant task
+# the functionality is apparently needed only for 1.4 jdk
+# but I don't feel like adding virtual for this
+COMMON_DEPENDS="
+	>=dev-java/commons-beanutils-1.7.0:1.7
+	>=dev-java/commons-codec-1.3:0
+	>=dev-java/commons-collections-3.1:0
+	>=dev-java/commons-digester-1.8:0
+	>=dev-java/commons-jxpath-1.2:0
+	>=dev-java/commons-lang-2.4:2.1
+	>=dev-java/commons-logging-1.1.1:0
+	dev-java/servletapi:2.4
+	dev-java/ant-core:0"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPENDS}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPENDS}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${P}-src"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Tweak build classpath and don't automatically run tests
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+
+	java-ant_rewrite-classpath
+}
+
+EANT_GENTOO_CLASSPATH="
+	commons-beanutils-1.7
+	commons-codec
+	commons-collections
+	commons-digester
+	commons-jxpath
+	commons-lang-2.1
+	commons-logging
+	servletapi-2.4
+	ant-core"
+
+# Would need mockobjects with j2ee support which we don't have
+# Check overlay for ebuild with test support
+RESTRICT="test"
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+	dodoc RELEASE-NOTES.txt || die
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-configuration/files/commons-configuration-1.6-gentoo.patch b/dev-java/commons-configuration/files/commons-configuration-1.6-gentoo.patch
new file mode 100644
index 000000000000..0cfa8f6511e7
--- /dev/null
+++ b/dev-java/commons-configuration/files/commons-configuration-1.6-gentoo.patch
@@ -0,0 +1,19 @@
+--- build.xml.orig	2006-10-13 00:00:17.000000000 +0200
++++ build.xml	2006-10-13 00:02:37.000000000 +0200
+@@ -97,13 +97,13 @@
+     </copy>

+   </target>

+ 

+-  <target name="jar" description="o Create the jar" depends="compile,test">

++  <target name="jar" description="o Create the jar" depends="compile">

+     <mkdir dir="${classesdir}/META-INF"/>

+     <copy file="LICENSE.txt" todir="${metadir}"/>

+     <copy file="NOTICE.txt" todir="${metadir}"/>

+-    <copy file="${conf.home}/manifest.mf" todir="${defaulttargetdir}" filtering="on"/>

++    <copy file="${conf.home}/MANIFEST.MF" todir="${defaulttargetdir}" filtering="on"/>

+     <jar jarfile="${defaulttargetdir}/${final.name}.jar" basedir="${classesdir}"

+-       manifest="${defaulttargetdir}/manifest.mf" excludes="**/package.html">

++       manifest="${defaulttargetdir}/MANIFEST.MF" excludes="**/package.html">

+     </jar>

+   </target>

+   <target name="clean" description="o Clean up the generated directories">