gentoo resync : 06.04.2022

4 files changed, 6 insertions, 107 deletions

diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
index 380f8473ca54..9a214c523c2b 100644
--- a/dev-php/twig/Manifest
+++ b/dev-php/twig/Manifest
@@ -1,7 +1,4 @@
 AUX Autoloader.php 503 BLAKE2B 57679179226098eea818df53154b98afd3249f12a219fc894a7529bdcb8ceb39c7c5c20f14263ce03875983ab0acaeaa6e09ca8446ee5b9a591b6e284e7f9238 SHA512 054a9420a23b67c57ca0780fdbc3c817436dea71780714654469efa23c0d17173e1c87b2f3c6ce48e26e4dd49a92f1f17e2e23472a666513e9fb8903a4f11699
-DIST twig-1.40.1.tar.gz 274081 BLAKE2B 0e73bd9fff58677446ba03ed560bff17c1879192b79cca9f718ccd330e1eac64ee1195d7034fa52ec009e323868d1cc1bedc182e90f0a77c8b54d6aa16022554 SHA512 de174e5dd14562a155515a3238aa07ef5a22c3bf0eff8ecc320f1a972e56f1ec759a53ee24579c6434e286b3775044e88c753fd08930037314b45c9577b310b1
-DIST twig-1.42.3.tar.gz 278164 BLAKE2B 4bff9f7f85ce8ca00871e9342ec11a68d4b930f7761bc7404f504322483d328570e9e540e2518b5e1ad513002ce95686b7a1a47ff7aa4b28c16b2871ba759b01 SHA512 9dc892d80445f9fa9a3bde5cfdc49f2975a43f36123c1f4bbbb40740269e9aa4355d0d8668552e535f74a8ff27cc8ee1dc6983b50567993c1deab09569a7c5e3
-EBUILD twig-1.40.1-r1.ebuild 1372 BLAKE2B 75e3c4f3f38c36f0423ac633ed6ce78b0e8c53dd31823fcb30d8977c47161ab89917c04f5cabd48679f6bb70d552c8f5eee507cc1dea033192e2759618b90565 SHA512 2eb497b3edc86f26f4c39e7cbe477904dfaf8399e92a7452fd30eea4fdfb8d64f808a3889d996d2b144252c48b05723f812bc0dc105afe3fc6a374d171e48273
-EBUILD twig-1.42.3-r1.ebuild 1381 BLAKE2B 7eed6dba35c53dd75bc0537106c71f21e884098dbc624e6a0bb74c20df3e8b9a9470a4b0406db30552b9e1fd426b35395b948b41922705d81f0263d76b947173 SHA512 2913e54cb00cfc43599ebecfbd1af319bae8e01250aa666524edd6f5f483adac859f98fcb53672f9fb87a43e6829bb8246438d1ea60202323da3086eaee16813
-EBUILD twig-1.42.3.ebuild 1372 BLAKE2B 75e3c4f3f38c36f0423ac633ed6ce78b0e8c53dd31823fcb30d8977c47161ab89917c04f5cabd48679f6bb70d552c8f5eee507cc1dea033192e2759618b90565 SHA512 2eb497b3edc86f26f4c39e7cbe477904dfaf8399e92a7452fd30eea4fdfb8d64f808a3889d996d2b144252c48b05723f812bc0dc105afe3fc6a374d171e48273
+DIST twig-1.44.6.tar.gz 126880 BLAKE2B a838a5ae8bc82b6e0a39b55ba7d3817dd0ac0c2995881662fc5e7327a5dea83dea4740952282c9320016b379c08f02cb53a850004ecd2c919ca84da6267d0a56 SHA512 a443a700b71f982ea47187d9753ba9903e879f272ed53ff399211f5a76e7dd84774d5071a24cb8d5df6ffa754ce989fac152d0fe124ca460b8f167a553be86e7
+EBUILD twig-1.44.6.ebuild 1380 BLAKE2B 0db79b98e60fe42c1260922ae5a40bdc19c46619d735f92ad7317f2fe5b2c57c677cec695f642cd3ffa221fafe86769b32eee38045df13c1695e1b6f5cd25691 SHA512 9ebecbaa4b6eee4f12926d158173edfd7c2bbd27692249fb9cd9ed9794939c46e72afcbdc016c3f94c8cfa2097d6b9f5467218ca58ebbf50ccf7b8d622144e89
 MISC metadata.xml 439 BLAKE2B 27da78ff42447ff34923822ed56ad44183aa7d93ac23ab32bcc1b433a4df1e6e44b853cc36754497b0911ebc9dcbe143149bde1cdcd86eb479d11dc72d347758 SHA512 bedb9bc4acd125c8c1b548767f99e18a4cbbd6cb77a7e6e1631b7b4c58442900ead5d3954a84c6a5c79aadef9d6d4be848a1dbc5d8796d87e39545ca082147ae
diff --git a/dev-php/twig/twig-1.40.1-r1.ebuild b/dev-php/twig/twig-1.40.1-r1.ebuild
deleted file mode 100644
index 5935eab4bd1d..000000000000
--- a/dev-php/twig/twig-1.40.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 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')"
-}
diff --git a/dev-php/twig/twig-1.42.3.ebuild b/dev-php/twig/twig-1.42.3.ebuild
deleted file mode 100644
index 5935eab4bd1d..000000000000
--- a/dev-php/twig/twig-1.42.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 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')"
-}
diff --git a/dev-php/twig/twig-1.42.3-r1.ebuild b/dev-php/twig/twig-1.44.6.ebuild
index 1b651a90eb5c..6bdc6cf5c7c3 100644
--- a/dev-php/twig/twig-1.42.3-r1.ebuild
+++ b/dev-php/twig/twig-1.44.6.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_PN="Twig"
 S="${WORKDIR}/${MY_PN}-${PV}"
 
 DESCRIPTION="PHP templating engine with syntax similar to Django"
-HOMEPAGE="http://twig.sensiolabs.org/"
+HOMEPAGE="https://twig.symfony.com/"
 SRC_URI="https://github.com/twigphp/${MY_PN}/archive/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 LICENSE="BSD"
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="dev-lang/php:*[ctype] dev-php/fedora-autoloader"
-DEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
+BDEPEND="test? ( dev-php/phpunit ${RDEPEND} )"
 # Test fail due to missing Symphony dependencies
 RESTRICT="test"