gentoo resync : 24.12.2018

4 files changed, 6 insertions, 95 deletions

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 5a65d33b40b7..e21b6c7cf615 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,11 +1,9 @@
 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.16.tar.gz 7852514 BLAKE2B a881caa6c31c80d6b0146cb49a08ba63ebfba21637747328adb8ec3afada2182b72c46576a79cc9e163546e5b980a2be516d842492517319deb0a4f5512ad605 SHA512 bf1329ac364c9037fd6cecd0e8565c8bd8d830343671f9ce5415a10e70da37256667675b3f97e4d2508a8a912fa7a06ca7f585586ac18e6734c939bc41a8b455
+DIST Django-1.11.17.tar.gz 7853439 BLAKE2B f6218ee690e505921d229193540b4166771465213aee3a3b239da6a88c1a7e166d182750192f984be7369e82c3ae172a9d858d7d30e9eb7cff4a467b543372e2 SHA512 ecf798ce8037d79dbbe673ad583e6414c9a24b807442feb967927b78cacb467f7f5c20e938116829d9b0df0563ee110a8d07294fd40b99dbd6356c8bae151bd6
 DIST Django-2.0.9.tar.gz 7992507 BLAKE2B c6f1d79401007d2c83553e885d5e32c7890b3f1ed53c948ea4c55cc2a0272c06d0b7fdafef7be5042ab26b3f8c3ffef64f6f01f49d6e615503f8bfad99b66c3a SHA512 7a766ce0240b19a18dc5a9a4682630c4ce90fa6ed0d02a97303088a990d09e097b609220f4e2806854585724f483cb2ae7e4f29bfd1898f3a0d6e758c2f4ea4a
-DIST Django-2.1.2.tar.gz 8611286 BLAKE2B 5107fd04ee11ae4ded3d8914d840e323e26617b526ab877654de08caa6ce1cb6f053d3afbdbdbda17ab26b1ed1bcb158ef092a63ef14393b87ed98e612cf43aa SHA512 3510f872762e75c7e66987857616d958d15bef91ce2d9e1656abcf4e0221b1c6ff72c59fd29643aa0b0288118db76d58023cffe48f401e7cdcd03d71822a282d
-DIST Django-2.1.3.tar.gz 8611851 BLAKE2B dc0c2bf994ef883d34d66d3d0f4e77d20f5a25671053831e4138e5431ec7ec8c89ba64d7ae4a58e034e01093276cd61a2d833319d28283cbd9ad8d6ae4b9b2d4 SHA512 b83732d8c0230bda0a29db92acd3e4e7531f9adb3a0d10f37c40288c08ccaa5d7d49184bd5ea000b991eaf8a196b317648c200c147a6e8f503ce42189344cee9
-EBUILD django-1.11.16.ebuild 3223 BLAKE2B b5354d00a4818503a709876413d4c7e5c0314d21cf702785538fb94fe8b3e0fb74abaafcbba00f3ddfebe6b533e25d6dc95eb3589c89dca4864127b080a4e8d0 SHA512 b68e22449b008c8ad9f40bdf3d7aab31fa48b533b055bd2c6d59b603b82905e032f44e00eeec7907d6b566aa350efd6a4816504e4ade5f5998a8d6f42304291f
+DIST Django-2.1.4.tar.gz 8611886 BLAKE2B 1deedd3c13c65a7f6ae2262ef1e894046e3151dc7bcd6da274d6e87e60db326cc28a51c62627d00c6feee3807ff8dd13823edf8b4494f0d1499272998f350748 SHA512 a2dc6fb7514f8d79aff98aeb0bd0edb1ede36ed2368e553fded8b58765092d6a2efcf2e9429bb9c7d2c16d466e46a9ff18aaf5911a7dd868f42569c1e82831aa
+EBUILD django-1.11.17.ebuild 3225 BLAKE2B a47970628dd96cb4001881c57f061752f0484cd6c74cb0800c1eb405d09e0d5e723b609fcd32e702a107d2eefc17877f898f3d049b3933384752e37589938311 SHA512 a0b5e1141cc0f66f9936183a03201cb66e5e76899e255a74dd655ff8a1df9a42a17dfcb963ad3326d9398e94462226f0b5c3ac328590784008be39dbf7aa5e7f
 EBUILD django-2.0.9.ebuild 3054 BLAKE2B df9058fcbf257e52709db580b2000fe5189432745582c782574ad562993c2848f33a7d15fcaf79487281509c6c20a1e903acdded0b7bd4e2aef0061759532b46 SHA512 0367e645c71e7dfc51308b3c7a9e4d211f8591bd82557a5fa61715219ab5573e804a046b212d7c89d3848a574823c1de16d7d08bbc77264d4bcfc967ae4e95fc
-EBUILD django-2.1.2.ebuild 2489 BLAKE2B a5fa9e5c8b327c68ec8d5cc2a254e265f0d25ac2e58e5148d6c2e4a4d88c96797afefba176afedf404667ed35cb11f1f7a05b8f0d0c1f918ad5eadb014cd537b SHA512 d31eb055c10c1441be1ac99bc2f29e4e2bbd3340285fea7559e247a0d7ce01d95b38cc2507e956760668a503ebbf9721419c9243cbf5c1d431060acc4f2e2f58
-EBUILD django-2.1.3.ebuild 2491 BLAKE2B 231d4a75de6fa479473deee6a8158117a57c6da608fa4e0d6aced990aacea8e058db901a0dcd246b27485894a2af054015bb885329596987600f9c3a032c0c6e SHA512 ac600d1d5b70822b5a39cbaffe742417cc28afccd9f619d1e2011e4bd86f5c7c1eca1eb977053ad4093db25ab5c189ec4ecf02e09d037bf5ad73d15a7cf19547
+EBUILD django-2.1.4.ebuild 2481 BLAKE2B 12716c330cc37493aa852f18930e7fb825b3c672cb4257d001b2e6886bca863b6fccde4435b86967b0acea56f2a0c9af2c9859677730e4cc017467a91a617e82 SHA512 efc649f1bf67e8376c6cee59b7c4ef16219df9d835e36ee7f070fad5e6502c413b56fbdd1095ae0d702cdad0b93196252e3801ee6d8d57d92698897ada81b7dc
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-1.11.16.ebuild b/dev-python/django/django-1.11.17.ebuild
index 6f859138b197..507ad31d67cd 100644
--- a/dev-python/django/django-1.11.16.ebuild
+++ b/dev-python/django/django-1.11.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 WEBAPP_NO_AUTO_INSTALL="yes"
 
diff --git a/dev-python/django/django-2.1.3.ebuild b/dev-python/django/django-2.1.3.ebuild
deleted file mode 100644
index 89d87db8de42..000000000000
--- a/dev-python/django/django-2.1.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-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"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-
-RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
-BDEPEND="
-	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_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-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
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" 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
-}
diff --git a/dev-python/django/django-2.1.2.ebuild b/dev-python/django/django-2.1.4.ebuild
index 576b624d32e3..4f8d934327ff 100644
--- a/dev-python/django/django-2.1.2.ebuild
+++ b/dev-python/django/django-2.1.4.ebuild
@@ -27,7 +27,7 @@ IUSE="doc sqlite test"
 RDEPEND="dev-python/pytz[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		$(python_gen_impl_dep sqlite)
 		dev-python/docutils[${PYTHON_USEDEP}]