gentoo resync : 18.08.2019

4 files changed, 16 insertions, 26 deletions

diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index ffd3435d4eba..f610218dc397 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1,8 +1,8 @@
 DIST youtube-viewer-3.3.3.tar.gz 232856 BLAKE2B 68f3529edeaeb443203f1c6bf4a9967346a5015d05d40ffeca65a1deeacb73cb9bd7fbc79ed2c70f161c82a03df8461b3d39b071ccbe480b10d4259eba08d430 SHA512 ca624c456d33aa804398f71f1dd4a095f7b9ca5ae5a1cb255b9e8a3dea671a8b0f986977428e797f1fc1f96d69087a66c71185e37cc521d668c036c4e7a5825f
-DIST youtube-viewer-3.3.4.tar.gz 232892 BLAKE2B d39d6406a664ea911ee6db76311b6526c5a962a10be45222613a54f5b11a34c81681389f9e6c9569076161444212a75d0a1053a2939b899a4935f391cc100300 SHA512 fc8a1c7ebda5efc7d1e32b211c3fe301e84db393fd6be06c026dd12903ad7a3dea7bc5b24e3125d55e0b56140a2d0fb2bf2ce001d3cde7792b8e4a3590496c7e
 DIST youtube-viewer-3.5.4.tar.gz 237736 BLAKE2B 900cd48025d28a1077f909a740d94824c07cc9d0c0fb0954c16fc79dd5bb7db53431fdadf4fca2ebb89b3fabc61801bd64bf8f042bbd70d53f1616d9fd74fcbd SHA512 60da8bd6017eeedb299ac5b226fc3094823a5dab8db938b603f4630724590dae5acc03c6ad609b8b3f3b0f2149bb37398d018893da7b2fde762f9f795bdaf618
+DIST youtube-viewer-3.5.5.tar.gz 238922 BLAKE2B 8e5b57f5e83ce53b3249e948e141042a4dff019e201718c5a75d5577a349707add5f2d4a6e5a53ff4968394b0b54df43bdee4933e9d4fe9ef62b6ed489a54678 SHA512 6e73565e7b8ba415e0f056a402804510af2d2d3e833daf3254330f75b404a21042318441d52b9b7ecb6659a693189c43a9b9148be4d3e154d4a1d23b402e8a63
 EBUILD youtube-viewer-3.3.3.ebuild 2025 BLAKE2B 390f88f32c0c4bfaca84c8265ac73dc1b712868b481d949f15f0c96bd83b780e42039d2d422faaaeeea557c5794164abe40694d4dd74c36e9e2519ef42661933 SHA512 2fa5e47ed3c5dca68f1176c26a468862c4e9f31782a8dc7328aca3754791114fb0f4090cd4936468c8b04f485919701eaa6c4a56301866dc7ddbe6eb97a0f726
