Version bump.

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

6 files changed, 66 insertions, 219 deletions

diff --git a/dev-java/commons-fileupload/ChangeLog b/dev-java/commons-fileupload/ChangeLog
index 7212ca960d31..7628ede29396 100644
--- a/dev-java/commons-fileupload/ChangeLog
+++ b/dev-java/commons-fileupload/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/commons-fileupload
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.61 2012/06/07 21:23:09 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.62 2012/07/11 22:31:56 caster Exp $
+
+*commons-fileupload-1.2.2 (11 Jul 2012)
+
+  11 Jul 2012; Vlastimil Babka <caster@gentoo.org>
+  -files/commons-fileupload-1.1.1-gentoo.patch,
+  -commons-fileupload-1.2-r1.ebuild, -commons-fileupload-1.2.1.ebuild,
+  +commons-fileupload-1.2.2.ebuild, -files/commons-fileupload-1.2-gentoo.patch:
+  Version bump.
 
   07 Jun 2012; Brent Baude <ranger@gentoo.org>
   commons-fileupload-1.2.1-r1.ebuild:
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.2-r1.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.2-r1.ebuild
deleted file mode 100644
index 7a8a7ab803b4..000000000000
--- a/dev-java/commons-fileupload/commons-fileupload-1.2-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.2-r1.ebuild,v 1.7 2011/12/19 12:44:30 sera Exp $
-
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java library for adding robust, high-performance, file upload capability to your servlets and web applications."
-HOMEPAGE="http://commons.apache.org/fileupload/"
-SRC_URI="mirror://apache/jakarta/commons/fileupload/source/${P}-src.tar.gz"
-COMMON_DEPEND=">=dev-java/commons-io-1.3
-	=dev-java/portletapi-1*
-	~java-virtuals/servlet-api-2.3"
-DEPEND=">=virtual/jdk-1.4
-	test? (
-		dev-java/ant-junit
-		=dev-java/junit-3.8*
-	)
-	${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-LICENSE="Apache-2.0"
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Tweak build classpath and don't automatically run tests
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	local libdir="${S}/target/lib"
-	mkdir -p ${libdir}/commons-io/jars -p  ${libdir}/javax.servlet/jars -p  ${libdir}/javax.portlet/jars
-	java-pkg_jar-from --into ${libdir}/commons-io/jars commons-io-1 commons-io.jar commons-io-1.3.jar
-	java-pkg_jar-from --into ${libdir}/javax.servlet/jars --virtual servlet-api-2.3 servlet.jar servlet-api-2.3.jar
-	java-pkg_jar-from --into ${libdir}/javax.portlet/jars portletapi-1 portletapi.jar portlet-api-1.0.jar
-}
-
-src_test() {
-	mkdir -p target/lib/junit/jars
-	java-pkg_jar-from --into "${S}"/target/lib/junit/jars junit junit.jar junit-3.8.1.jar
-	ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.2.1.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.2.1.ebuild
deleted file mode 100644
index 729d639ec9e5..000000000000
--- a/dev-java/commons-fileupload/commons-fileupload-1.2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.2.1.ebuild,v 1.6 2011/12/19 12:44:30 sera Exp $
-
-JAVA_PKG_IUSE="doc source"
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A Java library for adding robust, high-performance, file upload capability to your servlets and web applications."
-HOMEPAGE="http://commons.apache.org/fileupload/"
-SRC_URI="mirror://apache/commons/fileupload/source/${P}-src.tar.gz"
-COMMON_DEPEND=">=dev-java/commons-io-1.3
-	=dev-java/portletapi-1*
-	~java-virtuals/servlet-api-2.4"
-DEPEND=">=virtual/jdk-1.4
-	test? (
-		dev-java/ant-junit
-		=dev-java/junit-3.8*
-	)
-	${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-LICENSE="Apache-2.0"
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="test"
-
-S="${WORKDIR}/${P}-src"
-
-EANT_EXTRA_ARGS="-Dnoget=true -Dcommons-io.jar=true"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Tweak build classpath and don't automatically run tests
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	local libdir="${S}/target/lib"
-	mkdir -p ${libdir}/commons-io/jars -p  ${libdir}/javax.servlet/jars -p  ${libdir}/javax.portlet/jars
-	java-pkg_jar-from --into ${libdir}/commons-io/jars commons-io-1 commons-io.jar commons-io-1.3.2.jar
-	java-pkg_jar-from --into ${libdir}/javax.servlet/jars --virtual servlet-api-2.4 servlet-api.jar servlet-api-2.4.jar
-	java-pkg_jar-from --into ${libdir}/javax.portlet/jars portletapi-1 portletapi.jar portlet-api-1.0.jar
-}
-
-src_test() {
-	mkdir -p target/lib/junit/jars
-	java-pkg_jar-from --into "${S}"/target/lib/junit/jars junit junit.jar junit-3.8.1.jar
-	ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.2.2.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.2.2.ebuild
new file mode 100644
index 000000000000..8af3a72c7aee
--- /dev/null
+++ b/dev-java/commons-fileupload/commons-fileupload-1.2.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/commons-fileupload-1.2.2.ebuild,v 1.1 2012/07/11 22:31:56 caster Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Add robust, high-performance, file upload capability to your servlets and web applications."
+HOMEPAGE="http://commons.apache.org/fileupload/"
+SRC_URI="mirror://apache/commons/fileupload/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/commons-io:1
+	dev-java/portletapi:1
+	java-virtuals/servlet-api:2.5"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+S="${WORKDIR}/${P}-src"
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+
+java_prepare() {
+	# don't automatically run tests
+	sed -i 's/depends="compile,test"/depends="compile"/' build.xml
+	# upstream idea of using unless="noget" is somewhat flawed
+	sed -i 's/depends="get-dep-commons-io.jar,get-dep-servlet-api.jar,get-dep-portlet-api.jar,get-dep-junit.jar,get-dep-maven-xdoc-plugin.jar,get-dep-maven-changelog-plugin.jar"//' build.xml
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="commons-io-1,portletapi-1,servlet-api-2.5"
+EANT_EXTRA_ARGS="-Dlibdir=target/lib"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}-SNAPSHOT.jar
+
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/commons-fileupload/files/commons-fileupload-1.1.1-gentoo.patch b/dev-java/commons-fileupload/files/commons-fileupload-1.1.1-gentoo.patch
deleted file mode 100644
index f9fa2fb47ba5..000000000000
--- a/dev-java/commons-fileupload/files/commons-fileupload-1.1.1-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- build.xml.original	2006-09-23 00:11:00.000000000 +0200
-+++ build.xml	2006-09-23 00:24:15.000000000 +0200
-@@ -14,7 +14,7 @@
- 
-   <property name="defaulttargetdir" value="${basedir}/target">
-   </property>
--  <property name="libdir" value="${user.home}/.maven/repository">
-+  <property name="libdir" value="${basedir}/target/lib">
-   </property>
-   <property name="classesdir" value="${basedir}/target/classes">
-   </property>
-@@ -37,11 +37,11 @@
-   <property name="proxy.password" value="">
-   </property>
-   <path id="build.classpath">
--    <pathelement location="${libdir}/commons-io/jars/commons-io-1.1.jar">
-+    <pathelement location="${libdir}/commons-io/jars/commons-io.jar">
-     </pathelement>
--    <pathelement location="${libdir}/javax.servlet/jars/servlet-api-2.3.jar">
-+    <pathelement location="${libdir}/javax.servlet/jars/servlet.jar">
-     </pathelement>
--    <pathelement location="${libdir}/javax.portlet/jars/portlet-api-1.0.jar">
-+    <pathelement location="${libdir}/javax.portlet/jars/portletapi.jar">
-     </pathelement>
-     <pathelement location="${libdir}/junit/jars/junit-3.8.1.jar">
-     </pathelement>
-@@ -70,7 +70,7 @@
-       </and>
-     </condition>
-   </target>
--  <target name="compile" description="o Compile the code" depends="get-deps">
-+  <target name="compile" description="o Compile the code" depends="">
-     <mkdir dir="${classesdir}">
-     </mkdir>
-     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-@@ -90,7 +90,7 @@
-       </fileset>
-     </copy>
-   </target>
--  <target name="jar" description="o Create the jar" depends="compile,test">
-+  <target name="jar" description="o Create the jar" depends="compile">
-     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
-     </jar>
-   </target>
-@@ -167,7 +167,7 @@
-       </fileset>
-     </copy>
-   </target>
--  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
-+  <target name="javadoc" description="o Generate javadoc" depends="">
-     <mkdir dir="${javadocdir}">
-     </mkdir>
-     <tstamp>
-@@ -254,4 +254,4 @@
-     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
-     </unjar>
-   </target>
--</project>
-\ No newline at end of file
-+</project>
diff --git a/dev-java/commons-fileupload/files/commons-fileupload-1.2-gentoo.patch b/dev-java/commons-fileupload/files/commons-fileupload-1.2-gentoo.patch
deleted file mode 100644
index 4a09f6372598..000000000000
--- a/dev-java/commons-fileupload/files/commons-fileupload-1.2-gentoo.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- build.xml.original	2007-03-16 20:05:51.000000000 +0100
-+++ build.xml	2007-03-16 20:27:58.000000000 +0100
-@@ -8,13 +8,13 @@
-   <property file="${user.home}/build.properties"></property>
-   <!--Build properties-->
-   <property name="defaulttargetdir" value="${basedir}/target"></property>
--  <property name="libdir" value="${user.home}/.maven/repository"></property>
-+  <property name="libdir" value="target/lib"></property>
-   <property name="classesdir" value="${basedir}/target/classes"></property>
-   <property name="testclassesdir" value="${basedir}/target/test-classes"></property>
-   <property name="testreportdir" value="${basedir}/target/test-reports"></property>
-   <property name="distdir" value="${basedir}/dist"></property>
-   <property name="javadocdir" value="${basedir}/dist/docs/api"></property>
--  <property name="final.name" value="commons-fileupload-1.2rc3"></property>
-+  <property name="final.name" value="commons-fileupload-1.2"></property>
-   <property name="proxy.host" value=""></property>
-   <property name="proxy.port" value=""></property>
-   <property name="proxy.username" value=""></property>
-@@ -44,7 +44,7 @@
-       </and>
-     </condition>
-   </target>
--  <target name="compile" description="o Compile the code" depends="get-deps">
-+  <target name="compile" description="o Compile the code" depends="">
-     <mkdir dir="${classesdir}"></mkdir>
-     <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
-       <src>
-@@ -59,7 +59,7 @@
-       </fileset>
-     </copy>
-   </target>
--  <target name="jar" description="o Create the jar" depends="compile,test">
-+  <target name="jar" description="o Create the jar" depends="compile">
-     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar>
-   </target>
-   <target name="clean" description="o Clean up the generated directories">
-@@ -116,7 +116,7 @@
-       </fileset>
-     </copy>
-   </target>
--  <target name="javadoc" description="o Generate javadoc" depends="get-deps">
-+  <target name="javadoc" description="o Generate javadoc" depends="">
-     <mkdir dir="${javadocdir}"></mkdir>
-     <tstamp>
-       <format pattern="2002-yyyy" property="year"></format>
-@@ -199,4 +199,4 @@
-     <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get>
-     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar>
-   </target>
--</project>
-\ Chybí znak konce řádku na konci souboru
-+</project>