gentoo Easter resync : 12.04.2020

3 files changed, 48 insertions, 26 deletions

diff --git a/dev-lang/logtalk/Manifest b/dev-lang/logtalk/Manifest
index 1c1ba8e0fab3..21aaf7e5c93a 100644
--- a/dev-lang/logtalk/Manifest
+++ b/dev-lang/logtalk/Manifest
@@ -1,7 +1,8 @@
 AUX logtalk-3.11.2-portage.patch 920 BLAKE2B d20d393bc10809945d6100aef08610e9cffe5b40f91927448c5fa4ce3b1cd6120613f754438f15b4f008ff32deabf108e2c242d33ef1fe0d574705e93fb8505e SHA512 b1f6f6457e343db0674aad9633dc7d38f9714574372cb1bfb2e9dd72da52710df45b7488329d6e1448bd84aa10550598f73fc4aac182f60168220898423381dc
 AUX logtalk-3.18.0-portage.patch 1179 BLAKE2B 25fad57b8969a487a45ab254cfba3f17bd92741f3a49718efca75307af0a269d0aedf847ae6fa93c3495971653c7b442c4f454f61bb9968f5da809b2dd386e85 SHA512 2f2423991fe8e65c058ab295b73e64693a91e99225bb2af953702227a1234b45d89508cb339fbe12143e6a98657c440778b41c701ed333d0e05520705bfe12dc
-DIST logtalk-3.11.2.tar.bz2 3122034 BLAKE2B bb790f6c11f5812337777718f92585f459ba7acb4f66a246d575061bb269db85fc37dd73bd8e185de3fc4cdfe62dcdf1d26782ff1dfe26846d99b39c57e97dc5 SHA512 5c48a4c2165c8b4bfe3047d7dc42f3210a72488fbc2e7349a93ae17ed3590cdd4ff22417f153f163c76605ffc30a5bc8fad2bd91099edf68e675b1d94fb7662b
+AUX logtalk-3.36.0-portage.patch 1179 BLAKE2B aa40ea0df4f01778d01e2f7c174f9587d5d18f7ea80125ff198203081344eca3e050d3612c16627806e36171ca13a7875ccd0f935c4507ca987ef6529e691290 SHA512 5254edf0fced32c64d6848dad300ab48e53f7aa9f160e7b85e11fba5395b83da659134329846f281619b9fce1827ebae7c306fe1832fea8ece755fdfe7df7795
 DIST logtalk-3.18.0.tar.bz2 3280635 BLAKE2B 0105c0816d3b265f15f9ba6e82a4e6dbc877869c2ade6deac3f2748da12e14bd5de2e82ca8f1793c6553a635ca8a55138e79645219f09146c8adec4b60f70b30 SHA512 1575a564ff23d35b4d1581e7f5725515a548ea57d128fbfa13f8138e41791c50cc9626bdc26a85f5e676500b3f232faf742e434b1416707134e4c9b3f8afe424
-EBUILD logtalk-3.11.2.ebuild 3891 BLAKE2B 3b8ee7b51a351e741761d9ac9f2bc91f60692cad7fb5a54bd75c69813a0b1038f266b05a879464b1b23be8e2535e2f4ae0882ef5ec9eab5ff5d3f198c7031dcd SHA512 2c473569ac979996e3110222bca555387af264a8126ae870a9792169e7226ef41b6844dedc433ea20339e95f487cac0e04fba2eb07864c76e59bf9aa5ea0166b
+DIST logtalk-3.36.0.tar.bz2 18373894 BLAKE2B 3f4917dea47b32760edfde0538a260e5405b566520c514ec137766d17ad532f1d3e3a7a6d05b4b643b21933073951ed41bf92161ae49545eb458619444b10210 SHA512 0e93f091cb24aed3b08db05df29484e708e14cf58a673a42df70c899f3bafae30896be118d89dfdf3f3cb7d4ba520a815e46d563dd7418f80912b7067ed7da8e
 EBUILD logtalk-3.18.0.ebuild 3883 BLAKE2B 46f5263f30f6b10285d292981482e1b74f1f6a726fa3035f90bb29e0b1d420c7220256a10929f308fc0da934b7e39a815cb6c5794de4f16d8e86b365d67cb126 SHA512 7c8699c2cfafae06ef07061e7eb855a622ab1500d591677c3f1cc48edf2a157ff4825435dcc45b53ce0bbf3f331cfe9d4bc983c349468c62f427706cb9d1e8f6
