Version bump, bug 250268; New install system using split ebuilds, PEAR-PEAR is only that on package now, dev-php/pear will pull in necessary deps individually

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
RepoMan-Options: --force

7 files changed, 152 insertions, 22 deletions

diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest
new file mode 100644
index 000000000000..77b0f995731b
--- /dev/null
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@@ -0,0 +1,4 @@
+DIST Archive_Tar-1.3.3.tgz 18119 RMD160 3abe03b42ee81b6ddf5449db6277806f664aec6b SHA1 b49de079aee8c087c19b718534503234670598cb SHA256 c69e600bc972fa29e9e0fe318fca83201c5a5284a6800e7bef979bc03c93d956
+EBUILD PEAR-Archive_Tar-1.3.3.ebuild 721 RMD160 09c4a171d54e26ee8edb2477b232d819bbaa58a6 SHA1 e63e86bf596488df83311f9201e967bd12ae2c59 SHA256 10061086b1ae48a4a16184271d391035b39d523663b88e52b9c3641cac34fec0
+MISC ChangeLog 417 RMD160 430ae2555b13caa9e000a4fe055ac965a132ade5 SHA1 a9a6096f869e31f52f60e5747efd8e007d14e661 SHA256 875def4ba36a83a0cd5e7d67086762686e33b7ee1b0bb0329489a2594f0f720a
+MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index bb5ca862770a..efdf17110776 100644
--- a/dev-php/PEAR-PEAR/ChangeLog
+++ b/dev-php/PEAR-PEAR/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-php/PEAR-PEAR
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.106 2008/03/17 12:48:51 jokey Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.107 2009/09/23 02:41:50 beandog Exp $
+
+*PEAR-PEAR-1.8.1 (23 Sep 2009)
+
+  23 Sep 2009; Steve Dibb <beandog@gentoo.org> PEAR-PEAR-1.6.1.ebuild,
+  PEAR-PEAR-1.6.2-r1.ebuild, PEAR-PEAR-1.7.1.ebuild,
+  +PEAR-PEAR-1.8.1.ebuild:
+  Version bump, bug 250268; New install system using split ebuilds,
+  PEAR-PEAR is only that on package now, dev-php/pear will pull in necessary
+  deps individually
 
 *PEAR-PEAR-1.7.1 (17 Mar 2008)
 
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index e4fe9b1b290b..66457c15968a 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -6,10 +6,12 @@ DIST Console_Getopt-1.2.3.tgz 4011 RMD160 d1624dbcb223395ded9e46285f896d6f5bb5ca
 DIST PEAR-1.6.1.tgz 295780 RMD160 8066006183ec2987e9b9d6fb71e9a5db23b5b550 SHA1 b3ca5fcace112c98e8e16885ba97c00a3f427ce0 SHA256 5534a512970f5169796ab9394fc24a515ca5905782769fd1b715fefd4add2a8b
 DIST PEAR-1.6.2.tgz 297794 RMD160 db3c37446c8e06149d7197ebdd3e9d720dd162ce SHA1 99900fdad3f7b0078746a021d17749f6bdeec03c SHA256 5f502e44314f4ba28467e21b28c51207265a3d282b33dbc664edbcddf41dcc8e
 DIST PEAR-1.7.1.tgz 302377 RMD160 9e98cde01eb21d21daf934ebb03b27d375424e7d SHA1 a4a51b0686a7ad00c68abb23eca80416f18ddfd3 SHA256 127634eccb67e6378ce0a92045314c9a6252a40c5d5026b8b79f5b13e3fce7ab
+DIST PEAR-1.8.1.tgz 290382 RMD160 650c8206420b65569ad3a8bf067d7ff3274fdfae SHA1 67cd4a2a831ad2acb29de44eece7c215e5d3b5a3 SHA256 5de817886bcea77704ee2788700657429dfe48b0036d1d3b3850423f4577ccf1
 DIST Structures_Graph-1.0.2.tgz 30947 RMD160 8eb53f6da109b90bab5d8101e99183a1ae116404 SHA1 300aa0a2effb0b39c4fa8a63a834748ae99c2855 SHA256 d30e72fcb888d17d01d211dd0cdc8bdde8c87554fc4d7de438a4cf0b490a8697
 DIST XML_RPC-1.5.1.tgz 32215 RMD160 6e8b9f4698285609d9c9d4450c59c16083607ee8 SHA1 d28fd6d3139aa247d22428ec6b50e20a3cdaa4b4 SHA256 a5b517eef799df148d6c85ab19e188715a22c069f4507dcb792e5efb7d0f117e
