gentoo resync : 04.08.2018

5 files changed, 107 insertions, 12 deletions

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index a2cde230efdb..384da0e8e5e4 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,11 +2,13 @@ AUX django-1.7.6-bashcomp.patch 1090 BLAKE2B 7c3a960ade3b450da853175a7ea4afaab26
 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.14.tar.gz 7850578 BLAKE2B b858ab51d40812979ec04cffc459ce137a5f5604d105e73c2fdf9e36b07fd5cf12a7f31d6f89607716220328313663f4e99dabfdf40f93b5c829efe533efbc51 SHA512 71dbbad22bf0675a5c9aa36bcf69d6de561cf041b744fa37b407cb021ef342c3245b8001025c0492ce20df664e37ed2d7a5ffdc397761065d088ddb0d9fbe6c8
-DIST Django-1.8.18.tar.gz 7297986 BLAKE2B 3cf777d98bfc278a3b6458cbb1bbd273e6b77e35bdae24e73cd1af6b6ab7e71ef12d36df73d90a3971ac3b6fe6edbb4a2d14a95a6f2200c99419a049eb95cdda SHA512 41959c1012feec579dc991129976a655bc2f1ff7298bd05951c925b3d0a86a67cc32bf8a78273236b3db05cc1eb841a7aba5091bd06a072dd73c55eb0f7ecee8
+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.7.tar.gz 7988568 BLAKE2B afc3fb9cd3f37b7488ad8eb46eb9ebb540c54b04661a44620951930a352537ee3a3072a604fd2cbbc95ea3fe112ebab25f45f971bc30ad48161eb8cda26db6d3 SHA512 ef42d9046ce3e7b5067c5b85114c0cb5854b0ebb1d3bae526484f11da8abbf04864c83f176e9c6e498c9140b134c9a517968c7bb0bc087c49bf105b2aae8644c
+DIST Django-2.0.8.tar.gz 7987343 BLAKE2B ab35f50ce1911cb9603c7ac85e7ab01e6019ce9a2dac4cd733b11f35722368946ff3a130c3c791da4d49cf609b5747b4c5de64e29e27a8e12abb7f9e29cd363b SHA512 ac3cc3f58cb977518c6f549834beb35677c2d5541cfb5723045b98165926e826178cb33737c52a0f999be24bc38b84dde489a5f91d1c8d51b8338aa611acb518
+DIST Django-2.1.tar.gz 8583964 BLAKE2B 92a48bbdd45fa94c7b43961bf22bd5521019bf0c9f37f6685c8916d9d1886b77522fb58d7db27989a713445b51e15858161e5b99e636cdadc23860d2d0a8ef56 SHA512 1c75f0ad8ef353fb38d245034f108df5554cc27073f44ef920576b5dba3d2dd685d8905c0bde1701d43cb01b4c9dbb2bfa7c38c57fae3208af5be616d26d39cb
 EBUILD django-1.11.14.ebuild 3226 BLAKE2B 4fe569a5302e8a35933a4a5059930b2a644657599374db2a693a15e1df41b60d54a0a689e63777e2669bb2abbb2c034ae0eeef7b497b35925fce11513262a9e3 SHA512 549d9198a51d786a028d3defde21a66ab45819127c68422517f82a537ccdde36dfdda34999b228b46dbbd84adb0af3fffb353bca147bf148e0a3f071ceae88c0
