Prefer 1.5 over 1.4 and ebuild cleanup.

Package-Manager: portage-2.1.4_rc3

4 files changed, 40 insertions, 29 deletions

diff --git a/dev-java/c3p0/ChangeLog b/dev-java/c3p0/ChangeLog
index cfbd2fa43ce0..4e05972b364a 100644
--- a/dev-java/c3p0/ChangeLog
+++ b/dev-java/c3p0/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/c3p0
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.24 2007/02/11 12:22:21 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.25 2007/11/28 03:15:14 betelgeuse Exp $
+
+  28 Nov 2007; Petteri Räty <betelgeuse@gentoo.org> c3p0-0.9.0.4.ebuild:
+  Prefer 1.5 over 1.4 and ebuild cleanup.
 
   11 Feb 2007; Vlastimil Babka <caster@gentoo.org>
   -c3p0-0.8.5_pre9-r1.ebuild:
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index 1d25b4eba0eb..0fc3096df1d9 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,12 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST c3p0-0.9.0.4.src.tgz 297115 RMD160 7f9132acf9237faf9a019a45c103dcd2d32be7ed SHA1 106e66d6a8831ac082188e1654f850f7da2323e6 SHA256 eb4af48cb95345cc6deda1aefc8e8ad2796b10d7f736e15d06131b422a366947
-EBUILD c3p0-0.9.0.4.ebuild 1186 RMD160 575d90ad39b5663a1acaa41e05e56129de0e5a24 SHA1 9bdaa47899159c6f9d7e8696179a9b146659c69f SHA256 5fe0e44211d94f77c07f478b31884801a5eba53b501a74840c7fa482258d554b
-MD5 3af6988e845b1b46009643987cd86c8f c3p0-0.9.0.4.ebuild 1186
-RMD160 575d90ad39b5663a1acaa41e05e56129de0e5a24 c3p0-0.9.0.4.ebuild 1186
-SHA256 5fe0e44211d94f77c07f478b31884801a5eba53b501a74840c7fa482258d554b c3p0-0.9.0.4.ebuild 1186
-MISC ChangeLog 3001 RMD160 b009ec095da7dfdec52cf0711cde23af185f013c SHA1 058db92272fb4eead6d231a80d11c5a5611fcf74 SHA256 27f635b3f1dd1986be07573bbd1b7effdf5c0161193963791ddb86af5a6277b6
-MD5 90e7dc4ff7f5d84ebb7cb11127f5df5e ChangeLog 3001
-RMD160 b009ec095da7dfdec52cf0711cde23af185f013c ChangeLog 3001
-SHA256 27f635b3f1dd1986be07573bbd1b7effdf5c0161193963791ddb86af5a6277b6 ChangeLog 3001
+EBUILD c3p0-0.9.0.4.ebuild 1142 RMD160 adb36d42bc35af34fcbcb7f083bcf314b8fc7128 SHA1 9675cc68c353ec8c54a7a7ce90e14d2b50a47a61 SHA256 62a73f050ee8b1cc4b78aaafed868dde417f3c8e940b199be8daade25bb37f54
+MD5 792534800a279ba5607888d9eb1a9967 c3p0-0.9.0.4.ebuild 1142
+RMD160 adb36d42bc35af34fcbcb7f083bcf314b8fc7128 c3p0-0.9.0.4.ebuild 1142
+SHA256 62a73f050ee8b1cc4b78aaafed868dde417f3c8e940b199be8daade25bb37f54 c3p0-0.9.0.4.ebuild 1142
+MISC ChangeLog 3122 RMD160 bc7bff627987a66819b920ab9e9de68c1e5ba429 SHA1 0f58b72e41ef796c9457af404a6447cbe4a694b2 SHA256 a2e7fed591d7cb21dd327c32f98a432557a0b061d5c5def1dd41c194a95ca3c7
+MD5 67230c716cec0ba843b2f7c0382d36f9 ChangeLog 3122
+RMD160 bc7bff627987a66819b920ab9e9de68c1e5ba429 ChangeLog 3122
+SHA256 a2e7fed591d7cb21dd327c32f98a432557a0b061d5c5def1dd41c194a95ca3c7 ChangeLog 3122
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -14,3 +17,10 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 97f3119dbf20ce9b81ed9bc05ba995a9 files/digest-c3p0-0.9.0.4 241
 RMD160 582bc8c310a3f6cb1e49aa79ad3ae55a5ef5688c files/digest-c3p0-0.9.0.4 241
 SHA256 d84cfb957e3873b52186e1111fbd9ca98cb9d3eb651bc43dd2a4c4521688b777 files/digest-c3p0-0.9.0.4 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHTNz4cxLzpIGCsLQRAhqeAKCFtpNO33mfdD3HWFoCD+Rh4BSjWwCfUuCX
+4KMAZClgagqfUBp1VqpsqpA=
+=WPX2
+-----END PGP SIGNATURE-----
diff --git a/dev-java/c3p0/c3p0-0.9.0.4.ebuild b/dev-java/c3p0/c3p0-0.9.0.4.ebuild
index d4f24b92e84c..712f29ac98c3 100644
--- a/dev-java/c3p0/c3p0-0.9.0.4.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.0.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/c3p0-0.9.0.4.ebuild,v 1.6 2007/02/10 18:56:48 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/c3p0-0.9.0.4.ebuild,v 1.7 2007/11/28 03:15:14 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,16 +13,14 @@ HOMEPAGE="http://c3p0.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${SRC_P}.tgz"
 # Does not like Java 1.6's JDBC API
 COMMON_DEPEND="dev-java/log4j"
-DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
-	dev-java/ant-core
-	source? ( app-arch/zip )
+DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
 	${COMMON_DEPEND}"
 RDEPEND=">=virtual/jre-1.4
 	${COMMON_DEPEND}"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="doc source"
+IUSE=""
 
 S="${WORKDIR}/${SRC_P}"
 
@@ -32,9 +32,7 @@ src_unpack() {
 	echo "log4j.jar.file=$(java-pkg_getjar log4j log4j.jar)" >> build.properties
 }
 
-src_compile() {
-	eant jar $(use_doc javadocs)
-}
+EANT_DOC_TARGET="javadocs"
 
 src_install() {
 	java-pkg_newjar build/${P}.jar
diff --git a/dev-java/jmp/Manifest b/dev-java/jmp/Manifest
index 490e7c004005..c1e96e5fdb65 100644
--- a/dev-java/jmp/Manifest
+++ b/dev-java/jmp/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST jmp-0.51.tar.gz 629336 RMD160 b9ab75267ea88560dafd30fc93eea3b096935ffa SHA1 42ea84fd409b4c8515c4eac848f0ffa9f3325a73 SHA256 6be4c5660e2f74e0c10c3ccd32a709a7eb876faae05b65e89b0fa6f647b65045
-EBUILD jmp-0.51.ebuild 1255 RMD160 2256f4a642e9931b5cb652da932ff688e03a42b0 SHA1 a8df1f3354270ae1ce0bfee3db0654fbeb834511 SHA256 f8de57de2776043dd7a2bd66e5e558d149e45b94fc2f0f40bd2726acb21e7da4
-MD5 c71c13f4346875415eaba31f4a3b6c8b jmp-0.51.ebuild 1255
-RMD160 2256f4a642e9931b5cb652da932ff688e03a42b0 jmp-0.51.ebuild 1255
-SHA256 f8de57de2776043dd7a2bd66e5e558d149e45b94fc2f0f40bd2726acb21e7da4 jmp-0.51.ebuild 1255
-MISC ChangeLog 2252 RMD160 a6ba540e1c7e5a7480de421b5aabf55ed76690d6 SHA1 4f9cbf80388945a986c60b66fc2b8e66e24c0c49 SHA256 9939c690961387c6956f00e0f7291e75522e2f21c07be942978ffd7a5362f589
-MD5 e0e933632b46719c8448474600f7c70c ChangeLog 2252
-RMD160 a6ba540e1c7e5a7480de421b5aabf55ed76690d6 ChangeLog 2252
-SHA256 9939c690961387c6956f00e0f7291e75522e2f21c07be942978ffd7a5362f589 ChangeLog 2252
+EBUILD jmp-0.51.ebuild 1261 RMD160 bdb77666f6f62756040b0dee9a0a13c73d463874 SHA1 b779eea42d1d3396f015cdbf8a0a71088f4bd080 SHA256 5fe6f016b8c255b980f72df129bc2d3f0aa6bf21261275beedc7a66cb46fa6b4
+MD5 ce2e4f8508064bc8141d9581d9c02729 jmp-0.51.ebuild 1261
+RMD160 bdb77666f6f62756040b0dee9a0a13c73d463874 jmp-0.51.ebuild 1261
+SHA256 5fe6f016b8c255b980f72df129bc2d3f0aa6bf21261275beedc7a66cb46fa6b4 jmp-0.51.ebuild 1261
+MISC ChangeLog 2346 RMD160 6abcd6284fbc0e09f6448ed3f214d9fd394f77de SHA1 21924512e00d88e3bd67f177530607552a18271e SHA256 4b4ca2b29cf102d19b68f21a7ec2db886aab6e1459374ba0669d225329fc027e
+MD5 cbf44e507b7184f6c38fc3113b150a76 ChangeLog 2346
+RMD160 6abcd6284fbc0e09f6448ed3f214d9fd394f77de ChangeLog 2346
+SHA256 4b4ca2b29cf102d19b68f21a7ec2db886aab6e1459374ba0669d225329fc027e ChangeLog 2346
 MISC metadata.xml 406 RMD160 25b6dcdfe3a69a8b95d30065a93af579736c7eef SHA1 b405f462b24c7d53b9252bc039b9dfd8d03da203 SHA256 919c8d9d9940dd2e50b6947fbcc060136afa169da25415e20fcd5c111084b45e
 MD5 cfd123d7bb115028a1af5968daba9435 metadata.xml 406
 RMD160 25b6dcdfe3a69a8b95d30065a93af579736c7eef metadata.xml 406
@@ -18,9 +18,9 @@ MD5 24314723fc20759c154afb0d5ff66d91 files/digest-jmp-0.51 226
 RMD160 f0f385e527fafc7aa08632e2b40d58cf73481890 files/digest-jmp-0.51 226
 SHA256 1edd5e0e7abcaf7e3421bfd47da9cc5a0bb677ea32ab68594f409c10407da900 files/digest-jmp-0.51 226
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGHnZmcxLzpIGCsLQRArupAJ9s1tkzghklXQiCq4Xqgq3N8CoGkACdEASB
-FGceAVw69dVBX7ACCuPZUKU=
-=NWjX
+iD8DBQFHTN2hcxLzpIGCsLQRArQrAKCPknpKOIRf5oOFUubd+pDVJkU9lQCeIIbz
+xjo1Mft/6KYgvcwXyQ+U784=
+=y0wC
 -----END PGP SIGNATURE-----