Remove vulnerable versions. Fix security bug 385811.

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, 13 insertions, 153 deletions

diff --git a/dev-java/jcs/ChangeLog b/dev-java/jcs/ChangeLog
index 6f4b1c734b50..c53518169f1f 100644
--- a/dev-java/jcs/ChangeLog
+++ b/dev-java/jcs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jcs
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/ChangeLog,v 1.32 2015/06/15 15:44:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/ChangeLog,v 1.33 2015/06/15 15:51:24 monsieurp Exp $
+
+  15 Jun 2015; Patrice Clement <monsieurp@gentoo.org> -jcs-1.2.7.9-r1.ebuild,
+  -jcs-1.3-r1.ebuild:
+  Remove vulnerable versions. Fix security bug 385811.
 
   15 Jun 2015; Agostino Sarubbo <ago@gentoo.org> jcs-2.0.ebuild:
   Stable for ppc, wrt bug #551992
diff --git a/dev-java/jcs/Manifest b/dev-java/jcs/Manifest
index 552bd8b5c7c1..6ea2bcb94115 100644
--- a/dev-java/jcs/Manifest
+++ b/dev-java/jcs/Manifest
@@ -6,27 +6,17 @@ AUX build-1.2.7.9.xml 1301 SHA256 23aa79da40881782d71d557acd6db52ece62add677178d
 AUX build-1.3.xml 1278 SHA256 31a0c8d315a290bf2d953518fe9a017e93c49b2389869b293a4281f4e4822a04 SHA512 7167390aec4c6268ae68462d59e8e1a1491cd7c048da9d776051b6efbcc3cdc67d3700cd048dea2da015b827c334014a402a4761deaaecb8137abc247294d629 WHIRLPOOL 7697a53dd51a84d1c9c9bc3b24b96f5735ab01dd9073340208c72f247a296e19f6978552b0c61b77aa9c7c711087524cb646e3529e2e7997bba76d370e1ff484
 AUX jcs-2.0-build.xml 16360 SHA256 749112f080215b6a6a948d8db4b9155011a07ba4d9c50681fc7ff7e9afaf18f2 SHA512 8b11500fb24f7166475b3bb37b210884d8203bb73879649bcbeb4f892059c16bc20a9871b7d306c119efa7033e91a64ee77c5244a2adb460c4d63473de0f9b33 WHIRLPOOL e09216756276538663167cd9058e261f51c6fe34c9df8c4803a52e08a6b8a466a7b071f74dd0950563427b0a86868fa089384297d065103d6401f47fca529be2
 DIST commons-jcs-dist-2.0-beta-1-src.tar.gz 825048 SHA256 2ff60facc31b52625f1f2d8907380947508790bd864e2fea03625dee0c36ffa5 SHA512 56d68807de6d47debc893584a738bc797c2a150503ae460dc1444e9434b438926f6ad9fe8c1292250f6a0b2936210084cbd512083b5a8cc4f20e692b759a314f WHIRLPOOL e5e67465a7c318ec73de3ffacc566cce48304a3379885dd814f0c32f362c1d2e24abf2935e090056df0bd8db0fa85cb36553203e5eb6e837e23e888ca6cd137f
-DIST jcs-1.2.7.9.tar.bz2 570289 SHA256 9963cfb34fd813167b52907f21c2c5123f8a78b2d4fe2d21802967fb097735cf SHA512 3ea9a753d95815fcd81266e4ce83046b2eac22d52ab166929cbc082d2b5aa7e184a74adf87dcd77a2f19c4658d15deb364a439f515d4a1ba5d20c021f230abbc WHIRLPOOL 43e0a7853843e7c32799213043270b86e36e34756c3ce991a12d919a03f3bd806405b2734a938b236fa27d0e8e2b3bf2a2bd159235c6b9a70a5ce8f83fb1acb6
-DIST jcs-1.3-src.tar.gz 608600 SHA256 cb5534698e77e04715e634ed748941e3c24ecc0be6b8db1731a131848a51f611 SHA512 edaf63c83393c9e48711aa3b76545cafb2297909a4f7470a1396f3a1d3f7a5c78321ce29a8d0097be8b0600e587757fd1d45b5e5feb31e658ec6b4f3af950be6 WHIRLPOOL 34e698826ffd14b2b0fe488b5dcbac02fc43abb969eca207e98bef45b448c767e567f489682419a4e8566439026bef721bf57fc564cb6570ba692a36a4358da3
-EBUILD jcs-1.2.7.9-r1.ebuild 1753 SHA256 a80eec3b69ab32b08682f17e40b54fe73154ba4033e4678804c61b4cc3544d40 SHA512 788feef814da85a6467cae337d5972f7bc2bc5afc21afc5132df61328439ae1c4d8fdf9fc2a2159e1255641f4a6d8b9dc85922e70d39159ed46f72d1e0b58cc7 WHIRLPOOL 4ad0125b2b025845adae5f1484ef2ae1db6f1c050de4a2d5242708d06b900e5b383886000c190de5049fb1272d6daa9e30bdf56c42540a584ccba3055b1cca03
-EBUILD jcs-1.3-r1.ebuild 1573 SHA256 ec148aeb95a98429ac67d25cf1f60134bf03f84b8711593550bb26074400b928 SHA512 1b4405ddad358ada21587329ee04954e54a2accf6d0201b548f602b587e7eca16788ca502649f93301331490729b6f8dc529146c7efec4c960acc790ba2329e7 WHIRLPOOL c11238a98262dad89a1b4406324de4290a9c129ea3468a7af14d72a48ce75cb844d0a97cbc0025b3be9e058b648b4cbf792321756be111653c22a5666db81fc2
 EBUILD jcs-2.0.ebuild 2608 SHA256 d625bd6b3aa45976868b1bb92b642c9426d0f00888ed28d0596c978af4fc8fc5 SHA512 f4d9a243a17862bb98f35844218eff23ff2bcd4da74abebe4265b7472a9f73471c207f6ce1eae78d42f6670c748fea468c1c42ffc99989ca7ec52b8d0367fac2 WHIRLPOOL 31d1e7e615afb9e5b5a6decb34b595018b1afb5f410c0bc8eaf99a35eb5f6018292ab9a4409e2b583a3817eaed9c721395b4bb6319939fe80abdfa75b6d6c873
