Fixed deps for python-2.5 (thanks to Jokey). Fixed bug #148456 (by removing ez_setup...

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index e683a189d559c4a79310a373d67f55f0e5435c4e..d42d699a7607b2df482e9b7778eff5a97ae4b392 100644 (file)
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.8 2006/08/13 15:40:12 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.9 2006/12/30 01:49:34 dev-zero Exp $
+
+  30 Dec 2006; Tiziano Müller <dev-zero@gentoo.org> -django-0.91.ebuild,
+  django-0.95.ebuild:
+  Fixed deps for python-2.5 (thanks to Jokey). Fixed bug #148456 (by removing
+  ez_setup-import). Dropped old version.
 
   13 Aug 2006; Lukasz Strzygowski <lucass@gentoo.org> django-0.95.ebuild:
   Added dev-python/imaging rdep, bug #143788.

diff --git a/dev-python/django/django-0.95.ebuild b/dev-python/django/django-0.95.ebuild
index e7f81e99b83ff61f14249d04c9eaf47bd76bb95b..7f18b6e11ed7ee12096c32b3b88f60d25234d3ef 100644 (file)
--- a/dev-python/django/django-0.95.ebuild
+++ b/dev-python/django/django-0.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-0.95.ebuild,v 1.2 2006/08/13 15:40:12 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-0.95.ebuild,v 1.3 2006/12/30 01:49:34 dev-zero Exp $
 
 inherit distutils
 
@@ -13,20 +13,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 IUSE="sqlite postgres mysql"
 
-DEPEND=">=dev-lang/python-2.3
-               >=dev-python/setuptools-0.6_rc1"
-
-RDEPEND=">=dev-lang/python-2.3
-               sqlite? ( >=dev-python/pysqlite-2.0.3 )
-               postgres? ( <dev-python/psycopg-1.99 )
-               mysql? ( dev-python/mysql-python )
-               dev-python/imaging"
-
-S="${WORKDIR}/${MY_P}"
-DOCS="docs/* AUTHORS INSTALL LICENSE"
+RDEPEND="dev-python/imaging
+       sqlite? ( || (
+               ( >=dev-python/pysqlite-2.0.3 <dev-lang/python-2.5 )
+               >=dev-lang/python-2.5 ) )
+       postgres? ( <dev-python/psycopg-1.99 )
+       mysql? ( dev-python/mysql-python )"
+DEPEND="${RDEPEND}
+       >=dev-python/setuptools-0.6_rc3"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="docs/* AUTHORS INSTALL"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       sed -i \
+               -e '/ez_setup/d' \
+               setup.py || die "sed failed"
+}
 
-src_install()
-{
+src_install() {
        distutils_python_version
 
        site_pkgs="/usr/$(get_libdir)/python${PYVER}/site-packages/"
@@ -35,5 +43,6 @@ src_install()
 
        distutils_src_install --single-version-externally-managed
 
-       cp -r examples "${D}/usr/share/doc/${PF}"
+       insinto /usr/share/doc/${PF}
+       doins -r examples
 }