Merge from Prefix

(Portage version: 2.2.00.14552-prefix/cvs/Darwin powerpc, RepoMan options: --force)

6 files changed, 46 insertions, 30 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
 }