gentoo resync : 22.04.2018

4 files changed, 20 insertions, 20 deletions

diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index 9a6d085d0231..b44b2951b8ba 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -1,7 +1,7 @@
 AUX pcmanfm-1.2.5-CVE-2017-8934.patch 1451 BLAKE2B 77c6fa0dea7f2a82e3aa4ecf91050852010630e43245f2838538778020a2bfac20a1ab85022337eaa4c3df53b7fc7d833578a09d059638946abee65cba7a49c2 SHA512 1ae582c72dbf4e57cda84df07348414567ed4c4f39b3b6df96a4732b926c502735bfc2c6c62e6e987efd63d21526cb63eb4665d00f0eb7338acd8de1684c36b4
 DIST pcmanfm-1.2.3.tar.xz 406756 BLAKE2B e8f4c166559266b4628f5fda4b7595ea8a28e37aa71cc3ec957ff04af8c919a248da5b189eb52040f2d049f633313cf9386c77b331b8e491ed4b3a69615c5010 SHA512 b350566c3aee0fe857ed1f0df2ae7d2ce51caf1547b951b380145078ba60f2fe6e0490c4d4c19465c5b1e0a9966205db6f8fe4dafb7cb3e987b9157551df2b28
 DIST pcmanfm-1.2.5.tar.xz 417808 BLAKE2B 1bc4ff7879baa1b62c5acf0b48977f5a81b5bac2d449064ed3ae74740f8e6981ae129cdfe123b63e57e2a22769273348df1a48def61eeb6a72a5918fdad2847c SHA512 ce53315483f58361c5a7797bdca355dbbedc2cf3907d319c7c65be844ea74ed297497dc3183c903e06b8294f6301d19347f6b9871e34bf773c04ff4fb8ab32f3
-EBUILD pcmanfm-1.2.3.ebuild 1536 BLAKE2B 9178611586b4f75c979b780197e15ec6606c824d865fdb23b091f81b8baba1547624242d7aa4f461c89d49636ec5b84cf8c554befc551de6c546c6ac08a6263a SHA512 9f7ae35619fabcfe21a50054dc98c5f0de11fbd920ff630661a369491cf34cacbde83e59fcee176f83353d174b82560342836309d1bba6db75a73edfe5ce4ca2
-EBUILD pcmanfm-1.2.5.ebuild 1638 BLAKE2B 4d344630fd56ca206f43b64265eca613a59cec97bc5ab606aeaf77d94cc3fc99034e5e415aed666d941e3ad8ba5bb8575e50ef03ae29984e746a1be143b6e1b6 SHA512 2ca3bd0394b2cf81e0f4b8515ff0bea170b00e47e307a6312cc011fe2641869990a2ee03b7f803f5f4a71b1a28b4dcad7fb392dc1ed759221fbd0925cdf04968
-EBUILD pcmanfm-9999.ebuild 1775 BLAKE2B 409b92d95dbb8af1bfef8c2495bf156133d3e2bdd608eb3d5b82d0df0818c312e6ab6d92c8d2cf20f14ae43d0e3945b683cc448f53d68f357448a27a6892255d SHA512 26f93d3282f02f9616e3c49cb5105956130bbbeba6b9c12feb5c5caaea6883b8d180ff11b491c6b914063550d0153ee89ef1be58528b0b4615bd315a8d37ff2a
+EBUILD pcmanfm-1.2.3.ebuild 1525 BLAKE2B 91dd715d6cad05ca36b3e867d9a206e74f92f20ae2e7077e4af5773634019e0f7200f480bb211cbb0737c594258d8ae73c940fbef97385750113023fb8fe73fa SHA512 b226940a0ddc5968ff2db4ef462e745c9110a6b775d12cc299e3af88353272b8736712b8151c4a2532eefe2d0190d289677bfb0fc85bba6722147d7de9c01c00
+EBUILD pcmanfm-1.2.5.ebuild 1627 BLAKE2B d7092670f43bbe87a423bb5f1492676a09938dd695b0bc48b3adf30d39d309a851f462fb5231f0820ab27cf056df23e07bb72e067f43ab25ebb74b151863e139 SHA512 4bb01a683c3820e1a0d6c8d330e4f02d0ac588f0ad69cb3e96257906aecc4dd87eadf50b75b9c716bd0ab12778eafd64d3efcae379587102c0a385b3b06fca48
+EBUILD pcmanfm-9999.ebuild 1764 BLAKE2B 7886b9c70db89b2d86b2f18b0981fc7fc90e1e4feb23c9551b2a81bf6be0d0bff74026d04174bf507d43e5eacc7df16616bf63d17e8cf194823ccdd560e107c3 SHA512 010cf7f72a855c3cfd8486eb5a7f3f56c90856f204ded84dfc30c5d95972a952e2027469880e39435f0fa08851aae3dfe45ce38e46849d810db238ae9f52d8a0
 MISC metadata.xml 455 BLAKE2B 72f1a00dad24e78531309d59b0717ba16e183c7868f4e18843703f5e556adab1418f40d7d8cfcc26c5625b016271e67027eb6a98869067067c4e06389a7fde58 SHA512 41bcf6db377068ea7a0b678fb765cc33433e5d749e563f2bbe55edd02377cde79a5c15339f81ebb1609f1f14b50186a5d03d23ab100064cbc7841e26efee723d
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
index a15faa771fe8..968a5439acb5 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -7,7 +7,7 @@ is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv
 te th tr tt_RU ug uk vi zh_CN zh_TW"
 PLOCALE_BACKUP="en_GB"
 
-inherit eutils fdo-mime l10n readme.gentoo
+inherit eutils xdg-utils l10n readme.gentoo
 
 MY_PV="${PV/_/}"
 MY_P="${PN}-${MY_PV}"
@@ -52,12 +52,12 @@ src_configure() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild
index cbe9327aa04b..79c9d379f078 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild
@@ -8,7 +8,7 @@ is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv
 te th tr tt_RU ug uk vi zh_CN zh_TW"
 PLOCALE_BACKUP="en_GB"
 
-inherit eutils fdo-mime l10n readme.gentoo-r1
+inherit eutils xdg-utils l10n readme.gentoo-r1
 
 MY_PV="${PV/_/}"
 MY_P="${PN}-${MY_PV}"
@@ -61,12 +61,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/x11-misc/pcmanfm/pcmanfm-9999.ebuild b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
index d721dbfcaf5b..c23a058f92d1 100644
--- a/x11-misc/pcmanfm/pcmanfm-9999.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv
 te th tr tt_RU ug uk vi zh_CN zh_TW"
 PLOCALE_BACKUP="en_GB"
 
-inherit autotools eutils fdo-mime l10n readme.gentoo-r1
+inherit autotools eutils xdg-utils l10n readme.gentoo-r1
 
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}"
@@ -69,12 +69,12 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	readme.gentoo_print_elog
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }