gentoo resync : 14.07.2018

5 files changed, 210 insertions, 0 deletions

diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
new file mode 100644
index 000000000000..e83c5ee539c8
--- /dev/null
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -0,0 +1,5 @@
+AUX gentoo-libtool-mismatch-fix-v2.patch 510 BLAKE2B 59571998b848501efcdd4c304dc48e4950560f2f4d08add530d078787519b1c33dd511e92914208342011bd727e0fca12974b92a46b6a6bc9a66cbca061c9495 SHA512 03848aa6447c2969715e872481e17f7a6dbe7df9e42a13305fdbcfaf09505de40ed6d91c9c93f11a944adc94389472f04eac2b656f08dbdd9d1c3a1d07946ff4
+AUX pear.conf-r2 379 BLAKE2B fe57574f4e4ce095f7ddd9bc26606181a86e67f6c8e6dad57a713e187175b711d50d90c346759d430c32da0a740e7f79cffc7ccedc3b719d04dcd1792a9309f6 SHA512 81e4c95ccfd1a50d30d6e9db90fa099f3dd098bf4fa2c023f5369d0e96a197da91d2572ff3785bcfc83dba82abeca3932431083b5aa2aed155336697764666be
+DIST PEAR-1.10.5.tgz 291151 BLAKE2B b9095e6e488348917846693769f075c898271f2b65fbc69781247e8f46bf41afa4dfeb98d66c1aabce884e24c91bda50af3766745c3b8b5101aa54595e53c796 SHA512 c310fa8ec72ba201313dc03953ec1eba82daa137b27eac880fd5388dce72d38e6aa40737da43c3ad41db4df0d6717c7d77cf477d64b29245854ae95d2a94c364
+EBUILD PEAR-PEAR-1.10.5.ebuild 5890 BLAKE2B 4e34fc9a6e0069e9589c32fe17b7bafc334dbd1db76f02fdb085511c4542e7fe7f5dd4cb10dd826401c9ae9de059e534f25693f1168cd969f5d14ff736c6bf0d SHA512 75f0d4d550c573b1fc184128f401357837f120eb7cab088b78aa40c46e89035ea84ac85a0b39b8518e6f000fa93de4508fd3e82aa061a6f54d47ddf19fe01dea
+MISC metadata.xml 306 BLAKE2B fdddffeab9925e2296436f14f6224e0cbdbe2d386e863de68a555cf8b1e5434409af998a4b73c9380d2118db0a021401b23034895038e31559e0de0919a8c597 SHA512 2e46d7a6fcadfed2ff7be17a5f0a82b5cbf6184b50384f868a6ad8821746badfe126279ef9c114ef9d9a42374931193dba4b84483d437797636b95e6e97247fa
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
new file mode 100644
index 000000000000..d22b143ae103
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+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-Exception
+	>=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_prepare() {
+	default
+	# Exception.php is part of dev-php/PEAR-Exception.
+	rm PEAR/Exception.php || die "failed to remove PEAR/Exception.php"
+}
+
+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
+	[[ -z "${PEAR}" ]] && PEAR="${PV}"
+	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}}"
+
+	insinto /usr/share/php/.packagexml
+	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
+}
+
+pkg_config() {
+	# 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.symfony-project.com"
+
+	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: ${chan}"
+	done
+}
+
+pkg_postinst() {
+	pear clear-cache || die "failed to clear PEAR cache"
+
+	elog "Run 'emerge --config =${PF}' to automatically update the PEAR/PECL channels while online."
+
+	# Register the package from the package.xml file
+	# It is not critical to complete so only warn on failure
+	if [[ -f "${EROOT}usr/share/php/.packagexml/${MY_P}.xml" ]] ; then
+		"${EROOT}usr/bin/peardev" install -nrO --force \
+			"${EROOT}usr/share/php/.packagexml/${MY_P}.xml" 2> /dev/null \
+			|| ewarn "Failed to insert package into local PEAR database"
+	fi
+}
+
+pkg_prerm() {
+	# Uninstall known dependency
+	"${EROOT}usr/bin/peardev" uninstall -nrO "pear.php.net/PEAR"
+}
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
new file mode 100644
index 000000000000..f9a894100c8b
--- /dev/null
+++ b/dev-php/PEAR-PEAR/files/gentoo-libtool-mismatch-fix-v2.patch
@@ -0,0 +1,15 @@
+diff -aruN PEAR.orig/Builder.php PEAR/Builder.php
+--- 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
+ 
++        if (file_exists('aclocal.m4')) {
++                $this->_runCommand('rm aclocal.m4');
++                $this->_runCommand('autoreconf');
++        }
++
+         // FIXME make configurable
+         if (!$user=getenv('USER')) {
+             $user='defaultuser';
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";}
diff --git a/dev-php/PEAR-PEAR/metadata.xml b/dev-php/PEAR-PEAR/metadata.xml
new file mode 100644
index 000000000000..6470e34fb93a
--- /dev/null
+++ b/dev-php/PEAR-PEAR/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>php-bugs@gentoo.org</email>
+		<name>PHP</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pear">PEAR</remote-id>
+	</upstream>
+</pkgmetadata>