Ebuild cleanup, removed old version, added "admin" USE flag for JCS Admin.

(Portage version: 2.1.2_pre1-r1)
 (Signed Manifest commit)

4 files changed, 15 insertions, 148 deletions

diff --git a/dev-java/jcs/Manifest b/dev-java/jcs/Manifest
index 655371fd9362..3d52dfd04b5e 100644
--- a/dev-java/jcs/Manifest
+++ b/dev-java/jcs/Manifest
@@ -1,42 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX build-1.2.6.5.xml 1551 RMD160 0e93a53a29852d68e2a4e97c4829706dc177a18a SHA1 ac2245bd81b57c00abf2f46916f52cc257724f0a SHA256 ecb97d07966bcaa08a31abb99942fffd16e0aa4ff67768aa2b1c97b3f69f23bf
-MD5 e965f2f2c67683e91e2ef982804b1b76 files/build-1.2.6.5.xml 1551
-RMD160 0e93a53a29852d68e2a4e97c4829706dc177a18a files/build-1.2.6.5.xml 1551
-SHA256 ecb97d07966bcaa08a31abb99942fffd16e0aa4ff67768aa2b1c97b3f69f23bf files/build-1.2.6.5.xml 1551
-AUX build-1.2.7.8.xml 1551 RMD160 0e93a53a29852d68e2a4e97c4829706dc177a18a SHA1 ac2245bd81b57c00abf2f46916f52cc257724f0a SHA256 ecb97d07966bcaa08a31abb99942fffd16e0aa4ff67768aa2b1c97b3f69f23bf
-MD5 e965f2f2c67683e91e2ef982804b1b76 files/build-1.2.7.8.xml 1551
-RMD160 0e93a53a29852d68e2a4e97c4829706dc177a18a files/build-1.2.7.8.xml 1551
-SHA256 ecb97d07966bcaa08a31abb99942fffd16e0aa4ff67768aa2b1c97b3f69f23bf files/build-1.2.7.8.xml 1551
-DIST jcs-1.2.6.5.tar.bz2 11847582 RMD160 b9a1259bcb71c3cafc67db6b112f020ff4273e6a SHA1 aecb75d070a9a84f1dab472c6ee17028925625b8 SHA256 58cb7d3ad82a4015b0c2b44fd7ebea5eb9646f7383be3682c11ef6b442f3e0ba
+AUX build-1.2.7.8.xml 1301 RMD160 9352cbbdea831761100bf19a0c1e7f5846e27706 SHA1 37014ace719141b7ba400e8d496a2d36c5ae4bd7 SHA256 23aa79da40881782d71d557acd6db52ece62add677178db0013576b831a5b158
+MD5 40b15bf15b3548501185cae94dd60533 files/build-1.2.7.8.xml 1301
+RMD160 9352cbbdea831761100bf19a0c1e7f5846e27706 files/build-1.2.7.8.xml 1301
+SHA256 23aa79da40881782d71d557acd6db52ece62add677178db0013576b831a5b158 files/build-1.2.7.8.xml 1301
 DIST jcs-1.2.7.8.tar.bz2 562047 RMD160 86ef8c0a76de8f81ae4e1f859f7c71ec5c6b7c1d SHA1 6e3b8df342f63cd68f910cd9a3aa8c54dd7c179b SHA256 86bc1a5a80fbc2e3ec426bc3896c30281355bd1816524923d95dcd5e2e594222
