gentoo resync : 02.02.2022

3 files changed, 43 insertions, 51 deletions

diff --git a/dev-java/commons-imaging/Manifest b/dev-java/commons-imaging/Manifest
index 4a7fab83ce31..5e4e10b728ed 100644
--- a/dev-java/commons-imaging/Manifest
+++ b/dev-java/commons-imaging/Manifest
@@ -1,3 +1,3 @@
-DIST apache-sanselan-incubating-0.97-src.tar.gz 33317875 BLAKE2B c9db6c30accc308d2c5d5977b84da118ab50b010b3728665a75dab13f9fecb70075e2d2208a62fabc57af7396f7c39b1ec498e0840e5a2c9c8de9b95d2dd597a SHA512 b7e8af01f4b4ca812313bbf573758d9c0e1355266bfb83898336b14c4b492a8979f2a593f00d53c076e83cf807a049df624491a26623cfbceb00560b748f05f2
-EBUILD commons-imaging-0.97.ebuild 1310 BLAKE2B 2afbfb353ca4b79b3213acdd2fb03407f2cd4bec788aaf1be04d1fcefad9c224074e359052972dd962f33a6da9cb66f9806431375fe000278d8e875456e97705 SHA512 c17518c2a4edc116b0311b5a9b97b56b8f6a098448ccea06b15c2b3832f339ff136d897d0c3d120f6deb0fde7947cdce7f40e01ae1c31ddaeb35fa8a87aa35e1
+DIST commons-imaging-1.0-alpha2-src.tar.gz 39798631 BLAKE2B 01d0754689896a1f2ff1401cac7d9f59a6bbb245c0880f24f857efc53975c1203c6857d7a5d107763741a2dec7fb48c4faa258786f574cf2f3c5acca251e368b SHA512 f2479e0dc726a8d1193f4eef6289efe493cfbbe257054b5a13e929f5785f7a2c9c937e3f379e0f0066c591d18be27d12f1e5157e789eebab78fba489cc81e688
+EBUILD commons-imaging-1.0_alpha2.ebuild 1323 BLAKE2B 460e79cfd4ee6e04f6866d59b055bff9e8d485768edd0cbf7d0824a758afd6392f8c61da0783c08417eb42a07d2f08b2c15fd6fe1ab37b5920b22b2208e844ae SHA512 80a72d95cbcdf1ff08747d981fd23a91b326921b25af4372541dcb7bca2343b61ace604e723054b2b2f4da700867d34e1e80e61d934be07ebc7343f4f0131e76
 MISC metadata.xml 1078 BLAKE2B e2b1574082b656f2025228403463c5111b3d8174d72f9f4d9e31de9c9f72682b6cdd534d4aee455c30f222ae29fddf516395484a7b7fd5811cbd1f82382f4865 SHA512 812966e93eaea83f94ad0957d2421e73bafceff6c354b822d6936cbea9cd058e7dd0400d8d21e88eaa37a1cf1db625f2d5300317ea9817fc705558092c579cf3
diff --git a/dev-java/commons-imaging/commons-imaging-0.97.ebuild b/dev-java/commons-imaging/commons-imaging-0.97.ebuild
deleted file mode 100644
index f8c2ba3f2ef3..000000000000
--- a/dev-java/commons-imaging/commons-imaging-0.97.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A minimalistic realtime charting library for Java"
-HOMEPAGE="https://commons.apache.org/proper/commons-imaging"
-SRC_URI="mirror://apache/commons/sanselan/source/apache-sanselan-incubating-${PV}-src.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # 5/48 failures, dunno why :(
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
-	test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/sanselan-${PV}-incubator"
-JAVA_ENCODING="ISO-8859-1"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	# Tsk, Windows developers…
-	find src/test/java -name "*.java" -exec sed -i 's:\\:/:g' {} + || die
-}
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README.txt RELEASE_NOTES
-}
-
-src_test() {
-	local DIR="src/test/java"
-	local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)"
-
-	local TESTS=$(find "${DIR}" -name "*Test.java" ! -name "*BaseTest.java" ! -name SanselanTest.java ! -name ByteSourceTest.java)
-	TESTS="${TESTS//src\/test\/java\/}"
-	TESTS="${TESTS//.java}"
-	TESTS="${TESTS//\//.}"
-
-	ejavac -cp "${CP}" -d "${DIR}" $(find "${DIR}" -name "*.java")
-	ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/commons-imaging/commons-imaging-1.0_alpha2.ebuild b/dev-java/commons-imaging/commons-imaging-1.0_alpha2.ebuild
new file mode 100644
index 000000000000..9ec64af99b77
--- /dev/null
+++ b/dev-java/commons-imaging/commons-imaging-1.0_alpha2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/imaging/source/commons-imaging-1.0-alpha2-src.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild commons-imaging-1.0_alpha2.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.commons:commons-imaging:1.0-alpha2"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Commons Imaging (previously Sanselan) is a pure-Java image library."
+HOMEPAGE="https://commons.apache.org/proper/commons-imaging/"
+SRC_URI="mirror://apache/commons/imaging/source/commons-imaging-${PV/_/-}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? commons-io:commons-io:2.7 -> >=dev-java/commons-io-2.11.0:1
+# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!!
+# test? org.junit.jupiter:junit-jupiter:5.6.2 -> !!!groupId-not-found!!!
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+DOCS=( {LICENSE,NOTICE,RELEASE-NOTES}.txt README.md )
+
+S="${WORKDIR}/${P/_/-}-src"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_RESOURCE_DIRS="src/main/resources"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}