From: Jeroen Roovers Date: Wed, 5 Oct 2016 04:58:26 +0000 (+0200) Subject: net-misc/youtube-dl: Fix installing in Prefix by Jonathan Lovelace (bug #596188). X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=40920739a71b13d4388c6ac3cf573111304e6a03;p=gentoo.git net-misc/youtube-dl: Fix installing in Prefix by Jonathan Lovelace (bug #596188). Package-Manager: portage-2.3.1 --- diff --git a/net-misc/youtube-dl/youtube-dl-2016.10.02.ebuild b/net-misc/youtube-dl/youtube-dl-2016.10.02-r1.ebuild similarity index 98% rename from net-misc/youtube-dl/youtube-dl-2016.10.02.ebuild rename to net-misc/youtube-dl/youtube-dl-2016.10.02-r1.ebuild index 233bdf46fe97..1f0ca43a4f19 100644 --- a/net-misc/youtube-dl/youtube-dl-2016.10.02.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2016.10.02-r1.ebuild @@ -95,5 +95,5 @@ python_install_all() { distutils-r1_python_install_all - rm -r "${D}"/usr/etc || die + rm -r "${ED}"/usr/etc || die } diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild index 36b797369d09..260621e877cf 100644 --- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild +++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild @@ -5,7 +5,6 @@ EAPI=5 PYTHON_COMPAT=(python{2_7,3_3,3_4,3_5}) -DISTUTILS_SINGLE_IMPL=true inherit bash-completion-r1 distutils-r1 eutils git-r3 DESCRIPTION="Download videos from YouTube.com (and more sites...)" @@ -15,7 +14,7 @@ EGIT_REPO_URI="https://github.com/rg3/youtube-dl.git" LICENSE="public-domain" SLOT="0" KEYWORDS="" -IUSE="test" +IUSE="offensive test" RDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] @@ -26,21 +25,65 @@ DEPEND=" test? ( dev-python/nose[coverage(+)] ) " +python_prepare_all() { + 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 camwithher chaturbate drtuber eporner + eroprofile extremetube fourtube foxgay goshgay hellporno + hentaistigma hornbunny keezmovies lovehomeporn mofosex motherless + myvidster porn91 pornhd pornotube pornovoisines pornoxo redtube + ruleporn sexu slutload spankbang spankwire sunporno thisav tube8 + vporn watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz + youporn + ) + # these have multi-line import statements + local mxxx=( + pornhub xhamster tnaflix + ) + # do single line imports + sed -i \ + -e $( printf '/%s/d;' ${xxx[@]} ) \ + youtube_dl/extractor/extractors.py \ + || die + + # do multiple line imports + sed -i \ + -e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \ + youtube_dl/extractor/extractors.py \ + || die + + sed -i \ + -e $( printf '/%s/d;' ${mxxx[@]} ) \ + youtube_dl/extractor/generic.py \ + || die + + rm \ + $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \ + $( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \ + test/test_age_restriction.py \ + || die + fi + + epatch_user + + distutils-r1_python_prepare_all +} + src_compile() { distutils-r1_src_compile - emake -C docs man - ${PYTHON} devscripts/bash-completion.py } -src_test() { +python_test() { emake test } -src_install() { - python_domodule youtube_dl - dobin bin/${PN} +python_install_all() { dodoc README.md - doman docs/_build/man/${PN}.1 - newbashcomp ${PN}.bash-completion ${PN} - python_fix_shebang "${ED}" + + distutils-r1_python_install_all + + rm -r "${ED}"/usr/etc || die }