version bump, remove old

(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

6 files changed, 79 insertions, 154 deletions

diff --git a/net-misc/youtube-viewer/ChangeLog b/net-misc/youtube-viewer/ChangeLog
index f5fc4435c48e..ea3f9c9ad902 100644
--- a/net-misc/youtube-viewer/ChangeLog
+++ b/net-misc/youtube-viewer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/youtube-viewer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-viewer/ChangeLog,v 1.23 2013/02/21 16:14:42 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-viewer/ChangeLog,v 1.24 2013/09/21 12:35:21 hasufell Exp $
+
+*youtube-viewer-3.0.8 (21 Sep 2013)
+
+  21 Sep 2013; Julian Ospald <hasufell@gentoo.org>
+  -youtube-viewer-2.5.9.ebuild, -youtube-viewer-3.0.5.ebuild,
+  -youtube-viewer-3.0.6.ebuild, -youtube-viewer-3.0.7.ebuild,
+  +youtube-viewer-3.0.8.ebuild, +files/youtube-viewer-3.0.8-button.patch:
+  version bump, remove old
 
   21 Feb 2013; Julian Ospald <hasufell@gentoo.org> youtube-viewer-9999.ebuild:
   update live-ebuild
diff --git a/net-misc/youtube-viewer/files/youtube-viewer-3.0.8-button.patch b/net-misc/youtube-viewer/files/youtube-viewer-3.0.8-button.patch
new file mode 100644
index 000000000000..8205e837c735
--- /dev/null
+++ b/net-misc/youtube-viewer/files/youtube-viewer-3.0.8-button.patch
@@ -0,0 +1,54 @@
+commit 6c3d14d7d4f2b34d448f982ca0d7d4be39955666
+Author: hasufell <hasufell@gentoo.org>
+Date:   Sat Sep 21 14:28:59 2013 +0200
+
+    remove intrusive donate button
+
+diff --git a/bin/gtk-youtube-viewer b/bin/gtk-youtube-viewer
+index e33570a..34f5b07 100755
+--- a/bin/gtk-youtube-viewer
++++ b/bin/gtk-youtube-viewer
+@@ -353,7 +353,6 @@ my $app_icon_pixbuf    = 'Gtk2::Gdk::Pixbuf'->new_from_file("$icons_path/$execna
+ my $user_icon_pixbuf   = 'Gtk2::Gdk::Pixbuf'->new_from_file_at_size("$icons_path/user.png", 16, 16);
+ my $feed_icon_pixbuf   = 'Gtk2::Gdk::Pixbuf'->new_from_file_at_size("$icons_path/feed_icon.png", 16, 16);
+ my $default_thumb      = 'Gtk2::Gdk::Pixbuf'->new_from_file_at_size("$icons_path/default_thumb.jpg", 120, 90);
+-my $donate_icon_pixbuf = 'Gtk2::Gdk::Pixbuf'->new_from_file("$icons_path/donate.png");
+ my $animation          = 'Gtk2::Gdk::PixbufAnimation'->new_from_file("$icons_path/spinner.gif");
+ 
+ # Setting application title and icon
+@@ -595,7 +594,6 @@ sub new_image_from_pixbuf {
+ {
+     $gui->get_object('username_list')->set_image(new_image_from_pixbuf('icon_from_pixbuf', $user_icon_pixbuf));
+     $gui->get_object('channels_button')->set_image(new_image_from_pixbuf('icon_from_pixbuf', $user_icon_pixbuf));
+-    $gui->get_object('donate_button')->set_image(new_image_from_pixbuf('icon_from_pixbuf', $donate_icon_pixbuf));
+     $gui->get_object('button6')->set_image(new_image_from_pixbuf('icon_from_pixbuf', $feed_icon_pixbuf));
+     $gui->get_object('button23')->set_image(new_image_from_pixbuf('icon_from_pixbuf', $feed_icon_pixbuf));
+ }
+diff --git a/share/gtk-youtube-viewer.glade b/share/gtk-youtube-viewer.glade
+index 2fe6948..f7f8528 100644
+--- a/share/gtk-youtube-viewer.glade
++++ b/share/gtk-youtube-viewer.glade
+@@ -1178,23 +1178,6 @@ Unless the categoryID is valid, this field is ignored.</property>
+                                         <child>
+                                           <placeholder/>
+                                         </child>
+-                                        <child>
+-                                          <object class="GtkButton" id="donate_button">
+-                                            <property name="use_action_appearance">False</property>
+-                                            <property name="visible">True</property>
+-                                            <property name="can_focus">True</property>
+-                                            <property name="receives_default">True</property>
+-                                            <property name="image">image78</property>
+-                                            <property name="relief">none</property>
+-                                            <property name="image_position">right</property>
+-                                            <signal name="clicked" handler="donate" swapped="no"/>
+-                                          </object>
+-                                          <packing>
+-                                            <property name="expand">False</property>
+-                                            <property name="fill">False</property>
+-                                            <property name="position">1</property>
+-                                          </packing>
+-                                        </child>
+                                       </object>
+                                       <packing>
+                                         <property name="expand">False</property>
diff --git a/net-misc/youtube-viewer/youtube-viewer-2.5.9.ebuild b/net-misc/youtube-viewer/youtube-viewer-2.5.9.ebuild
deleted file mode 100644
index 8100a8119dbc..000000000000
--- a/net-misc/youtube-viewer/youtube-viewer-2.5.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-viewer/youtube-viewer-2.5.9.ebuild,v 1.4 2012/11/20 18:43:53 hasufell Exp $
-
-EAPI=4
-
-DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
-HOMEPAGE="http://trizen.googlecode.com"
-SRC_URI="http://dev.gentoo.org/~hasufell/distfiles/${P}.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/perl-5.10.0
-	dev-perl/libwww-perl
-	dev-perl/XML-Fast
-	|| ( media-video/mplayer[X,network]
-		media-video/mplayer2[X,network] )"
-
-S=${WORKDIR}
-
-src_install() {
-	newbin ${P} ${PN}
-}
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.0.5.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.0.5.ebuild
deleted file mode 100644
index 9307bf45d2a4..000000000000
--- a/net-misc/youtube-viewer/youtube-viewer-3.0.5.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-viewer/youtube-viewer-3.0.5.ebuild,v 1.2 2013/01/07 19:28:28 hasufell Exp $
-
-EAPI=4
-
-inherit perl-module vcs-snapshot
-
-DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
-HOMEPAGE="http://trizen.googlecode.com"
-SRC_URI="https://github.com/trizen/youtube-viewer/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk"
-
-RDEPEND="
-	>=dev-lang/perl-5.16.0
-	dev-perl/Data-Dump
-	dev-perl/libwww-perl
-	dev-perl/XML-Fast
-	|| ( media-video/mplayer[X,network]
-		media-video/mplayer2[X,network] )
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	virtual/perl-Scalar-List-Utils
-	virtual/perl-Term-ANSIColor
-	gtk? (
-		>=dev-perl/gtk2-perl-1.244.0
-		!net-misc/gtk-youtube-viewer
-		virtual/freedesktop-icon-theme
-		x11-libs/gdk-pixbuf:2[X,jpeg]
-	)"
-DEPEND="virtual/perl-Module-Build"
-
-SRC_TEST="do"
-
-S=${WORKDIR}/${P}/WWW-YoutubeViewer
-
-# build system installs files on "perl Build.PL" too
-# do all the work in src_install
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	use gtk && local myconf="--gtk-youtube-viewer"
-	perl-module_src_configure
-	perl-module_src_install
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-	einfo
-	elog "optional dependencies:"
-	elog "  dev-perl/TermReadKey (to get the terminal width size)"
-	elog "  dev-perl/Term-ReadLine-Gnu (for a better STDIN support)"
-	elog "  net-misc/gcap (for retrieving Youtube closed captions)"
-	einfo
-}
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.0.6.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.0.6.ebuild
deleted file mode 100644
index 66c754c2e5cf..000000000000
--- a/net-misc/youtube-viewer/youtube-viewer-3.0.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-viewer/youtube-viewer-3.0.6.ebuild,v 1.1 2013/01/27 20:14:52 hasufell Exp $
-
-EAPI=4
-
-inherit perl-module vcs-snapshot
-
-DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
-HOMEPAGE="http://trizen.googlecode.com"
-SRC_URI="https://github.com/trizen/youtube-viewer/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-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] )
-	virtual/perl-File-Spec
-	virtual/perl-Getopt-Long
-	virtual/perl-Term-ANSIColor
-	gtk? (
-		>=dev-perl/gtk2-perl-1.244.0
-		!net-misc/gtk-youtube-viewer
-		virtual/freedesktop-icon-theme
-		x11-libs/gdk-pixbuf:2[X,jpeg]
-	)"
-DEPEND="virtual/perl-Module-Build"
-
-SRC_TEST="do"
-
-S=${WORKDIR}/${P}/WWW-YoutubeViewer
-
-# build system installs files on "perl Build.PL" too
-# do all the work in src_install
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
-	use gtk && local myconf="--gtk-youtube-viewer"
-	perl-module_src_configure
-	perl-module_src_install
-}
-
-pkg_postinst() {
-	perl-module_pkg_postinst
-	einfo
-	elog "optional dependencies:"
-	elog "  dev-perl/LWP-Protocol-https or dev-perl/libwww-perl[ssl]"
-	elog "    (for HTTPS protocol and login support)"
-	elog "  dev-perl/TermReadKey (to get the terminal width size)"
-	elog "  dev-perl/Term-ReadLine-Gnu (for a better STDIN support)"
-	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 (--shuffle)"
-	einfo
-}
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.0.7.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.0.8.ebuild
index 10b35458daf0..7850743a1511 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.0.7.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.0.8.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-viewer/youtube-viewer-3.0.7.ebuild,v 1.1 2013/02/21 16:13:39 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-viewer/youtube-viewer-3.0.8.ebuild,v 1.1 2013/09/21 12:35:21 hasufell Exp $
 
-EAPI=4
+EAPI=5
 
-inherit perl-module vcs-snapshot
+inherit eutils perl-module vcs-snapshot
 
 DESCRIPTION="A command line utility for viewing youtube-videos in Mplayer"
 HOMEPAGE="http://trizen.googlecode.com"
@@ -24,6 +24,8 @@ RDEPEND="
 	virtual/perl-File-Spec
 	virtual/perl-Getopt-Long
 	virtual/perl-Term-ANSIColor
+	virtual/perl-Text-ParseWords
+	virtual/perl-Text-Tabs+Wrap
 	gtk? (
 		>=dev-perl/gtk2-perl-1.244.0
 		!net-misc/gtk-youtube-viewer
@@ -36,6 +38,12 @@ SRC_TEST="do"
 
 S=${WORKDIR}/${P}/WWW-YoutubeViewer
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-button.patch
+	rm share/gtk-youtube-viewer-icons/donate.png || die
+	perl-module_src_prepare
+}
+
 # build system installs files on "perl Build.PL" too
 # do all the work in src_install
 src_configure() { :; }
@@ -55,9 +63,13 @@ pkg_postinst() {
 	elog "    (for HTTPS protocol and login support)"
 	elog "  dev-perl/TermReadKey (to get the terminal width size)"
 	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 (--shuffle)"
+	elog "  virtual/perl-Scalar-List-Utils (to shuffle the playlists"
+	elog "    (--shuffle, -s))"
+	elog "  virtual/perl-threads (threads support)"
 	einfo
 }