Switched to java-virtuals/servlet-api and EAPI=1 slots.

(Portage version: 2.1.4.1)

3 files changed, 141 insertions, 1 deletions

diff --git a/dev-java/jcs/ChangeLog b/dev-java/jcs/ChangeLog
index ed1026e763e1..1f6d8219dfec 100644
--- a/dev-java/jcs/ChangeLog
+++ b/dev-java/jcs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jcs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/ChangeLog,v 1.17 2008/03/22 01:15:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcs/ChangeLog,v 1.18 2008/03/22 20:25:18 wltjr Exp $
+
+*jcs-1.3-r1 (22 Mar 2008)
+*jcs-1.2.7.9-r1 (22 Mar 2008)
+
+  22 Mar 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  +jcs-1.2.7.9-r1.ebuild, +jcs-1.3-r1.ebuild:
+  Switched to java-virtuals/servlet-api and EAPI=1 slots.
 
   22 Mar 2008; Markus Meier <maekke@gentoo.org> jcs-1.3.ebuild:
   amd64 stable, bug #204646
diff --git a/dev-java/jcs/jcs-1.2.7.9-r1.ebuild b/dev-java/jcs/jcs-1.2.7.9-r1.ebuild
new file mode 100644
index 000000000000..8e1c46c92912
--- /dev/null
+++ b/dev-java/jcs/jcs-1.2.7.9-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2008 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.1 2008/03/22 20:25:18 wltjr 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://jakarta.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
+	dev-java/commons-lang:0
+	dev-java/commons-logging
+	dev-java/commons-pool
+	dev-java/concurrent-util
+	dev-java/jgroups
+	dev-java/xmlrpc
+	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
new file mode 100644
index 000000000000..0e911d194a37
--- /dev/null
+++ b/dev-java/jcs/jcs-1.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2008 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.1 2008/03/22 20:25:18 wltjr 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://jakarta.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
+	dev-java/commons-logging
+	dev-java/commons-pool
+	dev-java/concurrent-util
+	dev-java/xmlrpc
+	admin? ( dev-java/velocity )"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+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/*
+}