Version bump for bug #189075 from php overlay as requested on irc

Package-Manager: portage-2.1.3.5

4 files changed, 185 insertions, 5 deletions

diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index 53c1031fe357..7bdd0f22a0b7 100644
--- a/dev-php/PEAR-PEAR/ChangeLog
+++ b/dev-php/PEAR-PEAR/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-php/PEAR-PEAR
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.86 2007/03/20 19:22:59 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.87 2007/08/16 10:47:01 jokey Exp $
+
+*PEAR-PEAR-1.6.1 (16 Aug 2007)
+
+  16 Aug 2007; Markus Ullmann <jokey@gentoo.org> +PEAR-PEAR-1.6.1.ebuild:
+  Version bump for bug #189075 from php overlay as requested on irc
 
 *PEAR-PEAR-1.5.1 (20 Mar 2007)
 
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 3862addd5f10..c9e1c8e25754 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX pear.conf 291 RMD160 311e624d97640448754aa2f3e643aa53501f9c25 SHA1 47b350c2bf4b882b5981504ac6acfd7c708367e6 SHA256 cbe9363c760952d00b90070d4a41e88a175e12c65f99668fbe16d8158f5fa7ab
 MD5 d9fcfb5558f62993d1e38157bc7b2002 files/pear.conf 291
 RMD160 311e624d97640448754aa2f3e643aa53501f9c25 files/pear.conf 291
@@ -5,9 +8,11 @@ SHA256 cbe9363c760952d00b90070d4a41e88a175e12c65f99668fbe16d8158f5fa7ab files/pe
 DIST Archive_Tar-1.3.1.tgz 15102 RMD160 e4d94299018d49835c9adb5d0d0bb7a4f3ee7fac SHA1 b1eb763a5fba1289686cf1355f90f0fe9149fa6d SHA256 f128b58b249d4f182bdf846c6762462468dbfda045ccb332858e62934d655bf6
 DIST Archive_Tar-1.3.2.tgz 17150 RMD160 cec105d1cdefd502f209c24c217645cec723d7a2 SHA1 40a16c6fe6cee12d9fd87d487785db2949ffa9ff SHA256 952820c055a770a6d1ecdff487b3de0ff0617a1baca084dac443a6d5f7cde53c
 DIST Console_Getopt-1.2.2.tgz 4252 RMD160 fb8a955ef2c41618305e03c9a4164c3a465c5e86 SHA1 3158237f6cd8ed34a269c67cbe546156c03cff0b SHA256 880bcaf960b8ce085709b749e9b4f523bbc9bbe9a9e9dd908e06e5f55a113336
+DIST Console_Getopt-1.2.3.tgz 4011 RMD160 d1624dbcb223395ded9e46285f896d6f5bb5ca74 SHA1 2f4ea028f478123164c3f6588f8a505dc35915df SHA256 1985b1434c13d5e619643c3712e4144d39f66f6fed61994765e6a0f1623680d8
 DIST Console_Getopt-1.2.tgz 3370 RMD160 d9bebe03b52a59b35a4d0fd0825da069037aa000 SHA1 706a9fb1724ef97ee333dadcda95cc7cc50c0c43 SHA256 90bc64b35832af79625ccd7a1cd981ae26adbe58e1296a052cc3947d9c959e0c
 DIST PEAR-1.4.11.tgz 283272 RMD160 bb047d4fb64691e2518ccdba0ced30eb6dd502cd SHA1 dbf2f31166efbe7cddc296f5a821806850772b27 SHA256 2ea2f7d0364db443fea39dc9bc96adebfce9fa45ffb035dbfc7b6a1cc5325600
 DIST PEAR-1.5.1.tgz 290252 RMD160 b1c7dc5d89d63a5d90e38527caca8a4bca93770c SHA1 89c279df27fef57859532224c17e4695ad94b0b6 SHA256 0d1c448225f449289c77cda87052f105efb711ccf7757df94d85f6a7c8c36a93
