10 files changed, 216 insertions, 107 deletions
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index a1a510d2000b..ea0f68f54f78 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Archive_Tar/Manifest b/dev-php/PEAR-Archive_Tar/Manifest
index 52c4dea52757..007db192e88f 100644
--- a/dev-php/PEAR-Archive_Tar/Manifest
+++ b/dev-php/PEAR-Archive_Tar/Manifest
@@ -1,7 +1,3 @@
-DIST Archive_Tar-1.4.12.tgz 21665 BLAKE2B fc4d2d5128bfc02da5f7e2465834e2ff14554188ede7899856f200935a850c35bb74e6fcca5c4c4ae641a575725a3edba2878376a587304f133c8f16e1ee9336 SHA512 9f2e6ca4628ba4ec95a324c4a706b2d01d2323b5e5e77f1cc7425784d1a35d139b1604bffca10af8b04c4cc875cb6b1f40715a00208cd042aba37f089a586497
-DIST Archive_Tar-1.4.13.tgz 21836 BLAKE2B b150c7493995c889bd91d24fb7bc5374be6ae157e27522a0d1e5b8fa994a09fdd7a03288263d0931f1d46da3e1b37c80e67cee07d5f54f501531b2adb7f4bb8a SHA512 3ee3dd8c8c8af018eb6c6d32409f2867c49f5a8ef21efecd8fb0a36207ca211eb49aaef02806b2df35aa6613d5dd69c8d81c72f97d4297dee3f732a9ab6ff9a7
 DIST Archive_Tar-1.4.14.tgz 21992 BLAKE2B e483ee9943c955dd6834538de70e8d6821b9abb250fca752e01fec7a62c28f59f65a6afe66adb804565c1f79cfc679fd72a32d0311f231dee424199b2600bb73 SHA512 a0277086221acf0cd01ec342af5afd62f01055a8b3bb4942d7a96d3517cce466a0c8a086411671a18d0f7a0a5e4187a76bad0d5c410c93fefe8cc58992327789
