From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- dev-php/pecl-geoip/Manifest | 3 +- .../files/fix-failing-tests-php8-1-1.1.1.patch | 71 ++++++++++++++++++++++ dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild | 7 ++- 3 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch (limited to 'dev-php/pecl-geoip') diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest index 12e0934e2fcc..7f26aa0a4d01 100644 --- a/dev-php/pecl-geoip/Manifest +++ b/dev-php/pecl-geoip/Manifest @@ -1,6 +1,7 @@ AUX fix-failing-tests-1.1.1.patch 1250 BLAKE2B 587561ec400fe54b21333d09d2ad721b66c321de5a9c1823c0cb9706e63c41a24f81e53eb9fb92bc1f33bc867e141e8f29c26abc1452058dc387d29a53b0c7bc SHA512 9e3c93b337c38feaec29001a5a5b243f376bc7a32caaafa848b51daa3f0efbdecf407de6c8f304801ad106aa0e4906513588c42aa19bc6d5b261ccd6cb00b652 +AUX fix-failing-tests-php8-1-1.1.1.patch 2463 BLAKE2B 8afb78f9e4c6c6c0cc7935401f1376c3bdcd587b1d84ddc7511c5d16dc97623c63115fca4e7fd05c13c932b7a9df9202645185b303abd372348571aaf7ec55c0 SHA512 138ab76ebd9526fa795c7122d10496b790a0a1c35f52942f3b90a59e59522d32a6109648913e0cacf83dea0f7e72919558346acd759c275b113bdba868b4daf9 AUX php8-support-1.1.1.patch 3017 BLAKE2B a3a200c6f9b081a1776a39a11cbcc1d547b5a1fa945e13436175e3e4834e5e83ad5980ed8b5d0e0b2f3c6fc31d8011a995cba98e3681ea2be22df55391767026 SHA512 80e234a37deb2a5ba075979aacb5f4a343ff2e938b42e398b1cb8fe98cc13cc70a2b9b1118e155a4ebc80783743e2f85ad09b1d48735112e807e902095d92035 DIST geoip-1.1.1.tgz 13004 BLAKE2B fe073b9459c434751ea0291ce6802041db47254f9d2d5b930db51751b3a66ce5cf925dc4bd07764920748b1735f26ba8bd136654e08ed9c24ac3b520e842f45d SHA512 395715297726aa8e7ed71297d403bea9cb08417a03adfca29dc6ea68bbc738c176f71ea621f9026109e07cd5a2adc647e2af8e140e18a6af1c8f0fe4ed1a9c6b EBUILD pecl-geoip-1.1.1-r4.ebuild 439 BLAKE2B bc68853acc3e32b5a5e5f2b1c0485d346a93a7976735aaa8cbf0e9a94cacb7185083d89f670a8200167254d764d8255dceae1d5be14aaac593c2731f33f9a2f5 SHA512 2dfb9075f54995b439bf67642d2babb448d271c6cde649e8302e4ca7f51c1f5a029114a923131ec1c7c6699428db5128256fb382e6e911fd2e0ab87cc7748f6e -EBUILD pecl-geoip-1.1.1-r5.ebuild 489 BLAKE2B 33b7073fe499d84d64df5dd07139a350e60bef86bd9f3bae5db8854faeb8a36c2c7286dabd3bcd9b3b53da63da3128aed44246631e70e26eb4efb8390b9c1472 SHA512 9cec410429e6ed5f24d55e71aa7b8a62cd722952acdfced25f0f97e006acc5d81a0b2d976bb67200709665b65a0f17770a7ba7d01ce3846a3a0914134ebb8974 +EBUILD pecl-geoip-1.1.1-r5.ebuild 541 BLAKE2B 13808da76505886faf7f8a32fc009795e58dacc3ce9a878f586abefb31c37cdfea1a97574d49923272378f52690fbdbaba4dffaa9418d3b695f330ad5e2556b1 SHA512 207605da880c707e3b7ec25e59ba2b3e1d239d9bcc72c82860ef32719b3017a84194d07a56ee8292a2238482b469d46fd2cb721292cd9fd67d4d674e3ec22d57 MISC metadata.xml 240 BLAKE2B f60f325331d493a555e53c29c7cf2742a415356da28a467505f1441f3fd790fd0d59050df84854bdc379d19d94a46121216479807975a2922d5a2fefde83416b SHA512 fada9d69055f2be962b95aac82f260ec5db7a3f4392d10f0458a1d125938fa17539f7ec486000f3a95cff85a3fbb6bbf1f6f4fe6c2de7aa420a7543a3e89d03e diff --git a/dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch b/dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch new file mode 100644 index 000000000000..a2f8353b438c --- /dev/null +++ b/dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch @@ -0,0 +1,71 @@ +diff --git a/tests/014.phpt b/tests/014.phpt +index 40f3ef8..93bc1f7 100644 +--- a/tests/014.phpt ++++ b/tests/014.phpt +@@ -8,10 +8,9 @@ Checking timezone info with (some) empty fields + + --EXPECTF-- +@@ -21,6 +20,3 @@ string(%d) "Europe/%s" + + Warning: geoip_time_zone_by_country_and_region(): You need to specify at least the country code. in %s on line %d + bool(false) +- +-Warning: geoip_time_zone_by_country_and_region(): You need to specify at least the country code. in %s on line %d +-bool(false) +diff --git a/tests/016.phpt b/tests/016.phpt +index 83c5250..9b2f056 100644 +--- a/tests/016.phpt ++++ b/tests/016.phpt +@@ -8,10 +8,8 @@ Checking geoip_region_name_by_code with (some) empty fields + +@@ -19,12 +17,6 @@ var_dump(geoip_region_name_by_code(1,'QC')); + + Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d + bool(false) +- +-Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d +-bool(false) +-bool(false) +- +-Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d + bool(false) + + Warning: geoip_region_name_by_code(): You need to specify the country and region codes. in %s on line %d +diff --git a/tests/019.phpt b/tests/019.phpt +new file mode 100644 +index 0000000..9493ea3 +--- /dev/null ++++ b/tests/019.phpt +@@ -0,0 +1,13 @@ ++--TEST-- ++Checking geoip_country_code_by_name_v6 (if IPv6 DB installed) ++--SKIPIF-- ++ ++--INI-- ++--FILE-- ++ ++--EXPECT-- ++string(2) "US" diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild index f5bbf1f24038..d7d644983bb4 100644 --- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild +++ b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PHP_EXT_NAME="geoip" DOCS="README ChangeLog" -USE_PHP="php7-2 php7-3 php7-4 php8-0" +USE_PHP="php7-3 php7-4 php8-0 php8-1" inherit php-ext-pecl-r3 @@ -22,4 +22,5 @@ RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/fix-failing-tests-1.1.1.patch" "${FILESDIR}/php8-support-1.1.1.patch" + "${FILESDIR}/fix-failing-tests-php8-1-1.1.1.patch" ) -- cgit v1.2.3