gentoo resync : 06.08.2019

6 files changed, 52 insertions, 199 deletions

diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
index b5f9df12a738..e1a0cc0d83bf 100644
--- a/dev-php/twig/Manifest
+++ b/dev-php/twig/Manifest
@@ -1,8 +1,6 @@
-AUX 1.40.1-autoloader-path.patch 852 BLAKE2B 5a09a7fc095fd4ae34ccadd35cbb97b2ba7e4e7ae8735d1beb04ed3014f984583245b44a2d96e3283daa73fc2767de7794c40f8033624499d8fb0bd3786f4bf0 SHA512 bff2e1acab5dc61b930d3698add018eb60975a7f043d4abc764579109a0d026bfe0be29e7d0756efcf583ad84bc3831ca6d081d36ec16e6b2e6651d9c7e9534f
 AUX Autoloader.php 503 BLAKE2B 57679179226098eea818df53154b98afd3249f12a219fc894a7529bdcb8ceb39c7c5c20f14263ce03875983ab0acaeaa6e09ca8446ee5b9a591b6e284e7f9238 SHA512 054a9420a23b67c57ca0780fdbc3c817436dea71780714654469efa23c0d17173e1c87b2f3c6ce48e26e4dd49a92f1f17e2e23472a666513e9fb8903a4f11699
 DIST twig-1.40.1.tar.gz 274081 BLAKE2B 0e73bd9fff58677446ba03ed560bff17c1879192b79cca9f718ccd330e1eac64ee1195d7034fa52ec009e323868d1cc1bedc182e90f0a77c8b54d6aa16022554 SHA512 de174e5dd14562a155515a3238aa07ef5a22c3bf0eff8ecc320f1a972e56f1ec759a53ee24579c6434e286b3775044e88c753fd08930037314b45c9577b310b1
-DIST twig-1.42.2.tar.gz 277760 BLAKE2B c72462b172f1cda85ca8a7988870e20abf09bdc6114eb428213508fcf9c19a2b10e180e8fa052b8e51e8aee749c7c0ded936e5792ca1f8b5c7024872335df3fb SHA512 17ccfcea750d9d9154841598b34de8882aa1144696d912c8175b1add996db4f31b3cb85bc68dc75f62944fe858345811ebbf952aabb0c3ff8c1bbc2a0f1a2576
+DIST twig-1.42.3.tar.gz 278164 BLAKE2B 4bff9f7f85ce8ca00871e9342ec11a68d4b930f7761bc7404f504322483d328570e9e540e2518b5e1ad513002ce95686b7a1a47ff7aa4b28c16b2871ba759b01 SHA512 9dc892d80445f9fa9a3bde5cfdc49f2975a43f36123c1f4bbbb40740269e9aa4355d0d8668552e535f74a8ff27cc8ee1dc6983b50567993c1deab09569a7c5e3
 EBUILD twig-1.40.1-r1.ebuild 1369 BLAKE2B d0cb11c5eacd37538ad94097a5c2db78c351893140df5f025b82a8f3b8ec57ebadfee4ecafc2be5c527955656315e20ea9b404ecdaf374a92864c6f66edcb421 SHA512 e4243f710ed4287c8bd8ebb74bba91e534c1b6ec3b898706dbbd2cc7920682bc0c78e92472ad33257696df1031acbcfdf5a67036f7ff0a050cb3ccb49e30106b
