gentoo auto-resync : 05:12:2022 - 21:07:33

4 files changed, 104 insertions, 0 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 6e6ae0975bdd..f2662264e18f 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-Mail/Manifest b/dev-php/PEAR-Mail/Manifest
index f66eb97fc500..2034e0b8a612 100644
--- a/dev-php/PEAR-Mail/Manifest
+++ b/dev-php/PEAR-Mail/Manifest
@@ -1,3 +1,6 @@
+AUX PEAR-Mail-1.5.0-fix-tests.patch 3054 BLAKE2B c320170667466461e3b31ec7565b229396ad9d79e7618fd6f69cd116334055bfd89f17439d12ab73df660f080405b83eb7f433223bc63778c61c9c29151566cd SHA512 b6c0871dfe1b5018f11b71eecd5ac9cd329ff23c31a6634764ea0686c690f647ffa7df9a6bb18de3dfd718fe19aafb60223d43dc92130ab24f1986d4e5babb02
 DIST Mail-1.4.1.tgz 21756 BLAKE2B 247df343a7b09760501918681cadc3a649ff9f2bd9974aa714a3661e64af6f1503edeb8ef0030f0ce113c43467cada3e7d62c6a60e751b5c8e6980c14f97fdbb SHA512 851fa64bcf042fba58a70833c12ec5d7af6382e14e6157eeeb5be51b22cdfa5677c5d1eeba8c1f9eef6d55c2d732a4d5d6ea28c726aef232b233c170f7b82307
+DIST Mail-1.5.0.tgz 23221 BLAKE2B fad07a2cbf2188f6f0dea3705ca5bd72d05505e2a9968f2b43c94045027e2506941e17854ef13cf65bc2ff99218e3663b0859e93563036bcbefa7911cc4f2b84 SHA512 07462b920a879182cb06576c6c91a52d1c0411afcefe9d701ae57633eb28cc0f08f163e9b808c00c38cfd7e886fc17ac4e7151dfda5905396b7819b365afa919
 EBUILD PEAR-Mail-1.4.1-r1.ebuild 473 BLAKE2B 8d82c172aaf9b26b7964913d8fd002e9285fb63688b4bb55afe80ffaff659eed912cc5d02f9f372f692ebd02a26e455348334d8490899e5d225614270e3b1466 SHA512 0a5e1303a430ac4b19d7041dcee129a381d6c0dcc1f85433e7acd3132e2c707ad0e3c397545ef7360583e373a4199d80d97bd90445abc4df56a17e04a9b1423b
+EBUILD PEAR-Mail-1.5.0.ebuild 664 BLAKE2B e227a1f191e10d5791182e2b218eb91f8e521deef28ac997d7bfe309c295eb4bf54429b943e32447a6c12b729c8c9583eb6d74441fcf637f02586e2971b28930 SHA512 c4b5aec829e850251b15c8816696beaf00b51199fabe65f543abf43aad2d523240e44e98c2f1a1e5d7e48e9379e1cd0eca26d22581c39e9209e184b98863170e
 MISC metadata.xml 307 BLAKE2B 9b7c04a9bb3999ba81a62188088b91ac72df01e84bb7c835115ee579bbc752b905291ecf5b0eaccb15c4b9ff7973027b1b4c6fc85d1ae61348ce1e43f60a1b3e SHA512 f0fc14d46ccec644e624ec3c39deed1b758ab50e707ea63221fc4594c6ce79e584c76981a8695f292ef0cd0576cde3542e37035a105bf6b24f855ccb63022fe5
diff --git a/dev-php/PEAR-Mail/PEAR-Mail-1.5.0.ebuild b/dev-php/PEAR-Mail/PEAR-Mail-1.5.0.ebuild
new file mode 100644
index 000000000000..a6b279e7630b
--- /dev/null
+++ b/dev-php/PEAR-Mail/PEAR-Mail-1.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit php-pear-r2 edos2unix
+
+DESCRIPTION="Class that provides multiple interfaces for sending emails"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-php/PEAR-Net_SMTP-1.4.1"
+BDEPEND="test? ( ${RDEPEND} dev-php/PEAR-PEAR )"
+
+src_prepare() {
+	# test files are DOS line-endings and default patch strips without this line
+	patch -p1 --binary < "${FILESDIR}/PEAR-Mail-1.5.0-fix-tests.patch"
+	default
+}
+
+src_test() {
+	peardev run-tests tests || die
+}
diff --git a/dev-php/PEAR-Mail/files/PEAR-Mail-1.5.0-fix-tests.patch b/dev-php/PEAR-Mail/files/PEAR-Mail-1.5.0-fix-tests.patch
new file mode 100644
index 000000000000..121d2299206e
--- /dev/null
+++ b/dev-php/PEAR-Mail/files/PEAR-Mail-1.5.0-fix-tests.patch
@@ -0,0 +1,74 @@
+diff --git a/tests/9137.phpt b/tests/9137.phpt

