gentoo auto-resync : 25:04:2024 - 23:59:45

3 files changed, 55 insertions, 47 deletions

diff --git a/dev-lang/gnuprologjava/Manifest b/dev-lang/gnuprologjava/Manifest
index a8b7c0277a16..d22e36b706b4 100644
--- a/dev-lang/gnuprologjava/Manifest
+++ b/dev-lang/gnuprologjava/Manifest
@@ -1,4 +1,4 @@
 AUX gnuprologjava-0.2.6-manual.patch 414 BLAKE2B 6bad70e46f1c2e9bdf9e4ef45cdbc4a4074671de28188aac7b69082e44eed86ef3fc1be1b5e83ea81da52df5d1b218583ab7ae73fdeeeb8241f50e8d45c23713 SHA512 419b509abae773e5ac3f2d79328bb4014776cc7c6390b8afa2d3d7242afec41e92d22830ed1be3c15f3d007c9fa08b303b553d883b18e1bde1fe9af09a0c7644
 DIST gnuprologjava-0.2.6-src.zip 477058 BLAKE2B 00248df0b307b733595b585ed5b847413d5de32c3348008ce53bb4dab93bfc465531bd59ea224f5c0bc6a66c3186ff55d353a0fe88d222b490927100cbafceea SHA512 b175c74e754a7176f5fc38ea2215809bb9d60ec5b8852f99a48a72a0bdb316b33b7195ff5c85398bb63aa2e522d12dfc75e2ff3af9f89ff44448d2f73357f0a4
-EBUILD gnuprologjava-0.2.6-r1.ebuild 870 BLAKE2B f148dec06e873bdeb9da63809b082972fbdcec546958c12ee9d284b56195217f0713d150c5fe49eebcc90f7c983a35937b890fbae6c6c321d01bc6f5c0d953ef SHA512 dab943589df310d16fca5c38e381fdc2926fe5cdad9c5011e7b205c1dd7b590392d6352644c11cddab437a0067f40b67f9956af5998a619ff9374d61e2096ad7
+EBUILD gnuprologjava-0.2.6-r2.ebuild 1163 BLAKE2B 93fbc175d98fb2718d2f32bec670e7ad6550e11eb818a89041f991bf347a38fb94ba71f96bceda6c3fa960edbbb694b884f9154adaf28e4b7fe8f0685fdbaf6f SHA512 a7deab720f6294edfb7fa8a1addbe247f9fb661caa3d1f9956f0adc93d4daaf10fb821c36b920ee4504b509c1b2fa19fae590a642c243a51e99f533140c9351c
 MISC metadata.xml 331 BLAKE2B 894fdaf1362143a9ec76d1354117ad387146c835993cd67fe0ba486333b93bd57e8395279ea5473844dc0a2cb39fae18b5bc883980136fe8bdfe0e2c123838ba SHA512 92eb687f37e4e8d0537d132021b672aaf7a523ac4ac8732657d9a30513f87e7e4c463b76aaa38b11d757c6c648a0662e10f259607b2dd9faabcd336ae4356eb4
diff --git a/dev-lang/gnuprologjava/gnuprologjava-0.2.6-r1.ebuild b/dev-lang/gnuprologjava/gnuprologjava-0.2.6-r1.ebuild
deleted file mode 100644
index dbc6b257eff2..000000000000
--- a/dev-lang/gnuprologjava/gnuprologjava-0.2.6-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2016-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="GNU Prolog for Java is an implementation of ISO Prolog as a Java library"
-HOMEPAGE="https://www.gnu.org/software/gnuprologjava"
-SRC_URI="mirror://gnu/gnuprologjava/${P}-src.zip"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-BDEPEND="app-arch/unzip"
-RDEPEND=">=virtual/jdk-1.8:*"
-DEPEND="${RDEPEND}
-	dev-java/ant-core"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-manual.patch
-	eapply_user
-}
-
-src_compile() {
-	eant jar
-	if use doc ; then
-		eant doc
-	fi
-	mv build/${P}.jar build/${PN}.jar || die
-}
-
-src_install() {
-	java-pkg_dojar build/${PN}.jar
-
-	if use doc ; then
-		java-pkg_dohtml -r build/api || die
-		java-pkg_dohtml -r build/manual || die
-	fi
-
-	dodoc NEWS.txt docs/readme.txt
-}
diff --git a/dev-lang/gnuprologjava/gnuprologjava-0.2.6-r2.ebuild b/dev-lang/gnuprologjava/gnuprologjava-0.2.6-r2.ebuild
new file mode 100644
index 000000000000..556d0c83474e
--- /dev/null
+++ b/dev-lang/gnuprologjava/gnuprologjava-0.2.6-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2016-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="GNU Prolog for Java is an implementation of ISO Prolog as a Java library"
+HOMEPAGE="https://www.gnu.org/software/gnuprologjava/"
+SRC_URI="mirror://gnu/gnuprologjava/${P}-src.zip"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+BDEPEND="app-arch/unzip"
+CP_DEPEND="dev-java/java-getopt:1"
+DEPEND="${CP_DEPEND}
+	>=virtual/jdk-1.8:*
+	doc? ( sys-apps/texinfo )"
+RDEPEND="${CP_DEPEND}
+	>=virtual/jre-1.8:*"
+
+DOCS=( NEWS.txt docs/readme.txt )
+PATCHES=( "${FILESDIR}/${P}-manual.patch" )
+
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="src"
+
+src_prepare() {
+	default #780585
+	java-pkg-2_src_prepare
+	rm -r src/gnu/getopt || die
+	mkdir res || die
+	pushd src > /dev/null || die
+	find -type f \
+		! -name '*.java' \
+		| xargs cp --parent -t ../res || die
+	popd > /dev/null || die
+	if use doc; then
+		mkdir manual || die
+		makeinfo --html docs/manual.texinfo --output=manual
+	fi
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	if use doc; then
+		docinto html
+		dodoc -r manual || die
+	fi
+}