Cleanup.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

2 files changed, 5 insertions, 84 deletions

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index 5945dbd0b1c6..7ca426c2dbf3 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/struts
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.41 2008/04/30 15:17:08 nixnut Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.42 2009/02/15 17:36:34 caster Exp $
+
+  15 Feb 2009; Vlastimil Babka <caster@gentoo.org> -struts-1.2.9-r1.ebuild:
+  Cleanup.
 
   30 Apr 2008; nixnut <nixnut@gentoo.org> struts-1.2.9-r2.ebuild:
   Stable on ppc wrt bug 217638
diff --git a/dev-java/struts/struts-1.2.9-r1.ebuild b/dev-java/struts/struts-1.2.9-r1.ebuild
deleted file mode 100644
index bbde72273a57..000000000000
--- a/dev-java/struts/struts-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,82 +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.2.9-r1.ebuild,v 1.6 2007/05/26 23:50:20 caster Exp $
-
-JAVA_PKG_IUSE="doc examples source"
-WANT_ANT_TASKS="ant-trax"
-
-inherit java-pkg-2 java-ant-2
-
-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"
-COMMON_DEPS="
-	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*"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPS}"
-DEPEND=">=virtual/jdk-1.4
-	${COMMON_DEPS}"
-IUSE=""
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
-
-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"
-
-	# 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)"
-
-	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.txt || die
-	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/*
-}