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

Package-Manager: portage-2.1.2_pre1-r1

3 files changed, 64 insertions, 65 deletions

diff --git a/dev-java/jcs/ChangeLog b/dev-java/jcs/ChangeLog
index 1b1cc3e606b5..e5e1b0ea87af 100644
--- a/dev-java/jcs/ChangeLog
+++ b/dev-java/jcs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jcs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/ChangeLog,v 1.4 2006/09/10 15:19:41 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/ChangeLog,v 1.5 2006/09/24 09:54:52 nelchael Exp $
+
+  24 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/build-1.2.6.5.xml, files/build-1.2.7.8.xml, -jcs-1.2.6.5-r1.ebuild,
+  jcs-1.2.7.8.ebuild:
+  Ebuild cleanup, removed old version, added "admin" USE flag for JCS Admin.
 
   10 Sep 2006; Krzysiek Pawlik <nelchael@gentoo.org> jcs-1.2.7.8.ebuild:
   Added ~ppc.
diff --git a/dev-java/jcs/files/build-1.2.7.8.xml b/dev-java/jcs/files/build-1.2.7.8.xml
index e7e891095475..f3623a42de76 100644
--- a/dev-java/jcs/files/build-1.2.7.8.xml
+++ b/dev-java/jcs/files/build-1.2.7.8.xml
@@ -1,54 +1,40 @@
 <?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>
+  <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"/>
+  <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}"/>
+      <fileset dir="${src}">
+        <include name="**/*.vm"/>
+      </fileset>
+    </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/jcs-1.2.7.8.ebuild b/dev-java/jcs/jcs-1.2.7.8.ebuild
index 29e85e0a2f82..0f7d692ea933 100644
--- a/dev-java/jcs/jcs-1.2.7.8.ebuild
+++ b/dev-java/jcs/jcs-1.2.7.8.ebuild
@@ -1,6 +1,6 @@
 # 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.7.8.ebuild,v 1.2 2006/09/10 15:19:41 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/jcs-1.2.7.8.ebuild,v 1.3 2006/09/24 09:54:52 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -12,28 +12,26 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="1.2"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source"
+IUSE="admin doc source"
 
-COMMON_DEPEND="dev-java/jgroups
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/jisp-2.5*
 	=dev-java/servletapi-2.3*
+	dev-db/hsqldb
+	dev-java/commons-dbcp
 	dev-java/commons-lang
 	dev-java/commons-logging
 	dev-java/commons-pool
-	dev-java/commons-dbcp
-	dev-java/xmlrpc
 	dev-java/concurrent-util
-	dev-java/velocity
-	=dev-java/jisp-2.5*
-	=dev-java/struts-1.1*
-	dev-db/hsqldb"
+	dev-java/jgroups
+	dev-java/xmlrpc
+	admin? ( dev-java/velocity )"
 DEPEND=">=virtual/jdk-1.4
 	dev-java/ant-core
 	source? ( app-arch/zip )
-	${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
+	${RDEPEND}"
 
-LIBRARY_PKGS="jgroups,servletapi-2.3,commons-lang,commons-logging,commons-pool,commons-dbcp,xmlrpc,concurrent-util,velocity,jisp-2.5,struts-1.1,hsqldb"
+LIBRARY_PKGS="jgroups,servletapi-2.3,commons-lang,commons-logging,commons-pool,commons-dbcp,xmlrpc,concurrent-util,jisp-2.5,hsqldb"
 
 src_unpack() {
 	unpack ${A}
@@ -43,6 +41,16 @@ src_unpack() {
 	# 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