-EBUILD django-1.8.18.ebuild 3037 BLAKE2B fbb57541c06ce4233a1f179c4280ad35c1193ce35a5069d8067554d0a72d1101699f6ac2e7316551412ae07e14f87fc8cfe22181e400b2976c1042346da5f66b SHA512 1600a406796e229dcf10c7172467494a38481a707ebf7d5087a69582b8e38c7eb495f774efe72ffd8daddfcedb01e7e1cab178205467842dcf7e0deb16b67fc2
-EBUILD django-1.8.19.ebuild 3015 BLAKE2B 031a0bd274e2588473d5e4856224ac9b7f1e98c22b6c52adddfacbde2b26074d3bb83e69a9a09f9f29ac833dda45151eb0bf0dd9eca1d634f4eb337e9ab889f4 SHA512 f7c368a5875b0a0c3c9f1ec4a7c28ff2f5e8ddd048c42c57c4f2ccfba79d21806f20ca0602d615b1a974b3b06cb53f29198159f2fe15aebfbe322e4e6bb6ed9b
-EBUILD django-2.0.7.ebuild 3059 BLAKE2B afe8fad8175ee2abda5be42069a68ea1f15c258551e639395248730175a7a37bf69d958bef7fcc8bb8ca75db772390b364b03f0af87dacd3da8833cd0bf0789c SHA512 25c4497797a4049baf998499af58208cccfa47dc32fd279cbb12c2e4339c46f5a38467c994e7f3ac20667da457c4f6dbe163e8b5e2587fdba398ddc77ab9ddac
+EBUILD django-1.11.15.ebuild 3228 BLAKE2B 4aab321bce708bd0f7054754874783c0d52056ab1bfb54172a3f190fbfce911b7dd1357978e0cdc7f630d42f1e386113d2d6f3e93e3e3030b57ec53376878d63 SHA512 79bb04e301c5a7c114e5df2b5dab43ae4daae9fc36574313779302578602341668cc27a1d29890a2ab6d40a79ef23be50dfd061516e40741327bbcc99e07353c
+EBUILD django-1.8.19.ebuild 3013 BLAKE2B 41cf956f18ab2bee939c1e31dae3b00a41ab1dcf75d8d8cda1f30d1161f0e9a150594600c2441c7ac4c7ab163666dcc19e09b3f6873380ad88a535286b0fffca SHA512 dcbb4508720fd0a7efda8114b775922b08ca65ae9183870c81870dba644084f8d04a729c99b7efb809dd69f9c0e77ea6b2c9e50142b1a9327ba0457e4f3692d9
+EBUILD django-2.0.8.ebuild 3059 BLAKE2B afe8fad8175ee2abda5be42069a68ea1f15c258551e639395248730175a7a37bf69d958bef7fcc8bb8ca75db772390b364b03f0af87dacd3da8833cd0bf0789c SHA512 25c4497797a4049baf998499af58208cccfa47dc32fd279cbb12c2e4339c46f5a38467c994e7f3ac20667da457c4f6dbe163e8b5e2587fdba398ddc77ab9ddac
+EBUILD django-2.1.ebuild 2494 BLAKE2B 59ebaa530f06a0837f84864b47e1e1ec7dc35422da3dbab3c7988e24469eb9c8a0f7a50e6bec1f0cdf22c0dd73fa80289714c63d57dcd953e316639256da27e2 SHA512 0a56f6dcb2315515c075885ef1cb3697581abb9ec8667e296b82d6fbf62d59e9051203d233d5ad0a34d4bfac5464b77f5670afdf80298fc4243230fa58a99651
 MISC metadata.xml 488 BLAKE2B b3ffa7cc6bced74a890b71be2bfb3805bb51a523f485079a7da0cb2698f3fa0ee1746922813859ac95df41b3ef3249c413f1692f3635427fa965874287b83d88 SHA512 9091a2e41a992542b38251b12623c0b1ac737cf01a4f46ce63096568bcde4e3d8546705bdb10c14c128b4cb6564e38dbb6d1803611c5197923b847304aa69cdb
diff --git a/dev-python/django/django-1.8.18.ebuild b/dev-python/django/django-1.11.15.ebuild
index 413258c4600e..0d97bbcdfd43 100644
--- a/dev-python/django/django-1.8.18.ebuild
+++ b/dev-python/django/django-1.11.15.ebuild
@@ -7,7 +7,7 @@ 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
+inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
 
 MY_PN="Django"
 MY_P="${MY_PN}-${PV}"
@@ -15,17 +15,22 @@ 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
+	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"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="amd64 ~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}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
 	test? (
@@ -33,8 +38,9 @@ DEPEND="${RDEPEND}
 		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}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		virtual/python-enum34[${PYTHON_USEDEP}]
 		)"
 
 S="${WORKDIR}/${MY_P}"
@@ -42,7 +48,7 @@ S="${WORKDIR}/${MY_P}"
 WEBAPP_MANUAL_SLOT="yes"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
+	"${FILESDIR}"/${PN}-1.9-bashcomp.patch
 )
 
 pkg_setup() {
@@ -63,7 +69,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 \
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 --parallel 1 \
 		|| die "Tests fail with ${EPYTHON}"
 }
 
diff --git a/dev-python/django/django-1.8.19.ebuild b/dev-python/django/django-1.8.19.ebuild
index 1f2e2d012e0a..1dda1fe2a773 100644
--- a/dev-python/django/django-1.8.19.ebuild
+++ b/dev-python/django/django-1.8.19.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 
 RDEPEND=""
diff --git a/dev-python/django/django-2.0.7.ebuild b/dev-python/django/django-2.0.8.ebuild
index 133d40ffb7d8..133d40ffb7d8 100644
--- a/dev-python/django/django-2.0.7.ebuild
+++ b/dev-python/django/django-2.0.8.ebuild
diff --git a/dev-python/django/django-2.1.ebuild b/dev-python/django/django-2.1.ebuild
new file mode 100644
index 000000000000..87201aa293d8
--- /dev/null
+++ b/dev-python/django/django-2.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
+}