Makes scripts installed into /usr/bin use /usr/bin/php as interpreter

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

4 files changed, 115 insertions, 12 deletions

diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index e64923fb4d2e..342975a9b5f6 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.120 2010/10/24 11:05:28 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.121 2010/10/30 17:09:16 olemarkus Exp $
+
+*PEAR-PEAR-1.9.1-r3 (30 Oct 2010)
+
+  30 Oct 2010; <olemarkus@gentoo.org> +PEAR-PEAR-1.9.1-r3.ebuild,
+  +files/pear.conf-r2:
+  Makes scripts installed into /usr/bin use /usr/bin/php as interpreter
 
   24 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
   PEAR-PEAR-1.9.1-r1.ebuild:
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 3bd47d2b4747..12911a287831 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,9 +1,7 @@
------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
+AUX pear.conf-r2 379 RMD160 adaf8e0edd442e7a612754af1f594d8e9e776023 SHA1 098fd2a554643380bf09cc36e03d556459e00eeb SHA256 33296ad828fdbe5447edc93aea6e81351f643fc2e845c6e4bdfad84b299023aa
 DIST Archive_Tar-1.3.2.tgz 17150 RMD160 cec105d1cdefd502f209c24c217645cec723d7a2 SHA1 40a16c6fe6cee12d9fd87d487785db2949ffa9ff SHA256 952820c055a770a6d1ecdff487b3de0ff0617a1baca084dac443a6d5f7cde53c
 DIST Console_Getopt-1.2.3.tgz 4011 RMD160 d1624dbcb223395ded9e46285f896d6f5bb5ca74 SHA1 2f4ea028f478123164c3f6588f8a505dc35915df SHA256 1985b1434c13d5e619643c3712e4144d39f66f6fed61994765e6a0f1623680d8
 DIST PEAR-1.6.2.tgz 297794 RMD160 db3c37446c8e06149d7197ebdd3e9d720dd162ce SHA1 99900fdad3f7b0078746a021d17749f6bdeec03c SHA256 5f502e44314f4ba28467e21b28c51207265a3d282b33dbc664edbcddf41dcc8e
@@ -15,12 +13,6 @@ EBUILD PEAR-PEAR-1.6.2-r1.ebuild 4372 RMD160 7e49549a31cf238a85a4e0f11db5bc693a3
 EBUILD PEAR-PEAR-1.9.0.ebuild 3074 RMD160 f74ef67cb985e3cf99468e2d4f4b3cc701d58afd SHA1 8649c6ea2779a2afaa1ee3aea8167d83b4852ce6 SHA256 0e510db7612f646ad9fd824cf14b63b399f4c626e25fd1ef20e19b43ec8e1571
 EBUILD PEAR-PEAR-1.9.1-r1.ebuild 2971 RMD160 d23f0066ba27e55a9d7604a6a14680d8c28ca1cc SHA1 5f3407690fac3ee6f281436309915c151b29ec38 SHA256 67e3acd3f9942aa622befdd0e9e7478654ef27c50543ecfe4fe232f1ada21d10
 EBUILD PEAR-PEAR-1.9.1-r2.ebuild 3652 RMD160 0c5fe36b3e793997fcd8c19589fa9d444348da82 SHA1 09cd06b7079955b085fa858533cb8d1798ef4154 SHA256 3e222f2cb4b9b98897a68af629112375c83c4d7e1aabea458e269610de146cc5
-MISC ChangeLog 17213 RMD160 82df5a562e59aec586b20b17bcceeb256d699f54 SHA1 3df3c7d447569b03b1ec663072d0b9886dea12a4 SHA256 e019717b267699ba4ea57533d3137c9f0902d763bf698610de4a3fc967c5cec6
+EBUILD PEAR-PEAR-1.9.1-r3.ebuild 3652 RMD160 2aa576557e14fdc77dd2128dd13974ef38806ffb SHA1 5e91577e55cda20ff3e33ef49d9b6b543ea0c9bc SHA256 9901603817b9601fffbc3717c737aaf2dcbe2fba3421b21bcc37216029998975
+MISC ChangeLog 17411 RMD160 ce8e3699e9b6eb027eeaa58d450d80e98790a143 SHA1 dccebe82f5548e8c732ffecac8595db7643b3bec SHA256 f254fa0f5951c6e2de94bf9872ff4b41f441d7abe93e56d90352fa278f170f71
 MISC metadata.xml 248 RMD160 a52d2dcf8ab8231c5e8332d5022d921fb8b6754e SHA1 84c45cabf8e0959e44317f8db4449c0056c7959e SHA256 a98d66f97c0d4f6f57c10b1b2038cfb7c5a76a58ff187ddff241024dfa8dee51
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzEEwEACgkQ9/cejkQaxBAdaQCfXw4peyTxoOKR+FCE+m2tYMsV
-nm8An2hhnuKDiOywyTlf6IS4C8ld89IU
-=1jAt
------END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r3.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r3.ebuild
new file mode 100644
index 000000000000..6fcceb6e380c
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.1-r3.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-r3.ebuild,v 1.1 2010/10/30 17:09:16 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-r2 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"
+}
diff --git a/dev-php/PEAR-PEAR/files/pear.conf-r2 b/dev-php/PEAR-PEAR/files/pear.conf-r2
new file mode 100644
index 000000000000..277227b4a47b
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/pear.conf-r2
@@ -0,0 +1,2 @@
+#PEAR_Config 0.9
+a:9:{s:7:"doc_dir";s:19:"/usr/share/php/docs";s:8:"data_dir";s:19:"/usr/share/php/data";s:8:"test_dir";s:20:"/usr/share/php/tests";s:7:"php_dir";s:14:"/usr/share/php";s:7:"bin_dir";s:8:"/usr/bin";s:7:"php_bin";s:12:"/usr/bin/php";s:9:"cache_dir";s:CACHEDIRLEN:"CACHEDIR";s:12:"download_dir";s:DOWNLOADDIRLEN:"DOWNLOADDIR";s:8:"temp_dir";s:TEMPDIRLEN:"TEMPDIR";}