gentoo resync : 10.11.2017

4 files changed, 2 insertions, 345 deletions

diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index eb15733b02c1..bcd8215bd3a4 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -2,12 +2,9 @@ AUX gentoo-libtool-mismatch-fix-v2.patch 510 SHA256 f4d702b44b86e481f6351b2880dc
 AUX gentoo-libtool-mismatch-fix.patch 718 SHA256 7ee96d72e09529f773c14db4da099fdb8beec12a370b76fb8901cc010cdb6fb5 SHA512 11fa9687c05ca448124b9b10801ca161ef1a5e77aa1aa9fe264a1e5ffa8947227e370a0f0d5f29d00bd5e7a280815dd43fc592996f52114cbf309556861db88e WHIRLPOOL 931d2d9c995dcaabaa2b5160a41146ad8771cb2b1947e2bd749b64be8c6520ad018ccc7bd8759aae7e3afeae78801c908b5362d089d89f55addaff1a7e1d1eeb
 AUX pear.conf-r2 379 SHA256 33296ad828fdbe5447edc93aea6e81351f643fc2e845c6e4bdfad84b299023aa SHA512 81e4c95ccfd1a50d30d6e9db90fa099f3dd098bf4fa2c023f5369d0e96a197da91d2572ff3785bcfc83dba82abeca3932431083b5aa2aed155336697764666be WHIRLPOOL 23a9d300340b463064a4f26489386d786c151394d763a9bcdbb6d5fd6ef72536849c375edd48c57f7c58e63a80650a975fdb7d6cbb368f59471789da4c65ae9a
 DIST PEAR-1.10.1.tgz 291167 SHA256 7eca0d8e4f6391d66d92abc4faebd5a9346e739b92573e20392db9e878a8d59f SHA512 df5f09a92d211a09dae147af474399171aed46e0536c091468b73b43ba4acdbdbf7b5cbdd17ef48b7d36d7b9dd23187dc6c75733731c267768d49c89698b0ef2 WHIRLPOOL ef067937d805a1e5c082c5945ffcbffd005757326f72572563154f2b5c573713050cc002af7727ebe053b3956fa1113c29bbbad6e74d8fb110704b07b7291929
-DIST PEAR-1.10.3.tgz 291095 SHA256 c882979c48640b0b1a71cf2290dad3b3bbef1c33e4f1ec9af36a710e88e7921a SHA512 1ad531a6e0ac30719b05e58f0758393bc6cdb0e89b4f99f843e7318a40ef18e74767e8ed63346b0ece9d6e8e71c8ebe15b08eaeb6f0c4f3169814bb4bb524332 WHIRLPOOL 987d875a76ccbf26ea3fce0ca1b11d0885bcd98c73c1bdd43ce41f5f0cec4504f769aaa2b1bca3e501763ab21c3d6980a2eb02d26bfdfbd6f9a28f938ebbd4ea
 DIST PEAR-1.10.5.tgz 291151 SHA256 74c28725fed39617a6c2f310d5e1185b05982e3478196c2fedc64b4e747c2465 SHA512 c310fa8ec72ba201313dc03953ec1eba82daa137b27eac880fd5388dce72d38e6aa40737da43c3ad41db4df0d6717c7d77cf477d64b29245854ae95d2a94c364 WHIRLPOOL 8d2bf23cb28c4242b9c452f141b42d445e2fce343ed091bc834ba058fb0358a1b22228585c0074bde445a0de8807af27b57d503962e57c45cd1f00e2f982ad7e
 EBUILD PEAR-PEAR-1.10.1-r1.ebuild 5088 SHA256 c95bf6f9744865cddefba51210a72f8a951d45315075486e9dee4212bf74c18d SHA512 a709a4874155a1095a390e159d77e797fc0cdca1b59929851a07e752d32648a27d36abc755c49a23fc6cc349dc0ef1a3f0012ba67c92b69c8c3c56b5394db22f WHIRLPOOL 813e72a67074cf26f704c513a1752eb7f9a956c7921d1e8e1c5f7a4626466e17bfe550b7129203c30f6cd587549e119a21a9e8ca19c41651a12be3b9bac0d7c0
