Dropped earlier revisions with equivalent keywords.

(Portage version: 2.1.2_rc1-r5)
 (Unsigned Manifest commit)

7 files changed, 4 insertions, 241 deletions

diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest
index 358dc9867bd5..c4b4f6a23ea7 100644
--- a/dev-java/struts/Manifest
+++ b/dev-java/struts/Manifest
@@ -1,31 +1,17 @@
 DIST jakarta-struts-1.1-src.tar.gz 9944708 RMD160 92ba28d9505fce58f8082f6c531ad901d3b87308 SHA1 641a3a7d2a9076ec1acfb5f3c2e86e1f831e89fd SHA256 f0b24f40a038d92fabd861f39978d81795e630462c4d2970922f085d92a664e7
-DIST jakarta-struts-1.2.2-src.tar.gz 5822503
-DIST jakarta-struts-1.2.4-src.tar.gz 10502335
 DIST struts-1.2.9-src.tar.gz 5754377 RMD160 da420cc0991a3f9056005d977ce1c46325aa9ea9 SHA1 2f461536eab7246c7ef3d647b142860b19bfd99d SHA256 7354437d04b666fc6d302b0fd14a3bb971a6389085d9f7a5ea4b25eed289400e
 EBUILD struts-1.1-r4.ebuild 2354 RMD160 3617c2b04731731de1684f42965e3ba85004a482 SHA1 d75afbc1872200954804c9f289c819659770b506 SHA256 cdba4f045b17f517b3b80aba0f10f90af18181083e81b81343f31e9b5cb9cc91
 MD5 03e38a674123224f0669096e7bc4e866 struts-1.1-r4.ebuild 2354
 RMD160 3617c2b04731731de1684f42965e3ba85004a482 struts-1.1-r4.ebuild 2354
 SHA256 cdba4f045b17f517b3b80aba0f10f90af18181083e81b81343f31e9b5cb9cc91 struts-1.1-r4.ebuild 2354
-EBUILD struts-1.2.2-r2.ebuild 2272 RMD160 b23bf837e1ed7ca268b280e2fd855d2e0c764e0d SHA1 fd454dae9f3160baa434d65711c1928a04c05bd5 SHA256 e52834c56ceea9064a27a5b2794270b878a40d1abc75b2de2c56e034bcc00675
-MD5 865dd397f11b5616702de4e9bf686be5 struts-1.2.2-r2.ebuild 2272
-RMD160 b23bf837e1ed7ca268b280e2fd855d2e0c764e0d struts-1.2.2-r2.ebuild 2272
-SHA256 e52834c56ceea9064a27a5b2794270b878a40d1abc75b2de2c56e034bcc00675 struts-1.2.2-r2.ebuild 2272
-EBUILD struts-1.2.4-r2.ebuild 2479 RMD160 0cce02146a1cf5adba65273b2b4e67dcbcd050bf SHA1 59bde4f80e4e1931e691ee90f105c02950932c71 SHA256 d472d9c3695ba6d13ae1032286e3dc736e5b7dd4662fb42849dacb0c6eebcfc0
-MD5 82216a9701d748a926f7921b8011a7b4 struts-1.2.4-r2.ebuild 2479
-RMD160 0cce02146a1cf5adba65273b2b4e67dcbcd050bf struts-1.2.4-r2.ebuild 2479
-SHA256 d472d9c3695ba6d13ae1032286e3dc736e5b7dd4662fb42849dacb0c6eebcfc0 struts-1.2.4-r2.ebuild 2479
 EBUILD struts-1.2.9-r1.ebuild 2646 RMD160 60014650b43c8f32b5f27f5b1b5dead04a67c510 SHA1 773f6c612d533b726e09bd5ed7b9035d908ef809 SHA256 8bad8864e965657477b3aa328fb6cdb9a302b70babaa6abfcf9886af1ab21f51
 MD5 9c630226c95415723d0729872e472e0f struts-1.2.9-r1.ebuild 2646
 RMD160 60014650b43c8f32b5f27f5b1b5dead04a67c510 struts-1.2.9-r1.ebuild 2646
 SHA256 8bad8864e965657477b3aa328fb6cdb9a302b70babaa6abfcf9886af1ab21f51 struts-1.2.9-r1.ebuild 2646
