Remove old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x3C5CF75A

3 files changed, 12 insertions, 63 deletions

diff --git a/dev-java/commons-el/ChangeLog b/dev-java/commons-el/ChangeLog
index 7a004fe616ec..8a261a411c83 100644
--- a/dev-java/commons-el/ChangeLog
+++ b/dev-java/commons-el/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/commons-el
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/ChangeLog,v 1.33 2014/08/02 18:10:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-el/ChangeLog,v 1.34 2014/08/03 10:36:55 sera Exp $
+
+  03 Aug 2014; Ralph Sennhauser <sera@gentoo.org> -commons-el-1.0-r2.ebuild:
+  Remove old
 
   02 Aug 2014; Agostino Sarubbo <ago@gentoo.org> commons-el-1.0-r3.ebuild:
   Stable for ppc64, wrt bug #502708
diff --git a/dev-java/commons-el/Manifest b/dev-java/commons-el/Manifest
index e1b571700705..e71a106dc126 100644
--- a/dev-java/commons-el/Manifest
+++ b/dev-java/commons-el/Manifest
@@ -4,24 +4,17 @@ Hash: SHA256
 AUX commons-el-1.0-java-1.7-compiler.patch 738 SHA256 1c6e91bdb41da37c2cafcd9b052371a1a3a4ec2054071b87e103fe4eb0819326 SHA512 b189a50f4de4f3362eec45a7dba4e5d4227aae30723180ddbebaae86949687ebb217d4bf28879723fdbcb1393a54dcbf9e14e543373faaeab3975c02e01e2807 WHIRLPOOL 88d780b5749fb9dfa1bc581eb119b017ac8af1d8b097ac8cc0e94fc318f6b62b7d5a6196bc0d37215701b30c010b71f8ce7a1530f32714f89e9004207205b276
 AUX commons-el-1.0-manifest 557 SHA256 b2ce487366d61c8ce0ff49c59c20aac7efb358ecb2174d775dc306b4987824f1 SHA512 6f2eba221225f9842eef312519b8c92532be4e87732202d72ecb8c1182264d5219c70fe5c3517b2df8d43bd4f828e556ae57e7e145a4be811acf914ad6b3314e WHIRLPOOL c742a839ea456460b7f57d7618a1962140163548522d9a0d02986d48853642d79338061c92f77b8c22165cc55db3640188b5bfccb02cb4a393a2ca1d34801c50
 DIST commons-el-1.0-src.tar.gz 64009 SHA256 3c9bdded6073563aaaddc9ad7c7387b242dc03cc385381503026b665a366c2c6 SHA512 51bee4a33816b2c7416f55bd2efe1e663350ca0b30b2b5a8f89154c51596df8481c736fa13576a9dad69b2da113728050c2c9b6f50125d38a36f45e4b82e2e83 WHIRLPOOL 5f019e0dac1211f713a8b3dd8818277c6241af133d3dc460e355332da40c58357e4d606e28301e770fe7dbf30f19885ba57f252e90cdd8923fbe258bec052ab6
-EBUILD commons-el-1.0-r2.ebuild 1498 SHA256 38ce321ed34bd3385e77763731e149b57d284cdacd5984350e69c48b3963b737 SHA512 ceed486ca11e994ddc3b1acd1cf61ec575bc8e9a70f88969baafba7cbc640f0f101be41c7f576fa6091b38ce69db2397cc0c9149ef271b74ba1b7cf18d01b1aa WHIRLPOOL 31d24e76154dc69e11a96a1b18a379763076742c8aa9eedaf8afdf6cc0afc2f9e454dff98174792b10687f3c5be19fe3991e46139ab8aeaff50b17509874b030
 EBUILD commons-el-1.0-r3.ebuild 1335 SHA256 93ce6647009dfe81f32cd08780dab74b66604cafa3384873e74af74fc8ccae26 SHA512 e4bf2d7388bc9149eb32a5c500d28863bc25821f054e8d889addbc0318dda6e887a5e4dc3c5ea9d1775f7753bf9ff8b623a03d66665893deb961cddc4e281506 WHIRLPOOL 9bdd6e3e4de74d11a9cb4d8f94200eed98b50aba63e4219d2a48284b08357798cdba7b9039c60eafee4e0b45de3c0151b99f642876f95f560d001098041194b4
