Merge commit 'refs/pull/992/head' of git://github.com/gentoo/gentoo

2 files changed, 0 insertions, 92 deletions

diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index 04dacb8544f2..67de31f5d46a 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1,3 +1,2 @@
-DIST youtube-viewer-3.1.1.tar.gz 210183 SHA256 416289dac7c4bb29ad046e41bbf49faaca31f1827379e9e0082f5b282186531d SHA512 1c7236cde68f21a80bb1f3ac29e19f86f52732c784adb70f6fc07177d74ada3a6ae1652e604fc12f62ce8ddf0c172593dd85a419a6d7d804f980fc09afda90f0 WHIRLPOOL 9045cc344bd627806526594daafbd8e17cfefa0e7aaf456c5c3a0c7ebec4bdd53f8ec708e051b37706ac3e1e29af3379e1df8ea21bfd370ca367950e6accf886
 DIST youtube-viewer-3.1.9.tar.gz 222276 SHA256 9b7ba2b50cea054898024bc871e231673269ab50db0526ee3f1a7ae62a51e8d2 SHA512 60ff81defd4d8d1bc1f6b5bceaa03c9bbe64e8fea2083ce60b04b6c14d8b13ded6da255b9aa46bfcb1b76cf33121ddb738d0f0c159e4bd207999ca558a43e86e WHIRLPOOL 2e6a79992c7760d93c2e28f1e4f5c14861b6fefed8e0bebb9a7d88c6cf27000904971b12274a972ca66471ffee7c3bfee8c90218c16ddd0ec96cc8f46779bffd
 DIST youtube-viewer-3.2.0.tar.gz 222528 SHA256 60a4ded8798da3cdadadf816b1c4e87c6feb697f01db70630f014584e5a2392e SHA512 bda3592874ded71e6a60d87b669d2c80999425ef2f2061e942a8db5755d9d6f2dabf038b8b7984efb1cccc3a5f9f12b2fa56290be9db871b2784b2c464367c3b WHIRLPOOL 73ec965bf4cf65d545b99d73e003ce7d74d92dcdc1f5d29c8b925e4d96e93d5924b66e06ec40e22f16119b6df6445344d650d5ca086e52aeb60a350c7ca8ce0d
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.1.1.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.1.1.ebuild
deleted file mode 100644
index fb6901464458..000000000000
--- a/net-misc/youtube-viewer/youtube-viewer-3.1.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit gnome2-utils eutils perl-module vcs-snapshot
-
-DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
-HOMEPAGE="https://trizen.googlecode.com"
-SRC_URI="https://github.com/trizen/youtube-viewer/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="|| ( Artistic GPL-1+ )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=dev-lang/perl-5.16.0
-	dev-perl/Data-Dump
-	dev-perl/libwww-perl
-	|| ( media-video/mplayer[X,network]
-		media-video/mplayer2[X,network]
-		media-video/mpv[X] )
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	virtual/perl-Term-ANSIColor
-	virtual/perl-Text-ParseWords
-	virtual/perl-Text-Tabs+Wrap
-	gtk? (
-		dev-perl/File-ShareDir
-		>=dev-perl/gtk2-perl-1.244.0
-		virtual/freedesktop-icon-theme
-		x11-libs/gdk-pixbuf:2[X,jpeg]
-	)"
-DEPEND="dev-perl/Module-Build"
-
-SRC_TEST="do"
-
-S=${WORKDIR}/${P}/WWW-YoutubeViewer
-
-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() {
-	local myconf
-	if use gtk ; then
-		myconf="--gtk-youtube-viewer"
-	fi
-	perl-module_src_configure
-	perl-module_src_install
-
-	if use gtk ; then
-		domenu share/gtk-youtube-viewer.desktop
-		doicon share/icons/gtk-youtube-viewer.png
-	fi
-}
-
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-	perl_set_version
-}
-
-pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
-	einfo
-	elog "optional dependencies:"
-	elog "  dev-perl/LWP-Protocol-https or dev-perl/libwww-perl[ssl]"
-	elog "  and virtual/perl-MIME-Base64"
-	elog "    (for HTTPS protocol and login support)"
-	elog "  dev-perl/Term-ReadLine-Gnu (for a better STDIN support)"
-	elog "  dev-perl/Text-CharWidth (print the results in a fixed-width"
-	elog "    format (--fixed-width, -W))"
-	elog "  dev-perl/XML-Fast (faster XML to HASH conversion)"
-	elog "  net-misc/gcap (for retrieving Youtube closed captions)"
-	elog "  virtual/perl-File-Temp (for posting comments)"
-	elog "  virtual/perl-Scalar-List-Utils (to shuffle the playlists"
-	elog "    (--shuffle, -s))"
-	elog "  virtual/perl-threads (threads support)"
-	einfo
-}
-
-pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
-}