-EBUILD struts-1.2.9.ebuild 2710 RMD160 4ba07bde545f56a384d87236a78335957e56b6a5 SHA1 fdf1674bc2071413cf9d9f58132016bcbf24f576 SHA256 ef897fec78d137327dc9072c5573a3ed3dadd3cc9b4e3302c00d3750d6164107
-MD5 ce679cc190404905e17d5d4a53041abc struts-1.2.9.ebuild 2710
-RMD160 4ba07bde545f56a384d87236a78335957e56b6a5 struts-1.2.9.ebuild 2710
-SHA256 ef897fec78d137327dc9072c5573a3ed3dadd3cc9b4e3302c00d3750d6164107 struts-1.2.9.ebuild 2710
-MISC ChangeLog 5040 RMD160 9c591d50bf8c301f1af230cdd3b71c581a97f181 SHA1 49d7a9ceb93b37a70bc73c4782b1a9cc83e25444 SHA256 08141329a1de8e1d168d4bbff2b6b909e0ccc419187d4dbab9122a5c8de7dc8c
-MD5 08a70a4e1bfe92fa4cd5763692629f2c ChangeLog 5040
-RMD160 9c591d50bf8c301f1af230cdd3b71c581a97f181 ChangeLog 5040
-SHA256 08141329a1de8e1d168d4bbff2b6b909e0ccc419187d4dbab9122a5c8de7dc8c ChangeLog 5040
+MISC ChangeLog 5219 RMD160 6dfe67e5e491f72dadee84f00193bd463002fea7 SHA1 ca39fa98834c7cc4553fe0bd2761660e3884a33d SHA256 30b99993a561d38793998815084949ffe10b0d27590ab8c5c9c398e9359b0037
+MD5 9ef8c8b68aeb232965179a676cf8923b ChangeLog 5219
+RMD160 6dfe67e5e491f72dadee84f00193bd463002fea7 ChangeLog 5219
+SHA256 30b99993a561d38793998815084949ffe10b0d27590ab8c5c9c398e9359b0037 ChangeLog 5219
 MISC metadata.xml 446 RMD160 cef996f6ba3e4f162c7c3cb01f767fbf140fb77c SHA1 23aa61ce80aba8d36a44ab8b5716d2f938736f94 SHA256 ec0f1085c4de877f6864625a8a5d94aa7fb8589d1329c3113600210770e65c33
 MD5 78a33d5e50bccb529dda947894c83d5d metadata.xml 446
 RMD160 cef996f6ba3e4f162c7c3cb01f767fbf140fb77c metadata.xml 446
@@ -33,15 +19,6 @@ SHA256 ec0f1085c4de877f6864625a8a5d94aa7fb8589d1329c3113600210770e65c33 metadata
 MD5 9aea0ef0024c6ce696ca8129311c11b9 files/digest-struts-1.1-r4 271
 RMD160 2c7d5df77d76407f62a2cee9b04a896f7aeb113f files/digest-struts-1.1-r4 271
 SHA256 d72fd2592e98fda22c4fb4f33aae0e87e76fed0592392fcb1782e13c23e58df5 files/digest-struts-1.1-r4 271
-MD5 ca49a9860e1c5de4c613a8209e388c41 files/digest-struts-1.2.2-r2 77
-RMD160 a5e9f80331534053defdd22b25d47adcf3b52a78 files/digest-struts-1.2.2-r2 77
-SHA256 741ab8fc6d8ac815aff8a9c8e64af6a4dea58b74edbdad5ca03f9b76c45ca67f files/digest-struts-1.2.2-r2 77
-MD5 762b50289a349b2d9dad8b763f5186a0 files/digest-struts-1.2.4-r2 78
-RMD160 61c5f18e9257e8d9aa92227fdbbef703d101e384 files/digest-struts-1.2.4-r2 78
-SHA256 5582702c909c9d2bc946d14c4bb1b451e30800cd87bc924da6782306fbac5812 files/digest-struts-1.2.4-r2 78
-MD5 13d4762881f165212ab229d51b6217f1 files/digest-struts-1.2.9 253
-RMD160 8b2ae452c1acbfb02532d53e88eace3c71330008 files/digest-struts-1.2.9 253
-SHA256 43e79b85ca106a5e434d5781e616ac42d843ad950aa24c25912455e10625a365 files/digest-struts-1.2.9 253
 MD5 13d4762881f165212ab229d51b6217f1 files/digest-struts-1.2.9-r1 253
 RMD160 8b2ae452c1acbfb02532d53e88eace3c71330008 files/digest-struts-1.2.9-r1 253
 SHA256 43e79b85ca106a5e434d5781e616ac42d843ad950aa24c25912455e10625a365 files/digest-struts-1.2.9-r1 253
