Remove old.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

4 files changed, 18 insertions, 69 deletions

diff --git a/dev-java/commons-io/ChangeLog b/dev-java/commons-io/ChangeLog
index 71ffe33650db..fb03bebb76e2 100644
--- a/dev-java/commons-io/ChangeLog
+++ b/dev-java/commons-io/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-io
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.57 2014/08/10 20:11:05 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/ChangeLog,v 1.58 2015/05/18 13:42:01 monsieurp Exp $
+
+  18 May 2015; Patrice Clement <monsieurp@gentoo.org> -commons-io-1.4.ebuild,
+  commons-io-2.4.ebuild:
+  Remove old.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> commons-io-1.4.ebuild,
   commons-io-2.0.1.ebuild, commons-io-2.4.ebuild:
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index c0907d255f8c..47fe561252d1 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST commons-io-1.4-src.tar.gz 236187 SHA256 eca986497f7b4d1b1ec41821b1b5df827bb31fc14833e4449cfa8bcd5d7f29bb SHA512 75395b5aeec6c04e6063b00161c3743dad6362f6a4095e26ba099aae8d187228d597fe91901afd395d06da390c4c19ceb60c73c49f83cbe45321b401a340f7c3 WHIRLPOOL 77d10b87b3be3006ead4fcb7ea9a72094ad35ea54951a5b0091b64f4e0bf82c75be36ae630cb90be82c444bb145e2f671268c187c6cb66cd82bfa8f9b8292e74
 DIST commons-io-2.0.1-src.tar.gz 280920 SHA256 32be3e626618b49c2e2fb268bd2101d7ae38438131df4560fc800bd2f26fdff8 SHA512 0e01d12c46707ff254b8aa3b31fe8d027e7bafd34a2c2c96b8867084bbe43c763d03f773189ec17ffc6525ad8d022009cb64cdf288a401194e8c0ebbe5d99ee2 WHIRLPOOL 4e34102bdf9b025165f25d09287ce446f838a92c990db099f5a9356cad994b88b9916c089f2ffcb7ceeeb5250b22daace637b7df5a3526711923824d0dc3f8f1
 DIST commons-io-2.4-src.tar.gz 330961 SHA256 961c8b41a891933c2d662d8e490667243ac82422668d1ccdd7bfedfdb944bb58 SHA512 69ac5f7b8de952d8b519ad89d4e9a33a9d269af0e68b735c0180ee8853a30e2a09147ceac362626a2fb3a041bd46eca094be2661ff280c1bab54a0548cae0aee WHIRLPOOL 4db6be6dbba4e3c9f67c471eff709ade22594ef1cea759da5651fa5788b1bcfeca689621eb3ff7ca52dca0229b096d597e9f5cb969ebcc7a06ff18f28ccc3551
-EBUILD commons-io-1.4.ebuild 1678 SHA256 b7f07540654477ea42823716042fdede4b2e520c8b5587604dce3695d3b09786 SHA512 be1ef0c42a40a565f3507cd283655128b6ddd08a3230c2dc94b2643b712f0c7c6d1ada2e66c606ec5c81e710b9eeb843d6100646f61062eabb5a9c4c5d7ed569 WHIRLPOOL 48e31471166f9bf608da3d0915f97b5870cd68a88740dc8475ef218bde94abaa0105a932329a9da7a31634ca7d01bc5dd7f12235cabdfc658dfd0705c9378a98
 EBUILD commons-io-2.0.1.ebuild 1684 SHA256 094b71a491a297ca1aafea6479147a6f878a14e348fe9ff18d0e0935871d33d2 SHA512 60819ebf690b190a54d1aa2b3ee2049bd8ad0590c7cc321bd1b60f3bc3d9945a135ada6ccd881e674fd9b31dcdadfc9f1d413ade5349c6c63c0e9102514fc5ab WHIRLPOOL 6b9c5cb07525c95b2527431203aba561936d93f73289ece726d7931be1552461d10e1499b00dbe95312ce023752ac10db86040c51ef8f140b31d1e6a7defb9ba
