Merge from Prefix

Package-Manager: portage-2.2.00.14552-prefix/cvs/Darwin powerpc
RepoMan-Options: --force

8 files changed, 29 insertions, 15 deletions

diff --git a/dev-python/decorator/ChangeLog b/dev-python/decorator/ChangeLog
index 1d283301d78e..20f551bafa91 100644
--- a/dev-python/decorator/ChangeLog
+++ b/dev-python/decorator/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/decorator
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/decorator/ChangeLog,v 1.8 2009/09/05 13:53:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/decorator/ChangeLog,v 1.9 2009/10/10 15:24:27 grobian Exp $
+
+  10 Oct 2009; Fabian Groffen <grobian@gentoo.org> decorator-3.1.2.ebuild:
+  Merge from Prefix
 
   05 Sep 2009; Patrick Lauer <patrick@gentoo.org> -decorator-3.0.1.ebuild:
   Remove old
diff --git a/dev-python/decorator/decorator-3.1.2.ebuild b/dev-python/decorator/decorator-3.1.2.ebuild
index 0ec0e7700d56..a39d095ea249 100644
--- a/dev-python/decorator/decorator-3.1.2.ebuild
+++ b/dev-python/decorator/decorator-3.1.2.ebuild
@@ -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/decorator/decorator-3.1.2.ebuild,v 1.1 2009/08/29 20:36:14 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/decorator/decorator-3.1.2.ebuild,v 1.2 2009/10/10 15:24:27 grobian Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -13,7 +13,7 @@ SRC_URI="http://pypi.python.org/packages/source/d/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DEPEND=""
diff --git a/dev-python/decoratortools/ChangeLog b/dev-python/decoratortools/ChangeLog
index 42689222eab2..6cbe7978ee67 100644
--- a/dev-python/decoratortools/ChangeLog
+++ b/dev-python/decoratortools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/decoratortools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/decoratortools/ChangeLog,v 1.12 2009/09/05 18:55:52 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/decoratortools/ChangeLog,v 1.13 2009/10/10 15:25:53 grobian Exp $
+
+  10 Oct 2009; Fabian Groffen <grobian@gentoo.org>
+  decoratortools-1.7.ebuild:
+  Merge from Prefix
 
   05 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   decoratortools-1.7.ebuild:
diff --git a/dev-python/decoratortools/decoratortools-1.7.ebuild b/dev-python/decoratortools/decoratortools-1.7.ebuild
index 935cc74d3f28..8e327d99db5a 100644
--- a/dev-python/decoratortools/decoratortools-1.7.ebuild
+++ b/dev-python/decoratortools/decoratortools-1.7.ebuild
@@ -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/decoratortools/decoratortools-1.7.ebuild,v 1.2 2009/09/05 18:55:52 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/decoratortools/decoratortools-1.7.ebuild,v 1.3 2009/10/10 15:25:53 grobian Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -16,7 +16,7 @@ SRC_URI="http://cheeseshop.python.org/packages/source/D/${MY_PN}/${MY_P}.zip"
 
 LICENSE="|| ( PSF-2.4 ZPL )"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND="app-arch/unzip
diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index d862bc6d203c..bc9817c30827 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -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:
diff --git a/dev-python/django/django-1.1.1.ebuild b/dev-python/django/django-1.1.1.ebuild
index 2eba0c5e517b..78205290e5e8 100644
--- a/dev-python/django/django-1.1.1.ebuild
+++ b/dev-python/django/django-1.1.1.ebuild
@@ -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 @@ SRC_URI="http://media.djangoproject.com/releases/${PV}/${MY_P}.tar.gz"
 
 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 @@ __EOF__
 }
 
 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 @@ src_install() {
 		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
diff --git a/dev-python/dnspython/ChangeLog b/dev-python/dnspython/ChangeLog
index 9278abb5cf68..ac751ccc1e5b 100644
--- a/dev-python/dnspython/ChangeLog
+++ b/dev-python/dnspython/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/dnspython
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dnspython/ChangeLog,v 1.46 2009/09/08 20:14:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dnspython/ChangeLog,v 1.47 2009/10/10 15:30:59 grobian Exp $
+
+  10 Oct 2009; Fabian Groffen <grobian@gentoo.org> dnspython-1.7.1.ebuild:
+  Merge from Prefix
 
   08 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   dnspython-1.7.1.ebuild:
diff --git a/dev-python/dnspython/dnspython-1.7.1.ebuild b/dev-python/dnspython/dnspython-1.7.1.ebuild
index 78b8bd678d69..eda151993f7b 100644
--- a/dev-python/dnspython/dnspython-1.7.1.ebuild
+++ b/dev-python/dnspython/dnspython-1.7.1.ebuild
@@ -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/dnspython/dnspython-1.7.1.ebuild,v 1.2 2009/09/08 20:14:30 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dnspython/dnspython-1.7.1.ebuild,v 1.3 2009/10/10 15:30:59 grobian Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -13,7 +13,7 @@ SRC_URI="http://www.dnspython.org/kits/${PV}/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="examples"
 
 DEPEND=""