public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-python/django: ChangeLog django-1.1.1.ebuild
@ 2009-10-10 15:29 Fabian Groffen (grobian)
  0 siblings, 0 replies; 6+ messages in thread
From: Fabian Groffen (grobian) @ 2009-10-10 15:29 UTC (permalink / raw
  To: gentoo-commits

grobian     09/10/10 15:29:36

  Modified:             ChangeLog django-1.1.1.ebuild
  Log:
  Merge from Prefix
  (Portage version: 2.2.00.14552-prefix/cvs/Darwin powerpc, RepoMan options: --force)

Revision  Changes    Path
1.39                 dev-python/django/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?r1=1.38&r2=1.39

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ChangeLog	9 Oct 2009 23:08:40 -0000	1.38
+++ ChangeLog	10 Oct 2009 15:29:36 -0000	1.39
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.38 2009/10/09 23:08:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.39 2009/10/10 15:29:36 grobian Exp $
+
+  10 Oct 2009; Fabian Groffen <grobian@gentoo.org> django-1.1.1.ebuild:
+  Merge from Prefix
 
   09 Oct 2009; Patrick Lauer <patrick@gentoo.org> -django-1.0.2-r1.ebuild,
   -django-1.0.3.ebuild, -django-1.1.ebuild:



1.2                  dev-python/django/django-1.1.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.1.1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.1.1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.1.1.ebuild?r1=1.1&r2=1.2

Index: django-1.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- django-1.1.1.ebuild	9 Oct 2009 23:05:00 -0000	1.1
+++ django-1.1.1.ebuild	10 Oct 2009 15:29:36 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.1 2009/10/09 23:05:00 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.2 2009/10/10 15:29:36 grobian Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -16,7 +16,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc examples mysql postgres sqlite test"
 
 RDEPEND="dev-python/imaging
@@ -65,9 +65,10 @@
 }
 
 src_install() {
+	[[ -z ${ED} ]] && local ED=${D}
 	distutils_python_version
 	site_pkgs="$(python_get_sitedir)"
-	export PYTHONPATH="${PYTHONPATH}:${D}/${site_pkgs}"
+	export PYTHONPATH="${PYTHONPATH}:${ED}/${site_pkgs}"
 	dodir ${site_pkgs}
 
 	distutils_src_install
@@ -84,8 +85,8 @@
 		dohtml txt -r docs/_build/html/*
 	fi
 
-	insinto "${MY_HTDOCSDIR}"
-	doins -r "${D}/${site_pkgs}"/django/contrib/admin/media/*
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r "${ED}/${site_pkgs}"/django/contrib/admin/media/*
 
 	#webapp_postinst_txt en "${WORKDIR}"/postinstall-en.txt
 	webapp_src_install






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-python/django: ChangeLog django-1.1.1.ebuild
@ 2010-01-03  1:25 Arfrever Frehtes Taifersar Arahesis (arfrever)
  0 siblings, 0 replies; 6+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis (arfrever) @ 2010-01-03  1:25 UTC (permalink / raw
  To: gentoo-commits

arfrever    10/01/03 01:25:40

  Modified:             ChangeLog django-1.1.1.ebuild
  Log:
  Fix tests (bug #294575).
  (Portage version: 15156-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.40                 dev-python/django/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?r1=1.39&r2=1.40

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ChangeLog	10 Oct 2009 15:29:36 -0000	1.39
+++ ChangeLog	3 Jan 2010 01:25:39 -0000	1.40
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/django
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.39 2009/10/10 15:29:36 grobian Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.40 2010/01/03 01:25:39 arfrever Exp $
+
+  03 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  django-1.1.1.ebuild, +files/django-1.1.1-fix_tests.patch:
+  Fix tests (bug #294575).
 
   10 Oct 2009; Fabian Groffen <grobian@gentoo.org> django-1.1.1.ebuild:
   Merge from Prefix



1.3                  dev-python/django/django-1.1.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.1.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.1.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.1.1.ebuild?r1=1.2&r2=1.3

Index: django-1.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- django-1.1.1.ebuild	10 Oct 2009 15:29:36 -0000	1.2
+++ django-1.1.1.ebuild	3 Jan 2010 01:25:39 -0000	1.3
@@ -1,17 +1,18 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.2 2009/10/10 15:29:36 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.3 2010/01/03 01:25:39 arfrever Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit bash-completion distutils multilib versionator webapp
 
-MY_P="${P/#d/D}"
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
 WEBAPP_MANUAL_SLOT="yes"
 
 DESCRIPTION="High-level python web framework"
-HOMEPAGE="http://www.djangoproject.com/"
+HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
 SRC_URI="http://media.djangoproject.com/releases/${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
@@ -32,8 +33,7 @@
 		>=dev-lang/python-2.5[sqlite]
 		( dev-python/pysqlite:2 <dev-lang/python-2.5 )
 	) )"
-
-RESTRICT_PYTHON_ABIS="3*"
+RESTRICT_PYTHON_ABIS="3.*"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -41,10 +41,15 @@
 
 DOCS="docs/* AUTHORS"
 
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-fix_tests.patch"
+}
+
 src_compile() {
 	distutils_src_compile
 
-	if use doc ; then
+	if use doc; then
 		pushd docs > /dev/null
 		emake html || die "Generation of HTML documentation failed"
 		popd > /dev/null
@@ -59,36 +64,38 @@
 ROOT_URLCONF='tests/urls.py'
 SITE_ID=1
 __EOF__
-		PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" tests/runtests.py --settings=settings -v1
+		# Tests have non-standard assumptions about PYTHONPATH and
+		# don't work with usual "build-${PYTHON_ABI}/lib".
+		PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=settings -v1
 	}
 	python_execute_function testing
 }
 
 src_install() {
-	[[ -z ${ED} ]] && local ED=${D}
-	distutils_python_version
-	site_pkgs="$(python_get_sitedir)"
-	export PYTHONPATH="${PYTHONPATH}:${ED}/${site_pkgs}"
-	dodir ${site_pkgs}
+	[[ -z "${ED}" ]] && local ED="${D}"
+
+	python_set_active_version 2
+	local sitedir="$(python_get_sitedir)"
+	export PYTHONPATH="${PYTHONPATH}${PYTHONPATH:+:}${ED}/${sitedir}"
+	dodir "${sitedir}"
 
 	distutils_src_install
 
 	dobashcompletion extras/django_bash_completion
 
-	if use examples ; then
+	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r examples
 	fi
 
-	if use doc ; then
+	if use doc; then
 		mv docs/_build/html/{_,.}sources
 		dohtml txt -r docs/_build/html/*
 	fi
 
 	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r "${ED}/${site_pkgs}"/django/contrib/admin/media/*
+	doins -r "${ED}/${sitedir}/django/contrib/admin/media/"* || die "doins failed"
 
-	#webapp_postinst_txt en "${WORKDIR}"/postinstall-en.txt
 	webapp_src_install
 }
 






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-python/django: ChangeLog django-1.1.1.ebuild
@ 2010-01-03 13:30 Pacho Ramos (pacho)
  0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos (pacho) @ 2010-01-03 13:30 UTC (permalink / raw
  To: gentoo-commits

pacho       10/01/03 13:30:08

  Modified:             ChangeLog django-1.1.1.ebuild
  Log:
  amd64 stable, bug 277109
  (Portage version: 2.1.7.15/cvs/Linux x86_64)

Revision  Changes    Path
1.41                 dev-python/django/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?r1=1.40&r2=1.41

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ChangeLog	3 Jan 2010 01:25:39 -0000	1.40
+++ ChangeLog	3 Jan 2010 13:30:08 -0000	1.41
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.40 2010/01/03 01:25:39 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.41 2010/01/03 13:30:08 pacho Exp $
+
+  03 Jan 2010; Pacho Ramos <pacho@gentoo.org> django-1.1.1.ebuild:
+  amd64 stable, bug 277109
 
   03 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   django-1.1.1.ebuild, +files/django-1.1.1-fix_tests.patch:



1.4                  dev-python/django/django-1.1.1.ebuild

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

Index: django-1.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- django-1.1.1.ebuild	3 Jan 2010 01:25:39 -0000	1.3
+++ django-1.1.1.ebuild	3 Jan 2010 13:30:08 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.3 2010/01/03 01:25:39 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.4 2010/01/03 13:30:08 pacho Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -17,7 +17,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc examples mysql postgres sqlite test"
 
 RDEPEND="dev-python/imaging






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-python/django: ChangeLog django-1.1.1.ebuild
@ 2010-01-03 21:45 Christian Faulhammer (fauli)
  0 siblings, 0 replies; 6+ messages in thread
From: Christian Faulhammer (fauli) @ 2010-01-03 21:45 UTC (permalink / raw
  To: gentoo-commits

fauli       10/01/03 21:45:26

  Modified:             ChangeLog django-1.1.1.ebuild
  Log:
  stable x86, bug 277109
  (Portage version: 2.1.6.13/cvs/Linux i686)

Revision  Changes    Path
1.42                 dev-python/django/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.42&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.42&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?r1=1.41&r2=1.42

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ChangeLog	3 Jan 2010 13:30:08 -0000	1.41
+++ ChangeLog	3 Jan 2010 21:45:26 -0000	1.42
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.41 2010/01/03 13:30:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.42 2010/01/03 21:45:26 fauli Exp $
+
+  03 Jan 2010; Christian Faulhammer <fauli@gentoo.org> django-1.1.1.ebuild:
+  stable x86, bug 277109
 
   03 Jan 2010; Pacho Ramos <pacho@gentoo.org> django-1.1.1.ebuild:
   amd64 stable, bug 277109



1.5                  dev-python/django/django-1.1.1.ebuild

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

Index: django-1.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- django-1.1.1.ebuild	3 Jan 2010 13:30:08 -0000	1.4
+++ django-1.1.1.ebuild	3 Jan 2010 21:45:26 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.4 2010/01/03 13:30:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.5 2010/01/03 21:45:26 fauli Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -17,7 +17,7 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc examples mysql postgres sqlite test"
 
 RDEPEND="dev-python/imaging






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-python/django: ChangeLog django-1.1.1.ebuild
@ 2010-02-08  8:43 Peter Volkov (pva)
  0 siblings, 0 replies; 6+ messages in thread
From: Peter Volkov (pva) @ 2010-02-08  8:43 UTC (permalink / raw
  To: gentoo-commits

pva         10/02/08 08:43:14

  Modified:             ChangeLog django-1.1.1.ebuild
  Log:
  Add inherit eutils for epatch.
  (Portage version: 2.1.7.17/cvs/Linux x86_64)

Revision  Changes    Path
1.43                 dev-python/django/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.43&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.43&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?r1=1.42&r2=1.43

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ChangeLog	3 Jan 2010 21:45:26 -0000	1.42
+++ ChangeLog	8 Feb 2010 08:43:13 -0000	1.43
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.42 2010/01/03 21:45:26 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.43 2010/02/08 08:43:13 pva Exp $
+
+  08 Feb 2010; Peter Volkov <pva@gentoo.org> django-1.1.1.ebuild:
+  Add inherit eutils for epatch.
 
   03 Jan 2010; Christian Faulhammer <fauli@gentoo.org> django-1.1.1.ebuild:
   stable x86, bug 277109



1.6                  dev-python/django/django-1.1.1.ebuild

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

Index: django-1.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- django-1.1.1.ebuild	3 Jan 2010 21:45:26 -0000	1.5
+++ django-1.1.1.ebuild	8 Feb 2010 08:43:13 -0000	1.6
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.5 2010/01/03 21:45:26 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.6 2010/02/08 08:43:13 pva Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
 
-inherit bash-completion distutils multilib versionator webapp
+inherit eutils bash-completion distutils multilib versionator webapp
 
 MY_PN="Django"
 MY_P="${MY_PN}-${PV}"






^ permalink raw reply	[flat|nested] 6+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-python/django: ChangeLog django-1.1.1.ebuild
@ 2010-02-14 17:37 Arfrever Frehtes Taifersar Arahesis (arfrever)
  0 siblings, 0 replies; 6+ messages in thread
From: Arfrever Frehtes Taifersar Arahesis (arfrever) @ 2010-02-14 17:37 UTC (permalink / raw
  To: gentoo-commits

arfrever    10/02/14 17:37:12

  Modified:             ChangeLog django-1.1.1.ebuild
  Log:
  Fix installation (bug #304789).
  (Portage version: 15354-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.44                 dev-python/django/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.44&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.44&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?r1=1.43&r2=1.44

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ChangeLog	8 Feb 2010 08:43:13 -0000	1.43
+++ ChangeLog	14 Feb 2010 17:37:11 -0000	1.44
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.43 2010/02/08 08:43:13 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.44 2010/02/14 17:37:11 arfrever Exp $
+
+  14 Feb 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  django-1.1.1.ebuild:
+  Fix installation (bug #304789).
 
   08 Feb 2010; Peter Volkov <pva@gentoo.org> django-1.1.1.ebuild:
   Add inherit eutils for epatch.



1.7                  dev-python/django/django-1.1.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.1.1.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.1.1.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.1.1.ebuild?r1=1.6&r2=1.7

Index: django-1.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- django-1.1.1.ebuild	8 Feb 2010 08:43:13 -0000	1.6
+++ django-1.1.1.ebuild	14 Feb 2010 17:37:11 -0000	1.7
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.6 2010/02/08 08:43:13 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.7 2010/02/14 17:37:11 arfrever Exp $
 
 EAPI="2"
+PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit eutils bash-completion distutils multilib versionator webapp
@@ -74,11 +75,6 @@
 src_install() {
 	[[ -z "${ED}" ]] && local ED="${D}"
 
-	python_set_active_version 2
-	local sitedir="$(python_get_sitedir)"
-	export PYTHONPATH="${PYTHONPATH}${PYTHONPATH:+:}${ED}/${sitedir}"
-	dodir "${sitedir}"
-
 	distutils_src_install
 
 	dobashcompletion extras/django_bash_completion
@@ -94,7 +90,7 @@
 	fi
 
 	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r "${ED}/${sitedir}/django/contrib/admin/media/"* || die "doins failed"
+	doins -r django/contrib/admin/media/* || die "doins failed"
 
 	webapp_src_install
 }






^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-02-14 17:37 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-03 21:45 [gentoo-commits] gentoo-x86 commit in dev-python/django: ChangeLog django-1.1.1.ebuild Christian Faulhammer (fauli)
  -- strict thread matches above, loose matches on Subject: below --
2010-02-14 17:37 Arfrever Frehtes Taifersar Arahesis (arfrever)
2010-02-08  8:43 Peter Volkov (pva)
2010-01-03 13:30 Pacho Ramos (pacho)
2010-01-03  1:25 Arfrever Frehtes Taifersar Arahesis (arfrever)
2009-10-10 15:29 Fabian Groffen (grobian)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox