Version bump.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

9 files changed, 17 insertions, 356 deletions

diff --git a/net-misc/youtube-dl/ChangeLog b/net-misc/youtube-dl/ChangeLog
index 42192de0adc9..ef918ce0ea71 100644
--- a/net-misc/youtube-dl/ChangeLog
+++ b/net-misc/youtube-dl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/youtube-dl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.336 2014/05/05 16:11:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.337 2014/05/12 16:46:41 jer Exp $
+
+*youtube-dl-2014.05.12 (12 May 2014)
+
+  12 May 2014; Jeroen Roovers <jer@gentoo.org> -youtube-dl-2014.04.01.3.ebuild,
+  -youtube-dl-2014.04.03.2.ebuild, -youtube-dl-2014.04.07.1.ebuild,
+  -youtube-dl-2014.04.11.2.ebuild, -youtube-dl-2014.04.19.ebuild,
+  -youtube-dl-2014.04.21.6.ebuild, -youtube-dl-2014.04.30.1.ebuild,
+  +youtube-dl-2014.05.12.ebuild:
+  Version bump.
 
 *youtube-dl-2014.05.05 (05 May 2014)
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index da14a7c69493..dd34eb3505a6 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -2,31 +2,19 @@
 Hash: SHA256
 
 DIST youtube-dl-2014.02.10.tar.gz 642951 SHA256 fa037ae7d3a3b47f57b91e57f89689c4277465152267809811ad5bf9f76a3d3f SHA512 2770b4721063ad3b06a06dc80c9ec81eb012b18b8d5e8aaace5b1e89d875e6e762e611f7c3ec9978e6dded3d27f8b12b1a7615be6dfa6cb283272e22e50f0545 WHIRLPOOL a8b7a4690fdee9c3053eb3d7ccc42862a05e1b75dabe81648e7ea28582b89981936559315b7bd9d0408a203efde09ff0bc23841a089cb4fb273c8d6d91581ad5
-DIST youtube-dl-2014.04.01.3.tar.gz 747225 SHA256 83d4ca50a8930434555c75fa169f7659da0cb3babba342ee55d4d479287437e3 SHA512 997812339b29aede5562e04000ee194e396b7141de419dc3f0b373cd4fee603c3fd36ccaddbcbd71bd2f0d7eec6d259de9c0b86dbbfccc24e48fd8fd118c30cb WHIRLPOOL 15cffaba115b36c824158bc332d534af71dd4b0bc483127b5ebd6157951c920270ef81d693fa6214590f7ed5e87e2e68d9c46be62ad62a81ddccb28321dbc374
-DIST youtube-dl-2014.04.03.2.tar.gz 752361 SHA256 17ff14edab3c15612a1d47b058a24123237802c80a880265c9f818d123b528ba SHA512 055960da3a3210abd8bbe26126edfb23725a55652fb5ca48c7eefb614a9b4c7b65bd652291922b080549e1e386f39472a9d484ae8c08b42cc6478a8216426f40 WHIRLPOOL 80642f8fe2ec663cdb98ea31e5848a77f534fefcbef685c01c361543c8fddbe2d0fc289d5e68824cdf3b94c004763b5691a80fd70ed596a3b59638ab4869907f
-DIST youtube-dl-2014.04.07.1.tar.gz 777558 SHA256 ac5b505b974e036c9265c700d6bb373fc3d1aff22e2314fd55aef355cfe3112c SHA512 76f7d6a8cf9d47ca73370757391837f3a7bcfeca0e09d45e81de01584ced58fb1785f53473c0b5b54e8545b825db8df88db10c44d81183d98d9b568010396a85 WHIRLPOOL 3deac3326ee42b14e37b2e685b999ed660dc064ebfd2eff11f7c975babdc8ee083c609513716c472ace14d39ba9a111ad33d897e47dfdf86f070ddc4bc5b4edb
-DIST youtube-dl-2014.04.11.2.tar.gz 781909 SHA256 b5ac770f8ecff6add8acd6b6f552462df2bc82b86c33ba7138156b49f338a7f2 SHA512 1b3e2c97731c9a703f9051c15a73ae1ce980fd73e4967c330e39b37bcf3bb7086b1c7e9be70978c120433551768b4ba1c968d5ec4e399014e19264532df8d447 WHIRLPOOL f04f5a2e7a45bc25e1c4534d613a7139ba1b928f07373baeb4ac810fbafd171c4fdb14f55a31b53bade88958e315ef5d024ebcbc03f8c1f4fbee420fc4ee60d5
 DIST youtube-dl-2014.04.13.tar.gz 785764 SHA256 582ddfb0c4f008c7e9a9d2f9f8752851bdb47c119c51f3b77500ad3dadf560e1 SHA512 8f2acc2402254d720d6020d364f400aee66e77d8eb99ad3c5b8dbab4b118366bc1f2d4c32e1ccf5ca5a3eada3592e1a3b83b66fe3ded5ee956c5945d64df828f WHIRLPOOL 09280635d5c766acb60ce8102198bd66acae1cd2d120edaceb9c27dbd423f458436dd211be72a92794c619032715adc0bae2d5087da6b2f91ce9b5a5099d4b16
