Version bump, adds log4j support, closing bug #135884.

Package-Manager: portage-2.1.2_pre2-r5

diff --git a/dev-java/c3p0/ChangeLog b/dev-java/c3p0/ChangeLog
index 2dd8d961edd03a583d6c3405242f43ae080f5e13..521922ccb043eec206d6198f6c42b397b06fabac 100644 (file)
--- a/dev-java/c3p0/ChangeLog
+++ b/dev-java/c3p0/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/c3p0
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.16 2006/07/22 21:49:12 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.17 2006/10/07 23:14:48 caster Exp $
+
+*c3p0-0.9.0.4 (07 Oct 2006)
+
+  07 Oct 2006; Vlastimil Babka <caster@gentoo.org> +c3p0-0.9.0.4.ebuild:
+  Version bump, adds log4j support, closing bug #135884.
 
   22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   c3p0-0.9.0_pre6-r1.ebuild:

diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index 42cdf269dffb9eee6570fabd951cbdce6c0701ec..7dfe15f807db8c2a64573f3b3ec0bffb06a9d8a7 100644 (file)
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST c3p0-0.8.5-pre9.src.tgz 198159
 DIST c3p0-0.8.5.2.src.tgz 202030
 DIST c3p0-0.9.0-pre6.src.tgz 291654 RMD160 543f25e0ecafb2b16408df41eefee1f90e2233a0 SHA1 a8f7055a83894ab05f3aa63473107aa6726ff938 SHA256 6a9d30dfc5ab0ef12db7da3451b5deb5b0e15df13d00431b790e0073ad550359
+DIST c3p0-0.9.0.4.src.tgz 297115 RMD160 7f9132acf9237faf9a019a45c103dcd2d32be7ed SHA1 106e66d6a8831ac082188e1654f850f7da2323e6 SHA256 eb4af48cb95345cc6deda1aefc8e8ad2796b10d7f736e15d06131b422a366947
 EBUILD c3p0-0.8.5.2.ebuild 1048 RMD160 0a768e852e87abbf9ac4e5d87c7010096dcc3798 SHA1 60617a5f50f2c326f0ec392d5f5f3831fbcd5838 SHA256 02eaf766bf39df6712f89754cff642934422ce0f5ec18fb34b9bbc92f3957de4
 MD5 216332b37f2c6219f4ecb63077932ea1 c3p0-0.8.5.2.ebuild 1048
 RMD160 0a768e852e87abbf9ac4e5d87c7010096dcc3798 c3p0-0.8.5.2.ebuild 1048
@@ -12,6 +10,10 @@ EBUILD c3p0-0.8.5_pre9-r1.ebuild 1053 RMD160 f1e43abf70498fc70a947029092fe7ce08d
 MD5 51cf230f5c0f2b61e1c6927a462e0715 c3p0-0.8.5_pre9-r1.ebuild 1053
 RMD160 f1e43abf70498fc70a947029092fe7ce08db57d7 c3p0-0.8.5_pre9-r1.ebuild 1053
 SHA256 36c3e19349c490671d5c8a7f28db96acf950022e56a39a2258af55d4c1242ef8 c3p0-0.8.5_pre9-r1.ebuild 1053
+EBUILD c3p0-0.9.0.4.ebuild 1165 RMD160 e9f6dfe9a40ed746610c61360f57e56c177d001e SHA1 f9ebf4fad47b8d673eb9af6f0ca6ca7049440312 SHA256 a06236caa29f19139e6215dc64caf4ee6686c815eb478cdbad5213757db8b481
+MD5 6988f2e293caaa718368fa9c6f1a768e c3p0-0.9.0.4.ebuild 1165
+RMD160 e9f6dfe9a40ed746610c61360f57e56c177d001e c3p0-0.9.0.4.ebuild 1165
+SHA256 a06236caa29f19139e6215dc64caf4ee6686c815eb478cdbad5213757db8b481 c3p0-0.9.0.4.ebuild 1165
 EBUILD c3p0-0.9.0_pre6-r1.ebuild 983 RMD160 f194e8b9983749a580850de72ce6b23d62327319 SHA1 3d25d6036058bead3c81a37ce3ba0ae203a9c7e4 SHA256 24807ffcf14bf03c0edab6d6c95fbfcbda9e5ec8a90510c9ca6036f77d7d9e83
 MD5 a833b1e13d4a30da9343ffe7d952b00c c3p0-0.9.0_pre6-r1.ebuild 983
 RMD160 f194e8b9983749a580850de72ce6b23d62327319 c3p0-0.9.0_pre6-r1.ebuild 983
@@ -20,10 +22,10 @@ EBUILD c3p0-0.9.0_pre6.ebuild 1051 RMD160 bb64ddc093318de9838d2d6d4b3ff1ce69789d
 MD5 0c6ae3dbd3ab6a89c6f10dab3e4e311e c3p0-0.9.0_pre6.ebuild 1051
 RMD160 bb64ddc093318de9838d2d6d4b3ff1ce69789d16 c3p0-0.9.0_pre6.ebuild 1051
 SHA256 5502883d7cd17f6ee4decc4f3e586e5bceee2998042ba4d068f6065cddb0fa81 c3p0-0.9.0_pre6.ebuild 1051