-EBUILD jcs-1.2.6.5-r1.ebuild 1697 RMD160 ae989e9bec43688e0b68f4500d780bf360f5fd88 SHA1 728f7af182207437e4ccf87fb2f7868ad0908b44 SHA256 743fc40120f0afa9ae18f9d207009f1c2b4256e4e70fa4c6253ebff28def5126
-MD5 4784d6737c24718dc2146326674a8835 jcs-1.2.6.5-r1.ebuild 1697
-RMD160 ae989e9bec43688e0b68f4500d780bf360f5fd88 jcs-1.2.6.5-r1.ebuild 1697
-SHA256 743fc40120f0afa9ae18f9d207009f1c2b4256e4e70fa4c6253ebff28def5126 jcs-1.2.6.5-r1.ebuild 1697
-EBUILD jcs-1.2.7.8.ebuild 1542 RMD160 4ee634ff70a21c2739cf1a33fd9a3a5838757250 SHA1 60d84799db30be4b008f54f13fcf860d29cb2818 SHA256 e74398442d68bd83f177f1f7aecdc0d997709f877af1a65ebe1fd7746b43f46c
-MD5 289bc65547ac8a8f5a7f0ae5a1d03015 jcs-1.2.7.8.ebuild 1542
-RMD160 4ee634ff70a21c2739cf1a33fd9a3a5838757250 jcs-1.2.7.8.ebuild 1542
-SHA256 e74398442d68bd83f177f1f7aecdc0d997709f877af1a65ebe1fd7746b43f46c jcs-1.2.7.8.ebuild 1542
-MISC ChangeLog 769 RMD160 6e16fc944a6b438fbfc4bfaa0f8318da4a0eb6ee SHA1 24bd38983af52140c45a415585fb6db3c29cf8f8 SHA256 fa8749251f0284a201a3ed16fa7d6d06ef14f3322877d918c30d40a373385b00
-MD5 a5c59e8d44acd94ba0a9e5c5dfe90018 ChangeLog 769
-RMD160 6e16fc944a6b438fbfc4bfaa0f8318da4a0eb6ee ChangeLog 769
-SHA256 fa8749251f0284a201a3ed16fa7d6d06ef14f3322877d918c30d40a373385b00 ChangeLog 769
+EBUILD jcs-1.2.7.8.ebuild 1707 RMD160 866534274e48e415ec1e728a9a159e43283d7801 SHA1 a3aa23e91496c52e9a5291e82746898d99335099 SHA256 90ebc182df730a50379f8495d4b19e234ac6050ce515f2e971f8785a36b0dad5
+MD5 32c89ec85edd501fc47c7815fd015587 jcs-1.2.7.8.ebuild 1707
+RMD160 866534274e48e415ec1e728a9a159e43283d7801 jcs-1.2.7.8.ebuild 1707
+SHA256 90ebc182df730a50379f8495d4b19e234ac6050ce515f2e971f8785a36b0dad5 jcs-1.2.7.8.ebuild 1707
+MISC ChangeLog 999 RMD160 1d7397fc04d994b4c3e424e31a51219074036d68 SHA1 486299e57cb20f26a23c1ad17fcf61a56cad4b18 SHA256 0584a2be83436dad5c11575828e82b4023e6dcebcc3e7ef3aafb27f77e3ab6c5
+MD5 8660862310da3eba7301ef4389cc49c8 ChangeLog 999
+RMD160 1d7397fc04d994b4c3e424e31a51219074036d68 ChangeLog 999
+SHA256 0584a2be83436dad5c11575828e82b4023e6dcebcc3e7ef3aafb27f77e3ab6c5 ChangeLog 999
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
 MD5 9f455923f62e1ecb14ebb7f29636850a metadata.xml 159
 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f metadata.xml 159
 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb metadata.xml 159
-MD5 bf53101d09030752f89a261d97e0bf59 files/digest-jcs-1.2.6.5-r1 244
-RMD160 4e3ae2a5bb7a18710af92880abf4cc315745fee6 files/digest-jcs-1.2.6.5-r1 244
-SHA256 94af3b5241aa8030496bfde532afc5fd02a71715470948c7823129ac453ae2c3 files/digest-jcs-1.2.6.5-r1 244
 MD5 151e4c41590f4285084767f674f9f8e1 files/digest-jcs-1.2.7.8 238
 RMD160 e6163c9d8549cf52e540044c576ffd8fde79d3de files/digest-jcs-1.2.7.8 238
 SHA256 b70cefc749aef5c3302d58db56d57fcdfb773cdbe5818671d9f4bb0a53f00ff0 files/digest-jcs-1.2.7.8 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFBC0Xgo/w9rxVVVERAgiGAJ9Zdiey73ysMDVftTzDmmF7rBJnqQCfY6dV