-DIST youtube-dl-2014.04.19.tar.gz 790720 SHA256 83051e796758b023b53de3c5bff61fa78c9a6e17ea1ca22d9b6777d9de3c2553 SHA512 2fec091f848ba52816fc7532c290087e1eefac90bfab275f18e72d452b2775b00cc204b14be1809da0e6bd703225daeeec25f553d2dfcd1bcfc1d8fb9db64db4 WHIRLPOOL ebc26b0587bb41187316421e8cec90f0d426eb27d5766bc59d9139ac59a441a0d9bc5c76170bc0ef914676ecd919a32dd7edb5380e834ab9c12245df4ecd00db
-DIST youtube-dl-2014.04.21.6.tar.gz 796348 SHA256 8df2a8300a6e333a637f655181216097839992b384f2eafa93f1ee9cfd2f1e1a SHA512 b79b4ea6e0106c12e09af3124911fa34521b94579e4c437205629c36bd1172bf9c176fcf1f2ee8173a035bfda0e8b3aefdb744a9ca23a7a1c5656aea08409a69 WHIRLPOOL b87b2e9ba71bcf21c2ecaad19d0dc1cb8e3e826a56a9277cebc599408591b65e28fc7831fa456929e2f4db57f255167fb4739cb0038b09f9b45f6d7c71a0950d
-DIST youtube-dl-2014.04.30.1.tar.gz 805378 SHA256 43061bb49b42dfd4dd2328cf8ef5215b3b3ba025a48ebc65d655fe1f1a3b0aee SHA512 af0005b4bc3ce4c195391288b813323da820b098e05fcec9e56159548905c1fb93c3518dfbc83700bf67deaec623735fee6bf9146e244b13ec5818cac74cfe1a WHIRLPOOL c56938605a4b3b6ae700fbb95ddbf0dc1ea1301ed133b6accca25f3f7f38c4ef013e46b2e85071ce636b458c39005fdd57bfb42cc73990bf35c1bc5e4962980a
 DIST youtube-dl-2014.05.05.tar.gz 809179 SHA256 6f02362cfa618d78f55f18d13baea4ebfa1ad15f1e3fef2e93a9d2a652e23d0f SHA512 b82c51d7594135c86a43b6effad2175aee848febfe5a3f3b7deeb0a41a1112c4da9a1dc96fa528acef750c83f28f4c08076d1dfcb30badcfffceba287f0aaa0b WHIRLPOOL 6d0d076d213fc32f0aa89cbb9cbd25423416358e387d23adad2809aec137e8437138054aa641629674ebdb2eb29c4d2d41058f1debee51c609d8523f56a8a7a2
+DIST youtube-dl-2014.05.12.tar.gz 811908 SHA256 61796e4448a3a030a64298cee64075e508904f0d9dcb98ddf21335c2123349b5 SHA512 fd8aff0dd61de1b346928cb28c4c6f58bedc225df92b74946272df450e7c13212ee534ff51648c0962a775ab0443a0b5ffc1610e39517c90f2f005dd851ee9e9 WHIRLPOOL a3f85b23c74430c584073f0202435b201f393a88067144620bfcd0553d8372c14f319f04b2f1f7bf0cf6eee86aa092175574dec166ecb34e25a48c8bd104d619
 EBUILD youtube-dl-2014.02.10.ebuild 1532 SHA256 19431ff1e4b76f6aeb79ef3ace9bc76ce1d610f2761f31eb6139479cbd9a8813 SHA512 518a5302d90b8181755777b626ee73d5fd3a0de580c0e8e57a5fc3e4bf133ac6b05c7dcaa6633df039bacbef43885aa648d1eab25c992fb885d1305dacd6a606 WHIRLPOOL b028ad7671bcbe1d3ae43662f03f58776c256f8f48b6935ce066da5e60b222f794a6422996cd7ca2ccd1b20c94391fecb8a93a5a9ad317e2801d7ac8c93dbde7
