gentoo resync : 08.10.2021

3 files changed, 57 insertions, 53 deletions

diff --git a/dev-db/apgdiff/Manifest b/dev-db/apgdiff/Manifest
index e610b25c0897..5ba967673257 100644
--- a/dev-db/apgdiff/Manifest
+++ b/dev-db/apgdiff/Manifest
@@ -1,3 +1,3 @@
-DIST apgdiff-2.4-src.zip 227714 BLAKE2B 1c62c94592b28a7caf5a56f4ef4206cc2655f2da278d5a71e165f409587d1573dd44b62261817f0b994ed95a398555190dee6a2873fe493f695e91c6cf9dd22c SHA512 f37e0f86ff8a8bc53a43cac1748ab3a2c96ab6c972b37ee63f281ee397b31a7b48986cbc963d89ea773f1bb7b10b798de74a4c88a03f2db7672501b93355261b
-EBUILD apgdiff-2.4.ebuild 1093 BLAKE2B 424bd47dbdcd0ab3c1cd8a2023d5e1ca1d9d4079f0881bcc1866607d7dd25c00efb14c9661619a28a30378d1a0d516af32efd021c8ea782382f919533392a3f6 SHA512 67ab1f76df9459c8dd91f207a65849d27202751210290e68506b55d69042d747c2267793c318320502664b7166fe8039856206d47f3f4882fc6f8c0064f2176b
+DIST apgdiff-2.7.0-sources.tar.gz 365759 BLAKE2B 6a43bea29fa77a6a07b8599b150769e42480e656d7930faf56dd5db89a2281e10baee596e78d245411879ca99e143d3ebfb6144ea68b5d2f56f7f939004897dc SHA512 db52bcf5af78339ab08cd6a5225d7df9d55cf4eb1bcefaf9e9b12f8ac06f7babb2261ac92b7aa49a6f43a39f9e7894f4dea88b1b794f0a87681ab872c5d1d430
+EBUILD apgdiff-2.7.0.ebuild 1438 BLAKE2B 11fadfe58847598d374689b85644f75c3c055b6b9ed99021db27725f5eeb81b7e6aa04cc6b40cb1d7529a9c70a9efa5206935fc99a7136a9a44754b86fd317eb SHA512 c34b4767f170f31a8c5dbc16458a5f43f39001e3fd55e882a00907513aed8fad4e9b32f0acc9b0d608a820d801773978ab080e61a9437ea732d6e236e31e737d
 MISC metadata.xml 302 BLAKE2B 919daabbb1bd47c74c25ca82a10d1658a79fee2ccd811da21b0208288ee2c0ace315c8e4322a4a025253f2cdf8ed4829b23ca4e4277e9877a3603880f6114888 SHA512 680951f51e23e4c0533b1d12ebf47ecd3e3ea2c3c793fe4c2f03c24de6cc270cec93270641893a1ca420636de3d7804c405d4c38b917c731f8dcbb223fe3d4c1
diff --git a/dev-db/apgdiff/apgdiff-2.4.ebuild b/dev-db/apgdiff/apgdiff-2.4.ebuild
deleted file mode 100644
index eed28c458186..000000000000
--- a/dev-db/apgdiff/apgdiff-2.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 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="A simple PostgreSQL diff tool that is useful for schema upgrades"
-HOMEPAGE="https://apgdiff.com"
-SRC_URI="https://apgdiff.com/download/${P}-src.zip"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=virtual/jdk-1.6
-	>=dev-java/ant-core-1.7.0:0
-	>=dev-java/ant-junit-1.7.0:0
-	app-arch/unzip:0
-	test? (
-		dev-java/hamcrest-core:0
-		>=dev-java/junit-4.4:4
-	)"
-
-RDEPEND=">=virtual/jre-1.6"
-
-java_prepare() {
-	mkdir "${S}"/lib
-	cd "${S}"/lib
-	if use test ; then
-		java-pkg_jar-from --build-only hamcrest-core
-		java-pkg_jar-from --build-only junit-4
-	fi
-}
-
-src_compile() {
-	eant -Dnoget=true jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_newjar dist/${P}.jar ${PN}.jar
-	java-pkg_dolauncher apgdiff --jar ${PN}.jar
-
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/main/java/*
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" eant -Dnoget=true test
-}
diff --git a/dev-db/apgdiff/apgdiff-2.7.0.ebuild b/dev-db/apgdiff/apgdiff-2.7.0.ebuild
new file mode 100644
index 000000000000..40a2fdce9033
--- /dev/null
+++ b/dev-db/apgdiff/apgdiff-2.7.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 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/fordfrog/apgdiff/archive/refs/tags/release_2.7.0.tar.gz --slot 0 --keywords "~amd64 ~x86" --ebuild apgdiff-2.7.0.ebuild
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="cz.startnet:apgdiff:2.7.0"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A simple PostgreSQL diff tool that is useful for schema upgrades"
+HOMEPAGE="https://github.com/fordfrog/apgdiff https://www.apgdiff.com/"
+SRC_URI="https://github.com/fordfrog/${PN}/archive/refs/tags/release_${PV}.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Compile dependencies
+# POM: pom.xml
+# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4
+# test? org.hamcrest:hamcrest-all:1.3 -> !!!artifactId-not-found!!!
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+	test? (
+		dev-java/hamcrest-core:0
+	)
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/${PN}-release_${PV}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_MAIN_CLASS="cz.startnet.utils.pgdiff.Main"
+JAVA_RESOURCE_DIRS=(
+	"src/main/resources"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="hamcrest-core,junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"src/test/resources"
+)