Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/youtube-dl/
Date: Sun, 15 Oct 2017 11:54:06
Message-Id: 1508068420.37cdd19ccb7782d6a8aa0320099a45b2cc16470e.jer@gentoo
1 commit: 37cdd19ccb7782d6a8aa0320099a45b2cc16470e
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 15 11:53:40 2017 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 15 11:53:40 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37cdd19c
7
8 net-misc/youtube-dl: Old.
9
10 Package-Manager: Portage-2.3.11, Repoman-2.3.3
11
12 net-misc/youtube-dl/Manifest | 2 -
13 net-misc/youtube-dl/youtube-dl-2017.09.24.ebuild | 98 ------------------------
14 net-misc/youtube-dl/youtube-dl-2017.10.01.ebuild | 97 -----------------------
15 3 files changed, 197 deletions(-)
16
17 diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
18 index 009ab62396f..10e59235ee2 100644
19 --- a/net-misc/youtube-dl/Manifest
20 +++ b/net-misc/youtube-dl/Manifest
21 @@ -1,5 +1,3 @@
22 DIST youtube-dl-2017.03.16.tar.gz 2631620 SHA256 55df3cbda9cf86e49baf54040340ec74c692bb3d6da3d2f5a1bc1238017dd492 SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c WHIRLPOOL 8345da00074e62ec9a9c244cb9ef64930fbd0e5e9e5bc1709bfcf56517cc6312031a09523c3016db2a1542c16a0297bea9d6883a201ae94e347e358307e92422
23 -DIST youtube-dl-2017.09.24.tar.gz 2810181 SHA256 7d7140ce63377e84a2072b4922809c7a2e90e3916cde2f4f1cc8860664395548 SHA512 de96406aeabb993a39941f5c67947fd1b77ec003be36b215cb3df1e5c90d63c7c570a5ca7627f5b2faae6a15ee07d45cf339cac6b511890acf49c5c38e6c5672 WHIRLPOOL e248990cce1bcbe50ae9e0ac6a95d760948809ec371b93126011d71599e721f1e9b0784690b832d3c5c04fb55c048b08c091193f821b18e1211f4c393ab2d017
24 -DIST youtube-dl-2017.10.01.tar.gz 2813364 SHA256 0b4f0e12b099c46ad47597764b10f45ceae3935834abf99d49ccd8cfb48dff10 SHA512 f1eafecb2418276df7e7bdb73402779521197f551be3431eda9727390884d42c50a73895d0c58fc3783ab04712e4bf5aa072dad6d3241724e19e6c4c80c0080d WHIRLPOOL 281b7cdb288c1890e785d15cf1aa7c1f8e33976c521559551924b0f18b26981fb33a0b60ff86df796613ef34d273a13b3ada3c5f3e851534dad4bf124260f509
25 DIST youtube-dl-2017.10.07.tar.gz 2816312 SHA256 d9a8935087c1e2fa3307594ae15f1e9ea0f8676e825fa676a50a3a3d471bba83 SHA512 4842c8b324a10a4eff398226749ff8394ca60cf1e47873c1dfb5cf9828b77772670ea30891f32b26bab421aa0e7ca95e2815e062061a2cbaf22e6c5f76e1d87d WHIRLPOOL 525eb2eb3f18bf5ed1776f1a4d43dd010793b3b1681f27b3ed4ed4afdbd0c3dcd2c18b8e532de1fa3c318ac6a5f186c0bdf60fa4c7c69fe939335a7235679c3c
26 DIST youtube-dl-2017.10.15.1.tar.gz 2820437 SHA256 da6ae68b2fbe81da7cf4ac6b989fa7bf27b3beb214eed551d466cc6e41d7297f SHA512 6093747f732dac4eda4c71d334ed01fc24ba70d29e5660c38ff795861f06c4029441c3a4576e6a5463974488aeb7732687e5634481c8b04127f77499a2405a1c WHIRLPOOL cc8fca27f2a110fde556e6c6506a88715d4e4a03c971b7e74e77a91a5b28916c66146afd6e476a19aca2fff3270719da102d254a05f62dbabb5dc2a10040d839
27
28 diff --git a/net-misc/youtube-dl/youtube-dl-2017.09.24.ebuild b/net-misc/youtube-dl/youtube-dl-2017.09.24.ebuild
29 deleted file mode 100644
30 index fa2e8cbf808..00000000000
31 --- a/net-misc/youtube-dl/youtube-dl-2017.09.24.ebuild
32 +++ /dev/null
33 @@ -1,98 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
40 -inherit bash-completion-r1 distutils-r1
41 -
42 -DESCRIPTION="Download videos from YouTube.com (and more sites...)"
43 -HOMEPAGE="https://rg3.github.com/youtube-dl/"
44 -SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
45 -
46 -LICENSE="public-domain"
47 -SLOT="0"
48 -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
49 -IUSE="+offensive test"
50 -
51 -RDEPEND="
52 - dev-python/setuptools[${PYTHON_USEDEP}]
53 -"
54 -DEPEND="
55 - ${RDEPEND}
56 - test? ( dev-python/nose[coverage(+)] )
57 -"
58 -
59 -S="${WORKDIR}/${PN}"
60 -
61 -python_prepare_all() {
62 - if ! use offensive; then
63 - sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
64 - youtube_dl/version.py || die
65 - # these have single line import statements
66 - local xxx=(
67 - alphaporno anysex behindkink camwithher chaturbate eporner
68 - eroprofile extremetube foxgay goshgay hellporno hentaistigma
69 - hornbunny keezmovies lovehomeporn mofosex motherless myvidster
70 - porn91 porncom pornflip pornhd pornotube pornovoisines pornoxo
71 - ruleporn sexu slutload spankbang spankwire sunporno thisav tube8
72 - vporn watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz
73 - youporn
74 - )
75 - # these have multi-line import statements
76 - local mxxx=(
77 - drtuber fourtube pornhub redtube tnaflix xhamster
78 - )
79 - # do single line imports
80 - sed -i \
81 - -e $( printf '/%s/d;' ${xxx[@]} ) \
82 - youtube_dl/extractor/extractors.py \
83 - || die
84 -
85 - # do multiple line imports
86 - sed -i \
87 - -e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
88 - youtube_dl/extractor/extractors.py \
89 - || die
90 -
91 - sed -i \
92 - -e $( printf '/%s/d;' ${mxxx[@]} ) \
93 - youtube_dl/extractor/generic.py \
94 - || die
95 -
96 - rm \
97 - $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
98 - $( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
99 - test/test_age_restriction.py \
100 - || die
101 - fi
102 -
103 - eapply_user
104 -
105 - distutils-r1_python_prepare_all
106 -}
107 -
108 -src_compile() {
109 - distutils-r1_src_compile
110 -}
111 -
112 -python_test() {
113 - emake test
114 -}
115 -
116 -python_install_all() {
117 - dodoc README.txt
118 - doman ${PN}.1
119 -
120 - newbashcomp ${PN}.bash-completion ${PN}
121 -
122 - insinto /usr/share/zsh/site-functions
123 - newins youtube-dl.zsh _youtube-dl
124 -
125 - insinto /usr/share/fish/completions
126 - doins youtube-dl.fish
127 -
128 - distutils-r1_python_install_all
129 -
130 - rm -r "${ED}"/usr/etc || die
131 -}
132
133 diff --git a/net-misc/youtube-dl/youtube-dl-2017.10.01.ebuild b/net-misc/youtube-dl/youtube-dl-2017.10.01.ebuild
134 deleted file mode 100644
135 index 975ce26c347..00000000000
136 --- a/net-misc/youtube-dl/youtube-dl-2017.10.01.ebuild
137 +++ /dev/null
138 @@ -1,97 +0,0 @@
139 -# Copyright 1999-2017 Gentoo Foundation
140 -# Distributed under the terms of the GNU General Public License v2
141 -
142 -EAPI=6
143 -PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
144 -inherit bash-completion-r1 distutils-r1
145 -
146 -DESCRIPTION="Download videos from YouTube.com (and more sites...)"
147 -HOMEPAGE="https://rg3.github.com/youtube-dl/"
148 -SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
149 -
150 -LICENSE="public-domain"
151 -SLOT="0"
152 -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
153 -IUSE="+offensive test"
154 -
155 -RDEPEND="
156 - dev-python/setuptools[${PYTHON_USEDEP}]
157 -"
158 -DEPEND="
159 - ${RDEPEND}
160 - test? ( dev-python/nose[coverage(+)] )
161 -"
162 -
163 -S="${WORKDIR}/${PN}"
164 -
165 -python_prepare_all() {
166 - if ! use offensive; then
167 - sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
168 - youtube_dl/version.py || die
169 - # these have single line import statements
170 - local xxx=(
171 - alphaporno anysex behindkink camwithher chaturbate eporner
172 - eroprofile extremetube foxgay goshgay hellporno hentaistigma
173 - hornbunny keezmovies lovehomeporn mofosex motherless myvidster
174 - porn91 porncom pornflip pornhd pornotube pornovoisines pornoxo
175 - ruleporn sexu slutload spankbang spankwire sunporno thisav tube8
176 - vporn watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz
177 - youporn
178 - )
179 - # these have multi-line import statements
180 - local mxxx=(
181 - drtuber fourtube pornhub redtube tnaflix xhamster
182 - )
183 - # do single line imports
184 - sed -i \
185 - -e $( printf '/%s/d;' ${xxx[@]} ) \
186 - youtube_dl/extractor/extractors.py \
187 - || die
188 -
189 - # do multiple line imports
190 - sed -i \
191 - -e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
192 - youtube_dl/extractor/extractors.py \
193 - || die
194 -
195 - sed -i \
196 - -e $( printf '/%s/d;' ${mxxx[@]} ) \
197 - youtube_dl/extractor/generic.py \
198 - || die
199 -
200 - rm \
201 - $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
202 - $( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
203 - test/test_age_restriction.py \
204 - || die
205 - fi
206 -
207 - eapply_user
208 -
209 - distutils-r1_python_prepare_all
210 -}
211 -
212 -src_compile() {
213 - distutils-r1_src_compile
214 -}
215 -
216 -python_test() {
217 - emake test
218 -}
219 -
220 -python_install_all() {
221 - dodoc README.txt
222 - doman ${PN}.1
223 -
224 - newbashcomp ${PN}.bash-completion ${PN}
225 -
226 - insinto /usr/share/zsh/site-functions
227 - newins youtube-dl.zsh _youtube-dl
228 -
229 - insinto /usr/share/fish/completions
230 - doins youtube-dl.fish
231 -
232 - distutils-r1_python_install_all
233 -
234 - rm -r "${ED}"/usr/etc || die
235 -}