gentoo resync : 15.01.2020

6 files changed, 108 insertions, 49 deletions

diff --git a/dev-php/PHP_TokenStream/Manifest b/dev-php/PHP_TokenStream/Manifest
index eba9dc0d46f4..cae983777df5 100644
--- a/dev-php/PHP_TokenStream/Manifest
+++ b/dev-php/PHP_TokenStream/Manifest
@@ -1,7 +1,7 @@
+AUX autoload-3.1.1.php 2833 BLAKE2B 594aafd23673466891934600e0620437390703a3a3e420c85b5b54de78c0b9a9a4ac39e72103c18e89b5cedb8d8c9c6c2441d6921f0f1034127ee9782967eaac SHA512 26ca45e5761c3a1fc9d89276271763fe5ef5b0c9107978e9e6415d4708da831b1b2f536d642b8e16f8a32cd4247630602d21ef5b5017de6684e8707613625d87
 AUX autoload.php 407 BLAKE2B 8f8afa7524cd277d498acbbc468ad6a7a2b57223111fa459c63a545251430f18be06e7f8079a3ae4f959338530e211d6d7a770bc0739668b9b612b4fbabc1719 SHA512 f80a008f1f443c90814c034822211e94e76d8af31b7da6fb39bbb5aace6473bab8befcd177fd3c2b5b2891bdb62bac66fb03ae6e0fe9429335950b134fccdeab
-AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1b0ad344e063ca1fa98cde446078346384e946f6b31f9caaf49cf7c82b4568f697a1ba0d2e633 SHA512 44f5d66b967cff45b87795609e6dd14443a4ce5ae8f3430a281429ba21e834bc3feb7f539fb6cd8349017eb301054a33dfcd7062d58f9fd0c1c7cd1892580092
-DIST PHP_TokenStream-1.1.3.tgz 9860 BLAKE2B 7160e80b5dc73cabd6cae388add7285fb99891d4e33a7b1224bd3ee9769b88c4e7c4927f96caa91bad2bbad86826f6a73665f716ea3d79b9f89eaa02a5187bf9 SHA512 2751acabc340f05c59bb46f8fb9e47ff25a5f8a6503f1525ed4977d96f2044ad0f9714b40f573d0b845aaf47424a89c3d9e7cfdada67c58d650bb98ee7b47772
 DIST PHP_TokenStream-1.4.11.tar.gz 13388 BLAKE2B 20ef9907ce660e2958ffd50f588ead563efa04c9fc4adda4a823830000f73ee7a4c988adc79d14e549c4f02836b7128aa42b01b26996a090595d34a191282b67 SHA512 4e8d8d1eb16169d46b64a43d91f3066d49fe8e3f184d90c5c7cf4234ebfe4eac271a811744b201f05dc86976b3c5b8ad4ae9f2532165a3849980663f1ac5852e
