gentoo resync : 28.04.2021

2 files changed, 19 insertions, 22 deletions

diff --git a/dev-lang/gprolog/Manifest b/dev-lang/gprolog/Manifest
index b9b117848e75..0b50ba2fe345 100644
--- a/dev-lang/gprolog/Manifest
+++ b/dev-lang/gprolog/Manifest
@@ -4,5 +4,5 @@ AUX gprolog-1.4.5-links.patch 488 BLAKE2B aa6c833c8f6d8a7bf6f2a30ef971efd4389035
 AUX gprolog-1.4.5-nodocs.patch 1117 BLAKE2B 15e65f72506a57dc7b1c549cb4f01c43e9d46f8a78c4a16309599b1db48d192e8aab933dc128ebcea957f77778a321f10d9233676356d52efc7c33e4ed658d13 SHA512 c4aa11081c8c85989e9947b3be25bc74a22456ecf5404b943e9985835319e7c33273bd2b30f003aad4cc3bc842b98069e647b8203a3c4f45f8cf2bed08af9afd
 AUX gprolog-1.4.5-txt-file.patch 578 BLAKE2B 22f4803c19fc4e8266065e457e711df2885d8539325f02bc426d1a351163e3dcf6f339e3f1bb2586e807ebd41b237f7e4f1ca9a139bd3fa71c76db5684c9d37d SHA512 e0cb7ed9c6dd8a394898086335312556ffa313e18dba9c281bcc45749ef9b297f0ec3cfddfd197524be55315c79cf89f370a04f0d6b10a0e95ac6a59ca92fc67
 DIST gprolog-1.4.5.tar.gz 3587361 BLAKE2B c0c73ce249d7c26b914a3f831c6ac93aeb884bded6c5ebbe51223f0685de0be2e746533aade1633a953b93e88a30796fa52ecd5e609d05bc051363cbf34e0477 SHA512 425103bc9e5bdbdb4ae331f5be0cf49524fbdb4f5e2809fb973360de9e7ad9935c1b28f3603e0be696a647153d9f0d3dacdc87251098ac99faf7d0b3c652fc60
-EBUILD gprolog-1.4.5.ebuild 1907 BLAKE2B 4155b81b163a3851aa59f0d1a41d1db3d63eb359cdd7ffd829330e0fb1628201816b562946cb9e11399440c9015a828af7093e2eaf6a94f42667d33b47eca26f SHA512 03b8744ca7804b4b808d15a2cbafea215bad2f3b2097749712b62d0a4e962ee710d4bd29439631771a50d3245a933df73467d0b5d30289c73f39250b3c60c5f2
+EBUILD gprolog-1.4.5.ebuild 1852 BLAKE2B 29c80571f694e9e109aa9df990e9b979710c6d8d257f40e3ca59db1b219217e37807ba553b659e0b3f91b4e89bf9d04c877f2ce5c9b422f153d8c1119bb4df77 SHA512 78cf253d27bc3f12d709f33e5d42ce9e6e7848d7e485c84d166f125d477ea27dea36a397d92b2c96f69a760312af60967f91de54111dfdf0d27f941fccfc2600
 MISC metadata.xml 236 BLAKE2B 665f3de6dc90f46a18379b3416063a49b1a79ddd7ef89eaed9be78f9adc5b234e9693cd31d6cf2d3477fc7dc00055492bef7de78da6c901c4a6e55eb0e781325 SHA512 e776224736bd575412c7b5b799f649c6b2947a70e6a9aea580063d9da7d09a8144e5ebaf7ac3ef131d578486cf05dec814dce11b2aeb884cded3be3cab70fcec
diff --git a/dev-lang/gprolog/gprolog-1.4.5.ebuild b/dev-lang/gprolog/gprolog-1.4.5.ebuild
index 80e33c7e6183..5892e1fbf171 100644
--- a/dev-lang/gprolog/gprolog-1.4.5.ebuild
+++ b/dev-lang/gprolog/gprolog-1.4.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A native Prolog compiler with constraint solving over finite domains (FD)"
 HOMEPAGE="http://www.gprolog.org/"
@@ -15,23 +15,18 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="debug doc examples"
 
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-links.patch
-	epatch "${FILESDIR}"/${P}-nodocs.patch
-	epatch "${FILESDIR}"/${P}-txt-file.patch
-	epatch "${FILESDIR}"/${P}-check-boot.patch
-
-	eapply_user
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-links.patch
+	"${FILESDIR}"/${P}-nodocs.patch
+	"${FILESDIR}"/${P}-txt-file.patch
+	"${FILESDIR}"/${P}-check-boot.patch
+)
 
 src_configure() {
 	CFLAGS_MACHINE="`get-flag -march` `get-flag -mcpu` `get-flag -mtune`"
 
-	# Work around -fno-common ( GCC10 default ), bug #71202
+	# Work around -fno-common (GCC 10 default), bug #71202
 	append-flags -fcommon
 
 	append-flags -fno-strict-aliasing
@@ -48,33 +43,35 @@ src_configure() {
 		gprolog_use_regs=no
 	fi
 
-	cd "${S}"/src
+	cd "${S}"/src || die
 	econf \
 		CFLAGS_MACHINE="${CFLAGS_MACHINE}" \
 		--with-c-flags="${CFLAGS}" \
 		--with-install-dir="${EPREFIX}"/usr/$(get_libdir)/${P} \
 		--with-links-dir="${EPREFIX}"/usr/bin \
-		--enable-regs=$gprolog_use_regs \
+		--enable-regs=${gprolog_use_regs} \
 		$(use_with doc doc-dir "${EPREFIX}"/usr/share/doc/${PF}) \
 		$(use_with doc html-dir "${EPREFIX}"/usr/share/doc/${PF}/html) \
 		$(use_with examples examples-dir "${EPREFIX}"/usr/share/doc/${PF}/examples)
 }
 
 src_compile() {
-	cd "${S}"/src
+	cd "${S}"/src || die
+
 	# gprolog is compiled using gplc which cannot be run in parallel
 	emake -j1
 }
 
 src_test() {
-	cd "${S}"/src
+	cd "${S}"/src || die
+
 	emake -j1 check
 }
 
 src_install() {
-	cd "${S}"/src
+	cd "${S}"/src || die
 	emake DESTDIR="${D}" install
 
-	cd "${S}"
+	cd "${S}" || die
 	dodoc ChangeLog NEWS PROBLEMS README
 }