-MISC ChangeLog 4309 SHA256 a8b1a3fd2fee5facaf939d8cc535b501d91f838d14a55d5943efb4b3afcb68ad SHA512 71db49af6885c7a90bfc684e11ed19b74695e969951423f6c01b6ceba42baf256c403b2217b09f22335c7e6464621b6218d0eb46204f3976678bbd4a1a1f77bd WHIRLPOOL 0063770cd8a94761fdc37baccd1e6bcb4c60f56ff13ac37a4c6aa037e8aa9eb7dc171f413510b219dbeb6c37a861af2b7f5886b1c8e9cd903c2aa3641d0d4c30
+MISC ChangeLog 4471 SHA256 e144710a24b16e6b7dc8eee831eb65b46c489196e1d76f26aa7e4eb873455aea SHA512 fb5623ec62990591120e286c30d19469c2aa8b81080e864365cadc77a49f7b3c29c315b8b43d4058dfea3f6e1c38ab32c2aa599297ac3fa12c5b7f0e1c8a34ac WHIRLPOOL 29519b918bd1bca5b8089e5964d70e1ba7873d15fc1d3633c15b0e1f5f3c30d65b6261f7d9766c99e02d690f1aad4931ab9a5210ae4d850efa1a988565bf44df
 MISC metadata.xml 232 SHA256 de4fbba5472a1a5e4b1014a186c98896d0b52d9c07b48beb2bc5a5350d25d6ad SHA512 b7061ae24f19c67046c7b79d7edb109a11a1f88c4bb160c5544ee2e5bd4793f4b807f418fd943cbea60b6fa80b6fa39623b687ccf2540d849f6d978be1a819ea WHIRLPOOL e84a2ae7600e3d8a122b1cb417a8013595e372210d0183ae310c8fc172a9b3f3fa1deca9870590d190a88f9519f137f3f7d25f3f32309c8e63a79633f4be7297
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVfvLzAAoJELp701BxlEWfzp4QAKs+WOCvOyYz0XbagjfoKZPQ
-vuwyxJye2eAcx9J8vbLl+Fff16wjlwFA9AIxWQImxessldNXA7+rrkZ8oYQqjk8o
-lNd9afQVwufQOyWOSetXOtOojr6btAIpDYY+5zngpITBqYjj61hjet1SIgPPwMdt
-D/Ov/bfTBSDA4o+v/zra5NO7Slkhbi7qu5v7bpLmPYebxNQATpYkG06iUK/E0f2M
-6g1Gi+G81Zl6vetPvRKfPUM3udjYg3uwjeosf7FnshUf7SqvRKD7uZMkPv0H6itt
-cfCpRx/3EdHY7NPYtD6ktirVU6Po4tAoLpS6cHr8z7xda9KWk0FlfyBNlSQz6Lln
-fiWc/0mPfPvOInqlBGkpgMFI7XS/CZIzBJOUsoqRay2PhWgVj9OaBUlfL+2N/K3y
-2e1/GCAXUjpYpvcQtBD8HHNYk3rvESxXvybhA3yzoZZh2JUUMO29GYG+LR4pRCem
-5nlgmhAH6zNjEgQw7ptCDSGNpQ0a3DTWzBlT8DrHg4wbzsxCxFAW0JEswo7QgC2y
-er/szxVbWkW2ywMD1CTt0STJ2iHRo5MnI5r4z+7fLw1eoaXTYPemU3VWWW8BMILV
-NwEtXR1/OtS2ZgvRVo0bOFJueFEPDhgizYZLEuDuxWOFcMn6LI/d6ya1ENF/Dk3U
-KnFMyCG++jVkux9YqlgJ
-=13rw
+iQEcBAEBCAAGBQJVfwL9AAoJEJGRpfGTSRu4TEoH/jLjCXD9Z9p4cS8cE6Tj2VGY
+0vgwrgAHs7cPZ0UuaIcxXOeUq91oAy0auLl9/Ylkrch59f1s6767+wsMn1SP6QAK
+Onju5RZN+8NsZHvuGpfy0lw6Og5t8fOcFLiuMgK/vbnIr7LcQ9ehdBs2LRg9cmEO
+qw2JxaDvQstLarqfKOtuTodE06oKetF3keCMxFvYBxnig12RkE90AW7Y9zGOpYk6
+b7OzcPg3Ssp7CKsROEqejxig7TyvQyqXCKkLOKaW+LMH9c1h4eI2NAWZgI/AGlS1
+C31EipUy4cACfIMFU+8XqJ2MF2Yfl9U6b4ZxnIpaXGm0N0JDQvYNBISaP9i3VJg=
+=EmPA
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jcs/jcs-1.2.7.9-r1.ebuild b/dev-java/jcs/jcs-1.2.7.9-r1.ebuild
deleted file mode 100644
index 5a3b2b6f8556..000000000000
--- a/dev-java/jcs/jcs-1.2.7.9-r1.ebuild
+++ /dev/null
@@ -1,70 +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/jcs/jcs-1.2.7.9-r1.ebuild,v 1.6 2014/09/04 04:53:25 ercpe Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JCS is a distributed caching system written in java for server-side java applications"
-HOMEPAGE="http://commons.apache.org/jcs/"
-# Yes, it's a checkout from JCS SVN...
-#  http://svn.apache.org/repos/asf/jakarta/jcs/tags/
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1.2"
-KEYWORDS="amd64 ppc x86"
-IUSE="admin"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-java/jisp:2.5
-	java-virtuals/servlet-api:2.3
-	dev-db/hsqldb
-	dev-java/commons-dbcp:0
-	dev-java/commons-lang:0
-	dev-java/commons-logging
-	dev-java/commons-pool:0
-	dev-java/concurrent-util:0
-	dev-java/jgroups:0
-	dev-java/xmlrpc:0
-	admin? ( dev-java/velocity )"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-
-LIBRARY_PKGS="jgroups,servlet-api-2.3,commons-lang,commons-logging,commons-pool,commons-dbcp,xmlrpc,concurrent-util,jisp-2.5,hsqldb"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# use our own build.xml because jcs's is demented by maven
-	cp "${FILESDIR}/build-${PV}.xml" build.xml
-
-	if use admin; then
-		LIBRARY_PKGS="${LIBRARY_PKGS},velocity"
-	else
-		ewarn
-		ewarn "JCS Admin is disabled, if you want it hit Ctrl-C and add"
-		ewarn "\"admin\" USE flag."
-		ewarn
-		rm -fr "${S}"/src/java/org/apache/jcs/admin
-	fi
-
-	cat > build.properties <<-END
-		classpath=$(java-pkg_getjars ${LIBRARY_PKGS})
-	END
-}
-
-src_compile() {
-	eant jar -Dproject.name=${PN} $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	use doc && java-pkg_dojavadoc dist/doc/api
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/jcs/jcs-1.3-r1.ebuild b/dev-java/jcs/jcs-1.3-r1.ebuild
deleted file mode 100644
index 62a2a39fcad5..000000000000
--- a/dev-java/jcs/jcs-1.3-r1.ebuild
+++ /dev/null
@@ -1,64 +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/jcs/jcs-1.3-r1.ebuild,v 1.7 2014/09/04 04:53:25 ercpe Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JCS is a distributed caching system written in java for server-side java applications"
-HOMEPAGE="http://commons.apache.org/jcs/"
-SRC_URI="mirror://apache/jakarta/jcs/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.3"
-KEYWORDS="amd64 ppc x86"
-IUSE="admin"
-
-RDEPEND=">=virtual/jre-1.4
-	dev-java/commons-lang:0
-	dev-java/jisp:2.5
-	java-virtuals/servlet-api:2.3
-	dev-db/hsqldb
-	dev-java/commons-dbcp:0
-	dev-java/commons-logging:0
-	dev-java/commons-pool:0
-	dev-java/concurrent-util:0
-	dev-java/xmlrpc:0
-	admin? ( dev-java/velocity )"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}"
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-LIBRARY_PKGS="servlet-api-2.3,commons-lang,commons-logging,commons-pool,commons-dbcp,xmlrpc,concurrent-util,jisp-2.5,hsqldb"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-
-	# use our own build.xml because jcs's is demented by maven
-	cp "${FILESDIR}/build-${PV}.xml" build.xml
-
-	if use admin; then
-		LIBRARY_PKGS="${LIBRARY_PKGS},velocity"
-	else
-		rm -fr "${S}/src/java/org/apache/jcs/admin"
-	fi
-
-	cat > build.properties <<-END
-		classpath=$(java-pkg_getjars ${LIBRARY_PKGS})
-	END
-}
-
-src_compile() {
-	eant jar -Dproject.name=${PN} $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-
-	use doc && java-pkg_dojavadoc dist/doc/api
-	use source && java-pkg_dosrc src/java/*
-}