From 10ebfe9a43747580f651e6180ad1de5566eb7f14 Mon Sep 17 00:00:00 2001
From: jorgicio <jpizarrocallejas@gmail.com>
Date: Sat, 11 Apr 2020 00:15:47 -0400
Subject: [PATCH] Bumping, repoman and fix #230

---
 www-plugins/ublock-origin/Manifest            | 20 +---
 www-plugins/ublock-origin/metadata.xml        | 23 ++---
 .../ublock-origin/ublock-origin-1.22.2.ebuild | 95 -------------------
 .../ublock-origin/ublock-origin-1.22.4.ebuild | 95 -------------------
 .../ublock-origin/ublock-origin-1.23.0.ebuild | 95 -------------------
 .../ublock-origin/ublock-origin-1.24.0.ebuild | 95 -------------------
 .../ublock-origin/ublock-origin-1.24.2.ebuild | 95 -------------------
 .../ublock-origin/ublock-origin-1.25.2.ebuild | 33 ++++---
 ...2.0.ebuild => ublock-origin-1.26.0.ebuild} | 33 ++++---
 .../ublock-origin/ublock-origin-9999.ebuild   | 33 ++++---
 10 files changed, 83 insertions(+), 534 deletions(-)
 delete mode 100644 www-plugins/ublock-origin/ublock-origin-1.22.2.ebuild
 delete mode 100644 www-plugins/ublock-origin/ublock-origin-1.22.4.ebuild
 delete mode 100644 www-plugins/ublock-origin/ublock-origin-1.23.0.ebuild
 delete mode 100644 www-plugins/ublock-origin/ublock-origin-1.24.0.ebuild
 delete mode 100644 www-plugins/ublock-origin/ublock-origin-1.24.2.ebuild
 rename www-plugins/ublock-origin/{ublock-origin-1.22.0.ebuild => ublock-origin-1.26.0.ebuild} (79%)

diff --git a/www-plugins/ublock-origin/Manifest b/www-plugins/ublock-origin/Manifest
index fc269268..3dad6847 100644
--- a/www-plugins/ublock-origin/Manifest
+++ b/www-plugins/ublock-origin/Manifest
@@ -1,16 +1,6 @@
-DIST ublock-origin-1.22.0.tar.gz 14199299 BLAKE2B 3ad491757c5bdadca40deb0f2d843316340c835cf79e4ec7558dbd1a5ffc8db289cf1a4d2f1ca30efb986f3dcbab1bcc980b2d4e3ab124b064177587410c3627 SHA512 1d9e788e50b8e73d48ee2a63926c378f7e61052ac370ca646510c38945b18cde2992ebaf63a39a5dd1ce1ccd39f04b2f6698ff89629e4b2ed8180d1513407f9c
-DIST ublock-origin-1.22.2.tar.gz 14199120 BLAKE2B d6883ae632a0462301bdda4d0038067fc1daca069389aafdeab281fd3a5dacdae20eb2166d084bb591ffb1fe0c0726f6ed82e0d48d439d71c7cf1f8ef1ba5e3f SHA512 745fd04bff0422c8d011ef93d2c7f2ce08b4bf8c3e088a960fdc05a6daa7455990b7d217f56bcdf5cbbc34c452188b88e21ecf735364058623570e75d6506a56
-DIST ublock-origin-1.22.4.tar.gz 14199189 BLAKE2B 589cb21e9abcb871a2cec1f92abd9dd7b88b3cd5745f1f78b685ae251936a1206eb38a875c4d8e4c5cee1aaef25f5e4c4149770d95dd93059c94a3c10e9a94a4 SHA512 ba825fdbeeefe8dd3d7848a0070343ca307589c394cb89efa9682a812e11b357186e1fee3ce740023b6734fd554813a9055dc631133bf318ba0f95d59c4bcc59
-DIST ublock-origin-1.23.0.tar.gz 14180426 BLAKE2B 01197475f43ec430971f54fc9e80a88bbe2e23e7e765135efd96d828160b28f9303f5ae00435819deef9248170eb41efb1122bfa445f1c30b2cd61368f6bb450 SHA512 f9d584247dd2a965f840d4f1123a4f5a6a6dc3e49b26a006a1e17fd8883f2659d17363156336da76a7d528e47d931772a5b4d31ef57d65de87becc77d9c7faa4
-DIST ublock-origin-1.24.0.tar.gz 14191776 BLAKE2B 4bc4431d82389b87993cbd50b085fba33ae3347d8d8a0c4351c05c2644eb7c1a2e9cb943e1c1417aa89945ac984578de1f1937de106df41842a55755299c6418 SHA512 b9dfe8943b29f0299561a9b73b1e39fed88c2828229c9c63044657ae65550d0e834eb69af7587f6345a29e4b37c81cb1517504f6d7d38b9f33206b8ef7e7f44c
-DIST ublock-origin-1.24.2.tar.gz 14191858 BLAKE2B 0af772acd31d5d7f928b4c05520e6625d946f453ac561660535bbf055f5ba873bc58f7a726bd525a97d47e20255fa9af88bcbae245ca453568a0562a3a620de4 SHA512 21a6de38fdb6f61ef9d441228047ae94fbac27e7c6a80aa591872d274c4afb5c5e25ad217e019e9e236be8c357fc63029ab33659ee1a258d77923f1c3653a989
 DIST ublock-origin-1.25.2.tar.gz 14215551 BLAKE2B fe38ee8f80c70754e81f44d8577006b05872630ba519671585d4ac0dc620d02370911a6a53131e50dd3047dac9707f3a76b7b15a13ab52bb3a3a7b614ca93bd6 SHA512 893cb58be92887b55d63f31e231015cd7803a4d45492434255d9d1d17e9f8cc34abf9da5aafe82fc9004f665e1cb71b1d8df8b94e14342a5e2f9a4b969c8904e
