Version bump.

Package-Manager: portage-2.1_pre5-r4

4 files changed, 183 insertions, 6 deletions

diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index 8921e8ee2328..4444a50559ab 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.50 2006/01/26 13:50:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.51 2006/03/10 10:50:56 sebastian Exp $
+
+*PEAR-PEAR-1.4.8 (10 Mar 2006)
+
+  10 Mar 2006; Sebastian Bergmann <sebastian@gentoo.org>
+  +PEAR-PEAR-1.4.8.ebuild:
+  Version bump.
 
   26 Jan 2006; Jeroen Roovers <jer@gentoo.org> PEAR-PEAR-1.4.6-r1.ebuild:
   Marked ~hppa (bug #111525).
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index dc26c8ef122d..1adc9bfe0104 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,20 +1,46 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 71b4a15949abf0c5f30701322a7daf2a ChangeLog 7339
+MD5 15885b9faf072decf349d020767284ab ChangeLog 7478
+RMD160 77f07719c45fc42fa598b58c33278bccf11b3849 ChangeLog 7478
+SHA256 f625b27cbe83de8ab00c6cc9c18c0d9cfea2624be5f13161e2ea49ebcca3dd62 ChangeLog 7478
 MD5 368b25bb1b27f216958924161fe9494f PEAR-PEAR-1.3.5.ebuild 474
+RMD160 97d324055a4283551b0bbfb0aafb4824ee46f331 PEAR-PEAR-1.3.5.ebuild 474
+SHA256 8ebfc40270098378e9db3138012b05caae8e61104df7ed1d2965951f60b675a8 PEAR-PEAR-1.3.5.ebuild 474
 MD5 4b7b18104c089f704049b94934a96938 PEAR-PEAR-1.3.6-r5.ebuild 3345
+RMD160 fa9996af32a67eef968b256c61a602d04f8809a0 PEAR-PEAR-1.3.6-r5.ebuild 3345
+SHA256 f3ad0273a9eb8156a9cf4781f08a480cba390ddc87f65dfeead38cc8b92b699a PEAR-PEAR-1.3.6-r5.ebuild 3345
 MD5 1a688ea74bfc54222ced5e6085024d03 PEAR-PEAR-1.4.6-r1.ebuild 4637
+RMD160 656c298b477b8db8c8b32b512278980ac3b5095d PEAR-PEAR-1.4.6-r1.ebuild 4637
+SHA256 de3495eb3573f3f445746c8125c05b97406fba6c0c3fd573c3767b151e5e58b6 PEAR-PEAR-1.4.6-r1.ebuild 4637
+MD5 55142eb4c3fb79056c426dd5dd9c6ab5 PEAR-PEAR-1.4.8.ebuild 4517
+RMD160 508030f3b9ebf447e33b2c3e144e6a72509078f1 PEAR-PEAR-1.4.8.ebuild 4517
+SHA256 4e43cfa32bd0ce242f54202ce21e8e861c7417f360e51be9b078a5750710d8c5 PEAR-PEAR-1.4.8.ebuild 4517
 MD5 3554c88b634f100ef42729557e042fea files/digest-PEAR-PEAR-1.3.5 59
+RMD160 1e7162fee10510036d553dac7d478b0e653db6f1 files/digest-PEAR-PEAR-1.3.5 59
+SHA256 d6676f38e01dd57fccb9cd57ff1c599b78ad0878c83d17fe250ca5ce5d4fb461 files/digest-PEAR-PEAR-1.3.5 59
 MD5 3b93337da15c6c451728ab40b9416e53 files/digest-PEAR-PEAR-1.3.6-r5 250
+RMD160 4fd1ad90afa3cfb6b443ce14f440048491c6ecce files/digest-PEAR-PEAR-1.3.6-r5 250
+SHA256 6b05d3ac190e45bc8ea57c1da89136fdaf1256a87028c23d3151e1282b53086d files/digest-PEAR-PEAR-1.3.6-r5 250
 MD5 8dce99141680abac08c7b328def8c375 files/digest-PEAR-PEAR-1.4.6-r1 250
+RMD160 99ba18d381cfe92a6c16b223746fc4f8ecba66e0 files/digest-PEAR-PEAR-1.4.6-r1 250
+SHA256 74ddbb4e9e1b93b04898fca84be794fabb4db63af9460bc3204342b6afdd6d0f files/digest-PEAR-PEAR-1.4.6-r1 250
+MD5 4d112f2de000f4d05ec223e654d48d15 files/digest-PEAR-PEAR-1.4.8 934
+RMD160 fb1d177a5da9db8fdcb77a8b4698d29189d4dc33 files/digest-PEAR-PEAR-1.4.8 934
+SHA256 3706fc569ef09ae6b6e0167ad6778fe0439970802c632cf22bc1f8f95a3f0726 files/digest-PEAR-PEAR-1.4.8 934
 MD5 4d00eb55859fa6e9e77a226693e0030b files/fix-packagingroot-1.4.6.patch 2549
+RMD160 378c98abc5d23a9c3d258ad50212035378d83eb2 files/fix-packagingroot-1.4.6.patch 2549
+SHA256 3b7b1d00a811f743dc4632aa348e79418cca482727c3576607515fa248b7ba86 files/fix-packagingroot-1.4.6.patch 2549
 MD5 c977da8e9e2fd780c6f818b21723b582 files/pear.conf 255
+RMD160 b1f058df654c187f42c85a11abaa2bc37bffb451 files/pear.conf 255
+SHA256 ecd1ed6b90400bf6874cc40f17aa0bf9e43bd31090e54a986894481f44f99ffb files/pear.conf 255
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
+RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
+SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD3F802+ySkm8kpY0RApjHAJ0dlQfHPHELDOYU39Q8tNtcjfJngQCgj599
-xoSiMPrjYKByJbNwVZRGhg8=
-=50vW
+iD8DBQFEEVodaGfFFLhbXWkRAhJ8AJ9LFBklgrCfUU+GWVMyvDFvRZWvxACgljte
+bpSHEgAawF7nR23xIfZSW2k=
+=vJbO
 -----END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.8.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.8.ebuild
new file mode 100644
index 000000000000..a57e12b0b7f8
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.8.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2006 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.4.8.ebuild,v 1.1 2006/03/10 10:50:56 sebastian Exp $
+
+inherit depend.php
+
+ARCHIVE_TAR="1.3.1"
+CONSOLE_GETOPT="1.2"
+PEAR="1.4.8"
+XML_RPC="1.4.5"
+
+[ -z "${PEAR_CACHEDIR}" ] && PEAR_CACHEDIR="/tmp/pear/cache"
+
+DESCRIPTION="PEAR Base System (PEAR, Archive_Tar, Console_Getopt, XML_RPC)."
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~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.6-r2
+		!dev-php/PEAR-Archive_Tar
+		!dev-php/PEAR-Console_Getopt
+		!dev-php/PEAR-XML_RPC"
+
+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
+	if [[ ${PHP_VERSION} == "4" ]] ; then
+		require_php_with_use cli pcre expat zlib
+	else
+		require_php_with_use cli pcre xml zlib
+	fi
+}
+
+src_install() {
+	require_php_cli
+
+	# Prevent SNMP related sandbox violoation.
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/
+
+	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"
+	sed -i "s:@pear_version@:${PEAR}:g" "${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
+	sed -i "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=16M:g" "${WORKDIR}/PEAR/pear" || die
+
+	# Prepare /usr/bin/peardev script.
+	cp "${WORKDIR}/PEAR-${PEAR}/scripts/peardev.sh" "${WORKDIR}/PEAR/peardev"
+	sed -i "s:@php_bin@:${PHPCLI}:g" "${WORKDIR}/PEAR/peardev" || die
+	sed -i "s:@bin_dir@:/usr/bin:g" "${WORKDIR}/PEAR/peardev" || die
+	sed -i "s:@php_dir@:/usr/share/php:g" "${WORKDIR}/PEAR/peardev" || die
+
+	# Prepare /usr/bin/pecl script.
+	cp "${WORKDIR}/PEAR-${PEAR}/scripts/peclcmd.php" "${WORKDIR}/PEAR/peclcmd.php"
+	cp "${WORKDIR}/PEAR-${PEAR}/scripts/pecl.sh" "${WORKDIR}/PEAR/pecl"
+	sed -i "s:@php_bin@:${PHPCLI}:g" "${WORKDIR}/PEAR/pecl" || die
+	sed -i "s:@bin_dir@:/usr/bin:g" "${WORKDIR}/PEAR/pecl" || die
+	sed -i "s:@php_dir@:/usr/share/php:g" "${WORKDIR}/PEAR/pecl" || die
+
+	# Prepare PEAR/Dependency2.php.
+	sed -i "s:@PEAR-VER@:${PEAR}:g" "${WORKDIR}/PEAR/PEAR/Dependency2.php" || 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 peardev pecl
+
+	insinto /etc
+	doins "${FILESDIR}/pear.conf"
+	sed -e "s|s:SUBSTLEN:\"SUBSTITUTEME\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" -i "${D}/etc/pear.conf"
+
+	keepdir "${PEAR_CACHEDIR}"
+	fperms 755 "${PEAR_CACHEDIR}"
+}
+
+pkg_preinst() {
+	rm -f "${ROOT}/etc/pear.conf"
+}
+
+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
+
+	# Update PEAR channels as needed, add new ones to the list if needed
+	pearchans="pear.php.net pecl.php.net components.ez.no"
+
+	for chan in ${pearchans} ; do
+		pear channel-discover ${chan}
+		pear channel-update ${chan}
+	done
+}
diff --git a/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.8 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.8
new file mode 100644
index 000000000000..47053314895c
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.8
@@ -0,0 +1,12 @@
+MD5 31e54ce401302065d43888223a0be4d9 Archive_Tar-1.3.1.tgz 15102
+RMD160 e4d94299018d49835c9adb5d0d0bb7a4f3ee7fac Archive_Tar-1.3.1.tgz 15102
+SHA256 f128b58b249d4f182bdf846c6762462468dbfda045ccb332858e62934d655bf6 Archive_Tar-1.3.1.tgz 15102
+MD5 8f9ec8253c04350bc01ee7ca941e24b6 Console_Getopt-1.2.tgz 3370
+RMD160 d9bebe03b52a59b35a4d0fd0825da069037aa000 Console_Getopt-1.2.tgz 3370
+SHA256 90bc64b35832af79625ccd7a1cd981ae26adbe58e1296a052cc3947d9c959e0c Console_Getopt-1.2.tgz 3370
+MD5 4d29453e1926f11e05b7cfbf4ab085e7 PEAR-1.4.8.tgz 283109
+RMD160 f5a0c52fb27e735ee55e533aea96ab4765e6ee34 PEAR-1.4.8.tgz 283109
+SHA256 893c5239945555160322f1716bf86910c1a822a668c6b07a6397589416ab134e PEAR-1.4.8.tgz 283109
+MD5 e526da7331b818e70ade5f006a4e7a9d XML_RPC-1.4.5.tgz 29172
+RMD160 43a0f5802dc32f4e61b347429f796c17f6efe90c XML_RPC-1.4.5.tgz 29172
+SHA256 2ae6e28b3f2f0cef9233f1b528c6910891597bcde2b55a01a942d0ba98039cd8 XML_RPC-1.4.5.tgz 29172