Merge from Prefix

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

16 files changed, 86 insertions, 50 deletions

diff --git a/dev-python/python-docs/ChangeLog b/dev-python/python-docs/ChangeLog
index 5b654319a6da..b769598604d0 100644
--- a/dev-python/python-docs/ChangeLog
+++ b/dev-python/python-docs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-docs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/ChangeLog,v 1.130 2009/10/04 18:21:41 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/ChangeLog,v 1.131 2009/10/11 11:22:18 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org>
+  python-docs-2.4.4-r1.ebuild, python-docs-2.5.4-r1.ebuild,
+  python-docs-2.6.2-r1.ebuild, python-docs-2.6.3.ebuild,
+  python-docs-3.1.1.ebuild:
+  Merge from Prefix
 
 *python-docs-2.6.3 (04 Oct 2009)
 
diff --git a/dev-python/python-docs/python-docs-2.4.4-r1.ebuild b/dev-python/python-docs/python-docs-2.4.4-r1.ebuild
index 6055a38d6c5f..974efa35efea 100644
--- a/dev-python/python-docs/python-docs-2.4.4-r1.ebuild
+++ b/dev-python/python-docs/python-docs-2.4.4-r1.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/python-docs/python-docs-2.4.4-r1.ebuild,v 1.4 2009/09/27 18:39:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.4.4-r1.ebuild,v 1.5 2009/10/11 11:22:18 grobian Exp $
 
 DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/"
@@ -9,7 +9,7 @@ http://www.python.org/ftp/python/doc/${PV}/info-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=app-admin/eselect-python-20090606"
@@ -26,13 +26,14 @@ src_unpack() {
 }
 
 src_install() {
+	[[ -z ${ED} ]] && local ED=${D}
 	docinto html
-	cp -R "${S}/Python-Docs-${PV}/"* "${D}/usr/share/doc/${PF}/html"
+	cp -R "${S}/Python-Docs-${PV}/"* "${ED}/usr/share/doc/${PF}/html"
 
 	insinto /usr/share/info
 	doins "${S}/info/"*
 
-	echo "PYTHONDOCS_${SLOT//./_}=\"/usr/share/doc/${PF}/html\"" > "60python-docs-${SLOT}"
+	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html\"" > "60python-docs-${SLOT}"
 	doenvd "60python-docs-${SLOT}"
 }
 
@@ -51,11 +52,12 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	[[ -z ${EROOT} ]] && local EROOT=${ROOT}
 	eselect_python_update
 
 	if ! has_version "<dev-python/python-docs-${SLOT}_alpha" && ! has_version ">=dev-python/python-docs-${SLOT%.*}.$((${SLOT#*.}+1))_alpha"; then
-		rm -f "${ROOT}etc/env.d/65python-docs"
+		rm -f "${EROOT}etc/env.d/65python-docs"
 	fi
 
-	rm -f "${ROOT}etc/env.d/50python-docs"
+	rm -f "${EROOT}etc/env.d/50python-docs"
 }
diff --git a/dev-python/python-docs/python-docs-2.5.4-r1.ebuild b/dev-python/python-docs/python-docs-2.5.4-r1.ebuild
index de91f6f7b91a..80cc955fcb1d 100644
--- a/dev-python/python-docs/python-docs-2.5.4-r1.ebuild
+++ b/dev-python/python-docs/python-docs-2.5.4-r1.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/python-docs/python-docs-2.5.4-r1.ebuild,v 1.4 2009/09/27 18:39:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.5.4-r1.ebuild,v 1.5 2009/10/11 11:22:18 grobian Exp $
 
 DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.python.org/ftp/python/doc/${PV}/html-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.5"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=app-admin/eselect-python-20090606"
@@ -22,10 +22,11 @@ src_unpack() {
 }
 
 src_install() {
+	[[ -z ${ED} ]] && local ED=${D}
 	docinto html
-	cp -R "${S}/Python-Docs-${PV}/"* "${D}/usr/share/doc/${PF}/html"
+	cp -R "${S}/Python-Docs-${PV}/"* "${ED}/usr/share/doc/${PF}/html"
 
-	echo "PYTHONDOCS_${SLOT//./_}=\"/usr/share/doc/${PF}/html\"" > "60python-docs-${SLOT}"
+	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html\"" > "60python-docs-${SLOT}"
 	doenvd "60python-docs-${SLOT}"
 }
 
@@ -44,11 +45,12 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	[[ -z ${EROOT} ]] && local EROOT=${ROOT}
 	eselect_python_update
 
 	if ! has_version "<dev-python/python-docs-${SLOT}_alpha" && ! has_version ">=dev-python/python-docs-${SLOT%.*}.$((${SLOT#*.}+1))_alpha"; then
