[gentoo-commits] repo/gentoo:master commit in: dev-python/django/

["Justin Lecher" <jlec@gentoo.org>]

commit:     783a4be550dab8510f3c99a0d3a9605214bf215a
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 20 09:19:16 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 09:19:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=783a4be5

dev-python/django: Drop vulnerable versions for CVE-2015-{5963,5964}

* drop KEYWORDS from masked versions

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=558096

Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 dev-python/django/Manifest             |   2 -
 dev-python/django/django-1.4.21.ebuild | 104 --------------------------------
 dev-python/django/django-1.5.12.ebuild |   2 +-
 dev-python/django/django-1.6.11.ebuild |   2 +-
 dev-python/django/django-1.7.9.ebuild  | 105 ---------------------------------
 5 files changed, 2 insertions(+), 213 deletions(-)

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 4cc8140..3f4d2d9 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,7 +1,5 @@
-DIST Django-1.4.21.tar.gz 7878015 SHA256 934f1975218680d51c4da9d63a39bc5fb1ddaac48476fd34b9ab7903fd98bcf4 SHA512 25fca8362fa30822a5993a2f1d00bc7629b97acfac97daa406fc7658019e35f52ecc539cc875a8ece3b1edb140fd5260e8dd3a355c9405b693d191746df516fa WHIRLPOOL 50fdcd0129cbd23e0400b15b3da069318a731643f5817a8bc98872f9c402b2f23171a13eb031732c0753855440c357b0a54c155fdc0b7bc71761d40f2848acab
 DIST Django-1.4.22.tar.gz 7802249 SHA256 d0e2c9d772fcab2cf9c09e1c05e711cf5fe5eb93225762b29f0739d65e0d1784 SHA512 03e833d95d8ffacf8cb753b8b8c15edc145830add322ad166c574a9a7428ed308082ffea7a73bcdb7315f489270fd84a38d1a8b12c090dfb9d68da5d281cef68 WHIRLPOOL 7c3999e05c31772b74dcca981b052d5e13621897490166f3c022bfd6db2d542c2eb7afb16b4fd4536a49b4834fc62e61010ad10949af1269c4363f1ef6ea7c9e
 DIST Django-1.5.12.tar.gz 8202839 SHA256 b3de77beb6e59b72071ca66f20c2ad34e1b90d39b0241e62c1f03c668ddd6ced SHA512 37736827618737c54e7b63f2376b915d8dc0cdaf1900a2f6c3c9e0edd69e50379f95e3b6a31c930efdca88793b6330e7226175af91951d8637e5db780bc9fd8d WHIRLPOOL a3d17e364b0f90ff3a059afbfb57fdb9988ad777048f3caa30244d7ae6b0c87f42e1e5af5bdcda8f09c713518e0fb2471e1e4da3a988f37e45e6bca7678ecafa
 DIST Django-1.6.11.tar.gz 6764000 SHA256 7e50e573e484435873b3515d7982d80093b2695aba17fd0ff024307454dc3a56 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829 WHIRLPOOL 5de086952bda9449f85798e8fe3bac82f11e1b856c1d39e340399e71ca6bf183318eebf1f536714567036485637166a929082a1ba9d6c1816f07c53dcc12c72a
 DIST Django-1.7.10.tar.gz 7584312 SHA256 b9357d2cebe61997055d417d607f9c650e817cd1a383b9a1b88bf1edad797c75 SHA512 ef9c8f3f5db17474970805bd5a3956c65766362d883013c19d32cb0fcc795de74a831758d66d18103255e5c510b2ee384099f08e12d75c567caad2d80404cc20 WHIRLPOOL 380f05ff7f51dfc50f578f946b5b83ae36ab8a96a10ccce9c62642f5b2434c2ba9de2d1d9bc57859db003e4569fa0c3e118cf51cd80a9fe40c04c49fdf213999
