gentoo resync : 16.04.2018

5 files changed, 57 insertions, 33 deletions

diff --git a/app-editors/bluefish/Manifest b/app-editors/bluefish/Manifest
index 891fa5106f82..1a400ff8c8af 100644
--- a/app-editors/bluefish/Manifest
+++ b/app-editors/bluefish/Manifest
@@ -3,8 +3,8 @@ DIST bluefish-2.2.10.tar.bz2 4159964 BLAKE2B 94210df4f9cf0abb46fa26612e1b64550f5
 DIST bluefish-2.2.6.tar.bz2 3793018 BLAKE2B f77b5e21a3289ebd2c9e3986476dca30e42ff489240adccba91a5aaa4a2e35282fb2b0a38137d249747e0496f410cd51159cdd7dc4e3b46a6affcb68d9b58099 SHA512 39dee296ec6bbe1a946f9fb1c54e7143363da4bb6ce52aee14c9bef906d2eb82e5e58f78680810357c0bfcb11c21f982756a9199fec2f454c2816005a4d9d83e
 DIST bluefish-2.2.8.tar.bz2 4097769 BLAKE2B f0e38841dde2e620fa2ea7390891f2c09f349d9861aeeef9b919dbdc67d7be15dd28852736590e99f0cd167feee3089df929e261e8a244f1301e130a3bad451b SHA512 0450909feb2370c1c84a214744f103bfe891086ba5f3ccc85060b4e134ee2161c3fde641720a3544a4d71c25f120a35925517cee4ffce6e2f07c778baa2cc5c1
 DIST bluefish-2.2.9.tar.bz2 4082978 BLAKE2B a99db5acc2bce79aefccdf676a9ce965f682e99531790f20d6c67ad7f43c566009793efc4f3369aa425fc764dcf05f2a83b0260bf6531845cac2c707009c7967 SHA512 ef644b37907d308b908d508ad00069e48343cd240ca7703a20b4498eda73be1a97a6c07598f6e51d4fb1c0f2a380c86a274ccbbe046da01db6c4641e41e268ae
-EBUILD bluefish-2.2.10.ebuild 2656 BLAKE2B 9a5a2acd3ff68de6d875f9bb3dd57b3147c52095f866ae4f408d988891530444290aa101d3efb4a680e233966057bea08e89a55c87cc3fba3e7995497c2b1796 SHA512 c93e74f176233278a380b637dab5378515a30eae921a9272caa4209235ee959e69cca1c477bf14ef11a034ca9e4c56f8e3afe4d895729b2fd4d89603d5a29de9
-EBUILD bluefish-2.2.6.ebuild 2252 BLAKE2B 18bab1a552cc035911c54338261d99ba366a9157675dedf3ef4de8f6d82b04269e5d94b9a1c82f6b3b0c42b24958927474e1862b7d29c6dc8231872657c9e91a SHA512 de8c028ca5caef9bcbbc95fde54b38a79f548b2ec939364eb414ab29ce27e06b4e4dfba5a1757c83f196d65947ca50025cefebc76f844d6f8b5bf78d63f0e014
-EBUILD bluefish-2.2.8.ebuild 2496 BLAKE2B bef59c9120bb99b580c11b1800ecda4eef0e92ea8d93628b7588225389bff8b1b412fe8008abfcd097ca1a82edb0b8ebb1eb8b19aee3a51261932bbc17b2bef2 SHA512 000ed3a4c617d9620b05f2e763f36beda2204b4ce91ec7b710087f2ba480efbfd48cbaead3c2d9029d3b4ec1e9eb4eccf5113c5146aae3dd6846485998b5b2e3
-EBUILD bluefish-2.2.9.ebuild 2656 BLAKE2B 9a5a2acd3ff68de6d875f9bb3dd57b3147c52095f866ae4f408d988891530444290aa101d3efb4a680e233966057bea08e89a55c87cc3fba3e7995497c2b1796 SHA512 c93e74f176233278a380b637dab5378515a30eae921a9272caa4209235ee959e69cca1c477bf14ef11a034ca9e4c56f8e3afe4d895729b2fd4d89603d5a29de9
+EBUILD bluefish-2.2.10.ebuild 2765 BLAKE2B 038b937c439b635d8e8e601b623613e59fa71bc513759ff46b4e5d3a9d9f5dce7f2712b94c3f62de8ca1bbc5ef91393941753db4b88f1d57b9dfcbe39af4672f SHA512 5b000ec5b127aca8d743fa0bed7e2360c6e0f9422600ff62d2d18b51bcd54eda306830916b43754bc3a227271e0b3ffcc975eca69e9b80ea7e03ed83661aac00
+EBUILD bluefish-2.2.6.ebuild 2340 BLAKE2B ffa844212337201b9a851f31b6b47f0e53a79df5624b1045074e729610af1d7a03752bfd6fe1f9559c6ddf557d3d8b3c33dd619aaa2569059322eeff9d9ff1b1 SHA512 d0ff8dd70461bcfe97888ad97bcf8fb4cf8cec932eeb0ca79614ac612ab04623cc928b988bce0f9c301482371d21ceaf093b9e70e2f854a824b18c3655503dba
+EBUILD bluefish-2.2.8.ebuild 2605 BLAKE2B 25c8fcd77c7b717e2625e5c59f20b443e710b92e44d0ac1b59416e410b5bff6b38cf444be6b4ef8249717dc5bc36189a300d17730cd9924918e3a31214bd2154 SHA512 3c096bbbdd8b77c18f5b92246f6d4ac6548c0499148c3562e9a308a45da602f236c1595a1534c8141f5d123c2c3d277eb6f9ff634a60054e852aaf9a7a7df065
+EBUILD bluefish-2.2.9.ebuild 2765 BLAKE2B 038b937c439b635d8e8e601b623613e59fa71bc513759ff46b4e5d3a9d9f5dce7f2712b94c3f62de8ca1bbc5ef91393941753db4b88f1d57b9dfcbe39af4672f SHA512 5b000ec5b127aca8d743fa0bed7e2360c6e0f9422600ff62d2d18b51bcd54eda306830916b43754bc3a227271e0b3ffcc975eca69e9b80ea7e03ed83661aac00
 MISC metadata.xml 542 BLAKE2B 0680cbbd32a85e3c53e10b4605e820d5eabc79761ef70bd41a5fe3cfb2a25a19251696c5b2e35f729e38c481728635cfbf8253ef07f15c656f8b164df905d3ef SHA512 7449eb863eecc8ed11167409f150847c628077e328f13481db6206498d15c7c6e148e7c309ed40eaf781f401147b7a757e8216324b2c01ea65202e39bf57fe5f