-EBUILD twig-1.40.1.ebuild 2738 BLAKE2B 7bb7d6d53773a8c1c8dfe222b4fc84233914456fd9e04ba75404e371e39168b4506158f73f3b89c647c7a3deff516389edd56a8792a3661f6802086e12ad7b18 SHA512 d70a35093e913df6d03aca6179d6c14d0971a999f4202059653eabc441858fba4f96211d6b3c64956e524ad60a6987e23053b8b0a2f809590f2b0b5bf74cdc8b
-EBUILD twig-1.42.2.ebuild 2678 BLAKE2B 9164ac002107614f31b67bf08f10104136b8bd5c5243e7c899c5b79c7dc8109ac17b28ada77492dcc5cd9dd3607bde5841718dc2647b5da752ba24e496e94b52 SHA512 d04fcdcf3d99db5c04ddb759aaf49a73f2c7b2a5d01e9badf1e3ad302cc0dc2dca0981d36a482c77ada7bbe53f2b245e9b5d3055b3b60dff74012aedd62be8fe
-MISC metadata.xml 545 BLAKE2B ccc89ed2677959e71586c28951a718dc42b2dbce61803762b75198606407ed8ed4eebbcd18cee00591fb6c9f22e422c8e026d4a5cd4814db3af47b8f31eb88ad SHA512 7374d514d449d55037c8c57a0fb95162bb11b9ad80cb9896510cc1fddad6a984c19fff5431ce4f2d9ecd49dad72cd54edc25e521c986c4347a841c1a4b8435de
+EBUILD twig-1.42.3.ebuild 1369 BLAKE2B d0cb11c5eacd37538ad94097a5c2db78c351893140df5f025b82a8f3b8ec57ebadfee4ecafc2be5c527955656315e20ea9b404ecdaf374a92864c6f66edcb421 SHA512 e4243f710ed4287c8bd8ebb74bba91e534c1b6ec3b898706dbbd2cc7920682bc0c78e92472ad33257696df1031acbcfdf5a67036f7ff0a050cb3ccb49e30106b
+MISC metadata.xml 438 BLAKE2B 412d85f4f682c6c8e279082834468d3a59cbe2d9fbaaef1f7674903a59e68982d3ec6059f61517383a05488d7bff960ca36dbc869f588388c98511fca5662e5b SHA512 849a7ea4878de239a4454b63f63ecf3ac959ba7fb49d83b0cb60891974bb1cf2c330d27188f6b2ca7cee2f2ad5aefebeb4b914f3eb50eff4e09c973d8ca80339
diff --git a/dev-php/twig/files/1.40.1-autoloader-path.patch b/dev-php/twig/files/1.40.1-autoloader-path.patch
deleted file mode 100644
index 8c236883e070..000000000000
--- a/dev-php/twig/files/1.40.1-autoloader-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/lib/Twig/Autoloader.php	2019-04-29 16:12:28.000000000 +0200
-+++ b/lib/Twig/Autoloader.php.new	2019-05-06 21:37:39.955238245 +0200
-@@ -43,9 +43,11 @@
-             return;
-         }
- 
--        if (is_file($file = __DIR__.'/../'.str_replace(['_', "\0"], ['/', ''], $class).'.php')) {
-+        if (is_file($file = __DIR__.'/../'.str_replace(['Twig_', "\0"], ['lib/', ''], $class).'.php')) {
-             require $file;
--        } elseif (is_file($file = __DIR__.'/../../src/'.str_replace(['Twig\\', '\\', "\0"], ['', '/', ''], $class).'.php')) {
-+        } elseif (is_file($file = __DIR__.'/../'.str_replace(['_', "\0"], ['/', ''], $class).'.php')) {
-+            require $file;
-+        } elseif (is_file($file = __DIR__.'/../src/'.str_replace(['Twig\\', '\\', "\0"], ['', '/', ''], $class).'.php')) {
-             require $file;
-         }
-     }
diff --git a/dev-php/twig/metadata.xml b/dev-php/twig/metadata.xml
index 434d766441f9..26aeb448aae9 100644
--- a/dev-php/twig/metadata.xml
+++ b/dev-php/twig/metadata.xml
@@ -9,11 +9,6 @@
     <email>php-bugs@gentoo.org</email>
     <name>PHP</name>
   </maintainer>
-  <use>
-    <flag name="extension">
-      Build the C extension (only for php-5.6.x).
-    </flag>
-  </use>
   <upstream>
     <remote-id type="github">twigphp/Twig</remote-id>
   </upstream>