+EBUILD logtalk-3.36.0.ebuild 3880 BLAKE2B 0213ef4aacd286ffa4483286e40dc18ce57d66559fb4f2a146b1c53f743514cd3ba88cab52d43ee0640dd5c078c2aaedafa33a32cf1fb565a9f34b0bc994c3ef SHA512 be98746464a03c93f5509acb377359cdce5d8bcf378c142d68f55b17c03fa09afe734496534c05cc9dec8f99c9e4fe431ad79e0f28b47b5d559717166bcf7a49
 MISC metadata.xml 404 BLAKE2B 8eee9851c967beb38e36f649b8eaefc8b8329f06adf298702a06b427edeb9a0e556a2f47e63c2b4cf4219027ed18502336b4a9e032d876bde18897985aea7dd8 SHA512 1faeefef2f7670809936eb73c4e9e4e18f44ee6e5851cc7386e996768ab88dbfa7c24801daa2cf4edca8646427eec1c871136540d71b7e0b0add3d00c78691ed
diff --git a/dev-lang/logtalk/files/logtalk-3.36.0-portage.patch b/dev-lang/logtalk/files/logtalk-3.36.0-portage.patch
new file mode 100644
index 000000000000..8e08a9f2ff7b
--- /dev/null
+++ b/dev-lang/logtalk/files/logtalk-3.36.0-portage.patch
@@ -0,0 +1,19 @@
+--- logtalk-3.36.0.orig/scripts/logtalk_user_setup.sh	2018-06-26 15:11:02.000000000 +0200
++++ logtalk-3.36.0/scripts/logtalk_user_setup.sh	2018-07-22 14:05:50.343406307 +0200
+@@ -131,16 +131,6 @@
+ rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/lgt2*
+ rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/logtalk.dtd
+ rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/logtalk.xsd
+-ln -sf "$LOGTALKHOME"/ACKNOWLEDGMENTS.md "$LOGTALKUSER"/ACKNOWLEDGMENTS.md
+-ln -sf "$LOGTALKHOME"/BIBLIOGRAPHY.bib "$LOGTALKUSER"/BIBLIOGRAPHY.bib
+-ln -sf "$LOGTALKHOME"/CONTRIBUTING.md "$LOGTALKUSER"/CONTRIBUTING.md
+-ln -sf "$LOGTALKHOME"/CUSTOMIZE.md "$LOGTALKUSER"/CUSTOMIZE.md
+-ln -sf "$LOGTALKHOME"/INSTALL.md "$LOGTALKUSER"/INSTALL.md
+-ln -sf "$LOGTALKHOME"/LICENSE.txt "$LOGTALKUSER"/LICENSE.txt
+-ln -sf "$LOGTALKHOME"/QUICK_START.md "$LOGTALKUSER"/QUICK_START.md
+-ln -sf "$LOGTALKHOME"/README.md "$LOGTALKUSER"/README.md
+-ln -sf "$LOGTALKHOME"/RELEASE_NOTES.md "$LOGTALKUSER"/RELEASE_NOTES.md
+-ln -sf "$LOGTALKHOME"/UPGRADING.md "$LOGTALKUSER"/UPGRADING.md
+ ln -sf "$LOGTALKHOME"/adapters "$LOGTALKUSER"/adapters
+ ln -sf "$LOGTALKHOME"/coding "$LOGTALKUSER"/coding
+ ln -sf "$LOGTALKHOME"/integration "$LOGTALKUSER"/integration
diff --git a/dev-lang/logtalk/logtalk-3.11.2.ebuild b/dev-lang/logtalk/logtalk-3.36.0.ebuild
index 6a29f2f8591b..f7a62987873b 100644
--- a/dev-lang/logtalk/logtalk-3.11.2.ebuild
+++ b/dev-lang/logtalk/logtalk-3.36.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit eutils xdg-utils
 
