Version bump.

(Portage version: 2.2.0_alpha185/cvs/Linux x86_64, signed Manifest commit with key A792A613)

3 files changed, 120 insertions, 1 deletions

diff --git a/net-misc/youtube-dl/ChangeLog b/net-misc/youtube-dl/ChangeLog
index 743a25996075..f6e146e96e87 100644
--- a/net-misc/youtube-dl/ChangeLog
+++ b/net-misc/youtube-dl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/youtube-dl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.183 2013/06/27 13:26:34 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.184 2013/06/28 15:27:07 jer Exp $
+
+*youtube-dl-2013.06.34.2 (28 Jun 2013)
+
+  28 Jun 2013; Jeroen Roovers <jer@gentoo.org> +youtube-dl-2013.06.34.2.ebuild,
+  +files/youtube-dl-2013.06.34.2-offensive.patch:
+  Version bump.
 
 *youtube-dl-2013.06.34 (27 Jun 2013)
 
diff --git a/net-misc/youtube-dl/files/youtube-dl-2013.06.34.2-offensive.patch b/net-misc/youtube-dl/files/youtube-dl-2013.06.34.2-offensive.patch
new file mode 100644
index 000000000000..264da9025e28
--- /dev/null
+++ b/net-misc/youtube-dl/files/youtube-dl-2013.06.34.2-offensive.patch
@@ -0,0 +1,59 @@
+--- a/youtube_dl/extractor/__init__.py
++++ b/youtube_dl/extractor/__init__.py
+@@ -35,9 +35,7 @@
+ from .myvideo import MyVideoIE
+ from .nba import NBAIE
+ from .photobucket import PhotobucketIE
+-from .pornotube import PornotubeIE
+ from .rbmaradio import RBMARadioIE
+-from .redtube import RedTubeIE
+ from .soundcloud import SoundcloudIE, SoundcloudSetIE
+ from .spiegel import SpiegelIE
+ from .stanfordoc import StanfordOpenClassroomIE
+@@ -54,13 +52,8 @@
+ from .vine import VineIE
+ from .wimp import WimpIE
+ from .worldstarhiphop import WorldStarHipHopIE
+-from .xhamster import XHamsterIE
+-from .xnxx import XNXXIE
+-from .xvideos import XVideosIE
+ from .yahoo import YahooIE, YahooSearchIE
+-from .youjizz import YouJizzIE
+ from .youku import YoukuIE
+-from .youporn import YouPornIE
+ from .youtube import YoutubeIE, YoutubePlaylistIE, YoutubeSearchIE, YoutubeUserIE, YoutubeChannelIE
+ from .zdf import ZDFIE
+ 
+@@ -90,7 +83,6 @@
+         ComedyCentralIE(),
+         EscapistIE(),
+         CollegeHumorIE(),
+-        XVideosIE(),
+         SoundcloudSetIE(),
+         SoundcloudIE(),
+         InfoQIE(),
+@@ -98,10 +90,6 @@
+         StanfordOpenClassroomIE(),
+         MTVIE(),
+         YoukuIE(),
+-        XNXXIE(),
+-        YouJizzIE(),
+-        PornotubeIE(),
+-        YouPornIE(),
+         GooglePlusIE(),
+         ArteTvIE(),
+         NBAIE(),
+@@ -121,13 +109,11 @@
+         ZDFIE(),
+         TumblrIE(),
+         BandcampIE(),
+-        RedTubeIE(),
+         InaIE(),
+         HowcastIE(),
+         VineIE(),
+         FlickrIE(),
+         TeamcocoIE(),
+-        XHamsterIE(),
+         HypemIE(),
+         Vbox7IE(),
+         GametrailersIE(),
diff --git a/net-misc/youtube-dl/youtube-dl-2013.06.34.2.ebuild b/net-misc/youtube-dl/youtube-dl-2013.06.34.2.ebuild
new file mode 100644
index 000000000000..44ea89e229d4
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2013.06.34.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2013.06.34.2.ebuild,v 1.1 2013/06/28 15:27:07 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_5,2_6,2_7,3_3})
+DISTUTILS_SINGLE_IMPL=true
+inherit bash-completion-r1 distutils-r1 eutils
+
+DESCRIPTION="Download videos from YouTube.com (and mores sites...)"
+HOMEPAGE="http://rg3.github.com/youtube-dl/"
+SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="offensive test"
+
+DEPEND="test? ( dev-python/nose[coverage(+)] )"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	if ! use offensive; then
+		epatch "${FILESDIR}"/${P}-offensive.patch
+		rm \
+			youtube_dl/extractor/pornotube.py \
+			youtube_dl/extractor/redtube.py \
+			youtube_dl/extractor/xhamster.py \
+			youtube_dl/extractor/xnxx.py \
+			youtube_dl/extractor/xvideos.py \
+			youtube_dl/extractor/youjizz.py \
+			youtube_dl/extractor/youporn.py \
+			|| die
+	fi
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	python_domodule youtube_dl
+	dobin bin/${PN}
+	dodoc CHANGELOG README.txt
+	doman ${PN}.1
+	newbashcomp ${PN}.bash-completion ${PN}
+	python_fix_shebang "${ED}"
+}