gentoo Easter resync : 12.04.2020

4 files changed, 58 insertions, 23 deletions

diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index 16f0ada492f7..0dc987c9bd5f 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1,8 +1,8 @@
 DIST youtube-viewer-3.5.5.tar.gz 238922 BLAKE2B 8e5b57f5e83ce53b3249e948e141042a4dff019e201718c5a75d5577a349707add5f2d4a6e5a53ff4968394b0b54df43bdee4933e9d4fe9ef62b6ed489a54678 SHA512 6e73565e7b8ba415e0f056a402804510af2d2d3e833daf3254330f75b404a21042318441d52b9b7ecb6659a693189c43a9b9148be4d3e154d4a1d23b402e8a63
-DIST youtube-viewer-3.5.8.tar.gz 239590 BLAKE2B 7230518b87f77d153820ba8c60af8e017cbc7e5f65d96597673f5c9500f5116a63aac28f385eac92a0df9e7f36ea7c3af8c4efa5b1ad55ae66afdb03abad95d7 SHA512 1d657c08ccf4fc4d79408e2020fda1f9187ffc1b6faea5524b4190627b46d22336b8faff22330882507ac81e3717344fdef614ea57717c1face1807a835ef746
 DIST youtube-viewer-3.5.9.tar.gz 236095 BLAKE2B b98cfbca26da99f148d3afe0a4f7a4478abaf7c9f9727b421b7718004950e8bee52f58fe08e30b7ccfcd44bdc3ba3f7f75a5a5450581c3f2a9badaeac0fcb5f4 SHA512 2fe06feacbb0240606197b982aa097272d1d615e83a15d686da96fe336a5e85c71dccc046faaa106d85b1012a6b169ff39434b72b2033b2c8d301616c085eae1
+DIST youtube-viewer-3.7.4.tar.gz 281921 BLAKE2B dac2cbf76f3d0939f79fa875652680e197f41bf09769585894147dfe433db72a94d59309237f5ce5398753a39e2cf2cf83ae3f4f6987f5a4b49d806de2598e2c SHA512 4584821fb0ae3ec7e5f9c3b2e887b1fa158fb74a82be07698277e12d3762fd3b8f0557baddb9e08fe485f322b44b91adc2feaaba46227e0c519a516b54bbc4e8
 EBUILD youtube-viewer-3.5.5.ebuild 2077 BLAKE2B aeccdf3f4c52ef9c7c1d87fcf73abbaae60ed073379e8d49296555cefa04a8a4a35377a5813701de4434473efd9b7f93122b4432aab38f713b5840a16c28533e SHA512 e643fd7e4b39e992619b4c16acc4fbd23ff5227348a3d0379a67cb4608164c7115bcd5737db3e3be4075182ed963aa646e194715ea19162ad3698a4701e55181
-EBUILD youtube-viewer-3.5.8-r1.ebuild 2126 BLAKE2B b4cdfcdf7e1ba4e9764c49d417b4109767254a3c848abe9580231b168a0232e72900d776178b90a487ecfe36aee7713e5f8c1ca5c5ca964aa2594335cacc34d8 SHA512 132f0f0cfb73393428e79a86b95a4109c1dec252ec2d6c67c7d58318d90595fdb08c86a105464f0d8ed9f620142840fda1090179ed05e83c6cb19a7b87e2abd8
 EBUILD youtube-viewer-3.5.9.ebuild 2126 BLAKE2B b4cdfcdf7e1ba4e9764c49d417b4109767254a3c848abe9580231b168a0232e72900d776178b90a487ecfe36aee7713e5f8c1ca5c5ca964aa2594335cacc34d8 SHA512 132f0f0cfb73393428e79a86b95a4109c1dec252ec2d6c67c7d58318d90595fdb08c86a105464f0d8ed9f620142840fda1090179ed05e83c6cb19a7b87e2abd8