@@ -21,6 +21,8 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-portage.patch
+
+	eapply_user
 }
 
 src_install() {
@@ -40,53 +42,53 @@ src_install() {
 	doins scripts/freedesktop/logtalk.xml
 
 	# Install documentation
-	dodoc ACKNOWLEDGMENTS.md BIBLIOGRAPHY.bib CUSTOMIZE.md \
-		INSTALL.md LICENSE.txt QUICK_START.md README.md \
-		RELEASE_NOTES.md UPGRADING.md VERSION.txt
+	dodoc ACKNOWLEDGMENTS.md BIBLIOGRAPHY.bib CONTRIBUTING.md \
+		CUSTOMIZE.md INSTALL.md LICENSE.txt QUICK_START.md \
+		README.md RELEASE_NOTES.md UPGRADING.md VERSION.txt
 
 	rm -f man/man1/logtalk_backend_select.1
 	rm -f man/man1/logtalk_version_select.1
 	doman man/man1/*.1
 
 	# Integration symlinks
-	dosym /usr/share/${P}/integration/logtalk_user_setup.sh \
+	dosym ../share/${P}/integration/logtalk_user_setup.sh \
 		/usr/bin/logtalk_user_setup
-	dosym /usr/share/${P}/integration/bplgt.sh \
+	dosym ../share/${P}/integration/bplgt.sh \
 		/usr/bin/bplgt
-	dosym /usr/share/${P}/integration/cxlgt.sh \
+	dosym ../share/${P}/integration/cxlgt.sh \
 		/usr/bin/cxlgt
-	dosym /usr/share/${P}/integration/eclipselgt.sh \
+	dosym ../share/${P}/integration/eclipselgt.sh \
 		/usr/bin/eclipselgt
-	dosym /usr/share/${P}/integration/gplgt.sh \
+	dosym ../share/${P}/integration/gplgt.sh \
 		/usr/bin/gplgt
-	dosym /usr/share/${P}/integration/jiplgt.sh \
+	dosym ../share/${P}/integration/jiplgt.sh \
 		/usr/bin/jiplgt
-	dosym /usr/share/${P}/integration/lplgt.sh \
+	dosym ../share/${P}/integration/lplgt.sh \
 		/usr/bin/lplgt
-	dosym /usr/share/${P}/integration/qplgt.sh \
+	dosym ../share/${P}/integration/qplgt.sh \
 		/usr/bin/qplgt
-	dosym /usr/share/${P}/integration/quintuslgt.sh \
+	dosym ../share/${P}/integration/quintuslgt.sh \
 		/usr/bin/quintuslgt
-	dosym /usr/share/${P}/integration/sicstuslgt.sh \
+	dosym ../share/${P}/integration/sicstuslgt.sh \
 		/usr/bin/sicstuslgt
-	dosym /usr/share/${P}/integration/swilgt.sh \
+	dosym ../share/${P}/integration/swilgt.sh \
 		/usr/bin/swilgt
-	dosym /usr/share/${P}/integration/xsblgt.sh \
+	dosym ../share/${P}/integration/xsblgt.sh \
 		/usr/bin/xsblgt
-	dosym /usr/share/${P}/integration/xsbmtlgt.sh \
+	dosym ../share/${P}/integration/xsbmtlgt.sh \
 		/usr/bin/xsbmtlgt
-	dosym /usr/share/${P}/integration/yaplgt.sh \
+	dosym ../share/${P}/integration/yaplgt.sh \
 		/usr/bin/yaplgt
 
-	dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2xml.sh \
+	dosym ../share/${P}/tools/lgtdoc/xml/lgt2xml.sh \
 		/usr/bin/lgt2xml
-	use xslt && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2html.sh \
+	use xslt && dosym ../share/${P}/tools/lgtdoc/xml/lgt2html.sh \
 		/usr/bin/lgt2html
-	use xslt && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2txt.sh \
+	use xslt && dosym ../share/${P}/tools/lgtdoc/xml/lgt2txt.sh \
 		/usr/bin/lgt2txt
-	use xslt && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2md.sh \
+	use xslt && dosym ../share/${P}/tools/lgtdoc/xml/lgt2md.sh \
 		/usr/bin/lgt2md
-	use fop  && dosym /usr/share/${P}/tools/lgtdoc/xml/lgt2pdf.sh \
+	use fop  && dosym ../share/${P}/tools/lgtdoc/xml/lgt2pdf.sh \
 		/usr/bin/lgt2pdf
 
 	# Install environment files