commit: 29003f76857b8fd6a6ea055e79b7b7014a703ccf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 13:07:53 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 15:09:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29003f76
dev-php/PEAR-Net_IPv4: drop 1.3.4-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-php/PEAR-Net_IPv4/Manifest | 1 -
.../PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild | 15 ----
dev-php/PEAR-Net_IPv4/files/remove_globals.patch | 96 ----------------------
3 files changed, 112 deletions(-)
diff --git a/dev-php/PEAR-Net_IPv4/Manifest b/dev-php/PEAR-Net_IPv4/Manifest
index d81abbd04a36..11c3b81b22f5 100644
--- a/dev-php/PEAR-Net_IPv4/Manifest
+++ b/dev-php/PEAR-Net_IPv4/Manifest
@@ -1,2 +1 @@
-DIST Net_IPv4-1.3.4.tgz 5981 BLAKE2B
5002a06d30443cf809346351a6c57c1faf1be0e6531fc0c7609ad6a9575122c53fa1c3f2e6614b77401adcfcdc604ee6b8ce5538d92aa8f42e8bf709899a0cba
SHA512
6b172e3d998232d53e56c2760282346e98307aefd47d5801a3803c3f55d5df3de26fe466d2594081a46f55bc59e1d040d8727b47cd9bcab1b132a31b4982bba1
DIST Net_IPv4-1.3.5.tgz 6346 BLAKE2B
a12592f262b2784dc5ffb04ab693f44d514a45a16b98bc2f9f7258669684f565f60127a156e5a319e76a2e426523f2a969335cb06dfd0de534584c03d45c262f
SHA512
6ed6c550217b70091c9d006519dd5731be46b02540867c1733d0c142f6e56712eb545bf5b1713e49fea3c5af8a81db86b9c9669ac2ca6eff0b95e52e29a853ed
diff --git a/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild
b/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild
deleted file mode 100644
index 1552ee3c9303..000000000000
--- a/dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit php-pear-r2
-
-DESCRIPTION="PEAR class for IP v4 calculations"
-
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/remove_globals.patch" )
diff --git a/dev-php/PEAR-Net_IPv4/files/remove_globals.patch
b/dev-php/PEAR-Net_IPv4/files/remove_globals.patch
deleted file mode 100644
index 2403deb0b4af..000000000000
--- a/dev-php/PEAR-Net_IPv4/files/remove_globals.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -aurN a/Net/IPv4.php b/Net/IPv4.php
---- a/Net/IPv4.php 2010-09-08 06:31:50.000000000 -0400
-+++ b/Net/IPv4.php 2017-08-04 14:57:52.872878217 -0400
-@@ -32,7 +32,37 @@
- *
- * @global array $GLOBALS['Net_IPv4_Netmask_Map']
- */
--$GLOBALS['Net_IPv4_Netmask_Map'] = array(
-+$GLOBALS['Net_IPv4_Netmask_Map'] = Net_IPv4::$Net_IPv4_Netmask_Map;
-+// }}}
-+// {{{ Net_IPv4
-+
-+/**
-+* Class to provide IPv4 calculations
-+*
-+* Provides methods for validating IP addresses, calculating netmasks,
-+* broadcast addresses, network addresses, conversion routines, etc.
-+*
-+* @category Net
-+* @package Net_IPv4
-+* @author Eric Kilfoil <e...@ypass.net>
-+* @author Marco Kaiser <b...@php.net>
-+* @author Florian Anderiasch <f...@php.net>
-+* @copyright 1997-2005 The PHP Group
-+* @license http://www.php.net/license/3_01.txt PHP License 3.01
-+* @version CVS: @package_version@
-+* @link http://pear.php.net/package/Net_IPv4
-+* @access public
-+*/
-+class Net_IPv4
-+{
-+ // {{{ properties
-+ var $ip = "";
-+ var $bitmask = false;
-+ var $netmask = "";
-+ var $network = "";
-+ var $broadcast = "";
-+ var $long = 0;
-+public static $Net_IPv4_Netmask_Map = array(
- 0 => "0.0.0.0",
- 1 => "128.0.0.0",
- 2 => "192.0.0.0",
-@@ -67,35 +97,6 @@
- 31 => "255.255.255.254",
- 32 => "255.255.255.255"
- );
--// }}}
--// {{{ Net_IPv4
--
--/**
--* Class to provide IPv4 calculations
--*
--* Provides methods for validating IP addresses, calculating netmasks,
--* broadcast addresses, network addresses, conversion routines, etc.
--*
--* @category Net
--* @package Net_IPv4
--* @author Eric Kilfoil <e...@ypass.net>
--* @author Marco Kaiser <b...@php.net>
--* @author Florian Anderiasch <f...@php.net>
--* @copyright 1997-2005 The PHP Group
--* @license http://www.php.net/license/3_01.txt PHP License 3.01
--* @version CVS: @package_version@
--* @link http://pear.php.net/package/Net_IPv4
--* @access public
--*/
--class Net_IPv4
--{
-- // {{{ properties
-- var $ip = "";
-- var $bitmask = false;
-- var $netmask = "";
-- var $network = "";
-- var $broadcast = "";
-- var $long = 0;
-
- // }}}
- // {{{ validateIP()
-@@ -154,7 +155,7 @@
- */
- function validateNetmask($netmask)
- {
-- if (! in_array($netmask, $GLOBALS['Net_IPv4_Netmask_Map'])) {
-+ if (! in_array($netmask, self::$Net_IPv4_Netmask_Map)) {
- return false;
- }
- return true;
-@@ -264,7 +265,7 @@
- */
- function calculate()
- {
-- $validNM = $GLOBALS['Net_IPv4_Netmask_Map'];
-+ $validNM = self::$Net_IPv4_Netmask_Map;
-
- if (! is_a($this, "net_ipv4")) {
- $myself = new Net_IPv4;
