gentoo resync : 05.04.2019

3 files changed, 103 insertions, 34 deletions

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index b3916a76e6d9..6d909761c181 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,9 +1,11 @@
 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.20.tar.gz 7846576 BLAKE2B 11423edda7f2f08cc894957da65c746c99ce7ce5399ff236972cce627e347cbc4a43c7ff75282318fac2ac8f65fc4db691ac9fe8e04059b0de4f1bfe31278382 SHA512 5a0fff6c9b90a08e98dee6d4d090047adb900a8f6a061f98e685e8998bfe3d97fe7a90aa7d4d2feae67026fb6e4441393d50cb5ab295604ed362a080b987f062
-DIST Django-2.0.13.tar.gz 7990057 BLAKE2B 8172d4ac3e74ce41403d3825ca102673e78cfc47c799a05de6543d3e06b69f97ce475b314d78d88226564cc2cafa1cbd1f6237232967ba15d88d94fa83514e1d SHA512 cae1977bec5b23475bb8b3b67444bf3b12edcd212db11e22e4d10456b1ae5d8dcc1734f1f07cb1e19dd39577684b03821cfc247174d687e29ea8fbed7b628727
 DIST Django-2.1.7.tar.gz 8608548 BLAKE2B c391fe2ed0fe9a4f4ef45cf828a0a85c16d5ede7c1bdc1ed5fae1185f04052290817900e97f95fa199425c344d91a9d32c7fb7ac8aec5d12152e7f8a39f8136f SHA512 bacbd52c834a14267588f7bcf57f52c246beb9971352e60eb780e28872884e0dd3701256dcd9600ae0faad29f42460391ea973e9fbb3338c2c08baf0d5ca2fe8
+DIST Django-2.1.8.tar.gz 8613572 BLAKE2B 543e41f1b4031b624f903f075e95af7e010510f4c265aebd35a5f6b3f074703b3a4b54bc7f2a9752e717ac99d20c42d6e34e556ca619a531cf8c66622ce1419a SHA512 f84fcdf919091a9db6289f25da601ce447382f79118a99f8f316b2479a9325d629f725edb4618300f76e23bd68ae45ff4c6b6576988f109d1a7ba715c73327c3
+DIST Django-2.2.tar.gz 8843237 BLAKE2B 6e2468e655cbb1cf4800dcad11ddb47267e90f6be87667b913703238c8ade13ac4f77ec8fa3b6aaf4b25660d7d19bbbb9935752661f5b94c4e1bccfae324041c SHA512 cab4e31d9ad7bc1765dd922913ade5ced7308cb687374c650358585070f2d19feca47c9135b56e3d686df08a9a80b0af232b79cea18ec229f2a9737af6c1f964
 EBUILD django-1.11.20.ebuild 3225 BLAKE2B 680a455b510afd47a56289169e22fcd160543408f6d28b22423fe461ebb952695d6764c22cf1a7f3ff0c75820b774411eb31b3fe3de8fc0384ac05ebc1abbb65 SHA512 62aa91d0b0c41d46735ca622b56ee29de303d018ce5cf3f48abc0bc277c81af66320f90c6390c0b51e9c04f37f83112f4d4017ca7588abd4667a9fe4562ea5a6
-EBUILD django-2.0.13.ebuild 3054 BLAKE2B 5604ab5ecda09fe388695b010bdca03eb5e35b1695e067a6344461ff414afb9816ecc43578465215416df637816fa8dc99ec456984f6fa966a511e1d784d6981 SHA512 1d093fc15a04482b7f94e340eeb2fdc2bb152c2bb4d50089b1ceb0e906866d78b26847810a3fbfc41e6381e5d61d35cc3927593d8c0ab8433436bcb9487a3326
 EBUILD django-2.1.7.ebuild 2481 BLAKE2B 25ae3441ef0e80a1b9a16df1a315180cdb9cb475231e6328457be807dfa0e5d944dd20d80da6de742dc4d4f91bf779ef63944bae2720203214e409cc4910d2cf SHA512 83b8407d681a9eecad1b6e70db357029024d059133ebd48d9e35488e2895ee4f298baecca2e5b4f683a74258b4844ebec9fb2a342325ffc6f98d17dc28fbcddf
+EBUILD django-2.1.8.ebuild 2483 BLAKE2B 22bb56f9fc8637973dbe0b59348df886100af5d9f6b99b36bbedd3e3a9b2f1ee35f777ac07e4cc53ad14ac60481416e65f910447d70f6b1c15a600f942798e43 SHA512 e6521060728d533a6548fd4a0747764340e71c01b8449707ae61a0721d310c92bd85a6e38809100687a7b303dd6518d7db86126f4172d5788b254b99e3226534
+EBUILD django-2.2.ebuild 2549 BLAKE2B 0affe65919234add35a7856b4d77cce102b0f9a91be30628efb31ce4929fa6dfbc7ce18d7d7e0473de969a2f00782108be1ee2824c33b2494aeca8e6823fd33a SHA512 c091c4db1e733b9f2bcd5554883cc46c217575f1f6605cdeb9aaa79c13792015490e5c5d037e6614b788652561bf66f0dac57e5412f8117a9da33167b50c8d18
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-2.0.13.ebuild b/dev-python/django/django-2.1.8.ebuild
index b9fce6b2cb61..fa8668065c0d 100644
--- a/dev-python/django/django-2.0.13.ebuild
+++ b/dev-python/django/django-2.1.8.ebuild
@@ -1,23 +1,19 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
-WEBAPP_NO_AUTO_INSTALL="yes"
 
-inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
+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
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
-	"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 # admin fonts: Roboto (media-fonts/roboto)
@@ -25,14 +21,13 @@ 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"
+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=""
-DEPEND="${RDEPEND}
-	dev-python/pytz[${PYTHON_USEDEP}]
+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}]
@@ -44,16 +39,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-WEBAPP_MANUAL_SLOT="yes"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.7-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
@@ -68,7 +57,7 @@ python_compile_all() {
 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 --parallel 1 \
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
 		|| die "Tests fail with ${EPYTHON}"
 }
 
@@ -81,16 +70,9 @@ python_install_all() {
 		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" dev-python/mysqlclient
@@ -102,9 +84,4 @@ pkg_postinst() {
 	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.2.ebuild b/dev-python/django/django-2.2.ebuild
new file mode 100644
index 000000000000..7e60a484fcf1
--- /dev/null
+++ b/dev-python/django/django-2.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 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 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-sqlparse[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/tblib[${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
+}