Import from php overlay

3 files changed, 56 insertions, 31 deletions

diff --git a/eclass/depend.php.eclass b/eclass/depend.php.eclass
index 925641d9ffed..a30be860cbea 100644
--- a/eclass/depend.php.eclass
+++ b/eclass/depend.php.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.23 2008/01/06 19:30:24 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/depend.php.eclass,v 1.24 2008/02/11 20:47:35 armin76 Exp $
 
 # Author: Stuart Herbert <stuart@gentoo.org>
 # Author: Luca Longinotti <chtekk@gentoo.org>
@@ -632,18 +632,40 @@ if [[ $# -lt 1 ]] ; then
 	exit 1
 fi
 
-phpdocdir="${D}/usr/share/doc/${CATEGORY}/${PF}/"
+phpdocdir="/usr/share/doc/${CATEGORY}/${PF}/"
 
-if [[ ! -d "${phpdocdir}" ]] ; then
-	install -d "${phpdocdir}"
+for x in $@ ; do
+	if [[ -s "${x}" ]] ; then
+		insinto "${phpdocdir}"
+		doins "${x}"
+		gzip -f -9 "${D}/${phpdocdir}/${x##*/}"
+	elif [[ ! -e "${x}" ]] ; then
+		echo "dodoc-php: ${x} does not exist" 1>&2
+	fi
+done
+}
+
+# @FUNCTION: dohtml-php
+# @USAGE: <list of html docs>
+# @DESCRIPTION:
+# Alternative to dohtml function for use in our PHP eclasses and ebuilds.
+# Stored here because depend.php gets always sourced everywhere in the PHP
+# ebuilds and eclasses. It simply is dohtml with a changed path to the docs.
+# NOTE: No support for [-a|-A|-p|-x] options is provided!
+dohtml-php() {
+if [[ $# -lt 1 ]] ; then
+	echo "$0: at least one argument needed" 1>&2
+	exit 1
 fi
 
+phphtmldir="/usr/share/doc/${CATEGORY}/${PF}/html"
+
 for x in $@ ; do
 	if [[ -s "${x}" ]] ; then
-		install -m0644 "${x}" "${phpdocdir}"
-		gzip -f -9 "${phpdocdir}/${x##*/}"
+		insinto "${phphtmldir}"
+		doins "${x}"
 	elif [[ ! -e "${x}" ]] ; then
-		echo "dodoc-php: ${x} does not exist" 1>&2
+		echo "dohtml-php: ${x} does not exist" 1>&2
 	fi
 done
 }
diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass
index 430edceab02f..a98c9b8046c3 100644
--- a/eclass/php-pear-lib-r1.eclass
+++ b/eclass/php-pear-lib-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.12 2007/09/02 17:49:20 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.13 2008/02/11 20:47:35 armin76 Exp $
 #
 # Author: Luca Longinotti <chtekk@gentoo.org>
 
@@ -13,11 +13,11 @@
 # such as Creole, Jargon, Phing etc., while retaining the functionality to put
 # the libraries into version-dependant directories.
 
-inherit depend.php
+inherit depend.php multilib
 
 EXPORT_FUNCTIONS src_install
 
-DEPEND="dev-lang/php >=dev-php/PEAR-PEAR-1.4.6"
+DEPEND="dev-lang/php >=dev-php/PEAR-PEAR-1.6.1"
 RDEPEND="${DEPEND}"
 
 # @FUNCTION: php-pear-lib-r1_src_install
@@ -34,23 +34,20 @@ php-pear-lib-r1_src_install() {
 	case "${CATEGORY}" in
 		dev-php)
 			if has_version '=dev-lang/php-5*' ; then
-				PHP_BIN="/usr/lib/php5/bin/php"
+				PHP_BIN="/usr/$(get_libdir)/php5/bin/php"
 			else
-				PHP_BIN="/usr/lib/php4/bin/php"
+				PHP_BIN="/usr/$(get_libdir)/php4/bin/php"
 			fi ;;
-		dev-php4) PHP_BIN="/usr/lib/php4/bin/php" ;;
-		dev-php5) PHP_BIN="/usr/lib/php5/bin/php" ;;
+		dev-php4) PHP_BIN="/usr/$(get_libdir)/php4/bin/php" ;;
+		dev-php5) PHP_BIN="/usr/$(get_libdir)/php5/bin/php" ;;
 		*) die "Version of PHP required by packages in category ${CATEGORY} unknown"
 	esac
 
 	cd "${S}"
 	mv -f "${WORKDIR}/package.xml" "${S}"
 
