Remove generation 1 ebuild.

(Portage version: 2.1.2.7)

3 files changed, 5 insertions, 72 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/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/*/*
-}