-EBUILD PEAR-PEAR-1.6.1.ebuild 5282 RMD160 13fd3973f66e213490afcddf1bd8551726e728aa SHA1 28f9f4104d0207e35b1193383f7301053bccea1a SHA256 e0d4ea9f64565bda89adefb283eae706159caac47cd6236305265c06df7ca90e
-EBUILD PEAR-PEAR-1.6.2-r1.ebuild 4243 RMD160 fa9c337495562e24d1eede164af676b17739e46b SHA1 9d9d740b0771a5dd2986e2f677e3e92930f00140 SHA256 d64c910d0911fa32ae53c37b57f987ec16a785ca726a8959e305ee3cbb334e26
-EBUILD PEAR-PEAR-1.7.1.ebuild 4457 RMD160 27c9b3e3177748542e50900747ae5f83e7c4f60a SHA1 cd62954372c57de8d248e22acb4785b79c30f7d3 SHA256 2486fda4284f67e7bb56b91abb5fd26efef52ee43bbafa173e68be78f3d61bf5
-MISC ChangeLog 15110 RMD160 0bb7a6e3d4bfc5358139ed3738366cc7407df6d9 SHA1 46ee67e553cf5f47475a8d36bede66ccdf99d8ef SHA256 31314671a28249208560cbaa6348e44eec1fa7d29332df60542d6f878ac5b5bb
+EBUILD PEAR-PEAR-1.6.1.ebuild 5403 RMD160 510d72ef53328a1ebf933e893c3c1f8def1e92d8 SHA1 ec3522a99c3b7ce9037aba8c810968733d55e3ef SHA256 60288730c76e4522046438a41c6c9a8c72fdd213c473fcdbb926772afa149b9b
+EBUILD PEAR-PEAR-1.6.2-r1.ebuild 4372 RMD160 7e49549a31cf238a85a4e0f11db5bc693a313829 SHA1 9412d7bbe4581b0072cca2f26c2e157dc8abf85d SHA256 1d2c70184a568377c1f6838235c87deb01962bb25f7dbf409d9b49540d0fa4e7
+EBUILD PEAR-PEAR-1.7.1.ebuild 4582 RMD160 e3a8c75cac95024cfca64ab6ce60a2c58626a951 SHA1 a8afbd6dd19d7a7c3f4b064fb8bb7507a354d90f SHA256 687d9f0cea4c59b180344ea45dd448750706521432ff84e1e96775299dceb0f8
+EBUILD PEAR-PEAR-1.8.1.ebuild 3108 RMD160 3e896107c3d903563eb5754796697572d6c9b172 SHA1 2e7807bf9589183f10707a9e41dd8a736dee539c SHA256 3d44c732f0dd9d8640ec6b6638940c63e2202752f3601b5e46da2ac856db95ab
+MISC ChangeLog 15461 RMD160 1b3e16a5a519590fecc73eb3d649257ac33649a6 SHA1 cfbef04eb3d9d29013ab683bb91f03b615cb5479 SHA256 aba66907762dcebf1447b4d5755c95e29938cc219b03307b64c46e192854ddfc
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.1.ebuild
index d1be682bbe7a..20db65487092 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.1.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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.10 2007/12/06 00:45:22 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.1.ebuild,v 1.11 2009/09/23 02:41:50 beandog Exp $
 
 inherit depend.php
 
@@ -32,14 +32,19 @@ IUSE=""
 # 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"