-	if has_version '>=dev-php/PEAR-PEAR-1.4.8' ; then
-		pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package"
-	else
-		pear -d php_bin="${PHP_BIN}" install --nodeps --packagingroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package"
-	fi
+	pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
+		"${S}/package.xml" || die "Unable to install PEAR package"
 
 	rm -Rf "${D}/usr/share/php/.channels" \
 	"${D}/usr/share/php/.depdblock" \
@@ -64,7 +61,8 @@ php-pear-lib-r1_src_install() {
 	# the path, many files can specify it wrongly
 	if [[ -n "${PHP_SHARED_CAT}" ]] && [[ "${PHP_SHARED_CAT}" != "php" ]] ; then
 		mv -f "${D}/usr/share/php" "${D}/usr/share/${PHP_SHARED_CAT}" || die "Unable to move files"
-		find "${D}/" -type f -exec sed -e "s|/usr/share/php|/usr/share/${PHP_SHARED_CAT}|g" -i {} \; || die "Unable to change PHP path"
+		find "${D}/" -type f -exec sed -e "s|/usr/share/php|/usr/share/${PHP_SHARED_CAT}|g" -i {} \; \
+			|| die "Unable to change PHP path"
 		einfo
 		einfo "Installing to /usr/share/${PHP_SHARED_CAT} ..."
 		einfo
diff --git a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass
index e88573c89385..49f017dacbb8 100644
--- a/eclass/php-pear-r1.eclass
+++ b/eclass/php-pear-r1.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.19 2007/11/08 16:07:22 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.20 2008/02/11 20:47:35 armin76 Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
 # Author: Luca Longinotti <chtekk@gentoo.org>
@@ -15,9 +15,11 @@
 # Note that this eclass doesn't handle dependencies of PEAR packages
 # on purpose; please use (R)DEPEND to define them correctly!
 
+inherit multilib
+
 EXPORT_FUNCTIONS src_install
 
-DEPEND="dev-lang/php >=dev-php/PEAR-PEAR-1.4.8"
+DEPEND="dev-lang/php >=dev-php/PEAR-PEAR-1.6.1"
 RDEPEND="${DEPEND}"
 
 # @ECLASS-VARIABLE: PHP_PEAR_PKG_NAME
@@ -59,22 +61,25 @@ php-pear-r1_src_install() {
 	case "${CATEGORY}" in
 		dev-php)
 			if has_version '=dev-lang/php-5*' ; then
-				PHP_BIN="/usr/lib/php5/bin/php"
+				PHP_BIN="/usr/$(get_libdir)/php5/bin/php"
 			else
-				PHP_BIN="/usr/lib/php4/bin/php"
+				PHP_BIN="/usr/$(get_libdir)/php4/bin/php"
 			fi ;;
-		dev-php4) PHP_BIN="/usr/lib/php4/bin/php" ;;
-		dev-php5) PHP_BIN="/usr/lib/php5/bin/php" ;;
+		dev-php4) PHP_BIN="/usr/$(get_libdir)/php4/bin/php" ;;
+		dev-php5) PHP_BIN="/usr/$(get_libdir)/php5/bin/php" ;;
 		*) die "Version of PHP required by packages in category ${CATEGORY} unknown"
 	esac
 
 	cd "${S}"
-	mv -f "${WORKDIR}/package.xml" "${S}"
-
-	if [[ -f "${S}"/package2.xml ]] ; then
-		pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" "${S}/package2.xml" > /dev/null || die "Unable to install PEAR package"
+	
+	if [[ -f "${WORKDIR}"/package2.xml ]] ; then
+		mv -f "${WORKDIR}/package2.xml" "${S}"
+		pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
+			"${S}/package2.xml" || die "Unable to install PEAR package"
 	else
-		pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" "${S}/package.xml" > /dev/null || die "Unable to install PEAR package"
+		mv -f "${WORKDIR}/package.xml" "${S}"
+		pear -d php_bin="${PHP_BIN}" install --force --loose --nodeps --offline --packagingroot="${D}" \
+			"${S}/package.xml" || die "Unable to install PEAR package"
 	fi
 
 	rm -Rf "${D}/usr/share/php/.channels" \