Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/django/files/, dev-python/django/
Date: Wed, 02 Dec 2015 07:53:18
Message-Id: 1449042781.b626ca718f4736db3dcdef09cf465dab65ef13a1.jlec@gentoo
1 commit: b626ca718f4736db3dcdef09cf465dab65ef13a1
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 2 07:53:01 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 2 07:53:01 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b626ca71
7
8 dev-python/django: Version Bump
9
10 Package-Manager: portage-2.2.25
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 dev-python/django/Manifest | 1 +
14 dev-python/django/django-1.9.ebuild | 111 ++++++++++++++++++++++
15 dev-python/django/files/django-1.9-bashcomp.patch | 46 +++++++++
16 3 files changed, 158 insertions(+)
17
18 diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
19 index 4c37289..08ed8fe 100644
20 --- a/dev-python/django/Manifest
21 +++ b/dev-python/django/Manifest
22 @@ -3,3 +3,4 @@ DIST Django-1.5.12.tar.gz 8202839 SHA256 b3de77beb6e59b72071ca66f20c2ad34e1b90d3
23 DIST Django-1.6.11.tar.gz 6764000 SHA256 7e50e573e484435873b3515d7982d80093b2695aba17fd0ff024307454dc3a56 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829 WHIRLPOOL 5de086952bda9449f85798e8fe3bac82f11e1b856c1d39e340399e71ca6bf183318eebf1f536714567036485637166a929082a1ba9d6c1816f07c53dcc12c72a
24 DIST Django-1.7.11.tar.gz 7586798 SHA256 2039144fce8f1b603d03fa5a5643578df1ad007c4ed41a617f02a3943f7059a1 SHA512 2e3415295ee6b590e366b09adb261baccb750519b9bcef1bb09bd52a2db705c8082bfc13440c621a5f41dd4f9bd626792eba4a572e78de3b7caf93c951c406ee WHIRLPOOL 8797862021c6acdfcba5752f6f5f2d567a564812fc5089678a9d00b9d8f1cb13c03bd0cb9b369b68ce1d1f1dc1522f05d41778f5181aef9c7d49783afc280e7c
25 DIST Django-1.8.7.tar.gz 7276831 SHA256 17a66de5cf59b5ee81c3dc57609b145bb45adddc0dc06937b998597d6e7b4523 SHA512 74b89efd4fd2d19542a30e0fa0648652aa85ea309804afadae1162b1cac3492e599beaf5ea868d67bcef5f016283952dcc869726cbf6f15141f0816a0377b041 WHIRLPOOL adae3d00ceab8bb3e526107068270d53de968b782d5e37a64f59ecaf75e8933d3895dc6de5c934ea180c8436a88acb4949f7f4f8bba56c13c92d08874596c784
26 +DIST Django-1.9.tar.gz 7392116 SHA256 05fe4b19a8778d4b48bbf1f4dfca3106881fea7982664553e7f7f861606f7c66 SHA512 255438e4ce89bc128506ef9137604cd38bc7cd5f69b687e9ec6c9332b7a89b55cc904209b630e42e0376cca944a26090da9b209ea2ecaaf0033ee5e8c9e0378d WHIRLPOOL d1ae1b62c7e3966dbef4191910970db3d83b5a6693528adb2966b00f0a599b7674689230e6d2875ea9fd44e0926ab0d98a303b45c61c1bb9a7e54555fd7a1cb7
27
28 diff --git a/dev-python/django/django-1.9.ebuild b/dev-python/django/django-1.9.ebuild
29 new file mode 100644
30 index 0000000..a435541
31 --- /dev/null
32 +++ b/dev-python/django/django-1.9.ebuild
33 @@ -0,0 +1,111 @@
34 +# Copyright 1999-2015 Gentoo Foundation
35 +# Distributed under the terms of the GNU General Public License v2
36 +# $Id$
37 +
38 +EAPI=5
39 +
40 +PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
41 +PYTHON_REQ_USE='sqlite?,threads(+)'
42 +WEBAPP_NO_AUTO_INSTALL="yes"
43 +
44 +inherit bash-completion-r1 distutils-r1 eutils versionator webapp
45 +
46 +MY_PN="Django"
47 +MY_P="${MY_PN}-${PV}"
48 +
49 +DESCRIPTION="High-level Python web framework"
50 +HOMEPAGE="http://www.djangoproject.com/ https://pypi.python.org/pypi/Django"
51 +SRC_URI="
52 + https://www.djangoproject.com/m/releases/$(get_version_component_range 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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
63 +IUSE="doc sqlite test"
64 +
65 +RDEPEND=""
66 +DEPEND="${RDEPEND}
67 + dev-python/setuptools[${PYTHON_USEDEP}]
68 + doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
69 + test? (
70 + ${PYTHON_DEPS//sqlite?/sqlite}
71 + dev-python/docutils[${PYTHON_USEDEP}]
72 + dev-python/numpy[$(python_gen_usedep 'python*')]
73 + dev-python/pillow[${PYTHON_USEDEP}]
74 + dev-python/pytz[${PYTHON_USEDEP}]
75 + dev-python/pyyaml[${PYTHON_USEDEP}]
76 + )"
77 +
78 +S="${WORKDIR}/${MY_P}"
79 +
80 +WEBAPP_MANUAL_SLOT="yes"
81 +
82 +PATCHES=(
83 + "${FILESDIR}"/${P}-bashcomp.patch
84 +)
85 +
86 +pkg_setup() {
87 + webapp_pkg_setup
88 +}
89 +
90 +python_prepare_all() {
91 + # Prevent d'loading in the doc build
92 + sed -e '/^ "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
93 +
94 + distutils-r1_python_prepare_all
95 +}
96 +
97 +python_compile_all() {
98 + use doc && emake -C docs html
99 +}
100 +
101 +python_test() {
102 + # Tests have non-standard assumptions about PYTHONPATH,
103 + # and don't work with ${BUILD_DIR}/lib.
104 + PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
105 + || die "Tests fail with ${EPYTHON}"
106 +}
107 +
108 +python_install_all() {
109 + newbashcomp extras/django_bash_completion ${PN}-admin
110 + bashcomp_alias ${PN}-admin django-admin.py
111 +
112 + if use doc; then
113 + rm -fr docs/_build/html/_sources || die
114 + local HTML_DOCS=( docs/_build/html/. )
115 + fi
116 +
117 + insinto "${MY_HTDOCSDIR#${EPREFIX}}"
118 + doins -r django/contrib/admin/static/admin/.
119 + distutils-r1_python_install_all
120 +}
121 +
122 +src_install() {
123 + distutils-r1_src_install
124 + webapp_src_install
125 +}
126 +
127 +pkg_postinst() {
128 + elog "Additional Backend support can be enabled via"
129 + optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
130 + optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
131 + optfeature "PostgreSQL backend support" dev-python/psycopg:2
132 + echo ""
133 + elog "Other features can be enhanced by"
134 + optfeature "GEO Django" sci-libs/gdal[geos]
135 + optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
136 + optfeature "ImageField Support" dev-python/pillow
137 + optfeature "Password encryption" dev-python/bcrypt
138 + optfeature "High-level abstractions for Django forms" dev-python/django-formtools
139 + echo ""
140 + elog "A copy of the admin media is available to webapp-config for installation in a"
141 + elog "webroot, as well as the traditional location in python's site-packages dir"
142 + elog "for easy development."
143 + webapp_pkg_postinst
144 +}
145
146 diff --git a/dev-python/django/files/django-1.9-bashcomp.patch b/dev-python/django/files/django-1.9-bashcomp.patch
147 new file mode 100644
148 index 0000000..8618dbe
149 --- /dev/null
150 +++ b/dev-python/django/files/django-1.9-bashcomp.patch
151 @@ -0,0 +1,46 @@
152 + extras/django_bash_completion | 35 +----------------------------------
153 + 1 file changed, 1 insertion(+), 34 deletions(-)
154 +
155 +diff --git a/extras/django_bash_completion b/extras/django_bash_completion
156 +index 06a2321..abe76e5 100755
157 +--- a/extras/django_bash_completion
158 ++++ b/extras/django_bash_completion
159 +@@ -37,37 +37,4 @@ _django_completion()
160 + COMP_CWORD=$COMP_CWORD \
161 + DJANGO_AUTO_COMPLETE=1 $1 ) )
162 + }
163 +-complete -F _django_completion -o default django-admin.py manage.py django-admin
164 +-
165 +-_python_django_completion()
166 +-{
167 +- if [[ ${COMP_CWORD} -ge 2 ]]; then
168 +- local PYTHON_EXE=${COMP_WORDS[0]##*/}
169 +- echo $PYTHON_EXE | egrep "python([2-9]\.[0-9])?" >/dev/null 2>&1
170 +- if [[ $? == 0 ]]; then
171 +- local PYTHON_SCRIPT=${COMP_WORDS[1]##*/}
172 +- echo $PYTHON_SCRIPT | egrep "manage\.py|django-admin(\.py)?" >/dev/null 2>&1
173 +- if [[ $? == 0 ]]; then
174 +- COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]:1}" \
175 +- COMP_CWORD=$(( COMP_CWORD-1 )) \
176 +- DJANGO_AUTO_COMPLETE=1 ${COMP_WORDS[*]} ) )
177 +- fi
178 +- fi
179 +- fi
180 +-}
181 +-
182 +-# Support for multiple interpreters.
183 +-unset pythons
184 +-if command -v whereis &>/dev/null; then
185 +- python_interpreters=$(whereis python | cut -d " " -f 2-)
186 +- for python in $python_interpreters; do
187 +- [[ $python != *-config ]] && pythons="${pythons} ${python##*/}"
188 +- done
189 +- unset python_interpreters
190 +- pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
191 +-else
192 +- pythons=python
193 +-fi
194 +-
195 +-complete -F _python_django_completion -o default $pythons
196 +-unset pythons
197 ++complete -F _django_completion -o default django-admin.py django-admin