gentoo resync : 03.12.2017

4 files changed, 20 insertions, 17 deletions

diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest
index d686029be0ef..490f058fd728 100644
--- a/www-client/conkeror/Manifest
+++ b/www-client/conkeror/Manifest
@@ -1,10 +1,10 @@
 AUX conkeror-r2.sh 342 BLAKE2B 40b2f866d78ef29498ea68afbe020fb62d317a33138d5f94eac095afeee671e31463cbdba8a1b5bd822e3add57748c86d72f7f652db0b17dcf19098502f31829 SHA512 e7a79a442b157e73b759e1afab554128ea6cde4631ddeedcea6d93f8fda15f443903924127818c3753f22ca7d8b41010b337eca31f86edd36f3a6d67be840b71
 AUX conkeror.desktop 353 BLAKE2B c99cf942bcf97bbdc1567a60d0d15252ae378c91eeac57c066763007270eff39ffc39dd0ba5654b3e674fa33a2750327af2c313ed9f4b8ed212860f5074beb93 SHA512 ea48c755c800d2df417d5461e07a41305545de4086e22bf741804c60bb6d7f002685481eb505593c02f5948887026f5b9f15f853794c0c85c9aba7c060cf0f64
-DIST conkeror-1.0.3.tar.xz 243360 SHA256 ee85cea9a46602fd6b3fb0a937016df45721617e8af96fb6837a97243e8476a1 SHA512 ce5fae1037fbadc639f5bdf37c627dd03f32a2a41db40aa640348f4a8c63e8775d4fa90f06a5488133e5739e7e64a60e2a3de11de389b67290eddf12628f4e5a WHIRLPOOL fa928c44b49f8e95904725359c070c8b0fc3581a05d735bb899ac67a771d2979584d4f244fa033c5506ceacdad1d384602166d3a12e4b9842d8ff22d773f0e60
-DIST conkeror-1.0_pre20140212.tar.gz 310931 SHA256 ecc434ed3c7703fe78c3413402ebb8b0ad7453d3ac65345a5ece329f615b0d32 SHA512 08174a50b5aca69a76ee1686c460cd62bc51d75030c067202be5acb947e6ebfb209adf5797be0096256eef913e688c401cdccd5afa1e738390458b244378c41e WHIRLPOOL 25c6eeb676d3e4238d27884b13bc298dd263811bbc19df3afbf833c5359283bb40a15e63725dbc2d7f9b990963fde4c1e070c1f44a06132b99ca2d6d951bb0cb
-DIST conkeror-1.0_pre20150519.tar.xz 242676 SHA256 8fdbb65acf44ea71b98449ec6540bd58ba90e4ab052fa43c07209a0e318819ce SHA512 49a3758baeb38c238aca253df0938cf308f6403d4237013dc23e9255affa23d516d1edb6fed31b0f705173e6441294d6602d575cfaeb3bb947ae7d0ac1cbaee9 WHIRLPOOL cc759843951c531d4899dba35dee5cec4acb504dd442e8fd0550d8f98bb526eb383ed889c889339a965071db64a5687d11b6b8a9e2167c06f4959db5dcbfc352
-DIST conkeror.png 5105 SHA256 b11856c32bdec9e9b045df44aa37727f6a3ec18507d376bf27675bc7ee042667 SHA512 fd44e2732a74ab6a54ef4a946f20619aa74d24d2244b0d6bedfa6d4680bc3247d297565550d8c3a5cc4a8ca608761ccb8f61e71cbe0c2851d400f8fa426e034f WHIRLPOOL 3fe3ea1f7f1caaa737ed3777b6b8cb6e10f971b5853a0a89de65c78e75323e8f01f01ea46d01fbff47dd97452e7a114b353322b4d8764a4d2bacf755c8fa3c66
-EBUILD conkeror-1.0.3.ebuild 1502 BLAKE2B 87af17cae8ed5afdd8ba396f261e4aaa93b96365aad2e3cc29dbed7db66b9b66d59eac03bcbfef1ebb8be0cb2870aaf66e4a523366aaa58ba2e7725e987688b8 SHA512 707d2b6051bdbfe9fd214a29b76cf1ea5b21224f6647d309a688d1e62eeedad50629ea019dbc1edddf6efaac946f9136e02188caac88a82e1dd47d47181ad283
-EBUILD conkeror-1.0_pre20140212.ebuild 1496 BLAKE2B 8180759cb90a686e9117c24cb6c4155e3e2e9026c4a679d8e01594707adbe18c0089c4147af930669f77abd0cea66e8235ecd04ee8e035ecc2aa651ae4e7933d SHA512 a9a065d0a2aa17f40151b1eea740955b76eae18b6fac9da206b151e94497c33e855688d3b52c6ca43db2bb741103c218a59601e3039cef7eff16f30e21fa3639
-EBUILD conkeror-1.0_pre20150519.ebuild 1502 BLAKE2B 29a533b3e025a7c36da7665aef052bd9387425e0eab4f17a31553a1617ae659e939045f7d39ce80452c86e96098c28bb2a55a028782f72fbab2c64b8d762e68c SHA512 771c76bbea95a60b02fbabeb4c28d570b6d5b09b2bbfea87abae11cbf2aa6aa4dda7f25ad37abeeb59ffba8fbda3ee618e11efb89d1b97509b56f776cf948207
+DIST conkeror-1.0.3.tar.xz 243360 BLAKE2B 3380016a37dda88cb0a8aea65918fdfda8cf58c08a018d9ef14b487fae63957b15b1d42e31e5971c546d5a8f691b9f7d52ff8b6c171bee8bfc9cc6a9d5a25637 SHA512 ce5fae1037fbadc639f5bdf37c627dd03f32a2a41db40aa640348f4a8c63e8775d4fa90f06a5488133e5739e7e64a60e2a3de11de389b67290eddf12628f4e5a
+DIST conkeror-1.0.4.tar.xz 243876 BLAKE2B 112a05a8601f67f1a360f8fa947c0d325aac8276f72f02a6162fd3ec886d8b912e75991c94e4ec5bb9ebb44c6762bcbcb7f5a18c89410ba7d2294c38f66aba84 SHA512 4d6f3391b3ddcaedf532b9108cecfea2378c15307a669a46dcdd98ed39bdf25f6facf741aba66be4f683afe951e1c25ca011a94440d98bb0621d9b2cb10adeca
+DIST conkeror-1.0_pre20140212.tar.gz 310931 BLAKE2B 19d558317789d2c26990bce2ae86e4c9c3a9b91e7e59bb57a59f4338b3a9f9ff2352cfdd93860c3f927cad26ddecad7adaec3454a9ec4096836fb068311724d5 SHA512 08174a50b5aca69a76ee1686c460cd62bc51d75030c067202be5acb947e6ebfb209adf5797be0096256eef913e688c401cdccd5afa1e738390458b244378c41e
+DIST conkeror.png 5105 BLAKE2B 7d8d455e76987d0db00748ea6d5319793685b2e0061539f9378411245644f46a8e40eadfb59a5d543c17d058e2dc5f85c1cc3d2deabe5b988adb9dd689fa2bcd SHA512 fd44e2732a74ab6a54ef4a946f20619aa74d24d2244b0d6bedfa6d4680bc3247d297565550d8c3a5cc4a8ca608761ccb8f61e71cbe0c2851d400f8fa426e034f
+EBUILD conkeror-1.0.3.ebuild 1561 BLAKE2B 18e65526dd01c807b482aba76ca380251c659fdb53b19d3b29a21ddd58ca3e8314c9fba9f894c7abf3e33ea31a0561fb6638d75e62b53a5298c125c8f0680b6d SHA512 636411bd37cb631341c446df2ed52817dbac9c548a54d9c49be0e5ade436156d195082ee320a9967c8e8ed8bbf30b8a7ca4d0bd9f9708f92ff7c5e4533643942
+EBUILD conkeror-1.0.4.ebuild 1553 BLAKE2B 4778cb89e4e3e173e8c70b5bc4b9a2acdbb87f9fabae224143dbf956ad52fa194dd3329459fe718fe41784566d836e8c6850fcbd98dd63f2190ab33d67fc40ea SHA512 204d9eddda633779b0e821edf30188021ef00bd588bbf858298832c746a58ff80465225c1f9da3ff5031d700b4905cc3a64cbcd5f607df182c95a61d5ac50812
+EBUILD conkeror-1.0_pre20140212.ebuild 1551 BLAKE2B 6637a056455c9c16910f8b1eae8e923e5fdab4c0bb3209e7cb9c75dec8c8256bf27aafbad40c9c889a9eb691f08ffad6a44bfff9c25feaa8f804567bf30d73d3 SHA512 a4750a5a575cda7d5e062e5cacff3ac237cb6cd024d22345faa927e7de49cd85af2e6819f01de54ef2cbbbf97aaae5d1c9e6b18047562664e0290815ddddad7c
 MISC metadata.xml 702 BLAKE2B 9768c0d3e10cb9898b5e80075926dfb4b8a3c6ce8ddf694c72989077c27d1dec0acc3cf3e522452b9281f21a2719011293eefa4bcb44b26a793c3348745dc1c0 SHA512 ef47f81c9122a73eb93dd60fc60cd414ce12f1f1c48413cdf7d7e3d3c47e4865dbe24927385b7fae27aebd2508acfccae1bd84cf7fef19a506aec9315f454c18
