[gentoo-commits] gentoo-x86 commit in dev-python/django: django-1.5.ebuild django-9999.ebuild ChangeLog

[Mike Gilbert (floppym)]

floppym     13/03/30 13:21:39

  Modified:             django-1.5.ebuild django-9999.ebuild ChangeLog
  Log:
  Update live ebuild.
  
  (Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

Revision  Changes    Path
1.5                  dev-python/django/django-1.5.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.5.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.5.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.5.ebuild?r1=1.4&r2=1.5

Index: django-1.5.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- django-1.5.ebuild	30 Mar 2013 13:15:19 -0000	1.4
+++ django-1.5.ebuild	30 Mar 2013 13:21:39 -0000	1.5
@@ -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.4 2013/03/30 13:15:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.ebuild,v 1.5 2013/03/30 13:21:39 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -49,11 +49,6 @@
 	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
 }
 
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-}
-
 python_install_all() {
 	distutils-r1_python_install_all
 	newbashcomp extras/django_bash_completion ${PN}
@@ -65,6 +60,8 @@
 
 	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
 	doins -r django/contrib/admin/static/admin/.
+
+	webapp_src_install
 }
 
 pkg_postinst() {



1.19                 dev-python/django/django-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?r1=1.18&r2=1.19

Index: django-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- django-9999.ebuild	23 Feb 2013 21:26:05 -0000	1.18
+++ django-9999.ebuild	30 Mar 2013 13:21:39 -0000	1.19
@@ -1,10 +1,9 @@
 # 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-9999.ebuild,v 1.18 2013/02/23 21:26:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.19 2013/03/30 13:21:39 floppym Exp $
 
 EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE='sqlite?'
 
 #if LIVE
@@ -26,9 +25,10 @@
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc mysql postgres sqlite test"
 
-RDEPEND="dev-python/imaging[${PYTHON_USEDEP}]
+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[${PYTHON_USEDEP}] )"
+	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} )"
@@ -42,21 +42,6 @@
 
 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
 }
@@ -77,7 +62,6 @@
 
 python_install_all() {
 	distutils-r1_python_install_all
-
 	newbashcomp extras/django_bash_completion ${PN}
 
 	if use doc; then
@@ -98,6 +82,8 @@
 	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.104                dev-python/django/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?r1=1.103&r2=1.104

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- ChangeLog	30 Mar 2013 13:15:19 -0000	1.103
+++ ChangeLog	30 Mar 2013 13:21:39 -0000	1.104
@@ -1,6 +1,10 @@
 # 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.103 2013/03/30 13:15:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.104 2013/03/30 13:21:39 floppym Exp $
+
+  30 Mar 2013; Mike Gilbert <floppym@g.o> django-1.5.ebuild,
+  django-9999.ebuild:
+  Update live ebuild.
 
   30 Mar 2013; Mike Gilbert <floppym@g.o> django-1.5.ebuild:
   Remove obsolete sed commands.