gentoo resync : 06.04.2022

3 files changed, 2 insertions, 60 deletions

diff --git a/dev-java/c3p0/Manifest b/dev-java/c3p0/Manifest
index 2a1a87b660a8..e0de783ffa2f 100644
--- a/dev-java/c3p0/Manifest
+++ b/dev-java/c3p0/Manifest
@@ -1,4 +1,3 @@
 DIST c3p0-0.9.5.5.src.tgz 869069 BLAKE2B 6e1349d1cd02647a7c2424b8e89a8c21cfd8faefd26b7e05ee9e2da1a1a501b2b3102b142eef52f56dea672408d683a6f47b4c89b25d529a578c4b1fe4aa819c SHA512 fa96b5d0042442c773309090b9cf8f0db8e16f334e321ac952afb198ca06cd66f6f7162369f22a439a0e6b45b1ffcddf540af53804f223844d7a5465213bece1
-EBUILD c3p0-0.9.5.5-r1.ebuild 1322 BLAKE2B f73ed9d33c5e510b8a5c8b5b3b4a10ef97940f67a0fc1a74059ecb1e78d4aa3c09ee3fea3c82b607cd860c68a45b076724c122a6270049072d7d41e196d4bf96 SHA512 b9cd8f8b80bb4564c52210752722f312978b8e81e7d1692eebd3375cbd0f63e73410956014502b7ef545a6f1f025f50fa78aecedd18a2d37e7c6aef2b41ec729
-EBUILD c3p0-0.9.5.5.ebuild 1304 BLAKE2B 12e0e9d144e0e14582e0ca37c40e4df33d746377697942d62dbeb5811cc76991e7c33d8c59f3dc4b1cdbff48fbf58a10336734932c412156a31e2fe3db8cda0a SHA512 b822c1570529ab43716475125273364df68f973f82155dc1d486b5ac234b68b7fbc7ad00288d7e0b78522fb3137794f509728265b4b6780aec227fc82ffac757
+EBUILD c3p0-0.9.5.5-r1.ebuild 1320 BLAKE2B 707f7de2a549ebf06fe03e1fb3289e9a34a4c77c4cb4cdf68f62758f5a68043acebb65d1283d99ead21682e4e6c58c223e04682521abc3f3c7f9dbae859ca35c SHA512 c767505847992ccc176b9112ec61eb57a3cf272f8a1dc56d2d7ce42abdc12bf5e3c0525da155aa6e83cbc2df0f72b2050121cace304677adc6d3f103b8a8e8e6
 MISC metadata.xml 311 BLAKE2B 94e12506ba1bdd92ded65a3ceb8421881aa0a2bce4a93affc09208ff35b942e10ebc855833056e118fbf3e3d4b04e653b3de9ed2d45266191bd580040fdfbe69 SHA512 d4d0cd654557b0ea5d850a8af90db536b3893d2221aba93449559abd2469725e853e5f1ac4bcd67629f1f5be253106eb0a3d1a53b9da144256a01bd7264b6cfe
diff --git a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
index cc33ee96ffbd..ab37f59be694 100644
--- a/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
+++ b/dev-java/c3p0/c3p0-0.9.5.5-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.mchange.com/projects/c3p0/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
 LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
 
 CP_DEPEND="
 	dev-java/log4j-12-api:2
diff --git a/dev-java/c3p0/c3p0-0.9.5.5.ebuild b/dev-java/c3p0/c3p0-0.9.5.5.ebuild
deleted file mode 100644
index a65d10630f90..000000000000
--- a/dev-java/c3p0/c3p0-0.9.5.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2022 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 java-ant-2
-
-DESCRIPTION="JDBC drivers with JNDI-bindable DataSources"
-HOMEPAGE="https://www.mchange.com/projects/c3p0/"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.src.tgz"
-LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux"
-
-CP_DEPEND="
-	dev-java/log4j:0
-	dev-java/mchange-commons:0
-"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CP_DEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CP_DEPEND}
-"
-
-S="${WORKDIR}/${P}.src"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_prepare() {
-	java-pkg_clean
-	java-pkg-2_src_prepare
-	java-pkg_jar-from --into lib/ log4j
-	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_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
-}