-EBUILD ublock-origin-1.22.0.ebuild 2624 BLAKE2B f9c9987ddcf520715140ab1e2b5f52f399163f95c50c93df67d7694fb2988b9ad26372cb5a232fc662eb59de2121491b10a78d664e772314d6c20c56a0d42bde SHA512 da13825ff359abaecc2c311ae118d4ade1c5a021f9f8d135a0ab3e9da9b06948e4b7ab871ad7d5693d12866240e8f1e9e709c7217091509e77fd5e6a3bd83dc8
-EBUILD ublock-origin-1.22.2.ebuild 2624 BLAKE2B f9c9987ddcf520715140ab1e2b5f52f399163f95c50c93df67d7694fb2988b9ad26372cb5a232fc662eb59de2121491b10a78d664e772314d6c20c56a0d42bde SHA512 da13825ff359abaecc2c311ae118d4ade1c5a021f9f8d135a0ab3e9da9b06948e4b7ab871ad7d5693d12866240e8f1e9e709c7217091509e77fd5e6a3bd83dc8
-EBUILD ublock-origin-1.22.4.ebuild 2624 BLAKE2B f9c9987ddcf520715140ab1e2b5f52f399163f95c50c93df67d7694fb2988b9ad26372cb5a232fc662eb59de2121491b10a78d664e772314d6c20c56a0d42bde SHA512 da13825ff359abaecc2c311ae118d4ade1c5a021f9f8d135a0ab3e9da9b06948e4b7ab871ad7d5693d12866240e8f1e9e709c7217091509e77fd5e6a3bd83dc8
-EBUILD ublock-origin-1.23.0.ebuild 2624 BLAKE2B f9c9987ddcf520715140ab1e2b5f52f399163f95c50c93df67d7694fb2988b9ad26372cb5a232fc662eb59de2121491b10a78d664e772314d6c20c56a0d42bde SHA512 da13825ff359abaecc2c311ae118d4ade1c5a021f9f8d135a0ab3e9da9b06948e4b7ab871ad7d5693d12866240e8f1e9e709c7217091509e77fd5e6a3bd83dc8
-EBUILD ublock-origin-1.24.0.ebuild 2624 BLAKE2B f9c9987ddcf520715140ab1e2b5f52f399163f95c50c93df67d7694fb2988b9ad26372cb5a232fc662eb59de2121491b10a78d664e772314d6c20c56a0d42bde SHA512 da13825ff359abaecc2c311ae118d4ade1c5a021f9f8d135a0ab3e9da9b06948e4b7ab871ad7d5693d12866240e8f1e9e709c7217091509e77fd5e6a3bd83dc8
-EBUILD ublock-origin-1.24.2.ebuild 2624 BLAKE2B f9c9987ddcf520715140ab1e2b5f52f399163f95c50c93df67d7694fb2988b9ad26372cb5a232fc662eb59de2121491b10a78d664e772314d6c20c56a0d42bde SHA512 da13825ff359abaecc2c311ae118d4ade1c5a021f9f8d135a0ab3e9da9b06948e4b7ab871ad7d5693d12866240e8f1e9e709c7217091509e77fd5e6a3bd83dc8
-EBUILD ublock-origin-1.25.2.ebuild 2624 BLAKE2B 6720550ae651da29918a26ed204928abe195c494aa6b000d60187f075916c0b826dce713b24217392cea540a97b95a0d88e973a066895577c56479286d925815 SHA512 17f6d1e198284f110bfe89c66df9acac0ae555bbde61b67b260d7efe56b95b8038dc1ac4c0b855817255686e36faf349020315c8e078374d29f8de8db2fabd99
-EBUILD ublock-origin-9999.ebuild 2624 BLAKE2B 6720550ae651da29918a26ed204928abe195c494aa6b000d60187f075916c0b826dce713b24217392cea540a97b95a0d88e973a066895577c56479286d925815 SHA512 17f6d1e198284f110bfe89c66df9acac0ae555bbde61b67b260d7efe56b95b8038dc1ac4c0b855817255686e36faf349020315c8e078374d29f8de8db2fabd99
-MISC metadata.xml 707 BLAKE2B 5946f3c38144602c7152a2ceb29972ed8f3f791b9c15afc034870beec3a5cbcdc6c0178f96074a64603bbc6b8d17fcc61cf76558688ab59148033f0ce00bb54a SHA512 ff93d6aec575164ae75ac9ac9689656c94fa95a0e84fbc083c7966f2bf796789c9bb136408bd895cc626b37c13fda33cd6727a2befdab78cc3e1eb9cfd4cc4a9
+DIST ublock-origin-1.26.0.tar.gz 14225145 BLAKE2B 78bcc41b11df9532a18cdbcbba8ef0ed0ae7c14d2bcc4afc6da8de955a169b41958ac45a0244ddad4bb888a8911171b721dd7ec07150a247e3d778a086fbb1fe SHA512 05e487c8f0964783c8b2d51b58617add82307e87575a5276c81d2cf845721d0937b30db443146f98c5c46d1e3a3f27f14d5418a18e8f752cfbcc1cb1644b20c6
+EBUILD ublock-origin-1.25.2.ebuild 2775 BLAKE2B 169f7cf60e3ac224921c4f8ff76388dcc6006bb1b3289168d5ab4107a5deb22f3f750ef162793506755eb7500211bf85286795bbe14e5a5ba36e489b6298a958 SHA512 ef4494113dcbfc10490e792f37708652e9efaa8e2a62bac07a718a286c8dce34de5ef0d2c6eb1f02b94fc96c057c2c75b25befb15ebc277563282a796cb76ecd
+EBUILD ublock-origin-1.26.0.ebuild 2775 BLAKE2B 169f7cf60e3ac224921c4f8ff76388dcc6006bb1b3289168d5ab4107a5deb22f3f750ef162793506755eb7500211bf85286795bbe14e5a5ba36e489b6298a958 SHA512 ef4494113dcbfc10490e792f37708652e9efaa8e2a62bac07a718a286c8dce34de5ef0d2c6eb1f02b94fc96c057c2c75b25befb15ebc277563282a796cb76ecd
+EBUILD ublock-origin-9999.ebuild 2775 BLAKE2B 169f7cf60e3ac224921c4f8ff76388dcc6006bb1b3289168d5ab4107a5deb22f3f750ef162793506755eb7500211bf85286795bbe14e5a5ba36e489b6298a958 SHA512 ef4494113dcbfc10490e792f37708652e9efaa8e2a62bac07a718a286c8dce34de5ef0d2c6eb1f02b94fc96c057c2c75b25befb15ebc277563282a796cb76ecd
+MISC metadata.xml 845 BLAKE2B e7e02cdd17a123b361e116b9e6070fec1def2e0941bae771286e7d5700628c88ad1c39bd29efcc57445805872a1a03fd55c67a74fed2742e04a616887696aee8 SHA512 c0c29d9ae3382fb5fa2930dd776d4316f289cadb78ece4174a29647e9b9339482ada2c17a448e075d96b63fe6c7090ec735255026f0ed2d226113d8d0d9da010
diff --git a/www-plugins/ublock-origin/metadata.xml b/www-plugins/ublock-origin/metadata.xml
index a30e29e5..ce5e7e7a 100644
--- a/www-plugins/ublock-origin/metadata.xml
+++ b/www-plugins/ublock-origin/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jpizarrocallejas@gmail.com</email>
-		<name>Jorge Pizarro Callejas</name>
-		<description>Jorgicio Gentoo Overlay</description>
-	</maintainer>
-	<use>
-		<flag name="chromium">Install the extension for Chromium-based browsers (Chromium, Google Chrome, Opera, Vivaldi, etc.)</flag>
-		<flag name="firefox">Install the extension for Firefox-based browsers (Firefox, Seamonkey, etc.)</flag>
-		<flag name="opera">Install the extension for Opera browser</flag>
-		<flag name="thunderbird">Install the extension for Thunderbird</flag>
-	</use>
+    <maintainer type="person">
+        <email>jpizarrocallejas@gmail.com</email>
+        <name>Jorge Pizarro Callejas</name>
+        <description>Jorgicio Gentoo Overlay</description>
+    </maintainer>
+    <use>
+        <flag name="chromium">Install the extension for Chromium-based browsers (Chromium, Google Chrome, Opera, Vivaldi, etc.)</flag>
+        <flag name="firefox">Install the extension for Firefox-based browsers (Firefox, Seamonkey, etc.)</flag>
+        <flag name="firefox-bin">Install the extension binary version of Firefox</flag>
+        <flag name="opera">Install the extension for Opera browser</flag>
+    <flag name="thunderbird">Install the extension for Thunderbird</flag>
+    </use>
 </pkgmetadata>
