The ebuild was hard coding 0.9 to SRC_URI so it wasn't a version bump at all. Fixed that and added examples use flag, changed LICENSE to Apache-2.0 and used mirror://apache.

Package-Manager: portage-2.1.2.5

7 files changed, 73 insertions, 31 deletions

diff --git a/dev-java/commons-launcher/ChangeLog b/dev-java/commons-launcher/ChangeLog
index 0f404f53b472..970ef525c74e 100644
--- a/dev-java/commons-launcher/ChangeLog
+++ b/dev-java/commons-launcher/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/commons-launcher
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/ChangeLog,v 1.22 2007/04/25 19:37:00 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/ChangeLog,v 1.23 2007/05/05 13:42:10 betelgeuse Exp $
+
+*commons-launcher-1.1-r1 (05 May 2007)
+
+  05 May 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/1.1-javadoc.patch, commons-launcher-0.9-r1.ebuild,
+  -commons-launcher-1.1.ebuild, +commons-launcher-1.1-r1.ebuild:
+  The ebuild was hard coding 0.9 to SRC_URI so it wasn't a version bump at
+  all. Fixed that and added examples use flag, changed LICENSE to Apache-2.0
+  and used mirror://apache.
 
   25 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
   -commons-launcher-0.9.ebuild:
diff --git a/dev-java/commons-launcher/Manifest b/dev-java/commons-launcher/Manifest
index 5822e81b6202..db854b14b1b9 100644
--- a/dev-java/commons-launcher/Manifest
+++ b/dev-java/commons-launcher/Manifest
@@ -1,19 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 1.1-javadoc.patch 1321 RMD160 a7e9f8b5ab2b2ad95b123ddaff5bb70ce2107e7f SHA1 63833d9fc9f94b5f5ddd3cbe4829db1c90d2c800 SHA256 dc7e828dcec44901b565d1cd65dcd9b4f5e5a401325dda1f182c16e1bf4d9f6c
+MD5 430418110a5bace8106aa7d59e6729d3 files/1.1-javadoc.patch 1321
+RMD160 a7e9f8b5ab2b2ad95b123ddaff5bb70ce2107e7f files/1.1-javadoc.patch 1321
+SHA256 dc7e828dcec44901b565d1cd65dcd9b4f5e5a401325dda1f182c16e1bf4d9f6c files/1.1-javadoc.patch 1321
+DIST commons-launcher-1.1-src.tar.gz 76558 RMD160 f6a3fa2eff82a33d0e1acd74396c10cf8519dca4 SHA1 6cc1d9bdae505f280850d51f09e86279fd60339b SHA256 cc52afb97ea4a224d7d9c82e96c30725a290bd6cd44586e8a10c3d145bd3b83a
 DIST launcher-0.9-src.tar.gz 41418 RMD160 6c4d7be5baae414eaca213fb8676bfb67c494011 SHA1 636c0be3c46c045a2f1b41f009824eb74a1c05c6 SHA256 192bfa82624f3ebc2e8c27753698ff7d8075801bc833333fa54a4e1126fbefdc
