gentoo resync : 19.03.2019

5 files changed, 44 insertions, 7 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index d693a55c47ea..405aabc2d037 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,6 @@
 DIST qutebrowser-1.5.2.tar.gz 3566709 BLAKE2B 4b317c87770cbc817e19808f7e1ce58c030bb8567aba21bf23c6d57f136ab13763ef6b6cdf0c078428b7b228ef32b1156eb1ab125df037a5073c110f83df806d SHA512 29c48d86b95bf2b40459ef06dab37fff7e30409f78d8c50c494ebafc9698a0c0123a63d160679b3a4778ecb15e5c339dc67357a60f493499ad4b6443f7dacc7a
 DIST qutebrowser-1.6.0.tar.gz 3638739 BLAKE2B 8ca5995b9126fa7e017e3f2924c07c01b2d90540e0521d74cdba4ce8f2f83d1c7e8f0dc412ff41936c3a36c17d53060c331ed069d8088ac11b772979a48c7b0d SHA512 54b275f0d00ef48fa88a0bc83f31efd0d1fe708d7223adcf83c9d1a5db60de8e9c77033b8bf4b2b9a526d11ce39941d5d9da8afe9f49f3ed06e6f6f7ef124c20
-EBUILD qutebrowser-1.5.2-r1.ebuild 1980 BLAKE2B 7c1a7e42b25c95f5af08eca93ba8add13583bb19d5e3313c18497bc1313ec20b94065c9872de2ab8dc1e48bd780b53382acada68e431c57a61c2809add45400f SHA512 288c5a7aaf50dda6c03d27e90b7b959423a86850beec6af914b18ad24217b38bc38b88fdfa1b930eaf62307e267d50f5a6421319b113ecf1a69c7598341b6085
-EBUILD qutebrowser-1.6.0.ebuild 1980 BLAKE2B 7c1a7e42b25c95f5af08eca93ba8add13583bb19d5e3313c18497bc1313ec20b94065c9872de2ab8dc1e48bd780b53382acada68e431c57a61c2809add45400f SHA512 288c5a7aaf50dda6c03d27e90b7b959423a86850beec6af914b18ad24217b38bc38b88fdfa1b930eaf62307e267d50f5a6421319b113ecf1a69c7598341b6085
-EBUILD qutebrowser-9999.ebuild 1990 BLAKE2B 8e59aa1c902f5e23181bcc119a84fb97ece4c4e4d130a7086dff1a91bbe5a81a690c47c8157dd9b9465d06d7db62a7adbd024e7a1e7eceea2c723528c58ae122 SHA512 1808947ce58525271b7646f843808a3ceedd5efa666e318a473c0b364dfc53b3d0f0a1e4b996a238c6fc116d1b969dde6848b97c2b5b56b7da532d492d1aa098
-MISC metadata.xml 445 BLAKE2B 11eed2c826838fbdf314c3c1a070bf152fd440891896e5adf6614c29685a4a4c4f5bf46e767de31ef7fbe3ee057ae752f12cfa078c5dda41860cf41708844d2e SHA512 441a63c005894a6527b1521de85b2a26ba107c79fd0663521250808381fe2264972049d14585f153ba3a81d026d715f604382c40489da72398d9eb0fbfd5a6ed
+EBUILD qutebrowser-1.5.2-r1.ebuild 2351 BLAKE2B fd82c398f2b73f5e2bf8de90b64246bff82d95fd99c7e3d64baffd96f993f8d8e396bdc4f4b83aa3af07092e36500f4656d49907d36b99e5300423b46a6d31c8 SHA512 f974bea576fd4cec11e32767156e0a7607eefbf059b2bea6940396ff5b992a30f1bd3dc09ae1fb8c93101a5185e72981b53a9c978da54b9991c266514d291859
+EBUILD qutebrowser-1.6.0.ebuild 2351 BLAKE2B fd82c398f2b73f5e2bf8de90b64246bff82d95fd99c7e3d64baffd96f993f8d8e396bdc4f4b83aa3af07092e36500f4656d49907d36b99e5300423b46a6d31c8 SHA512 f974bea576fd4cec11e32767156e0a7607eefbf059b2bea6940396ff5b992a30f1bd3dc09ae1fb8c93101a5185e72981b53a9c978da54b9991c266514d291859
+EBUILD qutebrowser-9999.ebuild 2361 BLAKE2B f0c23ba8f6b6de7b4e334d6d10340a2827ebe3838954cf9a8ef57eb0347d9b884f7699b0786396499fa5b6bc9e0c71e54315bf8eb63fa1ed76a5953c03486e3c SHA512 53fcc1c90cb6225c271f6d03bf1ab2c0d4f1e83e4b63dd00b86f9a98cdc35e836c35fb06f2f7f06a6aa4c582dd5883a3ec3f6203ef8be8bce689471272ed1998
+MISC metadata.xml 589 BLAKE2B 40485aca150508671b8b7fd65567c25abb73617b1f9d0d981c6ec9579b563904fefe5828e819276bb2c6e2c19883574334ffce0be7b047ad182bf3cdcadb70ea SHA512 e042cd2ad99080de919fce9f26a09cd6b1dd779cf2d2c8c26f8b214845635efc90e96e41acc025875ad7f8473ef750638ce4bf2f1ac3eeca6f7f762a44062ec0
diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index 7623d04971cf..3c4b9436adf9 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -12,4 +12,8 @@
 	<upstream>
 		<remote-id type="github">qutebrowser/qutebrowser</remote-id>
 	</upstream>
