Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/django/files/, dev-python/django/
Date: Thu, 05 Mar 2020 19:08:00
Message-Id: 1583435271.124b2b0f18a73dc01d867817a1604ef227f48a44.mgorny@gentoo
1 commit: 124b2b0f18a73dc01d867817a1604ef227f48a44
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 5 18:53:33 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 5 19:07:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124b2b0f
7
8 dev-python/django: Remove 1*
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/django/Manifest | 2 -
13 dev-python/django/django-1.11.20.ebuild | 113 ----------------------
14 dev-python/django/django-1.11.21.ebuild | 113 ----------------------
15 dev-python/django/files/django-1.9-bashcomp.patch | 46 ---------
16 4 files changed, 274 deletions(-)
17
18 diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
19 index 86e9ef6d1a0..a24eca6d3aa 100644
20 --- a/dev-python/django/Manifest
21 +++ b/dev-python/django/Manifest
22 @@ -1,5 +1,3 @@
23 -DIST Django-1.11.20.tar.gz 7846576 BLAKE2B 11423edda7f2f08cc894957da65c746c99ce7ce5399ff236972cce627e347cbc4a43c7ff75282318fac2ac8f65fc4db691ac9fe8e04059b0de4f1bfe31278382 SHA512 5a0fff6c9b90a08e98dee6d4d090047adb900a8f6a061f98e685e8998bfe3d97fe7a90aa7d4d2feae67026fb6e4441393d50cb5ab295604ed362a080b987f062
24 -DIST Django-1.11.21.tar.gz 7847136 BLAKE2B 940734dc980901cb13fd90ef38815556d41e94a9fb1ac3a0e36e786b4a8df549ec2bce8a114ffbff1133a066ee8423c7beaccc7c774985df0aa1def1ebab58c1 SHA512 c91a1189b6b8fbbb1470f870b09c1c553e860d3b8c0977240399524a830d5403929f14b4e4b689354080748aab1c70587ad56e265f4ac0b3bdc2714d01adbbc4
25 DIST Django-2.1.8.tar.gz 8613572 BLAKE2B 543e41f1b4031b624f903f075e95af7e010510f4c265aebd35a5f6b3f074703b3a4b54bc7f2a9752e717ac99d20c42d6e34e556ca619a531cf8c66622ce1419a SHA512 f84fcdf919091a9db6289f25da601ce447382f79118a99f8f316b2479a9325d629f725edb4618300f76e23bd68ae45ff4c6b6576988f109d1a7ba715c73327c3
26 DIST Django-2.1.9.tar.gz 8608747 BLAKE2B d5ef1aacc30067dfe5369655eb23ea67788f22edcf8ba070944c0fb4fdf2fc3628a364d480a3d47bae0339255fb66a3bc27f11eb5f07280812ab5f57b4367c64 SHA512 1f6ad122012d898da52ce44465700d2492ef9002d5c327b25e3edfe2116b8a1143feab79751a581029664311452d52d96fe116d8817edb0ef7d7dbddfc0a5ec7
27 DIST Django-2.2.1.tar.gz 8973889 BLAKE2B 890ab092807a587dbaba69fb6da7a4c53c8e976d3a4c29003549d72dd69c374640df280885a62845dda0d00f432e398747b9ed652aebbd7e3434c07e71d9a80f SHA512 661ed7352847d2167f8d3410b476cb585a269ef5d3afe0cb59cf0c9a2ea22f0572f12825368bc222f33f8c6d4c71767adade97e25b69f5a619795ccb670773e2
28
29 diff --git a/dev-python/django/django-1.11.20.ebuild b/dev-python/django/django-1.11.20.ebuild
30 deleted file mode 100644
31 index 63eb7b863c6..00000000000
32 --- a/dev-python/django/django-1.11.20.ebuild
33 +++ /dev/null
34 @@ -1,113 +0,0 @@
35 -# Copyright 1999-2020 Gentoo Authors
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -
40 -PYTHON_COMPAT=( python2_7 python3_{6,7} )
41 -PYTHON_REQ_USE='sqlite?,threads(+)'
42 -WEBAPP_NO_AUTO_INSTALL="yes"
43 -
44 -inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
45 -
46 -MY_PN="Django"
47 -MY_P="${MY_PN}-${PV}"
48 -
49 -DESCRIPTION="High-level Python web framework"
50 -HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
51 -SRC_URI="
52 - https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
53 - mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
54 - "
55 -
56 -LICENSE="BSD"
57 -# admin fonts: Roboto (media-fonts/roboto)
58 -LICENSE+=" Apache-2.0"
59 -# admin icons, jquery, xregexp.js
60 -LICENSE+=" MIT"
61 -SLOT="0"
62 -KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
63 -IUSE="doc sqlite test"
64 -RESTRICT="!test? ( test )"
65 -
66 -RDEPEND=""
67 -DEPEND="${RDEPEND}
68 - dev-python/pytz[${PYTHON_USEDEP}]
69 - dev-python/setuptools[${PYTHON_USEDEP}]
70 - doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
71 - test? (
72 - $(python_gen_impl_dep sqlite)
73 - dev-python/docutils[${PYTHON_USEDEP}]
74 - dev-python/numpy[$(python_gen_usedep 'python*')]
75 - dev-python/pillow[${PYTHON_USEDEP}]
76 - dev-python/pyyaml[${PYTHON_USEDEP}]
77 - dev-python/mock[${PYTHON_USEDEP}]
78 - virtual/python-enum34[${PYTHON_USEDEP}]
79 - )"
80 -
81 -S="${WORKDIR}/${MY_P}"
82 -
83 -WEBAPP_MANUAL_SLOT="yes"
84 -
85 -PATCHES=(
86 - "${FILESDIR}"/${PN}-1.9-bashcomp.patch
87 -)
88 -
89 -pkg_setup() {
90 - webapp_pkg_setup
91 -}
92 -
93 -python_prepare_all() {
94 - # Prevent d'loading in the doc build
95 - sed -e '/^ "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
96 -
97 - distutils-r1_python_prepare_all
98 -}
99 -
100 -python_compile_all() {
101 - use doc && emake -C docs html
102 -}
103 -
104 -python_test() {
105 - # Tests have non-standard assumptions about PYTHONPATH,
106 - # and don't work with ${BUILD_DIR}/lib.
107 - PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
108 - || die "Tests fail with ${EPYTHON}"
109 -}
110 -
111 -python_install_all() {
112 - newbashcomp extras/django_bash_completion ${PN}-admin
113 - bashcomp_alias ${PN}-admin django-admin.py
114 -
115 - if use doc; then
116 - rm -fr docs/_build/html/_sources || die
117 - local HTML_DOCS=( docs/_build/html/. )
118 - fi
119 -
120 - insinto "${MY_HTDOCSDIR#${EPREFIX}}"
121 - doins -r django/contrib/admin/static/admin/.
122 - distutils-r1_python_install_all
123 -}
124 -
125 -src_install() {
126 - distutils-r1_src_install
127 - webapp_src_install
128 -}
129 -
130 -pkg_postinst() {
131 - elog "Additional Backend support can be enabled via"
132 - optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
133 - optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
134 - optfeature "PostgreSQL backend support" dev-python/psycopg:2
135 - echo ""
136 - elog "Other features can be enhanced by"
137 - optfeature "GEO Django" sci-libs/gdal[geos]
138 - optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
139 - optfeature "ImageField Support" dev-python/pillow
140 - optfeature "Password encryption" dev-python/bcrypt
141 - optfeature "High-level abstractions for Django forms" dev-python/django-formtools
142 - echo ""
143 - elog "A copy of the admin media is available to webapp-config for installation in a"
144 - elog "webroot, as well as the traditional location in python's site-packages dir"
145 - elog "for easy development."
146 - webapp_pkg_postinst
147 -}
148
149 diff --git a/dev-python/django/django-1.11.21.ebuild b/dev-python/django/django-1.11.21.ebuild
150 deleted file mode 100644
151 index a09c08fe93a..00000000000
152 --- a/dev-python/django/django-1.11.21.ebuild
153 +++ /dev/null
154 @@ -1,113 +0,0 @@
155 -# Copyright 1999-2020 Gentoo Authors
156 -# Distributed under the terms of the GNU General Public License v2
157 -
158 -EAPI=6
159 -
160 -PYTHON_COMPAT=( python2_7 python3_{6,7} )
161 -PYTHON_REQ_USE='sqlite?,threads(+)'
162 -WEBAPP_NO_AUTO_INSTALL="yes"
163 -
164 -inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
165 -
166 -MY_PN="Django"
167 -MY_P="${MY_PN}-${PV}"
168 -
169 -DESCRIPTION="High-level Python web framework"
170 -HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
171 -SRC_URI="
172 - https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
173 - mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
174 - "
175 -
176 -LICENSE="BSD"
177 -# admin fonts: Roboto (media-fonts/roboto)
178 -LICENSE+=" Apache-2.0"
179 -# admin icons, jquery, xregexp.js
180 -LICENSE+=" MIT"
181 -SLOT="0"
182 -KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
183 -IUSE="doc sqlite test"
184 -RESTRICT="!test? ( test )"
185 -
186 -RDEPEND=""
187 -DEPEND="${RDEPEND}
188 - dev-python/pytz[${PYTHON_USEDEP}]
189 - dev-python/setuptools[${PYTHON_USEDEP}]
190 - doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
191 - test? (
192 - $(python_gen_impl_dep sqlite)
193 - dev-python/docutils[${PYTHON_USEDEP}]
194 - dev-python/numpy[$(python_gen_usedep 'python*')]
195 - dev-python/pillow[${PYTHON_USEDEP}]
196 - dev-python/pyyaml[${PYTHON_USEDEP}]
197 - dev-python/mock[${PYTHON_USEDEP}]
198 - virtual/python-enum34[${PYTHON_USEDEP}]
199 - )"
200 -
201 -S="${WORKDIR}/${MY_P}"
202 -
203 -WEBAPP_MANUAL_SLOT="yes"
204 -
205 -PATCHES=(
206 - "${FILESDIR}"/${PN}-1.9-bashcomp.patch
207 -)
208 -
209 -pkg_setup() {
210 - webapp_pkg_setup
211 -}
212 -
213 -python_prepare_all() {
214 - # Prevent d'loading in the doc build
215 - sed -e '/^ "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
216 -
217 - distutils-r1_python_prepare_all
218 -}
219 -
220 -python_compile_all() {
221 - use doc && emake -C docs html
222 -}
223 -
224 -python_test() {
225 - # Tests have non-standard assumptions about PYTHONPATH,
226 - # and don't work with ${BUILD_DIR}/lib.
227 - PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
228 - || die "Tests fail with ${EPYTHON}"
229 -}
230 -
231 -python_install_all() {
232 - newbashcomp extras/django_bash_completion ${PN}-admin
233 - bashcomp_alias ${PN}-admin django-admin.py
234 -
235 - if use doc; then
236 - rm -fr docs/_build/html/_sources || die
237 - local HTML_DOCS=( docs/_build/html/. )
238 - fi
239 -
240 - insinto "${MY_HTDOCSDIR#${EPREFIX}}"
241 - doins -r django/contrib/admin/static/admin/.
242 - distutils-r1_python_install_all
243 -}
244 -
245 -src_install() {
246 - distutils-r1_src_install
247 - webapp_src_install
248 -}
249 -
250 -pkg_postinst() {
251 - elog "Additional Backend support can be enabled via"
252 - optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
253 - optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
254 - optfeature "PostgreSQL backend support" dev-python/psycopg:2
255 - echo ""
256 - elog "Other features can be enhanced by"
257 - optfeature "GEO Django" sci-libs/gdal[geos]
258 - optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
259 - optfeature "ImageField Support" dev-python/pillow
260 - optfeature "Password encryption" dev-python/bcrypt
261 - optfeature "High-level abstractions for Django forms" dev-python/django-formtools
262 - echo ""
263 - elog "A copy of the admin media is available to webapp-config for installation in a"
264 - elog "webroot, as well as the traditional location in python's site-packages dir"
265 - elog "for easy development."
266 - webapp_pkg_postinst
267 -}
268
269 diff --git a/dev-python/django/files/django-1.9-bashcomp.patch b/dev-python/django/files/django-1.9-bashcomp.patch
270 deleted file mode 100644
271 index 8618dbef920..00000000000
272 --- a/dev-python/django/files/django-1.9-bashcomp.patch
273 +++ /dev/null
274 @@ -1,46 +0,0 @@
275 - extras/django_bash_completion | 35 +----------------------------------
276 - 1 file changed, 1 insertion(+), 34 deletions(-)
277 -
278 -diff --git a/extras/django_bash_completion b/extras/django_bash_completion
279 -index 06a2321..abe76e5 100755
280 ---- a/extras/django_bash_completion
281 -+++ b/extras/django_bash_completion
282 -@@ -37,37 +37,4 @@ _django_completion()
283 - COMP_CWORD=$COMP_CWORD \
284 - DJANGO_AUTO_COMPLETE=1 $1 ) )
285 - }
286 --complete -F _django_completion -o default django-admin.py manage.py django-admin
287 --
288 --_python_django_completion()
289 --{
290 -- if [[ ${COMP_CWORD} -ge 2 ]]; then
291 -- local PYTHON_EXE=${COMP_WORDS[0]##*/}
292 -- echo $PYTHON_EXE | egrep "python([2-9]\.[0-9])?" >/dev/null 2>&1
293 -- if [[ $? == 0 ]]; then
294 -- local PYTHON_SCRIPT=${COMP_WORDS[1]##*/}
295 -- echo $PYTHON_SCRIPT | egrep "manage\.py|django-admin(\.py)?" >/dev/null 2>&1
296 -- if [[ $? == 0 ]]; then
297 -- COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]:1}" \
298 -- COMP_CWORD=$(( COMP_CWORD-1 )) \
299 -- DJANGO_AUTO_COMPLETE=1 ${COMP_WORDS[*]} ) )
300 -- fi
301 -- fi
302 -- fi
303 --}
304 --
305 --# Support for multiple interpreters.
306 --unset pythons
307 --if command -v whereis &>/dev/null; then
308 -- python_interpreters=$(whereis python | cut -d " " -f 2-)
309 -- for python in $python_interpreters; do
310 -- [[ $python != *-config ]] && pythons="${pythons} ${python##*/}"
311 -- done
312 -- unset python_interpreters
313 -- pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
314 --else
315 -- pythons=python
316 --fi
317 --
318 --complete -F _python_django_completion -o default $pythons
319 --unset pythons
320 -+complete -F _django_completion -o default django-admin.py django-admin