[gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-PEAR/files/, dev-php/PEAR-PEAR/

[Brian Evans]

commit:     17f237bb5a0825ffe32a39e13158808fc0f7b326
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 18:01:20 2016 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 18:01:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f237bb

dev-php/PEAR-PEAR: Revbump to move pkg_postinst from dev-php/pear

Also adjust one patch to be -p1 compliant

Package-Manager: portage-2.3.0

 dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild       | 151 +++++++++++++++++++++
 .../files/gentoo-libtool-mismatch-fix-v2.patch     |   4 +-
 2 files changed, 153 insertions(+), 2 deletions(-)

diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild
new file mode 100644
index 0000000..86cc5ef
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.1-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PEAR Base System"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://pear.php.net/get/${MY_P}.tgz"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php:*[cli,xml,zlib]
+	>=dev-php/PEAR-Archive_Tar-1.4.0
+	>=dev-php/PEAR-Console_Getopt-1.4.1
+	>=dev-php/PEAR-Structures_Graph-1.1.0
+	>=dev-php/PEAR-XML_Util-1.3.0"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch" )
+
+pkg_setup() {
+	[[ -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/portage/make.conf and re-emerge ${PN}."
+	elog
+}
+
+src_install() {
+	insinto /usr/share/php
+	doins -r PEAR/
+	doins -r OS/
+	doins PEAR.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
+		sed "s:@pear_version@:${PEAR}:g" -i "${D}/usr/share/php/${i}" \
+			|| die "failed to sed pear_version"
+	done
+
+	for i in pear peardev pecl ; do
+		sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}" \
+			|| die "failed to sed @bin_dir@ in ${i}"
+		sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}" \
+			|| die "failed to sed @php_dir@ in ${i}"
+	done
+
+	sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" \
+		-i "${D}/usr/bin/pear" \
+		|| die "failed to set PHP ini values in pear executable"
+
+	sed "s:@package_version@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/Command/Package.php" \
+		|| die "failed to sed @package_version@"
+
+	sed "s:@PEAR-VER@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/Dependency2.php" \
+		|| die "failed to sed @PEAR-VER@ in Dependency2.php"
+
+	sed "s:@PEAR-VER@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php" \
+		|| die "failed to sed @PEAR-VER@ in v1.php"
+
+	sed "s:@PEAR-VER@:${PEAR}:g" \
+		-i "${D}/usr/share/php/PEAR/PackageFile/Parser/v2.php" \
+		|| die "failed to sed @PEAR-VER@ in v2.php"
+
+	# finalize install
+	insinto /etc
+	newins "${FILESDIR}"/pear.conf-r2 pear.conf
+
+	sed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed PHPCLILEN in pear.conf"
+
+	sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed CACHEDIRLEN in pear.conf"
+
+	sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed DOWNLOADDIRLEN in pear.conf"
+
+	sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed TEMPDIRLEN in pear.conf"
+
+	# Change the paths for eprefix!
+	sed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the docs path (prefix) in pear.conf"
+
+	sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the data path (prefix) in pear.conf"
+
+	sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the tests path (prefix) in pear.conf"
+
+	sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the PHP include path (prefix) in pear.conf"
+
+	sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" \
+		-i "${D}/etc/pear.conf" \
+		|| die "failed to sed the bin path (prefix) in pear.conf"
+
+	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
+	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
+	diropts -m1777
+	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
+}
+
+pkg_postinst() {
+	pear clear-cache || die "failed to clear PEAR cache"
+
+	# Update PEAR/PECL channels as needed, add new ones to the list if needed
+	elog "Updating PEAR/PECL channels"
+	local pearchans="pear.php.net pecl.php.net pear.phing.info "
+	pearchans+="pear.symfony-project.com pear.agavi.org"
+
+	for chan in ${pearchans} ; do
+		# The first command may fail if, for example, the channels have
+		# already been initialized.
+		pear channel-discover ${chan}
+		pear channel-update ${chan} || die "failed to update channels"
+	done
+}

diff --git a/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch
index 0a7effe..f9a8941 100644
--- a/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch
+++ b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch
@@ -1,6 +1,6 @@
 diff -aruN PEAR.orig/Builder.php PEAR/Builder.php
---- PEAR.orig/Builder.php	2014-07-12 08:25:32.000000000 -0400
-+++ PEAR/Builder.php	2015-01-16 13:43:14.927894013 -0500
+--- a/PEAR/Builder.php	2014-07-12 08:25:32.000000000 -0400
++++ b/PEAR/Builder.php	2015-01-16 13:43:14.927894013 -0500
 @@ -340,6 +340,11 @@
          }
          // }}} end of interactive part