gentoo resync : 22.04.2018

9 files changed, 32 insertions, 68 deletions

diff --git a/dev-lang/logtalk/Manifest b/dev-lang/logtalk/Manifest
index 17a27bff02ac..efd44e72ab8e 100644
--- a/dev-lang/logtalk/Manifest
+++ b/dev-lang/logtalk/Manifest
@@ -1,13 +1,12 @@
-AUX logtalk-3.00.0-no-user-docs.patch 1711 BLAKE2B aa6f95faa8b1a609fa8fa575c8729bc2c85a98d2828760d9d2fc5fea586db0652f0dcc3de2c578094b413bc191175e91fe2223a6e16a826a67089f1e4b005b9c SHA512 6e3b0ac3857955796b27e0f427cdea8d4bb0ab9be18a8423b383087eaa6ae2999a6b92fec57d3e303b62e621821db866ec4aacdf0e6b6205d44b9b233bcc4ab3
-AUX logtalk-3.03.0-no-user-docs.patch 1711 BLAKE2B 8f9b19e8a82144b5e86db9965f7153d5ad3cf3af4480b2036b61386fcbcb2dd6618fb045e509a04520d3456757cb1d8d597669202bd45558b23e17c9573ca0d6 SHA512 a159086a0b78ff853fbc98fde8be8a2962c5b91377daf9ae2b9f0a9aea5aca234d3c734e81bae660bbdbd4ef41ee1548817855181c09e705ec4b78ec26d683d2
-AUX logtalk-3.07.0-no-user-docs.patch 1711 BLAKE2B 8f9b19e8a82144b5e86db9965f7153d5ad3cf3af4480b2036b61386fcbcb2dd6618fb045e509a04520d3456757cb1d8d597669202bd45558b23e17c9573ca0d6 SHA512 a159086a0b78ff853fbc98fde8be8a2962c5b91377daf9ae2b9f0a9aea5aca234d3c734e81bae660bbdbd4ef41ee1548817855181c09e705ec4b78ec26d683d2
-AUX logtalk-3.11.2-portage.patch 1128 BLAKE2B 83328822ff3f5e6bc6b8508dc4d6b32caf87fed8ab8db35575402a2a2037d82c7a10ec70d976dae33dbba72dcdc3e1800dbadeaf01aa450a9238231b452afc81 SHA512 2b85afedc87697fefa85e204a7691ddfd68c52822db45f3654b267f4e06231bfc9d468041e5d074b6ee9884d501957417c8facf897cdf0cd8eba0e04b3461f8e
+AUX logtalk-3.00.0-no-user-docs.patch 1608 BLAKE2B d9bba69d6e8b71cf8e0942d94b5499f111563a57673de876c0dcbdca4ffa4722d1a37fa6e796aba4abf28a8a8daad749a34e9915f88d10f3c19ff7b6257b611c SHA512 9fca7ee47d11cf90b88a62f244b67ffad6c9d43e08b41fef3731461a3519555ae0c76167e8b313d103e27bcc4a24fb86e496cf8a5ef075c10f21f4dc27812fa3
+AUX logtalk-3.03.0-no-user-docs.patch 1608 BLAKE2B f485845bdbffe2ae11cf7335e66ea0a3e66ae241bcb847bb8839421012d0d27c80a348f0fd2fe64529b0a62a26f9eead3602541a53d088f8b8f2be4de280155b SHA512 ad899d1b941e1f162420f74c58868c91480c243c5888a8afb910b5fa5f8bb77073da31bed334ed193d4cbb17ce1980e5d426d2d57f0b15fbf8fdeb545c369197
+AUX logtalk-3.11.2-portage.patch 920 BLAKE2B d20d393bc10809945d6100aef08610e9cffe5b40f91927448c5fa4ce3b1cd6120613f754438f15b4f008ff32deabf108e2c242d33ef1fe0d574705e93fb8505e SHA512 b1f6f6457e343db0674aad9633dc7d38f9714574372cb1bfb2e9dd72da52710df45b7488329d6e1448bd84aa10550598f73fc4aac182f60168220898423381dc
 DIST logtalk-3.00.0.tar.bz2 1886297 BLAKE2B 7018a39b841c2c7e86945282baf04f83ecbe0dccc5d3760af963bd6e623acf8d04b3e6ce3aa7a702c7f1eb3a8f70d8c6d00d394ec249d2cbfa021d815e4db398 SHA512 bb4ecc709e71eee9a9a532bfcef764095e581189f3e17c9c0f2d80ceeaa4dd993d7da087b07e27f4a377a40d7a798378591d89ab6c801c7a26c1b1d646c7b76c
 DIST logtalk-3.03.0.tar.bz2 1997131 BLAKE2B 98cbf7d0b9778b7379b7de1c22ff1772b9bab7475b377cda07c7ae48a60494dc7a39fd0b88ab808f2076d1359b209ca43b1e6565052f0e47d34cb7e9ca33d30b SHA512 8445b0dda78ce0a7a0fe380b03d061271eb924df34c8f035c96a949b177c99234e2998c65f18c55be04c7d661c94473448eb2dc79a586dbc346ab07887f0e98a
 DIST logtalk-3.07.0.tar.bz2 2114396 BLAKE2B 62b5960c31fee312ce842b450d49a066508569b636277306e60bbca51bb825c967b0fb53779181e31cf8c9e3345addf7e6d2f1aae98f153cc42cc75bab93f3f9 SHA512 1b26c4f49dee469d6f3a4ae15dd0c429b2b79a407aca9f518af6d1f19f682b6c72dd76c6ed3da38555353219f832efce6f0fb54a4a946cae2fccfa78c67c5757
 DIST logtalk-3.11.2.tar.bz2 3122034 BLAKE2B bb790f6c11f5812337777718f92585f459ba7acb4f66a246d575061bb269db85fc37dd73bd8e185de3fc4cdfe62dcdf1d26782ff1dfe26846d99b39c57e97dc5 SHA512 5c48a4c2165c8b4bfe3047d7dc42f3210a72488fbc2e7349a93ae17ed3590cdd4ff22417f153f163c76605ffc30a5bc8fad2bd91099edf68e675b1d94fb7662b