-EBUILD youtube-dl-2014.04.01.3.ebuild 1561 SHA256 0b84361f867d5f56b5995e327f85ec24e29880820be213e94d6f8f12bc235d9e SHA512 6f1b2d428e6645421f66cdbe5dd52383ef8914c9b46ff03e7953498a930a1f88924124657853541bbfbe3922dbc2729d26310f125500db50e9fe5023378afc56 WHIRLPOOL 4a0552f1421c89d667a11321475829250bc0b5dce3c7b030a20c5cfe7d30cb5ae87bf564958f6fe81b02d7bda3a7ca42bc7295772dd6c0ad8391c88c945981e4
-EBUILD youtube-dl-2014.04.03.2.ebuild 1561 SHA256 752ff3a1ba1fcdf433b5b972da7f4e29b37c6a7c064bc6a10e52be00da80c6ef SHA512 048672cbd3ef11e889e74bda254f0fdde92f4a4075615abfa4773d49d769c4c2b72a105b8f1d18a89ddf2d41aec9b3ae6d43cbb807dc84b5f38cd0b850209df2 WHIRLPOOL 19a14d98ca1516b342ee6c060e2f6f5396d9d8622e70c04e627740716019fedbd542c76dfd7af3990a53fddccb85c653ffdfc361c2aaf374d121a98d9cfa5407
-EBUILD youtube-dl-2014.04.07.1.ebuild 1561 SHA256 c4db6dda3712b699a75af199d16b8eb56f33ed881da0c3365d860ceb73f60bf8 SHA512 7b57b07bc8cd5cb7e4bc195e4637e5adcc0298b19c003ffd298571e92db3e686f4ac8c1139569a84137d193be028db461867979cfb34e0daf70d283a306f678f WHIRLPOOL 89dfbbcf5424cac43418b355f8d3574ff84c8b54897ef0c20cc4688b4c53a3546f7df09bb5f0df83b7de729c466ff612e5602c1c161ea7d272320e0d3f2baa92
-EBUILD youtube-dl-2014.04.11.2.ebuild 1561 SHA256 181c97a15ba89e563a2b9ed62b6c9af7c1b42be65ad92584f7756be42a2de74e SHA512 f3b2ea8a64cdd60719269ff4c0e2073bfa9a7068326c2ecb6946fb619dbd66045dbc6ef26824223378d52aab46ff9289fdee920f3c78872b0b7da5f48a4d055a WHIRLPOOL 4a5c282425c11bcd420e7ba1e8b8d037bb689549671684b6e7bfee6b108a20a47c68cca9fb9c8c146fa0cc108e8760463ac089f1e2727b8a0d3a6594ddb112bc
 EBUILD youtube-dl-2014.04.13.ebuild 1558 SHA256 1f93ead304ca2f856b767d2352a74ae2a9872783be2f3dde1a13be2068aed3e1 SHA512 c15e7f6aa486be916897dffc45786faab14216bbf51da70d97fff4df9e2a6e701d56a93c133f07b16b8dc0d4f39a9049d14632fd8b651d9e0323beab25359a92 WHIRLPOOL ffa6b4dd6835479a35393d021015acb1763b028b0a50a0cceeb0ffc6204d23f508411b57580e81039a5fa4fb74cf27f07af2bd297cd2db6a45751d8d5741c2d9