-		rm -f "${ROOT}etc/env.d/65python-docs"
+		rm -f "${EROOT}etc/env.d/65python-docs"
 	fi
 
-	rm -f "${ROOT}etc/env.d/50python-docs"
+	rm -f "${EROOT}etc/env.d/50python-docs"
 }
diff --git a/dev-python/python-docs/python-docs-2.6.2-r1.ebuild b/dev-python/python-docs/python-docs-2.6.2-r1.ebuild
index a76cc0b35841..f3f6fe6f473c 100644
--- a/dev-python/python-docs/python-docs-2.6.2-r1.ebuild
+++ b/dev-python/python-docs/python-docs-2.6.2-r1.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/python-docs/python-docs-2.6.2-r1.ebuild,v 1.11 2009/09/27 18:39:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.6.2-r1.ebuild,v 1.12 2009/10/11 11:22:18 grobian Exp $
 
 DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.b
 
 LICENSE="PSF-2.2"
 SLOT="2.6"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=app-admin/eselect-python-20090606"
@@ -17,10 +17,11 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/python-${PV}-docs-html"
 
 src_install() {
+	[[ -z ${ED} ]] && local ED=${D}
 	docinto html
-	cp -R [a-z]* _static "${D}/usr/share/doc/${PF}/html"
+	cp -R [a-z]* _static "${ED}/usr/share/doc/${PF}/html"
 
-	echo "PYTHONDOCS_${SLOT//./_}=\"/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
+	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
 	doenvd "60python-docs-${SLOT}"
 }
 
@@ -39,11 +40,12 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	[[ -z ${EROOT} ]] && local EROOT=${ROOT}
 	eselect_python_update
 
 	if ! has_version "<dev-python/python-docs-${SLOT}_alpha" && ! has_version ">=dev-python/python-docs-${SLOT%.*}.$((${SLOT#*.}+1))_alpha"; then
-		rm -f "${ROOT}etc/env.d/65python-docs"
+		rm -f "${EROOT}etc/env.d/65python-docs"
 	fi
 
-	rm -f "${ROOT}etc/env.d/50python-docs"
+	rm -f "${EROOT}etc/env.d/50python-docs"
 }
diff --git a/dev-python/python-docs/python-docs-2.6.3.ebuild b/dev-python/python-docs/python-docs-2.6.3.ebuild
index edeac7c74731..2038f3e828dd 100644
--- a/dev-python/python-docs/python-docs-2.6.3.ebuild
+++ b/dev-python/python-docs/python-docs-2.6.3.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/python-docs/python-docs-2.6.3.ebuild,v 1.1 2009/10/04 18:21:41 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.6.3.ebuild,v 1.2 2009/10/11 11:22:18 grobian Exp $
 
 DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.b
 
 LICENSE="PSF-2.2"
 SLOT="2.6"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=app-admin/eselect-python-20090606"
@@ -17,10 +17,11 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/python-${PV}-docs-html"
 
 src_install() {
+	[[ -z ${ED} ]] && local ED=${D}
 	docinto html
-	cp -R [a-z]* _static "${D}/usr/share/doc/${PF}/html"
+	cp -R [a-z]* _static "${ED}/usr/share/doc/${PF}/html"
 
-	echo "PYTHONDOCS_${SLOT//./_}=\"/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
+	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
 	doenvd "60python-docs-${SLOT}"
 }
 
@@ -39,11 +40,12 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	[[ -z ${EROOT} ]] && local EROOT=${ROOT}
 	eselect_python_update
 
 	if ! has_version "<dev-python/python-docs-${SLOT}_alpha" && ! has_version ">=dev-python/python-docs-${SLOT%.*}.$((${SLOT#*.}+1))_alpha"; then
-		rm -f "${ROOT}etc/env.d/65python-docs"
+		rm -f "${EROOT}etc/env.d/65python-docs"
 	fi
 
-	rm -f "${ROOT}etc/env.d/50python-docs"
+	rm -f "${EROOT}etc/env.d/50python-docs"
 }
diff --git a/dev-python/python-docs/python-docs-3.1.1.ebuild b/dev-python/python-docs/python-docs-3.1.1.ebuild
index 4b560a831db7..8ba59bf419d9 100644
--- a/dev-python/python-docs/python-docs-3.1.1.ebuild
+++ b/dev-python/python-docs/python-docs-3.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/python-docs/python-docs-3.1.1.ebuild,v 1.2 2009/09/27 18:39:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-3.1.1.ebuild,v 1.3 2009/10/11 11:22:18 grobian Exp $
 
 DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.b
 
 LICENSE="PSF-2.2"
 SLOT="3.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 DEPEND=">=app-admin/eselect-python-20090606"
