gentoo resync : 22.04.2018

5 files changed, 10 insertions, 10 deletions

diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index a1466667a390..100b6932a3a7 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -4,8 +4,8 @@ DIST darktable-2.4.1.tar.xz 3396372 BLAKE2B 916a39b117c3af8bd81a1c6177929bdc0f75
 DIST darktable-2.4.2.tar.xz 3415724 BLAKE2B 2c7149ff14283f38208f223cab78c57d30cf0f50841484411bec64d8154b6c4f2213990d169da057d734b9ac792a549aa9c3a6137a0ebfcec6b4c7d6f3991817 SHA512 4ad698bbfbeb94ab8d25a5414e65a5e5d6d8edae0e77d1ac327dfed0e0519e1a8a6761f9efe653aa8c421cc37269efaef4da96c5bc3797f923b4a0df4ebdfa8b
 DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20
 DIST darktable-usermanual-2.4.0.pdf 15072726 BLAKE2B a10fb02bb732040e45e4b2c6b6a6e022c6095a29aac894727c8a803bf76ac50924bcd938f3c7085222f32542074cbe051afe8752059a0796db22adabecce3faf SHA512 0259ccd264ec0569a770d92a517932bf5b24ce279c699a636f36656519c400456f0bdbd5de1eacf96e0cb05c0b7e59a6c6fa02803b809bc0fabb902ffe454dd1
-EBUILD darktable-2.2.5.ebuild 3865 BLAKE2B 840d9f1a6d2df0d2531bdf69909e15bc82253971a286159eb0e1d2e8e319ca39a2b5f69732191b852c7706c441e29f232c9a3f773205c34b2916e12dcb92051f SHA512 7f9f2e38f942c2eaa90f5d26269d0dfdf393b16b68454b717334b7736da09556287b5cff1eed2d61ae02e1fb36ae5b117e9d32cb84bd3762390ff10f7c795612
-EBUILD darktable-2.4.1.ebuild 3999 BLAKE2B 902a5b16ca824ed39ab8774130c7c61ca501079cb1af3bd0e4191631fc18cc932beb1b89a16c11be8f7888189b936e3a8ad528065046e6e69a3cb04ebbcbe42c SHA512 a710ebc30b04bcc6ea70ed75cb0280563ac29218ed25a2f404c86ae50fc5a321b1e8a3bf84e49624232578223fc1e800c90096b778f0375f4b9bf93445d0a088
-EBUILD darktable-2.4.2.ebuild 3999 BLAKE2B ab8c8bfa882b0047df0357316d130a85a810e5f6bd52d449825f2334c67d6780b0271ab0586590329aaf10315220e852345e4705604f8a2d9f10d5db93ce036f SHA512 c5fc75df91ca994b5444984620405faee418d72a9fd42268f5df20e942b80714cc5a3695038c037bbf64af5f704923e7be6b0b0083892fc695d3cdeacc821c12
-EBUILD darktable-9999.ebuild 3434 BLAKE2B 3f4354c3815fdb84a0ff0b4362e1426d54cc8a9244cc39f3a760bcbc199044c1e8591ecdf8b581335f9e60a793f2519e39285ab50bfdd7542dc57f7a0601c913 SHA512 d814738b460f2e18847b52a2559ecd4479e45862209648badacab847b3dd0a002e4c168a69c69b1e416d5d68537f3fb19ae3f47006695572ea950e736d6c7bc7
+EBUILD darktable-2.2.5.ebuild 3856 BLAKE2B 01adcaf0ca198b5cea7c49b5dc3844c76a7f0a0a1c83e1a9729161721aa73b390971156bb3784ec4d9c7577821da90390b5bdd1c3c3820976963d45fab510187 SHA512 daf6de876de7db156d979292562411581f06e58f8bddf5b3cb96f75c4b8d38f7dd8ac951c275192ce5d6f5f139566492aa7c08238e35da131a056113c08d9a94
+EBUILD darktable-2.4.1.ebuild 3999 BLAKE2B da571509858accbfcc514c4283c58fe4fe820f5dc0baabfd07a056c7934671c2526c86ded6219f903d094f24888cb0115bf451292facdaf56b657faf48678c8b SHA512 c655edc4067ff2744244bf7f07d5239da45594d906c0032e2bf881d5ab1be7f83807897f8b60d0d7dd4e2fbbbd39e96d2ac47dfdcce79ccf8c16790d0b2ca455
+EBUILD darktable-2.4.2.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307
+EBUILD darktable-9999.ebuild 3434 BLAKE2B 9720e4706e25b09ef6b0a652cdd2ee47fdc394fee8a7a8f3a673c8393a081e1a87b136cd6da813ca59aa4c6c6da6930ffcaead9123cf768765eb276cfc8134ab SHA512 99476f1f3742d2404bc491e3fe654e4928b714429070fc338461db8f49c2cc51c089f9426aad1470c65dd606054a90a6d69e8c52deb83e39bc0a298393bf6111
 MISC metadata.xml 925 BLAKE2B 5f8855e5d645a30a6a4fdd5049e04f2269df88b042f69321677733d00b56d5e77b9084d996ab7c08340d24f14fdaea3080962465807266d435a954f0f4ca5dbf SHA512 f247ae77eba5dcebc3381cf6fabc68565dc6880c1b3aa5d90311864d78ba9868eb6848a960ead426c006e1e4c5f7d76baee256c948b68ad44785adf45215d09b
diff --git a/media-gfx/darktable/darktable-2.2.5.ebuild b/media-gfx/darktable/darktable-2.2.5.ebuild
index a8a7aa1b9a0f..09628ed7484f 100644
--- a/media-gfx/darktable/darktable-2.2.5.ebuild
+++ b/media-gfx/darktable/darktable-2.2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils
+inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils
 
 DOC_PV="2.2.0"
 MY_PV="${PV/_/}"
@@ -124,7 +124,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 
 	elog "when updating from the currently stable 1.6 series,"
 	elog "please bear in mind that your edits will be preserved during this process,"
@@ -135,5 +135,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/media-gfx/darktable/darktable-2.4.1.ebuild b/media-gfx/darktable/darktable-2.4.1.ebuild
index 29265f5ebb36..34320cc4d26b 100644
--- a/media-gfx/darktable/darktable-2.4.1.ebuild
+++ b/media-gfx/darktable/darktable-2.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils xdg-utils pax-utils eutils
+inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils
 
 DOC_PV="2.2.0"
 MY_PV="${PV/_/}"
diff --git a/media-gfx/darktable/darktable-2.4.2.ebuild b/media-gfx/darktable/darktable-2.4.2.ebuild
index 2dd7f1c2d2cc..76721f6a80a4 100644
--- a/media-gfx/darktable/darktable-2.4.2.ebuild
+++ b/media-gfx/darktable/darktable-2.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils xdg-utils pax-utils eutils
+inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils
 
 DOC_PV="2.4.0"
 MY_PV="${PV/_/}"
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index ffbe61010f4d..ea7f114839a9 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils xdg-utils git-r3 pax-utils eutils versionator
+inherit cmake-utils eutils flag-o-matic git-r3 gnome2-utils pax-utils toolchain-funcs versionator xdg-utils
 
 EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"