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 C855E1382C5 for ; Wed, 14 Feb 2018 17:53:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C0F3E0BAB; Wed, 14 Feb 2018 17:53:02 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CF1E5E0BAB for ; Wed, 14 Feb 2018 17:53:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CE94335C0A for ; Wed, 14 Feb 2018 17:53:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 443AA1E6 for ; Wed, 14 Feb 2018 17:52:56 +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: <1518630757.852388e03888fafa383aaede9c8c564a6189344b.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/PEAR-Validate/files/, dev-php/PEAR-Validate/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild dev-php/PEAR-Validate/files/0.8.5-fix-test-php7.patch X-VCS-Directories: dev-php/PEAR-Validate/files/ dev-php/PEAR-Validate/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 852388e03888fafa383aaede9c8c564a6189344b X-VCS-Branch: master Date: Wed, 14 Feb 2018 17:52:56 +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: 23f0ed40-9b7e-467a-869b-4de2265bdf28 X-Archives-Hash: c8da6a25a425e3a6d4ca90a1b8e6758a commit: 852388e03888fafa383aaede9c8c564a6189344b Author: Brian Evans gentoo org> AuthorDate: Wed Feb 14 17:52:37 2018 +0000 Commit: Brian Evans gentoo org> CommitDate: Wed Feb 14 17:52:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=852388e0 dev-php/PEAR-Validate: Revbump for EAPI, eclass changes and add tests Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild | 22 ++++++++++++++++++++++ .../PEAR-Validate/files/0.8.5-fix-test-php7.patch | 19 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild new file mode 100644 index 00000000000..e8e5e342cc5 --- /dev/null +++ b/dev-php/PEAR-Validate/PEAR-Validate-0.8.5-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit php-pear-r2 + +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" + +DESCRIPTION="Validation class" +LICENSE="BSD" +SLOT="0" +IUSE="minimal test" + +DEPEND="test? ( dev-php/PEAR-PEAR dev-php/PEAR-Date )" +RDEPEND="!minimal? ( dev-php/PEAR-Date )" +PATCHES=( "${FILESDIR}/0.8.5-fix-test-php7.patch" ) +HTML_DOCS=( docs/Example_Locale.php docs/sample_multiple.php ) + +src_test() { + peardev run-tests tests || die +} diff --git a/dev-php/PEAR-Validate/files/0.8.5-fix-test-php7.patch b/dev-php/PEAR-Validate/files/0.8.5-fix-test-php7.patch new file mode 100644 index 00000000000..069c5467d04 --- /dev/null +++ b/dev-php/PEAR-Validate/files/0.8.5-fix-test-php7.patch @@ -0,0 +1,19 @@ +From a22b5cf2c7e4b4cf366c311150721961d9b456ea Mon Sep 17 00:00:00 2001 +From: Christian Weiske +Date: Thu, 16 Jul 2015 00:38:55 +0200 +Subject: [PATCH] Make tests run on PHP 7 + +diff --git a/Validate.php b/Validate.php +index a8f621c..ea6cfa7 100644 +--- a/Validate.php ++++ b/Validate.php +@@ -583,7 +583,8 @@ function email($email, $options = null) + if ($use_rfc822? Validate::__emailRFC822($email, $options) : + preg_match($regex, $email)) { + if ($check_domain && function_exists('checkdnsrr')) { +- $domain = preg_replace('/[^-a-z.0-9]/i', '', array_pop(explode('@', $email))); ++ $parts = explode('@', $email); ++ $domain = preg_replace('/[^-a-z.0-9]/i', '', array_pop($parts)); + if (checkdnsrr($domain, 'MX') || checkdnsrr($domain, 'A')) { + return true; + }