From e144e0964a790f78d8cdcb2726496c206c24dd93 Mon Sep 17 00:00:00 2001
From: Brian Evans <grknight@gentoo.org>
Date: Fri, 16 Feb 2018 15:36:45 -0500
Subject: dev-php/PEAR-File_Gettext: Revbump direct to stable

Current stable is very broken with modern PHP
Increase EAPI and change eclass

WARNING - no tests, syntax checked only

Package-Manager: Portage-2.3.24, Repoman-2.3.6
---
 .../PEAR-File_Gettext-0.4.2-r1.ebuild              | 14 +++++
 .../PEAR-File_Gettext-0.4.2.ebuild                 | 13 -----
 .../files/File_Gettext-0.4.2-construct.patch       | 67 ++++++++++++++++++++++
 3 files changed, 81 insertions(+), 13 deletions(-)
 create mode 100644 dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
 delete mode 100644 dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2.ebuild
 create mode 100644 dev-php/PEAR-File_Gettext/files/File_Gettext-0.4.2-construct.patch

(limited to 'dev-php')

diff --git a/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild b/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..633c8c657fc4
--- /dev/null
+++ b/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="GNU Gettext file parser"
+
+LICENSE="PHP-3"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+PATCHES=( "${FILESDIR/File_Gettext-0.4.2-construct.patch}" )
diff --git a/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2.ebuild b/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2.ebuild
deleted file mode 100644
index 7c2ab3e6487d..000000000000
--- a/dev-php/PEAR-File_Gettext/PEAR-File_Gettext-0.4.2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit php-pear-r1
-
-DESCRIPTION="GNU Gettext file parser"
-
-LICENSE="PHP-3"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
diff --git a/dev-php/PEAR-File_Gettext/files/File_Gettext-0.4.2-construct.patch b/dev-php/PEAR-File_Gettext/files/File_Gettext-0.4.2-construct.patch
new file mode 100644
index 000000000000..3527814485ab
--- /dev/null
+++ b/dev-php/PEAR-File_Gettext/files/File_Gettext-0.4.2-construct.patch
@@ -0,0 +1,67 @@
+diff -aurN a/File/Gettext/MO.php b/File/Gettext/MO.php
+--- a/File/Gettext/MO.php	2012-03-03 22:00:49.000000000 -0500
++++ b/File/Gettext/MO.php	2018-02-16 15:15:17.725027132 -0500
+@@ -60,6 +60,10 @@
+      * @access  public
+      * @return  object      File_Gettext_MO
+      */
++    function __construct($file = '')
++    {
++        $this->file = $file;
++    }
+     function File_Gettext_MO($file = '')
+     {
+         $this->file = $file;
+diff -aurN a/File/Gettext/PO.php b/File/Gettext/PO.php
+--- a/File/Gettext/PO.php	2012-03-03 22:00:49.000000000 -0500
++++ b/File/Gettext/PO.php	2018-02-16 15:14:57.997419162 -0500
+@@ -42,6 +42,10 @@
+      * @access  public
+      * @return  object      File_Gettext_PO
+      */
++    function __construct($file = '')
++    {
++        $this->file = $file;
++    }
+     function File_Gettext_PO($file = '')
+     {
+         $this->file = $file;
+diff -aurN a/File/Gettext.php b/File/Gettext.php
+--- a/File/Gettext.php	2012-03-03 22:00:49.000000000 -0500
++++ b/File/Gettext.php	2018-02-16 15:14:27.629022634 -0500
+@@ -85,7 +85,7 @@
+             return File_Gettext::raiseError($php_errormsg);
+         }
+         $class = 'File_Gettext_' . $format;
+-        $obref = &new $class($file);
++        $obref = new $class($file);
+         return $obref;
+     }
+ 
+@@ -110,7 +110,7 @@
+ 
+         include_once 'File/Gettext/PO.php';
+ 
+-        $PO = &new File_Gettext_PO($pofile);
++        $PO = new File_Gettext_PO($pofile);
+         if (true !== ($e = $PO->load())) {
+             return $e;
+         }
+@@ -247,7 +247,7 @@
+     function &toMO()
+     {
+         include_once 'File/Gettext/MO.php';
+-        $MO = &new File_Gettext_MO;
++        $MO = new File_Gettext_MO;
+         $MO->fromArray($this->toArray());
+         return $MO;
+     }
+@@ -261,7 +261,7 @@
+     function &toPO()
+     {
+         include_once 'File/Gettext/PO.php';
+-        $PO = &new File_Gettext_PO;
++        $PO = new File_Gettext_PO;
+         $PO->fromArray($this->toArray());
+         return $PO;
+     }
-- 
cgit v1.2.3