+DIST PEAR-1.6.1.tgz 295780 RMD160 8066006183ec2987e9b9d6fb71e9a5db23b5b550 SHA1 b3ca5fcace112c98e8e16885ba97c00a3f427ce0 SHA256 5534a512970f5169796ab9394fc24a515ca5905782769fd1b715fefd4add2a8b
 DIST Structures_Graph-1.0.2.tgz 30947 RMD160 8eb53f6da109b90bab5d8101e99183a1ae116404 SHA1 300aa0a2effb0b39c4fa8a63a834748ae99c2855 SHA256 d30e72fcb888d17d01d211dd0cdc8bdde8c87554fc4d7de438a4cf0b490a8697
 DIST XML_RPC-1.5.0.tgz 31619 RMD160 866d2edcb68d6bb400d5a0364852ac62e267a3c4 SHA1 0c8de819abaebc37a77546b21499430147bfaf6b SHA256 d1e42d0e11a649cd0ca5cd3bbb3ced2f0984cdcde263d9c45ce6737405258edf
 DIST XML_RPC-1.5.1.tgz 32215 RMD160 6e8b9f4698285609d9c9d4450c59c16083607ee8 SHA1 d28fd6d3139aa247d22428ec6b50e20a3cdaa4b4 SHA256 a5b517eef799df148d6c85ab19e188715a22c069f4507dcb792e5efb7d0f117e
@@ -19,10 +24,14 @@ EBUILD PEAR-PEAR-1.5.1.ebuild 5434 RMD160 ff19062c626bb9c9cdb0c9b57b24ceec73d947
 MD5 19e138a680a6a70d058a4245afae0f37 PEAR-PEAR-1.5.1.ebuild 5434
 RMD160 ff19062c626bb9c9cdb0c9b57b24ceec73d947e2 PEAR-PEAR-1.5.1.ebuild 5434
 SHA256 3755e3acb493cd134ad8514a44d9c8149816ba5bb52be460f28794acba2cfb20 PEAR-PEAR-1.5.1.ebuild 5434
-MISC ChangeLog 12136 RMD160 4824f96d6f96d9e7c6bb582a213732b8ec68e295 SHA1 e76cc60ecceb1e05b7efcf2d52598b3f53a4b505 SHA256 ff2d71ccf924b26cb1071932b6558a99af43891f8ff433159aa4c54326861c09
-MD5 3093cec3fd1811a13885646509d2f4c9 ChangeLog 12136
-RMD160 4824f96d6f96d9e7c6bb582a213732b8ec68e295 ChangeLog 12136
-SHA256 ff2d71ccf924b26cb1071932b6558a99af43891f8ff433159aa4c54326861c09 ChangeLog 12136
+EBUILD PEAR-PEAR-1.6.1.ebuild 5268 RMD160 3b37b8c660a844724af99c2fce290a283af43004 SHA1 7a9a42151bc42e4e9a119c1f19493edbb63a43f0 SHA256 867b7c0dfd1feb35f3a5a3c060b4e900cf9ab9c7f922c5d0e60e6f874e9dc69b
+MD5 836fb20259256eedc5c11ca7d6b78146 PEAR-PEAR-1.6.1.ebuild 5268
+RMD160 3b37b8c660a844724af99c2fce290a283af43004 PEAR-PEAR-1.6.1.ebuild 5268
+SHA256 867b7c0dfd1feb35f3a5a3c060b4e900cf9ab9c7f922c5d0e60e6f874e9dc69b PEAR-PEAR-1.6.1.ebuild 5268
+MISC ChangeLog 12310 RMD160 ea7c85c6f7c4d3bd9da3bf767e50ea085a002a33 SHA1 8d7c596b8e16bf2037db02916d9c0771c9b937fb SHA256 2c7a8e0406a2fdbef0c0a9972d49f3f2a36b868f8366e9cb5ebeeab5db3385db
+MD5 c86feaa88f302b58a6b9636ebb774da5 ChangeLog 12310
+RMD160 ea7c85c6f7c4d3bd9da3bf767e50ea085a002a33 ChangeLog 12310
+SHA256 2c7a8e0406a2fdbef0c0a9972d49f3f2a36b868f8366e9cb5ebeeab5db3385db ChangeLog 12310
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -33,3 +42,13 @@ SHA256 e2f7990987f8332ae69a8d052b79298c04f5cb0c8a154023956724f272278c48 files/di
 MD5 91042e7fd684cd96409a9bea5c12a33a files/digest-PEAR-PEAR-1.5.1 1196
 RMD160 5e1ff06f43accc00414d9a80469755ac98ce3d10 files/digest-PEAR-PEAR-1.5.1 1196
 SHA256 43dedc607457443e764ef9b92766be077c6addb82cef4f22b486cbd5d861de7c files/digest-PEAR-PEAR-1.5.1 1196
