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-Services_JSON/Manifest | 5 --- .../PEAR-Services_JSON-1.0.3-r1.ebuild | 19 ---------- .../files/JSON-1.0.3-constructor.patch | 42 ---------------------- .../files/JSON-1.0.3-upstream-typo.patch | 20 ----------- dev-php/PEAR-Services_JSON/metadata.xml | 8 ----- 5 files changed, 94 deletions(-) delete mode 100644 dev-php/PEAR-Services_JSON/Manifest delete mode 100644 dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild delete mode 100644 dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch delete mode 100644 dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch delete mode 100644 dev-php/PEAR-Services_JSON/metadata.xml (limited to 'dev-php/PEAR-Services_JSON') diff --git a/dev-php/PEAR-Services_JSON/Manifest b/dev-php/PEAR-Services_JSON/Manifest deleted file mode 100644 index 4a4443c817f3..000000000000 --- a/dev-php/PEAR-Services_JSON/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX JSON-1.0.3-constructor.patch 1705 BLAKE2B fe8af8e0f1b3ff1632dc55501484e803d612b4a4c7b8dc5ede6ad57af95286574f213f87901e9491515582eab4dc0b48de2dc43995eb7d27e9bb69630ce0d74a SHA512 e61b88d35cb9a58622e0e7c58767306712cd9a39c908e64f0c2e2e51f277a43b2d0af177c1050d0bfc8c7fa387d868949644c62554f9a8d3f83157b3ec8577e5 -AUX JSON-1.0.3-upstream-typo.patch 758 BLAKE2B 9a443f2a4f9a52df75b11c46522d6894872dbfe97db165ce595b4237f773a6bf8143b4a1d1335282baf32487cd22403f444175ea62b40aed87dfec083a16d6d5 SHA512 455b44ac00f6efb8eae96f2a2cc83aa2c3d36f318e587f0412e45338625dd2566facdf9ff042f97d98780a25bd9d5ddd8a81faa422ba9afd211e3df4e7b30976 -DIST Services_JSON-1.0.3.tgz 9529 BLAKE2B 5a35899d53b66f3534afd64105c361e7aafa22641f540ef5ed38789ccc771f4e62577b1044af8d617579aed36e014e38e6bc30f39b476b09b47202d8822028d7 SHA512 2a94bebb662e250d56ae1f02f6debbff9e956820a603b8c4520f48ad0ed67a40c342d4eb000be9a9cf0e5b91c7bf9ebf98fae87f9ecca217b94b12441b746e5e -EBUILD PEAR-Services_JSON-1.0.3-r1.ebuild 476 BLAKE2B ad30d170717d858beaf1b956759ea4374d0eb66f2b8ede32c929efe55c949cd199994053b412d8858e38db724b1ad81492b9ecf2c3e94d07a7a9491339d060ef SHA512 eb642f611fbdb5617d0cf19a6ac03d66f8514ff9f57bc567c07a3d2ae0070e744de8d0b84339f85e1edc53e6245e65a403551b02de70a7ed38b4d901ee3e7847 -MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64 diff --git a/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild b/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild deleted file mode 100644 index 9e52d443b4b0..000000000000 --- a/dev-php/PEAR-Services_JSON/PEAR-Services_JSON-1.0.3-r1.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit php-pear-r2 - -IUSE="" -DESCRIPTION="PHP implementaion of json_encode/decode" -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -PATCHES=( "${FILESDIR}/JSON-1.0.3-upstream-typo.patch" "${FILESDIR}/JSON-1.0.3-constructor.patch" ) - -src_install() { - php-pear-r2_src_install - insinto /usr/share/php/Services - doins JSON.php -} diff --git a/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch deleted file mode 100644 index d7348f0f858e..000000000000 --- a/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-constructor.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -aurN a/JSON.php b/JSON.php ---- a/JSON.php 2011-01-13 21:40:48.000000000 -0500 -+++ b/JSON.php 2018-02-15 11:42:06.551287857 -0500 -@@ -139,6 +139,14 @@ - * strings or numbers, if you return an object, make sure it does - * not have a toJSON method, otherwise an error will occur. - */ -+ function __construct($use = 0) -+ { -+ $this->use = $use; -+ $this->_mb_strlen = function_exists('mb_strlen'); -+ $this->_mb_convert_encoding = function_exists('mb_convert_encoding'); -+ $this->_mb_substr = function_exists('mb_substr'); -+ } -+ - function Services_JSON($use = 0) - { - $this->use = $use; -@@ -909,6 +917,11 @@ - - class Services_JSON_Error extends PEAR_Error - { -+ function __construct($message = 'unknown error', $code = null, -+ $mode = null, $options = null, $userinfo = null) -+ { -+ parent::__construct($message, $code, $mode, $options, $userinfo); -+ } - function Services_JSON_Error($message = 'unknown error', $code = null, - $mode = null, $options = null, $userinfo = null) - { -@@ -923,6 +936,11 @@ - */ - class Services_JSON_Error - { -+ function __construct($message = 'unknown error', $code = null, -+ $mode = null, $options = null, $userinfo = null) -+ { -+ return; -+ } - function Services_JSON_Error($message = 'unknown error', $code = null, - $mode = null, $options = null, $userinfo = null) - { diff --git a/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch b/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch deleted file mode 100644 index c7d8be3aa910..000000000000 --- a/dev-php/PEAR-Services_JSON/files/JSON-1.0.3-upstream-typo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/JSON.php 2011/01/28 00:16:42 307804 -+++ b/JSON.php 2013/04/30 02:37:26 330165 -@@ -554,7 +544,7 @@ - - return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) - ? 'null' -- : new Services_JSON_Error(class_name($var). -+ : new Services_JSON_Error(get_class($var). - " toJSON returned an object with a toJSON method."); - - } -@@ -995,7 +985,7 @@ - function Services_JSON_Error($message = 'unknown error', $code = null, - $mode = null, $options = null, $userinfo = null) - { -- -+ return; - } - } - diff --git a/dev-php/PEAR-Services_JSON/metadata.xml b/dev-php/PEAR-Services_JSON/metadata.xml deleted file mode 100644 index aca42932b833..000000000000 --- a/dev-php/PEAR-Services_JSON/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - php-bugs@gentoo.org - PHP - - -- cgit v1.2.3