Ebuild cleanup.

Package-Manager: portage-2.1.2-r4

diff --git a/dev-java/jfreechart/ChangeLog b/dev-java/jfreechart/ChangeLog
index 2e46604cc51d8396e1666369c430eef2d662f9ac..e91d0c24fb8b43edc67090d37b8c9b078fd1adbf 100644 (file)
--- a/dev-java/jfreechart/ChangeLog
+++ b/dev-java/jfreechart/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jfreechart
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.15 2007/01/06 22:34:46 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.16 2007/01/27 23:03:57 betelgeuse Exp $
+
+  27 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
+  jfreechart-0.9.21-r1.ebuild:
+  Ebuild cleanup.
 
   06 Jan 2007; Miroslav Šulc <fordfrog@gentoo.org> jfreechart-1.0.3.ebuild:
   Added ~ppc keyword.

diff --git a/dev-java/jfreechart/Manifest b/dev-java/jfreechart/Manifest
index 1472a508a6c3c363726dc7e3021d0ca6afccfa55..3b775c58b69994f7b7717147af4a24c3180fade9 100644 (file)
--- a/dev-java/jfreechart/Manifest
+++ b/dev-java/jfreechart/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX jfreechart-1.0.3-build.xml.patch 2226 RMD160 241811560d64d1780c4c0e936b60802bae3cb2f0 SHA1 657e45cab4609745abb1b82524c710055bae36ca SHA256 b23b55d0ab9c7efc8f53375d7aca8b198eb22ca31f0164fb18a44059d9a387cc
 MD5 07e96486f8ff737555e57173e3030151 files/jfreechart-1.0.3-build.xml.patch 2226
 RMD160 241811560d64d1780c4c0e936b60802bae3cb2f0 files/jfreechart-1.0.3-build.xml.patch 2226
@@ -5,10 +8,10 @@ SHA256 b23b55d0ab9c7efc8f53375d7aca8b198eb22ca31f0164fb18a44059d9a387cc files/jf
 DIST jfreechart-0.9.21.tar.gz 2765821 RMD160 c6e96aa139c3d2b3f1cb2a1866115dbcbf391460 SHA1 6b6092f6569e5d1211688d0661564c3fb0a93ba7 SHA256 6f1d09212afe17666be5f433de3ff131ed2851595e867edb90c8de39a7e6bb45
 DIST jfreechart-1.0.2.tar.gz 4480107 RMD160 62cb6b1e4e4c6ffc676bd54c42696b95d64bbae9 SHA1 399bb52464e43ab05ce28068aa008e4439537b1f SHA256 6ac37dad4dbaa83a2869eb93fc81958933ea100110a39c747bc87fe6872d7931
 DIST jfreechart-1.0.3.tar.gz 5307298 RMD160 6dde2729f9cb0c2325c4be744178b25403f44efa SHA1 4d1708c540c9b6d5755e4ff2cc1a0031c97c5d10 SHA256 a863d36bac966b074d36fc3e220af7c8b862180447b503911558413b0586da5f
-EBUILD jfreechart-0.9.21-r1.ebuild 1179 RMD160 0a38bd3bf90ade45493b75b02837499e9d15bc8a SHA1 cb350542e321e46fe4fc72442a4e34de6c025841 SHA256 846f3029fdbad4beee63e702a619adab298608c0e2e88f112e6fd3f6ae34e515
-MD5 14df69f20a5011e00cf14064b5fe8b7e jfreechart-0.9.21-r1.ebuild 1179
-RMD160 0a38bd3bf90ade45493b75b02837499e9d15bc8a jfreechart-0.9.21-r1.ebuild 1179
-SHA256 846f3029fdbad4beee63e702a619adab298608c0e2e88f112e6fd3f6ae34e515 jfreechart-0.9.21-r1.ebuild 1179
+EBUILD jfreechart-0.9.21-r1.ebuild 1152 RMD160 7c88ad3943df63b00906f2dc7e15d704edc28c27 SHA1 f00e8b11b661c864b14d9546013fd11da10d937b SHA256 01f3af260c249f0bad74b22e1d9bf1a2ea8ecda8b57c9c03e8106d2404a8f234
+MD5 37e97ded6b72a54711830a2d7881a7d8 jfreechart-0.9.21-r1.ebuild 1152
+RMD160 7c88ad3943df63b00906f2dc7e15d704edc28c27 jfreechart-0.9.21-r1.ebuild 1152
+SHA256 01f3af260c249f0bad74b22e1d9bf1a2ea8ecda8b57c9c03e8106d2404a8f234 jfreechart-0.9.21-r1.ebuild 1152
 EBUILD jfreechart-0.9.21.ebuild 1203 RMD160 4cc8a37bbac33aad7a09c8c068d0a7b8e5e9e94f SHA1 381f48496961ae8803d3a40b3439db63d967782b SHA256 5d0c176501307f3d831401fb0e53b671d3c1207ef77f7a57c7a85813b24dfcf2
 MD5 3f9d1ed8dd52240fe141b2f1ba989114 jfreechart-0.9.21.ebuild 1203
 RMD160 4cc8a37bbac33aad7a09c8c068d0a7b8e5e9e94f jfreechart-0.9.21.ebuild 1203