diff --git a/dev-php/twig/twig-1.40.1.ebuild b/dev-php/twig/twig-1.40.1.ebuild
deleted file mode 100644
index 0903fb3e789b..000000000000
--- a/dev-php/twig/twig-1.40.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="Twig"
-USE_PHP="php5-6"
-S="${WORKDIR}/${MY_PN}-${PV}"
-PHP_EXT_S="${S}/ext/${PN}"
-PHP_EXT_NAME="${PN}"
-PHP_EXT_OPTIONAL_USE="extension"
-
-inherit eutils php-ext-source-r3
-
-DESCRIPTION="PHP templating engine with syntax similar to Django"
-HOMEPAGE="http://twig.sensiolabs.org/"
-SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc extension test"
-
-DEPEND="test? ( dev-php/phpunit )"
-
-# We always require *some* version of PHP; the eclass (conditionally)
-# requires *specific* versions.
-RDEPEND="dev-lang/php"
-
-src_prepare(){
-	# We need to call eapply_user ourselves, because it may be skipped
-	# if either the "extension" USE flag is not set, or if the user's
-	# PHP_TARGETS is essentially empty (does not contain "php5-6"). In
-	# the latter case, the eclass src_prepare does nothing. We only call
-	# the eclass phase conditionally because the correct version of
-	# e.g. "phpize" may not be there unless USE=extension is set.
-	epatch "${FILESDIR}/${PV}-autoloader-path.patch"
-	eapply_user
-	use extension && php-ext-source-r3_src_prepare
-}
-
-src_configure() {
-	# The eclass phase will try to run the ./configure script even if it
-	# doesn't exist (in contrast to the default src_configure), so we
-	# need to skip it if the eclass src_prepare (that creates said
-	# script) is not run.
-	use extension && php-ext-source-r3_src_configure
-}
-
-src_compile() {
-	# Avoids the same problem as in src_configure.
-	use extension && php-ext-source-r3_src_compile
-}
-
-src_install(){
-	use extension && php-ext-source-r3_src_install
-
-	cd "${S}" || die
-	# The autoloader requires the 'T' in "Twig" capitalized.
-	insinto "/usr/share/php/${MY_PN}/lib"
-	doins -r lib/"${MY_PN}"/*
-	insinto "/usr/share/php/${MY_PN}/src"
-	doins -r src/*
-	insinto "/usr/share/php/${MY_PN}"
-	dosym "lib/Autoloader.php" "/usr/share/php/${MY_PN}/Autoloader.php"
-
-	# The eclass src_install calls einstalldocs, so we may install a few
-	# files twice. Doing so should be harmless.
-	dodoc README.rst CHANGELOG
-
-	# This installs the reStructuredText source documents. There's got
-	# to be some way to turn them into HTML using Sphinx, but upstream
-	# doesn't provide for it.
-	use doc && dodoc -r doc
-}
-
-src_test(){
-	phpunit --bootstrap test/bootstrap.php || die "test suite failed"
-}
-
-pkg_postinst(){
-	elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
-	elog "To use it in a script, require('${MY_PN}/Autoloader.php'),"
-	elog "and then run \"Twig_Autoloader::register();\". Most of"
-	elog "the examples in the documentation should work without"
-	elog "further modification."
-}
diff --git a/dev-php/twig/twig-1.42.2.ebuild b/dev-php/twig/twig-1.42.2.ebuild
deleted file mode 100644
index 54c306ddc744..000000000000
--- a/dev-php/twig/twig-1.42.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="Twig"
-USE_PHP="php5-6"
-S="${WORKDIR}/${MY_PN}-${PV}"
-PHP_EXT_S="${S}/ext/${PN}"
-PHP_EXT_NAME="${PN}"
-PHP_EXT_OPTIONAL_USE="extension"
-
-inherit eutils php-ext-source-r3
-
-DESCRIPTION="PHP templating engine with syntax similar to Django"
-HOMEPAGE="http://twig.sensiolabs.org/"
-SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc extension test"
-
-DEPEND="test? ( dev-php/phpunit )"
-
-# We always require *some* version of PHP; the eclass (conditionally)
-# requires *specific* versions.
-RDEPEND="dev-lang/php"
-
-src_prepare(){
-	# We need to call eapply_user ourselves, because it may be skipped
-	# if either the "extension" USE flag is not set, or if the user's
-	# PHP_TARGETS is essentially empty (does not contain "php5-6"). In
-	# the latter case, the eclass src_prepare does nothing. We only call
-	# the eclass phase conditionally because the correct version of
-	# e.g. "phpize" may not be there unless USE=extension is set.
-	eapply_user
-	use extension && php-ext-source-r3_src_prepare
-}
-
-src_configure() {
-	# The eclass phase will try to run the ./configure script even if it
-	# doesn't exist (in contrast to the default src_configure), so we
-	# need to skip it if the eclass src_prepare (that creates said
-	# script) is not run.
-	use extension && php-ext-source-r3_src_configure
-}
-
-src_compile() {
-	# Avoids the same problem as in src_configure.
-	use extension && php-ext-source-r3_src_compile
-}
-
-src_install(){
-	use extension && php-ext-source-r3_src_install
-
-	cd "${S}" || die
-	# The autoloader requires the 'T' in "Twig" capitalized.
-	insinto "/usr/share/php/${MY_PN}/lib"
-	doins -r lib/*
-	insinto "/usr/share/php/${MY_PN}/src"
-	doins -r src/*
-	insinto "/usr/share/php/${MY_PN}"
-	#dosym "lib/Autoloader.php" "/usr/share/php/${MY_PN}/Autoloader.php"
-
-	# The eclass src_install calls einstalldocs, so we may install a few
-	# files twice. Doing so should be harmless.
-	dodoc README.rst CHANGELOG
-
-	# This installs the reStructuredText source documents. There's got
-	# to be some way to turn them into HTML using Sphinx, but upstream
-	# doesn't provide for it.
-	use doc && dodoc -r doc
-}
-
-src_test(){
-	phpunit --bootstrap test/bootstrap.php || die "test suite failed"
-}
-
-pkg_postinst(){
-	elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
-	elog "To use it in a script, require('${MY_PN}/Autoloader.php'),"
-	elog "and then run \"Twig_Autoloader::register();\". Most of"
-	elog "the examples in the documentation should work without"
-	elog "further modification."
-}
diff --git a/dev-php/twig/twig-1.42.3.ebuild b/dev-php/twig/twig-1.42.3.ebuild
new file mode 100644
index 000000000000..c06e5c627361
--- /dev/null
+++ b/dev-php/twig/twig-1.42.3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="Twig"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DESCRIPTION="PHP templating engine with syntax similar to Django"
+HOMEPAGE="http://twig.sensiolabs.org/"
+SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="dev-lang/php:*[ctype] dev-php/fedora-autoloader"
+DEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
+# Test fail due to missing Symphony dependencies
+RESTRICT="test"
+
+src_install(){
+	# The autoloader requires the 'T' in "Twig" capitalized.
+	insinto "/usr/share/php/${MY_PN}/lib"
+	doins -r lib/"${MY_PN}"/*
+	insinto "/usr/share/php/${MY_PN}/src"
+	doins -r src/*
+	insinto "/usr/share/php/${MY_PN}"
+	doins "${FILESDIR}/Autoloader.php"
+
+	dodoc README.rst CHANGELOG
+
+	# This installs the reStructuredText source documents. There's got
+	# to be some way to turn them into HTML using Sphinx, but upstream
+	# doesn't provide for it.
+	use doc && dodoc -r doc
+}
+
+src_test(){
+	cp "${FILESDIR}/Autoloader.php" "${S}" || die
+	phpunit --bootstrap Autoloader.php || die "test suite failed"
+	rm "${S}/Autoloader.php" || die
+}
+
+pkg_postinst(){
+	elog "${PN} has been installed in /usr/share/php/${MY_PN}/."
+	elog "To use it in a script, require('${MY_PN}/Autoloader.php')"
+}