From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 25FDB138334 for ; Mon, 28 Jan 2019 19:09:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1572E14D4; Mon, 28 Jan 2019 18:30:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5FFADE14D4 for ; Mon, 28 Jan 2019 18:30:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2E759335D93 for ; Mon, 28 Jan 2019 18:30:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B2AB24D9 for ; Mon, 28 Jan 2019 18:30:16 +0000 (UTC) From: "Jeroen Roovers" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeroen Roovers" Message-ID: <1548700200.122ab201e342645a4d3aac722fdae303230812c9.jer@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/youtube-dl/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/youtube-dl/youtube-dl-2019.01.27.ebuild net-misc/youtube-dl/youtube-dl-99999999.ebuild X-VCS-Directories: net-misc/youtube-dl/ X-VCS-Committer: jer X-VCS-Committer-Name: Jeroen Roovers X-VCS-Revision: 122ab201e342645a4d3aac722fdae303230812c9 X-VCS-Branch: master Date: Mon, 28 Jan 2019 18:30:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 50c3b6fa-44e8-4b71-984b-d1e0390a1763 X-Archives-Hash: 75474d0677361eecc30c0b7610bb097d commit: 122ab201e342645a4d3aac722fdae303230812c9 Author: Jeroen Roovers gentoo org> AuthorDate: Mon Jan 28 18:26:07 2019 +0000 Commit: Jeroen Roovers gentoo org> CommitDate: Mon Jan 28 18:30:00 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=122ab201 net-misc/youtube-dl: Remove USE=offensive, add RESTRICT=test Bug: https://bugs.gentoo.org/show_bug.cgi?id=599928 Closes: https://bugs.gentoo.org/show_bug.cgi?id=605010 Closes: https://bugs.gentoo.org/show_bug.cgi?id=635996 Closes: https://bugs.gentoo.org/show_bug.cgi?id=643200 Closes: https://bugs.gentoo.org/show_bug.cgi?id=676532 Package-Manager: Portage-2.3.58, Repoman-2.3.12 Signed-off-by: Jeroen Roovers gentoo.org> net-misc/youtube-dl/youtube-dl-2019.01.27.ebuild | 59 ++--------------------- net-misc/youtube-dl/youtube-dl-99999999.ebuild | 60 ++---------------------- 2 files changed, 7 insertions(+), 112 deletions(-) diff --git a/net-misc/youtube-dl/youtube-dl-2019.01.27.ebuild b/net-misc/youtube-dl/youtube-dl-2019.01.27.ebuild index 6ef55f59a57..2cb0551f3e3 100644 --- a/net-misc/youtube-dl/youtube-dl-2019.01.27.ebuild +++ b/net-misc/youtube-dl/youtube-dl-2019.01.27.ebuild @@ -8,76 +8,23 @@ inherit bash-completion-r1 distutils-r1 readme.gentoo-r1 DESCRIPTION="Download videos from YouTube.com (and more sites...)" HOMEPAGE="https://rg3.github.com/youtube-dl/" SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz" - LICENSE="public-domain" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" -IUSE="+offensive test" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +RESTRICT="test" +SLOT="0" RDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] " DEPEND=" ${RDEPEND} - test? ( dev-python/nose[coverage(+)] ) " - S="${WORKDIR}/${PN}" -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 eporner - eroprofile extremetube foxgay goshgay hellporno hentaistigma - hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom - pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu - slutload spankbang spankwire sunporno thisav vporn watchindianporn - xbef xnxx xtube xvideos xxxymovies youjizz youporn - ) - # these have multi-line import statements - local mxxx=( - drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster - ) - # 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 - - eapply_user - - distutils-r1_python_prepare_all -} - src_compile() { distutils-r1_src_compile } -python_test() { - emake test -} - python_install_all() { dodoc README.txt doman ${PN}.1 diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild index 4713e21251b..632093ebfdb 100644 --- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild +++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -8,76 +8,24 @@ inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1 DESCRIPTION="Download videos from YouTube.com (and more sites...)" HOMEPAGE="https://rg3.github.com/youtube-dl/" EGIT_REPO_URI="https://github.com/rg3/youtube-dl" - LICENSE="public-domain" -SLOT="0" -KEYWORDS="" -IUSE="+offensive test" +KEYWORDS="" +RESTRICT="test" +SLOT="0" RDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] " DEPEND=" ${RDEPEND} - 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 eporner - eroprofile extremetube foxgay goshgay hellporno hentaistigma - hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom - pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu - slutload spankbang spankwire sunporno thisav vporn watchindianporn - xbef xnxx xtube xvideos xxxymovies youjizz youporn - ) - # these have multi-line import statements - local mxxx=( - drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster - ) - # 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 - - eapply_user - - distutils-r1_python_prepare_all -} - src_compile() { distutils-r1_src_compile emake ${PN}.{bash-completion,fish,zsh} } -python_test() { - emake test -} - python_install_all() { dodoc README.md