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

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 16 insertions, 176 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/Manifest b/dev-java/velocity/Manifest
index 3c218ebe20f6..22c8ba3f27e4 100644
--- a/dev-java/velocity/Manifest
+++ b/dev-java/velocity/Manifest
@@ -1,28 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX velocity-1.4-versioned_jar.patch 2237 RMD160 2d79615b45f51d94b19967de0ae263b0fe65dd10 SHA1 c982f779d73d33bfb89c997dd908ff8327813ea5 SHA256 18fd6dad922d571a63e2a5fe2f036455ab4aea3a0c7224eba84ac8c6576baa09
-DIST velocity-1.5.tar.gz 4548966 RMD160 f9c5df89e786cb7672072d59ce2b4e02f703fdeb SHA1 9d3d0e41a69cb244597f3c886780a227980d5260 SHA256 26138ab6a2ff430f08c3410ad1a760034e48ae823a4dd15b26eed087f49fa8eb
 DIST velocity-1.6.3.tar.gz 5773231 RMD160 5f5f3a67e6bfa5ce6f2f97604f5fa6aabfe75deb SHA1 9ad441577dbf0a8b828a5759c4e98d0ebeeea748 SHA256 63b42ecd8b03a3dabb6a0cc7086844dc0af1066847fb442824b4e0e0fb622e1e
-EBUILD velocity-1.5-r1.ebuild 1965 RMD160 790caec564736e89547ce0c96450eabbca72fe58 SHA1 f9232dbafa23e1b96e95ee5b18f93e1114635b6a SHA256 c0619f68ca67f41efdf5962a9e7bd55b0e060932daa097f3a3b1cab60b7dfe5c
-EBUILD velocity-1.5.ebuild 1830 RMD160 5c87d18f616a50cbdd2dd1672940404383f5651d SHA1 46a806be2c85a42330efa51e89eaa62c5ca698d4 SHA256 5d76f6dacb4efef4c85470b08c700f26ae94df5dc10c531ca159e239af092113
 EBUILD velocity-1.6.3.ebuild 2093 RMD160 a24edc5bdd8ab36ab6909f97b807886b5e3b1e55 SHA1 08a2393401e3723b00de34c7f97a5ba1d1aa24e3 SHA256 331e52caef4b64836924a3fdc34e533e88bba933f4e4065e0fdf5cfd6dd6fdc5
-MISC ChangeLog 5975 RMD160 aa878d47b3df946a93b7bb3590f397ed69d067bd SHA1 56ad59951ad190ccd8adb37f27c30fd98fb39ee7 SHA256 7d93e68bccd77644888f32fd5e8c9876f6296195b0768121e7cf125bdd5d0bb9
+MISC ChangeLog 6130 RMD160 8e0c702bd9cd8f2cbde5c57f52f61525dc31d777 SHA1 871c37d7a9b6d778169ecd83355d275324f97dc1 SHA256 f7cb67ceff04440afaae844d6ad0660481eea722d182cacbde958a0a221f28cd
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOqmyFAAoJEF0huFKJUZL5IU0QALAGdYbBFW8eykZKDXh5B046
-emA76qhzzVC8yOvbXlCcljSfAFHlvgLpsH9mlZtzUTji3GeI6Vex0bAXxJ+7Aeh7
-lKF045tKx7w3f13q3MvBrETr3NM0L5dzpw8tFSaWmCS3l+yNGhrgzvOoq38nBTdH
-Tg+uHV77DYz6hjbl4ZK8saD11lnGEaQ2uViDn8akqd0cDXISJp8QklZ1SmG2ZGsV
-5u/WTKtzw+elTu7JL+TsKx4uDme+rb14xiHdxgXPu34W1rAjS9he7KzwcS4AE9lS
-grDoaUTK8qFBH+PwYbqdvnuQuYcxZCe9rWPR54ZB9n9Cx8y5zkaBXebtvHuTvvTz
-7LP7w+K3EgfGPj/Ii/+14wpIaYTg+75XuKWVOX5APEGk7NQEyxySP00cfwn/P3Xu
-g2v7/gNXp/3/7RsIQ4ass/+136EPHH2AGCsKRoMDTCNn508GzmDiulP63LsyEkFj
-dAAIfe8cuJnirhWmjUSftop4pIvwhjvSv3jON4pdaL57EF/CvmML4d1X4PKkQj81
-9b3ZRVttakQpXacmZIM9PxHQVvqVLcn7KPh7ahBbpEWG2BrynxnYaDFxhu/F+6RA
-O8CBt/eiP99V+DdC/3hi16UDUXN3iXvPBHIOjcI02faDgw2tSXGjMj4vfUpe1jqb
-8PR+eoHPfwU+hZiRSIkk
-=2d1M
+iQEcBAEBAgAGBQJPJSt8AAoJEIUJ+svaV1635yIH/ROyCuKb/jR6KoehcznidF6O
+coTnPtRPSDBo5Wul048wwYcSAPD4Fy/+cBsF8mKfYpgpy+ovcEcp7Smr+WlkarPx
+4d6kUG2i2uYOYuT15MTj6WtP3b3TVLFww8/hMSsXGRoZkQE1pAY0SvBwRGY2fovf
+TMoTiG203hvYIt2KcXXfmiyGSQlP+VS3fSGf/QoYV0bI405doCurJ3Zh/bWIND3n
+s2G0DlQYE4gngLs4PPm1UHI+1j5CwBCj7g/KA6ZOZsEl/148LIT+i7WFG3P/kWYk
+HYh4SNmAtiA9F4wA5kyUnf9QX+8a8NxpeBtkM/rxeBDKKwAevryauw9S8GWMKs8=
+=0b98
 -----END PGP SIGNATURE-----
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/*
-}