Remove generation 1 ebuild.

Package-Manager: portage-2.1.2.7

4 files changed, 19 insertions, 83 deletions

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index 60b866cb3099..d5861bb299e4 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/struts
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.32 2007/04/28 23:50:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.33 2007/05/17 20:09:57 betelgeuse Exp $
+
+  17 May 2007; Petteri Räty <betelgeuse@gentoo.org> -struts-1.1-r4.ebuild:
+  Remove generation 1 ebuild.
 
 *struts-1.1-r5 (28 Apr 2007)
 
@@ -116,12 +119,7 @@
   version bump
 
 *struts-1.2.2-r1 (08 Oct 2004)
-
-  08 Oct 2004; Thomas Matthijs <axxo@gentoo.org> +struts-1.1-r2.ebuild,
-  +struts-1.2.2-r1.ebuild:
-  Install *.tld files
-
-*struts-1.2.2-r1 (08 Oct 2004)
+*struts-1.1-r2 (08 Oct 2004)
 
   08 Oct 2004; Thomas Matthijs <axxo@gentoo.org> +struts-1.1-r2.ebuild,
   +struts-1.2.2-r1.ebuild:
diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest
index ced499f765b7..aade6aedad3c 100644
--- a/dev-java/struts/Manifest
+++ b/dev-java/struts/Manifest
@@ -1,9 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST jakarta-struts-1.1-src.tar.gz 9944708 RMD160 92ba28d9505fce58f8082f6c531ad901d3b87308 SHA1 641a3a7d2a9076ec1acfb5f3c2e86e1f831e89fd SHA256 f0b24f40a038d92fabd861f39978d81795e630462c4d2970922f085d92a664e7
 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.1-r5.ebuild 2251 RMD160 8f29490e817bf3be0a10615cffd39efbccdbaf97 SHA1 3b84d6a51a468c5c815c654e45e73acc2f2f1d29 SHA256 dba12830f3e65e2bd2c922525d00cf942e54f582ec3f6f6d5ea0dc17044e8045
 MD5 c47087d65bc91ee4bd773dbc01d2256f struts-1.1-r5.ebuild 2251
 RMD160 8f29490e817bf3be0a10615cffd39efbccdbaf97 struts-1.1-r5.ebuild 2251
@@ -12,20 +11,24 @@ EBUILD struts-1.2.9-r1.ebuild 2655 RMD160 a388ca106bbeb4358a96bf5a64c4ac09cc3f80
 MD5 68890a7ab78bcd0f68e03d18cf327009 struts-1.2.9-r1.ebuild 2655
 RMD160 a388ca106bbeb4358a96bf5a64c4ac09cc3f8070 struts-1.2.9-r1.ebuild 2655
 SHA256 fee2ef6d732c229c6abcd2fa4bc8c62b3daf4270b969792f06402fc37a58b75c struts-1.2.9-r1.ebuild 2655
-MISC ChangeLog 5630 RMD160 5f1799504e9d61a3cdb54e7e6aeea0834b07811f SHA1 d3c4fce17722e4c9221312beaf0befc7dae40763 SHA256 01cbf3660031b9ae4fffdeac0c0394fb7cbfd5889be275e5d251672f4705834f
-MD5 c91739e6da344b8fafd2476a34b816af ChangeLog 5630
-RMD160 5f1799504e9d61a3cdb54e7e6aeea0834b07811f ChangeLog 5630
-SHA256 01cbf3660031b9ae4fffdeac0c0394fb7cbfd5889be275e5d251672f4705834f ChangeLog 5630
+MISC ChangeLog 5616 RMD160 888aeb03832b18c93dfe21b5b42990f2ad61cc96 SHA1 a9fd1cbc7eb275b851229c09b20d88eb4dc901bd SHA256 a1e83966fb8783bff933dbb30dadde6546be57ebde9d9eba79dd0dc0bc0e3741
+MD5 0a855e2ac24f5c2c686999067dd41183 ChangeLog 5616
+RMD160 888aeb03832b18c93dfe21b5b42990f2ad61cc96 ChangeLog 5616
+SHA256 a1e83966fb8783bff933dbb30dadde6546be57ebde9d9eba79dd0dc0bc0e3741 ChangeLog 5616
 MISC metadata.xml 446 RMD160 cef996f6ba3e4f162c7c3cb01f767fbf140fb77c SHA1 23aa61ce80aba8d36a44ab8b5716d2f938736f94 SHA256 ec0f1085c4de877f6864625a8a5d94aa7fb8589d1329c3113600210770e65c33
 MD5 78a33d5e50bccb529dda947894c83d5d metadata.xml 446
 RMD160 cef996f6ba3e4f162c7c3cb01f767fbf140fb77c metadata.xml 446
 SHA256 ec0f1085c4de877f6864625a8a5d94aa7fb8589d1329c3113600210770e65c33 metadata.xml 446
-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 9aea0ef0024c6ce696ca8129311c11b9 files/digest-struts-1.1-r5 271
 RMD160 2c7d5df77d76407f62a2cee9b04a896f7aeb113f files/digest-struts-1.1-r5 271
 SHA256 d72fd2592e98fda22c4fb4f33aae0e87e76fed0592392fcb1782e13c23e58df5 files/digest-struts-1.1-r5 271
 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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGTLaWcxLzpIGCsLQRAm5HAJ0YqU/WYkt53hGqAITLpk8iiJKeqwCffLGS
+ddqh3ZzAtgxWFHgK/beLso0=
+=1k04
+-----END PGP SIGNATURE-----
diff --git a/dev-java/struts/files/digest-struts-1.1-r4 b/dev-java/struts/files/digest-struts-1.1-r4
deleted file mode 100644
index 878401922f4c..000000000000
--- a/dev-java/struts/files/digest-struts-1.1-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c21f443d145f5753d5b560a2d3c2d065 jakarta-struts-1.1-src.tar.gz 9944708
-RMD160 92ba28d9505fce58f8082f6c531ad901d3b87308 jakarta-struts-1.1-src.tar.gz 9944708
-SHA256 f0b24f40a038d92fabd861f39978d81795e630462c4d2970922f085d92a664e7 jakarta-struts-1.1-src.tar.gz 9944708
diff --git a/dev-java/struts/struts-1.1-r4.ebuild b/dev-java/struts/struts-1.1-r4.ebuild
deleted file mode 100644
index 3987e180e62d..000000000000
--- a/dev-java/struts/struts-1.1-r4.ebuild
+++ /dev/null
@@ -1,62 +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.1-r4.ebuild,v 1.4 2006/10/05 17:12:13 gustavoz Exp $
-
-inherit java-pkg
-
-DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
-SRC_URI="mirror://apache/jakarta/struts/source/jakarta-${P}-src.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/struts/index.html"
-LICENSE="Apache-1.1"
-SLOT="1.1"
-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
-	>=dev-java/commons-validator-1.0
-	=dev-java/jakarta-oro-2.0*
-	=dev-java/servletapi-2.3*"
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	>=dev-java/ant-1.5.4
-	source? ( app-arch/zip )
-	jikes? ( dev-java/jikes )"
-IUSE="doc jikes source"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-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
-	use doc && java-pkg_dohtml -r target/documentation/
-	use source && java-pkg_dosrc src/*/*
-}