gentoo resync : 11.02.2018

5 files changed, 8 insertions, 69 deletions

diff --git a/www-client/conkeror/Manifest b/www-client/conkeror/Manifest
index 490f058fd728..23c9218cac69 100644
--- a/www-client/conkeror/Manifest
+++ b/www-client/conkeror/Manifest
@@ -1,10 +1,8 @@
-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 BLAKE2B 3380016a37dda88cb0a8aea65918fdfda8cf58c08a018d9ef14b487fae63957b15b1d42e31e5971c546d5a8f691b9f7d52ff8b6c171bee8bfc9cc6a9d5a25637 SHA512 ce5fae1037fbadc639f5bdf37c627dd03f32a2a41db40aa640348f4a8c63e8775d4fa90f06a5488133e5739e7e64a60e2a3de11de389b67290eddf12628f4e5a
+AUX conkeror.sh 342 BLAKE2B 40b2f866d78ef29498ea68afbe020fb62d317a33138d5f94eac095afeee671e31463cbdba8a1b5bd822e3add57748c86d72f7f652db0b17dcf19098502f31829 SHA512 e7a79a442b157e73b759e1afab554128ea6cde4631ddeedcea6d93f8fda15f443903924127818c3753f22ca7d8b41010b337eca31f86edd36f3a6d67be840b71
 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
+EBUILD conkeror-1.0.4.ebuild 1549 BLAKE2B 80721b7f3aa1c859416d3c64776300dfee85e57517fbf5855720f799978391390eadfde9299a9d658e0bec686c0667e1b77f340d610c5db28ffee3439c5a3fd5 SHA512 b5cc4f661235380cba8a5923a5cee2f91a5c4327868ccdc561a73ed37077ca39a41c5b6e05282c351277bd2127861efef113312f837762c5281bd6c256ad6f74
+EBUILD conkeror-1.0_pre20140212.ebuild 1548 BLAKE2B acbe24f6f0f4b5779ae992344f5358113f93a5c82136ab3d78983f11289e802b56ef82e47d1b22228efd0f5cce4dcd72cd1277a6d735013a4748c8525e84a309 SHA512 049702fe656a95e80447075a861cb442c4f56ccfbc264a7a71da761b6f38b40be4a1b79d99217ddb6ad6668bbaf64062052ee426ab17cec8487a081209686686
 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
deleted file mode 100644
index 3e66718c9e60..000000000000
--- a/www-client/conkeror/conkeror-1.0.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs fdo-mime
-
-DESCRIPTION="A Mozilla-based web browser whose design is inspired by GNU Emacs"
-HOMEPAGE="http://conkeror.org/"
-# snapshot from git://repo.or.cz/conkeror.git
-# conkeror.png is derived from http://commons.wikimedia.org/wiki/File:Conker.jpg
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
-	https://dev.gentoo.org/~ulm/distfiles/${PN}.png"
-
-# CC-BY-SA-3.0 for conkeror.png
-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-57 )
-	( >=www-client/firefox-bin-23.0 <www-client/firefox-bin-57 ) )"
-
-S="${WORKDIR}/${PN}"
-
-src_unpack() {
-	unpack ${P}.tar.xz
-	cp "${DISTDIR}/${PN}.png" . || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r branding chrome components content defaults help locale modules \
-		search-engines style tests
-	doins application.ini *.manifest Info.plist
-
-	exeinto /usr/libexec/${PN}
-	doexe conkeror-spawn-helper
-	dosym ../../libexec/${PN}/conkeror-spawn-helper \
-		/usr/share/${PN}/conkeror-spawn-helper
-
-	newbin "${FILESDIR}/conkeror-r2.sh" conkeror
-	domenu "${FILESDIR}/conkeror.desktop"
-	doicon "${WORKDIR}/conkeror.png"
-
-	doman contrib/man/conkeror.1
-	dodoc CREDITS README
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/www-client/conkeror/conkeror-1.0.4.ebuild b/www-client/conkeror/conkeror-1.0.4.ebuild
index ae31992df34e..da0f8a16c9e9 100644
--- a/www-client/conkeror/conkeror-1.0.4.ebuild
+++ b/www-client/conkeror/conkeror-1.0.4.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
@@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
 # CC-BY-SA-3.0 for conkeror.png
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 ) CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="|| ( ( >=www-client/firefox-5.0 <www-client/firefox-57 )
 	( >=www-client/firefox-bin-23.0 <www-client/firefox-bin-57 ) )"
@@ -42,7 +42,7 @@ src_install() {
 	dosym ../../libexec/${PN}/conkeror-spawn-helper \
 		/usr/share/${PN}/conkeror-spawn-helper
 
-	newbin "${FILESDIR}/conkeror-r2.sh" conkeror
+	newbin "${FILESDIR}/conkeror.sh" conkeror
 	domenu "${FILESDIR}/conkeror.desktop"
 	doicon "${WORKDIR}/conkeror.png"
 
diff --git a/www-client/conkeror/conkeror-1.0_pre20140212.ebuild b/www-client/conkeror/conkeror-1.0_pre20140212.ebuild
index cbabbb2f05bf..a212377519f2 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -42,7 +42,7 @@ src_install() {
 	dosym ../../libexec/${PN}/conkeror-spawn-helper \
 		/usr/share/${PN}/conkeror-spawn-helper
 
-	newbin "${FILESDIR}/conkeror-r2.sh" conkeror
+	newbin "${FILESDIR}/conkeror.sh" conkeror
 	domenu "${FILESDIR}/conkeror.desktop"
 	doicon "${WORKDIR}/conkeror.png"
 
diff --git a/www-client/conkeror/files/conkeror-r2.sh b/www-client/conkeror/files/conkeror.sh
index 9b46d5bb0c07..9b46d5bb0c07 100644
--- a/www-client/conkeror/files/conkeror-r2.sh
+++ b/www-client/conkeror/files/conkeror.sh