commit:     37f30b0a27452cf4fb2b9cf37a5ae8f7d95f9954
Author:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 01:05:36 2018 +0000
Commit:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 01:06:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f30b0a

dev-python/django: revert removal of 1.8.18

Its removal broke a couple of revdeps I didn't properly check. Sorry.

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 dev-python/django/Manifest                         |   1 +
 dev-python/django/django-1.8.18.ebuild             | 106 +++++++++++++++++++++
 .../django/files/django-1.7.6-bashcomp.patch       |  34 +++++++
 3 files changed, 141 insertions(+)

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 581892f6f14..95d178fbb87 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,2 +1,3 @@
 DIST Django-1.11.14.tar.gz 7850578 BLAKE2B 
b858ab51d40812979ec04cffc459ce137a5f5604d105e73c2fdf9e36b07fd5cf12a7f31d6f89607716220328313663f4e99dabfdf40f93b5c829efe533efbc51
 SHA512 
71dbbad22bf0675a5c9aa36bcf69d6de561cf041b744fa37b407cb021ef342c3245b8001025c0492ce20df664e37ed2d7a5ffdc397761065d088ddb0d9fbe6c8
+DIST Django-1.8.18.tar.gz 7297986 BLAKE2B 
3cf777d98bfc278a3b6458cbb1bbd273e6b77e35bdae24e73cd1af6b6ab7e71ef12d36df73d90a3971ac3b6fe6edbb4a2d14a95a6f2200c99419a049eb95cdda
 SHA512 
41959c1012feec579dc991129976a655bc2f1ff7298bd05951c925b3d0a86a67cc32bf8a78273236b3db05cc1eb841a7aba5091bd06a072dd73c55eb0f7ecee8
 DIST Django-2.0.7.tar.gz 7988568 BLAKE2B 
afc3fb9cd3f37b7488ad8eb46eb9ebb540c54b04661a44620951930a352537ee3a3072a604fd2cbbc95ea3fe112ebab25f45f971bc30ad48161eb8cda26db6d3
 SHA512 
ef42d9046ce3e7b5067c5b85114c0cb5854b0ebb1d3bae526484f11da8abbf04864c83f176e9c6e498c9140b134c9a517968c7bb0bc087c49bf105b2aae8644c

diff --git a/dev-python/django/django-1.8.18.ebuild 
b/dev-python/django/django-1.8.18.ebuild
new file mode 100644
index 00000000000..413258c4600
--- /dev/null
+++ b/dev-python/django/django-1.8.18.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils versionator webapp
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/";
+SRC_URI="
+       https://www.djangoproject.com/m/releases/$(get_version_component_range 
1-2)/${MY_P}.tar.gz
+       mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
+       "
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+       dev-python/setuptools[${PYTHON_USEDEP}]
+       doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+       test? (
+               $(python_gen_impl_dep sqlite)
+               dev-python/docutils[${PYTHON_USEDEP}]
+               dev-python/numpy[$(python_gen_usedep 'python*')]
+               dev-python/pillow[${PYTHON_USEDEP}]
+               dev-python/pytz[${PYTHON_USEDEP}]
+               dev-python/pyyaml[${PYTHON_USEDEP}]
+               )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
+)
+
+pkg_setup() {
+       webapp_pkg_setup
+}
+
+python_prepare_all() {
+       # Prevent d'loading in the doc build
+       sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
+
+       distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+       use doc && emake -C docs html
+}
+
+python_test() {
+       # Tests have non-standard assumptions about PYTHONPATH,
+       # and don't work with ${BUILD_DIR}/lib.
+       PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+               || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+       newbashcomp extras/django_bash_completion ${PN}-admin
+       bashcomp_alias ${PN}-admin django-admin.py
+
+       if use doc; then
+               rm -fr docs/_build/html/_sources || die
+               local HTML_DOCS=( docs/_build/html/. )
+       fi
+
+       insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+       doins -r django/contrib/admin/static/admin/.
+       distutils-r1_python_install_all
+}
+
+src_install() {
+       distutils-r1_src_install
+       webapp_src_install
+}
+
+pkg_postinst() {
+       elog "Additional Backend support can be enabled via"
+       optfeature "MySQL backend support in python 2.7 only" 
dev-python/mysql-python
+       optfeature "MySQL backend support in python 2.7 - 3.4" 
dev-python/mysqlclient
+       optfeature "PostgreSQL backend support" dev-python/psycopg:2
+       echo ""
+       elog "Other features can be enhanced by"
+       optfeature "GEO Django" sci-libs/gdal[geos]
+       optfeature "Memcached support" dev-python/pylibmc 
dev-python/python-memcached
+       optfeature "ImageField Support" dev-python/pillow
+       optfeature "Password encryption" dev-python/bcrypt
+       optfeature "High-level abstractions for Django forms" 
dev-python/django-formtools
+       echo ""
+       elog "A copy of the admin media is available to webapp-config for 
installation in a"
+       elog "webroot, as well as the traditional location in python's 
site-packages dir"
+       elog "for easy development."
+       webapp_pkg_postinst
+}

diff --git a/dev-python/django/files/django-1.7.6-bashcomp.patch 
b/dev-python/django/files/django-1.7.6-bashcomp.patch
new file mode 100644
index 00000000000..ef76f8a873c
--- /dev/null
+++ b/dev-python/django/files/django-1.7.6-bashcomp.patch
@@ -0,0 +1,34 @@
+ extras/django_bash_completion | 16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/extras/django_bash_completion b/extras/django_bash_completion
+index 3e02d8e..5a33938 100755
+--- a/extras/django_bash_completion
++++ b/extras/django_bash_completion
+@@ -37,7 +37,7 @@ _django_completion()
+                    COMP_CWORD=$COMP_CWORD \
+                    DJANGO_AUTO_COMPLETE=1 $1 ) )
+ }
+-complete -F _django_completion -o default django-admin.py manage.py 
django-admin
++complete -F _django_completion -o default django-admin.py django-admin
+ 
+ _python_django_completion()
+ {
+@@ -55,17 +55,3 @@ _python_django_completion()
+         fi
+     fi
+ }
+-
+-# Support for multiple interpreters.
+-unset pythons
+-if command -v whereis &>/dev/null; then
+-    python_interpreters=$(whereis python | cut -d " " -f 2-)
+-    for python in $python_interpreters; do
+-        pythons="${pythons} ${python##*/}"
+-    done
+-    pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
+-else
+-    pythons=python
+-fi
+-
+-complete -F _python_django_completion -o default $pythons

Reply via email to