-DIST Django-1.7.9.tar.gz 7605194 SHA256 4f3f9fe4e5d20ff8ed6a90b5d2f2df2d8fc054e478cdcc3db81c6b29bd217860 SHA512 349f6950ec7cb37c8ae44a5fc9b924ef0d02e244c834a65bbdbe84d8a993474c6e94f82ac0df5bd08594c8cc6f72bf9413b7b30091319dbb5c018f211d3e9e67 WHIRLPOOL 977e011027f4783aab9cbf53cf6015dc705f63f6b442bc403ede76562822fb0c09027fd89fe776455f1e3d55e636db4f6b586130ad41a709aafbe9eac003870a
 DIST Django-1.8.4.tar.gz 7265101 SHA256 826996c81e1cc773500124d5c19212e4a7681a55ee169fab9085f2b3015a70d8 SHA512 34dee1d004f4b149bd8b0405bcad66c0b4ad68b3c0069b1631af2c457cbcc165d6a730d221777110525be74cf9369b695d4fc8d752317d0819fd338250222351 WHIRLPOOL 504f0271b74b9e93b74255922360fddcff3f6875297fcbd464e27212679b2275c98773088feab97fe8d0c0de664789653c72d614ed2d5fb9c648655685f895aa

diff --git a/dev-python/django/django-1.4.21.ebuild b/dev-python/django/django-1.4.21.ebuild
deleted file mode 100644
index 647d60e..0000000
--- a/dev-python/django/django-1.4.21.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-inherit bash-completion-r1 distutils-r1 eutils versionator webapp
-
-MY_P="Django-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
-SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${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="sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${PYTHON_DEPS//sqlite?/sqlite}
-		dev-python/docutils[${PYTHON_USEDEP}]
-		<dev-python/numpy-1.9[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-imaging[${PYTHON_USEDEP}]
-		)"
-
-#		app-text/pytextile[${PYTHON_USEDEP}]
-#		dev-python/markdown[${PYTHON_USEDEP}]
-#		dev-python/selenium[${PYTHON_USEDEP}]
-#		dev-python/py-bcrypt[${PYTHON_USEDEP}]
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.19-bashcomp.patch
-)
-
-python_prepare_all() {
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/test_correct_url_value_passes/_&/" \
-		-e "s/test_correct_url_with_redirect/_&/" \
-		-i tests/modeltests/validation/tests.py || die
-	sed \
-		-e "s/test_urlfield_3/_&/" \
-		-e "s/test_urlfield_4/_&/" \
-		-e "s/test_urlfield_10/_&/" \
-		-i tests/regressiontests/forms/tests/fields.py || die
-
-	distutils-r1_python_prepare_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 \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-
-	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/mysql-connector-python
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
-	echo ""
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r django/contrib/admin/static/admin/.
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "A copy of the admin media is available to"
-	elog "webapp-config for installation in a webroot,"
-	elog "as well as the traditional location in python's"
-	elog "site-packages dir for easy development"
-	elog
-	ewarn "If you build Django ${PV} without USE=\"vhosts\""
-
-	# XXX: call webapp_pkg_postinst? the old ebuild didn't do that...
-	ewarn "webapp-config will automatically install the"
-	ewarn "admin media into the localhost webroot."
-}

diff --git a/dev-python/django/django-1.5.12.ebuild b/dev-python/django/django-1.5.12.ebuild
index e2cbe18..1fe81f8 100644
--- a/dev-python/django/django-1.5.12.ebuild
+++ b/dev-python/django/django-1.5.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS=""
 IUSE="doc mysql postgres sqlite test"
 
 PY2_USEDEP=$(python_gen_usedep python2_7)

diff --git a/dev-python/django/django-1.6.11.ebuild b/dev-python/django/django-1.6.11.ebuild
index 25c61d0..bc7d327 100644
--- a/dev-python/django/django-1.6.11.ebuild
+++ b/dev-python/django/django-1.6.11.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS=""
 IUSE="doc sqlite test"
 
 RDEPEND=""

diff --git a/dev-python/django/django-1.7.9.ebuild b/dev-python/django/django-1.7.9.ebuild
deleted file mode 100644
index 6bfbaf5..0000000
--- a/dev-python/django/django-1.7.9.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
-PYTHON_REQ_USE='sqlite?'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils versionator webapp
-
-MY_P="Django-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
-SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${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_DEPS//sqlite?/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}]
-		)"
-
-#		dev-python/python-sqlparse[${PYTHON_USEDEP}]
-#		dev-python/bcrypt[${PYTHON_USEDEP}]
-#		dev-python/selenium[${PYTHON_USEDEP}]
-#		sci-libs/gdal[geos,${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}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-
-	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
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
-	echo ""
-}
-
-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
-}
-
-pkg_postinst() {
-	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
-}