-EBUILD youtube-dl-2014.04.19.ebuild 1559 SHA256 c5e715fbe713895439743c7cb66e003bf5b3a4dac8f823a2780b300e9ea5cd1b SHA512 cfffc66be3e9af9a396437cc652c680a25b58ad14014505207db8cd00b53a76dd8455e731fae55417cce07e81b0b9cf7a965a05d56833c7deed83e0eba397bb3 WHIRLPOOL 7bd3fee7b5c399004e46ba3e35078a976555a66102fda24f25209ae30164cce60edc97c1bccebf56d31367fa6bc9276b38e3ca19b0b71bd028af76d9832b5a0a
-EBUILD youtube-dl-2014.04.21.6.ebuild 1569 SHA256 eb9553ad3708d05ed935e3e87aa9043ae88c5b90cb7efdbed3f5f54fe633edcb SHA512 d7043924da7363374be489ec705b97501c3fac618c3ef9a07c25de3537688a0ae8d8b5a380bfc1da92a092513d7d43d5f6baa4a0b5078ff301576cf75bf44f50 WHIRLPOOL fe2ff350f1e70d85dccf0e469f790f79741015062d8f0846edc059dcdb41c9379b8b9fb0a72cd3b81d7aca568b866d991bd938596a6763e7781c8ba3e2161777
-EBUILD youtube-dl-2014.04.30.1.ebuild 1565 SHA256 3ee672451653ec8ae6ed533128c3e684da0d2cd1e8506d86d0a57e3632bcee3b SHA512 9275fa3b475716bb0d8d410afc44934163d8910b398616d45183da9926f372d606ab8a6f1a96bcc97472fff6bdcf9c4119436fe3fe691a7baea752a6cf03d67c WHIRLPOOL 7278d0c02e1593ff45c7725441e501720079c3ce901bf92715561583a481676f21f4cebe0db801543428e13b4365ec5edd59cca25194f3595b06cd679ff1b66c
 EBUILD youtube-dl-2014.05.05.ebuild 1563 SHA256 3b49ee6fdb04acaa711ba07bff80ebd37b65013446942110e037872955d8a325 SHA512 e8b4c57882fe3bb7ea1de6ffbca3a8f26274276584329358c4e85ced364bbff020c3f46b87216c4b6c15fffb2b1858c7469e6df7af7929ae46d9657e472318db WHIRLPOOL 96f813b9da4d941b9cb3db04e5d7565a7599125eae0abd1c1b471806cfef53076be9826031e8013420cf36bd3b4a4ef4a72265e880362cda41758bcc72bf593c
-MISC ChangeLog 49735 SHA256 7b30f54de62fdbe92b032598e877555f7b2721f05be28ffcf3b2f845421c01d0 SHA512 5dadeb686b2abf89fa7ed901618488a44daff8bdf19a6009363a783f0f9066e95d2fb71d76e008e9e46b6ba91230f237009519bfcd4a5165a25af88a3b8822c5 WHIRLPOOL 4f0f49d223fa833bac07908b70c71284acbf9451b376c2a007114663f6affc849b29da58f72838941d13653b196d33e81c979b8831dfbc205bf4eb8034c54906
+EBUILD youtube-dl-2014.05.12.ebuild 1563 SHA256 7ea2843a1dc28fe7904be4b6671e48f5d3a7ea22a022436ac1c20c93233f7675 SHA512 1592eff4be9cc004118679462b5a427bdf446a24c0dd4b800df92abbddae5179157235062193703472bba1215d2657014bee8497832bd0c5b0267ebfc11764b6 WHIRLPOOL c4d8d65c9201b31e4262765f2131fcd61b99f4c2e56f481703c6d8e029f96a0bf74cbe1e145475706ea13186fdb1a952ef3f5da80d7e128be18ab4fff9e65945
+MISC ChangeLog 50105 SHA256 1ca524b0b682c58587cc7ee801772ef895b8336501c34d39e55b056e53a86be4 SHA512 b94f94a7c8326da422edb2569a37761c2c8613dc23f5f01200c5bb06bcf15d78b134752a6436725bf2b1ff6a4b734acc37cbf012d7c88cc4d06137fc26683caf WHIRLPOOL 1d6292d9fe53b8dc86317e30bd204bcdd6e6f3fba71e692d18c33f5ea75d91e6d940a140a5e247767ccb33a93d2b2074cb04202ff03ed37d5fd67eb86da7664e
 MISC metadata.xml 274 SHA256 2b4f14b46d21b004377e745db520f7961bc4163b23e6f3d8bbcab508272b1f69 SHA512 acfb3695928ebf2ee87c75f06c7ab47a65f4aa8564b1426ee523a1a5c853ed56df0de4cba186ac003383a27dfa9d21e4f4ff44b48e152c406a918f1b01ca358b WHIRLPOOL 0f245af71a769b0d4eb9bb57a99599a0875ad0373a830ff9e8215a077d3d2f02e916b7b25d275b19b5139810608abddfada68d3d0f2e9191351d26ba716b623b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNnuEMACgkQVWmRsqeSphOs7gCdGfpbBbnsHzo/K7AllncA/UBQ
