Old.

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

5 files changed, 7 insertions, 256 deletions

diff --git a/net-misc/youtube-dl/ChangeLog b/net-misc/youtube-dl/ChangeLog
index eed5c48946a1..892901fdf366 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.214 2013/08/18 13:44:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.215 2013/08/18 14:06:31 jer Exp $
+
+  18 Aug 2013; Jeroen Roovers <jer@gentoo.org> -youtube-dl-2013.05.23.ebuild,
+  -files/youtube-dl-2013.05.10-offensive.patch,
+  -files/youtube-dl-2013.06.21-offensive.patch,
+  -files/youtube-dl-2013.06.34.2-offensive.patch:
+  Old.
 
   18 Aug 2013; Agostino Sarubbo <ago@gentoo.org> youtube-dl-2013.08.02.ebuild:
   Stable for x86, wrt bug #480162
diff --git a/net-misc/youtube-dl/files/youtube-dl-2013.05.10-offensive.patch b/net-misc/youtube-dl/files/youtube-dl-2013.05.10-offensive.patch
deleted file mode 100644
index c46a4f60eff6..000000000000
--- a/net-misc/youtube-dl/files/youtube-dl-2013.05.10-offensive.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- a/test/tests.json
-+++ b/test/tests.json
-@@ -30,30 +30,6 @@
-     "file":  "5779306.m4v"
-   },
-   {
--    "name": "XVideos",
--    "md5":  "1d0c835822f0a71a7bf011855db929d0",
--    "url":  "http://www.xvideos.com/video939581/funny_porns_by_s_-1",
--    "file":  "939581.flv"
--  },
--  {
--    "name": "YouPorn",
--    "md5": "c37ddbaaa39058c76a7e86c6813423c1",
--    "url": "http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/",
--    "file": "505835.mp4"
--  },
--  {
--    "name": "Pornotube",
--    "md5": "374dd6dcedd24234453b295209aa69b6",
--    "url": "http://pornotube.com/c/173/m/1689755/Marilyn-Monroe-Bathing",
--    "file": "1689755.flv"
--  },
--  {
--    "name": "YouJizz",
--    "md5": "07e15fa469ba384c7693fd246905547c",
--    "url": "http://www.youjizz.com/videos/zeichentrick-1-2189178.html",
--    "file": "2189178.flv"
--  },
--  {
-     "name": "Vimeo",
-     "md5":  "8879b6cc097e987f02484baf890129e5",
-     "url":  "http://vimeo.com/56015672",
-@@ -79,12 +55,6 @@
-     "file":  "PracticalUnix_intro-environment.mp4"
-   },
-   {
--    "name": "XNXX",
--    "md5":  "0831677e2b4761795f68d417e0b7b445",
--    "url":  "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_",
--    "file":  "1135332.flv"
--  },
--  {
-     "name": "Youku",
-     "url": "http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html",
-     "file": "XNDgyMDQ2NTQw_part00.flv",
-@@ -404,15 +374,6 @@
-     }
-   },
-   {
--    "name": "RedTube",
--    "url": "http://www.redtube.com/66418",
--    "file": "66418.mp4",
--    "md5": "7b8c22b5e7098a3e1c09709df1126d2d",
--    "info_dict":{
--      "title":"Sucked on a toilet"
--    }
--  },
--  {
-     "name": "Photobucket",
-     "url": "http://media.photobucket.com/user/rachaneronas/media/TiredofLinkBuildingTryBacklinkMyDomaincom_zpsc0c3b9fa.mp4.html?filters[term]=search&filters[primary]=videos&filters[secondary]=images&sort=1&o=0",
-     "file": "zpsc0c3b9fa.mp4",
diff --git a/net-misc/youtube-dl/files/youtube-dl-2013.06.21-offensive.patch b/net-misc/youtube-dl/files/youtube-dl-2013.06.21-offensive.patch
deleted file mode 100644
index bfb6ada772a8..000000000000
--- a/net-misc/youtube-dl/files/youtube-dl-2013.06.21-offensive.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- a/test/tests.json
-+++ b/test/tests.json
-@@ -47,46 +47,6 @@
-     }
-   },
-   {
--    "name": "XVideos",
--    "md5":  "1d0c835822f0a71a7bf011855db929d0",
--    "url":  "http://www.xvideos.com/video939581/funny_porns_by_s_-1",
--    "file":  "939581.flv",
--    "info_dict": {
--      "title": "Funny Porns By >>>>S<<<<<< -1"
--    }
--  },
--  {
--    "name": "YouPorn",
--    "md5": "c37ddbaaa39058c76a7e86c6813423c1",
--    "url": "http://www.youporn.com/watch/505835/sex-ed-is-it-safe-to-masturbate-daily/",
--    "file": "505835.mp4",
--    "info_dict": {
--      "upload_date": "20101221",
--      "description": "Love & Sex Answers: http://bit.ly/DanAndJenn -- Is It Unhealthy To Masturbate Daily?",
--      "uploader": "Ask Dan And Jennifer",
--      "title": "Sex Ed: Is It Safe To Masturbate Daily?"
--    }
--  },
--  {
--    "name": "Pornotube",
--    "md5": "374dd6dcedd24234453b295209aa69b6",
--    "url": "http://pornotube.com/c/173/m/1689755/Marilyn-Monroe-Bathing",
--    "file": "1689755.flv",
--    "info_dict": {
--      "upload_date": "20090708",
--      "title": "Marilyn-Monroe-Bathing"
--    }
--  },
--  {
--    "name": "YouJizz",
--    "md5": "07e15fa469ba384c7693fd246905547c",
--    "url": "http://www.youjizz.com/videos/zeichentrick-1-2189178.html",
--    "file": "2189178.flv",
--    "info_dict": {
--      "title": "Zeichentrick 1"
--    }
--  },
--  {
-     "name": "Vimeo",
-     "md5":  "8879b6cc097e987f02484baf890129e5",
-     "url":  "http://vimeo.com/56015672",
-@@ -121,15 +81,6 @@
-     }
-   },
-   {
--    "name": "XNXX",
--    "md5":  "0831677e2b4761795f68d417e0b7b445",
--    "url":  "http://video.xnxx.com/video1135332/lida_naked_funny_actress_5_",
--    "file":  "1135332.flv",
--    "info_dict": {
--      "title": "lida » Naked Funny Actress  (5)"
--    }
--  },
--  {
-     "name": "Youku",
-     "url": "http://v.youku.com/v_show/id_XNDgyMDQ2NTQw.html",
-     "file": "XNDgyMDQ2NTQw_part00.flv",
-@@ -513,15 +464,6 @@
-     "skip": "There is a limit of 200 free downloads / month for the test song"
-   },
-   {
--    "name": "RedTube",
--    "url": "http://www.redtube.com/66418",
--    "file": "66418.mp4",
--    "md5": "7b8c22b5e7098a3e1c09709df1126d2d",
--    "info_dict":{
--      "title":"Sucked on a toilet"
--    }
--  },
--  {
-     "name": "Photobucket",
-     "url": "http://media.photobucket.com/user/rachaneronas/media/TiredofLinkBuildingTryBacklinkMyDomaincom_zpsc0c3b9fa.mp4.html?filters[term]=search&filters[primary]=videos&filters[secondary]=images&sort=1&o=0",
-     "file": "zpsc0c3b9fa.mp4",
-@@ -593,17 +535,6 @@
-     }
-   },
-   {
--    "name": "XHamster",
--    "url": "http://xhamster.com/movies/1509445/femaleagent_shy_beauty_takes_the_bait.html",
--    "file": "1509445.flv",
--    "md5": "9f48e0e8d58e3076bb236ff412ab62fa",
--    "info_dict": {
--      "upload_date": "20121014",
--      "uploader_id": "Ruseful2011",
--      "title": "FemaleAgent Shy beauty takes the bait"
--    }
--  },
--  {
-     "name": "Hypem",
-     "url": "http://hypem.com/track/1v6ga/BODYWORK+-+TAME",
-     "file": "1v6ga.mp3",
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
deleted file mode 100644
index 264da9025e28..000000000000
--- a/net-misc/youtube-dl/files/youtube-dl-2013.06.34.2-offensive.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- 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.05.23.ebuild b/net-misc/youtube-dl/youtube-dl-2013.05.23.ebuild
deleted file mode 100644
index d4851849194f..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2013.05.23.ebuild
+++ /dev/null
@@ -1,35 +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-dl/youtube-dl-2013.05.23.ebuild,v 1.6 2013/06/25 10:32:48 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=(python{2_5,2_6,2_7})
-
-inherit bash-completion-r1 eutils python-single-r1
-
-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() {
-	use offensive || epatch "${FILESDIR}"/${PN}-2013.05.10-offensive.patch
-}
-
-src_install() {
-	rm -vf youtube_dl/*.py[co]
-	python_domodule youtube_dl
-	dobin bin/${PN}
-	dodoc CHANGELOG README.txt
-	doman ${PN}.1
-	newbashcomp ${PN}.bash-completion ${PN}
-	python_fix_shebang "${ED}"
-}