commit:     11e8e44c3e369d8455bcbb6ebad20790660ea0f0
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 17 23:34:07 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Jul 17 23:34:07 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=11e8e44c

Kill ye olde struts v1 and velocity-tools stuff with fire.

 dev-java/struts-legacy/ChangeLog                   |  70 -------------
 dev-java/struts-legacy/Manifest                    |   4 -
 dev-java/struts-legacy/metadata.xml                |   5 -
 dev-java/struts-legacy/struts-legacy-1.0-r2.ebuild |  36 -------
 dev-java/struts-sslext/ChangeLog                   |  11 ---
 dev-java/struts-sslext/Manifest                    |   5 -
 dev-java/struts-sslext/files/build-1.10.xml        |  54 ----------
 dev-java/struts-sslext/metadata.xml                |  12 ---
 .../struts-sslext/struts-sslext-1.10-r1.ebuild     |  48 ---------
 dev-java/struts/ChangeLog                          |  20 ----
 dev-java/struts/Manifest                           |   7 --
 dev-java/struts/files/struts-1.3.build.xml.patch   | 109 ---------------------
 dev-java/struts/metadata.xml                       |   6 --
 dev-java/struts/struts-1.1-r5.ebuild               |  60 ------------
 dev-java/struts/struts-1.3.8.ebuild                |  84 ----------------
 dev-java/velocity-tools/ChangeLog                  |  15 ---
 dev-java/velocity-tools/Manifest                   |   5 -
 .../files/velocity-tools-1.1-gentoo.patch          |  65 ------------
 dev-java/velocity-tools/metadata.xml               |   9 --
 .../velocity-tools/velocity-tools-1.1-r1.ebuild    |  71 --------------
 20 files changed, 696 deletions(-)

diff --git a/dev-java/struts-legacy/ChangeLog b/dev-java/struts-legacy/ChangeLog
deleted file mode 100644
index 27a138b..0000000
--- a/dev-java/struts-legacy/ChangeLog
+++ /dev/null
@@ -1,70 +0,0 @@
-# ChangeLog for dev-java/struts-legacy
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/ChangeLog,v 1.16 
2007/10/24 06:12:57 wltjr Exp $
-
-  24 Oct 2007; William L. Thomson Jr. <[email protected]>
-  -struts-legacy-1.0-r1.ebuild:
-  Removed java gen 1 ebuild
-
-*struts-legacy-1.0-r2 (29 Apr 2007)
-
-  29 Apr 2007; Vlastimil Babka <[email protected]>
-  +struts-legacy-1.0-r2.ebuild:
-  Revbump for migration to gen-2 eclasses.
-
-  21 Feb 2007; Piotr Jaroszyński <[email protected]> ChangeLog:
-  Transition to Manifest2.
-
-  05 Oct 2006; Gustavo Zacarias <[email protected]>
-  struts-legacy-1.0-r1.ebuild:
-  Dropping sparc keywords, see #96229
-
-  29 May 2005; Markus Rothe <[email protected]>
-  struts-legacy-1.0-r1.ebuild:
-  Stable on ppc64
-
-  07 May 2005; Jason Wever <[email protected]> struts-legacy-1.0-r1.ebuild:
-  Added ~sparc keyword.
-
-  09 Apr 2005; Markus Rothe <[email protected]>
-  struts-legacy-1.0-r1.ebuild:
-  Added ~ppc64 to KEYWORDS
-
-  16 Mar 2005; Jan Brinkmann <[email protected]>
-  struts-legacy-1.0-r1.ebuild:
-  added has_version jdbc2-stdext call to avoid error messages, depend on
-  jdbc2-stdext is conditional. fixes #85415
-
-  17 Oct 2004; Dylan Carlson <[email protected]>
-  struts-legacy-1.0-r1.ebuild:
-  keywords ~amd64; closes #67318.
-
-  16 Oct 2004; Thomas Matthijs <[email protected]>
-  struts-legacy-1.0-r1.ebuild:
-  use java-pkg_dohtml instead of dohtml to also install the package-list in
-  case of api docs: #50740
-
-  03 Oct 2004; Karl Trygve Kalleberg <[email protected]> 
struts-legacy-1.0-r1.ebuild:
-  jdbc2-stdext is present in 1.4, and is only needed for 1.3 vms. Removed old 
-  revision.
-
-  13 Jul 2004; <[email protected]> struts-legacy-1.0-r1.ebuild,
-  struts-legacy-1.0.ebuild:
-  added ~ppc keyword
-
-*struts-legacy-1.0-r1 (21 Jun 2004)
-
-  21 Jun 2004; Karl Trygve Kalleberg <[email protected]>
-  struts-legacy-1.0-r1.ebuild: Added more suitable runtime dependencies,
-  fixes #45402.
-
-  25 May 2004; Chris Aniszczyk <[email protected]> struts-legacy-1.0.ebuild:
-  Closes #51770.
-  Thanks to Claudiu Constantinescu <[email protected]> for the quick fix.
-
-*struts-legacy-1.0 (17 Mar 2004)
-
-  17 Mar 2004; Chris Aniszczyk <[email protected]> metadata.xml,
-  struts-legacy-1.0.ebuild:
-  Initial Import. Needed to build struts from source ;)
-

