From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9478F138334 for ; Sat, 21 Jul 2018 00:20:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 979A4E0882; Sat, 21 Jul 2018 00:20:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5515CE0882 for ; Sat, 21 Jul 2018 00:20:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D887E335D02 for ; Sat, 21 Jul 2018 00:20:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B6E7353 for ; Sat, 21 Jul 2018 00:20:10 +0000 (UTC) From: "Virgil Dupras" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Virgil Dupras" Message-ID: <1532132127.b5bd127d40a0ae08853af6e2c2c7cff86c5cc608.vdupras@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/django/files/, dev-python/django/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/django/Manifest dev-python/django/django-1.10.7.ebuild dev-python/django/django-1.4.22.ebuild dev-python/django/django-1.5.12.ebuild dev-python/django/django-1.6.11.ebuild dev-python/django/django-1.7.11.ebuild dev-python/django/django-1.8.18.ebuild dev-python/django/django-1.9.13.ebuild dev-python/django/files/django-1.4.19-bashcomp.patch dev-python/django/files/django-1.5-py3tests.patch dev-python/django/files/django-1.5.4-objects.patch dev-python/django/files/django-1.6-objects.patch dev-python/django/files/django-1.6.10-bashcomp.patch dev-python/django/files/django-1.7.6-bashcomp.patch X-VCS-Directories: dev-python/django/files/ dev-python/django/ X-VCS-Committer: vdupras X-VCS-Committer-Name: Virgil Dupras X-VCS-Revision: b5bd127d40a0ae08853af6e2c2c7cff86c5cc608 X-VCS-Branch: master Date: Sat, 21 Jul 2018 00:20:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: be0fbc27-3725-4afd-acdb-5f0f8d036e5b X-Archives-Hash: 65eac7d72e049571563dc953539f7efe commit: b5bd127d40a0ae08853af6e2c2c7cff86c5cc608 Author: Virgil Dupras gentoo org> AuthorDate: Sat Jul 21 00:15:27 2018 +0000 Commit: Virgil Dupras gentoo org> CommitDate: Sat Jul 21 00:15:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5bd127d dev-python/django: remove old and vulnerable Bug: https://bugs.gentoo.org/630064 Package-Manager: Portage-2.3.43, Repoman-2.3.10 dev-python/django/Manifest | 7 -- dev-python/django/django-1.10.7.ebuild | 110 --------------------- dev-python/django/django-1.4.22.ebuild | 103 ------------------- dev-python/django/django-1.5.12.ebuild | 77 --------------- dev-python/django/django-1.6.11.ebuild | 105 -------------------- dev-python/django/django-1.7.11.ebuild | 104 ------------------- dev-python/django/django-1.8.18.ebuild | 106 -------------------- dev-python/django/django-1.9.13.ebuild | 110 --------------------- .../django/files/django-1.4.19-bashcomp.patch | 37 ------- dev-python/django/files/django-1.5-py3tests.patch | 22 ----- dev-python/django/files/django-1.5.4-objects.patch | 31 ------ dev-python/django/files/django-1.6-objects.patch | 18 ---- .../django/files/django-1.6.10-bashcomp.patch | 35 ------- .../django/files/django-1.7.6-bashcomp.patch | 34 ------- 14 files changed, 899 deletions(-) diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest index 85e277a20ee..581892f6f14 100644 --- a/dev-python/django/Manifest +++ b/dev-python/django/Manifest @@ -1,9 +1,2 @@ -DIST Django-1.10.7.tar.gz 7737654 BLAKE2B 54625d105eff94f64aa6d9e3afbad390a1d63e4d262e5ef8ec47c568438ad756eff1e59450d34139e6a3e3dab0eb2c16aa7fbe71b9a0379625e57ef8da45331c SHA512 2b16de21a1c966942f0d912bde4f5be7004f250e5ce3c56a5ac462f81f82e911da19fa0aeb9058670d663caecc1016ce4bcd93c1fa058675150caa33cfeb0e3b DIST Django-1.11.14.tar.gz 7850578 BLAKE2B b858ab51d40812979ec04cffc459ce137a5f5604d105e73c2fdf9e36b07fd5cf12a7f31d6f89607716220328313663f4e99dabfdf40f93b5c829efe533efbc51 SHA512 71dbbad22bf0675a5c9aa36bcf69d6de561cf041b744fa37b407cb021ef342c3245b8001025c0492ce20df664e37ed2d7a5ffdc397761065d088ddb0d9fbe6c8 -DIST Django-1.4.22.tar.gz 7802249 BLAKE2B daf3a23c4e863ec9e5ff538f4a0720036e035be0c871fb6342ef9b40b8bb7a3dff9a735a040f4c003bce815f10153f4cf31dfdc181cd69fe4db1ab217ea93d76 SHA512 03e833d95d8ffacf8cb753b8b8c15edc145830add322ad166c574a9a7428ed308082ffea7a73bcdb7315f489270fd84a38d1a8b12c090dfb9d68da5d281cef68 -DIST Django-1.5.12.tar.gz 8202839 BLAKE2B 9f177aa1e06b2d908448022ccd9986074abf66e58f4ab3315f5d3fb28cc45b77e23fc0c3933166e2720d1869b35a596d65350742a8015688f88c5358fa0e3484 SHA512 37736827618737c54e7b63f2376b915d8dc0cdaf1900a2f6c3c9e0edd69e50379f95e3b6a31c930efdca88793b6330e7226175af91951d8637e5db780bc9fd8d -DIST Django-1.6.11.tar.gz 6764000 BLAKE2B 85ea8c37e0728405e0109504e81db92a0a4f31c908daa09fdcb73890df5724d7bea0a8c8322ee62b8b1ee07cf5a01078ba404140991799bc0acf1f31ca5003f5 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829 -DIST Django-1.7.11.tar.gz 7586798 BLAKE2B b48ba892e7c4830d122f179e7247862ee571b63ff840b9107d3d8ab21700ae744c6f51cfd7cb3606961b454c288c3f73f238301fcb5620b37b6fab4a1bf02ebe SHA512 2e3415295ee6b590e366b09adb261baccb750519b9bcef1bb09bd52a2db705c8082bfc13440c621a5f41dd4f9bd626792eba4a572e78de3b7caf93c951c406ee -DIST Django-1.8.18.tar.gz 7297986 BLAKE2B 3cf777d98bfc278a3b6458cbb1bbd273e6b77e35bdae24e73cd1af6b6ab7e71ef12d36df73d90a3971ac3b6fe6edbb4a2d14a95a6f2200c99419a049eb95cdda SHA512 41959c1012feec579dc991129976a655bc2f1ff7298bd05951c925b3d0a86a67cc32bf8a78273236b3db05cc1eb841a7aba5091bd06a072dd73c55eb0f7ecee8 -DIST Django-1.9.13.tar.gz 7498364 BLAKE2B f65cd9a20e6fa3f2f60e353a74d32f9ef1872a673ec60b1332cedeef99fbdd237a8221e3ff49fbc05bfbe831c6507fb745a63212a6739f76e889fce3445d3347 SHA512 bf642d5c342dd523ceb7a580213255ddf91a24bd5506355325b72c0eb91774d120ddb89d728a4b432ef0a587f8448e915c3217adcaa8ff5aa816873fa01ae7c0 DIST Django-2.0.7.tar.gz 7988568 BLAKE2B afc3fb9cd3f37b7488ad8eb46eb9ebb540c54b04661a44620951930a352537ee3a3072a604fd2cbbc95ea3fe112ebab25f45f971bc30ad48161eb8cda26db6d3 SHA512 ef42d9046ce3e7b5067c5b85114c0cb5854b0ebb1d3bae526484f11da8abbf04864c83f176e9c6e498c9140b134c9a517968c7bb0bc087c49bf105b2aae8644c diff --git a/dev-python/django/django-1.10.7.ebuild b/dev-python/django/django-1.10.7.ebuild deleted file mode 100644 index 1e04f234403..00000000000 --- a/dev-python/django/django-1.10.7.ebuild +++ /dev/null @@ -1,110 +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,6} pypy ) -PYTHON_REQ_USE='sqlite?,threads(+)' -WEBAPP_NO_AUTO_INSTALL="yes" - -inherit bash-completion-r1 distutils-r1 eutils versionator 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/$(get_version_component_range 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" -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.9-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 --parallel 1 \ - || 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-1.4.22.ebuild b/dev-python/django/django-1.4.22.ebuild deleted file mode 100644 index 0f0ba08919d..00000000000 --- a/dev-python/django/django-1.4.22.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='sqlite?,threads(+)' - -inherit bash-completion-r1 distutils-r1 eutils versionator webapp - -MY_P="Django-${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" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="" -IUSE="sqlite test" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - $(python_gen_impl_dep sqlite) - dev-python/docutils[${PYTHON_USEDEP}] - /dev/null; then -- python_interpreters=$(whereis python | cut -d " " -f 2-) -- for python in $python_interpreters; do -- pythons="${pythons} $(basename -- $python)" -- done -- pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ") --else -- pythons=python --fi -- --complete -F _python_django_completion -o default $pythons -- diff --git a/dev-python/django/files/django-1.5-py3tests.patch b/dev-python/django/files/django-1.5-py3tests.patch deleted file mode 100644 index 16b2cc209c0..00000000000 --- a/dev-python/django/files/django-1.5-py3tests.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://code.djangoproject.com/ticket/20514 -diff -ur Django-1.5.orig/django/contrib/gis/tests/test_measure.py Django-1.5/django/contrib/gis/tests/test_measure.py ---- django/contrib/gis/tests/test_measure.py 2013-02-27 03:04:14.000000000 +0800 -+++ django/contrib/gis/tests/test_measure.py 2013-05-28 04:40:18.983011224 +0800 -@@ -40,7 +40,7 @@ - "Testing access in different units" - d = D(m=100) - self.assertEqual(d.km, 0.1) -- self.assertAlmostEqual(d.ft, 328.084, 3) -+ self.assertAlmostEqual(d.ft, 328.084, places=3) - - def testAccessInvalid(self): - "Testing access in invalid units" -@@ -172,7 +172,7 @@ - "Testing access in different units" - a = A(sq_m=100) - self.assertEqual(a.sq_km, 0.0001) -- self.assertAlmostEqual(a.sq_ft, 1076.391, 3) -+ self.assertAlmostEqual(a.sq_ft, 1076.391, places=3) - - def testAccessInvaliA(self): - "Testing access in invalid units" diff --git a/dev-python/django/files/django-1.5.4-objects.patch b/dev-python/django/files/django-1.5.4-objects.patch deleted file mode 100644 index 48e649081d3..00000000000 --- a/dev-python/django/files/django-1.5.4-objects.patch +++ /dev/null @@ -1,31 +0,0 @@ -Remove un-needed objects.inv files from d'loading during doc build -diff -ur Django-1.5.1.orig/docs/conf.py Django-1.5.1/docs/conf.py ---- docs/conf.py 2013-03-29 04:10:14.000000000 +0800 -+++ docs/conf.py 2013-05-28 01:54:49.695008477 +0800 -@@ -91,12 +91,6 @@ - - # Links to Python's docs should reference the most recent version of the 2.x - # branch, which is located at this URL. --intersphinx_mapping = { -- 'python': ('http://docs.python.org/2.7', None), -- 'sphinx': ('http://sphinx.pocoo.org/', None), -- 'six': ('http://pythonhosted.org/six/', None), -- 'simplejson': ('http://simplejson.readthedocs.org/en/latest/', None), --} - - # Python's docs don't change every week. - intersphinx_cache_limit = 90 # days -# Fix creation of html docs on python 3 -# https://github.com/django/django/commit/a5733fcd7be7adb8b236825beff4ccda19900f9e -diff -ur Django-1.5.1.orig/docs/_ext/djangodocs.py Django-1.5.1/docs/_ext/djangodocs.py ---- docs/_ext/djangodocs.py 2013-03-29 04:07:21.000000000 +0800 -+++ docs/_ext/djangodocs.py 2013-05-28 02:34:59.057009144 +0800 -@@ -204,7 +204,7 @@ - if t == "templatefilter" and l == "ref/templates/builtins"], - } - outfilename = os.path.join(self.outdir, "templatebuiltins.js") -- with open(outfilename, 'wb') as fp: -+ with open(outfilename, 'w') as fp: - fp.write('var django_template_builtins = ') - json.dump(templatebuiltins, fp) - fp.write(';\n') diff --git a/dev-python/django/files/django-1.6-objects.patch b/dev-python/django/files/django-1.6-objects.patch deleted file mode 100644 index 597da6e6bb1..00000000000 --- a/dev-python/django/files/django-1.6-objects.patch +++ /dev/null @@ -1,18 +0,0 @@ -#Remove un-needed objects.inv files from d'loading during doc build -diff -ur Django-1.6.1.orig/docs/conf.py Django-1.6.1/docs/conf.py ---- docs/conf.py 2013-12-12 14:37:59.000000000 -0500 -+++ docs/conf.py 2014-01-16 20:57:36.253670094 -0500 -@@ -109,12 +109,6 @@ - - # Links to Python's docs should reference the most recent version of the 2.x - # branch, which is located at this URL. --intersphinx_mapping = { -- 'python': ('http://docs.python.org/2.7', None), -- 'sphinx': ('http://sphinx.pocoo.org/', None), -- 'six': ('http://pythonhosted.org/six/', None), -- 'simplejson': ('http://simplejson.readthedocs.org/en/latest/', None), --} - - # Python's docs don't change every week. - intersphinx_cache_limit = 90 # days - diff --git a/dev-python/django/files/django-1.6.10-bashcomp.patch b/dev-python/django/files/django-1.6.10-bashcomp.patch deleted file mode 100644 index 7c6ceff076a..00000000000 --- a/dev-python/django/files/django-1.6.10-bashcomp.patch +++ /dev/null @@ -1,35 +0,0 @@ - extras/django_bash_completion | 17 +---------------- - 1 file changed, 1 insertion(+), 16 deletions(-) - -diff --git a/extras/django_bash_completion b/extras/django_bash_completion -index 8f85211..ab13755 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,18 +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 -- 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 ef76f8a873c..00000000000 --- 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