diff --git a/dev-java/struts/files/digest-struts-1.2.2-r2 b/dev-java/struts/files/digest-struts-1.2.2-r2
deleted file mode 100644
index 0128ce1e30a0..000000000000
--- a/dev-java/struts/files/digest-struts-1.2.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 13de04190af306cffa3a829328a06325 jakarta-struts-1.2.2-src.tar.gz 5822503
diff --git a/dev-java/struts/files/digest-struts-1.2.4-r2 b/dev-java/struts/files/digest-struts-1.2.4-r2
deleted file mode 100644
index 2c7e22cd0fa7..000000000000
--- a/dev-java/struts/files/digest-struts-1.2.4-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 136539476afecd9fbd3a1f26255aef88 jakarta-struts-1.2.4-src.tar.gz 10502335
diff --git a/dev-java/struts/files/digest-struts-1.2.9 b/dev-java/struts/files/digest-struts-1.2.9
deleted file mode 100644
index a98f89af53d1..000000000000
--- a/dev-java/struts/files/digest-struts-1.2.9
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 63ff6e570410876412f8fd97749b2415 struts-1.2.9-src.tar.gz 5754377
-RMD160 da420cc0991a3f9056005d977ce1c46325aa9ea9 struts-1.2.9-src.tar.gz 5754377
-SHA256 7354437d04b666fc6d302b0fd14a3bb971a6389085d9f7a5ea4b25eed289400e struts-1.2.9-src.tar.gz 5754377
diff --git a/dev-java/struts/struts-1.2.2-r2.ebuild b/dev-java/struts/struts-1.2.2-r2.ebuild
deleted file mode 100644
index fe40160d068c..000000000000
--- a/dev-java/struts/struts-1.2.2-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.2-r2.ebuild,v 1.5 2005/10/01 08:20:48 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
-SRC_URI="mirror://apache/struts/source/jakarta-${P}-src.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/struts/index.html"
-LICENSE="Apache-2.0"
-SLOT="1.2"
-RDEPEND=">=virtual/jre-1.4
-	=dev-java/commons-beanutils-1.6*
-	>=dev-java/commons-collections-2.1
-	dev-java/struts-legacy
-	>=dev-java/commons-digester-1.5
-	>=dev-java/commons-fileupload-1.0
-	=dev-java/commons-lang-2.0*
-	>=dev-java/commons-logging-1.0.4
-	>=dev-java/commons-validator-1.1.3
-	=dev-java/jakarta-oro-2.0*
-	=dev-java/servletapi-2.3*"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	>=dev-java/ant-1.6.0
-	jikes? ( dev-java/jikes )"
-IUSE="doc jikes"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-S=${WORKDIR}/jakarta-struts
-
-src_compile() {
-	local antflags="compile.library"
-	use doc && antflags="${antflags} compile.javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.6 commons-beanutils.jar)"
-	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjars commons-collections)"
-	antflags="${antflags} -Dstruts-legacy.jar=$(java-pkg_getjars struts-legacy)"
-	antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)"
-	antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)"
-	antflags="${antflags} -Djakarta-oro.jar=$(java-pkg_getjars jakarta-oro-2.0)"
-	antflags="${antflags} -Dservlet.jar=$(java-pkg_getjars servletapi-2.3)"
-	antflags="${antflags} -Dcommons-lang.jar=$(java-pkg_getjars commons-lang)"
-	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
-	antflags="${antflags} -Dcommons-validator.jar=$(java-pkg_getjars commons-validator)"
-
-	ant ${antflags} || die "compile failed"
-}
-
-
-src_install() {
-	java-pkg_dojar target/library/struts.jar
-
-	#install the tld files
-	insinto /usr/share/${PN}-${SLOT}/lib
-	doins target/library/*.tld
-
-	dodoc README STATUS.txt
-	use doc && java-pkg_dohtml -r target/documentation/
-}
diff --git a/dev-java/struts/struts-1.2.4-r2.ebuild b/dev-java/struts/struts-1.2.4-r2.ebuild
deleted file mode 100644
index 744c2b499267..000000000000
--- a/dev-java/struts/struts-1.2.4-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.4-r2.ebuild,v 1.2 2005/10/01 08:20:48 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
-SRC_URI="mirror://apache/struts/source/jakarta-${P}-src.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/struts/index.html"
-LICENSE="Apache-2.0"
-SLOT="1.2"
-RDEPEND=">=virtual/jre-1.4
-	=dev-java/commons-beanutils-1.6*
-	>=dev-java/commons-collections-2.1
-	dev-java/struts-legacy
-	>=dev-java/commons-digester-1.5
-	>=dev-java/commons-fileupload-1.0
-	=dev-java/commons-lang-2.0*
-	>=dev-java/commons-logging-1.0.4
-	>=dev-java/commons-validator-1.1.3
-	=dev-java/jakarta-oro-2.0*
-	=dev-java/servletapi-2.3*"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	>=dev-java/ant-1.6.0
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-IUSE="doc examples jikes source"
-KEYWORDS="~x86 ~ppc ~amd64"
-
-S=${WORKDIR}/jakarta-${P}-src
-
-src_compile() {
-	local antflags="compile.library"
-	use doc && antflags="${antflags} compile.javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.6 commons-beanutils.jar)"
-	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjars commons-collections)"
-	antflags="${antflags} -Dstruts-legacy.jar=$(java-pkg_getjars struts-legacy)"
-	antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)"
-	antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)"
-	antflags="${antflags} -Djakarta-oro.jar=$(java-pkg_getjars jakarta-oro-2.0)"
-	antflags="${antflags} -Dservlet.jar=$(java-pkg_getjars servletapi-2.3)"
-	antflags="${antflags} -Dcommons-lang.jar=$(java-pkg_getjars commons-lang)"
-	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
-	antflags="${antflags} -Dcommons-validator.jar=$(java-pkg_getjars commons-validator)"
-
-	ant ${antflags} || die "compile failed"
-}
-
-src_install() {
-	java-pkg_dojar target/library/struts.jar
-
-	#install the tld files
-	insinto /usr/share/${PN}-${SLOT}/lib
-	doins target/library/*.tld
-
-	dodoc README STATUS.txt
-	use doc && java-pkg_dohtml -r target/documentation/
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -r src/example*/* ${D}/usr/share/doc/${PF}/examples
-	fi
-	use source && java-pkg_dosrc src/share/*
-}
diff --git a/dev-java/struts/struts-1.2.9.ebuild b/dev-java/struts/struts-1.2.9.ebuild
deleted file mode 100644
index 1ff369942899..000000000000
--- a/dev-java/struts/struts-1.2.9.ebuild
+++ /dev/null
@@ -1,82 +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/struts/struts-1.2.9.ebuild,v 1.1 2006/03/31 15:49:34 karltk Exp $
-
-inherit java-pkg
-
-MY_P=${P}-src
-DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
-SRC_URI="mirror://apache/struts/source/${MY_P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/struts/index.html"
-LICENSE="Apache-2.0"
-SLOT="1.2"
-RDEPEND=">=virtual/jre-1.4
-	dev-java/antlr
-	=dev-java/commons-beanutils-1.7*
-	>=dev-java/commons-collections-2.1
-	>=dev-java/commons-digester-1.5
-	>=dev-java/commons-fileupload-1.0
-	>=dev-java/commons-logging-1.0.4
-	~dev-java/commons-validator-1.1.4
-	=dev-java/jakarta-oro-2.0*
-	=dev-java/servletapi-2.3*"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	>=dev-java/ant-1.6.0
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-IUSE="doc examples jikes source"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-
-	# the build.xml expects this directory to exist
-	mkdir ${S}/lib
-	cd ${S}/lib
-
-	# No property exists for this
-	java-pkg_jar-from commons-collections
-}
-
-src_compile() {
-	local antflags="compile.library"
-	use doc && antflags="${antflags} compile.javadoc"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-
-	# In the order the build process asks for these
-	# They are copied in the build.xml to ${S}/target/library/
-	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
-	antflags="${antflags} -Dcommons-digester.jar=$(java-pkg_getjars commons-digester)"
-	antflags="${antflags} -Dcommons-fileupload.jar=$(java-pkg_getjars commons-fileupload)"
-	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
-	antflags="${antflags} -Dcommons-validator.jar=$(java-pkg_getjars commons-validator)"
-	antflags="${antflags} -Djakarta-oro.jar=$(java-pkg_getjars jakarta-oro-2.0)"
-
-	# Needed to compile
-	antflags="${antflags} -Dservlet.jar=$(java-pkg_getjars servletapi-2.3)"
-	antflags="${antflags} -Dantlr.jar=$(java-pkg_getjars antlr)"
-
-	# only needed for contrib stuff which we don't currently build
-#	antflags="${antflags} -Dstruts-legacy.jar=$(java-pkg_getjars struts-legacy)"
-
-	ant ${antflags} || die "compile failed"
-}
-
-src_install() {
-	java-pkg_dojar target/library/struts.jar
-
-	#install the tld files
-	insinto /usr/share/${PN}-${SLOT}/lib
-	doins target/library/*.tld
-
-	dodoc README STATUS.txt
-	use doc && java-pkg_dohtml -r target/documentation/
-	if use examples; then
-		dodir /usr/share/doc/${PF}/examples
-		cp -r src/example*/* ${D}/usr/share/doc/${PF}/examples
-	fi
-	use source && java-pkg_dosrc src/share/*
-}