+MD5 aafdf1cf14ae4cb7f681b366f9cfa408 files/digest-PEAR-PEAR-1.6.1 1196
+RMD160 414b787b8a6345e7d49de414d879c47155512cbc files/digest-PEAR-PEAR-1.6.1 1196
+SHA256 ade6ace52cd276fec92ec0e2835716527218ecdb6e553e2b25a8ffa70614ba24 files/digest-PEAR-PEAR-1.6.1 1196
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGxCswz974XjDVpbkRAiSeAKDKOzQKjedc1K+Z7iDuwiBCXeS/cQCbB1ZV
+17Zco+rmiUk17XOGDNd5mac=
+=RPV5
+-----END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.1.ebuild
new file mode 100644
index 000000000000..936a2855b623
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2007 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.6.1.ebuild,v 1.1 2007/08/16 10:47:01 jokey Exp $
+
+inherit depend.php
+
+ARCHIVE_TAR="1.3.2"
+CONSOLE_GETOPT="1.2.3"
+STRUCTURES_GRAPH="1.0.2"
+XML_RPC="1.5.1"
+PEAR="1.6.1"
+
+[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="/var/cache/pear"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DESCRIPTION="PEAR Base System (PEAR, Archive_Tar, Console_Getopt, Structures_Graph, 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/Structures_Graph-${STRUCTURES_GRAPH}.tgz
+		http://pear.php.net/get/XML_RPC-${XML_RPC}.tgz
+		http://pear.php.net/get/PEAR-${PEAR}.tgz"
+LICENSE="LGPL-2.1 PHP"
+SLOT="0"
+IUSE=""
+
+# we deliberately force people to remove their old PEAR installations,
+# and any package which may have put an old-style PEAR installation onto
+# their box
+# we also depend on a recent sandbox version to mitigate problems users
+# have been experiencing
+
+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
+		>=sys-apps/sandbox-1.2.17"
+RDEPEND="${DEPEND}"
+
+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" || die "sed failed"
+	cp "${WORKDIR}/PEAR-${PEAR}/scripts/pear.sh" "${WORKDIR}/PEAR/pear"
+	sed -i "s:@php_bin@:${PHPCLI}:g" "${WORKDIR}/PEAR/pear" || die "sed failed"
+	sed -i "s:@bin_dir@:/usr/bin:g" "${WORKDIR}/PEAR/pear" || die "sed failed"
+	sed -i "s:@php_dir@:/usr/share/php:g" "${WORKDIR}/PEAR/pear" || die "sed failed"
+	sed -i "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" "${WORKDIR}/PEAR/pear" || die "sed failed"
+
+	# 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 failed"
+	sed -i "s:@bin_dir@:/usr/bin:g" "${WORKDIR}/PEAR/peardev" || die "sed failed"
+	sed -i "s:@php_dir@:/usr/share/php:g" "${WORKDIR}/PEAR/peardev" || die "sed failed"
+
+	# Prepare /usr/bin/pecl script.
+	cp "${WORKDIR}/PEAR-${PEAR}/scripts/peclcmd.php" "${WORKDIR}/PEAR/peclcmd.php"
+	sed -i "s:@pear_version@:${PEAR}:g" "${WORKDIR}/PEAR/peclcmd.php" || die "sed failed"
+	cp "${WORKDIR}/PEAR-${PEAR}/scripts/pecl.sh" "${WORKDIR}/PEAR/pecl"
+	sed -i "s:@php_bin@:${PHPCLI}:g" "${WORKDIR}/PEAR/pecl" || die "sed failed"
+	sed -i "s:@bin_dir@:/usr/bin:g" "${WORKDIR}/PEAR/pecl" || die "sed failed"
+	sed -i "s:@php_dir@:/usr/share/php:g" "${WORKDIR}/PEAR/pecl" || die "sed failed"
+
+	# Prepare PEAR/Dependency2.php.
+	sed -i "s:@PEAR-VER@:${PEAR}:g" "${WORKDIR}/PEAR/PEAR/Dependency2.php" || die "sed failed"
+
+	# Install Archive_Tar Package.
+	cp -r "${WORKDIR}/Archive_Tar-${ARCHIVE_TAR}/Archive" "${WORKDIR}/PEAR/"
+
+	# Install Console_Getopt Package.
+	cp -r "${WORKDIR}/Console_Getopt-${CONSOLE_GETOPT}/Console" "${WORKDIR}/PEAR/"
+
+	# Install Structures_Graph Package.
+	cp -r "${WORKDIR}/Structures_Graph-${STRUCTURES_GRAPH}/Structures" "${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 Structures XML *.php
+	dobin pear peardev pecl
+
+	insinto /etc
+	doins "${FILESDIR}/pear.conf"
+	sed -e "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" -i "${D}/etc/pear.conf" || die "sed failed"
+	sed -e "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" -i "${D}/etc/pear.conf" || die "sed failed"
+
+	keepdir "${PEAR_CACHEDIR}"
+	fperms 755 "${PEAR_CACHEDIR}"
+}
+
+pkg_preinst() {
+	rm -f "${ROOT}/etc/pear.conf"
+}
+
+pkg_postinst() {
+	pear clear-cache
+
+	# Update PEAR/PECL 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 pear.phpunit.de pear.php-baustelle.de"
+
+	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.6.1 b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.6.1
new file mode 100644
index 000000000000..f93e98df92f9
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/digest-PEAR-PEAR-1.6.1
@@ -0,0 +1,15 @@
+MD5 17d49e837b64df4e8f9124f829b22cd1 Archive_Tar-1.3.2.tgz 17150
+RMD160 cec105d1cdefd502f209c24c217645cec723d7a2 Archive_Tar-1.3.2.tgz 17150
+SHA256 952820c055a770a6d1ecdff487b3de0ff0617a1baca084dac443a6d5f7cde53c Archive_Tar-1.3.2.tgz 17150
+MD5 d7618327f9302a7191893768982de823 Console_Getopt-1.2.3.tgz 4011
+RMD160 d1624dbcb223395ded9e46285f896d6f5bb5ca74 Console_Getopt-1.2.3.tgz 4011
+SHA256 1985b1434c13d5e619643c3712e4144d39f66f6fed61994765e6a0f1623680d8 Console_Getopt-1.2.3.tgz 4011
+MD5 1476f0ec3917d68e3d7af1346a9a7b89 PEAR-1.6.1.tgz 295780
+RMD160 8066006183ec2987e9b9d6fb71e9a5db23b5b550 PEAR-1.6.1.tgz 295780
+SHA256 5534a512970f5169796ab9394fc24a515ca5905782769fd1b715fefd4add2a8b PEAR-1.6.1.tgz 295780
+MD5 2664e2d024048f982e12fad4d1bfbb87 Structures_Graph-1.0.2.tgz 30947
+RMD160 8eb53f6da109b90bab5d8101e99183a1ae116404 Structures_Graph-1.0.2.tgz 30947
+SHA256 d30e72fcb888d17d01d211dd0cdc8bdde8c87554fc4d7de438a4cf0b490a8697 Structures_Graph-1.0.2.tgz 30947
+MD5 1b516162ad65971b5fd04a7c279627ec XML_RPC-1.5.1.tgz 32215
+RMD160 6e8b9f4698285609d9c9d4450c59c16083607ee8 XML_RPC-1.5.1.tgz 32215
+SHA256 a5b517eef799df148d6c85ab19e188715a22c069f4507dcb792e5efb7d0f117e XML_RPC-1.5.1.tgz 32215