Various bugfixes by Luca Longinotti.

(Portage version: 2.0.53_rc5)

4 files changed, 144 insertions, 12 deletions

diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index 822523554034..f0997c46d96d 100644
--- a/dev-php/PEAR-PEAR/ChangeLog
+++ b/dev-php/PEAR-PEAR/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/PEAR-PEAR
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.24 2005/09/17 21:24:52 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.25 2005/10/11 17:48:14 sebastian Exp $
+
+*PEAR-PEAR-1.3.6-r1 (11 Oct 2005)
+
+  11 Oct 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +PEAR-PEAR-1.3.6-r1.ebuild:
+  Various bugfixes by Luca Longinotti.
 
   17 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> PEAR-PEAR-1.3.6.ebuild:
   Marked ~amd64, bug 102649.
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index f8894fc2ba17..6b2d1cf861a5 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 12d9d23a6483ad963b905bac177dd843 ChangeLog 3447
+MD5 4885a2c696d8893a1d85e53b948fe4a4 ChangeLog 3609
 MD5 7e92e897d5dd12b435216d3ec6f31cbb PEAR-PEAR-1.3.5-r1.ebuild 3753
 MD5 e68f890941cc02efec6b8f2235bf8919 PEAR-PEAR-1.3.5.ebuild 470
+MD5 a656e047cf0af55ea4f56f352cb292cb PEAR-PEAR-1.3.6-r1.ebuild 4267
 MD5 86f5565e8542386af0acc025b06d549a PEAR-PEAR-1.3.6.ebuild 3994
 MD5 3554c88b634f100ef42729557e042fea files/digest-PEAR-PEAR-1.3.5 59
 MD5 46061bca70e685875cd072b811107a83 files/digest-PEAR-PEAR-1.3.5-r1 248
 MD5 02fb36158a6f513f8c40d304ff37ecbe files/digest-PEAR-PEAR-1.3.6 250
+MD5 1f5a11587884ea780abd05f353d576e4 files/digest-PEAR-PEAR-1.3.6-r1 250
 MD5 34b376f52ca199fffb4e52b83169574a metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLVGnI1lqEGTUzyQRAokzAKDUcUvXDhQVNwnzdQDJDuNdf5Jz9gCg04+X