-EBUILD logtalk-3.00.0.ebuild 4015 BLAKE2B c573d5330afeaad8ed7416e1b707a4d9848bb04570a6b8b4b6a26138ef75e77e1474827d3ca0f6b2cb522c869b28fe35f3c04aae8d4412a4cadd2c9474dd4193 SHA512 f9c3ea40e5700b934128c051d087fd79898993dd2bdfe92263929ad3f248b172946490d40bf47279da9e79fb91131dd10e3f05fc9f04816125a0a1aeb1abacf1
-EBUILD logtalk-3.03.0.ebuild 4014 BLAKE2B 69904aa1b8ed145f89bd39c4323f8f9a524ed1cd1414522af3b43d5f3d76e9a6a14152f51ab642ce5ca94cc67bfda2b9178daa37fc12e62e946f5b3cdf505525 SHA512 7a6243473dcdeb715358c9615c3dd7a3db041a1b9c4c3fd7e6517c58f7948d1df4340964b67f4c25a38587f8b77010826ccd1e2a2223e3d75431bf2b8a8fe452
-EBUILD logtalk-3.07.0.ebuild 3939 BLAKE2B 3c344acf50cd262295089de526eee2b28307922445bad47e0f5fb375f12f0287f49eca403b0a9b8ceb9ffe31b7376f5ee988d67b4e32e9259d18b5a0e2dcf73c SHA512 c8d2b9e8e8f991d2fff6e7a990ba2c5ceccdfab0d37faffca697e96851b857b9f627544cb383d4e5a90d8dc1c11c441df7fc1fcdf6ea10c8ee2a8891ca49d0a4
-EBUILD logtalk-3.11.2.ebuild 3877 BLAKE2B 4ba412c07ba41641522dae66fc7447314155fda480e2c6f34f6658de099c172f9669d7b43a058cff9bdea1161980fcb09ef5261796abc532ecba89d5f24d85f9 SHA512 ea9fe18937f59e79b5fcf4c046115baf15e3c0f89183d212175086ed2fcb1e7f5247d8ecba94c396bb39bec0835fb9827935d255fa77843775861ec62d99cc51
+EBUILD logtalk-3.00.0.ebuild 4014 BLAKE2B 8048fd0cc426d1d8db44edc7b5abfad50b50cccbb7c2369bfdb5b106f21662f94f91e3c07e1f8c7942f9f97fb663f86dd4c7cc34f8af4a27eb7ebf6169a032ab SHA512 2c38935ab304ed3de15635ce207e5ae3d8cb5a565c61b9257ff604fe40db262237198311423d93691ab73dd42aafc97eb06533c0781f1d018b6a3fa3b44e1d0e
+EBUILD logtalk-3.03.0.ebuild 4013 BLAKE2B 48e997cbd052b46bf2aaa5bb1b5e90f9b8e94baba7bce3e75168821b93c297c8dd7b3dac41f4fe94c16e4fd593fb5cb1fbe4e1654c26271fc86569497858338f SHA512 959f26b924c1082ed72fd1c84a6b26e56c40c3100118370f1cac5005b0df24f7cdff178031945cef27e3458c4c9ef90097abd995c060a6d14060e67d6464a3f4
+EBUILD logtalk-3.07.0.ebuild 3938 BLAKE2B b3627d4b97f1533e82382dab963ba2f537ec35c19a18e482046684c2194ae9524369a5e465b4e4065a5a0314cdb13a2817509ef00b83324fa0a8a3bbc4d064b1 SHA512 995fd87302c4866b048cc1f0089741380157b9a90b7c8565d7a1e9fa99aa0f604c91277a0bf33b019f0b3aa03aea490178fbce7614cf3468d8585bd8ce9f6eee
+EBUILD logtalk-3.11.2.ebuild 3868 BLAKE2B 6721c10a6c1e3d289222fc4ea2d8d84b27fee025de8b19cdf747f5c410183294581f0c9b7d603a191a808e1d71b7d61fc02dfb815a74fcfc4cc10ed61315ebab SHA512 6d8f9d1cf0764414ea4479a1975e79a76ff5b91365bfdf40f68d23e570f9028fd0ee218639ab278a413dc45da3f32b024d63fb9d4adfed80c868b25f8a0f083e
 MISC metadata.xml 404 BLAKE2B 8eee9851c967beb38e36f649b8eaefc8b8329f06adf298702a06b427edeb9a0e556a2f47e63c2b4cf4219027ed18502336b4a9e032d876bde18897985aea7dd8 SHA512 1faeefef2f7670809936eb73c4e9e4e18f44ee6e5851cc7386e996768ab88dbfa7c24801daa2cf4edca8646427eec1c871136540d71b7e0b0add3d00c78691ed
