commit: d7d799af7b62b39ed22b7f6c80caa84a8c3b003e
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 13:43:05 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 13:51:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7d799af
dev-java/velocity: Clean up old.
Package-Manager: portage-2.2.28
.../files/velocity-1.4-versioned_jar.patch | 48 ------------
dev-java/velocity/velocity-1.7-r1.ebuild | 87 ----------------------
dev-java/velocity/velocity-1.7.ebuild | 87 ----------------------
3 files changed, 222 deletions(-)
diff --git a/dev-java/velocity/files/velocity-1.4-versioned_jar.patch
b/dev-java/velocity/files/velocity-1.4-versioned_jar.patch
deleted file mode 100644
index 5b44559..0000000
--- a/dev-java/velocity/files/velocity-1.4-versioned_jar.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ru velocity-1.4/build/build.xml velocity-1.4-gentoo/build/build.xml
---- velocity-1.4/build/build.xml 2004-04-14 08:26:40.000000000 -0400
-+++ velocity-1.4-gentoo/build/build.xml 2005-07-14 21:33:37.000000000
-0400
-@@ -287,7 +287,7 @@
- <!-- =================================================================== -->
- <target name="jar" depends="compile">
-
-- <jar jarfile="${build.dir}/${project}-${version}.jar">
-+ <jar jarfile="${build.dir}/${project}.jar">
-
- <fileset dir="${build.dest}">
- <exclude name="**/package.html"/>
-@@ -324,7 +324,7 @@
- <!-- =================================================================== -->
- <target name="jar-J2EE" depends="compile-J2EE" if="J2EE.present">
-
-- <jar jarfile="${build.dir}/${project}-J2EE-${version}.jar"
-+ <jar jarfile="${build.dir}/${project}-J2EE.jar"
- basedir="${build.dest}"
- excludes="**/package.html"
- />
-@@ -336,7 +336,7 @@
- <!-- =================================================================== -->
- <target name="jar-core" depends="compile">
-
-- <jar compress="true"
jarfile="${build.dir}/${project}-core-${version}.jar">
-+ <jar compress="true" jarfile="${build.dir}/${project}-core.jar">
- <fileset dir="${build.dest}">
- <exclude name="**/package.html"/>
- <exclude name="org/apache/oro/**"/>
-@@ -356,7 +356,7 @@
- <!-- =================================================================== -->
- <target name="jar-util" depends="compile">
-
-- <jar jarfile="${build.dir}/${project}-util-${version}.jar">
-+ <jar jarfile="${build.dir}/${project}-util.jar">
- <fileset dir="${build.dest}">
- <exclude name="**/package.html"/>
- <include name="org/apache/velocity/anakia/**"/>
-@@ -373,7 +373,7 @@
- <!-- =================================================================== -->
- <target name="jar-servlet" depends="compile">
-
-- <jar jarfile="${build.dir}/${project}-servlet-${version}.jar">
-+ <jar jarfile="${build.dir}/${project}-servlet.jar">
- <fileset dir="${build.dest}">
- <exclude name="**/package.html"/>
- <include name="org/apache/velocity/servlet/**"/>
diff --git a/dev-java/velocity/velocity-1.7-r1.ebuild
b/dev-java/velocity/velocity-1.7-r1.ebuild
deleted file mode 100644
index a288f72..0000000
--- a/dev-java/velocity/velocity-1.7-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="examples doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="A Java-based template engine for easy creation/rendering of
documents that format and present data"
-HOMEPAGE="http://velocity.apache.org";
-SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="test"
-
-CDEPEND="
- dev-java/commons-collections:0
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/jdom:0
- dev-java/log4j:0
- dev-java/avalon-logkit:2.0
- dev-java/jakarta-oro:2.0
- java-virtuals/servlet-api:2.3
- dev-java/werken-xpath:0
- dev-java/ant-core:0
-"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.4
- test? (
- dev-java/ant-junit:0
- dev-java/ant-antlr:0
- dev-db/hsqldb:0
- )
-"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.4"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
- commons-collections
- commons-lang-2.1
- commons-logging
- jdom
- log4j
- avalon-logkit-2.0
- jakarta-oro-2.0
- servlet-api-2.3
- werken-xpath
- ant-core
-"
-
-# One test fails. see #219668
-RESTRICT="test"
-
-java_prepare() {
- rm -v *.jar lib/test/*.jar lib/*.jar || die
-}
-
-src_compile () {
- cd "${S}"/build
- eant jar -Dskip-download=true #prebuilt javadocs
-}
-
-src_test() {
- mkdir -p bin/test-lib || die
- cd bin/test-lib || die
- java-pkg_jar-from junit,hsqldb
- java-pkg_jar-from --virtual servlet-api-2.3
- cd "${S}"/build
- ANT_TASKS="ant-junit ant-antlr" eant test -Dskip-download=true
-}
-
-src_install () {
- java-pkg_newjar bin/*.jar
-
- dodoc NOTICE README.txt
- # has other stuff besides api too
- use doc && java-pkg_dohtml -r docs/*
- use examples && java-pkg_doexamples examples
- use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/velocity/velocity-1.7.ebuild
b/dev-java/velocity/velocity-1.7.ebuild
deleted file mode 100644
index 65a0d3d..0000000
--- a/dev-java/velocity/velocity-1.7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-JAVA_PKG_IUSE="examples doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="A Java-based template engine for easy creation/rendering of
documents that format and present data"
-HOMEPAGE="http://velocity.apache.org";
-SRC_URI="mirror://apache/${PN}/engine/${PV}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE="test"
-
-CDEPEND="
- dev-java/commons-collections:0
- dev-java/commons-lang:2.1
- dev-java/commons-logging:0
- dev-java/jdom:1.0
- dev-java/log4j:0
- dev-java/avalon-logkit:2.0
- dev-java/jakarta-oro:2.0
- java-virtuals/servlet-api:2.3
- dev-java/werken-xpath:0
- dev-java/ant-core:0
-"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.4
- test? (
- dev-java/ant-junit:0
- dev-java/ant-antlr:0
- dev-db/hsqldb:0
- )
-"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.4"
-
-JAVA_PKG_FILTER_COMPILER="jikes"
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-EANT_GENTOO_CLASSPATH="
- commons-collections
- commons-lang-2.1
- commons-logging
- jdom-1.0
- log4j
- avalon-logkit-2.0
- jakarta-oro-2.0
- servlet-api-2.3
- werken-xpath
- ant-core
-"
-
-# One test fails. see #219668
-RESTRICT="test"
-
-java_prepare() {
- rm -v *.jar lib/test/*.jar lib/*.jar || die
-}
-
-src_compile () {
- cd "${S}"/build
- eant jar -Dskip-download=true #prebuilt javadocs
-}
-
-src_test() {
- mkdir -p bin/test-lib || die
- cd bin/test-lib || die
- java-pkg_jar-from junit,hsqldb
- java-pkg_jar-from --virtual servlet-api-2.3
- cd "${S}"/build
- ANT_TASKS="ant-junit ant-antlr" eant test -Dskip-download=true
-}
-
-src_install () {
- java-pkg_newjar bin/*.jar
-
- dodoc NOTICE README.txt
- # has other stuff besides api too
- use doc && java-pkg_dohtml -r docs/*
- use examples && java-pkg_doexamples examples
- use source && java-pkg_dosrc src/java/*
-}