+index ba54c05..2e4c0a5 100644

+--- a/tests/9137.phpt

++++ b/tests/9137.phpt

+@@ -18,7 +18,8 @@ for ($i = 0; $i < count($addresses); $i++) {

+     $address = "\"" . addslashes($addresses[$i]['name']) . "\" ".

+         "<".$addresses[$i]['email'].">";

+ 

+-    $parsedAddresses = Mail_RFC822::parseAddressList($address);

++    $parser = new Mail_RFC822();

++    $parsedAddresses = $parser->parseAddressList($address);

+     if (is_a($parsedAddresses, 'PEAR_Error')) {

+         echo $address." :: Failed to validate\n";

+     } else {

+diff --git a/tests/9137_2.phpt b/tests/9137_2.phpt

+index cc9dcbc..9c3c32d 100644

+--- a/tests/9137_2.phpt

++++ b/tests/9137_2.phpt

+@@ -18,7 +18,8 @@ $addresses = array(

+ for ($i = 0; $i < count($addresses); $i++) {

+     // construct the address

+     $address = $addresses[$i]['raw'];

+-    $parsedAddresses = Mail_RFC822::parseAddressList($address);

++    $parser = new Mail_RFC822();

++    $parsedAddresses = $parser->parseAddressList($address);

+     if (PEAR::isError($parsedAddresses)) {

+         echo $address." :: Failed to validate\n";

+     } else {

+diff --git a/tests/bug17178.phpt b/tests/bug17178.phpt

+index 4572dda..425f329 100644

+--- a/tests/bug17178.phpt

++++ b/tests/bug17178.phpt

+@@ -4,7 +4,8 @@ Mail_RFC822::parseAddressList does not accept RFC-valid group syntax

+ <?php

+ require "Mail/RFC822.php";

+ 

+-var_dump(Mail_RFC822::parseAddressList("empty-group:;","invalid",false,false)); 

++$parser = new Mail_RFC822();

++var_dump($parser->parseAddressList("empty-group:;","invalid",false,false));

+ 

+ --EXPECT--

+ array(0) {

+diff --git a/tests/bug17317.phpt b/tests/bug17317.phpt

+index 331e803..045a939 100644

+--- a/tests/bug17317.phpt

++++ b/tests/bug17317.phpt

+@@ -4,9 +4,10 @@ Mail_RFC822::parseAddressList invalid periods in mail address

+ <?php

+ require "Mail/RFC822.php";

+ 

+-$result[] = Mail_RFC822::parseAddressList('.name@example.com');

+-$result[] = Mail_RFC822::parseAddressList('name.@example.com');

+-$result[] = Mail_RFC822::parseAddressList('name..name@example.com');

++$parser = new Mail_RFC822();

++$result[] = $parser->parseAddressList('.name@example.com');

++$result[] = $parser->parseAddressList('name.@example.com');

++$result[] = $parser->parseAddressList('name..name@example.com');

+ 

+ foreach ($result as $r) {

+     if (is_a($r, 'PEAR_Error')) {

+diff --git a/tests/validateQuotedString.phpt b/tests/validateQuotedString.phpt

+index 8b892bd..e0adb79 100644

+--- a/tests/validateQuotedString.phpt

++++ b/tests/validateQuotedString.phpt

+@@ -5,7 +5,8 @@ Mail_RFC822::parseAddressList simple tests

+ require_once 'Mail/RFC822.php';

+ $address_string = '"Joe Doe \(from Somewhere\)" <doe@example.com>, postmaster@example.com, root';

+ 

+-$address_array = Mail_RFC822::parseAddressList($address_string, "example.com");

++$parser = new Mail_RFC822();

++$address_array = $parser->parseAddressList($address_string, "example.com");

+ 

+ foreach ($address_array as $val) {

+     echo "mailbox : " . $val->mailbox . "\n";