-EBUILD commons-launcher-0.9-r1.ebuild 1015 RMD160 2fa3abc01a386f3edf74cfc01c327a94f49dc9ae SHA1 fcde7fa2721fdff264ca7253d8927fb08f0f1d37 SHA256 a52c42c7552024f638cf661fa61c1094beac09e6ef81f10fa88c3c437480c96e
-MD5 f7848558a832fc64e1e19728657f3031 commons-launcher-0.9-r1.ebuild 1015
-RMD160 2fa3abc01a386f3edf74cfc01c327a94f49dc9ae commons-launcher-0.9-r1.ebuild 1015
-SHA256 a52c42c7552024f638cf661fa61c1094beac09e6ef81f10fa88c3c437480c96e commons-launcher-0.9-r1.ebuild 1015
-EBUILD commons-launcher-1.1.ebuild 1074 RMD160 01ff04a095600a5c98b4fb287ea9062f0eff9d31 SHA1 b958352b370e6a426e11522eb8140f30e9a082dd SHA256 4623fbbbab3790da4db85a9c7e185bde9320f5ee88b41f48675d4c92f7216250
-MD5 f7ad1aa79dbc67a0ce078da279f3fc18 commons-launcher-1.1.ebuild 1074
-RMD160 01ff04a095600a5c98b4fb287ea9062f0eff9d31 commons-launcher-1.1.ebuild 1074
-SHA256 4623fbbbab3790da4db85a9c7e185bde9320f5ee88b41f48675d4c92f7216250 commons-launcher-1.1.ebuild 1074
-MISC ChangeLog 2906 RMD160 8e3e3f5972e5836822ce02558f07a93f55e4cf30 SHA1 58e26828a290e416ea7599aeb42029bd3e193ad2 SHA256 aa0ab3a8b2c8bfe5171a22a8d4074276a7fcb0581d4adf0090425480ec66f74e
-MD5 8b21104c71284de8b23d9b0b8796ca14 ChangeLog 2906
-RMD160 8e3e3f5972e5836822ce02558f07a93f55e4cf30 ChangeLog 2906
-SHA256 aa0ab3a8b2c8bfe5171a22a8d4074276a7fcb0581d4adf0090425480ec66f74e ChangeLog 2906
+EBUILD commons-launcher-0.9-r1.ebuild 1039 RMD160 d02c26d98780c90f4a733f3b84658919e39ffc05 SHA1 e54c7be50b71452ac21f9d742bf648d8fbcf9762 SHA256 2be4d7ee2fdae3a87f212297269d65ea430c07ad44dd56f4dda533da92cae4cd
+MD5 13c829d2c84639c8cd059c32dafb705f commons-launcher-0.9-r1.ebuild 1039
+RMD160 d02c26d98780c90f4a733f3b84658919e39ffc05 commons-launcher-0.9-r1.ebuild 1039
+SHA256 2be4d7ee2fdae3a87f212297269d65ea430c07ad44dd56f4dda533da92cae4cd commons-launcher-0.9-r1.ebuild 1039
+EBUILD commons-launcher-1.1-r1.ebuild 1170 RMD160 f6114a827b0b82445b64a735924ce30d4fc2059a SHA1 3bf2ea7b0abcc48eddc32bf73236ac6a73c4f884 SHA256 9f0674212ed231fa89377f35dedbb4e4cb224abaee67aacbc71d2c2d00b8fd76
+MD5 52e356fe368a0089a1447462f44f8ea1 commons-launcher-1.1-r1.ebuild 1170
+RMD160 f6114a827b0b82445b64a735924ce30d4fc2059a commons-launcher-1.1-r1.ebuild 1170
+SHA256 9f0674212ed231fa89377f35dedbb4e4cb224abaee67aacbc71d2c2d00b8fd76 commons-launcher-1.1-r1.ebuild 1170
+MISC ChangeLog 3305 RMD160 efe94467d46980566f2e4014dbfdcde916886ca4 SHA1 b84f86da904c26cc99c32e73d8e4d1ef7237706f SHA256 2520cee5c018d125706bce4154a129c0bd4fb60caed73d146aea2b54738d099d
+MD5 8c3b811a0be17d61c52f5cd25d57be67 ChangeLog 3305
+RMD160 efe94467d46980566f2e4014dbfdcde916886ca4 ChangeLog 3305
+SHA256 2520cee5c018d125706bce4154a129c0bd4fb60caed73d146aea2b54738d099d ChangeLog 3305
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -21,13 +26,13 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 b9913853bb5d587d65d94e715d1688a1 files/digest-commons-launcher-0.9-r1 247
 RMD160 36b122e47657837b77d0a2f4cc88b093dd0b460e files/digest-commons-launcher-0.9-r1 247
 SHA256 846b1839612a7b1c24a5128eeb8e7029195eeea76244eba69612b27209fb2f25 files/digest-commons-launcher-0.9-r1 247
