Version bump.

Package-Manager: portage-2.1.1_pre4-r1

4 files changed, 174 insertions, 5 deletions

diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index 8c09b9f12dea..bb93554378c9 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.69 2006/07/29 22:29:46 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.70 2006/08/01 04:45:10 sebastian Exp $
+
+*PEAR-PEAR-1.4.10 (01 Aug 2006)
+
+  01 Aug 2006; Sebastian Bergmann <sebastian@gentoo.org>
+  +PEAR-PEAR-1.4.10.ebuild:
+  Version bump.
 
   29 Jul 2006; Luca Longinotti <chtekk@gentoo.org>
   -files/fix-packagingroot-1.4.6.patch, -PEAR-PEAR-1.4.6-r1.ebuild:
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index b94a1c434e06..b824c6568ba3 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,12 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pear.conf 255 RMD160 b1f058df654c187f42c85a11abaa2bc37bffb451 SHA1 98ee860807a6cc92b9f036da38163440b2994383 SHA256 ecd1ed6b90400bf6874cc40f17aa0bf9e43bd31090e54a986894481f44f99ffb
 MD5 c977da8e9e2fd780c6f818b21723b582 files/pear.conf 255
 RMD160 b1f058df654c187f42c85a11abaa2bc37bffb451 files/pear.conf 255
 SHA256 ecd1ed6b90400bf6874cc40f17aa0bf9e43bd31090e54a986894481f44f99ffb files/pear.conf 255
 DIST Archive_Tar-1.3.1.tgz 15102 RMD160 e4d94299018d49835c9adb5d0d0bb7a4f3ee7fac SHA1 b1eb763a5fba1289686cf1355f90f0fe9149fa6d SHA256 f128b58b249d4f182bdf846c6762462468dbfda045ccb332858e62934d655bf6
 DIST Console_Getopt-1.2.tgz 3370 RMD160 d9bebe03b52a59b35a4d0fd0825da069037aa000 SHA1 706a9fb1724ef97ee333dadcda95cc7cc50c0c43 SHA256 90bc64b35832af79625ccd7a1cd981ae26adbe58e1296a052cc3947d9c959e0c
+DIST PEAR-1.4.10.tgz 284880 RMD160 d15a460d91f577b3a81efe7ad1dfa9436f4d2f9e SHA1 591af17866de58e19b1bab55e6b14fad66bf8805 SHA256 ae634180f74faef112d5c3477f1e1212a5a8343b55079f54efdd6a2c07e8e059
 DIST PEAR-1.4.9.tgz 283443 RMD160 038fb6f0f5d22bb1bb34fff1f80cf609d434cdd2 SHA1 cb74e281d7d30b7105ce2b4f152036b775e68cf1 SHA256 41281d20e988018ae9a849d6f78ae111825e95432926dcfe17b27203e08567e1
 DIST XML_RPC-1.4.8.tgz 30376 RMD160 f4c541a6ed0758c32eca52d0a7da6ce2796a7f56 SHA1 5fd5e0f4dfc49374a97b2a9c36254427462a604e SHA256 14f5708c7d8474f1ea3769f942243408f19687e1192260584a19c39cef47af02
 DIST XML_RPC-1.5.0.tgz 31619 RMD160 866d2edcb68d6bb400d5a0364852ac62e267a3c4 SHA1 0c8de819abaebc37a77546b21499430147bfaf6b SHA256 d1e42d0e11a649cd0ca5cd3bbb3ced2f0984cdcde263d9c45ce6737405258edf
+EBUILD PEAR-PEAR-1.4.10.ebuild 4575 RMD160 d9b784ff4fc1787ca2d64cb34bea229a0a8ac793 SHA1 8e62428113bc902962d4c9bd76cf05311d1f7476 SHA256 f0450ed7e54d1a332b8f24f49a492c4b30efd13dbc84f064459ba3e296463919
+MD5 3f7b4a3c6c4336181e9293f9f213e9c2 PEAR-PEAR-1.4.10.ebuild 4575
+RMD160 d9b784ff4fc1787ca2d64cb34bea229a0a8ac793 PEAR-PEAR-1.4.10.ebuild 4575
+SHA256 f0450ed7e54d1a332b8f24f49a492c4b30efd13dbc84f064459ba3e296463919 PEAR-PEAR-1.4.10.ebuild 4575
 EBUILD PEAR-PEAR-1.4.9-r1.ebuild 4564 RMD160 a9317919f5efb0b3d14879997a4b965e556c4ed3 SHA1 33b94f05a8d3acfb19fc778143579c5cefb35491 SHA256 3eb2d8d2abdc1f35ea88fc037073d3c835c68c738fb8a533f80e86b20daa4ca5
 MD5 7e21b4654b5adde0c4aac3d8f986f68f PEAR-PEAR-1.4.9-r1.ebuild 4564
 RMD160 a9317919f5efb0b3d14879997a4b965e556c4ed3 PEAR-PEAR-1.4.9-r1.ebuild 4564