@@ -21,10 +24,10 @@ EBUILD jfreechart-1.0.3.ebuild 1841 RMD160 dae97fea589889ef9c3d6e751a86230cc3987
 MD5 a69b79433316bed362c9268956e00521 jfreechart-1.0.3.ebuild 1841
 RMD160 dae97fea589889ef9c3d6e751a86230cc3987cdd jfreechart-1.0.3.ebuild 1841
 SHA256 9c9a2f56dd3d1973c9c76081d30b27386209f7b46e0870bbc6a193ee5e7dacee jfreechart-1.0.3.ebuild 1841
-MISC ChangeLog 2679 RMD160 5bd029efa9eac5296ed781fca5e91413b43bb29a SHA1 0b04ba29022c17553538b9a83a71ee9916136662 SHA256 c61876f51d82c5627a6f56ab0d6c6d1318b6ab9e9b7b742af36eb9efe075eca5
-MD5 548dc72677afb7dc61566967a0e33c29 ChangeLog 2679
-RMD160 5bd029efa9eac5296ed781fca5e91413b43bb29a ChangeLog 2679
-SHA256 c61876f51d82c5627a6f56ab0d6c6d1318b6ab9e9b7b742af36eb9efe075eca5 ChangeLog 2679
+MISC ChangeLog 2784 RMD160 c23a88a97a0a6c7ec3c93791b339721d61d98c58 SHA1 18d536d29d92af4f26217ca1ba100e3cabe92462 SHA256 7b2a3227a8bb2d7cc0fb5837c4afd73bfd1797685587a700c9a19231ea5aa780
+MD5 195e132b340ed22caa9a3853bd57dd15 ChangeLog 2784
+RMD160 c23a88a97a0a6c7ec3c93791b339721d61d98c58 ChangeLog 2784
+SHA256 7b2a3227a8bb2d7cc0fb5837c4afd73bfd1797685587a700c9a19231ea5aa780 ChangeLog 2784
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -41,3 +44,10 @@ SHA256 3509d8ccaf24876ad58beb864d2cfdb6cd712736fcbcc7220a1db68ec8e65d86 files/di
 MD5 d3b7b0e393e6a4223f7ef2c5ac48a653 files/digest-jfreechart-1.0.3 253
 RMD160 760c740abfb7a5529ddc8fa9d725ee36e822d54d files/digest-jfreechart-1.0.3 253
 SHA256 56c2051754b95649ae9a7ed9d6d970e51d328320af91a47a74fbab1d710d27d7 files/digest-jfreechart-1.0.3 253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFu9pkcxLzpIGCsLQRAlRFAJ41MHkmm3ztYe647TULCv7XK3lFMwCdGZZ+
+K62iIBNSHHiocXBz+sCKFck=
+=UDG+
+-----END PGP SIGNATURE-----

diff --git a/dev-java/jfreechart/jfreechart-0.9.21-r1.ebuild b/dev-java/jfreechart/jfreechart-0.9.21-r1.ebuild
index a71fb16e4a3656b9558a775550512461c465ef47..6442839506537c6e899db8c3b535e4e4a9ad1386 100644 (file)
--- a/dev-java/jfreechart/jfreechart-0.9.21-r1.ebuild
+++ b/dev-java/jfreechart/jfreechart-0.9.21-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/jfreechart/jfreechart-0.9.21-r1.ebuild,v 1.1 2006/09/11 12:59:25 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/jfreechart-0.9.21-r1.ebuild,v 1.2 2007/01/27 23:03:57 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -20,28 +20,21 @@ DEPEND=">=virtual/jdk-1.4
        dev-java/ant-core"
 
 src_unpack() {
-
        unpack ${A}
-       cd ${S}
-       rm -f lib/* *.jar
-
+       cd "${S}"
+       rm -v lib/* *.jar
 }
 
 src_compile() {
-
        local antflags="compile -Djcommon.jar=$(java-pkg_getjars jcommon) \
                -Dservlet.jar=$(java-pkg_getjar servletapi-2.3 servlet.jar) \
                -Dgnujaxp.jar=$(java-pkg_getjars gnu-jaxp)"
-       use doc && antflags="${antflags} javadoc"
-       eant -f ant/build.xml ${antflags} || die "compile failed"
-
+       eant -f ant/build.xml ${antflags} $(use_doc) || die "compile failed"
 }
 
 src_install() {
-
        java-pkg_newjar ${P}.jar ${PN}.jar
-       dodoc README.txt CHANGELOG.txt
-       use doc && java-pkg_dohtml -r javadoc/
+       dodoc README.txt CHANGELOG.txt || die
+       use doc && java-pkg_dojavadoc javadoc/
        use source && java-pkg_dosrc source/*
-
 }