-5HEAn2rxtqw56Wq2V5BdhL2UG+a8N82x
-=j7a6
+iEYEAREIAAYFAlNw+vMACgkQVWmRsqeSphNPTQCcDyWbUdkyUdDkRe3J0lCssOV+
+VD8AnRi//J7CF0CdVzo5L0EvJQRLy/5w
+=QAY6
 -----END PGP SIGNATURE-----
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.01.3.ebuild b/net-misc/youtube-dl/youtube-dl-2014.04.01.3.ebuild
deleted file mode 100644
index 0672d44698a3..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.04.01.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.04.01.3.ebuild,v 1.1 2014/04/01 18:56:33 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if ! use offensive; then
-		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
-			youtube_dl/version.py || die
-		local xxx=(
-			extremetube fourtube mofosex pornhd pornhub pornotube redtube
-			spankwire thisav trutube tube8 xbef xhamster xnxx xtube xvideos youjizz youporn
-		)
-		sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
-		rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			test/test_age_restriction.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}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.03.2.ebuild b/net-misc/youtube-dl/youtube-dl-2014.04.03.2.ebuild
deleted file mode 100644
index b6aa6081c316..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.04.03.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.04.03.2.ebuild,v 1.1 2014/04/03 14:22:13 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if ! use offensive; then
-		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
-			youtube_dl/version.py || die
-		local xxx=(
-			extremetube fourtube mofosex pornhd pornhub pornotube redtube
-			spankwire thisav trutube tube8 xbef xhamster xnxx xtube xvideos youjizz youporn
-		)
-		sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
-		rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			test/test_age_restriction.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}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.07.1.ebuild b/net-misc/youtube-dl/youtube-dl-2014.04.07.1.ebuild
deleted file mode 100644
index 75fb64c16615..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.04.07.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.04.07.1.ebuild,v 1.1 2014/04/07 13:58:16 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if ! use offensive; then
-		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
-			youtube_dl/version.py || die
-		local xxx=(
-			extremetube fourtube mofosex pornhd pornhub pornotube redtube
-			spankwire thisav trutube tube8 xbef xhamster xnxx xtube xvideos youjizz youporn
-		)
-		sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
-		rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			test/test_age_restriction.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}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.11.2.ebuild b/net-misc/youtube-dl/youtube-dl-2014.04.11.2.ebuild
deleted file mode 100644
index afb60e1677a8..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.04.11.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.04.11.2.ebuild,v 1.1 2014/04/11 14:52:35 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if ! use offensive; then
-		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
-			youtube_dl/version.py || die
-		local xxx=(
-			extremetube fourtube mofosex pornhd pornhub pornotube redtube
-			spankwire thisav trutube tube8 xbef xhamster xnxx xtube xvideos youjizz youporn
-		)
-		sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
-		rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			test/test_age_restriction.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}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.19.ebuild b/net-misc/youtube-dl/youtube-dl-2014.04.19.ebuild
deleted file mode 100644
index 696608cf5b8e..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.04.19.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.04.19.ebuild,v 1.1 2014/04/19 13:52:03 jer Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if ! use offensive; then
-		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
-			youtube_dl/version.py || die
-		local xxx=(
-			extremetube fourtube mofosex pornhd pornhub pornotube redtube
-			spankwire thisav trutube tube8 xbef xhamster xnxx xtube xvideos youjizz youporn
-		)
-		sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
-		rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			test/test_age_restriction.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}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.21.6.ebuild b/net-misc/youtube-dl/youtube-dl-2014.04.21.6.ebuild
deleted file mode 100644
index 7c68b94528ad..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2014.04.21.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.04.21.6.ebuild,v 1.2 2014/04/27 21:05:34 floppym Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python{2_6,2_7,3_3,3_4})
-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="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[coverage(+)] )
-"
-
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	if ! use offensive; then
-		sed -i -e "/__version__/s|'$|-gentoo_no_offensive_sites'|g" \
-			youtube_dl/version.py || die
-		local xxx=(
-			extremetube fourtube mofosex pornhd pornhub pornotube redtube
-			spankwire thisav trutube tube8 xbef xhamster xnxx xtube xvideos youjizz youporn
-		)
-		sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
-		rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
-			test/test_age_restriction.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}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2014.04.30.1.ebuild b/net-misc/youtube-dl/youtube-dl-2014.05.12.ebuild
index 45ba7ecd5ead..31f745eb9687 100644
--- a/net-misc/youtube-dl/youtube-dl-2014.04.30.1.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2014.05.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.04.30.1.ebuild,v 1.1 2014/04/30 14:58:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2014.05.12.ebuild,v 1.1 2014/05/12 16:46:41 jer Exp $
 
 EAPI=5