-nnzhxrWa1VIv/qv15ezD/nM=
-=TSQ/
------END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r1.ebuild
new file mode 100644
index 000000000000..4db5815e1f2c
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.3.6-r1.ebuild,v 1.1 2005/10/11 17:48:14 sebastian Exp $
+
+inherit depend.php
+
+ARCHIVE_TAR="1.3.1"
+CONSOLE_GETOPT="1.2"
+PEAR="1.3.6"
+XML_RPC="1.4.3"
+
+[ -z "${PEAR_CACHEDIR}" ] && PEAR_CACHEDIR=/tmp/pear/cache
+
+DESCRIPTION="PEAR Base System"
+HOMEPAGE="http://pear.php.net/"
+SRC_URI="http://pear.php.net/get/Archive_Tar-${ARCHIVE_TAR}.tgz
+		http://pear.php.net/get/Console_Getopt-${CONSOLE_GETOPT}.tgz
+		http://pear.php.net/get/XML_RPC-${XML_RPC}.tgz
+		http://pear.php.net/get/PEAR-${PEAR}.tgz"
+
+LICENSE="PHP"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+# we deliberately force people to remove their old PEAR installations,
+# and any package which may have put an old-style PEAR installation onto
+# the box
+
+DEPEND="dev-lang/php
+		!dev-php/php
+		!dev-php/php-cgi
+		!dev-php/mod_php
+		!<=dev-php/PEAR-PEAR-1.3.5-r1"
+
+PDEPEND=">=dev-php/PEAR-Archive_Tar-1.3.1-r1
+		>=dev-php/PEAR-Console_Getopt-1.2-r1
+		>=dev-php/PEAR-XML_RPC-1.4.3"
+
+pkg_setup() {
+	# we call this here, to ensure that the eclass picks the right
+	# version of php for the job
+	require_php_cli
+
+	# we check that PHP was compiled with the correct USE flags
+	require_php_with_use pear
+}
+
+src_install() {
+	require_php_cli
+
+	# Prevent SNMP related sandbox violoation.
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/
+
+	if [[ -d "${ROOT}"/usr/bin/pear ]] ; then
+		install_pear_without_bootstrap
+	else
+		bootstrap_pear
+		install_pear_after_bootstrap
+	fi
+
+	keepdir "${PEAR_CACHEDIR}"
+	fperms 755 "${PEAR_CACHEDIR}"
+}
+
+pkg_postinst() {
+	if has_version "<${PV}"; then
+		ewarn "The location of the local PEAR repository has been changed"
+		ewarn "from /usr/lib/php to /usr/share/php."
+	fi
+}
+
+bootstrap_pear() {
+	mkdir -p "${WORKDIR}/PEAR/XML/RPC"
+
+	# Install PEAR Package.
+	cp -r "${WORKDIR}/PEAR-${PEAR}/OS" "${WORKDIR}/PEAR/"
+	cp -r "${WORKDIR}/PEAR-${PEAR}/PEAR" "${WORKDIR}/PEAR/"
+	cp "${WORKDIR}/PEAR-${PEAR}/PEAR.php" "${WORKDIR}/PEAR/PEAR.php"
+	cp "${WORKDIR}/PEAR-${PEAR}/System.php" "${WORKDIR}/PEAR/System.php"
+
+	# Prepare /usr/bin/pear script.
+	cp "${WORKDIR}/PEAR-${PEAR}/scripts/pearcmd.php" "${WORKDIR}/PEAR/pearcmd.php"
+	cp "${WORKDIR}/PEAR-${PEAR}/scripts/pear.sh" "${WORKDIR}/PEAR/pear"
+	sed -i "s:@php_bin@:${PHPCLI}:g" "${WORKDIR}/PEAR/pear" || die
+	sed -i "s:@bin_dir@:/usr/bin:g" "${WORKDIR}/PEAR/pear" || die
+	sed -i 's:@php_dir@:/usr/share/php:g' "${WORKDIR}/PEAR/pear" || die
+
+	# Install Archive_Tar Package.
+	cp -r "${WORKDIR}/Archive_Tar-${ARCHIVE_TAR}/Archive" "${WORKDIR}/PEAR/Archive"
+
+	# Install Console_Getopt Package.
+	cp -r "${WORKDIR}/Console_Getopt-${CONSOLE_GETOPT}/Console" "${WORKDIR}/PEAR/"
+
+	# Install XML_RPC Package.
+	cp "${WORKDIR}/XML_RPC-${XML_RPC}/RPC.php" "${WORKDIR}/PEAR/XML/RPC.php"
+	cp "${WORKDIR}/XML_RPC-${XML_RPC}/Server.php" "${WORKDIR}/PEAR/XML/RPC/Server.php"
+
+	# Finalize installation.
+	cd "${WORKDIR}/PEAR"
+	insinto /usr/share/php
+	doins -r Archive Console OS PEAR XML *.php
+	dobin pear
+}
+
+install_pear_after_bootstrap() {
+	${PHPCLI} -d include_path=".:${D}/usr/share/php" "${D}/usr/share/php/pearcmd.php" config-set doc_dir /usr/share/php/doc || die
+	${PHPCLI} -d include_path=".:${D}/usr/share/php" "${D}/usr/share/php/pearcmd.php" config-set data_dir /usr/share/php/data || die
+	${PHPCLI} -d include_path=".:${D}/usr/share/php" "${D}/usr/share/php/pearcmd.php" config-set test_dir /usr/share/php/test || die
+	${PHPCLI} -d include_path=".:${D}/usr/share/php" "${D}/usr/share/php/pearcmd.php" config-set php_dir /usr/share/php || die
+	${PHPCLI} -d include_path=".:${D}/usr/share/php" "${D}/usr/share/php/pearcmd.php" config-set bin_dir /usr/bin || die
+	${PHPCLI} -d include_path=".:${D}/usr/share/php" "${D}/usr/share/php/pearcmd.php" config-set php_bin ${PHPCLI} || die
+
+	mkdir "${D}/etc"
+	cp "${HOME}/.pearrc" "${D}/etc/pear.conf"
+
+	prepare_pear_install
+	${PHPCLI} -d include_path=".:${D}/usr/share/php" "${D}/usr/share/php/pearcmd.php" install --nodeps --installroot="${D}" package.xml || die
+}
+
+install_pear_without_bootstrap() {
+	prepare_pear_install
+	PHP_PEAR_PHP_BIN=${PHPCLI} pear install --nodeps --installroot="${D}" package.xml || die
+}
+
+prepare_pear_install() {
+	cp "${WORKDIR}/package.xml" "${WORKDIR}/PEAR-${PEAR}"
+	cd "${WORKDIR}/PEAR-${PEAR}"
+}
diff --git a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r1 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r1
new file mode 100644
index 000000000000..b09ad85c597d
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.3.6-r1
@@ -0,0 +1,4 @@
+MD5 31e54ce401302065d43888223a0be4d9 Archive_Tar-1.3.1.tgz 15102
+MD5 8f9ec8253c04350bc01ee7ca941e24b6 Console_Getopt-1.2.tgz 3370
+MD5 4c2c6c366cef0f01246fea73420bfa78 PEAR-1.3.6.tgz 106880
+MD5 83138a445e424102db17b3b9588dbfef XML_RPC-1.4.3.tgz 27198