@@ -17,10 +17,11 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/python-${PV}-docs-html"
 
 src_install() {
+	[[ -z ${ED} ]] && local ED=${D}
 	docinto html
-	cp -R [a-z]* _static "${D}/usr/share/doc/${PF}/html"
+	cp -R [a-z]* _static "${ED}/usr/share/doc/${PF}/html"
 
-	echo "PYTHONDOCS_${SLOT//./_}=\"/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
+	echo "PYTHONDOCS_${SLOT//./_}=\"${EPREFIX}/usr/share/doc/${PF}/html/library\"" > "60python-docs-${SLOT}"
 	doenvd "60python-docs-${SLOT}"
 }
 
@@ -39,9 +40,10 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
+	[[ -z ${EROOT} ]] && local EROOT=${ROOT}
 	eselect_python_update
 
 	if ! has_version "<dev-python/python-docs-${SLOT}_alpha" && ! has_version ">=dev-python/python-docs-${SLOT%.*}.$((${SLOT#*.}+1))_alpha"; then
-		rm -f "${ROOT}etc/env.d/65python-docs"
+		rm -f "${EROOT}etc/env.d/65python-docs"
 	fi
 }
diff --git a/dev-python/python-fchksum/ChangeLog b/dev-python/python-fchksum/ChangeLog
index 741b094d4005..2bc5fa076926 100644
--- a/dev-python/python-fchksum/ChangeLog
+++ b/dev-python/python-fchksum/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/python-fchksum
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-fchksum/ChangeLog,v 1.33 2009/09/04 18:22:05 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-fchksum/ChangeLog,v 1.34 2009/10/11 11:26:21 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org>
+  python-fchksum-1.7.1.ebuild:
+  Merge from Prefix
 
   04 Sep 2009; Patrick Lauer <patrick@gentoo.org>
   -python-fchksum-1.6.1-r1.ebuild:
diff --git a/dev-python/python-fchksum/python-fchksum-1.7.1.ebuild b/dev-python/python-fchksum/python-fchksum-1.7.1.ebuild
index 3c69ad076cca..8c1841b30abb 100644
--- a/dev-python/python-fchksum/python-fchksum-1.7.1.ebuild
+++ b/dev-python/python-fchksum/python-fchksum-1.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-fchksum/python-fchksum-1.7.1.ebuild,v 1.25 2007/02/28 22:07:20 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-fchksum/python-fchksum-1.7.1.ebuild,v 1.26 2009/10/11 11:26:21 grobian Exp $
 
 # DON'T inherit distutils because it will cause a circular dependency with python
 #inherit distutils
@@ -11,7 +11,7 @@ SRC_URI="http://www.dakotacom.net/~donut/programs/fchksum/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd ~ppc-aix ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/python
@@ -22,5 +22,6 @@ src_compile() {
 }
 
 src_install() {
-	python setup.py install --root="${D}" || die
+	[[ -z ${ED} ]] && local ED=${D}
+	python setup.py install --root="${ED}" || die
 }
diff --git a/dev-python/python-memcached/ChangeLog b/dev-python/python-memcached/ChangeLog
index 46a06e69fba1..749d533eede7 100644
--- a/dev-python/python-memcached/ChangeLog
+++ b/dev-python/python-memcached/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/python-memcached
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-memcached/ChangeLog,v 1.7 2009/09/04 18:15:23 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-memcached/ChangeLog,v 1.8 2009/10/11 11:27:44 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org>
+  python-memcached-1.44.ebuild:
+  Merge from Prefix
 
   04 Sep 2009; Patrick Lauer <patrick@gentoo.org>
   -python-memcached-1.43.ebuild:
diff --git a/dev-python/python-memcached/python-memcached-1.44.ebuild b/dev-python/python-memcached/python-memcached-1.44.ebuild
index db3e4f8e941e..9633c187bd1d 100644
--- a/dev-python/python-memcached/python-memcached-1.44.ebuild
+++ b/dev-python/python-memcached/python-memcached-1.44.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/python-memcached/python-memcached-1.44.ebuild,v 1.2 2009/08/08 00:50:25 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-memcached/python-memcached-1.44.ebuild,v 1.3 2009/10/11 11:27:44 grobian Exp $
 
 NEED_PYTHON="2.4"
 SUPPORT_PYTHON_ABIS="1"
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.tummy.com/pub/python-memcached/${P}.tar.gz"
 
 LICENSE="OSL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux ~x86-macos"
 IUSE=""
 
 DEPEND="dev-python/setuptools"
diff --git a/dev-python/pytz/ChangeLog b/dev-python/pytz/ChangeLog
index 3a74eec228f7..4811bb4c9f5f 100644
--- a/dev-python/pytz/ChangeLog
+++ b/dev-python/pytz/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pytz
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/ChangeLog,v 1.41 2009/10/01 03:54:51 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/ChangeLog,v 1.42 2009/10/11 11:29:19 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pytz-2009n.ebuild:
+  Merge from Prefix
 
 *pytz-2009n (01 Oct 2009)
 