diff --git a/dev-lang/logtalk/files/logtalk-3.00.0-no-user-docs.patch b/dev-lang/logtalk/files/logtalk-3.00.0-no-user-docs.patch
index d25f19347d66..7c14f28413a6 100644
--- a/dev-lang/logtalk/files/logtalk-3.00.0-no-user-docs.patch
+++ b/dev-lang/logtalk/files/logtalk-3.00.0-no-user-docs.patch
@@ -1,5 +1,5 @@
---- logtalk-3.00.0.orig/scripts/logtalk_user_setup.sh	2015-01-08 14:04:03.000000000 +0100
-+++ logtalk-3.00.0/scripts/logtalk_user_setup.sh	2015-01-08 14:05:05.000000000 +0100
+--- a/scripts/logtalk_user_setup.sh
++++ b/scripts/logtalk_user_setup.sh
 @@ -114,14 +114,12 @@
  
  echo "Copying Logtalk files and directories..."
diff --git a/dev-lang/logtalk/files/logtalk-3.03.0-no-user-docs.patch b/dev-lang/logtalk/files/logtalk-3.03.0-no-user-docs.patch
index b28fd4852b04..6d4e7ab9154b 100644
--- a/dev-lang/logtalk/files/logtalk-3.03.0-no-user-docs.patch
+++ b/dev-lang/logtalk/files/logtalk-3.03.0-no-user-docs.patch
@@ -1,5 +1,5 @@
---- logtalk-3.03.0.orig/scripts/logtalk_user_setup.sh	2016-02-16 22:09:02.000000000 +0100
-+++ logtalk-3.03.0/scripts/logtalk_user_setup.sh	2016-02-20 09:49:34.000000000 +0100
+--- a/scripts/logtalk_user_setup.sh
++++ b/scripts/logtalk_user_setup.sh
 @@ -110,14 +110,12 @@
  
  echo "Copying Logtalk files and directories..."