+	<use>
+		<flag name="scripts">Installs userscripts from the misc/userscripts
+			directory to /usr/share/qutebrowser/userscripts.</flag>
+	</use>
 </pkgmetadata>
diff --git a/www-client/qutebrowser/qutebrowser-1.5.2-r1.ebuild b/www-client/qutebrowser/qutebrowser-1.5.2-r1.ebuild
index 9870584a71be..a464d065fdc3 100644
--- a/www-client/qutebrowser/qutebrowser-1.5.2-r1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.5.2-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowse
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="test"
+IUSE="scripts test"
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
@@ -55,6 +55,17 @@ python_install_all() {
 	domenu misc/${PN}.desktop
 	doicon -s scalable icons/${PN}.svg
 
+	if use scripts; then
+		# Install only those userscripts that have an explicit license header
+		exeinto /usr/share/qutebrowser/userscripts/
+		doexe misc/userscripts/dmenu_qutebrowser
+		doexe misc/userscripts/openfeeds
+		doexe misc/userscripts/qute-keepass
+		doexe misc/userscripts/qute-pass
+		doexe misc/userscripts/rss
+		doexe misc/userscripts/tor_identity
+	fi
+
 	distutils-r1_python_install_all
 }
 
diff --git a/www-client/qutebrowser/qutebrowser-1.6.0.ebuild b/www-client/qutebrowser/qutebrowser-1.6.0.ebuild
index 9870584a71be..a464d065fdc3 100644
--- a/www-client/qutebrowser/qutebrowser-1.6.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.6.0.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowse
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="test"
+IUSE="scripts test"
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
@@ -55,6 +55,17 @@ python_install_all() {
 	domenu misc/${PN}.desktop
 	doicon -s scalable icons/${PN}.svg
 
+	if use scripts; then
+		# Install only those userscripts that have an explicit license header
+		exeinto /usr/share/qutebrowser/userscripts/
+		doexe misc/userscripts/dmenu_qutebrowser
+		doexe misc/userscripts/openfeeds
+		doexe misc/userscripts/qute-keepass
+		doexe misc/userscripts/qute-pass
+		doexe misc/userscripts/rss
+		doexe misc/userscripts/tor_identity
+	fi
+
 	distutils-r1_python_install_all
 }
 
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild
index 106757922792..67471c02f629 100644
--- a/www-client/qutebrowser/qutebrowser-9999.ebuild
+++ b/www-client/qutebrowser/qutebrowser-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowse
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="test"
+IUSE="scripts test"
 
 COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 DEPEND="${COMMON_DEPEND}
@@ -55,6 +55,17 @@ python_install_all() {
 	domenu misc/org.${PN}.${PN}.desktop
 	doicon -s scalable icons/${PN}.svg
 
+	if use scripts; then
+		# Install only those userscripts that have an explicit license header
+		exeinto /usr/share/qutebrowser/userscripts/
+		doexe misc/userscripts/dmenu_qutebrowser
+		doexe misc/userscripts/openfeeds
+		doexe misc/userscripts/qute-keepass
+		doexe misc/userscripts/qute-pass
+		doexe misc/userscripts/rss
+		doexe misc/userscripts/tor_identity
+	fi
+
 	distutils-r1_python_install_all
 }