-MISC ChangeLog 2106 RMD160 62f82783a16be2b11f6e46c604a488ca2e81639c SHA1 087a9caafc763d2a74f73957b007627b2b859b0b SHA256 a38f7818ca254fcd466a5fa0517c12fed02ce2ff40391e4e246e53655e73e237
-MD5 9f333f8d5ff0504e66eaa552373ef941 ChangeLog 2106
-RMD160 62f82783a16be2b11f6e46c604a488ca2e81639c ChangeLog 2106
-SHA256 a38f7818ca254fcd466a5fa0517c12fed02ce2ff40391e4e246e53655e73e237 ChangeLog 2106
+MISC ChangeLog 2264 RMD160 722c6c1b29b86591dee092849d7c1a0b3f86e2a0 SHA1 fe66fb80c88c3418f5884f00faef44c817fefb87 SHA256 c28d51b67914b231f207ad9a6195eae0b5b879dcdbe2a79790186e6145af1e80
+MD5 d867032f97a3c65760127781025a5dbf ChangeLog 2264
+RMD160 722c6c1b29b86591dee092849d7c1a0b3f86e2a0 ChangeLog 2264
+SHA256 c28d51b67914b231f207ad9a6195eae0b5b879dcdbe2a79790186e6145af1e80 ChangeLog 2264
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -34,16 +36,12 @@ SHA256 75ff3616bd7bc470ea160b76df58b7c399b3403fdb85683e13e8afb4297300ab files/di
 MD5 345082f23a9374aea4f95ea617a9d969 files/digest-c3p0-0.8.5_pre9-r1 68
 RMD160 e9701078eca4a0cd1e09a849243cf5720f954ce6 files/digest-c3p0-0.8.5_pre9-r1 68
 SHA256 b1fb2a3593890908a6fdc49c16b281eaccad4880956cf4313b7cf9a1d2a5879e files/digest-c3p0-0.8.5_pre9-r1 68
+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
 MD5 5f7d83ed150322f9a8a249e68297053d files/digest-c3p0-0.9.0_pre6 250
 RMD160 779257c12661c30998b0100506997a6162459611 files/digest-c3p0-0.9.0_pre6 250
 SHA256 f5ac0c891ceb79ce31e21fd3b2e2b03c469267701679da9ecab7c6f622165f22 files/digest-c3p0-0.9.0_pre6 250
 MD5 5f7d83ed150322f9a8a249e68297053d files/digest-c3p0-0.9.0_pre6-r1 250
 RMD160 779257c12661c30998b0100506997a6162459611 files/digest-c3p0-0.9.0_pre6-r1 250
 SHA256 f5ac0c891ceb79ce31e21fd3b2e2b03c469267701679da9ecab7c6f622165f22 files/digest-c3p0-0.9.0_pre6-r1 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEwp1jgo/w9rxVVVERAtVGAJ4tOHTCdUhZ0gN9TqlWnAPdFi5o0QCgnt15
-QcYa7ExHnWFPQ4g0cdLDAIQ=
-=guvH
------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
new file mode 100644 (file)
index 0000000..dc1ec86
--- /dev/null
+++ b/dev-java/c3p0/c3p0-0.9.0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 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.1 2006/10/07 23:14:48 caster Exp $
+
+inherit java-pkg-2 java-ant-2
+
+SRC_P="${P}.src"
+
+DESCRIPTION="Library for augmenting traditional (DriverManager-based) JDBC drivers with JNDI-bindable DataSources"
+HOMEPAGE="http://c3p0.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${SRC_P}.tgz"
+# Does not like Java 1.6's JDBC API
+RDEPEND="dev-java/log4j"
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.5* )
+       dev-java/ant-core
+       source? ( app-arch/zip )
+       ${RDEPEND}"
+RDEPEND=">=virtual/jre-1.4
+       ${RDEPEND}"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc source"
+
+S="${WORKDIR}/${SRC_P}"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       echo "j2ee.jar.base.dir=${JAVA_HOME}" > build.properties
+       echo "log4j.jar.file=$(java-pkg_getjar log4j log4j.jar)" >> build.properties
+}
+
+src_compile() {
+       eant jar $(use_doc javadocs)
+}
+
+src_install() {
+       java-pkg_newjar build/${P}.jar
+       dodoc README-SRC
+       use doc && java-pkg_dojavadoc build/apidocs
+       use source && java-pkg_dosrc src/classes/com
+}

diff --git a/dev-java/c3p0/files/digest-c3p0-0.9.0.4 b/dev-java/c3p0/files/digest-c3p0-0.9.0.4
new file mode 100644 (file)
index 0000000..6970459
--- /dev/null
+++ b/dev-java/c3p0/files/digest-c3p0-0.9.0.4
@@ -0,0 +1,3 @@
+MD5 3f2c41198d40a92ecc5178b5c2740501 c3p0-0.9.0.4.src.tgz 297115
+RMD160 7f9132acf9237faf9a019a45c103dcd2d32be7ed c3p0-0.9.0.4.src.tgz 297115
+SHA256 eb4af48cb95345cc6deda1aefc8e8ad2796b10d7f736e15d06131b422a366947 c3p0-0.9.0.4.src.tgz 297115