Version bump. Remove dependency on 1.5 jdk - bug #292001.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

3 files changed, 66 insertions, 3 deletions

diff --git a/dev-java/c3p0/ChangeLog b/dev-java/c3p0/ChangeLog
index 4e05972b364a..ba681a8c9b09 100644
--- a/dev-java/c3p0/ChangeLog
+++ b/dev-java/c3p0/ChangeLog
@@ -1,6 +1,11 @@
 # 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.25 2007/11/28 03:15:14 betelgeuse Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/ChangeLog,v 1.26 2009/11/08 22:53:55 caster Exp $
+
+*c3p0-0.9.1.2 (08 Nov 2009)
+
+  08 Nov 2009; Vlastimil Babka <caster@gentoo.org> +c3p0-0.9.1.2.ebuild:
+  Version bump. Remove dependency on 1.5 jdk - bug #292001.
 
   28 Nov 2007; Petteri Räty <betelgeuse@gentoo.org> c3p0-0.9.0.4.ebuild:
   Prefer 1.5 over 1.4 and ebuild cleanup.
diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index 0f55881a5d20..4e2bec6d7e27 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,4 +1,7 @@
 DIST c3p0-0.9.0.4.src.tgz 297115 RMD160 7f9132acf9237faf9a019a45c103dcd2d32be7ed SHA1 106e66d6a8831ac082188e1654f850f7da2323e6 SHA256 eb4af48cb95345cc6deda1aefc8e8ad2796b10d7f736e15d06131b422a366947
+DIST c3p0-0.9.1.2-codegen.tar.bz2 15434 RMD160 336dd067bddd314496556f6e1ba1802f5dcc5b11 SHA1 91af8c99b610079fb8c8c4a27526ab8878b00082 SHA256 c8c920d7cc240e07276525d861f88128f6403e1a123e2526796caa440b9c9025
+DIST c3p0-0.9.1.2.src.tgz 380118 RMD160 6998f5c44ce42c7cb4dbb0902075cec4cbe3a13a SHA1 79699771d4e62e61ac2e3a8b203f518665623042 SHA256 b837a5668a7fb0cb2338dbe26867ecc91c6e9ea030440107becb999a9a8724d3
 EBUILD c3p0-0.9.0.4.ebuild 1142 RMD160 adb36d42bc35af34fcbcb7f083bcf314b8fc7128 SHA1 9675cc68c353ec8c54a7a7ce90e14d2b50a47a61 SHA256 62a73f050ee8b1cc4b78aaafed868dde417f3c8e940b199be8daade25bb37f54
-MISC ChangeLog 3122 RMD160 bc7bff627987a66819b920ab9e9de68c1e5ba429 SHA1 0f58b72e41ef796c9457af404a6447cbe4a694b2 SHA256 a2e7fed591d7cb21dd327c32f98a432557a0b061d5c5def1dd41c194a95ca3c7
+EBUILD c3p0-0.9.1.2.ebuild 1748 RMD160 b3b0e80b4b80498073f65b5921867d7ae0a3fe1e SHA1 104e2cd7ee9562d627229911e0f6557c3b94d00c SHA256 07be6d410f79755cc5e7bbb96a57ba0f8c0829d927abdc94a1bcec2e8db21b5b
+MISC ChangeLog 3281 RMD160 24965fcd500d297012524b759fe3c4db7744feb7 SHA1 a17acdc9145baea5ec97aa67ec874bf069c59b2a SHA256 fe638259da717688e19450890570b494eacfd53d94065730d0a9dc5fadec26c5
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/c3p0/c3p0-0.9.1.2.ebuild b/dev-java/c3p0/c3p0-0.9.1.2.ebuild
new file mode 100644
index 000000000000..d6d0cd472d92
--- /dev/null
+++ b/dev-java/c3p0/c3p0-0.9.1.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/c3p0/c3p0-0.9.1.2.ebuild,v 1.1 2009/11/08 22:53:55 caster Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit java-pkg-2 java-ant-2
+
+SRC_P="${P}.src"
+
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+DESCRIPTION="Library for augmenting traditional (DriverManager-based) JDBC drivers with JNDI-bindable DataSources"
+HOMEPAGE="http://c3p0.sourceforge.net/"
+# how to package the generated sources:
+# 1) comment out the sed build.xml calls below and compile with forced sun-jdk-1.5
+# 2) go to the ${WORKDIR}
+# 3) tar -cjf c3p0-0.9.1.2-codegen.tar.bz2 c3p0-0.9.1.2.src/build/codegen/
+SRC_URI="mirror://sourceforge/${PN}/${SRC_P}.tgz
+	mirror://gentoo/c3p0-0.9.1.2-codegen.tar.bz2"
+# Does not like Java 1.6's JDBC API
+COMMON_DEPEND="dev-java/log4j"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${SRC_P}"
+
+src_prepare() {
+	echo "j2ee.jar.base.dir=${JAVA_HOME}" > build.properties
+	echo "log4j.jar.file=$(java-pkg_getjar log4j log4j.jar)" >> build.properties
+
+	java-ant_rewrite-bootclasspath 1.5
+	# don't generate sources, use the pregenerated from gentoo mirrors
+	# since generator uses reflection, it's not as simple as javac bootclasspath rewrite
+	sed -i 's/depends="codegen"//' build.xml
+	sed -i 's/depends="codegen,/depends="init,/' build.xml
+}
+
+EANT_DOC_TARGET="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
+}