--- eclass/php-pear-r1.eclass	2005/09/04 12:57:44	1.1
+++ eclass/php-pear-r1.eclass	2005/11/30 09:59:18	1.1.1.1
@@ -1,10 +1,11 @@
 # Copyright 1999-2005 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.1 2005/09/04 12:57:44 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.1.1.1 2005/11/30 09:59:18 chriswhite Exp $
 #
 # Author: Tal Peer <coredumb@gentoo.org>
+# Maintained by the PHP Herd <php-bugs@gentoo.org>
 #
-# The php-pear eclass provides means for easy installation of PEAR
+# The php-pear-r1 eclass provides means for an easy installation of PEAR
 # packages, see http://pear.php.net
 
 # Note that this eclass doesn't handle PEAR packages' dependencies on
@@ -18,7 +19,7 @@
 
 # We must depend on the base package as we need it to do
 # install tasks (it provides the pear binary).
-DEPEND="${DEPEND} dev-lang/php"
+DEPEND="${DEPEND} dev-lang/php >=dev-php/PEAR-PEAR-1.3.6"
 RDEPEND="${RDEPEND} ${DEPEND}"
 
 fix_PEAR_PV() {
@@ -35,14 +36,17 @@
 
 [ -z "${SRC_URI}" ] && SRC_URI="http://pear.php.net/get/${PEAR_PN}.tgz"
 [ -z "${HOMEPAGE}" ] && HOMEPAGE="http://pear.php.net/${PHP_PEAR_PKG_NAME}"
+
 S="${WORKDIR}/${PEAR_PN}"
 
-php-pear_src_install() {
-	# SNMP is nuts sometimes
+php-pear-r1_src_install() {
+	# SNMP support
 	addpredict /usr/share/snmp/mibs/.index
 	addpredict /var/lib/net-snmp/
 
-	cd ${S}
-	mv ${WORKDIR}/package.xml ${S}
-	pear install --nodeps --installroot=${D} ${S}/package.xml || die "Unable to install PEAR package"
+	cd "${S}"
+	mv "${WORKDIR}/package.xml" "${S}"
+	pear install --nodeps --installroot="${D}" "${S}/package.xml" || die "Unable to install PEAR package"
+	rm -rf "${D}/usr/share/php/.filemap" \
+	"${D}/usr/share/php/.lock"
 }