struts:1.1 moved to java overlay as nothing in the main tree needs it

Package-Manager: portage-2.1.4.1

3 files changed, 16 insertions, 65 deletions

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index b5d8f13b9b77..b973a6e154d2 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.36 2007/05/26 23:50:20 caster Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.37 2008/02/08 15:23:39 betelgeuse Exp $
+
+  08 Feb 2008; Petteri Räty <betelgeuse@gentoo.org> -struts-1.1-r5.ebuild:
+  struts:1.1 moved to java overlay as nothing in the main tree needs it
 
   26 May 2007; Vlastimil Babka <caster@gentoo.org> struts-1.2.9-r1.ebuild:
   Migrated to split-ant, style cleanup.
diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest
index 8fa0f8b3672d..939fb71867d2 100644
--- a/dev-java/struts/Manifest
+++ b/dev-java/struts/Manifest
@@ -1,6 +1,14 @@
-DIST jakarta-struts-1.1-src.tar.gz 9944708 RMD160 92ba28d9505fce58f8082f6c531ad901d3b87308 SHA1 641a3a7d2a9076ec1acfb5f3c2e86e1f831e89fd SHA256 f0b24f40a038d92fabd861f39978d81795e630462c4d2970922f085d92a664e7
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST struts-1.2.9-src.tar.gz 5754377 RMD160 da420cc0991a3f9056005d977ce1c46325aa9ea9 SHA1 2f461536eab7246c7ef3d647b142860b19bfd99d SHA256 7354437d04b666fc6d302b0fd14a3bb971a6389085d9f7a5ea4b25eed289400e
-EBUILD struts-1.1-r5.ebuild 2289 RMD160 59c5556ff79be04788fe24e080a3fecd1f8dd1f0 SHA1 72d05f1b066b1713a47d6791eef6290524fc8c7b SHA256 27fb4a8211621f1c84cd2d0f518ea236acb15f986db354b8405d2bc229dab0ac
 EBUILD struts-1.2.9-r1.ebuild 2641 RMD160 4ae0f9e53f572b61f533e06c4f56b0598bf053ca SHA1 08b60629c7d12a6e55d01be1ec8d99e236e3cd98 SHA256 72f9c564fe70589911b15e15c83cd9cdd919aad479e73c4df1e8b279b06f69cd
-MISC ChangeLog 5979 RMD160 78c30c72a5db5afa30ebde308d91b5a2cd0e606c SHA1 268b7ba2a8e2f5b51942c583415c9ce02f8406c8 SHA256 628a460bb5f33f3da5c503b6d7d34c7223e91b73e4c044bc66f838643bef1dcc
+MISC ChangeLog 6132 RMD160 6d6b5f6eec11863289d37fa5e3709bea6d5fdbb9 SHA1 92f57f3dadca7c9ecfd13846fd828fcd81adca7e SHA256 37d2b62c59d0bf9607f6b38ea3c0c209e00109c440d2c92e8c0cf0910c2876ad
 MISC metadata.xml 446 RMD160 cef996f6ba3e4f162c7c3cb01f767fbf140fb77c SHA1 23aa61ce80aba8d36a44ab8b5716d2f938736f94 SHA256 ec0f1085c4de877f6864625a8a5d94aa7fb8589d1329c3113600210770e65c33
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHrHL6cxLzpIGCsLQRAnssAJ4uDHZRfk7sAlQoFztNXvqK1goLOACfRR8P
+jEfE47UvAT8Ywh7Uyub+Q/w=
+=BlRr
+-----END PGP SIGNATURE-----
diff --git a/dev-java/struts/struts-1.1-r5.ebuild b/dev-java/struts/struts-1.1-r5.ebuild
deleted file mode 100644
index 48ef8cbe21f1..000000000000
--- a/dev-java/struts/struts-1.1-r5.ebuild
+++ /dev/null
@@ -1,60 +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/struts/struts-1.1-r5.ebuild,v 1.2 2007/05/17 20:38:39 betelgeuse Exp $
-
-WANT_ANT_TASKS="ant-trax"
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-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"
-COMMON_DEP="=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.1*
-	=dev-java/jakarta-oro-2.0*
-	=dev-java/servletapi-2.3*"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEP}"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S=${WORKDIR}/jakarta-${P}-src
-
-src_compile() {
-	local antflags="compile.library"
-	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.6 commons-beanutils.jar)"
-	antflags="${antflags} -Dcommons-collections.jar=$(java-pkg_getjar \
-		commons-collections commons-collections.jar)"
-	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)"
-
-	eant ${antflags} $(use_doc compile.javadoc)
-}
-
-src_install() {
-	java-pkg_dojar target/library/${PN}.jar
-
-	# install the tld files
-	insinto /usr/share/${PN}-${SLOT}/lib
-	doins target/library/*.tld
-
-	dodoc README STATUS || die
-	use doc && java-pkg_dojavadoc target/documentation/api
-	use source && java-pkg_dosrc src/*/*
-}