diff --git a/app-editors/bluefish/bluefish-2.2.10.ebuild b/app-editors/bluefish/bluefish-2.2.10.ebuild
index edf1fbd4866e..2e9a485511db 100644
--- a/app-editors/bluefish/bluefish-2.2.10.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.10.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools eutils fdo-mime python-single-r1
+inherit autotools gnome2-utils python-single-r1 xdg-utils
 
 MY_P=${P/_/-}
 
@@ -77,12 +77,17 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 
 	einfo "Adding XML catalog entries..."
 	/usr/bin/xmlcatalog  --noout \
@@ -94,8 +99,9 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	einfo "Removing XML catalog entries..."
 	/usr/bin/xmlcatalog  --noout \
 		--del 'Bluefish/DTD/Bflang' \
diff --git a/app-editors/bluefish/bluefish-2.2.6.ebuild b/app-editors/bluefish/bluefish-2.2.6.ebuild
index 2c420dafef14..2e47961b2f0c 100644
--- a/app-editors/bluefish/bluefish-2.2.6.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils fdo-mime python-single-r1
+inherit gnome2-utils python-single-r1 xdg-utils
 
 MY_P=${P/_/-}
 
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
 		dev-util/intltool
 	)"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 # there actually is just some broken manpage checkup -> not bother
 RESTRICT="test"
@@ -60,12 +60,17 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 
 	einfo "Adding XML catalog entries..."
 	/usr/bin/xmlcatalog  --noout \
@@ -77,8 +82,9 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	einfo "Removing XML catalog entries..."
 	/usr/bin/xmlcatalog  --noout \
 		--del 'Bluefish/DTD/Bflang' \
diff --git a/app-editors/bluefish/bluefish-2.2.8.ebuild b/app-editors/bluefish/bluefish-2.2.8.ebuild
index bf84c0859b2e..2ffd0fb8bb4f 100644
--- a/app-editors/bluefish/bluefish-2.2.8.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit eutils fdo-mime python-single-r1
+inherit gnome2-utils python-single-r1 xdg-utils
 
 MY_P=${P/_/-}
 
@@ -71,12 +71,17 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 
 	einfo "Adding XML catalog entries..."
 	/usr/bin/xmlcatalog  --noout \
@@ -88,8 +93,9 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	einfo "Removing XML catalog entries..."
 	/usr/bin/xmlcatalog  --noout \
 		--del 'Bluefish/DTD/Bflang' \
diff --git a/app-editors/bluefish/bluefish-2.2.9.ebuild b/app-editors/bluefish/bluefish-2.2.9.ebuild
index edf1fbd4866e..2e9a485511db 100644
--- a/app-editors/bluefish/bluefish-2.2.9.ebuild
+++ b/app-editors/bluefish/bluefish-2.2.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools eutils fdo-mime python-single-r1
+inherit autotools gnome2-utils python-single-r1 xdg-utils
 
 MY_P=${P/_/-}
 
@@ -77,12 +77,17 @@ src_configure() {
 
 src_install() {
 	default
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 
 	einfo "Adding XML catalog entries..."
 	/usr/bin/xmlcatalog  --noout \
@@ -94,8 +99,9 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 	einfo "Removing XML catalog entries..."
 	/usr/bin/xmlcatalog  --noout \
 		--del 'Bluefish/DTD/Bflang' \