From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 82783139694 for ; Sun, 19 Mar 2017 14:52:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CDC5921C1CF; Sun, 19 Mar 2017 14:52:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9718F21C1CF for ; Sun, 19 Mar 2017 14:52:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 34C1B34155D for ; Sun, 19 Mar 2017 14:52:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 66D406DB8 for ; Sun, 19 Mar 2017 14:52:00 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1489935105.8d6aece75f1c584f09d7a84395982d0a9521f740.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-Text_CAPTCHA/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-php/PEAR-Text_CAPTCHA/PEAR-Text_CAPTCHA-1.0.2-r1.ebuild dev-php/PEAR-Text_CAPTCHA/PEAR-Text_CAPTCHA-1.0.2.ebuild X-VCS-Directories: dev-php/PEAR-Text_CAPTCHA/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 8d6aece75f1c584f09d7a84395982d0a9521f740 X-VCS-Branch: master Date: Sun, 19 Mar 2017 14:52:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1769807d-5aba-451b-bebb-e73759f98996 X-Archives-Hash: 8118645c5b4827f1f1e11c4c41784280 commit: 8d6aece75f1c584f09d7a84395982d0a9521f740 Author: Brian Evans gentoo org> AuthorDate: Sun Mar 19 14:51:45 2017 +0000 Commit: Brian Evans gentoo org> CommitDate: Sun Mar 19 14:51:45 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6aece7 dev-php/PEAR-Text_CAPTCHA: Revbump to fix WORKDIR wrt bug 613122 Package-Manager: Portage-2.3.5, Repoman-2.3.2 .../PEAR-Text_CAPTCHA-1.0.2-r1.ebuild | 27 +++++++++++++ .../PEAR-Text_CAPTCHA-1.0.2.ebuild | 47 ---------------------- 2 files changed, 27 insertions(+), 47 deletions(-) diff --git a/dev-php/PEAR-Text_CAPTCHA/PEAR-Text_CAPTCHA-1.0.2-r1.ebuild b/dev-php/PEAR-Text_CAPTCHA/PEAR-Text_CAPTCHA-1.0.2-r1.ebuild new file mode 100644 index 00000000000..39b7c17d0ab --- /dev/null +++ b/dev-php/PEAR-Text_CAPTCHA/PEAR-Text_CAPTCHA-1.0.2-r1.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit php-pear-r2 + +DESCRIPTION="Generation of CAPTCHAs" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="minimal" + +RDEPEND="dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[gd,truetype] >=dev-php/PEAR-Text_Password-1.1.1 + !minimal? ( dev-php/PEAR-Numbers_Words + dev-php/PEAR-Text_Figlet + >=dev-php/PEAR-Image_Text-0.7.0 )" + +src_prepare() { + sed -i -e '/role="doc"/d' -e '/role="test"/d' "${WORKDIR}/package.xml" || die + eapply_user +} + +src_install() { + local DOCS=( README ) + php-pear-r2_src_install +} diff --git a/dev-php/PEAR-Text_CAPTCHA/PEAR-Text_CAPTCHA-1.0.2.ebuild b/dev-php/PEAR-Text_CAPTCHA/PEAR-Text_CAPTCHA-1.0.2.ebuild deleted file mode 100644 index 5aea29b1335..00000000000 --- a/dev-php/PEAR-Text_CAPTCHA/PEAR-Text_CAPTCHA-1.0.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PN="${PN/PEAR-/}" -MY_P="${MY_PN}-${PV}" - -HOMEPAGE="http://pear.php.net/package/${MY_PN}" -SRC_URI="http://pear.php.net/get/${MY_P}.tgz" -DESCRIPTION="Generation of CAPTCHAs" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="minimal" - -RDEPEND="dev-php/PEAR-PEAR >=dev-lang/php-5.3:*[gd,truetype] >=dev-php/PEAR-Text_Password-1.1.1 - !minimal? ( dev-php/PEAR-Numbers_Words - dev-php/PEAR-Text_Figlet - >=dev-php/PEAR-Image_Text-0.7.0 )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default_src_prepare - sed -i -e '/role="doc"/d' -e '/role="test"/d' "${WORKDIR}/package.xml" || die -} - -src_install() { - local DOCS=( README ) - insinto /usr/share/php - doins -r Text - einstalldocs -} - -pkg_postinst() { - # Register the package from the package.xml file - # Operation is not critical so die is not required - if [[ -f "${WORKDIR}/package.xml" ]] ; then - "${EROOT}usr/bin/peardev" install -nrO --force "${WORKDIR}/package.xml" 2> /dev/null - fi -} - -pkg_postrm() { - # Uninstall known dependency - "${EROOT}usr/bin/peardev" uninstall -nrO "pear.php.net/${MY_PN}" -}