+	!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
+	!dev-php/pear
+	!dev-php/PEAR-Archive_Tar
+	!dev-php/PEAR-Console_Getopt
+	!dev-php/PEAR-Structures_Graph
+	!dev-php/PEAR-XML_RPC"
 RDEPEND="${DEPEND}"
 
 pkg_setup() {
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.2-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.2-r1.ebuild
index c15697acc081..60d5260a069d 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.2-r1.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.2-r1.ebuild,v 1.9 2008/01/10 10:06:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.6.2-r1.ebuild,v 1.10 2009/09/23 02:41:50 beandog Exp $
 
 inherit depend.php
 
@@ -28,7 +28,12 @@ IUSE=""
 # we depend on a recent sandbox version to mitigate problems users
 # have been experiencing
 DEPEND="dev-lang/php
-	>=sys-apps/sandbox-1.2.17"
+	>=sys-apps/sandbox-1.2.17
+	!dev-php/pear
+	!dev-php/PEAR-Archive_Tar
+	!dev-php/PEAR-Console_Getopt
+	!dev-php/PEAR-Structures_Graph
+	!dev-php/PEAR-XML_RPC"
 RDEPEND="dev-lang/php"
 
 S=${WORKDIR}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.7.1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.7.1.ebuild
index b39055d51905..60d155346877 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.7.1.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.7.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.7.1.ebuild,v 1.2 2008/03/17 17:18:17 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.7.1.ebuild,v 1.3 2009/09/23 02:41:50 beandog Exp $
 
 inherit depend.php
 
@@ -23,7 +23,12 @@ LICENSE="LGPL-2.1 PHP-2.02 PHP-3 PHP-3.01 MIT"
 SLOT="0"
 IUSE=""
 
-DEPEND="dev-lang/php"
+DEPEND="dev-lang/php
+	!dev-php/pear
+	!dev-php/PEAR-Archive_Tar
+	!dev-php/PEAR-Console_Getopt
+	!dev-php/PEAR-Structures_Graph
+	!dev-php/PEAR-XML_RPC"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.8.1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.8.1.ebuild
new file mode 100644
index 000000000000..d43ba4d4fea2
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.8.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2009 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.8.1.ebuild,v 1.1 2009/09/23 02:41:50 beandog Exp $
+
+inherit depend.php
+
+PEAR="${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+
+DESCRIPTION="PEAR Base System"
+HOMEPAGE="http://pear.php.net/package/PEAR"
+SRC_URI="http://pear.php.net/get/PEAR-${PEAR}.tgz"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-lang/php"
+PDEPEND="dev-php/pear"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	has_php
+
+	# 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
+
+	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="/var/cache/pear"
+	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="/var/tmp/pear"
+	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="/tmp"
+
+	elog
+	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
+	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
+	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
+	elog
+	elog "If you want to change the above values, you need to set"
+	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
+	elog "accordingly in /etc/make.conf and re-emerge ${PN}."
+	elog
+}
+
+src_install() {
+	# Prevent SNMP related sandbox violoation.
+	addpredict /usr/share/snmp/mibs/.index
+	addpredict /var/lib/net-snmp/
+
+	# install PEAR package
+	cd "${S}"/PEAR-${PEAR}
+
+	insinto /usr/share/php
+	doins -r PEAR/
+	doins -r OS/
+	doins PEAR.php PEAR5.php System.php
+	doins scripts/pearcmd.php
+	doins scripts/peclcmd.php
+
+	newbin scripts/pear.sh pear
+	newbin scripts/peardev.sh peardev
+	newbin scripts/pecl.sh pecl
+
+	# adjust some scripts for current version
+	for i in pearcmd.php peclcmd.php ; do
+		dosed "s:@pear_version@:${PEAR}:g" /usr/share/php/${i}
+	done
+
+	for i in pear peardev pecl ; do
+		dosed "s:@php_bin@:${PHPCLI}:g" /usr/bin/${i}
+		dosed "s:@bin_dir@:/usr/bin:g" /usr/bin/${i}
+		dosed "s:@php_dir@:/usr/share/php:g" /usr/bin/${i}
+	done
+	dosed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" /usr/bin/pear
+
+	dosed "s:@package_version@:${PEAR}:g" /usr/share/php/PEAR/Command/Package.php
+	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/Dependency2.php
+	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v1.php
+	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v2.php
+
+	# finalize install
+	insinto /etc
+	newins "${FILESDIR}"/pear.conf-r1 pear.conf
+	dosed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" /etc/pear.conf
+	dosed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" /etc/pear.conf
+	dosed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" /etc/pear.conf
+	dosed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" /etc/pear.conf
+
+	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR}"
+	keepdir "${PEAR_CACHEDIR}"
+	diropts -m1777
+	keepdir "${PEAR_DOWNLOADDIR}"
+}
+
+pkg_preinst() {
+	rm -f "${ROOT}/etc/pear.conf"
+}