From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1426146-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id D1A35158094
for <garchives@archives.gentoo.org>; Tue, 9 Aug 2022 07:12:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 31757E0C2A;
Tue, 9 Aug 2022 07:12:29 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0A4DFE0C2F
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Aug 2022 07:12:28 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 130DB340D38
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Aug 2022 07:12:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 64888569
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Aug 2022 07:12:26 +0000 (UTC)
From: "Jakov Smolić" <jsmolic@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Jakov Smolić" <jsmolic@gentoo.org>
Message-ID: <1660029100.ed1e3e3e8d7a610fafe873075454b35a2079b04a.jsmolic@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-geoip/, dev-php/pecl-geoip/files/, profiles/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-php/pecl-geoip/Manifest dev-php/pecl-geoip/files/fix-failing-tests-1.1.1.patch dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch dev-php/pecl-geoip/files/php8-support-1.1.1.patch dev-php/pecl-geoip/metadata.xml dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild profiles/package.mask
X-VCS-Directories: profiles/ dev-php/pecl-geoip/files/ dev-php/pecl-geoip/
X-VCS-Committer: jsmolic
X-VCS-Committer-Name: Jakov Smolić
X-VCS-Revision: ed1e3e3e8d7a610fafe873075454b35a2079b04a
X-VCS-Branch: master
Date: Tue, 9 Aug 2022 07:12:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: fbba5ab7-0063-46c8-8f24-1db16c0ebdbe
X-Archives-Hash: cc2a4ba565664b082461db035c7c4332
commit: ed1e3e3e8d7a610fafe873075454b35a2079b04a
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 9 07:11:40 2022 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Aug 9 07:11:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed1e3e3e
dev-php/pecl-geoip: treeclean
Closes: https://bugs.gentoo.org/857636
Closes: https://bugs.gentoo.org/526244
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
dev-php/pecl-geoip/Manifest | 1 -
.../pecl-geoip/files/fix-failing-tests-1.1.1.patch | 46 -----------
.../files/fix-failing-tests-php8-1-1.1.1.patch | 71 -----------------
dev-php/pecl-geoip/files/php8-support-1.1.1.patch | 93 ----------------------
dev-php/pecl-geoip/metadata.xml | 8 --
dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild | 22 -----
dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild | 26 ------
profiles/package.mask | 7 --
8 files changed, 274 deletions(-)
diff --git a/dev-php/pecl-geoip/Manifest b/dev-php/pecl-geoip/Manifest
deleted file mode 100644
index 40aaf1667795..000000000000
--- a/dev-php/pecl-geoip/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST geoip-1.1.1.tgz 13004 BLAKE2B fe073b9459c434751ea0291ce6802041db47254f9d2d5b930db51751b3a66ce5cf925dc4bd07764920748b1735f26ba8bd136654e08ed9c24ac3b520e842f45d SHA512 395715297726aa8e7ed71297d403bea9cb08417a03adfca29dc6ea68bbc738c176f71ea621f9026109e07cd5a2adc647e2af8e140e18a6af1c8f0fe4ed1a9c6b
diff --git a/dev-php/pecl-geoip/files/fix-failing-tests-1.1.1.patch b/dev-php/pecl-geoip/files/fix-failing-tests-1.1.1.patch
deleted file mode 100644
index a86994708e7b..000000000000
--- a/dev-php/pecl-geoip/files/fix-failing-tests-1.1.1.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-On Gentoo, we require users to download the GeoIP databases
-themselves. As a result, the databases may not be there when
-installing pecl-geoip. The first patch below skips a test if the
-database it uses is not present. The second patch disables 019.phpt
-completely, because I can't make it pass.
-
-PHP-Bug: 73416
-
-diff --git a/tests/001.phpt b/tests/001.phpt
-index a548d6e..c0e4972 100644
---- a/tests/001.phpt
-+++ b/tests/001.phpt
-@@ -1,7 +1,10 @@
- --TEST--
- Checking Country (Free) DB availability
- --SKIPIF--
--<?php if (!extension_loaded("geoip")) print "skip"; ?>
-+<?php
-+if (!extension_loaded("geoip")) print "skip";
-+if (!file_exists(geoip_db_filename(GEOIP_COUNTRY_EDITION))) print "skip";
-+?>
- --POST--
- --GET--
- --FILE--
-diff --git a/tests/019.phpt b/tests/019.phpt
-deleted file mode 100644
-index 4630354..0000000
---- a/tests/019.phpt
-+++ /dev/null
-@@ -1,15 +0,0 @@
----TEST--
--Checking geoip_setup_custom_directory() (with trailing slash)
----SKIPIF--
--<?php if (!extension_loaded("geoip")) print "skip"; ?>
----INI--
--geoip.custom_directory="/test/"
----FILE--
--<?php
--
--var_dump( geoip_country_name_by_name_v6('0000:0000:0000:0000') );
--
--?>
----EXPECT--
--string(27) "/some/other/place/GeoIP.dat"
--string(6) "/test/"
-\ No newline at end of file
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
deleted file mode 100644
index a2f8353b438c..000000000000
--- a/dev-php/pecl-geoip/files/fix-failing-tests-php8-1-1.1.1.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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
- <?php
-
- var_dump(geoip_time_zone_by_country_and_region('US','MA'));
--var_dump(geoip_time_zone_by_country_and_region('US',NULL));
-+var_dump(geoip_time_zone_by_country_and_region('US',''));
- var_dump(geoip_time_zone_by_country_and_region('DE'));
--var_dump(geoip_time_zone_by_country_and_region(NULL,''));
--var_dump(geoip_time_zone_by_country_and_region(NULL,NULL));
-+var_dump(geoip_time_zone_by_country_and_region('',''));
-
- ?>
- --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
- <?php
-
- var_dump(geoip_region_name_by_code('CA',''));
--var_dump(geoip_region_name_by_code('CA',NULL));
- var_dump(geoip_region_name_by_code('CA',1));
- var_dump(geoip_region_name_by_code('','QC'));
--var_dump(geoip_region_name_by_code(NULL,'QC'));
- var_dump(geoip_region_name_by_code(1,'QC'));
-
- ?>
-@@ -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--
-+<?php if (!extension_loaded("geoip") || !defined("GEOIP_COUNTRY_EDITION_V6") || !geoip_db_avail(GEOIP_COUNTRY_EDITION_V6)) print "skip"; ?>
-+--INI--
-+--FILE--
-+<?php
-+
-+var_dump( geoip_country_code_by_name_v6('2001:4860:4860::8888') );
-+
-+?>
-+--EXPECT--
-+string(2) "US"
diff --git a/dev-php/pecl-geoip/files/php8-support-1.1.1.patch b/dev-php/pecl-geoip/files/php8-support-1.1.1.patch
deleted file mode 100644
index 50c53d1a94a7..000000000000
--- a/dev-php/pecl-geoip/files/php8-support-1.1.1.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- a/geoip.c 2020/10/30 12:04:28 351081
-+++ b/geoip.c 2020/10/30 12:51:07 351082
-@@ -34,41 +34,72 @@
- #include "ext/standard/info.h"
- #include "php_geoip.h"
-
--
-+/* For PHP 8 */
-+#ifndef TSRMLS_CC
-+#define TSRMLS_CC
-+#endif
-
- ZEND_DECLARE_MODULE_GLOBALS(geoip)
-
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_void, 0, 0, 0)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_database_opt, 0, 0, 0)
-+ ZEND_ARG_INFO(0, database)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_database, 0, 0, 1)
-+ ZEND_ARG_INFO(0, database)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_host, 0, 0, 1)
-+ ZEND_ARG_INFO(0, host)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_region, 0, 0, 2)
-+ ZEND_ARG_INFO(0, country_code)
-+ ZEND_ARG_INFO(0, region_code)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO_EX(arginfo_geoip_directory, 0, 0, 1)
-+ ZEND_ARG_INFO(0, directory)
-+ZEND_END_ARG_INFO()
-+
- static int le_geoip;
-
- /* {{{ */
- zend_function_entry geoip_functions[] = {
-- PHP_FE(geoip_database_info, NULL)
-+ PHP_FE(geoip_database_info, arginfo_geoip_database_opt)
- #define GEOIPDEF(php_func, c_func, db_type) \
-- PHP_FE(php_func, NULL)
-+ PHP_FE(php_func, arginfo_geoip_host)
- #include "geoip.def"
- #undef GEOIPDEF
-- PHP_FE(geoip_continent_code_by_name, NULL)
-- PHP_FE(geoip_org_by_name, NULL)
-- PHP_FE(geoip_record_by_name, NULL)
-- PHP_FE(geoip_id_by_name, NULL)
-- PHP_FE(geoip_region_by_name, NULL)
-- PHP_FE(geoip_isp_by_name, NULL)
-- PHP_FE(geoip_db_avail, NULL)
-- PHP_FE(geoip_db_get_all_info, NULL)
-- PHP_FE(geoip_db_filename, NULL)
-+ PHP_FE(geoip_continent_code_by_name, arginfo_geoip_host)
-+ PHP_FE(geoip_org_by_name, arginfo_geoip_host)
-+ PHP_FE(geoip_record_by_name, arginfo_geoip_host)
-+ PHP_FE(geoip_id_by_name, arginfo_geoip_host)
-+ PHP_FE(geoip_region_by_name, arginfo_geoip_host)
-+ PHP_FE(geoip_isp_by_name, arginfo_geoip_host)
-+ PHP_FE(geoip_db_avail, arginfo_geoip_database)
-+ PHP_FE(geoip_db_get_all_info, arginfo_geoip_void)
-+ PHP_FE(geoip_db_filename, arginfo_geoip_database)
- #if LIBGEOIP_VERSION >= 1004001
-- PHP_FE(geoip_region_name_by_code, NULL)
-- PHP_FE(geoip_time_zone_by_country_and_region, NULL)
-+ PHP_FE(geoip_region_name_by_code, arginfo_geoip_region)
-+ PHP_FE(geoip_time_zone_by_country_and_region, arginfo_geoip_region)
- #endif
- #ifdef HAVE_CUSTOM_DIRECTORY
-- PHP_FE(geoip_setup_custom_directory, NULL)
-+ PHP_FE(geoip_setup_custom_directory, arginfo_geoip_directory)
- #endif
-- PHP_FE(geoip_asnum_by_name, NULL)
-- PHP_FE(geoip_domain_by_name, NULL)
-+ PHP_FE(geoip_asnum_by_name, arginfo_geoip_host)
-+ PHP_FE(geoip_domain_by_name, arginfo_geoip_host)
- #if LIBGEOIP_VERSION >= 1004008
-- PHP_FE(geoip_netspeedcell_by_name, NULL)
-+ PHP_FE(geoip_netspeedcell_by_name, arginfo_geoip_host)
- #endif
-+#ifdef PHP_FE_END
-+ PHP_FE_END
-+#else
- {NULL, NULL, NULL}
-+#endif
- };
- /* }}} */
-
diff --git a/dev-php/pecl-geoip/metadata.xml b/dev-php/pecl-geoip/metadata.xml
deleted file mode 100644
index 222c77f3742a..000000000000
--- a/dev-php/pecl-geoip/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>php-bugs@gentoo.org</email>
- <name>PHP</name>
- </maintainer>
-</pkgmetadata>
diff --git a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild b/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
deleted file mode 100644
index 9b8d00516a8d..000000000000
--- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="geoip"
-DOCS="README ChangeLog"
-USE_PHP="php7-2 php7-3 php7-4"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="PHP extension to map IP address to geographic places"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/geoip"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/fix-failing-tests-1.1.1.patch" )
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
deleted file mode 100644
index d7d644983bb4..000000000000
--- a/dev-php/pecl-geoip/pecl-geoip-1.1.1-r5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PHP_EXT_NAME="geoip"
-DOCS="README ChangeLog"
-USE_PHP="php7-3 php7-4 php8-0 php8-1"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="PHP extension to map IP address to geographic places"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-libs/geoip"
-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"
-)
diff --git a/profiles/package.mask b/profiles/package.mask
index 15577ff6c56f..f14407800a74 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -491,13 +491,6 @@ x11-libs/gtk+extra
# Bug #830581, removal on 2022-08-10.
dev-libs/ucommon
-# Brian Evans <grknight@gentoo.org> (2022-07-11)
-# The database behind this extension is no longer available
-# Please migrate to dev-php/maxmind-db-reader optionally with its
-# bundled extension. Bug 857636
-# Removal on 2022-08-10.
-dev-php/pecl-geoip
-
# Fabian Groffen <grobian@gentoo.org> (2022-07-02)
# Segfaults handling SPF validations (warn on permerror), like the
# previous release, better not to trust your important mail to