-EBUILD PEAR-Archive_Tar-1.4.12.ebuild 1339 BLAKE2B 6bb49ee44218b20678ad9910601ec45594912b0b6daf7adc0e7331a289fc8846514ddc66b2664461629ca50d480d5d840f461c7ad48c60683a9952ae121d4815 SHA512 a9c556741d824c935e9e1a4007ec6270b7da65f32032d03335353f8fb3676eca9b2404be01444c01d5456eb903c3a7df22d09bc22eb70ccfaead4a5bca6746df
-EBUILD PEAR-Archive_Tar-1.4.13.ebuild 1345 BLAKE2B 788692c5dbc83cf35c4937b3332edb6c59e3f6837f541c963b25227e9ecbb7ba137bbb1053bd83412e05bcf320ec2c4bee72e7bb1196a24d58f67cf3130050b9 SHA512 8aa15cb4e7dda9e75d54035d4f492db34186c49a9e53aec29b280f1038fa183d797850beaaebbcbe575fb9d694199a0b3d3fca3c3050473f523e30e68852e9ce
-EBUILD PEAR-Archive_Tar-1.4.14.ebuild 1345 BLAKE2B 788692c5dbc83cf35c4937b3332edb6c59e3f6837f541c963b25227e9ecbb7ba137bbb1053bd83412e05bcf320ec2c4bee72e7bb1196a24d58f67cf3130050b9 SHA512 8aa15cb4e7dda9e75d54035d4f492db34186c49a9e53aec29b280f1038fa183d797850beaaebbcbe575fb9d694199a0b3d3fca3c3050473f523e30e68852e9ce
+EBUILD PEAR-Archive_Tar-1.4.14.ebuild 1339 BLAKE2B 6bb49ee44218b20678ad9910601ec45594912b0b6daf7adc0e7331a289fc8846514ddc66b2664461629ca50d480d5d840f461c7ad48c60683a9952ae121d4815 SHA512 a9c556741d824c935e9e1a4007ec6270b7da65f32032d03335353f8fb3676eca9b2404be01444c01d5456eb903c3a7df22d09bc22eb70ccfaead4a5bca6746df
 MISC metadata.xml 337 BLAKE2B def75fcf8f3291007347252cd8885def7980837bf24cef97f5709ff0166792bb6597d2d0395425e897a8a0afee7fc5436ecfd745e66e4b9147f76f93cb92f923 SHA512 c77cfe795995f88c94b790ac8900e1366e2d4b4adf12f5d18284687145bd37177052ee6f39bf66fe97d8f254366b83019ba51632e15cbfdf7c93d7f08d8f48e7
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild
deleted file mode 100644
index 09a18646d8e6..000000000000
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.12.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tar file management class"
-HOMEPAGE="https://pear.php.net/package/Archive_Tar"
-SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-# bzip2 and zlib are needed for compressed tarballs, and there's one
-# call to preg_match to test paths against a pattern of files and
-# directories that will be ignored.
-RDEPEND="dev-lang/php:*[bzip2,pcre(+),zlib]"
-PDEPEND="dev-php/PEAR-PEAR"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r Archive
-
-	dodoc docs/*
-
-	insinto /usr/share/php/.packagexml
-	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
-}
-
-pkg_postinst() {
-	# It is not critical to complete so only warn on failure
-	if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" && \
-		-x "${EROOT}/usr/bin/peardev" ]] ; 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_postrm() {
-	if [[ -x "${EROOT}/usr/bin/peardev" ]]; then
-		"${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/${MY_PN}"
-	fi
-}
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.13.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.13.ebuild
deleted file mode 100644
index 02c0db09b3a8..000000000000
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.13.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/PEAR-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Tar file management class"
-HOMEPAGE="https://pear.php.net/package/Archive_Tar"
-SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-# bzip2 and zlib are needed for compressed tarballs, and there's one
-# call to preg_match to test paths against a pattern of files and
-# directories that will be ignored.
-RDEPEND="dev-lang/php:*[bzip2,pcre(+),zlib]"
-PDEPEND="dev-php/PEAR-PEAR"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins -r Archive
-
-	dodoc docs/*
-
-	insinto /usr/share/php/.packagexml
-	newins "${WORKDIR}/package.xml" "${MY_P}.xml"
-}
-
-pkg_postinst() {
-	# It is not critical to complete so only warn on failure
-	if [[ -f "${EROOT}/usr/share/php/.packagexml/${MY_P}.xml" && \
-		-x "${EROOT}/usr/bin/peardev" ]] ; 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_postrm() {
-	if [[ -x "${EROOT}/usr/bin/peardev" ]]; then
-		"${EROOT}/usr/bin/peardev" uninstall -nrO "pear.php.net/${MY_PN}"
-	fi
-}
diff --git a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.14.ebuild b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.14.ebuild
index 02c0db09b3a8..09a18646d8e6 100644
--- a/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.14.ebuild
+++ b/dev-php/PEAR-Archive_Tar/PEAR-Archive_Tar-1.4.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://pear.php.net/package/Archive_Tar"
 SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 # bzip2 and zlib are needed for compressed tarballs, and there's one
diff --git a/dev-php/PEAR-DB/Manifest b/dev-php/PEAR-DB/Manifest
index 4824f27b4e1f..9c483751df17 100644
--- a/dev-php/PEAR-DB/Manifest
+++ b/dev-php/PEAR-DB/Manifest
@@ -1,7 +1,9 @@
 DIST DB-1.10.0.tgz 132485 BLAKE2B 10ddf37984f33effb913c9e307b8543af56e344863fea8fde01cfd4684b829353f0799dff6413cffff711418bf7e8cb7f5855bf6f312d41d92db55d363784796 SHA512 01855d0e26b4463fac1f3f9c84c7f3fed62c9087cdd95843340f6250fbd63f4d33f7e958d3f3895f9c2fa568015e86e660393a578c764fa0d39b36a6394dc48a
+DIST DB-1.11.0.tgz 132549 BLAKE2B 0925a551bbda04dd71a1d2ffaf462485a92b62a7f141a5f097614dde8a8c8d6098705116a6f7c0b3bdd62547ad5962381ef15fee3057ba054cead8998306232c SHA512 88488874ee1cb6ff228199106702b1992eab4c7dce44984639951c0693e37ace115214973ef9cbd79959f0602b58cce8a254b47e32dc3d44171d0d7bf78db825
 DIST DB-1.9.2.tgz 133795 BLAKE2B 8b37b010145efd10a2b551392988a810c35b9a8c794eb0e162056fcded104276b19e97afb91149f1814f9f838a0db579a76578fb80d96d0574e5b7714d77aa91 SHA512 126bbbb847a24c20731f1e5f4a549e9d7e0651a760f10c49cfc7550f80dd8b05f3560bc80110bcaab9e79dcbb714c6113948f14a727f7f4087a23178b3db0afa
 DIST DB-1.9.3.tgz 132290 BLAKE2B 8970697ac66bc9fe7f8c374431c59627133401e5b591fb3fc95ffc3a6ebb8cfe7e93982178e092eefc79d91657992eb539fc7211a237e3fe7407c75c7013831f SHA512 3fe98f97307818f65c0eaf291169fd13533a4d484d34d7fa7aa82580f6ec3d89b984292f173da2cf896f5f15531db9bde2be981e5a7679cc00c48aa2f9cc1142
 EBUILD PEAR-DB-1.10.0.ebuild 763 BLAKE2B bd693bb7f0f00cdb4c9baece3cca0b72970ed186e82122a19e3b727c01b1c351e1cc478b776c7de1ab098eda175eba0398ca198e6f18655cb0fb888e0f373c38 SHA512 54473078315418ff95db1f9758f599231cc7cb276822cde992fa82ac8fcba4f275484072e7b0607faae95b6bccd94d02b2bd213e8e514b94cfb163995cd47665
+EBUILD PEAR-DB-1.11.0.ebuild 763 BLAKE2B 9d614f227cacf8ff1daf6edf792b7becc90b844bc410ee45017f09e72c76fb56928de8d960b6e89c8f10ba4ebe0e0ae515ac16be171f3020f100455ce80eb853 SHA512 7b35d98042b02ea144e475b3e5f1f8c6cda272a6856e1fb7bf75a46a0db84c443de19c05ba7594f0aace133850089d555d70b9863af16cf5026c20d1b166cb30
 EBUILD PEAR-DB-1.9.2-r1.ebuild 757 BLAKE2B 49824dda889b460ff1dba2c8c683d33a9ff45af29c0db0f70375f55959e06b434e88060bb882d8370659e6e838c09360313f3e903415e2715f565e2b5f8c7f30 SHA512 e5d62d1518feaa4d64a1192650d72530edc0ca8ce4282a406b4f8fc57e046fd6c5f960d2b7ebf19bfa1ebd6198284fc7bcc4c13c018209a1685bb0a877b5ff9f
 EBUILD PEAR-DB-1.9.3.ebuild 763 BLAKE2B a1b994ccbc19b5b13732585235cbf814f6b5e37f12fbd09c6b7f8a1c6812eff583cc5eadb3f3dd78609fa77ad74f67381e9d6b3685b120c9b05ee5f5a041c59c SHA512 eb4d31372c536a2377af8522f853744d1228c5a8927c74086c2bf94e34b7df9aa4d8755d6a0f7ed5cff084af59085368d31bc2e615751926e9b557efaacaf517
-MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
+MISC metadata.xml 375 BLAKE2B 53d298087d61e24ce56d3510ad35e8ce35a75b38c2123a90f50244763285b47a528dd8edaffdb9e669cf1266d57380cf8739ad8fbf1f44e1774012727eea2d68 SHA512 31340bdd042e46b4f4b727117b773fbae45f7299655df97aba3427bb3c6ea48739bc1c0a0afd56f2d74f57deb4845c997eff64c30c26d028e8254063f3e8e430
diff --git a/dev-php/PEAR-DB/PEAR-DB-1.11.0.ebuild b/dev-php/PEAR-DB/PEAR-DB-1.11.0.ebuild
new file mode 100644
index 000000000000..1e96bfe6f5a9
--- /dev/null
+++ b/dev-php/PEAR-DB/PEAR-DB-1.11.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit php-pear-r2
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+DESCRIPTION="Database abstraction layer for PHP"
+LICENSE="PHP-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+DEPEND="test? ( dev-php/PEAR-PEAR )"
+
+DOCS=( doc/TESTERS doc/IDEAS doc/MAINTAINERS doc/STATUS )
+
+src_test() {
+	# Requires the "pear" executable from dev-php/PEAR-PEAR, and also
+	# a working version of the cli SAPI eselected.
+	pear run-tests tests || die
+
+	# The command succeeds regardless of whether or not the test suite
+	# passed, but this file is only written when there was a failure.
+	[[ -f run-tests.log ]] && die "test suite failed"
+}
diff --git a/dev-php/PEAR-DB/metadata.xml b/dev-php/PEAR-DB/metadata.xml
index b86acf66c756..f9ffc486d99e 100644
--- a/dev-php/PEAR-DB/metadata.xml
+++ b/dev-php/PEAR-DB/metadata.xml
@@ -5,4 +5,9 @@
 		<email>php-bugs@gentoo.org</email>
 		<name>PHP</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">pear/DB</remote-id>
+		<remote-id type="pear">DB</remote-id>
+	</upstream>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 5083b776f742..758a36ff9ec8 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,5 +1,7 @@
 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.12.tgz 293220 BLAKE2B fb25123852a60e4bd2c041d1fb58174b3053b24ff8ec19b44efe02aee041bbed102b14b270dc1c9764150eea7c85862ad78adefdc1d789540da18ec0f3aeae68 SHA512 1ce478800a150d7906f8aa4fa4371d3d190fa2af44691c9aa193babfe76f1b031b493f48df15b93e93dd5518a6d62ba6a7d5b1799b62d5a968f7a84f3677b971
+DIST PEAR-1.10.13.tgz 293384 BLAKE2B 0adbf707d71cfd584b1338e906fbd38de038292a91153547ed87bdea4c0a7c9ee2ca01c25c91cf8246b8fba88b71126fa8b76ed7059b4338d5bbc65c3d53ce78 SHA512 2a08134365b7bd92840880a23149ef457b0a3a04b78dc71f5db475911b49def58d8cb825332151df8d3eb5941b54157ae80879f36fc8de59037f301fc0565740
 EBUILD PEAR-PEAR-1.10.12.ebuild 5897 BLAKE2B f5c9c8e98b23638cec1579a8ab8966b5abb287f105ecfc6d794cf50646dedfb657f4ef4b54315d815ed2feb1627edbcd89ef5bf3c8e6362f3c4f4431a23500a3 SHA512 263a6f2e3035d2f738e4633c9e0078389c6ce3ffb3760e9e215c9a933e73a00730ec3cb842672599d80fe6b90919c622f2c012b6fa4d4bcb18d4f78d608909aa
+EBUILD PEAR-PEAR-1.10.13.ebuild 5903 BLAKE2B 3e103091a6f0f6878521dcf79ce4a73bfdb1a265afa58064f6daef6760f92a922095889d18a08eb49c02e6b898ab8d04c7e0c29bf99b5cd091de4cf0c29fe9b4 SHA512 5c536d6b008d2c3bc55c62c1807d9411ee2a0afcb48ad80b2795a329fd245fecc253d96115e95ea7a65f062e334ed74878c2e565265ed22676b33e78ca9d3540
 MISC metadata.xml 330 BLAKE2B b29bdd083977a57f2ebab61b7d1642dce8f373a863d94c6b5e3f0440b74c304de8943d6bebee811fd4262eecfd3289bf0284db2073013afeabf7481f62c5c73a SHA512 71e2b7db5ab5c40629d27f2f3e2cff54da4bea771eb48f9cbd8f76784b42a347ccf8551cf0949866ba1a8c47c5af9d0dfd30757fca13d839ecd9afcee83d59de
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.13.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.13.ebuild
new file mode 100644
index 000000000000..5cc6db313633
--- /dev/null
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.13.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PEAR Base System"
+HOMEPAGE="https://pear.php.net/package/PEAR"
+SRC_URI="https://pear.php.net/get/${MY_P}.tgz"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/php:*[cli(-),xml(-),zlib(-)]
+	>=dev-php/PEAR-Archive_Tar-1.4.9
+	>=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.4.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"
+}