-EBUILD PHP_TokenStream-1.1.3.ebuild 583 BLAKE2B 3a1710a72b29f85af856f4e04d05afbd4b91e8291961076a81fc19d3b78c2377dc605b642e53ca350b33060b7a8912581f4217905b85fbebbde021036f69570f SHA512 8fcb56e1c778c7364964cbfb18264eaf4a5ba06865f3a1a921c5413b11c2e5817c4f020fa92c4e09aee3b8f2e7392fe9022d1cf3c8efecc08307620261db6e1f
-EBUILD PHP_TokenStream-1.4.11.ebuild 843 BLAKE2B 4992c8b94fd2227430029979b0b3129fa6c7eb61199bd28832e34a01600a652648165c97cc011f46ccc0a61b77c4aeb8eb5bce0c21ad9dfd11ae8464fe5c77d3 SHA512 c7482a579e2e31cef080bec162cd439ff6b7ce1efa1794d966e2972b03dd1abd98c407ff6a05433126426d6f51d792aff2a5e670041c0ee0e1e8d65485c53842
+DIST PHP_TokenStream-3.1.1.tar.gz 14275 BLAKE2B 5300768f79cba17a08f55a58a05744eef55df00fc0f0144612bddd3ba5d0494fe19bd5b74d56b57d345f5d98b63033aa05e6d157c0979be163e51dc7cc5ad19f SHA512 3a1e36d13b8d77d6fe7d1617fc43a8d59b68af6ee6182afdecf5c970c844f7cb63f3056ce7f6aaae17237b948c5ff9862438d823c2eda179e24c1bb4fc4f4e02
+EBUILD PHP_TokenStream-1.4.11-r1.ebuild 783 BLAKE2B 3e2b005138362ce8ace2032b42fd9e9be1a4064e0414e92d53ad2da48aca43869471075bbab7faf1c2b5d967f7eaf573086b764fb3258e3824107a0bb0df482d SHA512 5a5edd0479b64399dc476c190a7782c6c96ffe26bd30e2d3f273542f474be99ac254b57c597496028b9c9e0201b97e0ddb1e29dc857e1973d76cc9d1730f4a4b
+EBUILD PHP_TokenStream-3.1.1.ebuild 1378 BLAKE2B f138bb9ce3d3d297afadf2f93edf22c745a2c3328e08c1220cb4f60f0489bf75da8bb362b290718e9e858cbed8acb8757afc6b2045380a26f7f24d1d400060f0 SHA512 a42603239c2c8021c53854a2a250ad2863ccbbe80bb465e67b0a1335967b8ceee2b975cd152a2d668b26ec3dfdbd5315cf1631a57d32d46048920bdfe38f37b5
 MISC metadata.xml 338 BLAKE2B d6fc1656deef3d826ef47d31a4c02b873a71c287f2d349f96dffa1fcc0b3006a3549a80872efd23b09288d144d18776aefe6e7e6c52045eedc53beeb1331c794 SHA512 1f758ba782eba886cefecaacc81c4c1e77c6e00f6a1e265f5fdf789f757b3c2e3ca742f9c3c1f6427920b6ab42388b34cf2c7d50b11247c4a94a3fee69993e47
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild
deleted file mode 100644
index 16306964ba0f..000000000000
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-1.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_PEAR_PKG_NAME="PHP_TokenStream"
-PHP_PEAR_DOMAIN="pear.phpunit.de"
-PHP_PEAR_CHANNEL="${FILESDIR}/channel.xml"
-
-inherit php-pear-r2
-
-DESCRIPTION="Wrapper around PHP's tokenizer extension"
-HOMEPAGE="http://pear.phpunit.de"
-SRC_URI="http://pear.phpunit.de/get/PHP_TokenStream-1.1.3.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 hppa x86"
-IUSE=""
-
-DEPEND="dev-lang/php:*[tokenizer]
-	>=dev-php/pear-1.9.4"
-RDEPEND="${DEPEND}"
-DOCS=( README.markdown ChangeLog.markdown )
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
index 8ebb0d66df95..4cf938f01d85 100644
--- a/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11.ebuild
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-1.4.11-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MY_PN="php-token-stream"
 
