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

(Portage version: 2.2_rc40/cvs/Linux x86_64, RepoMan options: --force)

5 files changed, 142 insertions, 18 deletions

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/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"
+}