-EBUILD commons-io-2.4.ebuild 1687 SHA256 93e3fde2533b4c60f07e0ff92d71ab19417f5d5e691c54e1c769d86181be3145 SHA512 09bbe9346c387f010845e7a983206377d59bf0d942f8028168176b95ecbb410ecc2937d07adbf57ef8024289d9ac5ed2572ef3ee572935a635da4946bb75763b WHIRLPOOL fd384018e448df62071b79cd036fe14b65846adcc7ca03071d002eab4d724843264b4ec0212e4af960d5e20903cda9625743cfc6fc49d83ac49392750a76588e
-MISC ChangeLog 7984 SHA256 8742c5b8d0ad44237afe9dd23fd9561889459b832e3c7bc18ed630ee6a47788a SHA512 b9cc0f55cc52c34de296e9416c3ba159f0ca90d3c0a011dd4e34bf5faa92c7041f564572b29305b48f5985d90c5f2f98aa62aeddeb666aafcc9d2e20d645c276 WHIRLPOOL 56330fd9a17032011e6101730cef7ddfa1827f0d9727c0985c2eafc3753b8ec5d0d48e4d7773fd595139bf8d3232ee304601e6aee1811686df8fe858749439d5
+EBUILD commons-io-2.4.ebuild 1686 SHA256 082dc83c18f3c000e0148a03214450a2707dcd6e925b8f75fbd35a787744b666 SHA512 40560951f160d75ac9903423fae49364b735a5988323febe541830f5f83f1a896c5b4cc644095d71adbe51608cb7e84c298b231b4e79c779abbdb42bf2133c6c WHIRLPOOL fd255d4283e4ff72ffb90fd9c9ab101780ac2c7eb6dc241d6d7aec23f09e8284c449159cb223bc8cc32967ca46ddec2e44333954993600d9be6f7e688e116bf4
+MISC ChangeLog 8105 SHA256 693e00a76609ae7452eecbff2d3b60d505a234060d120f08f8d40ad1f9e89c8f SHA512 2b71c274b460e22c56193636bc91ed972bbf566ce9a8cea3b7b4d2a2a99585f811f3e8456e385497677267e59c3291ee1ba07e2de953caaf6dadb1c97b7f1512 WHIRLPOOL 93c942ad6338484e2f977b1e4b26f7ce5111c945c0c3182a0684dc3a3912c8498a883e323fc270b74c9b225753d3779d58f6f9cfd33db9ccdd396e9fc3f98f5f
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0dkACgkQcaHudmEf86rlLACdGvXRsdwfS3XKGftmObYuXMnD
-l2cAn0hxupb6hQAVcjS0xhTuOds1p39k
-=cj3B
+iQEcBAEBCAAGBQJVWevLAAoJEJGRpfGTSRu4b+YH+gOj9XxDQ2136vrviNCHphYS
+Vj3uc32xqqR06vBNSt7356c4seGiDKgr/NgVrDpetoNUL3E0xZc2tFO1RusN05sk
+kqFyi+Tqpn3fBWLsaxHg8ErEw5xNSfXHXX11WPMLYcWHT/EQHfSPaAYTuaXWLrXb
+4ENdo+Ha09NOp8Bl0O8095wysz5rj2GK9sPzNVi9Alv1iyPLmB0xf91k+HUIdVOY
+d/ik156dfDpgOuH4EikMs0ItoAk6NuVXoqRKw4r3M49yFKffGVqwnJw44xh2uegV
+WrCLzGpaLQnFtlt9RWFDSwL2dPaVEZ8InlALOk3ufGKHr1ou2vWQUgRNzqjRfGU=
+=hC5P
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-io/commons-io-1.4.ebuild b/dev-java/commons-io/commons-io-1.4.ebuild
deleted file mode 100644
index 2a177c9b55a4..000000000000
--- a/dev-java/commons-io/commons-io-1.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/commons-io-1.4.ebuild,v 1.11 2014/08/10 20:11:05 slyfox Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P="${P}-src"
-DESCRIPTION="Commons-IO contains utility classes, stream implementations, file filters, and endian classes"
-HOMEPAGE="http://commons.apache.org/io/"
-SRC_URI="mirror://apache/commons/io/source/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="test"
-
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/ant-junit )"
-RDEPEND=">=virtual/jre-1.4"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	java-ant_ignore-system-classes
-	java-ant_rewrite-classpath
-	# Setting java.io.tmpdir doesn't have effect unless we do this because the
-	# vm is forked
-	java-ant_xml-rewrite -f build.xml --change -e junit -a clonevm -v "true"
-}
-
-EANT_EXTRA_ARGS="-Duser.home=${T}"
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]]; then
-		ANT_OPTS="-Djava.io.tmpdir=${T} -Duser.home=${T}" \
-		ANT_TASKS="ant-junit" \
-			eant test \
-			-Dgentoo.classpath="$(java-pkg_getjars junit)" \
-			-Dlibdir="libdir" \
-			-Djava.io.tmpdir="${T}"
-	else
-		elog "Tests fail unless userpriv is enabled because they test for"
-		elog "file permissions which doesn't work when run as root."
-	fi
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-
-	dodoc RELEASE-NOTES.txt NOTICE.txt || die
-	use doc && java-pkg_dojavadoc target/apidocs
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/commons-io/commons-io-2.4.ebuild b/dev-java/commons-io/commons-io-2.4.ebuild
index ebe3df82fec5..ad2ceb0e7f0c 100644
--- a/dev-java/commons-io/commons-io-2.4.ebuild
+++ b/dev-java/commons-io/commons-io-2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/commons-io-2.4.ebuild,v 1.2 2014/08/10 20:11:05 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-io/commons-io-2.4.ebuild,v 1.3 2015/05/18 13:42:01 monsieurp Exp $
 
 EAPI=5
 JAVA_PKG_IUSE="doc source"
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/io/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=virtual/jre-1.6"