gentoo resync : 15.02.2018

3 files changed, 43 insertions, 0 deletions

diff --git a/dev-php/PEAR-Validate/Manifest b/dev-php/PEAR-Validate/Manifest
index 671bb6825302..a69ffa26ee17 100644
--- a/dev-php/PEAR-Validate/Manifest
+++ b/dev-php/PEAR-Validate/Manifest
@@ -1,3 +1,5 @@
+AUX 0.8.5-fix-test-php7.patch 905 BLAKE2B 5d000b990cd38d697af861ff828f2e9efd8fdef0e2a6fec87fbc60208c1a9f40686c5c0be63cdf862221311f235f87bccb975cf78bb4d5f2b03be6916d3899bb SHA512 44aa6cb09f19ad3246bc7e6d825de786139da433564b902bfff020be52b14f554f752f0ca7f790d378a74a3a62e15cf13383a9bff25db2f67e4496d5bcef5e7b
 DIST Validate-0.8.5.tgz 21668 BLAKE2B 5f1897f9a796bab047beb7bdcf79726f58f069874cb1d08a17078c8d974bed626b3e37dd792e8b941fd0115d9060986278d459037580adedf6088ef51d5f2c13 SHA512 4e2e330b0a74a24d18af262ef42d872ab9eb2386e11c5647d898c60e11a29d06c97c0295cdf0999c3a4805f3f1efae2949c54520da50cf6adfcc5a6c4f6e1b63
+EBUILD PEAR-Validate-0.8.5-r1.ebuild 549 BLAKE2B 6d7ba004da69f7dbb3b61e1e4f1cf82ce93e4114bb053c749b85206bb1743a1e516c4b2e3bf3416e82533e4fe94af7e423eefb639848c892b18998a66c6c71a6 SHA512 5e54805118a4b2f3d40d79a91e62d3ea5731ca0cb2690363921a7d189629f8b6ffb0c4612b44ba2a733dfa6d147a31804c70e0d28ad1e38084399a07f872e5a2
 EBUILD PEAR-Validate-0.8.5.ebuild 290 BLAKE2B fa9926af4fc63048b70691fea65f6e29f8452b11b169c86824c356a8d413b82587656aca2eba1732675166c42b8fc65e80ed93b89d7aca9aac25097954f58395 SHA512 7fa9c4dc4f9f0e052923c492f4f431c7f74411beba76b3bb3e5c87c6b82ca22bad7664b2b2def9f64c221c7618dce4ee690e0fb7a73ef11c55d337f8cbec96d2
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
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 000000000000..e8e5e342cc58
--- /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 000000000000..069c5467d049
--- /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 <cweiske@cweiske.de>
+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;
+                 }