Version bump. Fix multi-line python imports with USE=-offensive (bug #540988 by Erik).

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

4 files changed, 26 insertions, 71 deletions

diff --git a/net-misc/youtube-dl/ChangeLog b/net-misc/youtube-dl/ChangeLog
index 2c2326f0f6da..1ca95a8df4c1 100644
--- a/net-misc/youtube-dl/ChangeLog
+++ b/net-misc/youtube-dl/ChangeLog
@@ -1,6 +1,13 @@
 # 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.457 2015/02/21 11:35:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/ChangeLog,v 1.458 2015/03/04 13:58:31 jer Exp $
+
+*youtube-dl-2015.03.03.1 (04 Mar 2015)
+
+  04 Mar 2015; Jeroen Roovers <jer@gentoo.org> -youtube-dl-2015.02.18.ebuild,
+  -youtube-dl-2015.02.20.ebuild, +youtube-dl-2015.03.03.1.ebuild:
+  Version bump. Fix multi-line python imports with USE=-offensive (bug #540988
+  by Erik).
 
 *youtube-dl-2015.02.20 (21 Feb 2015)
 
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 89f984b7e01a..9be048d77927 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST youtube-dl-2014.11.02.1.tar.gz 1123292 SHA256 2e4ee5cc168eb56f778beec48809aa18068c22f8bbaa1911f5b69cf51edb609e SHA512 0a21d216c36642a079e837440d05338970abd30352564a41267ddb33ff4afd866a28aa678c7186b2a0dd4a11e8ec1e36b55bdf1307b3f23b9f2d3422d8ab9fbd WHIRLPOOL 6bbd185c60371ef553899a2838950fcefa849c76b8ec70d18106e38f9be3ec0bc28c799bd3de3d4ad6a0956699ed6613706b7b4205fcddef1f0ec4bc7c9772a7
-DIST youtube-dl-2015.02.18.tar.gz 1366758 SHA256 dfb87e4c85845de15f05be8f79164c79756eedc3a39aa01a24d52b97093bcf8a SHA512 e0ce30407e29e722e64220faec845be13977d7b0e1f8fcf17345e8e6bcf1b077a00a080714c7eee89f81aab8386073bd6365b11331ad0295249946c1bb8ff8f7 WHIRLPOOL 1c4eef5cbedcbb886842792622b5b2168d8dbfd97c1ea6d7dec1e86b4df4703d5a6eedd50e42770d0f2f1b178eed80fc0483d3e0428ac65441a67af0b728edb6
-DIST youtube-dl-2015.02.20.tar.gz 1378238 SHA256 3bfef8d0202b613ea4b03c40642c8d33eb174cd6360f47bd6d0a83a0dae8622b SHA512 ba6dbd32addd0c76030a4f52d6a3bccfed58094c189d5702379ae4ae99cdd488b25e62615e37a699773091133062fe3eaffcb6ab5dd6c45aed9f9265b67f47c2 WHIRLPOOL ca59185a730ef3d04ca7179452faab9cf3a0f893ab88aa86ee3f174488e8e6d58d6b869588a490229f4a97eae8927116353ed7a4632c87fdbef56236a68ba7c7
+DIST youtube-dl-2015.03.03.1.tar.gz 1407072 SHA256 31e4dd019c1564f9a2b9ad187b461d2fd0c9d1fa3f636ea36d5dd970fb77f539 SHA512 de139c280a59fb3a521a1b6169e59c65915828e49ef38d53a5da53eae6cf9bcd7b65cc3072ba3a13592d8859d6f575bc39bc62e8da87568265230be25cda2df3 WHIRLPOOL bc912d44818a190d31f015930a3b439569993b304d977e3e207c1ae27625fcbb3b27a0012b04d5f62adbfe80c2d1aac227730bbf473cc8936eac64af7b5b27f3
 EBUILD youtube-dl-2014.11.02.1.ebuild 1683 SHA256 05cdd128d0e7fe3c6d3d7c478a26c9bf0d115cda96d56ad5c60ea591002d1091 SHA512 1c81ade34e1165c43f545def40a397dacab353d7d7aed2643358ac7edd8bd515abd36fda5ca917f0d0b801d644dbbf71a3f64b014191c85ab84ab08421b14fe8 WHIRLPOOL 6bfd5803999f6c0265b1a5e336b5acd9b66838037576f9aa5ebbabd5dfac03f9cccb434d3d9c8b4958fd1a4c9026028f185b18ff9d99daeb695cf9203b951bf2
-EBUILD youtube-dl-2015.02.18.ebuild 1760 SHA256 57c1ad5b2fe2ca2de54ccc4b54196b482fb33822073b56b35d02e7e59c2f4c4d SHA512 7b36e1804a86689c8ad981383ff395d0bb2ad86acb610b1e58dee51adcc1c12eb99dc3522bcce4fe649317b85cc05dc505f337abb4206cfe27422518f07263d3 WHIRLPOOL 58802d4cdffa8c77bbe5ec4fb979c789961a31658b74672bd66b72894be90569bb9d726bd5057e78b0481fc7721fe1c0b1d457f74a6d192b4f7acde412cfef4e
-EBUILD youtube-dl-2015.02.20.ebuild 1760 SHA256 34376aaa826c67cef2192efbf844300e50fbafa20a1d119d94ea6bfd04f85d2a SHA512 de59498dc1ad6a487705599f1aece4ee39eed96a2775fb7c273f3c7b7ab03257a3e89d907e0a493a4239a374d88a953d9cf36da3f93fc124efb36cfa8db022db WHIRLPOOL 367d458d6dcc6c97e4651b118a1e6081417d700d935bdb36af9a44a765c44da94cacf3b442596338b61df3cfb1f57a0354881085169557ef106414949e6e81c6
-MISC ChangeLog 69580 SHA256 673d5918fd34f2f2a1c2f5a2e072e0a6c68a2b16f6775a2e7ccf589e86babde6 SHA512 a1b820305586d1530d371df098498d5ce2dfe24f72b5d9d0f023df2735f91342cc70fbe724268c25a550c49f06d6aeeae6ce8f9d7eebe3086c614b7bb5697a66 WHIRLPOOL a5d5b2be7e3639fba9c1fd7f19bceee3c1ce6753b94c87851a5c8acbf76f2518d7ced5940ff40b362973abf5860c5a41735acf936d1e5b9e765ffb6c640798b4
+EBUILD youtube-dl-2015.03.03.1.ebuild 2076 SHA256 711bc1cbf605d0ad86c66e0f06694a7c3149da527bec988de8ecbe0664bb44ff SHA512 f08d88256d1d5993d052c3cdde42a716f921d91f3c97061e283157a6952bdcd4cea63d2f37f787d99783c876e9737e2d858f637fd83d7d16a5b8d8e33d7f1336 WHIRLPOOL c29ea669593516d946622f6e3221a5d8c71308006a729f11056a02fecd7672e136540b159c515e34130fb51839b48c1a4176c026a7a3a5d58c3c11a1ffe70092
+MISC ChangeLog 69856 SHA256 f1bb460a593f1599868bb0f5c1d952256273a5fc03e66810a31ffe7487ed81bb SHA512 aafee08892f5b89cf4be72fe75f9b2200fb5d259f3e3899a809fa28b53ce2f74bbd73947050ae84ef337dc2b1604d8de0396459af76477c335315a07611bf7e9 WHIRLPOOL aea572325e9261409843f70d2cd9e18380ff2ef9ce91b75732db4de263fa1bd05f95490b89b4a64f04138e2817e47fb7ef55680d0c8bffd5460a481fed4523f7
 MISC metadata.xml 274 SHA256 2b4f14b46d21b004377e745db520f7961bc4163b23e6f3d8bbcab508272b1f69 SHA512 acfb3695928ebf2ee87c75f06c7ab47a65f4aa8564b1426ee523a1a5c853ed56df0de4cba186ac003383a27dfa9d21e4f4ff44b48e152c406a918f1b01ca358b WHIRLPOOL 0f245af71a769b0d4eb9bb57a99599a0875ad0373a830ff9e8215a077d3d2f02e916b7b25d275b19b5139810608abddfada68d3d0f2e9191351d26ba716b623b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlTobZIACgkQVWmRsqeSphOJqgCcC2DTFk/Hf51lG9hihyQPxv/f
-xR4AmwbuZbfikn/s8fHprKLB25b5qenk
-=YSvi
+iEYEAREIAAYFAlT3D4gACgkQVWmRsqeSphMIRgCeM4uClF+eHOge4mMycS73QWxU
+Q8gAn070IytogaUXT471KPZ5yQWw5qr9
+=jUkD
 -----END PGP SIGNATURE-----
diff --git a/net-misc/youtube-dl/youtube-dl-2015.02.20.ebuild b/net-misc/youtube-dl/youtube-dl-2015.02.20.ebuild
deleted file mode 100644
index cfd600e68887..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2015.02.20.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.02.20.ebuild,v 1.1 2015/02/21 11:35:44 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
-		local xxx=(
-			alphaporno anysex behindkink drtuber empflix eporner eroprofile
-			extremetube fourtube foxgay goshgay hellporno hentaistigma
-			hornbunny keezmovies mofosex motherless pornhd pornhub pornotube
-			pornoxo redtube sexykarma sexu sunporno slutload spankwire thisav
-			tnaflix trutube tube8 vporn xbef xhamster xnxx xtube xvideos
-			xxxymovies 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 README.txt
-	doman ${PN}.1
-	newbashcomp ${PN}.bash-completion ${PN}
-	python_fix_shebang "${ED}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2015.02.18.ebuild b/net-misc/youtube-dl/youtube-dl-2015.03.03.1.ebuild
index 7b720805ac55..63e02ca938ca 100644
--- a/net-misc/youtube-dl/youtube-dl-2015.02.18.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2015.03.03.1.ebuild
@@ -1,6 +1,6 @@
 # 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.02.18.ebuild,v 1.1 2015/02/18 06:57:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2015.03.03.1.ebuild,v 1.1 2015/03/04 13:58:31 jer Exp $
 
 EAPI=5
 
@@ -28,16 +28,26 @@ 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 pornhub pornotube
+			hornbunny keezmovies mofosex motherless pornhd pornotube
 			pornoxo redtube sexykarma sexu sunporno slutload 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
 }