Remove old depending on dev-java/servletapi. #398689

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 13 insertions, 59 deletions

diff --git a/dev-java/commons-fileupload/ChangeLog b/dev-java/commons-fileupload/ChangeLog
index b3e2b2e04707..b4dde659dc75 100644
--- a/dev-java/commons-fileupload/ChangeLog
+++ b/dev-java/commons-fileupload/ChangeLog
@@ -1,6 +1,10 @@
 # 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.55 2012/01/28 07:01:18 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-fileupload/ChangeLog,v 1.56 2012/01/28 07:06:09 sera Exp $
+
+  28 Jan 2012; Ralph Sennhauser <sera@gentoo.org>
+  -commons-fileupload-1.2.ebuild:
+  Remove old depending on dev-java/servletapi. #398689
 
 *commons-fileupload-1.2.1-r1 (27 Jan 2012)
 
diff --git a/dev-java/commons-fileupload/Manifest b/dev-java/commons-fileupload/Manifest
index 68228ad37946..a3accc1a34a8 100644
--- a/dev-java/commons-fileupload/Manifest
+++ b/dev-java/commons-fileupload/Manifest
@@ -9,17 +9,16 @@ DIST commons-fileupload-1.2.1-src.tar.gz 149613 RMD160 6025029680b33f8f440685b32
 EBUILD commons-fileupload-1.2-r1.ebuild 1828 RMD160 59d9fadbc86697467070ce19946e3fc9017f5df6 SHA1 08abbee90b94b3c44eb9126b6ab8d4dbbcf26bf7 SHA256 8fba6b4f49d2231d5a4fa204e8e48ac595bd73181b74b1db01a8788a54a93122
 EBUILD commons-fileupload-1.2.1-r1.ebuild 1339 RMD160 5e8b31456042f554b50293c27b366d878a42dc46 SHA1 4609abc581b8301884fcf9fa9b1ee4c8f8e6d57b SHA256 773b7cbfaabb38d77715b0d87ff859c499b652af2ad7730877e5b413e8685b72
 EBUILD commons-fileupload-1.2.1.ebuild 1894 RMD160 04e3524caeadcde718fbd663c2e29a6f4763be3a SHA1 5b58734b370399f00bbb87638525377185611b20 SHA256 463fa12d0b184a784e45369fcb0600769e685d6d2cd4e78939811bc812635300
-EBUILD commons-fileupload-1.2.ebuild 1775 RMD160 b79b8c9750c9f8c6ab2f121b21767c7078fcf5bc SHA1 7172c429d73af65f1e441c8b3cb5cb6461a749e5 SHA256 bed2a50113f92687467fb7fa2c3b3ac811f3062b3677318ad9bf1b14efdb4417
-MISC ChangeLog 7693 RMD160 c6af19eb580edeec4a16e6a27a11271db6aa4496 SHA1 a3d2d4f37620c8dd23da0fede098ebbedf06a8d9 SHA256 0b4c9f3755c0e98fcec3d8de22a3ac2d6ec7b4f2003f869300905761add049d6
+MISC ChangeLog 7833 RMD160 10b207f18289664aeb0e3eeefe73de89f1650ba3 SHA1 551d3ebcec54e3a16a8def40d2201febe0981fc9 SHA256 cab731619188b7c6bbf75eaecb818c22135a05cad75edbf8a3a11672c7b551e1
 MISC metadata.xml 671 RMD160 895cae12deb9c4ed95f4eaace3b0e3b7660319e8 SHA1 49752e593b3f67367fbaaa7bfab27f8085b6df3b SHA256 5e208644d6c279e798b5991dff81a225dbb4408ec4eda8b6720b7e8c39e82739
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPI51MAAoJEIUJ+svaV163/rkIAJDOJvjMA6FTso0O5nl+Dqhh
-qGVO6k7XuBSIUAI/43KKb7S3K84T49+onCMjjOc85EZ97oSWfXm3Qb4/RbcSRo2V
-RLoQkbIBw+15RuoEyiFuu+vwoTpud4Me4zKaO+Bp8iBRGOaSaa3TXc5Z7PwticAO
-/Q55UbJ03JZ/WEhF4qfifxmzZ+b1iil7Cfxn3/1aRzUHQfUt2W0J05V7203hmnb9
-QEwV3jzUIL4Pgqb+fDKxwa+GrVByDYrXZH3OBD86vp/7eL4+RUcsIu4YQas+uiD8
-gVnO6NTAsx0ZRTkZaMqBpO0kB1F+rji4wnVglICzd2GS4C4/+4KTVeKXCQOQUI4=
-=ZAJb
+iQEcBAEBAgAGBQJPI55vAAoJEIUJ+svaV163iW8H/1eTTWpO9+9dXYZ8nG5+JifR
+6kkUlGU9iFcHBJGivGXong9LR+IO7/kFklNgF32fvSlpZYfr51+OR7fAhWFfT8L2
+F6eI0/axFpByow/mk57BD2RC+LzYVCbZq/zfEs45qvJduua3Holbrk8xVS3SZjI4
+MPAVJ6dh8Pvp1njByzyjIauJLnGJUJyQF7Hcxs7s5XMLWGD5ywrzGLR+IjgOQ0nW
+Lwr1O3ltnLFzH8LtNQHEDPD3fYC5WykVMGwgLTMTsaNTEk9Sh/hMoWz3QGGKz62m
+lAIoU2XNXzYY0S4v+yfUwjh0VA9qy2+EU4w/tAXbPLFMNMtvw/49vGMsg0Ep62Q=
+=VmFo
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-fileupload/commons-fileupload-1.2.ebuild b/dev-java/commons-fileupload/commons-fileupload-1.2.ebuild
deleted file mode 100644
index a5a19716294e..000000000000
--- a/dev-java/commons-fileupload/commons-fileupload-1.2.ebuild
+++ /dev/null
@@ -1,49 +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.ebuild,v 1.11 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*
-	~dev-java/servletapi-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"
-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 servletapi-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/*
-}