diff --git a/dev-java/struts-legacy/Manifest b/dev-java/struts-legacy/Manifest
deleted file mode 100644
index 8bf12ef..0000000
--- a/dev-java/struts-legacy/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST struts-legacy-1.0-src.tar.gz 12767 RMD160 
cd4915010f5151c21cdbece3d8c0f1d40ee246ee SHA1 
f4e5a366c716530132c78dd8cb0a003b34f234c7 SHA256 
c43f2585c703437a85e4b3ea0301e01d38690de225f845ace8399144c89262d0
-EBUILD struts-legacy-1.0-r2.ebuild 1121 RMD160 
185d3b13e509b39a427ca6edb6d9339068a0fa62 SHA1 
5f880d4b343b845f06055bde4b036951accfe721 SHA256 
f3266c3d2fd8738fb67c8a1bf6903cbf3335978ef1dddf1929711ce1fe60d5aa
-MISC ChangeLog 2343 RMD160 3c8b1b4b8fd2b6b05421d07b6bdb480930bcce7c SHA1 
dad67034adb3c239097be0489e9fc9c3ab609848 SHA256 
96985dab22395d5c56308adb33bb2ec450ad523b2a6de242a3d5d565b2d54cda
-MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 
c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 
295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9

diff --git a/dev-java/struts-legacy/metadata.xml 
b/dev-java/struts-legacy/metadata.xml
deleted file mode 100644
index 838c00a..0000000
--- a/dev-java/struts-legacy/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<herd>java</herd>
-</pkgmetadata>

diff --git a/dev-java/struts-legacy/struts-legacy-1.0-r2.ebuild 
b/dev-java/struts-legacy/struts-legacy-1.0-r2.ebuild
deleted file mode 100644
index 9e0acbd..0000000
--- a/dev-java/struts-legacy/struts-legacy-1.0-r2.ebuild
+++ /dev/null
@@ -1,36 +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-legacy/struts-legacy-1.0-r2.ebuild,v 
1.1 2007/04/29 00:01:43 caster Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Jakarta Struts Legacy Library"
-SRC_URI="mirror://apache/jakarta/struts/struts-legacy/${P}-src.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/struts/";
-IUSE="doc"
-COMMON_DEP="dev-java/commons-logging"
-RDEPEND=">=virtual/jre-1.4
-               ${COMMON_DEP}"
-# 1.6 adds some abstract method somewhere that this doesn't override
-DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
-               ${COMMON_DEP}"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-S=${WORKDIR}/${P}-src
-
-src_compile() {
-       sed -i 's:compile,docs:compile:' build.xml || die "sed failed"
-       echo "commons-logging.jar=$(java-pkg_getjar commons-logging 
commons-logging.jar)" > build.properties
-       echo "jdk.version=1.4" >> build.properties
-
-       eant dist $(use_doc docs)
-}
-
-src_install() {
-       java-pkg_dojar dist/${PN}.jar
-
-       newdoc STATUS.txt STATUS
-       use doc && java-pkg_dojavadoc dist/docs/api
-}

diff --git a/dev-java/struts-sslext/ChangeLog b/dev-java/struts-sslext/ChangeLog
deleted file mode 100644
index b4e79f4..0000000
--- a/dev-java/struts-sslext/ChangeLog
+++ /dev/null
@@ -1,11 +0,0 @@
-# ChangeLog for dev-java/struts-sslext
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  25 Jan 2009; Alistair Bush <[email protected]> metadata.xml,
-  struts-sslext-1.10-r1.ebuild:
-  QA Fixes.
-
-  22 Jan 2009; Alistair Bush <[email protected]> ChangeLog:
-  Add ChangeLog for QA.
-

