gentoo resync : 17.02.2018

4 files changed, 141 insertions, 16 deletions

diff --git a/dev-php/PEAR-HTML_CSS/Manifest b/dev-php/PEAR-HTML_CSS/Manifest
index 73168bdfaac3..a3bb436cb898 100644
--- a/dev-php/PEAR-HTML_CSS/Manifest
+++ b/dev-php/PEAR-HTML_CSS/Manifest
@@ -1,3 +1,4 @@
+AUX HTML_CSS-1.5.4-fix-tests.patch 4009 BLAKE2B 6285a30de1d1fae3cb2a1326e451927a8297b77184c6f6371d391358fb8c52852befedbefc4dd65140787cb69e31772a1c1a1ec3c054ba1a4a306cc217f953db SHA512 39bc6ad58740cd7d84cc79285e7cbff3070dd4c5460484cb285d29e1a179a326cb18905288cb581d720327611baf0c33b4b7bfe736fb77f9c52faeb9e0f23490
 DIST HTML_CSS-1.5.4.tgz 45553 BLAKE2B 8fef3897bb577a1c12c7dd96ea4d15de5c1b46b40546b23b7262eaaf99db83c988631639a4f4e9b7a344ec02642e49c01c3afc9858f01ccd8c8e77cb39a75008 SHA512 d9418f5fe62dff27f39a0be80378444db6f9636323dd4a85fc1173cb799aa4e74656a55a1179bfc40a926d6ac3c3d67dde378ac49c2c19468e4541e2302c3afa
-EBUILD PEAR-HTML_CSS-1.5.4-r1.ebuild 415 BLAKE2B ae0ddb8bba4a59f344854b5d43da7b4bd9fcdc134f34845946eff59fed3b4b4ac272817abd63daef63233918a52aff58afe937db9798eb76db3f3658251169b4 SHA512 43eaad075649ca70dadb0512b066c30ad740b0877082f17636d8cbe4a14aef4470db9bd7c08cc7a6fa0afb3cf96d249f80f6419e986eedb0a961a718236449bf
+EBUILD PEAR-HTML_CSS-1.5.4-r2.ebuild 658 BLAKE2B 75f540083de1bc6d789fa06b425ca70fd90d938fdbd494b27535e91313bee50869ce58974acaf09f9f752760b0ba369ca940f2ddad8c56d5368f298a86748d10 SHA512 adca37a844f597d37f51a7108c8b03296aeaba2de63010a6146d17c9e3d0c87163fd1caad6d8f7ab571e7c5e1a059d9e4cdb8d5987023441d7794c933a2c26b8
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r1.ebuild b/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r1.ebuild
deleted file mode 100644
index 0819717f0bbc..000000000000
--- a/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit php-pear-r1
-
-DESCRIPTION="Provides a simple interface for generating a stylesheet declaration"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="minimal"
-RDEPEND=">=dev-php/PEAR-HTML_Common-1.2.4
-	!minimal? ( >=dev-php/PEAR-Services_W3C_CSSValidator-0.1.0
-		    >=dev-php/phpunit-3.2.0 )"
diff --git a/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild b/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild
new file mode 100644
index 000000000000..c9b8063f636f
--- /dev/null
+++ b/dev-php/PEAR-HTML_CSS/PEAR-HTML_CSS-1.5.4-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit php-pear-r2
+
+DESCRIPTION="Provides a simple interface for generating a stylesheet declaration"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="minimal test"
+RDEPEND=">=dev-php/PEAR-HTML_Common-1.2.4
+	!minimal? ( >=dev-php/PEAR-Services_W3C_CSSValidator-0.1.0 )"
+DEPEND="test? ( ${RDEPEND} >=dev-php/phpunit-3.7 )"
+PATCHES=( "${FILESDIR}/HTML_CSS-1.5.4-fix-tests.patch" )
+
+src_prepare() {
+	mkdir HTML || die
+	mv CSS CSS.php HTML || die
+	default
+}
+
+src_test() {
+	ln -s ../HTML tests/HTML || die
+	phpunit tests/AllTests.php || die
+}
diff --git a/dev-php/PEAR-HTML_CSS/files/HTML_CSS-1.5.4-fix-tests.patch b/dev-php/PEAR-HTML_CSS/files/HTML_CSS-1.5.4-fix-tests.patch
new file mode 100644
index 000000000000..410ad7593ec3
--- /dev/null
+++ b/dev-php/PEAR-HTML_CSS/files/HTML_CSS-1.5.4-fix-tests.patch
@@ -0,0 +1,112 @@
+diff -aurN a/tests/AllTests.php b/tests/AllTests.php
+--- a/tests/AllTests.php	1970-01-01 04:13:26.000000000 -0500
++++ b/tests/AllTests.php	2018-02-16 16:28:52.565010362 -0500
+@@ -24,7 +24,6 @@
+ 

+ require_once 'HTML_CSS_TestSuite_Standard.php';

