diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-03-30 13:15:19 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-03-30 13:15:19 +0000 |
| commit | 2a7d94b191918328fc0b01dc2f945bc7b2fec1a2 (patch) | |
| tree | 0ff7393cc7acb096e708377680f94e926df6fd6a /dev-python/django | |
| parent | Remove vulnerable ebuilds after stabling, for security bug #463622. (diff) | |
| download | gentoo-2-2a7d94b191918328fc0b01dc2f945bc7b2fec1a2.tar.gz gentoo-2-2a7d94b191918328fc0b01dc2f945bc7b2fec1a2.tar.bz2 gentoo-2-2a7d94b191918328fc0b01dc2f945bc7b2fec1a2.zip | |
Remove obsolete sed commands.
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-python/django')
| -rw-r--r-- | dev-python/django/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/django/django-1.5.ebuild | 23 |
2 files changed, 8 insertions, 20 deletions
diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog index 7029aa489545..b92bbda4a068 100644 --- a/dev-python/django/ChangeLog +++ b/dev-python/django/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/django # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.102 2013/03/28 05:09:51 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.103 2013/03/30 13:15:19 floppym Exp $ + + 30 Mar 2013; Mike Gilbert <floppym@gentoo.org> django-1.5.ebuild: + Remove obsolete sed commands. 28 Mar 2013; Mike Gilbert <floppym@gentoo.org> django-1.5.ebuild: Remove obsolete comment. diff --git a/dev-python/django/django-1.5.ebuild b/dev-python/django/django-1.5.ebuild index f11231407a29..4d359a60fcc4 100644 --- a/dev-python/django/django-1.5.ebuild +++ b/dev-python/django/django-1.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.ebuild,v 1.3 2013/03/28 05:09:51 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.ebuild,v 1.4 2013/03/30 13:15:19 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) @@ -19,10 +19,10 @@ 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" -py2dep=$(python_gen_usedep 'python2*') -RDEPEND="dev-python/imaging[${py2dep}] +PY2_USEDEP=$(python_gen_usedep 'python2*') +RDEPEND="dev-python/imaging[${PY2_USEDEP}] postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - mysql? ( >=dev-python/mysql-python-1.2.3[${py2dep}] )" + mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )" DEPEND="${RDEPEND} doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] ) test? ( ${PYTHON_DEPS//sqlite?/sqlite} )" @@ -31,21 +31,6 @@ S="${WORKDIR}/${MY_P}" WEBAPP_MANUAL_SLOT="yes" -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_compile_all() { use doc && emake -C docs html } |