diff --git a/dev-lang/logtalk/files/logtalk-3.07.0-no-user-docs.patch b/dev-lang/logtalk/files/logtalk-3.07.0-no-user-docs.patch
deleted file mode 100644
index b28fd4852b04..000000000000
--- a/dev-lang/logtalk/files/logtalk-3.07.0-no-user-docs.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- logtalk-3.03.0.orig/scripts/logtalk_user_setup.sh	2016-02-16 22:09:02.000000000 +0100
-+++ logtalk-3.03.0/scripts/logtalk_user_setup.sh	2016-02-20 09:49:34.000000000 +0100
-@@ -110,14 +110,12 @@
- 
- echo "Copying Logtalk files and directories..."
- mkdir -p "$LOGTALKUSER"/contributions
--mkdir -p "$LOGTALKUSER"/docs
- mkdir -p "$LOGTALKUSER"/examples
- mkdir -p "$LOGTALKUSER"/library
- mkdir -p "$LOGTALKUSER"/scratch
- mkdir -p "$LOGTALKUSER"/tests
- mkdir -p "$LOGTALKUSER"/tools
- cp -RL "$LOGTALKHOME"/contributions "$LOGTALKUSER"/
--cp -RL "$LOGTALKHOME"/docs "$LOGTALKUSER"/
- cp -RL "$LOGTALKHOME"/examples "$LOGTALKUSER"/
- cp -RL "$LOGTALKHOME"/library "$LOGTALKUSER"/
- cp -RL "$LOGTALKHOME"/scratch "$LOGTALKUSER"/
-@@ -131,16 +129,7 @@
- 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"/BIBLIOGRAPHY.bib "$LOGTALKUSER"/BIBLIOGRAPHY.bib
--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"/manuals "$LOGTALKUSER"/manuals
- ln -sf "$LOGTALKHOME"/paths "$LOGTALKUSER"/paths
- ln -sf "$LOGTALKHOME"/coding "$LOGTALKUSER"/coding
- ln -sf "$LOGTALKHOME"/tools/lgtdoc/xml/lgt2html.sh "$LOGTALKUSER"/tools/lgtdoc/xml/lgt2html
diff --git a/dev-lang/logtalk/files/logtalk-3.11.2-portage.patch b/dev-lang/logtalk/files/logtalk-3.11.2-portage.patch
index bbe75385a92e..f416217399f1 100644
--- a/dev-lang/logtalk/files/logtalk-3.11.2-portage.patch
+++ b/dev-lang/logtalk/files/logtalk-3.11.2-portage.patch
@@ -1,6 +1,5 @@
-diff -urN logtalk-3.11.2.orig/scripts/logtalk_user_setup.sh logtalk-3.11.2/scripts/logtalk_user_setup.sh
---- logtalk-3.11.2.orig/scripts/logtalk_user_setup.sh	2017-08-28 10:13:52.000000000 +0200
-+++ logtalk-3.11.2/scripts/logtalk_user_setup.sh	2017-09-24 14:47:36.815968990 +0200
+--- a/scripts/logtalk_user_setup.sh
++++ b/scripts/logtalk_user_setup.sh
 @@ -130,14 +130,6 @@
  rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/lgt2*
  rm -f "$LOGTALKUSER"/tools/lgtdoc/xml/logtalk.dtd