-EBUILD youtube-viewer-9999.ebuild 2066 BLAKE2B 2e4b124f1665cf74802d26c2846bada76df74c1ec3c924209b5337317f54eec6966e91938813d07dc3a19b1fe175da51744a10ea1647a879d332865bece9c325 SHA512 020de8cd2fe7a25980841da52c21deab563bebd1e40f5135b8cac247dff88f55d5ddb1736ed75d631c82b171f2bdc1482040b5b723e5c4ffdfe32f6a0ff70b4a
-MISC metadata.xml 1001 BLAKE2B ea9aae31db72d91c37e3f37b672404262ad303a26461df31c78d4a45050ac27c46e9ed18b160eb96f34d15b08bd6250139ed2960834b0aa93923c2651bd19e58 SHA512 2136df64736fa79cae9cda680d3412ff700c03b943c19184a0d1c94d51f161b34eddefee88468ef63a99e87a553973caeb1241226fbac13eabb5462990d98fd6
+EBUILD youtube-viewer-3.7.4-r1.ebuild 2496 BLAKE2B 9d5b79820a27b95a922b8d93a9586475c097d8c064c7e5cce9bb817de098d2401b9b9674c85d13f59a4625afe809de39f7f9219b6680bbb4f6a983472349d369 SHA512 d75a19b8022f7184cedf6b7cdd022c68f316623420203d646ba26b4b57a50aa1acb488f4d24cd66ecdebc65973b5d601a124656b96fa5377258c2df852e33b27
+EBUILD youtube-viewer-9999.ebuild 2363 BLAKE2B 00362cde6040f2920a56ebb920714da4e28b5ef1425ffc4b5bf8eb920bed98d46822c22e5e1ef37ed37d8cf83fb5b333d6adca9cd7d0a51368697523d56a477b SHA512 47ae6a92016a1d61780fcb5c6f6b638f9ba19ad26ac5939e940e6fa3d8fd0ec3a23ae13ff28c9d2b3f02748e063072a8f8053cd65fbbe2ae6f6050cb201663d5
+MISC metadata.xml 1231 BLAKE2B 691c72ae1d2c9a73fbdbd449718ae6f14ce65ef95b997923c2a14cca565c5f2e7f85094ef4a68806615239f7ac16b08bc24ecc857e1f05f86d0d7f3920e67e0f SHA512 65289c8a1802c76de4d360682bba3b8ecd6c541797bcb33d18f237aaaf86a1d715749fd7b2d668a108803fb9e33ad49e5a7691ea0e3a4f081a6b99a7cab32e4e
diff --git a/net-misc/youtube-viewer/metadata.xml b/net-misc/youtube-viewer/metadata.xml
index 7f054f58d41f..8b79660b6222 100644
--- a/net-misc/youtube-viewer/metadata.xml
+++ b/net-misc/youtube-viewer/metadata.xml
@@ -18,7 +18,9 @@
 		<remote-id type="github">trizen/youtube-viewer</remote-id>
 	</upstream>
 	<use>
-		<flag name="gtk">Install the gtk GUI, called gtk-youtube-viewer</flag>
+		<flag name="gtk" restrict='&lt;net-misc/youtube-viewer-3.7.0'>Install the gtk2 GUI</flag>
+		<flag name="gtk" restrict='&gt;=net-misc/youtube-viewer-3.7.0'>Install the gtk3 GUI</flag>
+		<flag name="gtk2" restrict='&gt;=net-misc/youtube-viewer-3.7.0'>Use the old gtk2 GUI instead of the gtk3 one</flag>
 	</use>
 	<longdescription lang="en">
 		Youtube Viewer is a CLI application dedicated for searching and
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.5.8-r1.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.7.4-r1.ebuild
index 676951a81313..90be18b8c75b 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.5.8-r1.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.7.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,9 @@ SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.t
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
+IUSE="gtk gtk2"
+
+REQUIRED_USE="gtk2? ( gtk )"
 
 RDEPEND="
 	dev-perl/Data-Dump
@@ -30,27 +32,37 @@ RDEPEND="
 	virtual/perl-Text-ParseWords
 	virtual/perl-Text-Tabs+Wrap
 	gtk? (
+		gtk2? (
+			>=dev-perl/Gtk2-1.244.0
+		)
+		!gtk2? (
+			dev-perl/Gtk3
+		)
 		dev-perl/File-ShareDir
-		>=dev-perl/Gtk2-1.244.0
 		virtual/freedesktop-icon-theme
 		x11-libs/gdk-pixbuf:2[X,jpeg]
 	)
