diff options
author | Vlastimil Babka <caster@gentoo.org> | 2009-10-08 12:00:15 +0000 |
---|---|---|
committer | Vlastimil Babka <caster@gentoo.org> | 2009-10-08 12:00:15 +0000 |
commit | 2b84ffe3324c341963d993ae1af8d2a37f158195 (patch) | |
tree | da759c07a038bc76d67fd6747076e0945352db99 /dev-java/commons-cli | |
parent | Libgadu require threads enabled to work. Force due to unsynced tree (diff) | |
download | gentoo-2-2b84ffe3324c341963d993ae1af8d2a37f158195.tar.gz gentoo-2-2b84ffe3324c341963d993ae1af8d2a37f158195.tar.bz2 gentoo-2-2b84ffe3324c341963d993ae1af8d2a37f158195.zip |
Remove old.
(Portage version: 2.2_rc44/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/commons-cli')
-rw-r--r-- | dev-java/commons-cli/ChangeLog | 7 | ||||
-rw-r--r-- | dev-java/commons-cli/commons-cli-1.0-r5.ebuild | 48 | ||||
-rw-r--r-- | dev-java/commons-cli/commons-cli-1.1.ebuild | 35 | ||||
-rw-r--r-- | dev-java/commons-cli/files/commons-cli-1.0-build.xml.patch | 11 | ||||
-rw-r--r-- | dev-java/commons-cli/files/commons-cli-1.0-gentoo.diff | 127 |
5 files changed, 6 insertions, 222 deletions
diff --git a/dev-java/commons-cli/ChangeLog b/dev-java/commons-cli/ChangeLog index da62d91a21b0..996cb4ab1742 100644 --- a/dev-java/commons-cli/ChangeLog +++ b/dev-java/commons-cli/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/commons-cli # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.44 2009/09/06 20:06:48 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/ChangeLog,v 1.45 2009/10/08 12:00:14 caster Exp $ + + 08 Oct 2009; Vlastimil Babka <caster@gentoo.org> + -commons-cli-1.0-r5.ebuild, -files/commons-cli-1.0-build.xml.patch, + -files/commons-cli-1.0-gentoo.diff, -commons-cli-1.1.ebuild: + Remove old. 06 Sep 2009; Brent Baude <ranger@gentoo.org> commons-cli-1.2.ebuild: Marking commons-cli-1.2 ppc64 for bug 279014 diff --git a/dev-java/commons-cli/commons-cli-1.0-r5.ebuild b/dev-java/commons-cli/commons-cli-1.0-r5.ebuild deleted file mode 100644 index 04b1b272d6ea..000000000000 --- a/dev-java/commons-cli/commons-cli-1.0-r5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.0-r5.ebuild,v 1.14 2009/03/27 19:54:47 elvanor Exp $ - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 eutils - -DESCRIPTION="A Java library for working with the command line arguments and options." -HOMEPAGE="http://jakarta.apache.org/commons/cli/" -SRC_URI="mirror://apache/jakarta/commons/cli/source/cli-${PV}-src.tar.gz" - -LICENSE="Apache-1.1" -SLOT="1" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" -IUSE="" - -CDEPEND="dev-java/commons-logging - =dev-java/commons-lang-2.0*" -RDEPEND=">=virtual/jre-1.4 - ${CDEPEND}" -DEPEND=">=virtual/jdk-1.4 - test? ( dev-java/ant-junit ) - ${CDEPEND}" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-build.xml.patch" - - mkdir lib && cd lib - java-pkg_jar-from commons-logging commons-logging.jar - java-pkg_jar-from commons-lang -} - -src_test() { - java-pkg_jar-from --into lib junit - ANT_TASKS="ant-junit" eant test -} - -src_install() { - java-pkg_newjar target/${P}.jar - - dodoc README.txt || die - use doc && java-pkg_dojavadoc target/docs/apidocs - use source && java-pkg_dosrc src/java/org -} diff --git a/dev-java/commons-cli/commons-cli-1.1.ebuild b/dev-java/commons-cli/commons-cli-1.1.ebuild deleted file mode 100644 index 60479faf17d0..000000000000 --- a/dev-java/commons-cli/commons-cli-1.1.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-cli/commons-cli-1.1.ebuild,v 1.5 2008/10/27 23:13:59 ranger Exp $ - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 eutils - -DESCRIPTION="A Java library for working with the command line arguments and options." -HOMEPAGE="http://commons.apache.org/cli/" -MY_P=${P}-src -SRC_URI="mirror://apache/commons/cli/source/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=virtual/jre-1.4" -# Blocking junit for https://bugs.gentoo.org/show_bug.cgi?id=215659 -DEPEND=">=virtual/jdk-1.4 - !<dev-java/junit-3.8.2 - test? ( dev-java/ant-junit )" - -S=${WORKDIR}/${MY_P} - -JAVA_ANT_REWRITE_CLASSPATH="true" - -src_install() { - java-pkg_newjar target/${P}.jar - - dodoc README.txt RELEASE-NOTES.txt || die - use doc && java-pkg_dojavadoc dist/docs/api - use source && java-pkg_dosrc src/java/org -} diff --git a/dev-java/commons-cli/files/commons-cli-1.0-build.xml.patch b/dev-java/commons-cli/files/commons-cli-1.0-build.xml.patch deleted file mode 100644 index c46b72582282..000000000000 --- a/dev-java/commons-cli/files/commons-cli-1.0-build.xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- build.xml.orig 2007-01-25 10:48:56.000000000 +0100 -+++ build.xml 2007-01-25 10:49:33.000000000 +0100 -@@ -8,7 +8,7 @@ - <property name="testreportdir" value="target/test-reports"></property> - <property name="distdir" value="dist"></property> - <property name="javadocdir" value="target/docs/apidocs"></property> -- <property name="final.name" value="commons-cli-1.0-beta-2-dev"></property> -+ <property name="final.name" value="commons-cli-1.0"></property> - - <target name="init" description="o Initializes some properties"> - diff --git a/dev-java/commons-cli/files/commons-cli-1.0-gentoo.diff b/dev-java/commons-cli/files/commons-cli-1.0-gentoo.diff deleted file mode 100644 index d7093de1e7bc..000000000000 --- a/dev-java/commons-cli/files/commons-cli-1.0-gentoo.diff +++ /dev/null @@ -1,127 +0,0 @@ ---- build.xml 2002-11-06 00:10:24.000000000 -0500 -+++ build.xml.patched 2004-05-14 16:22:54.196814648 -0400 -@@ -1,15 +1,23 @@ - <?xml version="1.0" encoding="UTF-8"?> - - <project default="jar" name="commons-cli" basedir="."> -- -+ -+ <property file="${basedir}/build.properties"/> -+ -+ <path id="compile.classpath"> -+ <pathelement location="${commons-logging.jar}"/> -+ <pathelement location="${commons-lang.jar}"/> -+ <pathelement location="${junit.jar}"/> -+ </path> -+ - <property name="defaulttargetdir" value="target"></property> - <property name="classesdir" value="target/classes"></property> - <property name="testclassesdir" value="target/test-classes"></property> - <property name="testreportdir" value="target/test-reports"></property> - <property name="distdir" value="dist"></property> - <property name="javadocdir" value="target/docs/apidocs"></property> -- <property name="final.name" value="commons-cli-1.0-beta-2-dev"></property> -- -+ <property name="final.name" value="commons-cli-1.0"></property> -+ - <target name="init" description="o Initializes some properties"> - - <condition property="noget"> -@@ -17,21 +25,13 @@ - </condition> - </target> - -- <target name="jar" description="o Create the jar" depends="get-deps"> -+ <target name="jar" description="o Create the jar"> - - <mkdir dir="${classesdir}"></mkdir> - -- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> -- <src> -- <pathelement location="src/java"></pathelement> -- </src> -- <classpath> -- <fileset dir="lib"> -- <include name="*.jar"></include> -- </fileset> -- </classpath> -+ <javac srcdir="src/java" destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> -+ <classpath refid="compile.classpath"/> - </javac> -- - - <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar> - -@@ -55,10 +55,8 @@ - <sysproperty key="basedir" value="src/test"></sysproperty> - <formatter type="xml"></formatter> - <formatter usefile="true" type="plain"></formatter> -+ <classpath refid="compile.classpath"/> - <classpath> -- <fileset dir="lib"> -- <include name="*.jar"></include> -- </fileset> - <pathelement location="target/${final.name}.jar"></pathelement> - <pathelement path="${testclassesdir}"></pathelement> - </classpath> -@@ -79,10 +77,8 @@ - <src> - <pathelement location="src/test"></pathelement> - </src> -+ <classpath refid="compile.classpath"/> - <classpath> -- <fileset dir="lib"> -- <include name="*.jar"></include> -- </fileset> - <pathelement location="target/${final.name}.jar"></pathelement> - </classpath> - </javac> -@@ -115,39 +111,17 @@ - <property name="title" value="CLI 1.0-beta-2-dev API"></property> - - <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.cli.*"> -+ -+ <classpath refid="compile.classpath"/> - <classpath> -- <fileset dir="lib"> -- <include name="*.jar"></include> -- </fileset> - <pathelement location="target/${final.name}.jar"></pathelement> - </classpath> - </javadoc> - - </target> - -- <target name="get-deps" unless="noget" depends="init"> -- -- <mkdir dir="lib"></mkdir> -- -- <get dest="lib/commons-logging-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.jar"></get> -- <get dest="lib/commons-lang-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-SNAPSHOT.jar"></get> -- <get dest="lib/junit-3.7.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.7.jar"></get> -- -- </target> -- -- -- -- -- -- -- -- -- -- - <target name="install-maven"> - -- -- - <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${maven.repo.remote}/maven/maven-install-latest.jar"></get> - - <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar> -@@ -155,4 +129,4 @@ - </target> - - </project> -- -\ No newline at end of file -+ |