Version bump.

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

3 files changed, 82 insertions, 15 deletions

diff --git a/net-misc/youtube-dl/ChangeLog b/net-misc/youtube-dl/ChangeLog
index 2e785010f35a..9fe5ffa0b2cf 100644
--- a/net-misc/youtube-dl/ChangeLog
+++ b/net-misc/youtube-dl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/youtube-dl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.466 2015/04/08 13:12:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.467 2015/04/09 03:56:24 jer Exp $
+
+*youtube-dl-2015.04.09 (09 Apr 2015)
+
+  09 Apr 2015; Jeroen Roovers <jer@gentoo.org> +youtube-dl-2015.04.09.ebuild:
+  Version bump.
 
   08 Apr 2015; Agostino Sarubbo <ago@gentoo.org> youtube-dl-2015.04.03.ebuild:
   Stable for amd64, wrt bug #545484
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 7f099c7ee90c..cf8c0894ec31 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -4,25 +4,17 @@ Hash: SHA256
 DIST youtube-dl-2014.11.02.1.tar.gz 1123292 SHA256 2e4ee5cc168eb56f778beec48809aa18068c22f8bbaa1911f5b69cf51edb609e SHA512 0a21d216c36642a079e837440d05338970abd30352564a41267ddb33ff4afd866a28aa678c7186b2a0dd4a11e8ec1e36b55bdf1307b3f23b9f2d3422d8ab9fbd WHIRLPOOL 6bbd185c60371ef553899a2838950fcefa849c76b8ec70d18106e38f9be3ec0bc28c799bd3de3d4ad6a0956699ed6613706b7b4205fcddef1f0ec4bc7c9772a7
 DIST youtube-dl-2015.03.28.tar.gz 1462478 SHA256 4333a9e1f5c44a084cc4df6b24676bbc0a6847bce3cf8ebc03b294a97c7df1d1 SHA512 32a2934ac54cebbd7112a2cfaa9c4809a12d33d4d78902ea493e0a5cc5da2e1581d9bfd1540844bc8578f21987ba148be6c92c372c6cbddcca3832c64ebf63e8 WHIRLPOOL 0e822d36a016eecd8fd1efc8d583fcae3118aa40ea8dd5f12859104441fa55de8a77ee1bcecbfad76cbeca365ee0b90f7735cd9444632d7ff43b1460be151adf
 DIST youtube-dl-2015.04.03.tar.gz 1472296 SHA256 0521a15a24a9b620728a2f45ea9163ca74660ed443781b6e69b4e06d36d7bf59 SHA512 6b2c85cfa222a31f3462aab583fa98bb92544cd5fb0d395ca0b69a26c24ab174870d02264e058281f09305752d50aa5a06d0d747205499a530b275e3194fc6f9 WHIRLPOOL 391e06ea261f92e03a0b38618307f1c9d53a2dfb9f2062fe0cd3ded1ea0c411033a17ded581616032c74a9e4fb398a57e565bf847196a23a9f89433f861362ae
+DIST youtube-dl-2015.04.09.tar.gz 1482406 SHA256 8171182490e33413ad9f21c2f46b6640c8baee7655c95d4bf96ae696f3ce1c6c SHA512 79ac7688300f12081c603c6f1d778ab1b4c3c0239179d412890809151e98a7e003b76e9c6683e22db8e67fbbd558976acff12cafb70aebb5c241b3a39b4855ae WHIRLPOOL 0ef72ace5ecd09098760d58a85d97cb06c361018a0790ffa2f88dcd32d8835e4d6bc1a4352bdb1b3a6c4952b33b8bb156fcc817d00b8c6a2eaf5da552f7795db
 EBUILD youtube-dl-2014.11.02.1.ebuild 1683 SHA256 05cdd128d0e7fe3c6d3d7c478a26c9bf0d115cda96d56ad5c60ea591002d1091 SHA512 1c81ade34e1165c43f545def40a397dacab353d7d7aed2643358ac7edd8bd515abd36fda5ca917f0d0b801d644dbbf71a3f64b014191c85ab84ab08421b14fe8 WHIRLPOOL 6bfd5803999f6c0265b1a5e336b5acd9b66838037576f9aa5ebbabd5dfac03f9cccb434d3d9c8b4958fd1a4c9026028f185b18ff9d99daeb695cf9203b951bf2
 EBUILD youtube-dl-2015.03.28.ebuild 2074 SHA256 ac58919bcee7092f72a587153dd4fa28157b9a28a09d596254bd1b911445ceb0 SHA512 541b3293ec7911323ed773f93c2405d304b961e8396305d0df5496d517990fd421c18363630fa12263ec2c31224f305212ec1d8e9af07ce71203ddf6493f9dd6 WHIRLPOOL 5212f39430c90cc0928abc86fe426696b7e626ed30e75b324550c2bebc7ded17be978b3f2756af22607499e019618a2a6074aeea8fbe1a59c0a41071f2194228
 EBUILD youtube-dl-2015.04.03.ebuild 2072 SHA256 4bc3927c7a5dc8520c486e45bc6932b888902ea0bf1892ad6cb1f73a61a094f7 SHA512 b6bb2bf78313bccb727010745ac7d24b22b48cc73317bde17335b99692d6b2c34309d7436619b3b42b85efb701343f5a4eb160be9f7b44714f248579c7bc10f6 WHIRLPOOL 652ad229be65c463088133768ff285654b62271177ec80a75c1b91b8e0e099bcb750cfc179f28f8e0a89dd02c0ce4b9343fdff49f91b383edf11ef03aef77a87
