gentoo resync : 16.01.2021

9 files changed, 190 insertions, 0 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 232c2eb74039..4025191f1c8b 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-XML_Parser/Manifest b/dev-php/PEAR-XML_Parser/Manifest
index 82acc30cff8a..ca152aac1066 100644
--- a/dev-php/PEAR-XML_Parser/Manifest
+++ b/dev-php/PEAR-XML_Parser/Manifest
@@ -1,5 +1,7 @@
+AUX XML_Parser-1.3.8-php8.patch 2326 BLAKE2B eea8733bfbb1e36ff64ac666b7d52fc7f5b0770dd8c99c6fc25daa3f1e480faa86d786e88593aac791c11e1500b0f560b819438ac13760f1066097bc74c597f0 SHA512 46f1ff5d882901ff761a940276c9e54e4050091f786935eaf93d775073b6c02cf3d8659024b97a196f653ecd2f160eadaed42c10ebe30ded3ae42b502a100255
 DIST XML_Parser-1.3.7.tgz 13339 BLAKE2B 10cc89dbf4f6c4b28fea73cc45757e71a897b01fd21a3d2711fef5eb0cd33e1fdeda143ce88dd425fdea9802a02f3d7e352ec17295b88d8cfae87af6a342f622 SHA512 b4e6c76962eb47f15096e7d77658cf41ca372a9389967e5204e865b253da4f4e248e7b893aa4c6624bb1178e3985667d018849df6d9a07aa6b9a707c743fe64b
 DIST XML_Parser-1.3.8.tgz 13534 BLAKE2B c0227d48b43b9b0fec3251c81e56017344101b4a2dc9a5eb85310d1130148a1d7e365b3b6e3f4fcab03aeac1f702f81f22d45c4db67ff515836ef8a173cd7d4c SHA512 f840acf2e068d642177d37958487021b5bf57cd33048738f2f18fa35d83dfe428ce327900a9a141c2a184e4dbdddc9e8eefaf87604131f516f016aee30aad603
 EBUILD PEAR-XML_Parser-1.3.7-r1.ebuild 335 BLAKE2B 8d0a94831080a1b63f6d027f0bc8116e4ab060a7d006c845988b741cd3bdd632413506e6d6c27a5600c4a576e787560c44cdfd3556b16ccb8aa6bac044f4a747 SHA512 c92564e9843a44010860df1d75742d0ee0b268dd691a5f58f56042add9ef1d05fc48e246f43ed969b125c02e1640dbc46d70848511c82db0ac1378de231c1e9f
+EBUILD PEAR-XML_Parser-1.3.8-r1.ebuild 798 BLAKE2B 93297c78f0f949d872fe7e9aadeead3ac6d211b172b5b403544d2b8b827d9a16ca64295a75e56b702da9a23a550903eaad3acdf7e9b1bdc70b1df2b0f72b1762 SHA512 ee751f12cc4c2b5481d032ae70819065b90265152611ee5239a5e6a48e240c2243757a446d59babb1d35ff82e5dc6efcb0772422879f3e70b4552b576c1cb182
 EBUILD PEAR-XML_Parser-1.3.8.ebuild 341 BLAKE2B dc7dd85a9ce752a957097bc131fcc7ac565139ebb5f693d8731a2f191ba20e3e17ba9a72cfbf024eb86f8858497b9fb23a3eff58e7b174ca89d7c7c47667d19a SHA512 7ea194eca487b19e8d95f3c182fe3dca4e3a07bcac0758c6e2bcafea7774bddc3cd1c362157b6ce6249f79e97aa7ebecf02286453a481bf435cc94ecee16065c
 MISC metadata.xml 236 BLAKE2B 55612da78a71f8cee31c387a5862636996734210d765fac66d8c7706acc5151e6a9e7ff5123aeb097c911495c6220ba3b5d2f1355f46e8ab6bdb240e1697e26d SHA512 2782b20a65dca663ff7c64b7e67db05641abed478fd5996e5750b2e52ba870829f89125baa8967dd29fd20ef9b46ad233b0dd08801308b7756717ec2f292446c
