gentoo resync : 24.02.2018

6 files changed, 2 insertions, 189 deletions

diff --git a/dev-php/PEAR-OLE/Manifest b/dev-php/PEAR-OLE/Manifest
index 26c085998582..e32fbaee0b4b 100644
--- a/dev-php/PEAR-OLE/Manifest
+++ b/dev-php/PEAR-OLE/Manifest
@@ -1,8 +1,3 @@
-AUX 1.0.0_rc2-fix-static-calls.patch 3089 BLAKE2B d65644399ece787df63bcef2c30cbf1b0b03d4ebf8bb304ac25f9028c615db0c584a54473edbc5787778447e7dc89fa8fd2c17de712d5cbf8190c57bf806c18f SHA512 061674617d100f7c9d795d55b8a75a759dc9d321a784c2a29cec6a669cd7321e4bb0c3481c0641451098a2263b114f1bd248cc255060fdc44846f5d689dd971a
-AUX pear-bug-19284.patch 1026 BLAKE2B 6fe6b4cab234bdd4877df640615c2ee13db595e73f8f3740067b4eb4711bfba6c747e09596fb10ee3b2160ef2a9435f10d0a0323a0639b55cf97f10d4422b442 SHA512 5fa13721f6ee57dafe8a6930033a2c06dd3c048f5aa1b3060d85a5cd7dedd84dceb7189f7cafd4512b8a9b05ada893351935b0dab45a0d1caec53c8ecabd45cc
-DIST OLE-1.0.0RC2.tgz 13981 BLAKE2B d794318e105b30ab5cc39ce7ab3f7d706bdd72344597937f4c94a456a82643649e4a0bda06f7883c00705ad7081f6ea6e988a30d6e934c1c5a0b9ae3f2d59e3b SHA512 9d0b236da4a0f82f272cf2e5642246ca35f83b9d21f1cc41ebe32d536949e9c7fce8d3bee0dce051f692a0283e1203d5ba2bacbe339f72cad4c83eb7a7b7e884
 DIST OLE-1.0.0RC3.tgz 14233 BLAKE2B ca8ae3959b618a0cd9344a3b07c8587f4f1d10063ff6101e8f27d0c4c8b0d08a0a258ae40ac9b7ce30622d57cc6bfbb2a5b4f5b393ef69e25c276813ee70461e SHA512 36a9bbe243d0f172bcd3fc5dd0926a0e42389b4e222cca90678f41bb968c70e4d04c959f3fe3bad1704543ecbcda871a248aa445a1dc6c2f0b73925198f5b07e
-EBUILD PEAR-OLE-1.0.0_rc2-r1.ebuild 625 BLAKE2B d4a0874f2ebc624966efbd7fea9572ed7d6835065193ae52dd58edc101ffa0c9f6a3e9582eb1385e4536ed34ccad531468b384e05be6ddfa678937bbb0e9dd03 SHA512 efd8463b6c131f75ce0fbee812a590e77dca132c7f62fdbfdd156f5b296a0a255f97c054033596ba8da82360e75e7e1ce0e782354f9973419a4ce09450baf741
-EBUILD PEAR-OLE-1.0.0_rc2-r2.ebuild 756 BLAKE2B 331f7230d0effdad12ec6d001a006320bd2218a95a63633e5f7c1db44a1ed2c2ac550e66e45077920c89629d8deb82907165b8ee295afd3c6b210056f645afbf SHA512 95e28eefaeaf15458f001c1cc5d7a9a2f799f201f8cd09ea5a98452d5e0e8af2870df8f1f13281e86297c447df3c96cb9f115aafd65d065997052c34774d15c1
-EBUILD PEAR-OLE-1.0.0_rc3.ebuild 375 BLAKE2B 4222dfb008b3399e00cf37031440f345ae0f201749bc0a382aca2917831ee9a09f3a7911e19d1b1a3d4b056e685006d62953fa6c75ed553ef90577a9f464b008 SHA512 2516ba7069dd59af319555b85ffa00606e055b48c82ae2c8b9c6c84fd33e22099183074b6b361f2e9cfd6fb9adc5bfaf833d64db5e15c265de3a00052c37f3d9
+EBUILD PEAR-OLE-1.0.0_rc3.ebuild 367 BLAKE2B 57738add3d3d7eba94b19b622fb94dc3bdfda51897cc16b478da83cc4de284a2b66d264a6a05ca63e898daaf3a5940ed83793b4e86c918eb3889c0791339c5e8 SHA512 c8d0f02785f25a7491631a5a3b200af7906b612318607175437d6182bf1ec978144b2695ecaa1303e91cb2f72254f500e4888ea5bf88e73b64d5988a0f1a8f77
 MISC metadata.xml 365 BLAKE2B d3239ca6d5ef2cac6033276506a09ac2dc02805de0cc194f700be394828c56d754d364fa1b12895f3a78d2fc7145c57b8a097fbbc02bcebd006da21759a42793 SHA512 3871e3db946f3c1d55f06eb228b38e4b3d596b40781c0062c5aa5dad7b785312db6ddf41e16f372f3541c1eaf30264b78bd84db2a4c2843376af4111a50479ae
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2-r1.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2-r1.ebuild
deleted file mode 100644
index 01c977ab5b7f..000000000000
--- a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/PEAR-/}"
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV^^}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Package for reading and writing OLE containers"
-HOMEPAGE="http://pear.php.net/package/${MY_PN}"
-SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-RDEPEND="dev-lang/php:*
-	dev-php/PEAR-PEAR"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	insinto /usr/share/php
-	doins "${MY_PN}.php"
-	doins -r "${MY_PN}"
-}
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2-r2.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2-r2.ebuild
deleted file mode 100644
index e48f9f9de5a6..000000000000
--- a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc2-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/PEAR-/}"
-MY_PV="${PV/_/}"
-MY_PV="${MY_PV^^}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Package for reading and writing OLE containers"
-HOMEPAGE="http://pear.php.net/package/${MY_PN}"
-SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/php:*
-	dev-php/PEAR-PEAR"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	eapply "${FILESDIR}/pear-bug-19284.patch" \
-		"${FILESDIR}/${PV}-fix-static-calls.patch"
-	eapply_user
-}
-
-src_install() {
-	insinto /usr/share/php
-	doins "${MY_PN}.php"
-	doins -r "${MY_PN}"
-}
diff --git a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
index 111377cdd9f1..bd8e6951959f 100644
--- a/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
+++ b/dev-php/PEAR-OLE/PEAR-OLE-1.0.0_rc3.ebuild
@@ -11,5 +11,5 @@ DESCRIPTION="Package for reading and writing OLE containers"
 HOMEPAGE="https://pear.php.net/package/OLE"
 LICENSE="PHP-3.01"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