-EBUILD PEAR-PEAR-1.10.3-r1.ebuild 5688 SHA256 7228c7cbb46cd41cd08c0c18844a746f310f1354b414c08ffcd2271aa196de39 SHA512 64ed25403281efda677a63208f7d880be24b86f7410ea4522039d91a3f8c6f0db89c41068e46692510bc4c94de75770bcd5d5ff5a6622705c3141a97333fd864 WHIRLPOOL bff92eb51830711634f7447ad5255959d83e798654bf9be2a0d1fb5f7bc9018a44b683c887ecfbd022b31dfde4a35ac06206f6989d573be53d706f1089c35e4b
-EBUILD PEAR-PEAR-1.10.3-r2.ebuild 5704 SHA256 0f1a81dd3a278b1db92d8dce58970f446bcf47e2e093b61078eb1720dd169a84 SHA512 4c55f8757f8ad140ef4cc3a2142e3ec0e6bcf2591e88cd40dadb435c2a1c911c0b7e08eac513eb07f2f75b2483041065302a5b694a8e7b29de5cc65a07e6bfdb WHIRLPOOL a4c268633d1284f27d48f07840c0de867e63ca6e44d84749e0d1b87485854361790cd967bd0ae53c9a7de005e72958ff2e63b81063de670d0ffa169b408f3a47
-EBUILD PEAR-PEAR-1.10.5.ebuild 5870 SHA256 57927e77a3aa5396a36c0a0afe97e3db4e6d8ccd551d9cf079c390328099ff5b SHA512 a8045d807eb56c361997a46671c1408c2eff3ad9bee8723b9533c6264e6f72df4f7566d3d0c1465b37703f60c2895c640cba8b18f9b3c66759cea64701ab344a WHIRLPOOL 368739149b16fa3f4fab24a753af05bb237fb220a20d2b40ab4605b56b5feb14806d4716d94384f5757565042df4d5d67cf98b38fff1dd348bd774eb665dc4d7
+EBUILD PEAR-PEAR-1.10.5.ebuild 5882 SHA256 3fcfbdbc07b80e91855a1a90f88430f984587530d6aaf15b37937848f8ccc5da SHA512 e87709aac8de8feeb34ad662a91dff86db7f704f27b4d9c4398cf7793655571f7e713babcc46922f0acf376b71a806296d1150e30b6784ae763b68c0ce84d91c WHIRLPOOL fca5b9515a0ec6455d4d88504131564c8bf36bd64c1e93f265b76feedbedd38cf31080fa0f5840dff56da7d2386f41d94ec90173eced4956fb11dc9be44bdf74
 MISC ChangeLog 4271 SHA256 1dbd6a3cfede43b89ddb4c89e17286f907fa86f2ee827681d6d205b86c23e24a SHA512 df1cc8bac38bae0e8514db77fa0dcd6f610b28980375e2bc7e716acc7d0b6d4d57019833a9d544ad415323ca4a19f131ffb5d5446f5d627465d18039a8a13772 WHIRLPOOL bd51b54d01f17780e88e1281b99b0f9fd84456b9301f8435c11705655af6bc561b36d1638110322b6047315e3755912c22ebd8d1004ff27bafa8f843c0f36dde
 MISC ChangeLog-2015 23213 SHA256 d764ce928a6df94c55474dfbda8643bf640233ebf0e486aca3e0ff6eae9526b0 SHA512 e3cba6a170207110b1e162b91c70c38f1dfe3841f2a63c1b7f924e7ab9ea5ee637d8d4cbc6cb284d4806546d751ac2aa5a4bd0e08c86213c5d19ae53ff6a2d56 WHIRLPOOL 9bdcb6737bee37275a1e3367fe85b4befd54d64ca7de96e057c2b73d7fd3f0d49637616c03ff12c8293f987d13f6b0e0f524369243dcf92044c1c544c5a0558d
 MISC metadata.xml 306 SHA256 91b4007b73df9f43b5286941673f49f3a9aae409c62c48ab31af8b4dcd191012 SHA512 2e46d7a6fcadfed2ff7be17a5f0a82b5cbf6184b50384f868a6ad8821746badfe126279ef9c114ef9d9a42374931193dba4b84483d437797636b95e6e97247fa WHIRLPOOL 196291f2331d8f65b33f4f450ae97951a391a0240b9f3e1be58338eddf5b88e7c3e11660427f78a15b138ff20eb24c36293fbe6120dfc54eb9931d2f8e717f59
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r1.ebuild
deleted file mode 100644
index 94d1ad067dd3..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2017 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 ~amd64-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
-	[[ -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_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"
-
-	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
-
-	# 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/PEAR-PEAR-1.10.3-r2.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r2.ebuild
deleted file mode 100644
index a097da16a520..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.3-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2017 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="~amd64 ~arm ~hppa"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-lang/php:*[cli,xml,zlib]
-	dev-php/PEAR-Archive_Tar
-	dev-php/PEAR-Console_Getopt
-	dev-php/PEAR-Exception
-	dev-php/PEAR-Structures_Graph
-	dev-php/PEAR-XML_Util"
-
-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_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.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
-
-	# 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/PEAR-PEAR-1.10.5.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
index 9a39ac1c9476..277099941f1a 100644
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
+++ b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.5.ebuild
@@ -10,7 +10,7 @@ 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="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE=""