-MD5 b9913853bb5d587d65d94e715d1688a1 files/digest-commons-launcher-1.1 247
-RMD160 36b122e47657837b77d0a2f4cc88b093dd0b460e files/digest-commons-launcher-1.1 247
-SHA256 846b1839612a7b1c24a5128eeb8e7029195eeea76244eba69612b27209fb2f25 files/digest-commons-launcher-1.1 247
+MD5 747d817adcb739f7fe6ddb25d18ed6c1 files/digest-commons-launcher-1.1-r1 271
+RMD160 9b6772e942b49a32df9a8d26e398858b915c05e3 files/digest-commons-launcher-1.1-r1 271
+SHA256 545911db5edb12b14ccf65142cecfc0835a59d74b42621a6c71c1b4002a50934 files/digest-commons-launcher-1.1-r1 271
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGL63dcxLzpIGCsLQRAkPEAJ93uUWdLoiETt+gpMMtD/7bwbr/oACggIh7
-WuIc7UlmrDf+049OG2a3qAM=
-=FSMJ
+iD8DBQFGPIm6cxLzpIGCsLQRAsbmAJ9EAkMESkksKGkMfECliK3F3eQQWgCeLHK0
+JAE8rm3nPvtjiRaps3bclnw=
+=ubA8
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-launcher/commons-launcher-0.9-r1.ebuild b/dev-java/commons-launcher/commons-launcher-0.9-r1.ebuild
index 67624889650e..11177d06d854 100644
--- a/dev-java/commons-launcher/commons-launcher-0.9-r1.ebuild
+++ b/dev-java/commons-launcher/commons-launcher-0.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/commons-launcher-0.9-r1.ebuild,v 1.8 2007/04/08 20:01:40 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/commons-launcher-0.9-r1.ebuild,v 1.9 2007/05/05 13:42:10 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd"
 
 DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
+RDEPEND=">=virtual/jre-1.4
+	dev-java/ant-core"
 
 S=${WORKDIR}/${PN}
 
diff --git a/dev-java/commons-launcher/commons-launcher-1.1.ebuild b/dev-java/commons-launcher/commons-launcher-1.1-r1.ebuild
index ee7859ada67e..52f91db5494b 100644
--- a/dev-java/commons-launcher/commons-launcher-1.1.ebuild
+++ b/dev-java/commons-launcher/commons-launcher-1.1-r1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/commons-launcher-1.1.ebuild,v 1.2 2007/04/25 19:33:41 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/commons-launcher-1.1-r1.ebuild,v 1.1 2007/05/05 13:42:10 betelgeuse Exp $
 
-JAVA_PKG_IUSE="doc source"
+JAVA_PKG_IUSE="examples doc source"
 
-inherit java-pkg-2 java-ant-2
+inherit base java-pkg-2 java-ant-2
 
 DESCRIPTION="Commons-launcher eliminates the need for a batch or shell script to launch a Java class."
 HOMEPAGE="http://jakarta.apache.org/commons/launcher/"
-SRC_URI="ftp://ftp.ibiblio.org/pub/mirrors/apache/jakarta/commons/launcher/source/launcher-0.9-src.tar.gz"
-LICENSE="Apache-1.1"
+SRC_URI="mirror://apache/jakarta/${PN/-//}/source/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 
@@ -19,6 +19,9 @@ RDEPEND=">=virtual/jre-1.4
 
 S=${WORKDIR}/${PN}
 
