jlec 15/02/28 18:08:42
Modified: django-1.7.5.ebuild django-9999.ebuild ChangeLog
Added: django-1.4.19.ebuild django-1.6.10.ebuild
Removed: django-1.7.4.ebuild django-1.7.ebuild
Log:
Version BUmp and drop old for CVE-2015-{0219,0220,0221,0222}, #536586; add
correct dependencies for tests, Use optfeature instead of harddepened on
imaging, #473228
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.2 dev-python/django/django-1.7.5.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.7.5.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.7.5.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.7.5.ebuild?r1=1.1&r2=1.2
Index: django-1.7.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.7.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- django-1.7.5.ebuild 28 Feb 2015 12:59:28 -0000 1.1
+++ django-1.7.5.ebuild 28 Feb 2015 18:08:42 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.7.5.ebuild,v 1.1
2015/02/28 12:59:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.7.5.ebuild,v 1.2
2015/02/28 18:08:42 jlec Exp $
EAPI=5
@@ -21,13 +21,23 @@
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc sqlite test"
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- virtual/python-imaging[${PYTHON_USEDEP}]
-"
+RDEPEND=""
DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
- test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
+ 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}"
@@ -49,15 +59,13 @@
}
python_compile_all() {
- if use doc; then
- emake -C docs html
- fi
+ 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 -v1 \
+ PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
|| die "Tests fail with ${EPYTHON}"
}
@@ -67,8 +75,11 @@
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 "MySQL backend support in python 2.7 - 3.4"
dev-python/mysqlcient
optfeature "PostgreSQL backend support" dev-python/psycopg:2
+ optfeature "GEO Django" sci-libs/gdal[geos]
+ optfeature "Memcached support" dev-python/python-memcached
+ optfeature "ImageField Support" virtual/python-imaging
echo ""
}
@@ -77,7 +88,7 @@
bashcomp_alias ${PN}-admin django-admin.py
if use doc; then
- rm -fr docs/_build/html/_sources
+ rm -fr docs/_build/html/_sources || die
local HTML_DOCS=( docs/_build/html/. )
fi
1.24 dev-python/django/django-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.24&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.24&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?r1=1.23&r2=1.24
Index: django-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- django-9999.ebuild 9 Sep 2014 05:27:31 -0000 1.23
+++ django-9999.ebuild 28 Feb 2015 18:08:42 -0000 1.24
@@ -1,48 +1,65 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.23
2014/09/09 05:27:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.24
2015/02/28 18:08:42 jlec Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
PYTHON_REQ_USE='sqlite?'
WEBAPP_NO_AUTO_INSTALL="yes"
-#if LIVE
-inherit git-2
-EGIT_REPO_URI="git://github.com/django/django.git
- https://github.com/django/django.git";
-#endif
-
-inherit bash-completion-r1 distutils-r1 versionator webapp
-
-MY_P="Django-${PV}"
+inherit bash-completion-r1 distutils-r1 eutils git-r3 versionator webapp
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"
+SRC_URI=""
+EGIT_REPO_URI="
+ git://github.com/django/django.git
+ https://github.com/django/django.git
+ "
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux
~x86-linux ~ppc-macos ~x86-macos"
-IUSE="doc mysql postgres sqlite test"
+KEYWORDS=""
+IUSE="doc sqlite test"
-PY2_USEDEP=$(python_gen_usedep 'python2*')
-RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )"
+RDEPEND=""
DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
- test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
-
-#if LIVE
-SRC_URI=
-KEYWORDS=
-#endif
+ test? (
+ ${PYTHON_DEPS//sqlite?/sqlite}
+ dev-python/bcrypt[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/numpy[$(python_gen_usedep 'python*')]
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/python-sqlparse[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${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.5-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
}
@@ -50,33 +67,36 @@
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 -v1 \
+ PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
|| die "Tests fail with ${EPYTHON}"
}
-src_test() {
- # Port conflict in django.test.testcases.LiveServerTestCase.
- # Several other races with temp files.
- DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
-}
-
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/mysqlcient
+ optfeature "PostgreSQL backend support" dev-python/psycopg:2
+ optfeature "GEO Django" sci-libs/gdal[geos]
+ optfeature "Memcached support" dev-python/python-memcached
+ optfeature "ImageField Support" virtual/python-imaging
+ echo ""
}
python_install_all() {
- distutils-r1_python_install_all
- newbashcomp extras/django_bash_completion ${PN}
+ newbashcomp extras/django_bash_completion ${PN}-admin
+ bashcomp_alias ${PN}-admin django-admin.py
if use doc; then
- rm -fr docs/_build/html/_sources
- dohtml -A txt -r docs/_build/html/.
+ 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() {
1.152 dev-python/django/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.152&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.152&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?r1=1.151&r2=1.152
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- ChangeLog 28 Feb 2015 12:59:28 -0000 1.151
+++ ChangeLog 28 Feb 2015 18:08:42 -0000 1.152
@@ -1,6 +1,18 @@
# ChangeLog for dev-python/django
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.151
2015/02/28 12:59:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.152
2015/02/28 18:08:42 jlec Exp $
+
+*django-1.4.19 (28 Feb 2015)
+*django-1.6.10 (28 Feb 2015)
+
+ 28 Feb 2015; Justin Lecher <[email protected]> +django-1.4.19.ebuild,
+ +django-1.6.10.ebuild, +files/django-1.4.19-bashcomp.patch,
+ +files/django-1.4.19-test.patch, +files/django-1.6.10-bashcomp.patch,
+ +files/django-1.6.10-test.patch, -django-1.7.4.ebuild, -django-1.7.ebuild,
+ django-1.7.5.ebuild, django-9999.ebuild:
+ Version BUmp and drop old for CVE-2015-{0219,0220,0221,0222}, #536586; add
+ correct dependencies for tests, Use optfeature instead of harddepened on
+ imaging, #473228
*django-1.7.5 (28 Feb 2015)
1.1 dev-python/django/django-1.4.19.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.4.19.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.4.19.ebuild?rev=1.1&content-type=text/plain
Index: django-1.4.19.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.19.ebuild,v 1.1
2015/02/28 18:08:42 jlec Exp $
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}"/${P}-bashcomp.patch
"${FILESDIR}"/${P}-test.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" 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."
}
1.1 dev-python/django/django-1.6.10.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.6.10.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.6.10.ebuild?rev=1.1&content-type=text/plain
Index: django-1.6.10.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.6.10.ebuild,v 1.1
2015/02/28 18:08:42 jlec Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
PYTHON_COMPAT=( python2_7 )
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-1.9[$(python_gen_usedep 'python*')]
dev-python/pillow[${PYTHON_USEDEP}]
dev-python/pyyaml[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
)"
# dev-python/bcrypt[${PYTHON_USEDEP}]
# dev-python/selenium[${PYTHON_USEDEP}]
S="${WORKDIR}/${MY_P}"
WEBAPP_MANUAL_SLOT="yes"
PATCHES=(
"${FILESDIR}"/${PN}-1.5-py3tests.patch
"${FILESDIR}"/${PN}-1.6-objects.patch
"${FILESDIR}"/${P}-bashcomp.patch
"${FILESDIR}"/${P}-test.patch
)
pkg_setup() {
webapp_pkg_setup
}
python_prepare_all() {
# Disable tests requiring network connection.
sed \
-e "s:test_sensitive_cookie_not_cached:_&:g" \
-i tests/cache/tests.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/mysql-connector-python
optfeature "PostgreSQL backend support" dev-python/psycopg:2
optfeature "Memcached support" 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
}
