gentoo resync 08.09.2018

4 files changed, 2 insertions, 145 deletions

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index ad8793481d42..d544a57c118b 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,12 +1,9 @@
-AUX django-1.7.6-bashcomp.patch 1090 BLAKE2B 7c3a960ade3b450da853175a7ea4afaab267ff96f4b161fecd7abfd0a534b7feadb1d70cae04f4242574653456fb0c8d1b92594e31dd977f68839b97f5be8cf6 SHA512 e7df516ea276eef06c79db2ec3694bbbbbe6724669281bc97311c9386f943f55bf65c4d41d07a4ecf2dc8abf11fddd0d07fc5a08f357365c67274c74280fc532
 AUX django-1.9-bashcomp.patch 1734 BLAKE2B d65bc505e4096fd8d23619f3d76b76d66fc3e68f408906c30a1a8e97a5ef5c0c9c1b352f8c4f4acd1588c639f7b0a489a53e1dbc9763b395ce2488c463e6d5b4 SHA512 d3caa9b77d6c336e131b706411080aa129df83ac60293a2612eb268d08a6c40096b322715766801e16a641134762174ecefcf2b93698f47b022fc31421597403
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 DIST Django-1.11.15.tar.gz 7843843 BLAKE2B b7713de8136302d8d95929ed449ab01173e28c0d5d20529eaae9d6bd6d323f53b674a4fb6e8398da4b57a223f10ef63e7961accc8fd777313f18b4e2b0f225ed SHA512 4ea18c59f7c74d0b6deb9d292d5de068c6dcc53d9596f321f5a7e823ff5fe423cc8d69c88bf53e3acd9c36c4ecc4447148243a127d5114a4894b0fd4d449f37e
-DIST Django-1.8.19.tar.gz 7359244 BLAKE2B 1c7b857f864527cf5b9cac8e08599e1f4f3306a828bcc253e0e59755da6d464592e627eb3743687b0410d308b3d089359dd79af0146b02e6db7f5eca43f04401 SHA512 cec71f4a1aaa3fcfc43a035e9fcd8d6fabde7aade43491f9205942cbeb251ae394e49ec6b5b2403b74c24b069064d44ae6070b151c0c949b940f2d46aa87774e
 DIST Django-2.0.8.tar.gz 7987343 BLAKE2B ab35f50ce1911cb9603c7ac85e7ab01e6019ce9a2dac4cd733b11f35722368946ff3a130c3c791da4d49cf609b5747b4c5de64e29e27a8e12abb7f9e29cd363b SHA512 ac3cc3f58cb977518c6f549834beb35677c2d5541cfb5723045b98165926e826178cb33737c52a0f999be24bc38b84dde489a5f91d1c8d51b8338aa611acb518
-DIST Django-2.1.tar.gz 8583964 BLAKE2B 92a48bbdd45fa94c7b43961bf22bd5521019bf0c9f37f6685c8916d9d1886b77522fb58d7db27989a713445b51e15858161e5b99e636cdadc23860d2d0a8ef56 SHA512 1c75f0ad8ef353fb38d245034f108df5554cc27073f44ef920576b5dba3d2dd685d8905c0bde1701d43cb01b4c9dbb2bfa7c38c57fae3208af5be616d26d39cb
+DIST Django-2.1.1.tar.gz 8595422 BLAKE2B b4d46162b8a48ada2e1321e6731afdfac8c6acbc394991178c33a374ea2d61d0b1f91ede6a56f9e88d20ba2ddbe6910fe452f79fc6cfb342fddc6222c454dad1 SHA512 e29180097cda0de35eb3dac77b7f7f3f31771257b9bfcd6d3fd37d421c572e1226bb1760635ccedee357cee7ca3dcb302de6126a771007a2cdef82970a596813
 EBUILD django-1.11.15.ebuild 3226 BLAKE2B 4fe569a5302e8a35933a4a5059930b2a644657599374db2a693a15e1df41b60d54a0a689e63777e2669bb2abbb2c034ae0eeef7b497b35925fce11513262a9e3 SHA512 549d9198a51d786a028d3defde21a66ab45819127c68422517f82a537ccdde36dfdda34999b228b46dbbd84adb0af3fffb353bca147bf148e0a3f071ceae88c0
-EBUILD django-1.8.19.ebuild 3013 BLAKE2B 41cf956f18ab2bee939c1e31dae3b00a41ab1dcf75d8d8cda1f30d1161f0e9a150594600c2441c7ac4c7ab163666dcc19e09b3f6873380ad88a535286b0fffca SHA512 dcbb4508720fd0a7efda8114b775922b08ca65ae9183870c81870dba644084f8d04a729c99b7efb809dd69f9c0e77ea6b2c9e50142b1a9327ba0457e4f3692d9
 EBUILD django-2.0.8.ebuild 3057 BLAKE2B 8374be208eb49d23aa72ab5deada4745954ce46795c08c6b63d2e4d1178c0021fef8bbc115b209d0e94623c30972c14eef23576dda43ec81a5fd4311e08794ca SHA512 1531bca2617ad4a102cd1f07eab6779bed931735ca457b575f4ca1c2f896118c1405e38ed9907d515c69b36efb0ea2d54cba290619a64e7ca1e9bbab82f90fdb
-EBUILD django-2.1.ebuild 2494 BLAKE2B 59ebaa530f06a0837f84864b47e1e1ec7dc35422da3dbab3c7988e24469eb9c8a0f7a50e6bec1f0cdf22c0dd73fa80289714c63d57dcd953e316639256da27e2 SHA512 0a56f6dcb2315515c075885ef1cb3697581abb9ec8667e296b82d6fbf62d59e9051203d233d5ad0a34d4bfac5464b77f5670afdf80298fc4243230fa58a99651
+EBUILD django-2.1.1.ebuild 2494 BLAKE2B 59ebaa530f06a0837f84864b47e1e1ec7dc35422da3dbab3c7988e24469eb9c8a0f7a50e6bec1f0cdf22c0dd73fa80289714c63d57dcd953e316639256da27e2 SHA512 0a56f6dcb2315515c075885ef1cb3697581abb9ec8667e296b82d6fbf62d59e9051203d233d5ad0a34d4bfac5464b77f5670afdf80298fc4243230fa58a99651
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-1.8.19.ebuild b/dev-python/django/django-1.8.19.ebuild
deleted file mode 100644
index 1dda1fe2a773..000000000000
--- a/dev-python/django/django-1.8.19.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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} pypy )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils eapi7-ver 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/$(ver_cut 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/django-2.1.ebuild b/dev-python/django/django-2.1.1.ebuild
index 87201aa293d8..87201aa293d8 100644
--- a/dev-python/django/django-2.1.ebuild
+++ b/dev-python/django/django-2.1.1.ebuild
diff --git a/dev-python/django/files/django-1.7.6-bashcomp.patch b/dev-python/django/files/django-1.7.6-bashcomp.patch
deleted file mode 100644
index ef76f8a873c7..000000000000
--- a/dev-python/django/files/django-1.7.6-bashcomp.patch
+++ /dev/null
@@ -1,34 +0,0 @@
- 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