diff --git a/www-plugins/ublock-origin/ublock-origin-1.22.2.ebuild b/www-plugins/ublock-origin/ublock-origin-1.22.2.ebuild
deleted file mode 100644
index 488fb104..00000000
--- a/www-plugins/ublock-origin/ublock-origin-1.22.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3
-
-MY_PN="uBlock"
-
-DESCRIPTION="An efficient blocker for Chromium and Firefox. Fast and lean."
-HOMEPAGE="https://github.com/gorhill/uBlock"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gorhill/${MY_PN}.git"
-else
-	MY_PV="${PV/_pre/b}"
-	MY_PV="${PV/_rc/rc}"
-	MY_P="${MY_PN}-${MY_PV}"
-	SRC_URI="https://github.com/gorhill/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="chromium firefox opera thunderbird"
-REQUIRED_USE="|| ( chromium firefox opera thunderbird )"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-DOCS=( MANIFESTO.md README.md )
-
-src_unpack(){
-	[[ ${PV} == 9999 ]] && git-r3_src_unpack || default_src_unpack
-	EGIT_REPO_URI="https://github.com/uBlockOrigin/uAssets.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/uAssets"
-	[[ ${PV} == 9999 ]] && EGIT_COMMIT_DATE=$(GIT_DIR="${S}/.git" git show -s --format=%ct || die)
-	git-r3_src_unpack
-}
-
-src_prepare(){
-	sed -r -i \
-		-e 's/(git.+clone.+)https.+/\1\.\.\/uAssets/' \
-		tools/make-assets.sh || die
-	default_src_prepare
-}
-
-src_compile() {
-	use chromium && ( tools/make-chromium.sh || die )
-	use firefox && ( tools/make-firefox.sh all || die )
-	use opera && ( tools/make-opera.sh || die )
-	use thunderbird && ( tools/make-thunderbird.sh all || die )
-	default_src_compile
-}
-
-src_install() {
-	if use chromium; then
-		insinto "/usr/share/chromium/extensions/${PN}"
-		doins -r dist/build/uBlock0.chromium/.
-	fi
-
-	if use firefox; then
-		insinto "/usr/$(get_libdir)/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-		newins dist/build/uBlock0.firefox.xpi uBlock0@raymondhill.net.xpi
-	fi
-
-	if use opera; then
-		insinto "/usr/$(get_libdir)/opera/extensions/${PN}"
-		doins -r dist/build/uBlock0.opera/.
-	fi
-
-	if use thunderbird; then
-		insinto "/usr/$(get_libdir)/thunderbird/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-		newins dist/build/uBlock0.thunderbird.xpi uBlock0@raymondhill.net.xpi
-	fi
-	einstalldocs
-}
-
-pkg_postinst(){
-	if use chromium; then
-		echo
-		elog "If you use Chromium/Chrome (or based), the extension is installed in"
-		elog "${EROOT}/usr/share/chromium/extensions/"
-		elog "To enable ${PN}, follow these steps:"
-		echo
-		elog "* Go to Chromium/Chrome extensions."
-		elog "* Click to check \"Developer mode\""
-		elog "* Click \"Load unpacked extension\""
-		elog "* In the file selector dialog, search the path mentioned above."
-		elog "* Click \"Open\""
-		echo
-		elog "Then the extension will be available in your browser."
-		echo
-	fi
-}
diff --git a/www-plugins/ublock-origin/ublock-origin-1.22.4.ebuild b/www-plugins/ublock-origin/ublock-origin-1.22.4.ebuild
deleted file mode 100644
index 488fb104..00000000
--- a/www-plugins/ublock-origin/ublock-origin-1.22.4.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3
-
-MY_PN="uBlock"
-
-DESCRIPTION="An efficient blocker for Chromium and Firefox. Fast and lean."
-HOMEPAGE="https://github.com/gorhill/uBlock"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gorhill/${MY_PN}.git"
-else
-	MY_PV="${PV/_pre/b}"
-	MY_PV="${PV/_rc/rc}"
-	MY_P="${MY_PN}-${MY_PV}"
-	SRC_URI="https://github.com/gorhill/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="chromium firefox opera thunderbird"
-REQUIRED_USE="|| ( chromium firefox opera thunderbird )"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-DOCS=( MANIFESTO.md README.md )
-
-src_unpack(){
-	[[ ${PV} == 9999 ]] && git-r3_src_unpack || default_src_unpack
-	EGIT_REPO_URI="https://github.com/uBlockOrigin/uAssets.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/uAssets"
-	[[ ${PV} == 9999 ]] && EGIT_COMMIT_DATE=$(GIT_DIR="${S}/.git" git show -s --format=%ct || die)
-	git-r3_src_unpack
-}
-
-src_prepare(){
-	sed -r -i \
-		-e 's/(git.+clone.+)https.+/\1\.\.\/uAssets/' \
-		tools/make-assets.sh || die
-	default_src_prepare
-}
-
-src_compile() {
-	use chromium && ( tools/make-chromium.sh || die )
-	use firefox && ( tools/make-firefox.sh all || die )
-	use opera && ( tools/make-opera.sh || die )
-	use thunderbird && ( tools/make-thunderbird.sh all || die )
-	default_src_compile
-}
-
-src_install() {
-	if use chromium; then
-		insinto "/usr/share/chromium/extensions/${PN}"
-		doins -r dist/build/uBlock0.chromium/.
-	fi
-
-	if use firefox; then
-		insinto "/usr/$(get_libdir)/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-		newins dist/build/uBlock0.firefox.xpi uBlock0@raymondhill.net.xpi
-	fi
-
-	if use opera; then
-		insinto "/usr/$(get_libdir)/opera/extensions/${PN}"
-		doins -r dist/build/uBlock0.opera/.
-	fi
-
-	if use thunderbird; then
-		insinto "/usr/$(get_libdir)/thunderbird/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-		newins dist/build/uBlock0.thunderbird.xpi uBlock0@raymondhill.net.xpi
-	fi
-	einstalldocs
-}
-
-pkg_postinst(){
-	if use chromium; then
-		echo
-		elog "If you use Chromium/Chrome (or based), the extension is installed in"
-		elog "${EROOT}/usr/share/chromium/extensions/"
-		elog "To enable ${PN}, follow these steps:"
-		echo
-		elog "* Go to Chromium/Chrome extensions."
-		elog "* Click to check \"Developer mode\""
-		elog "* Click \"Load unpacked extension\""
-		elog "* In the file selector dialog, search the path mentioned above."
-		elog "* Click \"Open\""
-		echo
-		elog "Then the extension will be available in your browser."
-		echo
-	fi
-}
diff --git a/www-plugins/ublock-origin/ublock-origin-1.23.0.ebuild b/www-plugins/ublock-origin/ublock-origin-1.23.0.ebuild
deleted file mode 100644
index 488fb104..00000000
--- a/www-plugins/ublock-origin/ublock-origin-1.23.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3
-
-MY_PN="uBlock"
-
-DESCRIPTION="An efficient blocker for Chromium and Firefox. Fast and lean."
-HOMEPAGE="https://github.com/gorhill/uBlock"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gorhill/${MY_PN}.git"
-else
-	MY_PV="${PV/_pre/b}"
-	MY_PV="${PV/_rc/rc}"
-	MY_P="${MY_PN}-${MY_PV}"
-	SRC_URI="https://github.com/gorhill/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="chromium firefox opera thunderbird"
-REQUIRED_USE="|| ( chromium firefox opera thunderbird )"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-DOCS=( MANIFESTO.md README.md )
-
-src_unpack(){
-	[[ ${PV} == 9999 ]] && git-r3_src_unpack || default_src_unpack
-	EGIT_REPO_URI="https://github.com/uBlockOrigin/uAssets.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/uAssets"
-	[[ ${PV} == 9999 ]] && EGIT_COMMIT_DATE=$(GIT_DIR="${S}/.git" git show -s --format=%ct || die)
-	git-r3_src_unpack
-}
-
-src_prepare(){
-	sed -r -i \
-		-e 's/(git.+clone.+)https.+/\1\.\.\/uAssets/' \
-		tools/make-assets.sh || die
-	default_src_prepare
-}
-
-src_compile() {
-	use chromium && ( tools/make-chromium.sh || die )
-	use firefox && ( tools/make-firefox.sh all || die )
-	use opera && ( tools/make-opera.sh || die )
-	use thunderbird && ( tools/make-thunderbird.sh all || die )
-	default_src_compile
-}
-
-src_install() {
-	if use chromium; then
-		insinto "/usr/share/chromium/extensions/${PN}"
-		doins -r dist/build/uBlock0.chromium/.
-	fi
-
-	if use firefox; then
-		insinto "/usr/$(get_libdir)/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-		newins dist/build/uBlock0.firefox.xpi uBlock0@raymondhill.net.xpi
-	fi
-
-	if use opera; then
-		insinto "/usr/$(get_libdir)/opera/extensions/${PN}"
-		doins -r dist/build/uBlock0.opera/.
-	fi
-
-	if use thunderbird; then
-		insinto "/usr/$(get_libdir)/thunderbird/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-		newins dist/build/uBlock0.thunderbird.xpi uBlock0@raymondhill.net.xpi
-	fi
-	einstalldocs
-}
-
-pkg_postinst(){
-	if use chromium; then
-		echo
-		elog "If you use Chromium/Chrome (or based), the extension is installed in"
-		elog "${EROOT}/usr/share/chromium/extensions/"
-		elog "To enable ${PN}, follow these steps:"
-		echo
-		elog "* Go to Chromium/Chrome extensions."
-		elog "* Click to check \"Developer mode\""
-		elog "* Click \"Load unpacked extension\""
-		elog "* In the file selector dialog, search the path mentioned above."
-		elog "* Click \"Open\""
-		echo
-		elog "Then the extension will be available in your browser."
-		echo
-	fi
-}
diff --git a/www-plugins/ublock-origin/ublock-origin-1.24.0.ebuild b/www-plugins/ublock-origin/ublock-origin-1.24.0.ebuild
deleted file mode 100644
index 488fb104..00000000
--- a/www-plugins/ublock-origin/ublock-origin-1.24.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3
-
-MY_PN="uBlock"
-
-DESCRIPTION="An efficient blocker for Chromium and Firefox. Fast and lean."
-HOMEPAGE="https://github.com/gorhill/uBlock"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gorhill/${MY_PN}.git"
-else
-	MY_PV="${PV/_pre/b}"
-	MY_PV="${PV/_rc/rc}"
-	MY_P="${MY_PN}-${MY_PV}"
-	SRC_URI="https://github.com/gorhill/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="chromium firefox opera thunderbird"
-REQUIRED_USE="|| ( chromium firefox opera thunderbird )"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-DOCS=( MANIFESTO.md README.md )
-
-src_unpack(){
-	[[ ${PV} == 9999 ]] && git-r3_src_unpack || default_src_unpack
-	EGIT_REPO_URI="https://github.com/uBlockOrigin/uAssets.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/uAssets"
-	[[ ${PV} == 9999 ]] && EGIT_COMMIT_DATE=$(GIT_DIR="${S}/.git" git show -s --format=%ct || die)
-	git-r3_src_unpack
-}
-
-src_prepare(){
-	sed -r -i \
-		-e 's/(git.+clone.+)https.+/\1\.\.\/uAssets/' \
-		tools/make-assets.sh || die
-	default_src_prepare
-}
-
-src_compile() {
-	use chromium && ( tools/make-chromium.sh || die )
-	use firefox && ( tools/make-firefox.sh all || die )
-	use opera && ( tools/make-opera.sh || die )
-	use thunderbird && ( tools/make-thunderbird.sh all || die )
-	default_src_compile
-}
-
-src_install() {
-	if use chromium; then
-		insinto "/usr/share/chromium/extensions/${PN}"
-		doins -r dist/build/uBlock0.chromium/.
-	fi
-
-	if use firefox; then
-		insinto "/usr/$(get_libdir)/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-		newins dist/build/uBlock0.firefox.xpi uBlock0@raymondhill.net.xpi
-	fi
-
-	if use opera; then
-		insinto "/usr/$(get_libdir)/opera/extensions/${PN}"
-		doins -r dist/build/uBlock0.opera/.
-	fi
-
-	if use thunderbird; then
-		insinto "/usr/$(get_libdir)/thunderbird/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-		newins dist/build/uBlock0.thunderbird.xpi uBlock0@raymondhill.net.xpi
-	fi
-	einstalldocs
-}
-
-pkg_postinst(){
-	if use chromium; then
-		echo
-		elog "If you use Chromium/Chrome (or based), the extension is installed in"
-		elog "${EROOT}/usr/share/chromium/extensions/"
-		elog "To enable ${PN}, follow these steps:"
-		echo
-		elog "* Go to Chromium/Chrome extensions."
-		elog "* Click to check \"Developer mode\""
-		elog "* Click \"Load unpacked extension\""
-		elog "* In the file selector dialog, search the path mentioned above."
-		elog "* Click \"Open\""
-		echo
-		elog "Then the extension will be available in your browser."
-		echo
-	fi
-}
diff --git a/www-plugins/ublock-origin/ublock-origin-1.24.2.ebuild b/www-plugins/ublock-origin/ublock-origin-1.24.2.ebuild
deleted file mode 100644
index 488fb104..00000000
--- a/www-plugins/ublock-origin/ublock-origin-1.24.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit git-r3
-
-MY_PN="uBlock"
-
-DESCRIPTION="An efficient blocker for Chromium and Firefox. Fast and lean."
-HOMEPAGE="https://github.com/gorhill/uBlock"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gorhill/${MY_PN}.git"
-else
-	MY_PV="${PV/_pre/b}"
-	MY_PV="${PV/_rc/rc}"
-	MY_P="${MY_PN}-${MY_PV}"
-	SRC_URI="https://github.com/gorhill/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="chromium firefox opera thunderbird"
-REQUIRED_USE="|| ( chromium firefox opera thunderbird )"
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-DOCS=( MANIFESTO.md README.md )
-
-src_unpack(){
-	[[ ${PV} == 9999 ]] && git-r3_src_unpack || default_src_unpack
-	EGIT_REPO_URI="https://github.com/uBlockOrigin/uAssets.git"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/uAssets"
-	[[ ${PV} == 9999 ]] && EGIT_COMMIT_DATE=$(GIT_DIR="${S}/.git" git show -s --format=%ct || die)
-	git-r3_src_unpack
-}
-
-src_prepare(){
-	sed -r -i \
-		-e 's/(git.+clone.+)https.+/\1\.\.\/uAssets/' \
-		tools/make-assets.sh || die
-	default_src_prepare
-}
-
-src_compile() {
-	use chromium && ( tools/make-chromium.sh || die )
-	use firefox && ( tools/make-firefox.sh all || die )
-	use opera && ( tools/make-opera.sh || die )
-	use thunderbird && ( tools/make-thunderbird.sh all || die )
-	default_src_compile
-}
-
-src_install() {
-	if use chromium; then
-		insinto "/usr/share/chromium/extensions/${PN}"
-		doins -r dist/build/uBlock0.chromium/.
-	fi
-
-	if use firefox; then
-		insinto "/usr/$(get_libdir)/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-		newins dist/build/uBlock0.firefox.xpi uBlock0@raymondhill.net.xpi
-	fi
-
-	if use opera; then
-		insinto "/usr/$(get_libdir)/opera/extensions/${PN}"
-		doins -r dist/build/uBlock0.opera/.
-	fi
-
-	if use thunderbird; then
-		insinto "/usr/$(get_libdir)/thunderbird/extensions/{3550f703-e582-4d05-9a08-453d09bdfdc6}"
-		newins dist/build/uBlock0.thunderbird.xpi uBlock0@raymondhill.net.xpi
-	fi
-	einstalldocs
-}
-
-pkg_postinst(){
-	if use chromium; then
-		echo
-		elog "If you use Chromium/Chrome (or based), the extension is installed in"
-		elog "${EROOT}/usr/share/chromium/extensions/"
-		elog "To enable ${PN}, follow these steps:"
-		echo
-		elog "* Go to Chromium/Chrome extensions."
-		elog "* Click to check \"Developer mode\""
-		elog "* Click \"Load unpacked extension\""
-		elog "* In the file selector dialog, search the path mentioned above."
-		elog "* Click \"Open\""
-		echo
-		elog "Then the extension will be available in your browser."
-		echo
-	fi
-}
diff --git a/www-plugins/ublock-origin/ublock-origin-1.25.2.ebuild b/www-plugins/ublock-origin/ublock-origin-1.25.2.ebuild
index 91e1af74..bd4b6cbe 100644
--- a/www-plugins/ublock-origin/ublock-origin-1.25.2.ebuild
+++ b/www-plugins/ublock-origin/ublock-origin-1.25.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,10 +23,8 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="chromium firefox opera thunderbird"
-REQUIRED_USE="|| ( chromium firefox opera thunderbird )"
-RDEPEND=""
-DEPEND="${RDEPEND}"
+IUSE="chromium firefox firefox-bin opera thunderbird"
+REQUIRED_USE="|| ( chromium firefox firefox-bin opera thunderbird )"
 
 DOCS=( MANIFESTO.md README.md )
 
