Remove old, no longer needs dev-java/servletapi. #398689

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 6 insertions, 157 deletions

diff --git a/dev-java/velocity/ChangeLog b/dev-java/velocity/ChangeLog
index 28b32442f9f6..0c9698e21292 100644
--- a/dev-java/velocity/ChangeLog
+++ b/dev-java/velocity/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/velocity
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.45 2010/05/22 19:06:24 ken69267 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/ChangeLog,v 1.46 2012/01/29 11:20:15 sera Exp $
+
+  29 Jan 2012; Ralph Sennhauser <sera@gentoo.org> -velocity-1.5.ebuild,
+  -velocity-1.5-r1.ebuild:
+  Remove old, no longer needs dev-java/servletapi. #398689
 
   22 May 2010; Kenneth Prugh <ken69267@gentoo.org> velocity-1.6.3.ebuild:
   amd64 stable, bug #315559
diff --git a/dev-java/velocity/velocity-1.5-r1.ebuild b/dev-java/velocity/velocity-1.5-r1.ebuild
deleted file mode 100644
index ce7a47de3073..000000000000
--- a/dev-java/velocity/velocity-1.5-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.5-r1.ebuild,v 1.5 2010/03/30 17:38:48 fauli Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="examples doc source test"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="A Java-based template engine for easy creation/rendering of documents that format and present data."
-HOMEPAGE="http://velocity.apache.org"
-SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-CDEPEND="
-	dev-java/commons-lang:2.1
-	dev-java/commons-collections
-	dev-java/jdom:1.0
-	dev-java/log4j
-	dev-java/avalon-logkit:2.0
-	dev-java/jakarta-oro:2.0
-	java-virtuals/servlet-api:2.3
-	dev-java/werken-xpath
-	dev-java/ant-core"
-DEPEND=">=virtual/jdk-1.4
-	test? (
-		dev-java/ant-junit
-		dev-java/ant-antlr
-		dev-db/hsqldb
-	)
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -v *.jar lib/test/*.jar lib/*.jar || die
-
-	mkdir -p bin/lib
-	cd bin/lib || die
-
-	java-pkg_jar-from commons-lang-2.1
-	java-pkg_jar-from --virtual servlet-api-2.3
-	java-pkg_jar-from jdom-1.0,log4j,avalon-logkit-2.0
-	java-pkg_jar-from ant-core,commons-collections
-	java-pkg_jar-from werken-xpath,jakarta-oro-2.0
-}
-
-src_compile () {
-	cd "${S}/build"
-	eant jar -Dskip-download=true #prebuilt javadocs
-}
-
-#One test fails see #219668 :(
-RESTRICT="test"
-
-src_test() {
-	mkdir -p bin/test-lib || die
-	cd bin/test-lib || die
-	java-pkg_jar-from junit,hsqldb
-	java-pkg_jar-from --virtual servlet-api-2.3
-	cd "${S}/build"
-	ANT_TASKS="ant-junit ant-antlr" eant test -Dskip-download=true
-}
-
-src_install () {
-	java-pkg_newjar bin/*.jar
-
-	dodoc NOTICE README.txt || die
-	# has other stuff besides api too
-	use doc && java-pkg_dohtml -r docs/*
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/velocity/velocity-1.5.ebuild b/dev-java/velocity/velocity-1.5.ebuild
deleted file mode 100644
index 2d9b562832e5..000000000000
--- a/dev-java/velocity/velocity-1.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/velocity/velocity-1.5.ebuild,v 1.7 2007/08/26 14:22:12 betelgeuse Exp $
-
-JAVA_PKG_IUSE="examples doc source test"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="A Java-based template engine that allows easy creation/rendering of documents that format and present data."
-HOMEPAGE="http://velocity.apache.org"
-SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-CDEPEND="
-	>=dev-java/commons-lang-2.1
-	dev-java/commons-collections
-	>=dev-java/jdom-1.0
-	dev-java/log4j
-	>=dev-java/avalon-logkit-2.0
-	=dev-java/jakarta-oro-2.0*
-	=dev-java/servletapi-2.3*
-	dev-java/werken-xpath
-	dev-java/ant-core"
-DEPEND=">=virtual/jdk-1.4
-	test? (
-		dev-java/ant-junit
-		dev-java/ant-antlr
-		dev-db/hsqldb
-	)
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -v *.jar lib/test/*.jar lib/*.jar || die
-
-	mkdir -p bin/lib
-	cd bin/lib || die
-
-	java-pkg_jar-from commons-lang-2.1,servletapi-2.3
-	java-pkg_jar-from jdom-1.0,log4j,avalon-logkit-2.0
-	java-pkg_jar-from ant-core,commons-collections
-	java-pkg_jar-from werken-xpath,jakarta-oro-2.0
-}
-
-src_compile () {
-	cd "${S}/build"
-	eant jar -Dskip-download=true #prebuilt javadocs
-}
-
-src_test() {
-	mkdir -p bin/test-lib || die
-	cd bin/test-lib || die
-	java-pkg_jar-from junit,hsqldb,servletapi-2.3
-	cd "${S}/build"
-	ANT_TASKS="ant-junit ant-antlr" eant test -Dskip-download=true
-}
-
-src_install () {
-	java-pkg_newjar bin/*.jar
-
-	dodoc NOTICE README.txt || die
-	# has other stuff besides api too
-	use doc && java-pkg_dohtml -r docs/*
-	use examples && java-pkg_doexamples examples
-	use source && java-pkg_dosrc src/java/*
-}