Ebuild cleanup.

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/commons-launcher/ChangeLog b/dev-java/commons-launcher/ChangeLog
index d618a3b835a2cf464af4dbd7940a6fc3d7422bbc..def4cf2750218e259f4e2fc40d8f57544e643b9c 100644 (file)
--- a/dev-java/commons-launcher/ChangeLog
+++ b/dev-java/commons-launcher/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-launcher
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/ChangeLog,v 1.15 2006/12/09 09:14:37 flameeyes Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/ChangeLog,v 1.16 2007/04/02 15:33:34 betelgeuse Exp $
+
+  02 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  commons-launcher-0.9-r1.ebuild:
+  Ebuild cleanup.
 
   09 Dec 2006; Diego Pettenò <flameeyes@gentoo.org>
   commons-launcher-0.9-r1.ebuild:

diff --git a/dev-java/commons-launcher/Manifest b/dev-java/commons-launcher/Manifest
index 427c824be43d89d154fac2a84b27672cd61cfcef..ad94b9de8b94a0d7e1f239ffdbd53152da702b86 100644 (file)
--- a/dev-java/commons-launcher/Manifest
+++ b/dev-java/commons-launcher/Manifest
@@ -2,18 +2,18 @@
 Hash: SHA1
 
 DIST launcher-0.9-src.tar.gz 41418 RMD160 6c4d7be5baae414eaca213fb8676bfb67c494011 SHA1 636c0be3c46c045a2f1b41f009824eb74a1c05c6 SHA256 192bfa82624f3ebc2e8c27753698ff7d8075801bc833333fa54a4e1126fbefdc
-EBUILD commons-launcher-0.9-r1.ebuild 1158 RMD160 e91544fe4d448fa0bce4dcf3f836415b2429654e SHA1 00b64b95b3a4191285b39a8df4f54d6aab908969 SHA256 65b3e1e3a661b07f75fde80b83b3366851b49e01b2d7fa7df9c6a4b263348295
-MD5 a560d6bf7ee0b9921af089fc61ad33d1 commons-launcher-0.9-r1.ebuild 1158
-RMD160 e91544fe4d448fa0bce4dcf3f836415b2429654e commons-launcher-0.9-r1.ebuild 1158
-SHA256 65b3e1e3a661b07f75fde80b83b3366851b49e01b2d7fa7df9c6a4b263348295 commons-launcher-0.9-r1.ebuild 1158
+EBUILD commons-launcher-0.9-r1.ebuild 1023 RMD160 2db8b1e175156d096d56fc6e650ddc04d05b4c7a SHA1 5d4d15dac3e19aedcbd65ec9af0eb03070cdfe02 SHA256 a7fab5715f256f27b9d11fcf0765c91e65c2f2f0c5c7af850a0290fcd40bdd26
+MD5 b78a4f4faed17a73d923dbd20bbd034e commons-launcher-0.9-r1.ebuild 1023
+RMD160 2db8b1e175156d096d56fc6e650ddc04d05b4c7a commons-launcher-0.9-r1.ebuild 1023
+SHA256 a7fab5715f256f27b9d11fcf0765c91e65c2f2f0c5c7af850a0290fcd40bdd26 commons-launcher-0.9-r1.ebuild 1023
 EBUILD commons-launcher-0.9.ebuild 1128 RMD160 967778e4a2aed6accda8c1b2299685ae2324419c SHA1 20c3d5bb4e4c7d41558d70902f2f98948b9aa760 SHA256 6d64af607409e63ef4df2b9b6ac55b76513dae9a33728909073ce9fa879c6ae5
 MD5 cab1edec6790654d696b5b407513635b commons-launcher-0.9.ebuild 1128
 RMD160 967778e4a2aed6accda8c1b2299685ae2324419c commons-launcher-0.9.ebuild 1128
 SHA256 6d64af607409e63ef4df2b9b6ac55b76513dae9a33728909073ce9fa879c6ae5 commons-launcher-0.9.ebuild 1128
-MISC ChangeLog 2070 RMD160 6329c9196b49cfdb95f0e87596dcd2be5a685d30 SHA1 eca79c8b456f1601a2e8070a07749bfad55f6597 SHA256 d5de1fcf477c1036f723b4bf4a3bf2006b13258b7dee285f472c76c2dd24557d
-MD5 d2d2d4f5af5b9279824013565dfd459b ChangeLog 2070
-RMD160 6329c9196b49cfdb95f0e87596dcd2be5a685d30 ChangeLog 2070
-SHA256 d5de1fcf477c1036f723b4bf4a3bf2006b13258b7dee285f472c76c2dd24557d ChangeLog 2070
+MISC ChangeLog 2177 RMD160 b70d836c39fe08133817f6e3cdebf395606d40c5 SHA1 0e1e73d7f22353b6368e4e47613f08ecd1c116f0 SHA256 87488cbe56f01452bc0015adc529bb1fd5c2da0aa6e89a1ceb72a2ced057db17
+MD5 c2ad064d3ec7a42932f40834fbe4abb1 ChangeLog 2177
+RMD160 b70d836c39fe08133817f6e3cdebf395606d40c5 ChangeLog 2177
+SHA256 87488cbe56f01452bc0015adc529bb1fd5c2da0aa6e89a1ceb72a2ced057db17 ChangeLog 2177
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -25,9 +25,9 @@ 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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFen6EAiZjviIA2XgRAi1QAKCUeMjRwPIL/d0VST+P55OzCmG7QgCghycV
-7dmaXGXENX5w5HXqZFLe0Oc=
-=KLYc
+iD8DBQFGESJRcxLzpIGCsLQRAgy9AJ9CHVNYDXtoXNBVfEhygEmcUufZOwCgjhls
+swJZYrg7fTQL5xw2UJFr1Mg=
+=izsj
 -----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 f95a36f64869b5d562fadc22266ded6f7f06370f..ec9fa10dca8a05d1e774d5c8dedff19c4f16c774 100644 (file)
--- 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,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.4 2006/12/09 09:14:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-launcher/commons-launcher-0.9-r1.ebuild,v 1.5 2007/04/02 15:33:34 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -10,23 +12,20 @@ SRC_URI="ftp://ftp.ibiblio.org/pub/mirrors/apache/jakarta/commons/launcher/sourc
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc source"
-DEPEND=">=virtual/jdk-1.4
-       >=dev-java/ant-core-1.4
-       source? ( app-arch/zip )"
+
+DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
+
 S=${WORKDIR}/${PN}
 
 src_compile() {
        java-ant_rewrite-classpath "${S}/build.xml"
-       local antflags="jar"
-       use doc && antflags="${antflags} javadoc"
-       eant -Dgentoo.classpath=$(java-pkg_getjars ant-core) ${antflags} || die "compilation problem"
+       EANT_GENTOO_CLASSPATH="ant-core" java-pkg-2_src_compile
 }
 
 src_install() {
        java-pkg_dojar dist/bin/*.jar || die "java-pkg_dojar died"
-       dohtml *.html
-       use doc && java-pkg_dohtml -r dist/docs/*
+       dohtml *.html || die
+       use doc && java-pkg_dohtml dist/docs/api
        use source && java-pkg_dosrc src/java/*
 }