[gentoo-commits] repo/gentoo:master commit in: dev-lang/interprolog/files/, dev-lang/interprolog/
commit: ba29d0c5bc3cc5a71e349ddfc3a43d8f30fd2b52
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Jun 11 16:23:00 2024 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Wed Jun 19 08:06:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba29d0c5
dev-lang/interprolog: rewrite with java-pkg-simple
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Closes:
https://github.com/gentoo/gentoo/pull/36770/commits/f5f48ba75dbb51ae9bb8914c79a698dbf41b1002
Signed-off-by: Miroslav Šulc gentoo.org>
dev-lang/interprolog/files/build.xml | 45 --
dev-lang/interprolog/interprolog-2.1.2-r3.ebuild | 60
2 files changed, 60 insertions(+), 45 deletions(-)
diff --git a/dev-lang/interprolog/files/build.xml
b/dev-lang/interprolog/files/build.xml
deleted file mode 100644
index a24536d8936d..
--- a/dev-lang/interprolog/files/build.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev-lang/interprolog/interprolog-2.1.2-r3.ebuild
b/dev-lang/interprolog/interprolog-2.1.2-r3.ebuild
new file mode 100644
index ..f53ed5917e12
--- /dev/null
+++ b/dev-lang/interprolog/interprolog-2.1.2-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}$(ver_rs 1- '')"
+
+DESCRIPTION="InterProlog is a Java front-end and enhancement for Prolog"
+HOMEPAGE="https://declarativa.com/InterProlog/;
+SRC_URI="https://declarativa.com/InterProlog/${MY_P}.zip;
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+DEPEND="
+ dev-java/junit:0
+ >=virtual/jdk-1.8:*
+ || (
+ dev-lang/xsb
+ dev-lang/swi-prolog
+ dev-lang/yap )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+HTML_DOCS=( INSTALL.htm faq.htm prologAPI.htm )
+PATCHES=(
+ "${FILESDIR}"/${P}-java1.4.patch
+ "${FILESDIR}"/${P}-java17.patch
+)
+
+JAVA_CLASSPATH_EXTRA="junit"
+JAVA_RESOURCE_DIRS="res"
+JAVA_SRC_DIR="com"
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ java-pkg_clean
+ rm -r htmldocs || die
+ mkdir res || die
+ find com -type f ! -name '*.java' \
+ | xargs cp --parents -t res || die
+}
+
+src_install() {
+ java-pkg-simple_src_install
+
+ if use doc ; then
+ dodoc -r images
+ dodoc PaperEPIA01.doc
+ fi
+}
[gentoo-commits] repo/gentoo:master commit in: dev-lang/interprolog/
commit: 42a13c1b06f4ad300ab25e6cc69fe108ddad2f96
Author: Volkmar W. Pogatzki pogatzki net>
AuthorDate: Tue Mar 12 15:33:20 2024 +
Commit: Joonas Niilola gentoo org>
CommitDate: Thu Apr 25 05:51:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42a13c1b
dev-lang/interprolog: switch to dev-java/ant
Signed-off-by: Volkmar W. Pogatzki pogatzki.net>
Signed-off-by: Joonas Niilola gentoo.org>
.../{interprolog-2.1.2.ebuild => interprolog-2.1.2-r2.ebuild} | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-lang/interprolog/interprolog-2.1.2.ebuild
b/dev-lang/interprolog/interprolog-2.1.2-r2.ebuild
similarity index 84%
rename from dev-lang/interprolog/interprolog-2.1.2.ebuild
rename to dev-lang/interprolog/interprolog-2.1.2-r2.ebuild
index 5ad016be357f..9c7632350f8b 100644
--- a/dev-lang/interprolog/interprolog-2.1.2.ebuild
+++ b/dev-lang/interprolog/interprolog-2.1.2-r2.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit java-pkg-2 java-ant-2
MY_P="${PN}$(ver_rs 1- '')"
DESCRIPTION="InterProlog is a Java front-end and enhancement for Prolog"
-HOMEPAGE="http://www.declarativa.com/interprolog/;
-SRC_URI="http://www.declarativa.com/interprolog/${MY_P}.zip;
+HOMEPAGE="https://declarativa.com/InterProlog/;
+SRC_URI="https://declarativa.com/InterProlog/${MY_P}.zip;
LICENSE="LGPL-2"
SLOT="0"
@@ -21,7 +21,7 @@ RDEPEND=">=virtual/jdk-1.8:*
DEPEND="${RDEPEND}
app-arch/unzip
- dev-java/ant-core
+ >=dev-java/ant-1.10.14-r3:0
|| (
dev-lang/xsb
dev-lang/swi-prolog
[gentoo-commits] repo/gentoo:master commit in: dev-lang/interprolog/, dev-lang/interprolog/files/
commit: af2d73433a2869344c961aa0f1f73b6372f8ddba
Author: Keri Harris gentoo org>
AuthorDate: Fri May 27 17:36:41 2022 +
Commit: Keri Harris gentoo org>
CommitDate: Fri May 27 17:38:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af2d7343
dev-lang/interprolog: support compiling with Java 17
Closes: https://bugs.gentoo.org/846929
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Keri Harris gentoo.org>
dev-lang/interprolog/files/interprolog-2.1.2-java17.patch | 13 +
dev-lang/interprolog/interprolog-2.1.2.ebuild | 3 ++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/dev-lang/interprolog/files/interprolog-2.1.2-java17.patch
b/dev-lang/interprolog/files/interprolog-2.1.2-java17.patch
new file mode 100644
index ..5c0ad07b8daa
--- /dev/null
+++ b/dev-lang/interprolog/files/interprolog-2.1.2-java17.patch
@@ -0,0 +1,13 @@
+--- interprolog212.orig/com/declarativa/interprolog/AbstractPrologEngine.java
2005-09-30 19:26:22.0 +0200
interprolog212/com/declarativa/interprolog/AbstractPrologEngine.java
2022-05-27 19:26:35.059409877 +0200
+@@ -389,9 +389,7 @@
+ progressMessage("Cleaning path "+p);
+ if (System.getProperty("java.version").compareTo("1.4")>=0) {
+ try{
+-Method decode = URLDecoder.class.getMethod("decode", new
+-Class[]{String.class, String.class});
+-return (String)decode.invoke(new URLDecoder(),new
Object[]{p,"UTF-8"});
++return URLDecoder.decode(p,"UTF-8");
+ } catch (Exception e){
+ throw new IPException("Inconsistency in
PrologEngine.cleanPath"+e);
+ }
diff --git a/dev-lang/interprolog/interprolog-2.1.2.ebuild
b/dev-lang/interprolog/interprolog-2.1.2.ebuild
index af273a150564..dc9d77efd441 100644
--- a/dev-lang/interprolog/interprolog-2.1.2.ebuild
+++ b/dev-lang/interprolog/interprolog-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -33,6 +33,7 @@ EANT_GENTOO_CLASSPATH="junit"
src_prepare() {
eapply "${FILESDIR}"/${P}-java1.4.patch
+ eapply "${FILESDIR}"/${P}-java17.patch
eapply_user
cp "${FILESDIR}"/build.xml "${S}" || die
[gentoo-commits] repo/gentoo:master commit in: dev-lang/interprolog/
commit: bf23d5b47fed01cf61b77f6da194eb5f20d625dd Author: Keri Harris gentoo org> AuthorDate: Sun May 2 16:50:10 2021 + Commit: Keri Harris gentoo org> CommitDate: Sun May 2 17:01:07 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf23d5b4 dev-lang/interprolog: stable on amd64 + x86. Bug 787734 Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Keri Harris gentoo.org> dev-lang/interprolog/interprolog-2.1.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/interprolog/interprolog-2.1.2.ebuild b/dev-lang/interprolog/interprolog-2.1.2.ebuild index 22aab174b3c..af273a15056 100644 --- a/dev-lang/interprolog/interprolog-2.1.2.ebuild +++ b/dev-lang/interprolog/interprolog-2.1.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.declarativa.com/interprolog/interprolog212.zip; LICENSE="LGPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="doc" RDEPEND=">=virtual/jdk-1.8:*
[gentoo-commits] repo/gentoo:master commit in: dev-lang/interprolog/
commit: 5feb2770ab2ec6362a968a6023c00a38e0983e28
Author: Keri Harris gentoo org>
AuthorDate: Sun May 2 08:04:13 2021 +
Commit: Keri Harris gentoo org>
CommitDate: Sun May 2 08:04:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5feb2770
dev-lang/interprolog: update JDK dependency
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Keri Harris gentoo.org>
dev-lang/interprolog/interprolog-2.1.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/interprolog/interprolog-2.1.2.ebuild
b/dev-lang/interprolog/interprolog-2.1.2.ebuild
index fbd13ff599a..22aab174b3c 100644
--- a/dev-lang/interprolog/interprolog-2.1.2.ebuild
+++ b/dev-lang/interprolog/interprolog-2.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc"
-RDEPEND=">=virtual/jdk-1.4:=
+RDEPEND=">=virtual/jdk-1.8:*
dev-java/junit:0"
DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-lang/interprolog/
commit: 38a031f319ac0141f063bf0c778351f62b023b4c
Author: Keri Harris gentoo org>
AuthorDate: Sun Oct 13 14:31:51 2019 +
Commit: Keri Harris gentoo org>
CommitDate: Sun Oct 13 14:32:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38a031f3
dev-lang/interprolog: do not call dohtml with EAPI 7
Signed-off-by: Keri Harris gentoo.org>
Package-Manager: Portage-2.3.76, Repoman-2.3.11
dev-lang/interprolog/interprolog-2.1.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/interprolog/interprolog-2.1.2.ebuild
b/dev-lang/interprolog/interprolog-2.1.2.ebuild
index afa655e41ff..fbd13ff599a 100644
--- a/dev-lang/interprolog/interprolog-2.1.2.ebuild
+++ b/dev-lang/interprolog/interprolog-2.1.2.ebuild
@@ -51,8 +51,8 @@ src_install() {
if use doc ; then
java-pkg_dohtml -r docs/*
- dohtml INSTALL.htm faq.htm prologAPI.htm
- dohtml -r images
+ dodoc INSTALL.htm faq.htm prologAPI.htm
+ dodoc -r images
dodoc PaperEPIA01.doc
fi
}
[gentoo-commits] repo/gentoo:master commit in: dev-lang/interprolog/
commit: 23a4139a08be8eb393c37dc995dc56f9b9de0fe9
Author: Keri Harris gentoo org>
AuthorDate: Sun Oct 13 13:13:47 2019 +
Commit: Keri Harris gentoo org>
CommitDate: Sun Oct 13 13:14:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a4139a
dev-lang/interprolog: bump EAPI
Signed-off-by: Keri Harris gentoo.org>
Package-Manager: Portage-2.3.76, Repoman-2.3.11
dev-lang/interprolog/interprolog-2.1.2.ebuild | 28 ---
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/dev-lang/interprolog/interprolog-2.1.2.ebuild
b/dev-lang/interprolog/interprolog-2.1.2.ebuild
index 7f9f9e0938f..afa655e41ff 100644
--- a/dev-lang/interprolog/interprolog-2.1.2.ebuild
+++ b/dev-lang/interprolog/interprolog-2.1.2.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=0
+EAPI=7
-inherit eutils java-pkg-2 java-ant-2 versionator
+inherit java-pkg-2 java-ant-2
-MY_PV="$(delete_all_version_separators)"
-MY_P="${PN}${MY_PV}"
+MY_P="${PN}$(ver_rs 1- '')"
DESCRIPTION="InterProlog is a Java front-end and enhancement for Prolog"
HOMEPAGE="http://www.declarativa.com/interprolog/;
@@ -17,13 +16,12 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc"
-DEPEND=">=virtual/jdk-1.4
+RDEPEND=">=virtual/jdk-1.4:=
+ dev-java/junit:0"
+
+DEPEND="${RDEPEND}
app-arch/unzip
dev-java/ant-core
- =dev-java/junit-3.8*"
-
-RDEPEND=">=virtual/jdk-1.4
- =dev-java/junit-3.8*
|| (
dev-lang/xsb
dev-lang/swi-prolog
@@ -33,13 +31,11 @@ S="${WORKDIR}"/${MY_P}
EANT_GENTOO_CLASSPATH="junit"
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${P}-java1.4.patch
+src_prepare() {
+ eapply "${FILESDIR}"/${P}-java1.4.patch
+ eapply_user
- cp "${FILESDIR}"/build.xml "${S}"
+ cp "${FILESDIR}"/build.xml "${S}" || die
mkdir "${S}"/src
mv "${S}"/com "${S}"/src
rm interprolog.jar junit.jar