diff --git a/dev-python/pytz/pytz-2009n.ebuild b/dev-python/pytz/pytz-2009n.ebuild
index 68075b1cba9f..79f298f8b0c4 100644
--- a/dev-python/pytz/pytz-2009n.ebuild
+++ b/dev-python/pytz/pytz-2009n.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/pytz/pytz-2009n.ebuild,v 1.1 2009/10/01 03:54:51 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytz/pytz-2009n.ebuild,v 1.2 2009/10/11 11:29:19 grobian Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -13,7 +13,7 @@ SRC_URI="http://pypi.python.org/packages/source/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="MIT"
 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 ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-python/setuptools
@@ -36,6 +36,7 @@ src_test() {
 }
 
 src_install() {
+	[[ -z ${ED} ]] && local ED=${D}
 	distutils_src_install
-	rm -fr "${D}"usr/lib*/python*/site-packages/pytz/zoneinfo
+	rm -fr "${ED}"usr/lib*/python*/site-packages/pytz/zoneinfo
 }
diff --git a/dev-python/pyxml/ChangeLog b/dev-python/pyxml/ChangeLog
index 6c4d114dfdb8..4ff8c746fca4 100644
--- a/dev-python/pyxml/ChangeLog
+++ b/dev-python/pyxml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyxml
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/ChangeLog,v 1.58 2009/09/23 17:47:04 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/ChangeLog,v 1.59 2009/10/11 11:31:35 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pyxml-0.8.4-r2.ebuild:
+  Merge from Prefix
 
   23 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pyxml-0.8.4-r2.ebuild:
diff --git a/dev-python/pyxml/pyxml-0.8.4-r2.ebuild b/dev-python/pyxml/pyxml-0.8.4-r2.ebuild
index 3b07f39f0b8d..8e0ec7280db0 100644
--- a/dev-python/pyxml/pyxml-0.8.4-r2.ebuild
+++ b/dev-python/pyxml/pyxml-0.8.4-r2.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/pyxml/pyxml-0.8.4-r2.ebuild,v 1.10 2009/09/23 17:47:04 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.4-r2.ebuild,v 1.11 2009/10/11 11:31:35 grobian Exp $
 
 EAPI="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples"
 
 DEPEND=">=dev-libs/expat-1.95.6"
@@ -42,7 +42,7 @@ src_compile() {
 	fi
 
 	# use the already-installed shared copy of libexpat
-	distutils_src_compile --with-libexpat=/usr ${myconf}
+	distutils_src_compile --with-libexpat="${EPREFIX}"/usr ${myconf}
 }
 src_test() {
 	cd test
@@ -53,6 +53,7 @@ src_test() {
 }
 
 src_install() {
+	[[ -z ${ED} ]] && local ED=${D}
 	distutils_src_install
 
 	doman doc/man/*
@@ -60,5 +61,5 @@ src_install() {
 		dohtml -A api,web -r doc/*
 		insinto /usr/share/doc/${PF} && doins doc/*.tex
 	fi
-	use examples && cp -r demo "${D}"/usr/share/doc/${PF}
+	use examples && cp -r demo "${ED}"/usr/share/doc/${PF}
 }
diff --git a/dev-python/pyyaml/ChangeLog b/dev-python/pyyaml/ChangeLog
index bae0c5dfffef..de118b553993 100644
--- a/dev-python/pyyaml/ChangeLog
+++ b/dev-python/pyyaml/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pyyaml
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyyaml/ChangeLog,v 1.15 2009/09/05 19:06:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyyaml/ChangeLog,v 1.16 2009/10/11 11:33:04 grobian Exp $
+
+  11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pyyaml-3.09.ebuild:
+  Merge from Prefix
 
   05 Sep 2009; Brent Baude <ranger@gentoo.org> pyyaml-3.08.ebuild:
   Marking pyyaml-3.08 ppc64 for bug 277972
diff --git a/dev-python/pyyaml/pyyaml-3.09.ebuild b/dev-python/pyyaml/pyyaml-3.09.ebuild
index b40eb6eae4bc..7c6c511911a5 100644
--- a/dev-python/pyyaml/pyyaml-3.09.ebuild
+++ b/dev-python/pyyaml/pyyaml-3.09.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/pyyaml/pyyaml-3.09.ebuild,v 1.2 2009/09/05 16:39:21 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyyaml/pyyaml-3.09.ebuild,v 1.3 2009/10/11 11:33:04 grobian Exp $
 
 EAPI="2"
 
@@ -17,7 +17,7 @@ SRC_URI="http://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-linux ~x86-macos"
 IUSE="examples libyaml"
 
 DEPEND="libyaml? ( dev-libs/libyaml dev-python/pyrex )"