From 4b19be30aa626b327c885dae62c559ec0e9fb935 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Oct 2019 22:19:36 +0100 Subject: gentoo resync : 13.10.2019 --- dev-lang/interprolog/Manifest | 2 +- dev-lang/interprolog/interprolog-2.1.2.ebuild | 32 ++++++++++++--------------- 2 files changed, 15 insertions(+), 19 deletions(-) (limited to 'dev-lang/interprolog') diff --git a/dev-lang/interprolog/Manifest b/dev-lang/interprolog/Manifest index a4f76dff5b7a..bf782de2217f 100644 --- a/dev-lang/interprolog/Manifest +++ b/dev-lang/interprolog/Manifest @@ -1,5 +1,5 @@ AUX build.xml 1461 BLAKE2B 97f817f1c8a5594c5b9a0f449046c1c91d6789d27592f421fb0d92d0d21cb30f009d90c99b037900e109d791159ad49d78cd3f5bb99464d35cae0508128c648c SHA512 0e469d954d69db940fdf1893257f20d15d1009148d3979755edd448bc1cda9425df5169f6ddba3e37b8eaccd25f3fbb7bfeb3c58a572111be2474e1850a32cb6 AUX interprolog-2.1.2-java1.4.patch 1341 BLAKE2B b1c02e38f990d8f693a274cb258b18151e5b5d93a8670ae40d2d0b29b25c8ee86c749463b880166d759509331c9bd58d57286f9c62b36ba53673291129d27a09 SHA512 cfd4a637e4d86172547448801c92decfa3f10fa7d02e007c42d8415901d742ecbdf1fca1e4034c7069885a06824f1577bc64f2454a2c31877af68e74ad3aa0d2 DIST interprolog212.zip 1066931 BLAKE2B ea2666ff756c30db35262137938c32ee98d8a145ce59ea3b8694328771b8925395f7643ecabf9e0c010515176fdbbedcd333a81003a09c0ae1d9c1a94215e095 SHA512 e3d8b216f7e76d5d95ad9d27a96720075575fd717c89ddf9403376a72e18d56fd68afa2b1e6e70da55b99cd84043a16695ff37a59ec3366115cd4c36ed1ff50c -EBUILD interprolog-2.1.2.ebuild 1180 BLAKE2B 88d35e894e03f6acf61a09a6d65007a162acfdfd98255d5aaa539e57026f5d55701c4f2c407da170b7abb575d1d65fff5a4df48cb89c5f28c735ef2368ed810f SHA512 f23b17be7103d48eba043ebfcc0e646a6ff7efff7c79a8783dbfec3e0a5a7726726d9b6cf75aa7456e75e88f4d5abb442062c0941bc22ab38d679f374084555a +EBUILD interprolog-2.1.2.ebuild 1087 BLAKE2B 812e466069aa994d9ddc3b16089575f598d6ba5242256a7c9d63c726d6076f334761d9386805410e7df1d861c145019aa6eb6459b4edc669624ef4101e7d8cbc SHA512 c21e68d08227a146e10d0a1b0abb56e710ec98cf51c0a04b9d20bc532cc25ffc898c00a0217e014d4641d4078ae61264e310b25e94799d2717c9373559c92597 MISC metadata.xml 236 BLAKE2B 665f3de6dc90f46a18379b3416063a49b1a79ddd7ef89eaed9be78f9adc5b234e9693cd31d6cf2d3477fc7dc00055492bef7de78da6c901c4a6e55eb0e781325 SHA512 e776224736bd575412c7b5b799f649c6b2947a70e6a9aea580063d9da7d09a8144e5ebaf7ac3ef131d578486cf05dec814dce11b2aeb884cded3be3cab70fcec diff --git a/dev-lang/interprolog/interprolog-2.1.2.ebuild b/dev-lang/interprolog/interprolog-2.1.2.ebuild index 7f9f9e0938fe..fbd13ff599a8 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 @@ -55,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 } -- cgit v1.2.3