gentoo resync : 20.03.2022

4 files changed, 45 insertions, 85 deletions

diff --git a/dev-java/treelayout/Manifest b/dev-java/treelayout/Manifest
index 9813d1758cd2..a6c6d2650fb5 100644
--- a/dev-java/treelayout/Manifest
+++ b/dev-java/treelayout/Manifest
@@ -1,5 +1,3 @@
-DIST treelayout-1.0.2.tar.gz 1007086 BLAKE2B c5ef3f0bc2a7c99a983f648efcca65a4a4fd9d72710b7a1a8263629435da6a79a328778983475565dfc23738978bf658067e3e63e7c36db84a54189821c0da07 SHA512 89a627d8ab2f248bb9b22139de0a28f310deb555f78825f29f4acfd0df7b4c212c8df241b004f8452a4be8a0f7717ee996df3eef4dd88ca905f4ad211df92655
 DIST treelayout-1.0.3.tar.gz 965389 BLAKE2B 5fb893ca0176e245778cf115a3c537d7a0ae4bcaf8119be41aa214dcf3887f5c286445d3d289134193a1b28269a2ba4952c6b9e81e3e462163bead188768f919 SHA512 5fb6a70206978c6bf8ea3c70603f38049cad21038bcedfd5a7f4dde1e4f8b080bfa78ca6dc2e43a7d0771ded39d5793f0c5340cf60ce63348d28a9be6abc3be4
-EBUILD treelayout-1.0.2.ebuild 1004 BLAKE2B 7eafdbac19bf6141d67a96d666cd592946b4a93e9bf3cd4b35221b5a3df1eadeadaaec698d748c7bc7b8a8ed9c525b13d351566916dfd4e3e0a2a157ba242f00 SHA512 a7ee265033e143173d1cb0e2f59d88c9e66cc57b9fb1f4b3ab6fe7eb6893e42a3db235455a115d5eed64c6fa177ac5ae04adb06c2801a3f4b54be622103a47ec
-EBUILD treelayout-1.0.3.ebuild 1017 BLAKE2B a819a2735f4f8a6145425f91d86d43175a4852510ac369a05b72455ebbb8b3441c7ec3c3764716100ca500bfd5fdd8b40380beb243675df7d95e048b677429c0 SHA512 bc4491ef38618fec210518054107ba81257b4de258aad99102e5ecd60ba4b5d2b619b4e1b8c2884d7f1be157b09665910b05ce07c0f0f9a3f0d6b2aba3335ba1
+EBUILD treelayout-1.0.3-r1.ebuild 1162 BLAKE2B 331154c903aa1d898d41dc3468262ae4149e3534a1ca6dfcec654faef8f016362b3c060f149b4d8636a776265e9faeb2331e76b46409c7915324acf4297bb8bd SHA512 63a4ded165bdfc0991a2fc0e511680b88133758f9e47d79e7209f0ff00b553173d298b24ae579ddc85be133679f2c8dbfbb1368d193ee1aa33f1c503727b060b
 MISC metadata.xml 678 BLAKE2B 938023ea4359e75dbde9c82c09764342f83b97e0aa35c53820f38dcd91832a8e1c930a97f5f58f379f18ac94e352ffc8b8bc039c4bcf4d723e925b5ddfe34a3b SHA512 db1c6876c80fc0c2adbb380b3c32c64827a8c203dcac99a7d428e2e7ab3a042ed3aa064c819510110480497fcea5b51a603b3a0e3d8e0cc46dbe624986232d1d
diff --git a/dev-java/treelayout/treelayout-1.0.2.ebuild b/dev-java/treelayout/treelayout-1.0.2.ebuild
deleted file mode 100644
index a055bd951140..000000000000
--- a/dev-java/treelayout/treelayout-1.0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Efficiently create compact tree layouts in Java"
-SRC_URI="https://github.com/abego/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/abego/treelayout"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
-	test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${P}/org.abego.${PN}"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_PKG_BSFIX_NAME="build-impl.xml"
-EANT_BUILD_XML="nbproject/build-impl.xml"
-
-src_configure() {
-	EANT_EXTRA_ARGS="-Dplatform.home=${JAVA_HOME}"
-}
-
-src_install() {
-	java-pkg_newjar dist/org.abego.${PN}.core.jar
-	dodoc CHANGES.txt doc/abegoTreeLayout.pdf
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/treelayout/treelayout-1.0.3-r1.ebuild b/dev-java/treelayout/treelayout-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..010b4519046e
--- /dev/null
+++ b/dev-java/treelayout/treelayout-1.0.3-r1.ebuild
@@ -0,0 +1,44 @@
+# 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 https://github.com/abego/treelayout/archive/v1.0.3.tar.gz --slot 0 --keywords "~amd64 ~arm ~arm64 ~ppc64 ~x86" --ebuild treelayout-1.0.3-r1.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.abego.treelayout:org.abego.treelayout.core:1.0.3"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Efficient and customizable TreeLayout Algorithm in Java."
+HOMEPAGE="https://github.com/abego/treelayout"
+SRC_URI="https://github.com/abego/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+#	LICENSE="!!!equivalentPortageLicenseName-not-found!!!"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+DOCS=( ../README.md )
+
+S="${WORKDIR}/${P}/org.abego.treelayout"
+
+JAVA_SRC_DIR="src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+
+src_install() {
+	default # https://bugs.gentoo.org/789582
+	java-pkg-simple_src_install
+}
diff --git a/dev-java/treelayout/treelayout-1.0.3.ebuild b/dev-java/treelayout/treelayout-1.0.3.ebuild
deleted file mode 100644
index 6785a357c359..000000000000
--- a/dev-java/treelayout/treelayout-1.0.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-JAVA_PKG_BSFIX_NAME="build-impl.xml"
-EANT_BUILD_XML="nbproject/build-impl.xml"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Efficiently create compact tree layouts in Java"
-HOMEPAGE="https://github.com/abego/treelayout"
-SRC_URI="https://github.com/abego/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}/org.abego.${PN}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-DEPEND=">=virtual/jdk-1.8:*
-	test? ( dev-java/ant-junit:0 )"
-
-src_configure() {
-	EANT_EXTRA_ARGS="-Dplatform.home=${JAVA_HOME}"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_newjar dist/org.abego.${PN}.core.jar
-	dodoc CHANGES.txt src/website/abegoTreeLayout.pdf
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/main/java/*
-}