-MISC ChangeLog 4054 SHA256 10cb740c9e14e4dc212d979ba67b3b38e11bdb5f3584a94f96f333eab4f6d279 SHA512 262e56d854b1b1d49d5f70e0ecd941f895522dd8eb4d3172da142e07ad6c8ca52a49218666b87c426b7375e83c813cb82f7cc622577957cca1d709c703e1865f WHIRLPOOL 175ff3bbc74955241187be9c3f2babc70523b52458c216d12e813787f2b9b068f1383a64ce08df364d64dd339b88d07eb96deb80a4489f1d3a07a53f6ce2871d
+MISC ChangeLog 4146 SHA256 4344077b821cd70b1c01990a73ae0fc90df44a23e093041c1e357988af8952dd SHA512 2283c6a23cd3ffdf9428b428daeaecfb9fad4b993cf1f5d125d7b37ea5ab9aed348d7c0978bbc54d5852ffeb12f4f6b8ac818a2792f61d591413a61c6acc73e7 WHIRLPOOL 3c087099a6657292f27629638c2ce5c4d861e36e4dddd96b61735448d0113a7c19e65865f84c01be738aa98d711a665b7c2e752a2d4d8f47198e0c8ba7c68176
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT3Sl5AAoJELp701BxlEWf8BIQALq2GKQm4q7NTm1tvmerR8tI
-A5dNEegSlZ8qV0iZdzG0sMyXQZ9mNvtKtE6PNeXaiYzDiXRwFPTRtIs+olfsHY3S
-aPEUZBzvulKs3Fhh5kFzE5zdJw9hVP7FsmbEW0buUSijefV649m3wCU0YO0Z3WB0
-oZTnxBDWUIdQ+MFycP6vg1hu0fiJFZfp5GrNQmiG4qfj1LnwxmkVSZ7gxN+i4S2m
-bNNKjjdzya3zfC7t1AfLwEL96ScN4NunT+HssWe7wHhrC0dX0tUb/9K+kaAR3PxC
-UAq0ZgaFtzYBUANqDDJzgmdbcp6DQVRMaP/BvTyCTUkXkRAL5bpg79LhLneSV0GQ
-YABMUSRAjkc9pQV997gVNfxDJugeyUnAnB+iTiKMFLPS6nMRxh9F9gBW5aWS/C2G
-enVi+YDaGrWhcu2SfRI7JOfz9PCueEHNcnJpwBZLjv8S/mqjTE0bgV5Ivpx4I9G7
-8oyJ+TGUM4i85r56hW5greZjkTBoMUuw+Ovgf1sdqApUOvF0ZFeSHuD3yQRPmbly
-vOo0iutvqbnfsm2tohUf4STEbQn7J4YndRjoTBg18jgysZH5JdCtzH76etNPjvsh
-TRMGlPHX3RcmczU57DbUiR0gLOwiDfb7rLBCmw4VpLE0EL6J+cIaOVIPaFY4gMuw
-GR0v3BFI03MzdzP2Cwir
-=N0Kb
+iQEcBAEBCAAGBQJT3hDQAAoJELjwI6Q8XPdalIMH/3yj0PWjkrICfgTD+MFcxjNq
+Dogy7x2FMZ/oSckjuV/X8tdCo3J0pQeUWBuhA14mwWUId0EupjsT3u6L/ulX5BMo
+hbCSb/yEVwff1DQIN36Ee3ZsvHHfRKj46UD/ZNwtmK+VZ6FNnWQDIOKk1LNYPjLw
+d5AwLvrrYLMh2Q2uggnSFeskEv0WjsHohqZLVBSPS0kzBhIPjZ/a2qR7nKiLtGGK
+GTebNy1AVQFIAXcGl+wprxJSJwi7TBu9HLposr5y56fFToxa1479i8CofhLatkMr
+loLXCuAcI1EnfEzk+XwXLCf6MMSr/wASNtHStZrOwNNRgbQxTwNrp4AB5dF6tPA=
+=t+wM
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-el/commons-el-1.0-r2.ebuild b/dev-java/commons-el/commons-el-1.0-r2.ebuild
deleted file mode 100644
index 0a3768bf0214..000000000000
--- a/dev-java/commons-el/commons-el-1.0-r2.ebuild
+++ /dev/null
@@ -1,47 +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-el/commons-el-1.0-r2.ebuild,v 1.7 2011/12/19 12:49:28 sera Exp $
-
-JAVA_PKG_IUSE="source"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="EL is the JSP 2.0 Expression Language Interpreter from Apache."
-HOMEPAGE="http://commons.apache.org/el/"
-SRC_URI="mirror://apache/jakarta/commons/el/source/${P}-src.tar.gz"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-COMMON_DEP="~dev-java/servletapi-2.4"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-S=${WORKDIR}/${P}-src
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	mv "build.properties" "build.properties.old"
-
-	echo "servlet-api.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" >> build.properties
-	echo "jsp-api.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)" >> build.properties
-	echo "servletapi.build.notrequired = true" >> build.properties
-	echo "jspapi.build.notrequired = true" >> build.properties
-
-	# Build.xml is broken, fix it
-	sed -i "s:../LICENSE:./LICENSE.txt:" build.xml || die "sed failed"
-}
-
-src_install() {
-	java-osgi_dojar-fromfile "dist/${PN}.jar" "${FILESDIR}/${P}-manifest" \
-		"Apache Commons EL" || die "Unable to install"
-
-	dodoc LICENSE.txt RELEASE-NOTES.txt || die
-	dohtml STATUS.html PROPOSAL.html || die
-
-	use source && java-pkg_dosrc src/java/org
-}