dev-php/PEAR-PHP_Beautifier: new revision sans the php-pear-r1 eclass.

This new revision drops the php-pear-r1 eclass in order to fix some
otherwise-unfixable issues. First, the ebuild has been updated to
EAPI=6; that one was easy. Two new USE flags to enable the CLI and
installation of the examples were added -- that and the removal
of the eclass caused some RDEPEND changes.

We now have custom src_prepare() and src_install() phases:

  * In src_prepare, we replace the strings @package_version@ and
    @php_bin@ everywhere in the source code using sed. We also
    apply a new patch to use the default error_reporting, which
    hides a bunch of ugly errors.

  * The src_install phase now installs the examples to the proper
    location, and only installs the CLI script with USE=cli.

Package-Manager: portage-2.3.0

1 files changed, 44 insertions, 0 deletions

diff --git a/dev-php/PEAR-PHP_Beautifier/files/use_default_error_reporting.patch b/dev-php/PEAR-PHP_Beautifier/files/use_default_error_reporting.patch
new file mode 100644
index 000000000000..cf1019b3399c
--- /dev/null
+++ b/dev-php/PEAR-PHP_Beautifier/files/use_default_error_reporting.patch
@@ -0,0 +1,44 @@
+From 39e6b5605bd15db6a1f2f223dede9c8d2265140c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Mon, 9 Jan 2017 22:34:30 -0500
+Subject: [PATCH 1/1] Use the default PHP error_reporting value.
+
+The php_beautifier script triggers some strict/deprecation warnings
+with newer versions of PHP. With error_reporting = E_ALL, they are
+shown to the user. Instead, we can at least respect the default
+value of error_reporting from php.ini which (on Gentoo, anyway)
+hides strict/deprecation warnings.
+---
+ Beautifier.php         | 2 +-
+ scripts/php_beautifier | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Beautifier.php b/Beautifier.php
+index 584ac4d..90d8d0b 100755
+--- a/Beautifier.php
++++ b/Beautifier.php
+@@ -19,7 +19,7 @@
+  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+  * @version    CVS: $Id:$
+  */
+-error_reporting(E_ALL);
++// error_reporting(E_ALL);
+ // Before all, test the tokenizer extension
+ if (!extension_loaded('tokenizer')) {
+     throw new Exception("Compile php with tokenizer extension. Use --enable-tokenizer or don't use --disable-all on configure.");
+diff --git a/scripts/php_beautifier b/scripts/php_beautifier
+index 255a264..6e87f4e 100755
+--- a/scripts/php_beautifier
++++ b/scripts/php_beautifier
+@@ -52,7 +52,7 @@
+     */
+     require_once 'PHP/Beautifier/Batch.php';
+     define('PHP_Beautifier_WINDOWS', substr(PHP_OS, 0, 3) == 'WIN');
+-    error_reporting(E_ALL);
++    // error_reporting(E_ALL);
+     // get log object
+     $oLog = PHP_Beautifier_Common::getLog();
+     
+-- 
+2.10.2
+