diff --git a/www-client/conkeror/conkeror-1.0.3.ebuild b/www-client/conkeror/conkeror-1.0.3.ebuild
index 7555b3f7ea66..3e66718c9e60 100644
--- a/www-client/conkeror/conkeror-1.0.3.ebuild
+++ b/www-client/conkeror/conkeror-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,8 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-23.0 )"
+RDEPEND="|| ( ( >=www-client/firefox-5.0 <www-client/firefox-57 )
+	( >=www-client/firefox-bin-23.0 <www-client/firefox-bin-57 ) )"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/www-client/conkeror/conkeror-1.0_pre20150519.ebuild b/www-client/conkeror/conkeror-1.0.4.ebuild
index 6d1df3cc1f4f..ae31992df34e 100644
--- a/www-client/conkeror/conkeror-1.0_pre20150519.ebuild
+++ b/www-client/conkeror/conkeror-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs fdo-mime
+inherit toolchain-funcs desktop xdg-utils
 
 DESCRIPTION="A Mozilla-based web browser whose design is inspired by GNU Emacs"
 HOMEPAGE="http://conkeror.org/"
@@ -17,7 +17,8 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-23.0 )"
+RDEPEND="|| ( ( >=www-client/firefox-5.0 <www-client/firefox-57 )
+	( >=www-client/firefox-bin-23.0 <www-client/firefox-bin-57 ) )"
 
 S="${WORKDIR}/${PN}"
 
@@ -50,9 +51,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/www-client/conkeror/conkeror-1.0_pre20140212.ebuild b/www-client/conkeror/conkeror-1.0_pre20140212.ebuild
index 454321e9e7ee..cbabbb2f05bf 100644
--- a/www-client/conkeror/conkeror-1.0_pre20140212.ebuild
+++ b/www-client/conkeror/conkeror-1.0_pre20140212.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,8 @@ LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
-RDEPEND="|| ( >=www-client/firefox-5.0 >=www-client/firefox-bin-23.0 )"
+RDEPEND="|| ( ( >=www-client/firefox-5.0 <www-client/firefox-57
+	>=www-client/firefox-bin-23.0 <www-client/firefox-bin-57 ) )"
 
 S="${WORKDIR}/${PN}"