-EBUILD youtube-viewer-3.3.4.ebuild 2027 BLAKE2B d090963e37b0a6198e6aaea0c358c860b36c59c8201cef648c42acb59d970aa28283eb63d1dc1173be74624e7161d4a284f0a2757416bce826a1cd68ba9c47a1 SHA512 a62061be86dfe9a526790673f3c47ce60146537956cbc2d1f1b0c64cdfec6954044662d770ac74ad8e3b8245f4da9e6c194d5175631a81e82deb89494f2f97b8
-EBUILD youtube-viewer-3.5.4.ebuild 2079 BLAKE2B 7757729231aff1136e15af651df558b62f015d0da273111ead2085461e52b65e3f5fb70df8fe132231ae4f1e80d99ac48e5f64191d9695c85985b58b23d16648 SHA512 72ac6fe280939c42eeaf44c6e2d2827db79eda151d88dd212ac6d378f70607e1e816e74429acd2d241a967fbb9d4e2376b3706965df8bb5bfda471a02d976d5c
-EBUILD youtube-viewer-9999.ebuild 2252 BLAKE2B 5cb27656f5f6ff899760f9f200ea3ddaae1f3a721bbeff90b8b7c3fe4b0c38f09b2ce7cc9be2a19cbd7b41c03d54426cc1e2e1d62dab1038d866b27e876e6875 SHA512 15f2acb1b4346ada4d71913569ef91852657ac52861ff89b6b7952903ef20c6a9bcb438f89a024aaab030c9e0a4820c2f0cab08a7ce4fbe92884a5d3e4044f04
+EBUILD youtube-viewer-3.5.4.ebuild 2077 BLAKE2B aeccdf3f4c52ef9c7c1d87fcf73abbaae60ed073379e8d49296555cefa04a8a4a35377a5813701de4434473efd9b7f93122b4432aab38f713b5840a16c28533e SHA512 e643fd7e4b39e992619b4c16acc4fbd23ff5227348a3d0379a67cb4608164c7115bcd5737db3e3be4075182ed963aa646e194715ea19162ad3698a4701e55181
+EBUILD youtube-viewer-3.5.5.ebuild 2079 BLAKE2B 7757729231aff1136e15af651df558b62f015d0da273111ead2085461e52b65e3f5fb70df8fe132231ae4f1e80d99ac48e5f64191d9695c85985b58b23d16648 SHA512 72ac6fe280939c42eeaf44c6e2d2827db79eda151d88dd212ac6d378f70607e1e816e74429acd2d241a967fbb9d4e2376b3706965df8bb5bfda471a02d976d5c
+EBUILD youtube-viewer-9999.ebuild 2066 BLAKE2B 2e4b124f1665cf74802d26c2846bada76df74c1ec3c924209b5337317f54eec6966e91938813d07dc3a19b1fe175da51744a10ea1647a879d332865bece9c325 SHA512 020de8cd2fe7a25980841da52c21deab563bebd1e40f5135b8cac247dff88f55d5ddb1736ed75d631c82b171f2bdc1482040b5b723e5c4ffdfe32f6a0ff70b4a
 MISC metadata.xml 1001 BLAKE2B ea9aae31db72d91c37e3f37b672404262ad303a26461df31c78d4a45050ac27c46e9ed18b160eb96f34d15b08bd6250139ed2960834b0aa93923c2651bd19e58 SHA512 2136df64736fa79cae9cda680d3412ff700c03b943c19184a0d1c94d51f161b34eddefee88468ef63a99e87a553973caeb1241226fbac13eabb5462990d98fd6
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.5.4.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.5.4.ebuild
index b41e4a52107c..c3fb66845352 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.5.4.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.3.4.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.5.5.ebuild
index 0a797691ff7f..b41e4a52107c 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.3.4.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -63,6 +63,7 @@ pkg_postinst() {
 	optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS
 	optfeature "the case if there are SSL problems" dev-perl/Mozilla-CA
 	optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth
+	optfeature "live streams support" net-misc/youtube-dl
 	optfeature "threads support" virtual/perl-threads
 	elog
 	elog "Check the configuration file in ~/.config/youtube-viewer/"
diff --git a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
index 94ebef6a27a5..42baf31b22b6 100644
--- a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,12 +16,11 @@ KEYWORDS=""
 IUSE="gtk"
 
 RDEPEND="
-	>=dev-lang/perl-5.16.0
 	dev-perl/Data-Dump
 	dev-perl/JSON
 	dev-perl/libwww-perl[ssl]
 	dev-perl/Term-ReadLine-Gnu
-	media-video/ffmpeg[openssl]
+	dev-perl/LWP-Protocol-https
 	virtual/perl-Encode
 	virtual/perl-File-Path
 	virtual/perl-File-Spec
@@ -37,26 +36,21 @@ RDEPEND="
 		virtual/freedesktop-icon-theme
 		x11-libs/gdk-pixbuf:2[X,jpeg]
 	)
-	|| ( media-video/mpv media-video/mplayer media-video/smplayer media-video/vlc )"
+	|| ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] )
+	|| ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )"
 DEPEND="dev-perl/Module-Build"
 
 SRC_TEST="do"
 
-src_prepare() {
-	perl-module_src_prepare
-}
-
-# build system installs files on "perl Build.PL" too
-# do all the work in src_install
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
+src_configure() {
 	local myconf
 	if use gtk ; then
 		myconf="--gtk-youtube-viewer"
 	fi
 	perl-module_src_configure
+}
+
+src_install() {
 	perl-module_src_install
 
 	if use gtk ; then
@@ -65,19 +59,14 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-	perl_set_version
-}
-
 pkg_postinst() {
 	use gtk && gnome2_icon_cache_update
 	elog "Optional dependencies:"
 	optfeature "cache support" dev-perl/LWP-UserAgent-Cached
-	optfeature "better STDIN support" dev-perl/Term-ReadLine-Gnu
 	optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS
 	optfeature "the case if there are SSL problems" dev-perl/Mozilla-CA
 	optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth
+	optfeature "live streams support" net-misc/youtube-dl
 	optfeature "threads support" virtual/perl-threads
 	elog
 	elog "Check the configuration file in ~/.config/youtube-viewer/"