diff --git a/dev-php/PEAR-OLE/files/1.0.0_rc2-fix-static-calls.patch b/dev-php/PEAR-OLE/files/1.0.0_rc2-fix-static-calls.patch
deleted file mode 100644
index e9dea0cad4f7..000000000000
--- a/dev-php/PEAR-OLE/files/1.0.0_rc2-fix-static-calls.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 17a94ee1f244cbf0c728f37d1628eb28955465ac Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jean-S=C3=A9bastien=20Hedde?= <jeanseb@au-fil-du.net>
-Date: Mon, 27 Jan 2014 11:32:19 +0100
-Subject: [PATCH 1/3] Non-static method System::tmpdir() should not be called
- statically, assuming  from incompatible context
-
----
- OLE/PPS/File.php | 3 ++-
- OLE/PPS/Root.php | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/OLE/PPS/File.php b/OLE/PPS/File.php
-index 8fb1acd..553627e 100644
---- a/OLE/PPS/File.php
-+++ b/OLE/PPS/File.php
-@@ -47,7 +47,8 @@ class OLE_PPS_File extends OLE_PPS
-     */
-     function OLE_PPS_File($name)
-     {
--        $this->_tmp_dir = System::tmpdir();
-+        $system = new System();
-+        $this->_tmp_dir = $system->tmpdir();
-         $this->OLE_PPS(
-             null, 
-             $name,
-diff --git a/OLE/PPS/Root.php b/OLE/PPS/Root.php
-index 387c3b3..9da6330 100755
---- a/OLE/PPS/Root.php
-+++ b/OLE/PPS/Root.php
-@@ -53,7 +53,8 @@ class OLE_PPS_Root extends OLE_PPS
-     */
-     function OLE_PPS_Root($time_1st, $time_2nd, $raChild)
-     {
--        $this->_tmp_dir = System::tmpdir();
-+        $system = new System();
-+        $this->_tmp_dir = $system->tmpdir();
-         $this->OLE_PPS(
-            null, 
-            OLE::Asc2Ucs('Root Entry'),
-
-From 482239c562cc66959fc8c04e8308d812196d56f8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jean-S=C3=A9bastien=20Hedde?= <jeanseb@au-fil-du.net>
-Date: Mon, 27 Jan 2014 11:35:00 +0100
-Subject: [PATCH 2/3] OLE::LocalDate2OLE, OLE::OLE2LocalDate are static
- methods.
-
-These functions are called staticly and don't use $this.
----
- OLE.php | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/OLE.php b/OLE.php
-index d7dced7..2a5da73 100755
---- a/OLE.php
-+++ b/OLE.php
-@@ -493,7 +493,7 @@ function Asc2Ucs($ascii)
-     * @param integer $date A timestamp 
-     * @return string The string for the OLE container
-     */
--    function LocalDate2OLE($date = null)
-+    static function LocalDate2OLE($date = null)
-     {
-         if (!isset($date)) {
-             return "\x00\x00\x00\x00\x00\x00\x00\x00";
-@@ -538,7 +538,7 @@ function LocalDate2OLE($date = null)
-     * @access public
-     * @static
-     */
--    function OLE2LocalDate($string)
-+    static function OLE2LocalDate($string)
-     {
-         if (strlen($string) != 8) {
-             return new PEAR_Error("Expecting 8 byte string");
-
-From af1b260a8bd0a5fc337f96f5b84b2accbb75f650 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jean-S=C3=A9bastien=20Hedde?= <jeanseb@au-fil-du.net>
-Date: Mon, 27 Jan 2014 11:38:34 +0100
-Subject: [PATCH 3/3] Asc2Ucs is a static method.
-
----
- OLE.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/OLE.php b/OLE.php
-index 2a5da73..e0cec8f 100755
---- a/OLE.php
-+++ b/OLE.php
-@@ -475,7 +475,7 @@ function getDataLength($index)
-     * @param string $ascii The ASCII string to transform
-     * @return string The string in Unicode
-     */
--    function Asc2Ucs($ascii)
-+    static function Asc2Ucs($ascii)
-     {
-         $rawname = '';
-         for ($i = 0; $i < strlen($ascii); $i++) {
diff --git a/dev-php/PEAR-OLE/files/pear-bug-19284.patch b/dev-php/PEAR-OLE/files/pear-bug-19284.patch
deleted file mode 100644
index c94142c1ae46..000000000000
--- a/dev-php/PEAR-OLE/files/pear-bug-19284.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e63587ddb88057cc2e403c48d2f41728ba1044ef Mon Sep 17 00:00:00 2001
-From: flack <flack@contentcontrol-berlin.de>
-Date: Tue, 27 Nov 2012 10:26:09 +0100
-Subject: [PATCH] Fix problem where Excel files couldn't be opened in Ofccie
- 2010
-
-I haven't traced the problem, the fix is from one of the comments of http://pear.php.net/bugs/bug.php?id=19284, but for me, this reproducably fixes the issue the Excel 2010 refuses to open the files because they are corrupt
----
- OLE/PPS/Root.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/OLE/PPS/Root.php b/OLE/PPS/Root.php
-index 2f19ba0..387c3b3 100755
---- a/OLE/PPS/Root.php
-+++ b/OLE/PPS/Root.php
-@@ -620,7 +620,7 @@ function _create_header($num_sb_blocks, $num_bb_blocks, $num_pps_blocks)
-       else
-         fwrite($FILE, pack("V", -2));
- 
--      fwrite($FILE, pack("V", 1));
-+      fwrite($FILE, pack("V", $num_sb_blocks));
- 
-       // Extra BDList Start, Count
-       if($bbd_info["blockchain_list_entries"] < $bbd_info["header_blockchain_list_entries"])