-JGS1RLTTDQ7T8OjTFzBKbt8=
-=/edk
+iD8DBQFFFlX6go/w9rxVVVERAoGOAJkB0GxAZBrNctVRASlxbv7RnK2HEQCZAfXk
+QvgYX3qomKftgaPp/MJiUZQ=
+=31F/
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jcs/files/build-1.2.6.5.xml b/dev-java/jcs/files/build-1.2.6.5.xml
deleted file mode 100644
index e7e891095475..000000000000
--- a/dev-java/jcs/files/build-1.2.6.5.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!---
-   @author: Saleem Abdulrasool <compnerd@gentoo.org>
-   @date: 5/9/2005
-   @revision: 1.0_alpha
-
-   @notes: Call using the following: ant -f build.xml -Dproject.name=${project name} -Dpackage.name=${package name}
--->
-
-<project name="Gentoo_Builder" default="jar" basedir=".">
-   <property name="src" value="src/java"/>
-   <property name="build" value="build"/>
-   <property name="dist" value="dist"/>
-
-   <property name="pkg" value="${package.name}"/>
-   <property name="jar" value="${project.name}.jar"/>
-
-   <!-- Override any defined properties -->
-   <property file="build.properties"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-      <mkdir dir="${dist}"/>
-      <mkdir dir="${dist}/doc"/>
-   </target>
-
-   <target name="compile" depends="init">
-      <javac srcdir="${src}" destdir="${build}" classpath="${classpath}"/>
-   </target>
-
-   <target name="manifest" depends="init">
-      <manifest file="${build}/MANIFEST.MF" mode="update">
-         <attribute name="Built-By" value="Gentoo Portage"/>
-      </manifest>
-   </target>
-   
-   <target name="jar" depends="compile,manifest">
-      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
-         <fileset dir="${build}"/>
-      </jar>
-   </target>
-
-   <target name="javadoc" depends="compile">
-      <javadoc destdir="${dist}/doc/api">
-      	<fileset dir="${src}"/>
-      </javadoc>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build}"/>
-      <delete dir="${dist}"/>
-   </target>
-</project>
diff --git a/dev-java/jcs/files/digest-jcs-1.2.6.5-r1 b/dev-java/jcs/files/digest-jcs-1.2.6.5-r1
deleted file mode 100644
index cfb3c8f3f0be..000000000000
--- a/dev-java/jcs/files/digest-jcs-1.2.6.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4f15a3bf18f3fb99eb5f87280e6a5445 jcs-1.2.6.5.tar.bz2 11847582
-RMD160 b9a1259bcb71c3cafc67db6b112f020ff4273e6a jcs-1.2.6.5.tar.bz2 11847582
-SHA256 58cb7d3ad82a4015b0c2b44fd7ebea5eb9646f7383be3682c11ef6b442f3e0ba jcs-1.2.6.5.tar.bz2 11847582
diff --git a/dev-java/jcs/jcs-1.2.6.5-r1.ebuild b/dev-java/jcs/jcs-1.2.6.5-r1.ebuild
deleted file mode 100644
index ecc1afd65621..000000000000
--- a/dev-java/jcs/jcs-1.2.6.5-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/jcs-1.2.6.5-r1.ebuild,v 1.2 2006/07/22 20:46:40 nelchael Exp $
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_PN="jakarta-turbine-jcs"
-DESCRIPTION="JCS is a distributed caching system written in java for server-side java applications"
-HOMEPAGE="http://jakarta.apache.org/jcs/"
-# svn co http://svn.apache.org/repos/asf/jakarta/jcs/tags/JCS_1_2_6_5/ jcs-1.2.6.5
-# rm  -r jcs-1.2.6.5/tempbuild
-# tar jcvf jcs-1.2.6.5.tar.bz2 jcs-1.2.6.5
-SRC_URI="http://gentooexperimental.org/distfiles/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="1.2"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc source"
-
-COMMON_DEPEND="dev-java/jgroups
-	=dev-java/servletapi-2.3*
-	dev-java/commons-lang
-	dev-java/xmlrpc
-	dev-java/concurrent-util
-	dev-java/velocity
-	=dev-java/jisp-2.5*
-	=dev-java/struts-1.1*
-	dev-db/hsqldb"
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	source? ( app-arch/zip )
-	${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-
-#S=${WORKDIR}/${MY_PN}
-
-LIBRARY_PKGS="jgroups,servletapi-2.3,commons-lang,xmlrpc,concurrent-util,velocity,jisp-2.5,struts-1.1,hsqldb"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# TODO submit jikes patch upstream
-	#epatch ${FILESDIR}/${P}-jikes.patch
-
-	# use our own build.xml because jcs's is demented by maven
-	cp ${FILESDIR}/build-${PV}.xml build.xml
-
-	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_dohtml -r dist/doc/api
-	use source && java-pkg_dosrc src/java/*
-}