-	|| ( media-video/ffmpeg[openssl,-libressl] media-video/ffmpeg[-openssl,libressl] media-video/ffmpeg[gnutls] )
+	|| ( >=media-video/ffmpeg-4.1.3[openssl,-libressl] >=media-video/ffmpeg-4.1.3[-openssl,libressl] >=media-video/ffmpeg-4.1.3[gnutls] )
 	|| ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )"
 DEPEND="dev-perl/Module-Build"
 
 src_configure() {
 	local myconf
-	if use gtk ; then
-		myconf="--gtk-youtube-viewer"
+	if use gtk; then
+		if use gtk2; then
+			myconf="--gtk2"
+		else
+			myconf="--gtk3"
+		fi
 	fi
+
 	perl-module_src_configure
 }
 
 src_install() {
 	perl-module_src_install
 
-	if use gtk ; then
+	if use gtk; then
 		domenu share/gtk-youtube-viewer.desktop
 		doicon share/icons/gtk-youtube-viewer.png
 	fi
@@ -68,6 +80,10 @@ pkg_postinst() {
 	elog
 	elog "Check the configuration file in ~/.config/youtube-viewer/"
 	elog "and configure your video player backend."
+	elog
+	ewarn "Starting with version 3.7.4, youtube-viewer requires the user to"
+	ewarn "get their own API key to function. Please refer to README.md or"
+	ewarn "https://github.com/trizen/youtube-viewer#logging-in for details!"
 }
 
 pkg_postrm() {
diff --git a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
index 42baf31b22b6..8ee6e65d0d11 100644
--- a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils eutils perl-module git-r3
+inherit desktop eutils perl-module git-r3 xdg-utils
 
 DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
 HOMEPAGE="https://trizenx.blogspot.com/2012/03/gtk-youtube-viewer.html"
@@ -13,8 +13,15 @@ EGIT_REPO_URI="https://github.com/trizen/${PN}.git"
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
 KEYWORDS=""
-IUSE="gtk"
+IUSE="gtk gtk2"
 
+REQUIRED_USE="gtk2? ( gtk )"
+
+GTK_COMMON_DEPS="
+	dev-perl/File-ShareDir
+	virtual/freedesktop-icon-theme
+	x11-libs/gdk-pixbuf:2[X,jpeg]
+"
 RDEPEND="
 	dev-perl/Data-Dump
 	dev-perl/JSON
@@ -31,12 +38,17 @@ RDEPEND="
 	virtual/perl-Text-ParseWords
 	virtual/perl-Text-Tabs+Wrap
 	gtk? (
+		gtk2? (
+			>=dev-perl/Gtk2-1.244.0
+		)
+		!gtk2? (
+			dev-perl/Gtk3
+		)
 		dev-perl/File-ShareDir
-		>=dev-perl/Gtk2-1.244.0
 		virtual/freedesktop-icon-theme
 		x11-libs/gdk-pixbuf:2[X,jpeg]
 	)
-	|| ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] )
+	|| ( >=media-video/ffmpeg-4.1.3[openssl,-libressl] >=media-video/ffmpeg-4.1.3[-openssl,libressl] >=media-video/ffmpeg-4.1.3[gnutls] )
 	|| ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )"
 DEPEND="dev-perl/Module-Build"
 
@@ -44,23 +56,28 @@ SRC_TEST="do"
 
 src_configure() {
 	local myconf
-	if use gtk ; then
-		myconf="--gtk-youtube-viewer"
+	if use gtk; then
+		if use gtk2; then
+			myconf="--gtk2"
+		else
+			myconf="--gtk3"
+		fi
 	fi
+
 	perl-module_src_configure
 }
 
 src_install() {
 	perl-module_src_install
 
-	if use gtk ; then
+	if use gtk; then
 		domenu share/gtk-youtube-viewer.desktop
 		doicon share/icons/gtk-youtube-viewer.png
 	fi
 }
 
 pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
+	use gtk && xdg_icon_cache_update
 	elog "Optional dependencies:"
 	optfeature "cache support" dev-perl/LWP-UserAgent-Cached
 	optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS
@@ -74,5 +91,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
+	use gtk && xdg_icon_cache_update
 }