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

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

[Brian Evans]

commit:     0d20e7d92de22996dfa8bf6ea993d7d3eb97fa69
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 02:51:44 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 02:51:44 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d20e7d9

dev-php/PEAR-PEAR: Drop old alpha version; clean up unused files

Package-Manager: portage-2.2.26

 dev-php/PEAR-PEAR/Manifest                       |   1 -
 dev-php/PEAR-PEAR/PEAR-PEAR-1.10.0_alpha2.ebuild | 108 -----------------------
 dev-php/PEAR-PEAR/files/pear.conf                |   2 -
 dev-php/PEAR-PEAR/files/pear.conf-r1             |   2 -
 4 files changed, 113 deletions(-)

diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index bd7badf..addcdf4 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,4 +1,3 @@
-DIST PEAR-1.10.0dev2.tgz 290636 SHA256 6a1c697a0691b1566c251b295846d804e79776f2a7f5b149cfe41b3db75b4493 SHA512 b430f8cfd9858710198fd849ebd91d4c6cf6b5e68d88348a49ddaeb1e7a234ec8a60862a3344810c2ce7d402746fb677e2824b2960d56b290df306905c154523 WHIRLPOOL 83746c0079239350049202f0bc8e60ce58e7f2718fa6af80482b9f4377c246a1e638c9aac47f88c24f8f0b342716216b976fe6e8668925b178ca8def9732c98d
 DIST PEAR-1.10.1.tgz 291167 SHA256 7eca0d8e4f6391d66d92abc4faebd5a9346e739b92573e20392db9e878a8d59f SHA512 df5f09a92d211a09dae147af474399171aed46e0536c091468b73b43ba4acdbdbf7b5cbdd17ef48b7d36d7b9dd23187dc6c75733731c267768d49c89698b0ef2 WHIRLPOOL ef067937d805a1e5c082c5945ffcbffd005757326f72572563154f2b5c573713050cc002af7727ebe053b3956fa1113c29bbbad6e74d8fb110704b07b7291929
 DIST PEAR-1.9.4.tgz 296332 SHA256 80c329264a0363c6222b2f750e1646015161c9787bb4041f5ab41d95160bb93c SHA512 f4c8c6f24039940254cf774e51087a12e6b17f7cbd7308c814f8b43f1342ae68db6b2d94626a4d7ed05e8b537816da08459e2939689f15aef725504683657f47 WHIRLPOOL a640fa5dff5eda2801698094b3d99c7c63d9028727f323634dc6c17942d4cbf4fe76ddd35b89a11a8187de068201b875642bf90ea705544801d4ffaac3325828
 DIST PEAR-1.9.5.tgz 290006 SHA256 d4c27d7321f76527222eae3972c6ffb62412cc729105c858ae0bb0861d699bdb SHA512 73c5ef84c4ededa7bca81b1d94944e80ddf9dc40101c0727c5975d4ddb72f66a28aecafcefb7af8d1cc3b6fa7e488e704559a7efbebe860adfb8e9796cdf4933 WHIRLPOOL ea42f63e73d680985857f3e8e318e1f7d001edc843d12b94c9b7d3969c0793c0a9709d2dc8940b339be2f9e854cb2a3acb8c0e5cdef7ddc3cd06c9df97a3ee37

diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.0_alpha2.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.0_alpha2.ebuild
deleted file mode 100644
index 4221a0e..0000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.10.0_alpha2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils
-
-PEAR="${PV//_alpha/dev}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~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:*[cli,pcre(+),xml,zlib]"
-
-RDEPEND="${DEPEND}"
-
-PDEPEND="dev-php/pear"
-
-S="${WORKDIR}"
-
-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() {
-	cd PEAR-${PEAR}
-	epatch "${FILESDIR}/gentoo-libtool-mismatch-fix-v2.patch"
-	epatch_user
-}
-
-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 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}"
-	done
-
-	for i in pear peardev pecl ; do
-		sed "s:@bin_dir@:${EPREFIX}/usr/bin:g" -i "${D}/usr/bin/${i}"
-		sed "s:@php_dir@:${EPREFIX}/usr/share/php:g" -i "${D}/usr/bin/${i}"
-	done
-	sed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" -i "${D}/usr/bin/pear"
-
-	sed "s:@package_version@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/Command/Package.php"
-	sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/Dependency2.php"
-	sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/PackageFile/Parser/v1.php"
-	sed "s:@PEAR-VER@:${PEAR}:g" -i "${D}/usr/share/php/PEAR/PackageFile/Parser/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"
-	sed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" -i "${D}/etc/pear.conf"
-	sed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" -i "${D}/etc/pear.conf"
-	sed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" -i "${D}/etc/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"
-	sed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" -i "${D}/etc/pear.conf"
-	sed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" -i "${D}/etc/pear.conf"
-	sed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" -i "${D}/etc/pear.conf"
-	sed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" -i "${D}/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 b/dev-php/PEAR-PEAR/files/pear.conf
deleted file mode 100644
index 5a3c529..0000000
--- a/dev-php/PEAR-PEAR/files/pear.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-#PEAR_Config 0.9
-a:7:{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:PHPCLILEN:"PHPCLI";s:9:"cache_dir";s:CACHEDIRLEN:"CACHEDIR";}

diff --git a/dev-php/PEAR-PEAR/files/pear.conf-r1 b/dev-php/PEAR-PEAR/files/pear.conf-r1
deleted file mode 100644
index 78f6981..0000000
--- a/dev-php/PEAR-PEAR/files/pear.conf-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-#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:PHPCLILEN:"PHPCLI";s:9:"cache_dir";s:CACHEDIRLEN:"CACHEDIR";s:12:"download_dir";s:DOWNLOADDIRLEN:"DOWNLOADDIR";s:8:"temp_dir";s:TEMPDIRLEN:"TEMPDIR";}
\ No newline at end of file