@@ -15,17 +23,27 @@ EBUILD PEAR-PEAR-1.4.9-r2.ebuild 4576 RMD160 05b8299b07aab117948039bdea1104ac760
 MD5 acc81329dcf8afba4252263b04cec5a3 PEAR-PEAR-1.4.9-r2.ebuild 4576
 RMD160 05b8299b07aab117948039bdea1104ac7607f36c PEAR-PEAR-1.4.9-r2.ebuild 4576
 SHA256 555b1dc7a51e61358101728fbe6861459526cd293508c6a7714d07cc2ad65904 PEAR-PEAR-1.4.9-r2.ebuild 4576
-MISC ChangeLog 9770 RMD160 6603b57e03d8e65ff911dba81dcc7ecd64ff1299 SHA1 a77aaee7abe7d9f5b290dc3c712fc2f7119b604b SHA256 e23b62c72de8e6e451c3d67959ba81e43f1ffbdda6a20c24ed70519c89bb6026
-MD5 c35ae4af55d6b871f189ed9ba520d09f ChangeLog 9770
-RMD160 6603b57e03d8e65ff911dba81dcc7ecd64ff1299 ChangeLog 9770
-SHA256 e23b62c72de8e6e451c3d67959ba81e43f1ffbdda6a20c24ed70519c89bb6026 ChangeLog 9770
+MISC ChangeLog 9908 RMD160 5da485989b0703547b0cb490aa6f71266ff02433 SHA1 4e784a643450f150fafbdd3b805e08bae6dac87d SHA256 6f199c5343fedf183b0c557f604715ecfbb33a8c22086021302085c5fca3b908
+MD5 db093669b67b53582433c16685346dee ChangeLog 9908
+RMD160 5da485989b0703547b0cb490aa6f71266ff02433 ChangeLog 9908
+SHA256 6f199c5343fedf183b0c557f604715ecfbb33a8c22086021302085c5fca3b908 ChangeLog 9908
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata.xml 157
+MD5 c755b696270868b2e2a294280ada7f63 files/digest-PEAR-PEAR-1.4.10 937
+RMD160 13fb3f271857a3349c3623c3360b8606152e0cd8 files/digest-PEAR-PEAR-1.4.10 937
+SHA256 9b7b0e5549651624ed4c258b0e878b6b2264f9b606850b96a743c25292781987 files/digest-PEAR-PEAR-1.4.10 937
 MD5 60da169ef31f6e9258d1056b6e52ee7e files/digest-PEAR-PEAR-1.4.9-r1 934
 RMD160 72d0bd149d0e1b09ef7effebe839f56b4096e6d6 files/digest-PEAR-PEAR-1.4.9-r1 934
 SHA256 a798498cc3fe1f27095f5f56a12e0987babb05f061fe698b1a8bb9f6336bef45 files/digest-PEAR-PEAR-1.4.9-r1 934
 MD5 0bbc6c3ba147abad0536342d55bd8d54 files/digest-PEAR-PEAR-1.4.9-r2 934
 RMD160 917e093879bfd3548aeb48dfb926e19034c7ff34 files/digest-PEAR-PEAR-1.4.9-r2 934
 SHA256 9071af871f9fdfa2233f067c97d999041453e0c2ce0ba97ab7b9f25d60388687 files/digest-PEAR-PEAR-1.4.9-r2 934
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5rc1 (GNU/Linux)
+
+iD8DBQFEztxgaGfFFLhbXWkRAu2lAJ4uQs+TYN7MVKAWPgGrRGk0kCcb2QCfbd3U
+NAJoLj2CNaTm1PpJf59f33g=
+=ePSb
+-----END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.10.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.10.ebuild
new file mode 100644
index 000000000000..0ae318cc45a5
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.4.10.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.10.ebuild,v 1.1 2006/08/01 04:45:10 sebastian Exp $
+
+inherit depend.php
+
+ARCHIVE_TAR="1.3.1"
+CONSOLE_GETOPT="1.2"
+PEAR="1.4.10"
+XML_RPC="1.5.0"
+
+[ -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 pear.phpdb.org pear.phing.info pear.symfony-project.com"
+
+	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.10 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.10
new file mode 100644
index 000000000000..fd424f2bed5f
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.4.10
@@ -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 ed27ba53deaf651f98e4a314ba7ddb32 PEAR-1.4.10.tgz 284880
+RMD160 d15a460d91f577b3a81efe7ad1dfa9436f4d2f9e PEAR-1.4.10.tgz 284880
+SHA256 ae634180f74faef112d5c3477f1e1212a5a8343b55079f54efdd6a2c07e8e059 PEAR-1.4.10.tgz 284880
+MD5 9f9205d8c8b3ca07a50c5d332c6fb722 XML_RPC-1.5.0.tgz 31619
+RMD160 866d2edcb68d6bb400d5a0364852ac62e267a3c4 XML_RPC-1.5.0.tgz 31619
+SHA256 d1e42d0e11a649cd0ca5cd3bbb3ced2f0984cdcde263d9c45ce6737405258edf XML_RPC-1.5.0.tgz 31619