diff --git a/dev-lang/logtalk/logtalk-3.00.0.ebuild b/dev-lang/logtalk/logtalk-3.00.0.ebuild
index 18801007a6b0..d21ce5022afa 100644
--- a/dev-lang/logtalk/logtalk-3.00.0.ebuild
+++ b/dev-lang/logtalk/logtalk-3.00.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils fdo-mime
+inherit eutils xdg-utils
 
 DESCRIPTION="Open source object-oriented logic programming language"
 HOMEPAGE="http://logtalk.org"
@@ -21,7 +21,7 @@ RDEPEND="
 	${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-user-docs.patch
+	epatch "${FILESDIR}"/${PN}-3.00.0-no-user-docs.patch
 }
 
 src_install() {
@@ -99,7 +99,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 
 	ewarn "Before running logtalk, users should execute"
 	ewarn "logtalk_user_setup *once*."
@@ -128,5 +128,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/dev-lang/logtalk/logtalk-3.03.0.ebuild b/dev-lang/logtalk/logtalk-3.03.0.ebuild
index dae592f640b3..018dbd5eff83 100644
--- a/dev-lang/logtalk/logtalk-3.03.0.ebuild
+++ b/dev-lang/logtalk/logtalk-3.03.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils fdo-mime
+inherit eutils xdg-utils
 
 DESCRIPTION="Open source object-oriented logic programming language"
 HOMEPAGE="http://logtalk.org"
@@ -21,7 +21,7 @@ RDEPEND="
 	${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-user-docs.patch
+	epatch "${FILESDIR}"/${PN}-3.03.0-no-user-docs.patch
 }
 
 src_install() {
@@ -99,7 +99,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 
 	ewarn "Before running logtalk, users should execute"
 	ewarn "logtalk_user_setup *once*"
@@ -128,5 +128,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/dev-lang/logtalk/logtalk-3.07.0.ebuild b/dev-lang/logtalk/logtalk-3.07.0.ebuild
index cb0cc659b75b..b5e3854b4f1e 100644
--- a/dev-lang/logtalk/logtalk-3.07.0.ebuild
+++ b/dev-lang/logtalk/logtalk-3.07.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils fdo-mime
+inherit eutils xdg-utils
 
 DESCRIPTION="Open source object-oriented logic programming language"
 HOMEPAGE="http://logtalk.org"
@@ -21,7 +21,7 @@ RDEPEND="
 	${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-user-docs.patch
+	epatch "${FILESDIR}"/${PN}-3.03.0-no-user-docs.patch
 }
 
 src_install() {
@@ -100,7 +100,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 
 	ewarn "The following integration scripts are installed"
 	ewarn "for running logtalk with selected Prolog compilers:"
@@ -126,5 +126,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/dev-lang/logtalk/logtalk-3.11.2.ebuild b/dev-lang/logtalk/logtalk-3.11.2.ebuild
index 4469d4c34937..682b01ea55f2 100644
--- a/dev-lang/logtalk/logtalk-3.11.2.ebuild
+++ b/dev-lang/logtalk/logtalk-3.11.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils fdo-mime
+inherit eutils xdg-utils
 
 DESCRIPTION="Open source object-oriented logic programming language"
 HOMEPAGE="http://logtalk.org"
@@ -95,7 +95,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 
 	ewarn "The following integration scripts are installed"
 	ewarn "for running logtalk with selected Prolog compilers:"
@@ -122,5 +122,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }