Added revbump with prefix support. Also removed sed'ing @php_bin@ as it

will always be in $PATH

Package-Manager: portage-2.1.9.11/cvs/Linux x86_64

3 files changed, 112 insertions, 12 deletions

diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index a0937594a284..492b583f1e96 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.118 2010/10/14 15:06:46 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.119 2010/10/23 06:57:50 olemarkus Exp $
+
+*PEAR-PEAR-1.9.1-r2 (22 Oct 2010)
+
+  22 Oct 2010; <olemarkus@gentoo.org> +PEAR-PEAR-1.9.1-r2.ebuild:
+  Added revbump with prefix support. Also removed sed'ing @php_bin@ as it
+  will always be in path
 
   14 Oct 2010; Christian Faulhammer <fauli@gentoo.org>
   PEAR-PEAR-1.9.1-r1.ebuild:
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 74aa0483953a..198797e01cf5 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.6.2-accept-encoding-bug_12116.patch 603 RMD160 d19b8be3352e479c7316f259cfb23f397de655fb SHA1 cab06556f29fbc9749a6566bf124678e7de60188 SHA256 7f15a8fe6c09c6846b4e052b6f6ee2052b0191b215f7e41bc56b6b89c952ae4a
 AUX pear.conf 291 RMD160 311e624d97640448754aa2f3e643aa53501f9c25 SHA1 47b350c2bf4b882b5981504ac6acfd7c708367e6 SHA256 cbe9363c760952d00b90070d4a41e88a175e12c65f99668fbe16d8158f5fa7ab
 AUX pear.conf-r1 379 RMD160 df2595353d3a0ee5474dff41a445ebd2e642a5ec SHA1 a9971714efca2a84ef54b5f7c71f3adbbe3d2930 SHA256 43e78396b7b91cf16a3d33d36c19096c9e7281b7f771c379f383a16c7756c490
@@ -14,12 +11,6 @@ DIST XML_RPC-1.5.1.tgz 32215 RMD160 6e8b9f4698285609d9c9d4450c59c16083607ee8 SHA
 EBUILD PEAR-PEAR-1.6.2-r1.ebuild 4372 RMD160 7e49549a31cf238a85a4e0f11db5bc693a313829 SHA1 9412d7bbe4581b0072cca2f26c2e157dc8abf85d SHA256 1d2c70184a568377c1f6838235c87deb01962bb25f7dbf409d9b49540d0fa4e7
 EBUILD PEAR-PEAR-1.9.0.ebuild 3074 RMD160 f74ef67cb985e3cf99468e2d4f4b3cc701d58afd SHA1 8649c6ea2779a2afaa1ee3aea8167d83b4852ce6 SHA256 0e510db7612f646ad9fd824cf14b63b399f4c626e25fd1ef20e19b43ec8e1571
 EBUILD PEAR-PEAR-1.9.1-r1.ebuild 2969 RMD160 19976c25cf814265a2d2b3609fb14f2e09430657 SHA1 cdddc6714b5c534a49e9e0210f8c777205cce1ea SHA256 ac13aad90a91fb6d1a81342db5c261573fbfb26fe63d8a8f82e0018de7605ce5
-MISC ChangeLog 16892 RMD160 1d5662134ba2a5c239f3ffb9a61a955fb47676ae SHA1 62fcf10579e6c322125e3d02e0d3885b992bbd38 SHA256 396a60669a1fb6d2abf2dd925d9992a4e4f8c425b580174c8a49f601a0e61697
+EBUILD PEAR-PEAR-1.9.1-r2.ebuild 3652 RMD160 0c5fe36b3e793997fcd8c19589fa9d444348da82 SHA1 09cd06b7079955b085fa858533cb8d1798ef4154 SHA256 3e222f2cb4b9b98897a68af629112375c83c4d7e1aabea458e269610de146cc5
+MISC ChangeLog 17097 RMD160 b4c49bc040bafb5be3f6ea661b0b3b3cf3454e74 SHA1 cbf75405ca3a676563b0562341bde054f9fa0600 SHA256 ce0a258848d48953c62dae9b948108869a759698e08a54de4f23ac43c289c8d7
 MISC metadata.xml 248 RMD160 a52d2dcf8ab8231c5e8332d5022d921fb8b6754e SHA1 84c45cabf8e0959e44317f8db4449c0056c7959e SHA256 a98d66f97c0d4f6f57c10b1b2038cfb7c5a76a58ff187ddff241024dfa8dee51
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAky3HQcACgkQNQqtfCuFnePkUgCffIl3HD3DwHSFYFyrSbnefRYO
-X5AAmweXQxLI59e+pamDJyhtl8YbYctJ
-=r/1Q
------END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r2.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r2.ebuild
new file mode 100644
index 000000000000..94df0fe30080
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2010 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.9.1-r2.ebuild,v 1.1 2010/10/23 06:57:50 olemarkus Exp $
+
+EAPI="3"
+
+inherit depend.php
+
+PEAR="${PV}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+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-5.3[pcre] >=dev-lang/php-5.3 )
+		dev-lang/php[cli,xml,zlib]"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	has_php
+
+	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
+	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
+	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/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:@bin_dir@:${EPREFIX}/usr/bin:g" /usr/bin/${i}
+		dosed "s:@php_dir@:${EPREFIX}/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
+
+	# Change the paths for eprefix!
+	dosed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" /etc/pear.conf
+	dosed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" /etc/pear.conf
+	dosed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" /etc/pear.conf
+	dosed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" /etc/pear.conf
+	dosed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" /etc/pear.conf
+
+	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
+	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
+	diropts -m1777
+	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}/etc/pear.conf"
+}