diff --git a/dev-java/struts-sslext/Manifest b/dev-java/struts-sslext/Manifest
deleted file mode 100644
index 99dc3f5..0000000
--- a/dev-java/struts-sslext/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX build-1.10.xml 1546 RMD160 ebd507967b0bb2fabe2aac044ef60e3785189654 SHA1 
68699e0269a51d6f4eba82e5b15bd485974d8084 SHA256 
db486d24f063b5ec263d6da56b52dd2a7cae686cb9c347fb9702cc0d3dda7868
-DIST sslext-struts1.10-src.tar.gz 15711 RMD160 
60706b597e5bd658f18738929f42bff39ac18fe9 SHA1 
e68782fe354ca9a5f3d758643d736cdcda158768 SHA256 
f5587e14d3f1fc74a14b6d09741af459a4c939f14c55056762268308b42e9321
-EBUILD struts-sslext-1.10-r1.ebuild 1123 RMD160 
54a758498b9909cceb497f9afe9651d74ddb4f79 SHA1 
a7c61fc7f7e4786db9c0407bdf4a55f698283fb3 SHA256 
bf99a2500a7f999f15d0b65d07673904f73eac5a56ad7adf4c7c47eb8e1391ca
-MISC ChangeLog 320 RMD160 b9fd233526ca0a4f27d95e4e77123e46d324ad8c SHA1 
9bbadd77b07587f184a61397b91de96910cb364a SHA256 
27b78deab09502185fe2752bfbc8130f9ef3f2b23f47458c2d05ae45d97f1d8e
-MISC metadata.xml 432 RMD160 d98a028e73713b5602875e2bd548eb94d7ce9e01 SHA1 
4f1781fa109f5b1f19adb8e31e2e5e1ea7138aaf SHA256 
23f250345b8eafe02247b5593f5cf1e0d2bdbb6a812b6c13779e3c226faccf80

diff --git a/dev-java/struts-sslext/files/build-1.10.xml 
b/dev-java/struts-sslext/files/build-1.10.xml
deleted file mode 100644
index 4153ebf..0000000
--- a/dev-java/struts-sslext/files/build-1.10.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!---
-   @author: Saleem Abdulrasool <[email protected]>
-   @date: 5/9/2005
-   @revision: 1.0_alpha
-
-   @notes: Call using the following: ant -f build.xml -Dproject.name=${project 
name} -Dpackage.name=${package name}
--->
-
-<project name="Gentoo_Builder" default="jar" basedir=".">
-   <property name="src" value="src"/>
-   <property name="build" value="build"/>
-   <property name="dist" value="dist"/>
-
-   <property name="pkg" value="${package.name}"/>
-   <property name="jar" value="${project.name}.jar"/>
-
-   <!-- Override any defined properties -->
-   <property file="build.properties"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-      <mkdir dir="${dist}"/>
-      <mkdir dir="${dist}/doc"/>
-   </target>
-
-   <target name="compile" depends="init">
-      <javac srcdir="${src}" destdir="${build}" classpath="${classpath}"/>
-   </target>
-
-   <target name="manifest" depends="init">
-      <manifest file="${build}/MANIFEST.MF" mode="update">
-         <attribute name="Built-By" value="Gentoo Portage"/>
-      </manifest>
-   </target>
-   
-   <target name="jar" depends="compile,manifest">
-      <jar jarfile="${dist}/${jar}" manifest="${build}/MANIFEST.MF">
-         <fileset dir="${build}"/>
-      </jar>
-   </target>
-
-   <target name="javadoc" depends="compile">
-      <javadoc destdir="${dist}/doc/api">
-       <fileset dir="${src}"/>
-      </javadoc>
-   </target>
-
-   <target name="clean">
-      <delete dir="${build}"/>
-      <delete dir="${dist}"/>
-   </target>
-</project>

diff --git a/dev-java/struts-sslext/metadata.xml 
b/dev-java/struts-sslext/metadata.xml
deleted file mode 100644
index 1382a7d..0000000
--- a/dev-java/struts-sslext/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-       <herd>java</herd>
-       <longdescription>
-               Extension to the Apache Jakarta Struts framework that allows 
developers
-               to configure web applications to automatically switch between 
the http
-               and https protocols. Configuration is performed within the 
Struts config
-               xml file.
-       </longdescription>
-</pkgmetadata>
-