-MISC ChangeLog 71048 SHA256 439ec0b7b30f73ea5524a11557db7a1360a177abf456d7455df096b76390b558 SHA512 29b4d41f2841faf9894ff8203233eb73ec536c9bd711820507035ecdac971b2f20b4eadd49d9c80c7debe4404d37bdf376a6101cac3610e5265ef49e32c74b0c WHIRLPOOL 62bc54c4ac0b06d5389342e4f8617a8475ffa62a449e7b446bb680499beedb1f9a53d04db8a0bc8d2b8a77b7924571b76870e566b7378d055eb554801e6ca616
+EBUILD youtube-dl-2015.04.09.ebuild 2098 SHA256 b6d9fa724ccdc949c9349cd6e191b2f4695a08b477fea7492ecc6eeeed9f9338 SHA512 82f180de6ce0e2a1315a2babbfd9091598307b489962d93528cd554e420197271a07658ec1b5509f495c633e3dd4cf6e5b6c8441683920ae3edd41c1adf6bffb WHIRLPOOL 2b833143bcc32211244b8f02f359a3b5a725e75f9884dc6053662ec7c6bb08cdd7a445721e04cf04a8fe9076fd0dc7601520dce4a8df4c4a2aef8aa611be1e32
+MISC ChangeLog 71181 SHA256 b5fc0ac09a7f4d82e2a37b42a86eb97372ca8246ebf140735ab4518664f79083 SHA512 f6451304c7a39b96c0af7c12770d9f728ca77bf2a0074ae1885d28d760740f44fc9284db7470b984a0dde9f0aeae75a65d601df95a7307c8bfae9d4d5b50f5bd WHIRLPOOL b5b8f6bccfc24fbd3ee527572b84089f11e4319e6c30a945cbeb5945a33ed5d1b3c72530597b4a2578467161af56bc92fe0fc27d43368f5971e32e39cac02470
 MISC metadata.xml 274 SHA256 2b4f14b46d21b004377e745db520f7961bc4163b23e6f3d8bbcab508272b1f69 SHA512 acfb3695928ebf2ee87c75f06c7ab47a65f4aa8564b1426ee523a1a5c853ed56df0de4cba186ac003383a27dfa9d21e4f4ff44b48e152c406a918f1b01ca358b WHIRLPOOL 0f245af71a769b0d4eb9bb57a99599a0875ad0373a830ff9e8215a077d3d2f02e916b7b25d275b19b5139810608abddfada68d3d0f2e9191351d26ba716b623b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVJSlQAAoJELp701BxlEWf+QYP/37lVsQXBACku6h91saG4+so
-OGFw3AsRaGWn7QRx/YnEke/MZGr528ldL9STbZvjL70+jKny70E0mC8Jywm66CtT
-jgAVJolOcA2nPsoTVOQXwlAlzfdqs+SgQxYVmq8jpT7cL5qhp/a62hRm9yZU6uA+
-1G5fYZDZ1fSn3P8yDvY9G794Uq6dXvC/G99D5CaG3JYND+52YcYg/W99BRlgV2zz
-k3eTFq0GKYgJIhgb3GPqN8g0ElYHdONNu9kXvlzm3vk9SGsSEvjuWEdkraviLX4A
-Ghvm3fLmWwxYLkY9UiBxORJJRKLERN1HleJZ438bE03W+wRrfcd2BPUusbwYs9sv
-JAWmfJRiYLacXQVQewDLNaHgUEkceXwi61CEc3wOpa8EQXNq4ZkbFvfvMrD2zKat
-r7fKeVjUGuJeo/pQYPdB1TfhFz1k2gOWJMwHa+O0uIlg9UN2PHv7oBwjaRuUXGFX
-tf0k1A9olfGn0xPyhAl1Y1nwfzfOofX/0ekz1tj2PtGXNjTNvzbQ64TWVoZjEiSf
-UHbnVasxiP0qDyXjJq7Zd6ImYluvu85tmr8D5vNitWi95cJIEJiWDdKLzLsB1lax
-38Pz86CZHdZXmtEe6isoPpK+chHan1O2TrERhw6licyyJ44Y5UP67IJCc7jxt+pM
-DETNgYUUuAhDOc41008+
-=5i/3
+iEYEAREIAAYFAlUl+GkACgkQVWmRsqeSphNeQwCeOpCfmEs4H9X7DPRmf9x+/idC
+w20An3uB6mmemxv9BOcGQnsXCri2dz/e
+=xpmz
 -----END PGP SIGNATURE-----
diff --git a/net-misc/youtube-dl/youtube-dl-2015.04.09.ebuild b/net-misc/youtube-dl/youtube-dl-2015.04.09.ebuild
new file mode 100644
index 000000000000..278e04551d55
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2015.04.09.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.04.09.ebuild,v 1.1 2015/04/09 03:56:24 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(python{2_7,3_3,3_4})
+DISTUTILS_SINGLE_IMPL=true
+inherit bash-completion-r1 distutils-r1 eutils
+
+DESCRIPTION="Download videos from YouTube.com (and more 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
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink drtuber empflix eporner eroprofile
+			extremetube fourtube foxgay goshgay hellporno hentaistigma
+			hornbunny keezmovies mofosex motherless pornhd pornotube
+			pornovoisines pornoxo redtube sexykarma sexu sunporno slutload
+			spankbang spankwire thisav tnaflix trutube tube8 vporn xbef
+			xhamster xnxx xtube xvideos xxxymovies youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			pornhub
+		)
+		# do single line imports
+		sed -i -e $( printf '/%s/d;' ${xxx[@]} ) youtube_dl/extractor/__init__.py || die
+		# do multiple line imports
+		sed -i -e $( printf '/%s/,/)/d;' ${mxxx[@]} ) youtube_dl/extractor/__init__.py || die
+
+		rm $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			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 README.txt
+	doman ${PN}.1
+	newbashcomp ${PN}.bash-completion ${PN}
+	python_fix_shebang "${ED}"
+}