gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 114 insertions, 0 deletions

diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index ca216fdfd52a..6d9377abb69d 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,3 +1,5 @@
+AUX c3p0-0.9.5.5-source-target.patch 1729 BLAKE2B c077cc97c0f8dc880268f7b60175ce705536f8c12294e70450b6cdcf86677cf92f5c541411fa3d2034e90c8ceedcd79f10d70169eced3c3844022709091e84ee SHA512 c69d8223674510557b86b0adf83ea461e09d2d6f7dee559823c5955ee7d01d963c9d6a247d7cb52672743d6f03fc4c5747a6476002512238f4b0ee12cc9bfbf4
 DIST c3p0-0.9.5.5.src.tgz 869069 BLAKE2B 6e1349d1cd02647a7c2424b8e89a8c21cfd8faefd26b7e05ee9e2da1a1a501b2b3102b142eef52f56dea672408d683a6f47b4c89b25d529a578c4b1fe4aa819c SHA512 fa96b5d0042442c773309090b9cf8f0db8e16f334e321ac952afb198ca06cd66f6f7162369f22a439a0e6b45b1ffcddf540af53804f223844d7a5465213bece1
 EBUILD c3p0-0.9.5.5-r1.ebuild 1360 BLAKE2B 1a1b15eb6de048720a89c42dd934810a9f64eb66b3afad1728a86260f1528cd7ed3a7d69c9f245af468e29680eb866ae3cac046434436cf42656d1f13bd6537a SHA512 77c61f9f98e0f2f5e72289590775b4748b9562e5d661e65a1c7e5c3f71e9c36a337294d87fd55474cfbe4c2a68fa45dd623ef3fd041f7fa3baf3626156428739
+EBUILD c3p0-0.9.5.5-r2.ebuild 1551 BLAKE2B 19d9a5e96bded024bb5b9f2103ed23ff003c5fd9f55d671f121ce1abcb3ffb2b6f7a2ecaad892c1fd8cf3b6e87b3b47eaa549b26325fc3a17532a88f631ce668 SHA512 e55be2dc605cb7c1f38ed1b6b90893c3456df4c2c906fb3c48e9c6b5f7c67abb509b7c95f2bf7942e144651af518b6245742a8c23930f941a6c1d73fbbc1f50b
 MISC metadata.xml 364 BLAKE2B 41a7f0e98d0f4de31b20f73cef598f7b92b7978c02a86709698152150e56ff00ab2c38204c270b316f0549961f550b53a50e5b32a40ad479aa6a24906a75e77c SHA512 724b392d317b00aa3f0e4f8e3ca1dd20f52abd03581172a15a54c9f803582fc4be26e92fa5c61786e6db821900a7d23c02655494d4fe33a552ec3aaf086ab5cf
diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
new file mode 100644
index 000000000000..89dc72a719c4
--- /dev/null
+++ b/dev-java/c3p0/c3p0-0.9.5.5-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Tests require an existing running SQL server and 'junit.jar.file' property
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2
+
+DESCRIPTION="JDBC drivers with JNDI-bindable DataSources"
+HOMEPAGE="https://www.mchange.com/projects/c3p0/"
+SRC_URI="https://downloads.sourceforge.net/project/c3p0/c3p0-src/c3p0-${PV}/${P}.src.tgz"
+S="${WORKDIR}/${P}.src"
+
+LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+CP_DEPEND="
+	dev-java/log4j-12-api:2
+	dev-java/mchange-commons:0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}
+"
+
+PATCHES=( "${FILESDIR}/c3p0-0.9.5.5-source-target.patch" )
+
+src_prepare() {
+	java-pkg_clean
+	default #780585
+	java-pkg-2_src_prepare
+	java-pkg_jar-from --into lib/ log4j-12-api-2
+	java-pkg_jar-from --into lib/ mchange-commons
+
+	# Test sources interfere with Javadoc generation on JDK 11
+	# Remove since the tests will never be run
+	rm -r src/java/com/mchange/v2/c3p0/test ||
+		die "Failed to remove unused test sources"
+}
+
+src_compile() {
+	eant jar $(usev doc javadoc) \
+		-Dant.build.javac.source="$(java-pkg_get-source)" \
+		-Dant.build.javac.target="$(java-pkg_get-target)"
+}
+
+src_install() {
+	java-pkg_newjar "build/${P}.jar"
+	einstalldocs
+
+	use doc && java-pkg_dojavadoc build/apidocs
+	use examples && java-pkg_doexamples src/java/com/mchange/v2/c3p0/example
+	use source && java-pkg_dosrc src/java/com/mchange/v2
+}
diff --git a/dev-java/c3p0/files/c3p0-0.9.5.5-source-target.patch b/dev-java/c3p0/files/c3p0-0.9.5.5-source-target.patch
new file mode 100644
index 000000000000..d066a59fde1b
--- /dev/null
+++ b/dev-java/c3p0/files/c3p0-0.9.5.5-source-target.patch
@@ -0,0 +1,49 @@
+diff --git a/build.xml b/build.xml
+index 47a0f2a..47f8f2b 100644
+--- a/build.xml
++++ b/build.xml
+@@ -180,8 +180,6 @@
+   <target name="init-codegen" depends="debuggen,subst">
+     <javac destdir="${build.classes.dir}" 
+            classpathref="codegen-classpath"
+-	   source="${jvm.target.version}"
+-	   target="${jvm.target.version}"
+            debug="true">
+       <src>
+ 	<pathelement location="${build.codegen.dir}" />
+@@ -224,8 +222,6 @@
+   <target name="compile-common" depends="codegen">
+     <javac destdir="${build.classes.dir}" 
+            classpathref="build-classpath" 
+-	   source="${jvm.target.version}"
+-	   target="${jvm.target.version}"
+            debug="on">
+       <sourcepath>
+ 	<pathelement location="${build.codegen.dir}" />
+@@ -246,8 +242,6 @@
+   <target name="compile-subst" depends="codegen">
+     <javac destdir="${build.classes.dir}" 
+            classpathref="build-classpath" 
+-	   source="${jvm.target.version}"
+-	   target="${jvm.target.version}"
+            debug="on">
+       <sourcepath>
+ 	<pathelement location="${build.codegen.dir}" />
+@@ -262,8 +256,6 @@
+   <target name="compile-mgmt" depends="codegen" unless="no-mgmt">
+     <javac destdir="${build.classes.dir}" 
+            classpathref="build-classpath" 
+-	   source="${jvm.target.version}"
+-	   target="${jvm.target.version}"
+            debug="on">
+       <sourcepath>
+ 	<pathelement location="${java.src.dir}" />
+@@ -318,8 +310,6 @@
+   <target name="compile-junit" depends="compile">
+     <javac destdir="${test.classes.dir}" 
+            classpathref="test-classpath" 
+-	   source="${jvm.target.version}"
+-	   target="${jvm.target.version}"
+            debug="on">
+       <sourcepath>
+ 	<pathelement location="${java.src.dir}" />