+# https://issues.apache.org/jira/browse/LAUNCHER-7
+PATCHES="${FILESDIR}/1.1-javadoc.patch"
+
 src_compile() {
 	java-ant_rewrite-classpath "${S}/build.xml"
 	EANT_GENTOO_CLASSPATH="ant-core" java-pkg-2_src_compile
@@ -26,8 +29,8 @@ src_compile() {
 
 src_install() {
 	java-pkg_dojar dist/bin/*.jar || die "java-pkg_dojar died"
-	dodoc RELEASE-NOTES.txt || die
-	dohtml *.html || die
+	dodoc README.txt NOTICE.txt || die
 	use doc && java-pkg_dojavadoc dist/docs/api
+	use examples && java-pkg_doexamples example
 	use source && java-pkg_dosrc src/java/*
 }
diff --git a/dev-java/commons-launcher/files/1.1-javadoc.patch b/dev-java/commons-launcher/files/1.1-javadoc.patch
new file mode 100644
index 000000000000..d83229a744eb
--- /dev/null
+++ b/dev-java/commons-launcher/files/1.1-javadoc.patch
@@ -0,0 +1,24 @@
+diff -ur src.old/java/org/apache/commons/launcher/types/ArgumentSet.java src/java/org/apache/commons/launcher/types/ArgumentSet.java
+--- src.old/java/org/apache/commons/launcher/types/ArgumentSet.java	2004-02-28 13:52:20.000000000 +0200
++++ src/java/org/apache/commons/launcher/types/ArgumentSet.java	2007-05-05 16:26:13.000000000 +0300
+@@ -18,7 +18,7 @@
+ 

+ 

+ /**

+- * A class that represents a set of nested <arg> elements.

++ * A class that represents a set of nested &lt;arg&gt; elements.

+  *

+  * @author Patrick Luby

+  */

+diff -ur src.old/java/org/apache/commons/launcher/types/ConditionalArgument.java src/java/org/apache/commons/launcher/types/ConditionalArgument.java
+--- src.old/java/org/apache/commons/launcher/types/ConditionalArgument.java	2004-02-28 14:43:31.000000000 +0200
++++ src/java/org/apache/commons/launcher/types/ConditionalArgument.java	2007-05-05 16:26:50.000000000 +0300
+@@ -24,7 +24,7 @@
+ import org.apache.tools.ant.types.Path;

+ 

+ /**

+- * A class that represents nested <arg> or <jvmarg> elements. This class

++ * A class that represents nested &lt;arg&gt; or &lt;jvmarg&gt; elements. This class

+  * provides the same functionality as the class that represents these same

+  * elements in a "java" task. In addition, this class supports conditional "if"

+  * and "unless" attributes.

diff --git a/dev-java/commons-launcher/files/digest-commons-launcher-1.1 b/dev-java/commons-launcher/files/digest-commons-launcher-1.1
deleted file mode 100644
index bbc4650bec0e..000000000000
--- a/dev-java/commons-launcher/files/digest-commons-launcher-1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 781e74002a40aa797c5c1f1758252ffe launcher-0.9-src.tar.gz 41418
-RMD160 6c4d7be5baae414eaca213fb8676bfb67c494011 launcher-0.9-src.tar.gz 41418
-SHA256 192bfa82624f3ebc2e8c27753698ff7d8075801bc833333fa54a4e1126fbefdc launcher-0.9-src.tar.gz 41418
diff --git a/dev-java/commons-launcher/files/digest-commons-launcher-1.1-r1 b/dev-java/commons-launcher/files/digest-commons-launcher-1.1-r1
new file mode 100644
index 000000000000..615e83e07a96
--- /dev/null
+++ b/dev-java/commons-launcher/files/digest-commons-launcher-1.1-r1
@@ -0,0 +1,3 @@
+MD5 99082b05bfc6f5ce452d179ee2871ef9 commons-launcher-1.1-src.tar.gz 76558
+RMD160 f6a3fa2eff82a33d0e1acd74396c10cf8519dca4 commons-launcher-1.1-src.tar.gz 76558
+SHA256 cc52afb97ea4a224d7d9c82e96c30725a290bd6cd44586e8a10c3d145bd3b83a commons-launcher-1.1-src.tar.gz 76558