diff --git a/dev-java/struts-sslext/struts-sslext-1.10-r1.ebuild 
b/dev-java/struts-sslext/struts-sslext-1.10-r1.ebuild
deleted file mode 100644
index 1223200..0000000
--- a/dev-java/struts-sslext/struts-sslext-1.10-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="sslext"
-MY_A="sslext-struts${PV}-src"
-DESCRIPTION="Extension to Struts that allows automatically switching between 
the http and https."
-HOMEPAGE="http://sslext.sourceforge.net/";
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_A}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-COMMON_DEPEND="=dev-java/struts-1.1*
-       ~dev-java/servletapi-2.4
-       dev-java/commons-digester
-       dev-java/commons-logging"
-DEPEND=">=virtual/jdk-1.4
-       dev-java/ant-core
-       ${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.4
-       ${COMMON_DEPEND}"
-
-src_unpack() {
-       mkdir -p "${S}/src"
-       cd "${S}/src"
-       unpack ${A}
-
-       cd "${S}"
-       cp "${FILESDIR}/build-${PV}.xml" build.xml
-       local classpath
-       classpath=$(java-pkg_getjars 
struts-1.1,servletapi-2.4,commons-digester,commons-logging)
-       echo "classpath=${classpath}" > build.properties
-}
-
-src_compile() {
-       eant -Dproject.name=${PN} jar $(use_doc)
-}
-
-src_install() {
-       java-pkg_dojar dist/${PN}.jar
-
-       use doc && java-pkg_dohtml -r dist/doc/api
-}

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
deleted file mode 100644
index fb555c1..0000000
--- a/dev-java/struts/ChangeLog
+++ /dev/null
@@ -1,20 +0,0 @@
-# ChangeLog for dev-java/struts
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  15 Feb 2009; Vlastimil Babka <[email protected]> struts-1.3.8.ebuild:
-  Slot dep on commons-beanutils.
-
-  20 Jan 2009; Alistair Bush <[email protected]> +metadata.xml,
-  struts-1.1-r5.ebuild, -struts-1.3.5.ebuild, struts-1.3.8.ebuild:
-  Drop ~ppc as unsatisfied deps. QA Fixes.
-
-  08 Feb 2008; Petteri Räty <[email protected]> +struts-1.1-r5.ebuild:
-  Add struts:1.1 from the main tree. Nothing there needs it.
-
-  26 Dec 2007; <[email protected]> +struts-1.3.8.ebuild:
-  Bumped struts to 1.3.8
-
-  08 May 2007; Vlastimil Babka <[email protected]> struts-1.3.5.ebuild:
-  Update bsf dep.
-

diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest
deleted file mode 100644
index a8e172a..0000000
--- a/dev-java/struts/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX struts-1.3.build.xml.patch 4221 RMD160 
53752553fff763a9735c1733d05f02a6ca472f75 SHA1 
b0d91411189ec7f9047e1da775615ca821cb9849 SHA256 
46311dc84ecb7e9a57e64423cbf6466c82dcb9366f819f33b73dd97085b9556d
-DIST jakarta-struts-1.1-src.tar.gz 9944708 RMD160 
92ba28d9505fce58f8082f6c531ad901d3b87308 SHA1 
641a3a7d2a9076ec1acfb5f3c2e86e1f831e89fd SHA256 
f0b24f40a038d92fabd861f39978d81795e630462c4d2970922f085d92a664e7
-DIST struts-1.3.8-src.zip 6366579 RMD160 
da793324675a11f88c5834e242f881f3c1e4f9ff SHA1 
a8ad316848406e53983bdefb98cfcedff2f0dc03 SHA256 
640cfc87192f7f5d0c1e8efcabbbb8f03ad521f6168c3e7c35a6419bfd4804a6
-EBUILD struts-1.1-r5.ebuild 2182 RMD160 
dc6b2198810edb2e0d5946eff5e25f005979c5ca SHA1 
a165c2c6d91c61ec55829e77d5f750a3757fec56 SHA256 
8c319c9e038dfa1fd278e1a7ec6fdc52e66d7fd6021e2f6b38bbdcebc9a45294
-EBUILD struts-1.3.8.ebuild 1820 RMD160 
4a28bbb3ad65d1a8d20c8124b079a20b3db4120f SHA1 
7594663468c4aaca2ef88d1442386ba0975392ed SHA256 
f726b8ef9b21149b57ee414f0eded7025dc52e142bd4c783e4119e71ca53d7bc
-MISC ChangeLog 713 RMD160 4063e5a2c8d82d99c1681770dfc23ea731884fee SHA1 
d7d6feb496e9eeb94797bc37865d47eb10e834f0 SHA256 
8ba14e98a690a70dda5e5c87f210916020a7f5def08ef485ac76b211615fc00e
-MISC metadata.xml 159 RMD160 5259d4be0ca7b74c28e711d45a289def9aeadbd9 SHA1 
c4ec40cd8f19e0d780a5133941bc50043be198cf SHA256 
1c070a909e96d9d193f84ad9304d196febbe33b60a724cc4b0d20634bb82255b

diff --git a/dev-java/struts/files/struts-1.3.build.xml.patch 
b/dev-java/struts/files/struts-1.3.build.xml.patch
deleted file mode 100644
index 83af872..0000000
--- a/dev-java/struts/files/struts-1.3.build.xml.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- /dev/null  2000-10-22 01:01:00.000000000 +0200
-+++ build.xml  2006-10-22 12:59:14.000000000 +0200
-@@ -0,0 +1,106 @@
-+<?xml version="1.0" ?>
-+      <project basedir="." default="all-modules" name="struts">
-+      <property name="build.dir" value="target"/>
-+      <property name="build.output" value="classes"/>
-+      <property name="lib.dir" value="lib"/>
-+      <property name="base.src.dir" value="src/main"/>
-+
-+      <target name="all-modules" description="Packages ALL MODULES">
-+              <antcall target="compileWithProperties">
-+                      <param name="module.name" value="core"/>
-+              </antcall>
-+              <antcall target="compileWithProperties">
-+                      <param name="module.name" value="taglib"/>
-+              </antcall>
-+              <antcall target="compileWithProperties">
-+                      <param name="module.name" value="extras"/>
-+              </antcall>
-+              <antcall target="compileWithoutProperties">
-+                      <param name="module.name" value="tiles"/>
-+              </antcall>
-+              <antcall target="compileWithoutProperties">
-+                      <param name="module.name" value="scripting"/>
-+              </antcall>
-+              <antcall target="compileWithoutProperties">
-+                      <param name="module.name" value="el"/>
-+              </antcall>
-+              <antcall target="compileWithProperties">
-+                      <param name="module.name" value="faces"/>
-+              </antcall>
-+      </target>
-+
-+      <target description="Create component Javadoc documentation" 
name="javadoc">
-+              <mkdir dir="${build.dir}/docs"/>
-+              <javadoc author="true" bottom="Copyright (c) 2000-2006 Apache 
Software Foundation" destdir="${build.dir}/docs" doctitle="&lt;h1&gt;Struts 
(Version 1.3.5)&lt;/h1&gt;" packagenames="org.apache.*" private="true" 
source="1.4" version="true" windowtitle="Struts (Version 1.3.5)">
-+                      <classpath>
-+                              <fileset dir="${lib.dir}">
-+                                      <include name="**/*.jar"/>
-+                              </fileset>
-+                      </classpath>
-+                      <fileset dir="core/${base.src.dir}/java">
-+                              <include name="**/*.java"/>
-+                      </fileset>
-+                      <fileset dir="taglib/${base.src.dir}/java">
-+                              <include name="**/*.java"/>
-+                      </fileset>
-+                      <fileset dir="extras/${base.src.dir}/java">
-+                              <include name="**/*.java"/>
-+                      </fileset>
-+                      <fileset dir="tiles/${base.src.dir}/java">
-+                              <include name="**/*.java"/>
-+                      </fileset>
-+                      <fileset dir="scripting/${base.src.dir}/java">
-+                              <include name="**/*.java"/>
-+                      </fileset>
-+                      <fileset dir="el/${base.src.dir}/java">
-+                              <include name="**/*.java"/>
-+                      </fileset>
-+                      <fileset dir="faces/${base.src.dir}/java">
-+                              <include name="**/*.java"/>
-+                      </fileset>
-+              </javadoc>
-+      </target>
-+
-+<!-- HELPER TARGETS -->
-+
-+      <target name="compileWithoutProperties" description="Packages a module: 
give it a -module.name- parameter">
-+              <antcall target="compile">
-+                      <param name="module.name" value="${module.name}"/>
-+              </antcall>
-+              <antcall target="jar">
-+                      <param name="module.name" value="${module.name}"/>
-+              </antcall>
-+      </target>
-+      <target name="compileWithProperties" description="Packages a module AND 
copy its properties files: give it a -module.name- parameter">
-+              <antcall target="compile">
-+                      <param name="module.name" value="${module.name}"/>
-+              </antcall>
-+              <copy todir="${build.dir}/${module.name}/${build.output}">
-+                      <fileset dir="${module.name}/${base.src.dir}/java">
-+                              <include name="**/*.properties"/>
-+                      </fileset>
-+              </copy>
-+              <antcall target="jar">
-+                      <param name="module.name" value="${module.name}"/>
-+              </antcall>
-+      </target>
-+      <target description="Generic COMPILE target: give it a -module.name- 
parameter" name="compile">
-+              <mkdir dir="${build.dir}/${module.name}/${build.output}"/>
-+              <javac debug="true" deprecation="true" 
destdir="${build.dir}/${module.name}/${build.output}" 
excludes="**/package.html" optimize="false" source="1.4" target="1.4">
-+                      <src>
-+                              <pathelement 
location="${module.name}/${base.src.dir}/java"/>
-+                      </src>
-+                      <classpath>
-+                              <fileset dir="${lib.dir}">
-+                                      <include name="**/*.jar"/>
-+                              </fileset>
-+                      </classpath>
-+              </javac>
-+              <copy todir="${build.dir}/${module.name}/${build.output}">
-+                      <fileset 
dir="${module.name}/${base.src.dir}/resources"/>
-+              </copy>
-+      </target>
-+      <target description="Generic JAR target: give it a -module.name- 
parameter" name="jar">
-+              <jar basedir="${build.dir}/${module.name}/${build.output}" 
excludes="**/package.html" jarfile="${lib.dir}/struts-${module.name}.jar"/>
-+      </target>
-+</project>

diff --git a/dev-java/struts/metadata.xml b/dev-java/struts/metadata.xml
deleted file mode 100644
index 604e0a4..0000000
--- a/dev-java/struts/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-       <herd>java</herd>
-</pkgmetadata>
-

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 4727e2b..0000000
--- a/dev-java/struts/struts-1.1-r5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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 ~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/*/*
-}

diff --git a/dev-java/struts/struts-1.3.8.ebuild 
b/dev-java/struts/struts-1.3.8.ebuild
deleted file mode 100644
index f616ea0..0000000
--- a/dev-java/struts/struts-1.3.8.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=1
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets"
-SRC_URI="mirror://apache/struts/source/${P}-src.zip"
-HOMEPAGE="http://struts.apache.org/";
-LICENSE="Apache-2.0"
-SLOT="1.3"
-IUSE="doc source"
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEP="
-       >=dev-java/antlr-2.7.2
-       dev-java/commons-beanutils:1.7
-       =dev-java/commons-chain-1.1*
-       >=dev-java/jakarta-jstl-1
-       >=dev-java/commons-logging-1
-       >=dev-java/commons-digester-1.8
-       =dev-java/commons-validator-1.3*
-       =dev-java/jakarta-oro-2.0*
-       >=dev-java/commons-fileupload-1.1.1
-       =dev-java/servletapi-2.3*
-       >=dev-java/bsf-2.3
-       =dev-java/jsfapi-1*
-       >=dev-java/junit-3.8"
-
-RDEPEND=">=virtual/jre-1.4
-       ${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
-       ${RDEPEND}
-       >=dev-java/ant-1.6.0
-       app-arch/zip
-       app-arch/unzip"
-
-S="${WORKDIR}/${P}/src"
-
-src_unpack() {
-       unpack ${A}
-
-       cd "${S}"
-
-       mkdir lib
-
-       cd lib
-       java-pkg_jarfrom antlr
-       java-pkg_jarfrom commons-beanutils-1.7
-       java-pkg_jarfrom commons-chain-1.1
-       java-pkg_jarfrom jakarta-jstl
-       java-pkg_jarfrom commons-logging
-       java-pkg_jarfrom commons-digester
-       java-pkg_jarfrom commons-validator-1.3
-       java-pkg_jarfrom jakarta-oro-2.0
-       java-pkg_jarfrom commons-fileupload
-       java-pkg_jarfrom servletapi-2.3
-       java-pkg_jarfrom bsf-2.3
-       java-pkg_jarfrom jsfapi-1
-       java-pkg_jarfrom junit
-       cd ..
-
-       epatch "${FILESDIR}/struts-1.3.build.xml.patch"
-}
-
-src_compile() {
-       eant all-modules $(use_doc)
-}
-
-src_install() {
-       for module_name in "core" "taglib" "extras" "tiles" "scripting" "el" 
"faces"
-       do
-               java-pkg_dojar "lib/struts-${module_name}.jar"
-
-               use source && java-pkg_dosrc ${module_name}/src/main/java/*
-       done
-
-       dodoc ../NOTICE.txt ../LICENSE.txt
-
-       use doc && dohtml -r target/docs/
-}

diff --git a/dev-java/velocity-tools/ChangeLog 
b/dev-java/velocity-tools/ChangeLog
deleted file mode 100644
index c911d40..0000000
--- a/dev-java/velocity-tools/ChangeLog
+++ /dev/null
@@ -1,15 +0,0 @@
-# ChangeLog for dev-java/velocity-tools
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  21 Jan 2009; Alistair Bush <[email protected]> +metadata.xml,
-  velocity-tools-1.1-r1.ebuild:
-  Drop keywords due to missing deps. QA Fixes.
-
-  07 Jun 2007; kiorky <[email protected]> velocity-tools-1.1-r1.ebuild:
-  fix to compile and install correctly. Fix typos and increase use of eclasses.
-
-  06 Jun 2007; Miroslav Šulc <[email protected]>
-  velocity-tools-1.1-r1.ebuild:
-  Dropped 'jikes' USE flag
-

diff --git a/dev-java/velocity-tools/Manifest b/dev-java/velocity-tools/Manifest
deleted file mode 100644
index 9a37b34..0000000
--- a/dev-java/velocity-tools/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX velocity-tools-1.1-gentoo.patch 2465 RMD160 
13656864d5443a74564ab517ada10ebc19aff0d2 SHA1 
309ee981abad50328d57ff1dbb6b0702877c38a9 SHA256 
e37b6ebd3f3e5cb27b259052a1d1040527777f3b1b999d00cd0b7b41d52a7681
-DIST velocity-tools-1.1-src.tar.gz 2061359 RMD160 
5cc6990fed4215ac8f15f6f32772bf94acd4af57 SHA1 
bbd0ff90fe76c976908fabfcd29384fae75d095c SHA256 
19c4a9c1cd62ae10c5c8b69df9727fe27f76df6a4a6d63fe775963157a4d310d
-EBUILD velocity-tools-1.1-r1.ebuild 1576 RMD160 
75e602cb80b6f868c1a4ebd15ba1f40b59de83c9 SHA1 
2a946656877a24cbb8cff788ac89f7a83c7fe122 SHA256 
2704a17819d13cb4dbd9526435d32205eb27ec8bfb429fbec945bce4c660b7e2
-MISC ChangeLog 539 RMD160 9b3d2c617ac7d748b61393963fe6ed6b87c692c2 SHA1 
f683242522f25030c7092cebc45d38c94ec8f9ac SHA256 
53a52881f6d5bc26450b2f5d79146ddea2f6d470e529575e1a825d4b0d536808
-MISC metadata.xml 376 RMD160 618fa70e5cfb39902da6882a51274cbd2f957189 SHA1 
ade3d9cda2bde07aca3c42a744e60c433db3c517 SHA256 
b865645e56b02cfdedae90b047c51d937652beb5d348840843bf9c04b1d3b4d8

diff --git a/dev-java/velocity-tools/files/velocity-tools-1.1-gentoo.patch 
b/dev-java/velocity-tools/files/velocity-tools-1.1-gentoo.patch
deleted file mode 100644
index 5e4de52..0000000
--- a/dev-java/velocity-tools/files/velocity-tools-1.1-gentoo.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -ru velocity-tools/build.properties 
velocity-tools-patched/build.properties
---- velocity-tools/build.properties    2003-10-14 20:03:56.000000000 -0400
-+++ velocity-tools-patched/build.properties    2005-07-02 15:24:13.000000000 
-0400
-@@ -14,7 +14,7 @@
- servlet.jar=${tools.lib.path}/servlet.jar
- struts.jar=${tools.lib.path}/struts.jar
- sslext.jar=${tools.lib.path}/sslext.jar
--velocity.jar=${tools.lib.path}/velocity-dep-1.3.1.jar
-+velocity.jar=${tools.lib.path}/velocity.jar
- velocity-dvsl.jar=${tools.lib.path}/velocity-dvsl-0.43.jar
- 
- # JDK 1.3 users will need to specify this
-diff -ru velocity-tools/build.xml velocity-tools-patched/build.xml
---- velocity-tools/build.xml   2004-05-17 11:56:36.000000000 -0400
-+++ velocity-tools-patched/build.xml   2005-07-02 18:11:14.000000000 -0400
-@@ -55,6 +55,7 @@
- 
-   <!-- Construct classpath of all jars in lib repository -->
-   <path id="lib.classpath">
-+      <pathelement path="${portage.classpath}"/>
-     <fileset dir="${lib.home}">
-       <include name="**/*.jar"/>
-     </fileset>
-@@ -62,18 +63,7 @@
- 
-   <!-- Construct explicit classpath of libs needed to compile this project -->
-   <path id="compile.classpath">
--    <pathelement location="${commons-collections.jar}"/>
--    <pathelement location="${commons-digester.jar}"/>
--    <pathelement location="${commons-logging.jar}"/>
--    <pathelement location="${commons-validator.jar}"/>
--    <pathelement location="${struts.jar}"/>
--    <pathelement location="${sslext.jar}"/>
--    <pathelement location="${servlet.jar}"/>
--    <pathelement location="${velocity.jar}"/>
--
--    <!-- for JDK 1.3 users -->
--    <pathelement location="${jdbc.jar}"/>
--    <pathelement location="${xerces.jar}"/>
-+      <path refid="lib.classpath"/>
-   </path>
- 
- 
-@@ -215,6 +205,8 @@
-     </jar>
-   </target>
- 
-+  <target name="jar" depends="jar.struts,jar.view,jar.generic"/>
-+
- 
- 
-   <!-- Build Javadocs (struts, view, generic) -->
-@@ -241,11 +233,7 @@
-   <!-- Build Velocity-Tools documentation -->
-   <target name="docs" description="Generate documentation into ${docs.dir}">
-     <taskdef name="dvsl" classname="org.apache.tools.dvsl.DVSLTask">
--      <classpath>
--        <pathelement location="${dom4j.jar}"/>
--        <pathelement location="${velocity.jar}"/>
--        <pathelement location="${velocity-dvsl.jar}"/>
--      </classpath>
-+      <classpath refid="lib.classpath"/>
-     </taskdef>
- 
-     <dvsl basedir="${docs.src}"

diff --git a/dev-java/velocity-tools/metadata.xml 
b/dev-java/velocity-tools/metadata.xml
deleted file mode 100644
index 9815b8a..0000000
--- a/dev-java/velocity-tools/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-       <herd>java</herd>
-       <longdescription>
-               A collection of Velocity subprojects with a common goal of 
creating tools and infrastructure for building both web and non-web 
applications using the Velocity template engine.
-       </longdescription>
-</pkgmetadata>
-

diff --git a/dev-java/velocity-tools/velocity-tools-1.1-r1.ebuild 
b/dev-java/velocity-tools/velocity-tools-1.1-r1.ebuild
deleted file mode 100644
index e060d7c..0000000
--- a/dev-java/velocity-tools/velocity-tools-1.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-JAVA_PKG_IUSE="doc"
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="A collection of Velocity subprojects for web and non-web apps 
using the Velocity template engine."
-HOMEPAGE="http://jakarta.apache.org/velocity/tools/";
-SRC_URI="http://archive.apache.org/dist/jakarta/${PN}/source/${P}-src.tar.gz";
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-COMMON_DEPEND="
-=dev-java/commons-beanutils-1.6*
-dev-java/commons-collections
-dev-java/commons-digester
-dev-java/commons-logging
-dev-java/commons-validator
-=dev-java/dom4j-1*
-dev-java/dvsl
-=dev-java/jaxen-1.1*
-=dev-java/servletapi-2.3*
-=dev-java/struts-1.1*
-=dev-java/struts-sslext-1.1*
-dev-java/velocity
-dev-java/dvsl
-"
-DEPEND=">=virtual/jdk-1.4
-${COMMON_DEPEND}"
-RDEPEND=">=virtual/jre-1.4
-${COMMON_DEPEND}"
-
-EANT_GENTOO_CLASSPATH="
-commons-beanutils-1.6
-commons-collections
-commons-digester
-commons-logging
-commons-validator
-dom4j-1
-jaxen-1.1
-servletapi-2.3
-struts-1.1
-struts-sslext-1.1
-velocity
-dvsl
-"
-EANT_DOC_TARGET="javadoc"
-EANT_EXTRA_ARGS="-Dproject.name=${PN}"
-EANT_BUILD_TARGET="jar.struts jar.view jar.generic"
-
-src_unpack() {
-       mkdir "${S}" || die
-       cd "${S}" || die
-       unpack ${A}
-
-       rm "${S}"/lib/*.jar || die
-
-       java-ant_rewrite-classpath "${S}/build.xml"
-
-}
-
-src_install() {
-       java-pkg_newjar dist/${P}.jar ${PN}.jar
-       java-pkg_newjar dist/${PN}-generic-${PV}.jar ${PN}-generic.jar
-       java-pkg_newjar dist/${PN}-view-${PV}.jar ${PN}-view.jar
-
-       use doc && java-pkg_dojavadoc "${S}/docs/javadoc"
-}

Reply via email to