@@ -42,15 +40,23 @@ src_prepare(){
 	sed -r -i \
 		-e 's/(git.+clone.+)https.+/\1\.\.\/uAssets/' \
 		tools/make-assets.sh || die
-	default_src_prepare
+	default
 }
 
 src_compile() {
-	use chromium && ( tools/make-chromium.sh || die )
-	use firefox && ( tools/make-firefox.sh all || die )
-	use opera && ( tools/make-opera.sh || die )
-	use thunderbird && ( tools/make-thunderbird.sh all || die )
-	default_src_compile
+	if use chromium; then
+		tools/make-chromium.sh || die
+	fi
+	if use firefox || use firefox-bin; then
+		tools/make-firefox.sh all || die
+	fi
+	if use opera; then
+		tools/make-opera.sh || die
+	fi
+	if use thunderbird; then
+		tools/make-thunderbird.sh all || die
+	fi
+	default
 }
 
 src_install() {
@@ -64,6 +70,11 @@ src_install() {
 		newins dist/build/uBlock0.firefox.xpi uBlock0@raymondhill.net.xpi
 	fi
 
+	if use firefox-bin; then
+		insinto "/opt/firefox/extensions/"
+		newins dist/build/uBlock0.firefox.xpi uBlock0@raymondhill.net.xpi
+	fi
+
 	if use opera; then
 		insinto "/usr/$(get_libdir)/opera/extensions/${PN}"
 		doins -r dist/build/uBlock0.opera/.
diff --git a/www-plugins/ublock-origin/ublock-origin-1.22.0.ebuild b/www-plugins/ublock-origin/ublock-origin-1.26.0.ebuild
similarity index 79%
rename from www-plugins/ublock-origin/ublock-origin-1.22.0.ebuild
rename to www-plugins/ublock-origin/ublock-origin-1.26.0.ebuild
index 488fb104..bd4b6cbe 100644
--- a/www-plugins/ublock-origin/ublock-origin-1.22.0.ebuild
+++ b/www-plugins/ublock-origin/ublock-origin-1.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,10 +23,8 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="chromium firefox opera thunderbird"
-REQUIRED_USE="|| ( chromium firefox opera thunderbird )"
-RDEPEND=""
-DEPEND="${RDEPEND}"
+IUSE="chromium firefox firefox-bin opera thunderbird"
+REQUIRED_USE="|| ( chromium firefox firefox-bin opera thunderbird )"
 
 DOCS=( MANIFESTO.md README.md )
 
@@ -42,15 +40,23 @@ src_prepare(){
 	sed -r -i \
 		-e 's/(git.+clone.+)https.+/\1\.\.\/uAssets/' \
 		tools/make-assets.sh || die
-	default_src_prepare
+	default
 }
 
 src_compile() {
-	use chromium && ( tools/make-chromium.sh || die )
-	use firefox && ( tools/make-firefox.sh all || die )
-	use opera && ( tools/make-opera.sh || die )
-	use thunderbird && ( tools/make-thunderbird.sh all || die )
-	default_src_compile
+	if use chromium; then
+		tools/make-chromium.sh || die
+	fi
+	if use firefox || use firefox-bin; then
+		tools/make-firefox.sh all || die
+	fi
+	if use opera; then
+		tools/make-opera.sh || die
+	fi
+	if use thunderbird; then
+		tools/make-thunderbird.sh all || die
+	fi
+	default
 }
 
 src_install() {
@@ -64,6 +70,11 @@ src_install() {
 		newins dist/build/uBlock0.firefox.xpi uBlock0@raymondhill.net.xpi
 	fi
 
+	if use firefox-bin; then
+		insinto "/opt/firefox/extensions/"
+		newins dist/build/uBlock0.firefox.xpi uBlock0@raymondhill.net.xpi
+	fi
+
 	if use opera; then
 		insinto "/usr/$(get_libdir)/opera/extensions/${PN}"
 		doins -r dist/build/uBlock0.opera/.
diff --git a/www-plugins/ublock-origin/ublock-origin-9999.ebuild b/www-plugins/ublock-origin/ublock-origin-9999.ebuild
index 91e1af74..bd4b6cbe 100644
--- a/www-plugins/ublock-origin/ublock-origin-9999.ebuild
+++ b/www-plugins/ublock-origin/ublock-origin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,10 +23,8 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="chromium firefox opera thunderbird"
-REQUIRED_USE="|| ( chromium firefox opera thunderbird )"
-RDEPEND=""
-DEPEND="${RDEPEND}"
+IUSE="chromium firefox firefox-bin opera thunderbird"
+REQUIRED_USE="|| ( chromium firefox firefox-bin opera thunderbird )"
 
 DOCS=( MANIFESTO.md README.md )
 
@@ -42,15 +40,23 @@ src_prepare(){
 	sed -r -i \
 		-e 's/(git.+clone.+)https.+/\1\.\.\/uAssets/' \
 		tools/make-assets.sh || die
-	default_src_prepare
+	default
 }
 
 src_compile() {
-	use chromium && ( tools/make-chromium.sh || die )
-	use firefox && ( tools/make-firefox.sh all || die )
-	use opera && ( tools/make-opera.sh || die )
-	use thunderbird && ( tools/make-thunderbird.sh all || die )
-	default_src_compile
+	if use chromium; then
+		tools/make-chromium.sh || die
+	fi
+	if use firefox || use firefox-bin; then
+		tools/make-firefox.sh all || die
+	fi
+	if use opera; then
+		tools/make-opera.sh || die
+	fi
+	if use thunderbird; then
+		tools/make-thunderbird.sh all || die
+	fi
+	default
 }
 
 src_install() {
@@ -64,6 +70,11 @@ src_install() {
 		newins dist/build/uBlock0.firefox.xpi uBlock0@raymondhill.net.xpi
 	fi
 
+	if use firefox-bin; then
+		insinto "/opt/firefox/extensions/"
+		newins dist/build/uBlock0.firefox.xpi uBlock0@raymondhill.net.xpi
+	fi
+
 	if use opera; then
 		insinto "/usr/$(get_libdir)/opera/extensions/${PN}"
 		doins -r dist/build/uBlock0.opera/.