diff --git a/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8-r1.ebuild b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8-r1.ebuild
new file mode 100644
index 000000000000..461ae05c1155
--- /dev/null
+++ b/dev-php/PEAR-XML_Parser/PEAR-XML_Parser-1.3.8-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit php-pear-r2
+
+DESCRIPTION="XML parsing class based on PHP's SAX parser"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+# This is to match patch compatibility
+RDEPEND="!<dev-php/PEAR-XML_RSS-1.1.0-r2"
+
+PATCHES=( "${FILESDIR}/XML_Parser-1.3.8-php8.patch" )
+
+src_test() {
+	peardev run-tests -r || die
+}
+
+pkg_postinst() {
+	php-pear-r2_pkg_postinst
+	elog 'This version includes a PHP 8 compatibilty patch for startHandler'
+	elog 'which removes the pass-by-reference off of $attribs (third parameter).'
+	elog 'This could break old scripts with recent versions until that override also'
+	elog 'removes the pass-by-reference.'
+}
diff --git a/dev-php/PEAR-XML_Parser/files/XML_Parser-1.3.8-php8.patch b/dev-php/PEAR-XML_Parser/files/XML_Parser-1.3.8-php8.patch
new file mode 100644
index 000000000000..8115fd8d7297
--- /dev/null
+++ b/dev-php/PEAR-XML_Parser/files/XML_Parser-1.3.8-php8.patch
@@ -0,0 +1,66 @@
+diff -aruN a/XML/Parser.php b/XML/Parser.php
+--- a/XML/Parser.php	2022-01-10 11:32:08.624378884 -0500
++++ b/XML/Parser.php	2022-01-10 11:47:09.581396869 -0500
+@@ -651,12 +651,12 @@
+      *
+      * @param mixed $xp       ??
+      * @param mixed $elem     ??
+-     * @param mixed &$attribs ??
++     * @param mixed $attribs ??
+      *
+      * @return null
+      * @abstract
+      */
+-    function startHandler($xp, $elem, &$attribs)
++    function startHandler($xp, $elem, $attribs)
+     {
+         return null;
+     }
+diff -aruN a/tests/001.phpt b/tests/001.phpt
+--- a/tests/001.phpt	2019-04-10 14:18:52.000000000 -0400
++++ b/tests/001.phpt	2022-01-10 11:46:50.341458673 -0500
+@@ -13,10 +13,10 @@
+ require_once "XML/Parser.php";
+ 
+ class __TestParser1 extends XML_Parser {
+-    function startHandler($xp, $element, &$attribs) {
++    function startHandler($xp, $element, $attribs) {
+         print "<$element";
+         reset($attribs);
+-        while (list($key, $val) = each($attribs)) {
++        foreach ($attribs as $key => $val) {
+             $enc = htmlentities($val);
+             print " $key=\"$enc\"";
+         }
+diff -aruN /tests/002.phpt /tests/002.phpt
+--- a/tests/002.phpt	2019-04-10 14:18:52.000000000 -0400
++++ b/tests/002.phpt	2022-01-10 11:46:58.281433169 -0500
+@@ -13,10 +13,10 @@
+ require_once "XML/Parser.php";
+ 
+ class __TestParser2 extends XML_Parser {
+-    function startHandler($xp, $element, &$attribs) {
++    function startHandler($xp, $element, $attribs) {
+         print "<$element";
+         reset($attribs);
+-        while (list($key, $val) = each($attribs)) {
++        foreach ($attribs as $key => $val) {
+             $enc = htmlentities($val);
+             print " $key=\"$enc\"";
+         }
+diff -aruN /tests/003.phpt /tests/003.phpt
+--- a/tests/003.phpt	2019-04-10 14:18:52.000000000 -0400
++++ b/tests/003.phpt	2022-01-10 11:41:03.402573127 -0500
+@@ -13,10 +13,10 @@
+ require_once "XML/Parser.php";
+ 
+ class __TestParser3 extends XML_Parser {
+-    function startHandler($xp, $element, &$attribs) {
++    function startHandler($xp, $element, $attribs) {
+         print "<$element";
+         reset($attribs);
+-        while (list($key, $val) = each($attribs)) {
++        foreach ($attribs as $key => $val) {
+             $enc = htmlentities($val);
+             print " $key=\"$enc\"";
+         }
diff --git a/dev-php/PEAR-XML_RSS/Manifest b/dev-php/PEAR-XML_RSS/Manifest
index 5360610ac9ec..57e737a05005 100644
--- a/dev-php/PEAR-XML_RSS/Manifest
+++ b/dev-php/PEAR-XML_RSS/Manifest
@@ -1,6 +1,8 @@
+AUX XML_RSS-1.1.0-php8.patch 435 BLAKE2B 2be25c01a0b5199da9c980c76968e4abcd000542a6d35669ca77df3bc8c5d3908c3b0506bb8716db99f00694d3c41ab99fc432d27aa7acb825f8486e2fb9685c SHA512 4de21ea93afce259d9f4a8797e55271a5d0a1d02c83c7044a71042047657af1f66d3a813a40a15bcba6c7f848e3234b7685f0c1d6de473680d0d2790e8a50f4f
 DIST XML_RSS-1.1.0.tgz 8178 BLAKE2B da290ea2e656372478435451b5043f3254e1a06423495c62c753b636208ece31e5b9aebe59a9b84254aac70d2088b4c35f78b763b6045d29c467ff0989bbc6fa SHA512 947b040ec71728328bad0130da874132c12e8c14a37f57b0ebc4e9db26aed49d0f9702e20ae401bd92782e1895de71dbd5daf09adebec0eaf268c77dfe183c24
 DIST XML_RSS-1.1.0a1.tgz 6717 BLAKE2B f38aaa6981d94668031272cd48f5648ce9fec499fde4627b6291d1a9c0dea4db72779e3ce7a089be9ee5d23ad56d05c6bd3ffce031b9ef3f4fac5360c3da4420 SHA512 e88c7618cad60a775c07ac26aedf05b7ce7ab3c9f012f3e638031b3567227db237ee2e1238fa051f9f415388a5d7c131af02b8200e08c01a9078654ea5877ce8
 EBUILD PEAR-XML_RSS-1.1.0-r1.ebuild 647 BLAKE2B b2b2bc8d0fe2e1c5b8bace7ea71dc4675ae41b35c5d745cbdaaa11fc463f249ab19d6e4854f788f74658ad17bf6a194c7b913bedc417999a77928c060d2158a3 SHA512 c703c51b9d47635bb990f500d59a6d700d4b2128f27c5b280eec63408f59ca25aff8f44eb963960c0e000a1c21e5245e3e9cc7f10f26abc7653bc6719e417e3e
+EBUILD PEAR-XML_RSS-1.1.0-r2.ebuild 710 BLAKE2B 448098c1c7c688d159f89fd6ef56136d569f0f625962961b827d8e9fa506c8ea0e89e9680b627d3465bb81dedd1714758efa3457a4c65b94aa8071145d0d3845 SHA512 6526803869f1a32486b352358e2d7184da9957b3f8473973398b27cd12326246c685ca4763bbe3a9259963d15fae27467502d0bb867f9dc75b78550372b282be
 EBUILD PEAR-XML_RSS-1.1.0.ebuild 487 BLAKE2B 8440250374caa8e0576b6fce03b94365a20fe427d9426c940a0f2d157b1fd32d908e260909fb751a11741f05c5dba16f35de902202d95b46a232c33186f520a6 SHA512 f7057116b01bcb37cc34080458443c1df0e4a1d4ac539643183883ff5709f496620797f635a3e17cfe3b6ffb85137c4e45a5a67a0d6a3d83694f83a9e4b1e41c
 EBUILD PEAR-XML_RSS-1.1.0_alpha1.ebuild 744 BLAKE2B 77fb85bb46773022fe8a017ccb3ab4e923e604c0986b6d7b0ed5ab7a84af0d5812769cf87dc8b55014c4cea1755567dab608dcb0597c5f9b8d73733ff9057065 SHA512 e8d9b93a30bc6d13ed42eaa310aa656166e05e32375b9d9c85edf17175fe0693881df55d3fb0cd469be5193fca8f66a2aa158e68b5623a5385a60c76e3c6dde0
 MISC metadata.xml 399 BLAKE2B f3ef6e861b38cd9ce49b1552de3532ffdeb2ea57d93c84f9609ef4ffa60eb92a91de63bed850d67bd0b913d07fabf1a8629037d1e9ec8ad0fa88edfb071f81f7 SHA512 b354f9fe5ca15d0a9216d4a2bc7dc6f1bd4315b33473c7c66085c87af10cc9814397746006c4185e3f69f020d6128a633946a85366520259a6c3feca41aad2e9
diff --git a/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0-r2.ebuild b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..0511a5abb0a6
--- /dev/null
+++ b/dev-php/PEAR-XML_RSS/PEAR-XML_RSS-1.1.0-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit php-pear-r2
+
+DESCRIPTION="PHP parser for RDF and RSS documents"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-php/PEAR-XML_Parser-1.3.8-r1"
+BDEPEND="test? ( ${RDEPEND} dev-php/phpunit )"
+
+PATCHES=( "${FILESDIR}/XML_RSS-1.1.0-php8.patch" )
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's/_Framework_/\\Framework\\/' \
+		-e 's/_TextUI_/\\TextUI\\/' \
+		tests/*.php
+}
+
+src_test() {
+	phpunit --bootstrap "${S}/XML/RSS.php" \
+		--cache-result-file="${T}/test-results.cache" tests || die
+}
diff --git a/dev-php/PEAR-XML_RSS/files/XML_RSS-1.1.0-php8.patch b/dev-php/PEAR-XML_RSS/files/XML_RSS-1.1.0-php8.patch
new file mode 100644
index 000000000000..b78765cb80ea
--- /dev/null
+++ b/dev-php/PEAR-XML_RSS/files/XML_RSS-1.1.0-php8.patch
@@ -0,0 +1,12 @@
+diff -aurN a/XML/RSS.php b/XML/RSS.php
+--- a/XML/RSS.php	2017-03-07 14:16:38.000000000 -0500
++++ b/XML/RSS.php	2022-01-11 09:09:34.745242886 -0500
+@@ -202,7 +202,7 @@
+      * @return void
+      * @access private
+      */
+-    function startHandler($parser, $element, &$attribs)
++    function startHandler($parser, $element, $attribs)
+     {
+         if (substr($element, 0, 4) == "RSS:") {
+             $element = substr($element, 4);
diff --git a/dev-php/smarty/Manifest b/dev-php/smarty/Manifest
index bff8b74715c6..01516091c15d 100644
--- a/dev-php/smarty/Manifest
+++ b/dev-php/smarty/Manifest
@@ -1,4 +1,6 @@
 DIST manual-en.3.1.14.zip 408414 BLAKE2B 03d4e7a386eb3bd5b19e5c555ec34b86812838a5b5fac8ec0ab9701fba89a5867714da57d950f68224a89bbe2267c18d638ee850681860de309c74bbfb3d0a0b SHA512 d384e3856b45ed3f992f3732a5465120abe9fb947cdf13ff67a9c4264f72987d24885ee61cd7309b728e64cdfe4f34c3e7f757096d35de56d962f3b78def9e58
 DIST smarty-3.1.39.tar.gz 264604 BLAKE2B ab5e8e052fd83e38a99725f03dcc4a206848c153b0584c12de1c605d9a9a5b47d23c29bd8a5179e53cf73921c89632ee2c4e9921002f41a4de97c6dc2e7d91a1 SHA512 84566bdefd83784c5b22ea4c21405261010a03e07839b15f6e1837aeb93ae12ae724a31648627b5f8794659e2fcd6cbbcd633be8d290dd1744e45e87fbe60fd2
+DIST smarty-4.0.3.tar.gz 358999 BLAKE2B 13866ff2da1d99672337815eb264b3941a51ef4b26079995790a1759e7a1acd1e6c724af25eae5eec18f992f1a1f08564746867d5c715df9755a8899cd96c641 SHA512 9a3cf224b38e4e0fd55d2242f4b09531ae44f581979b64754fea1bab4f540b49c0222e9a43622d87d3d82e68c6d8aaca31bb34dc0b1b691ed413de6af06e69cb
 EBUILD smarty-3.1.39.ebuild 1332 BLAKE2B 6223fcc88515195b121844c10598bfa3759d28943cc06c4295a2fdbd50f422d19e1bfd7dc720a93a0859eccf935acdc6331954a6f08163ef10bde05a59edf5de SHA512 ffa1e8578375016ed486ca4a81585acdacb96e82bf42fa52dd7950759cc31582ad67de1a4143c31d55a975f6baae877bba164a414e5fb7ed315601b4cb823f72
+EBUILD smarty-4.0.3.ebuild 1349 BLAKE2B 21a788ae2556328e15ff8153fb71e385ad2eca62126d87abd9f121f416a6d46646f1c211ffa876c4fa475265db8653033bb606ca3f786359125e4660f601e997 SHA512 7e1db2a808be9b30b9e7af27ce643b02406e3ce59eee3d0385b06b1b5127a2284e48c56909f4723093039d268f8a7027567f0779068b0d18d873f3211f24bff3
 MISC metadata.xml 742 BLAKE2B 2e882a2cd16715923bd3b93e032b2680fe07853bc0a1a03a62690f57a0254373611e5dd323dec285ac3d051dfdfd167f114c68ad4ca2caa916a76262d71e4725 SHA512 3589fb45084564c669e97fdebab3964ced2500dea7a53dd452961e71a3a2d5070cb71467dc3489a4a2474858ebf8f4d05d8b01728382e08215752b535b6a3681
diff --git a/dev-php/smarty/smarty-4.0.3.ebuild b/dev-php/smarty/smarty-4.0.3.ebuild
new file mode 100644
index 000000000000..b8594fc0e25c
--- /dev/null
+++ b/dev-php/smarty/smarty-4.0.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOC_PV="3.1.14"
+
+DESCRIPTION="A template engine for PHP"
+HOMEPAGE="https://www.smarty.net/"
+SRC_URI="https://github.com/smarty-php/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	doc? ( https://www.smarty.net/files/docs/manual-en.${DOC_PV}.zip )"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+BDEPEND="doc? ( app-arch/unzip )"
+
+# PHP unicode support is detected at runtime, and the cached templates
+# that smarty generates depend on it. If, later on, PHP is reinstalled
+# without unicode support, all of the previously-generated cached
+# templates will begin to throw 500 errrors for missing mb_foo
+# functions. See bug #532618.
+RDEPEND="dev-lang/php:*[unicode]"
+
+src_install() {
+	insinto "/usr/share/php/${PN}"
+	doins -r libs/*
+
+	local DOCS=( CHANGELOG.md README.md SECURITY.md )
+	local HTML_DOCS
+	use doc && HTML_DOCS="${WORKDIR}/manual-en/"*
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "${PN} has been installed in /usr/share/php/${PN}/."
+	elog
+	elog 'To use it in your scripts, include the Smarty.class.php file'
+	elog "from the \"${PN}\" directory; for example,"
+	elog
+	elog "  require('${PN}/Smarty.class.php');"
+	elog
+	elog 'After that, the Smarty class will be available to you.'
+}