+ require_once 'HTML_CSS_TestSuite_Output.php';

+-require_once 'HTML_CSS_TestSuite_Bugs.php';

+ 

+ /**

+  * Class for running all test suites for HTML_CSS package.

+@@ -79,7 +78,6 @@
+         $suite = new PHPUnit_Framework_TestSuite('HTML_CSS Test Suite');

+         $suite->addTestSuite('HTML_CSS_TestSuite_Standard');

+         $suite->addTestSuite('HTML_CSS_TestSuite_Output');

+-        $suite->addTestSuite('HTML_CSS_TestSuite_Bugs');

+         return $suite;

+     }

+ 

+@@ -126,4 +124,4 @@
+ if (PHPUnit_MAIN_METHOD == 'HTML_CSS_AllTests::main') {

+     HTML_CSS_AllTests::main();

+ }

+-?>
+\ No newline at end of file
++?>

+diff -aurN a/tests/HTML_CSS_TestSuite_Output.php b/tests/HTML_CSS_TestSuite_Output.php
+--- a/tests/HTML_CSS_TestSuite_Output.php	1970-01-01 04:13:26.000000000 -0500
++++ b/tests/HTML_CSS_TestSuite_Output.php	2018-02-16 16:36:35.283820690 -0500
+@@ -18,7 +18,6 @@
+ 

+ require_once "PHPUnit/Framework/TestCase.php";

+ require_once "PHPUnit/Framework/TestSuite.php";

+-require_once "PHPUnit/Extensions/OutputTestCase.php";

+ 

+ require_once 'HTML/CSS.php';

+ require_once 'PEAR.php';

+@@ -34,7 +33,7 @@
+  * @link     http://pear.php.net/package/HTML_CSS

+  * @since    File available since Release 1.5.2

+  */

+-class HTML_CSS_TestSuite_Output extends PHPUnit_Extensions_OutputTestCase

++class HTML_CSS_TestSuite_Output extends PHPUnit_Framework_TestCase

+ {

+     /**

+      * A CSS object

+@@ -70,7 +69,12 @@
+ 

+         $this->css = new HTML_CSS($attrs, $prefs);

+ 

+-        $this->setOutputCallback(array(&$this, 'normalizeOutput'));

++        $this->setOutputCallback(array($this, 'normalizeOutput'));

++    }

++

++    protected function normalizeOutput($buffer)

++    {

++        return str_replace("\r", '', $buffer);

+     }

+ 

+     /**

+@@ -153,4 +157,4 @@
+ if (PHPUnit_MAIN_METHOD == "HTML_CSS_TestSuite_Output::main") {

+     HTML_CSS_TestSuite_Output::main();

+ }

+-?>
+\ No newline at end of file
++?>

+diff -aurN a/tests/HTML_CSS_TestSuite_Standard.php b/tests/HTML_CSS_TestSuite_Standard.php
+--- a/tests/HTML_CSS_TestSuite_Standard.php	1970-01-01 04:13:26.000000000 -0500
++++ b/tests/HTML_CSS_TestSuite_Standard.php	2018-02-16 16:47:01.837374212 -0500
+@@ -117,12 +117,10 @@
+      */

+     public function catchError($error, $code, $level)

+     {

+-        $this->assertType(PHPUnit_Framework_Constraint_IsType::TYPE_OBJECT, $error);

+-        if ($error instanceof PEAR_Error) {

+-            $this->assertEquals($error->getCode(), $code);

+-            $user_info = $error->getUserInfo();

+-            $this->assertEquals($user_info['level'], $level);

+-        }

++        $this->assertInstanceOf(PEAR_Error::class, $error);

++        $this->assertEquals($error->getCode(), $code);

++        $user_info = $error->getUserInfo();

++        $this->assertEquals($user_info['level'], $level);

+     }

+ 

+     /**

+@@ -724,7 +722,7 @@
+         $css_data = array($fn, $strcss);

+         $messages = array();

+ 

+-        $stub = $this->getMock('HTML_CSS', array('validate'));

++        $stub = $this->createMock(HTML_CSS::class);

+         $stub->expects($this->any())

+              ->method('validate')

+              ->will($this->returnValue(true));

+@@ -1578,7 +1576,7 @@
+         $this->catchError($r, HTML_CSS_ERROR_INVALID_INPUT, 'exception');

+ 

+         // validate

+-        $stub = $this->getMock('HTML_CSS', array('validate'));

++        $stub = $this->createMock(HTML_CSS::class);

+         $stub->expects($this->any())

+              ->method('validate')

+              ->will($this->returnCallback(array(&$this, 'cbMockValidator')));

+@@ -1680,4 +1678,4 @@
+ if (PHPUnit_MAIN_METHOD == "HTML_CSS_TestSuite_Standard::main") {

+     HTML_CSS_TestSuite_Standard::main();

+ }

+-?>
+\ No newline at end of file
++?>