From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-php/PEAR-Net_IPv4/Manifest | 4 - .../PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild | 15 ---- dev-php/PEAR-Net_IPv4/files/remove_globals.patch | 96 ---------------------- dev-php/PEAR-Net_IPv4/metadata.xml | 8 -- 4 files changed, 123 deletions(-) delete mode 100644 dev-php/PEAR-Net_IPv4/Manifest delete mode 100644 dev-php/PEAR-Net_IPv4/PEAR-Net_IPv4-1.3.4-r1.ebuild delete mode 100644 dev-php/PEAR-Net_IPv4/files/remove_globals.patch delete mode 100644 dev-php/PEAR-Net_IPv4/metadata.xml (limited to 'dev-php/PEAR-Net_IPv4') diff --git a/dev-php/PEAR-Net_IPv4/Manifest b/dev-php/PEAR-Net_IPv4/Manifest deleted file mode 100644 index 23b641ad03fb..000000000000 --- a/dev-php/PEAR-Net_IPv4/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX remove_globals.patch 2824 BLAKE2B 188e43865818fb4df38daea1ff2f6f955c34340b439c0150a53d5ae313012cd6302d24082370cbad35716f7e030a3654548c926c4b0cfb57e0ad0d7e672887fc SHA512 93cd8a95d320a2c80822185fa7ca9be494decf65000b747e20bb75b887efa3d6e5e2b81ba1afdaccbcc9e6c1ea48f4c401ea96a0865dd1143a32fc92e8890c3b -DIST Net_IPv4-1.3.4.tgz 5981 BLAKE2B 5002a06d30443cf809346351a6c57c1faf1be0e6531fc0c7609ad6a9575122c53fa1c3f2e6614b77401adcfcdc604ee6b8ce5538d92aa8f42e8bf709899a0cba SHA512 6b172e3d998232d53e56c2760282346e98307aefd47d5801a3803c3f55d5df3de26fe466d2594081a46f55bc59e1d040d8727b47cd9bcab1b132a31b4982bba1 -EBUILD PEAR-Net_IPv4-1.3.4-r1.ebuild 291 BLAKE2B 43dfbc68553873748d0940728229fb582bab9eeb59584c3ba6c63be49be3086189aee99dc8e3b76f867aafceab1ac4f5549d72f77444ff6a6918ffc387d4f7de SHA512 1b8f24d2f9f891ccf98bf2e85d3f7524eae7ab76ea8ee79b26871c487dd2577c4951bfa97e7cb55c0a347cdb8f75218207238bb336d2a0ebd35fce32afdfeb57 -MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64 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 -+* @author Marco Kaiser -+* @author Florian Anderiasch -+* @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 --* @author Marco Kaiser --* @author Florian Anderiasch --* @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; diff --git a/dev-php/PEAR-Net_IPv4/metadata.xml b/dev-php/PEAR-Net_IPv4/metadata.xml deleted file mode 100644 index aca42932b833..000000000000 --- a/dev-php/PEAR-Net_IPv4/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - php-bugs@gentoo.org - PHP - - -- cgit v1.2.3