@@ -18,9 +18,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 RDEPEND="dev-php/fedora-autoloader
 	|| (
-		dev-lang/php:5.6[tokenizer]
-		dev-lang/php:7.0[tokenizer]
-		dev-lang/php:7.1[tokenizer]
+		dev-lang/php:7.2[tokenizer(-)]
 	)"
 
 src_install() {
diff --git a/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild b/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
new file mode 100644
index 000000000000..106234e79bf1
--- /dev/null
+++ b/dev-php/PHP_TokenStream/PHP_TokenStream-3.1.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_PHP="php7-2 php7-3 php7-4"
+MY_PN="php-token-stream"
+
+DESCRIPTION="Wrapper around PHP's tokenizer extension"
+HOMEPAGE="http://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="test"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+	|| (
+		dev-lang/php:7.2[tokenizer(-)]
+		dev-lang/php:7.3[tokenizer(-)]
+		dev-lang/php:7.4[tokenizer(-)]
+	)"
+BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	sed -i -e 's/setUp()/setUp():void/' tests/Token/*.php || die
+	default
+}
+
+src_install() {
+	insinto /usr/share/php/PHP/Token
+	doins -r src/*
+	newins "${FILESDIR}/autoload-3.1.1.php" autoload.php
+}
+
+src_test() {
+	mkdir vendor || die
+	cp "${FILESDIR}/autoload-3.1.1.php" vendor/autoload.php || die
+	sed -i 's~__DIR__~__DIR__."/../src"~' vendor/autoload.php || die
+	for target in ${USE_PHP//-/.} ; do
+		if [ -x /usr/bin/$target ] ; then
+			${target} /usr/bin/phpunit -c phpunit.xml || die
+		fi
+	done
+}
+
+pkg_postinst() {
+	ewarn "This library now loads via /usr/share/php/PHP/Token/autoload.php"
+	ewarn "Please update any scripts to require the autoloader"
+}
diff --git a/dev-php/PHP_TokenStream/files/autoload-3.1.1.php b/dev-php/PHP_TokenStream/files/autoload-3.1.1.php
new file mode 100644
index 000000000000..4e385c87ec24
--- /dev/null
+++ b/dev-php/PHP_TokenStream/files/autoload-3.1.1.php
@@ -0,0 +1,47 @@
+<?php
+/* Autoloader for dev-php/PHP_TokenStream */
+
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {
+    require_once '/usr/share/php/Fedora/Autoloader/autoload.php';
+}
+
+\Fedora\Autoloader\Autoload::addClassMap(
+   [
+		'php_token' => '/Token.php',
+		'php_tokenwithscope' => '/Token.php',
+		'php_tokenwithscopeandvisibility' => '/Token.php',
+		'php_token_open_tag' => '/Token.php',
+		'php_token_util' => '/Token/Util.php',
+		'php_token_stream' => '/Token/Stream.php',
+		'php_token_stream_cachingfactory' => '/Token/Stream/CachingFactory.php',
+    ],
+    __DIR__
+);
+$_gentooFedAutoload = function() {
+$_fedAutoLoadtokens = [];
+$_fedAutoLoadtokenSubClasses = ['includes','function','interface','abstract','ampersand','and_equal',
+'array','array_cast','as','at','backtick','bad_character','boolean_and','boolean_or','boolean_cast',
+'break','caret','case','catch','character','class','class_c','class_name_constant','clone','close_bracket',
+'close_curly','close_square','close_tag','colon','comma','comment','concat_equal','const','constant_encapsed_string',
+'continue','curly_open','dec','declare','default','div','div_equal','dnumber','do','doc_comment','dollar',
+'dollar_open_curly_braces','dot','double_arrow','double_cast','double_colon','double_quotes','echo','else',
+'elseif','empty','encapsed_and_whitespace','enddeclare','endfor','endforeach','endif','endswitch','endwhile',
+'end_heredoc','equal','eval','exclamation_mark','exit','extends','file','final','for','foreach','func_c','global',
+'gt','if','implements','inc','include','include_once','inline_html','instanceof','int_cast','isset','is_equal',
+'is_greater_or_equal','is_identical','is_not_equal','is_not_identical','is_smaller_or_equal','line','list',
+'lnumber','logical_and','logical_or','logical_xor','lt','method_c','minus','minus_equal','mod_equal','mult',
+'mult_equal','new','num_string','object_cast','object_operator','open_bracket','open_curly','open_square',
+'open_tag','open_tag_with_echo','or_equal','paamayim_nekudotayim','percent','pipe','plus','plus_equal','print',
+'private','protected','public','question_mark','require','require_once','return','semicolon','sl','sl_equal',
+'sr','sr_equal','start_heredoc','static','string','string_cast','string_varname','switch','throw','tilde',
+'try','unset','unset_cast','use','use_function','var','variable','while','whitespace','xor_equal','halt_compiler',
+'dir','goto','namespace','ns_c','ns_separator','callable','insteadof','trait','trait_c','finally','yield',
+'ellipsis','pow','pow_equal','coalesce','spaceship','yield_from','coalesce_equal','fn'
+];
+foreach($_fedAutoLoadtokenSubClasses as $_fedAutoLoadi)
+	$_fedAutoLoadtokens["php_token_{$_fedAutoLoadi}"] = '/Token.php';
+\Fedora\Autoloader\Autoload::addClassMap($_fedAutoLoadtokens, __DIR__);
+};
+$_gentooFedAutoload();
+unset ($_gentooFedAutoload);
+
diff --git a/dev-php/PHP_TokenStream/files/channel.xml b/dev-php/PHP_TokenStream/files/channel.xml
deleted file mode 100644
index 91bb6786f543..000000000000
--- a/dev-php/PHP_TokenStream/files/channel.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<channel version="1.0" xmlns="http://pear.php.net/channel-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/channel-1.0 http://pear.php.net/dtd/channel-1.0.xsd">
-    <name>pear.phpunit.de</name>
-    <summary>PHPUnit PEAR Channel</summary>
-    <suggestedalias>phpunit</suggestedalias>
-    <servers>
-        <primary>
-            <rest>
-                <baseurl type="REST1.0">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.1">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.2">http://pear.phpunit.de/rest/</baseurl>
-                <baseurl type="REST1.3">http://pear.phpunit.de/rest/</baseurl>
-            </rest>
-        </primary>
-    </servers>
-</channel>
\ No newline at end of file