From 057cf86b6862cba73763ea0121ceae53ce0daee2 Mon Sep 17 00:00:00 2001
From: blshkv <blshkv@pentoo.ch>
Date: Sat, 6 Jan 2018 10:48:35 +0800
Subject: [PATCH] firefox: move to v57 with all webext plugins

---
 .../base/package.accept_keywords/www-client   |  2 +
 www-plugins/foxyproxy/foxyproxy-6.2.ebuild    |  2 +-
 ...-r1.ebuild => hackplugins-meta-1.2.ebuild} | 11 ++---
 www-plugins/noscript/Manifest                 |  3 +-
 .../noscript/noscript-10.1.3c_p1.ebuild       | 40 -------------------
 www-plugins/noscript/noscript-10.1.6.2.ebuild | 20 ++++++++++
 www-plugins/noscript/noscript-5.1.7.ebuild    | 40 -------------------
 .../user-agent-switcher-revived-0.2.0.ebuild  |  2 +-
 .../wappalyzer/wappalyzer-5.3.2.ebuild        |  2 +-
 9 files changed, 32 insertions(+), 90 deletions(-)
 rename www-plugins/hackplugins-meta/{hackplugins-meta-1.1-r1.ebuild => hackplugins-meta-1.2.ebuild} (81%)
 delete mode 100644 www-plugins/noscript/noscript-10.1.3c_p1.ebuild
 create mode 100644 www-plugins/noscript/noscript-10.1.6.2.ebuild
 delete mode 100644 www-plugins/noscript/noscript-5.1.7.ebuild

diff --git a/profiles/pentoo/base/package.accept_keywords/www-client b/profiles/pentoo/base/package.accept_keywords/www-client
index 6d1eb9e96..4d532ad2a 100644
--- a/profiles/pentoo/base/package.accept_keywords/www-client
+++ b/profiles/pentoo/base/package.accept_keywords/www-client
@@ -1,2 +1,4 @@
 www-client/google-chrome
 www-plugins/google-talkplugin
+
+=www-client/firefox-bin-57.0*
diff --git a/www-plugins/foxyproxy/foxyproxy-6.2.ebuild b/www-plugins/foxyproxy/foxyproxy-6.2.ebuild
index ab6566c22..d5ca31eaf 100644
--- a/www-plugins/foxyproxy/foxyproxy-6.2.ebuild
+++ b/www-plugins/foxyproxy/foxyproxy-6.2.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="http://getfoxyproxy.org"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/www-plugins/hackplugins-meta/hackplugins-meta-1.1-r1.ebuild b/www-plugins/hackplugins-meta/hackplugins-meta-1.2.ebuild
similarity index 81%
rename from www-plugins/hackplugins-meta/hackplugins-meta-1.1-r1.ebuild
rename to www-plugins/hackplugins-meta/hackplugins-meta-1.2.ebuild
index 7552cade0..689cb292d 100644
--- a/www-plugins/hackplugins-meta/hackplugins-meta-1.1-r1.ebuild
+++ b/www-plugins/hackplugins-meta/hackplugins-meta-1.2.ebuild
@@ -13,15 +13,16 @@ IUSE="+firefox"
 
 PDEPEND="
 	firefox? (
-		www-plugins/firebug
 		www-plugins/foxyproxy
 		www-plugins/noscript
-		www-plugins/ringleader
-		www-plugins/sql-inject-me
-		www-plugins/user-agent-switcher
-		www-plugins/xss-me
+		www-plugins/user-agent-switcher-revived
+		www-plugins/wappalyzer
 		)"
 
+#	www-plugins/firebug
+#	www-plugins/ringleader
+#	www-plugins/sql-inject-me
+#	www-plugins/xss-me
 #	www-plugins/cookies_exportimport
 #	www-plugins/adblock_plus
 #	www-plugins/downthemall
diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest
index cdf59bcb7..2d92ca3ae 100644
--- a/www-plugins/noscript/Manifest
+++ b/www-plugins/noscript/Manifest
@@ -1,2 +1 @@
-DIST noscript-10.1.3c_p1.xpi 348469 SHA256 5066ffdf98c47b84dc78a85c04ab6fcb5756e6b081daf6ac5926bc0b5b0097e3 SHA512 659d4ed83113f79999f89556a03f03b46f084ce95c046fac04d2856052ce94b174427fb6143d3da729e7fd242a749a2635580fc63677c7d8e180d73292b26776 WHIRLPOOL 2ebfae1520206c2c47d9fc4510cd5a7e78cd43b27b54965f4df6d53db1b3bf10579b68d371f16d63828de699215e46b477dd8236ebf4f15f07cb9892a45132eb
-DIST noscript-5.1.7.xpi 777107 SHA256 617f73683acdca7df2a7d08843443d38929afbf40075e113ab3ccab0eef7cd6b SHA512 ac8e4d60c850f9d7828a9cbf0b019daeebe84187ecfb427c63f20c497ee2c480989b1342030d14f5fc03644865742f2df9ab143b607de1b4e5b692e7b8e64fdf WHIRLPOOL 4295b01c374c431e27047f171c66099c6466036cbdeb3e7571c167539ef2ccd61e0009ae42532bf7e8d09e021deb509f91b0be7a8a5e1a6178aa8568b02b6d50
+DIST noscript-10.1.6.2.xpi 369042 SHA256 657d8ebff32415adb1a2d72cd0f7db5dabe8a32900d7c2f911a840548d31d37b SHA512 02a7e87c7154c4698161a41b0e62820381ff83c68a9e44797c557afea525fcc03e801212565840d00f6763204ed0305dec35d4355f48db1e284481c1222711c6 WHIRLPOOL 488bd43d1d4164bdfd228900b79b01df65aa1a7c4110ae3cffbf6af9ba3f98d9970711c4c0fcb50ebf2bed6244445e9fdcd6aff4fa551dd41daa15126a981ba7
diff --git a/www-plugins/noscript/noscript-10.1.3c_p1.ebuild b/www-plugins/noscript/noscript-10.1.3c_p1.ebuild
deleted file mode 100644
index 5de28a3d9..000000000
--- a/www-plugins/noscript/noscript-10.1.3c_p1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mozilla-addon
-
-#https://services.addons.mozilla.org/en-US/firefox/api/1.5/addon/noscript
-#<install
-
-MOZ_FILEID="790773"
-DESCRIPTION="Allow active content in firefox to run only from trusted sites."
-HOMEPAGE="http://noscript.net"
-SRC_URI="https://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-#KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_seamonkey target_firefox-bin target_seamonkey-bin"
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( www-client/firefox )
-		target_firefox-bin? ( www-client/firefox-bin )
-		target_seamonkey? ( www-client/seamonkey )
-		target_seamonkey-bin? ( www-client/seamonkey-bin )
-	)"
-
-src_install() {
-	# symlink all possible target paths if this is set
-	if use symlink_all_targets; then
-		MZA_TARGETS="firefox seamonkey firefox-bin seamonkey-bin"
-	else
-		use target_firefox && MZA_TARGETS+=" firefox"
-		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-		use target_seamonkey && MZA_TARGETS+=" seamonkey"
-		use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
-	fi
-	mozilla-addon_src_install
-}
diff --git a/www-plugins/noscript/noscript-10.1.6.2.ebuild b/www-plugins/noscript/noscript-10.1.6.2.ebuild
new file mode 100644
index 000000000..e2b547972
--- /dev/null
+++ b/www-plugins/noscript/noscript-10.1.6.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+#https://services.addons.mozilla.org/en-US/firefox/api/1.5/addon/noscript
+#<install
+WEXT_FILEID="826047"
+#<guid>
+WEXT_GUID="{73a6fe31-595d-460b-a920-fcc0f8843232}"
+
+inherit mozilla-webext
+
+DESCRIPTION="Allow active content in firefox to run only from trusted sites."
+HOMEPAGE="http://noscript.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/www-plugins/noscript/noscript-5.1.7.ebuild b/www-plugins/noscript/noscript-5.1.7.ebuild
deleted file mode 100644
index 074c3ae98..000000000
--- a/www-plugins/noscript/noscript-5.1.7.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mozilla-addon
-
-#https://services.addons.mozilla.org/en-US/firefox/api/1.5/addon/noscript
-#<install
-
-MOZ_FILEID="777542"
-DESCRIPTION="Allow active content in firefox to run only from trusted sites."
-HOMEPAGE="http://noscript.net"
-SRC_URI="https://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_seamonkey target_firefox-bin target_seamonkey-bin"
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( www-client/firefox )
-		target_firefox-bin? ( www-client/firefox-bin )
-		target_seamonkey? ( www-client/seamonkey )
-		target_seamonkey-bin? ( www-client/seamonkey-bin )
-	)"
-
-src_install() {
-	# symlink all possible target paths if this is set
-	if use symlink_all_targets; then
-		MZA_TARGETS="firefox seamonkey firefox-bin seamonkey-bin"
-	else
-		use target_firefox && MZA_TARGETS+=" firefox"
-		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-		use target_seamonkey && MZA_TARGETS+=" seamonkey"
-		use target_seamonkey-bin && MZA_TARGETS+=" seamonkey-bin"
-	fi
-	mozilla-addon_src_install
-}
diff --git a/www-plugins/user-agent-switcher-revived/user-agent-switcher-revived-0.2.0.ebuild b/www-plugins/user-agent-switcher-revived/user-agent-switcher-revived-0.2.0.ebuild
index 5b0076318..f7b77bed6 100644
--- a/www-plugins/user-agent-switcher-revived/user-agent-switcher-revived-0.2.0.ebuild
+++ b/www-plugins/user-agent-switcher-revived/user-agent-switcher-revived-0.2.0.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="https://mybrowseraddon.com/useragent-switcher.html"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/www-plugins/wappalyzer/wappalyzer-5.3.2.ebuild b/www-plugins/wappalyzer/wappalyzer-5.3.2.ebuild
index c52d3bda1..d81cfa664 100644
--- a/www-plugins/wappalyzer/wappalyzer-5.3.2.ebuild
+++ b/www-plugins/wappalyzer/wappalyzer-5.3.2.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/AliasIO/Wappalyzer"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""