[gentoo-commits] repo/gentoo:master commit in: dev-php/twig/, dev-php/twig/files/

[Brian Evans]

commit:     147ff3d952aeea19a822f42ba2805e980d696735
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 26 13:37:27 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Aug 26 13:37:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=147ff3d9

dev-php/twig: Drop old versions which include the extension

PHP 5.6 is EOL and the extension needs to go away
PHP team is planning on masking 5.6 2019-10-01

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-php/twig/Manifest                           |  1 -
 dev-php/twig/files/1.40.1-autoloader-path.patch | 16 -----
 dev-php/twig/metadata.xml                       |  5 --
 dev-php/twig/twig-1.40.1.ebuild                 | 87 -------------------------
 dev-php/twig/twig-1.42.2.ebuild                 | 86 ------------------------
 5 files changed, 195 deletions(-)

diff --git a/dev-php/twig/Manifest b/dev-php/twig/Manifest
index 36d6379ab8f..5f5c81ed533 100644
--- a/dev-php/twig/Manifest
+++ b/dev-php/twig/Manifest
@@ -1,3 +1,2 @@
 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

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 8c236883e07..00000000000
--- 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 434d766441f..26aeb448aae 100644
--- a/dev-php/twig/metadata.xml
+++ b/dev-php/twig/metadata.xml
@@ -9,11 +9,6 @@
     <email>php-bugs@g.o</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 0903fb3e789..00000000000
--- 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 54c306ddc74..00000000000
--- 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."
-}