gentoo resync : 06.08.2019

22 files changed, 112 insertions, 408 deletions

diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 25dba54b405c..daa1a0e438a3 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/PEAR-MDB2/Manifest b/dev-php/PEAR-MDB2/Manifest
index cbbb74b4866d..5e9e4e010ca4 100644
--- a/dev-php/PEAR-MDB2/Manifest
+++ b/dev-php/PEAR-MDB2/Manifest
@@ -1,3 +1,4 @@
 DIST MDB2-2.5.0b5.tgz 136834 BLAKE2B 4736cd205f186b56af4ad7b0c6a83aee5c042d06202464b4226d76e0e37608472f4650f6849de1912f6e47f35ff41ef6fe55f6449835f86ef7eb7ae8bb6e02e2 SHA512 76381594070d250f4428eebeaa4867e72b2be0723ec592ff4f0fba089823e97de057f93e630a5cb226ca2f67028bee57072a0af30677728d614d7a7242c6c6fc
 EBUILD PEAR-MDB2-2.5.0_beta5-r1.ebuild 875 BLAKE2B b9bbdb22670d60fa7221fe510cfa41bc346200951d0f3ce617e6465c68e9c238c53db41072ed10e695a8fe171bb36566b4c0d03d2ba2dd458cbd92749211a30e SHA512 a86f3135543576367ea8cd3e5932f7846591fdb3d3f213a811c14ebf9f9bed57550a97ddfd0769f0a270976a402d8c02c037a1410baa4ac268f560e3f59cdcce
+EBUILD PEAR-MDB2-2.5.0_beta5-r2.ebuild 882 BLAKE2B 4b69e044f0152dd8c3fe7cb8b0d9d9377d428cb0db8ffa20e264ecb9dc027211ccc3edbfb6a09192d5dc114a4f1df1bcccc59caa850cf29a52b1450264660cfb SHA512 1abbb9b1d743f5b2dd8314148b4a0f94522f05a451ba3d9ed83f85a76b34e8494e11b7032080b7fdeae68637ab3ccb063ee89c7d6a5bc5e1a5159a1be0edb4fb
 MISC metadata.xml 306 BLAKE2B c73f196a4a888c22bcde1298962ef829f5993b71d8ac5ded01f41b5fe2e91f599f8c9ed64e134ec26db62d9cc3c610397bf33159f3efde999ccc9cd40ab7bd4e SHA512 2edc3e48edb9d3788f5af8aea2797a72ff699c3fe28ed7664ebc1b1abe5d25616a54d3b9ace88ffef2399113d1678add85153b469d113f6e9e82808390d0373a
diff --git a/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
new file mode 100644
index 000000000000..001677444083
--- /dev/null
+++ b/dev-php/PEAR-MDB2/PEAR-MDB2-2.5.0_beta5-r2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PEAR_PV=${PV/_beta/b}
+
+inherit php-pear-r2
+
+DESCRIPTION="Database Abstraction Layer"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="mssql mysql mysqli oci8 oci8-instant-client postgres sqlite"
+
+RDEPEND=">=dev-php/PEAR-PEAR-1.9.1"
+
+PDEPEND="mssql? ( >=dev-php/PEAR-MDB2_Driver_mssql-1.3.0_beta4 )
+	mysql? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4 )
+	mysqli? ( >=dev-php/PEAR-MDB2_Driver_mysqli-1.5.0_beta4 )
+	oci8? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 )
+	oci8-instant-client? ( >=dev-php/PEAR-MDB2_Driver_oci8-1.5.0_beta4 )
+	postgres? ( >=dev-php/PEAR-MDB2_Driver_pgsql-1.5.0_beta4 )"
+
+DOCS=( docs/CONTRIBUTORS docs/MAINTAINERS docs/README docs/STATUS docs/TODO )
+HTML_DOCS=( docs/datatypes.html)
diff --git a/dev-php/PEAR-Net_SmartIRC/Manifest b/dev-php/PEAR-Net_SmartIRC/Manifest
index dfacfa77aa68..ffda77c6e802 100644
--- a/dev-php/PEAR-Net_SmartIRC/Manifest
+++ b/dev-php/PEAR-Net_SmartIRC/Manifest
@@ -1,7 +1,9 @@
 DIST Net_SmartIRC-1.1.10.tar.gz 927009 BLAKE2B b410a0b4a02e60e27860f9c6b0ab8fecf4874273601694ad61dcf88a2e916aee20d1858cf951fffb229f4eac0c0ddda55530bb6840da3c7b741cf9ee3971f7b2 SHA512 16ad30d358af99f40c53a75cf5f1c944a3e68f4c1cffd586acd61ceed280d5d1fcd4f4d5e88db55f1f66c37c5b7f37aec2f45a26dc6b98860eacb42c9f3fbea5
 DIST Net_SmartIRC-1.1.12.tgz 166039 BLAKE2B 43aec437de08d6e0dd651b810b21b5fed5587e2e7e154fe4f078cc618ee501c3d962b824931558458895541ddc9dc46ec3b1f0356aac5b052dd63b498018bb47 SHA512 2da5f0f9ea9167dfd1490fb6ba1e97416c78389924f390030ba71ea28dc5b667451223daa7e3878cbae607159054d656534ff646636f8f5294eb0bda1b17074c
 DIST Net_SmartIRC-1.1.13.tgz 166028 BLAKE2B 7e2b91dc01febe561c3ce55901f999f84f87fdbe20b5a1560a060125de4ae7d9869141cc0b2bcd9dfd0479a3a0a2d3c9d0f2719f70edc122df70f181d788f73b SHA512 d8f5a4f38b0aa830a84c9433deaf16b936f79e30bd9588cb0225ec20698af3d334fd1fdb320c64d1a72b0d206ae794b9e4135f1053855f586155694f6342cb0b
+DIST Net_SmartIRC-1.1.14.tgz 166115 BLAKE2B bacd23296dea25bc898ce3ba67d89949a3ad34675000bde9fe78371a7d97596272708f114b7980c3754cb862be68b84dcb0e8df10374cb560180d50c3bf61f49 SHA512 35cf0714a695e1b40e0db1f4d20c0ea4d431940e1e5894899db0bd13137e90c790067d266dc43f1ccc2921ad1f48cc70aa448225acac4358c8eb839f755717a0
 EBUILD PEAR-Net_SmartIRC-1.1.10-r1.ebuild 772 BLAKE2B 18f87d05e097ffb5b38209978ca92f429fb319a8c2414a068c780964c4bdb6a7346dcea647e7490e68aa9764afe4db6269b30b24a99be6cb585471f4d3d6c5ac SHA512 900e81b51fd39ceb8266f7bf5dadb39bf0585fe3a9b3ec40b51a7b3b6db0313a2b7a849a292be4767e4e426ed58167d29f980a5756cdaa86398be93221a01a76
 EBUILD PEAR-Net_SmartIRC-1.1.12.ebuild 545 BLAKE2B 80991f66ddd016eacdbf1c1d1b9232bf15a507e04e4ca530f0a78d135187c1a944cb7cf57e88a4266e45a0c20c76b74b720ee733daf6562e5fc303c978e75c64 SHA512 aea02f3d6ac0e4fd6b8fa92730162e6fe07e1e6299d084f8260cead0b2e8b6d982644ed4d37cb8c8ceeb296bf118b88f8913005d81b8e972e060885aeb56d4fe
 EBUILD PEAR-Net_SmartIRC-1.1.13.ebuild 542 BLAKE2B 8ea1b954d63b2b9b79c19b5188933c28a64978bcf64e48427ff5d2d5c54b27d7ef134f30c0d04a87c3d002fa9aef40b8fce72310827c9e96600089d5707abbd5 SHA512 9e8bd3b6c852f93458b9704a28f5b0ee11d7d8eb5f08dc1ed708d1b943026f379cac37679e2446b8db06544f34c48589bc2a0b1a4f3c892b66cead0caab563b8
+EBUILD PEAR-Net_SmartIRC-1.1.14.ebuild 542 BLAKE2B b83893302467febf4d294444c9bdfe1c902aff437b199cb519228fbd74ec15f5c350f0e09c16390a7626129cf22fd384ab875b61129b6980b082556268bc6e0e SHA512 f9f78d8fd37608299b72cd9efa58e27a7095e5e6d57c81c272a641fbe040fc20a1ed40d4b63899ec4d51f10c90d38a9f6258b313e759e1a6d8d4e4ab665246f6
 MISC metadata.xml 383 BLAKE2B ab5de001d8fe2ec2f6beaf3b457f5296123b286b335b3910ea58eadefe3369ab4fba6ad34fd1262ae465e2e521251b8034c046d1cbaf35afe819717d709917a7 SHA512 083df49fdd76cb7e00bb81b6501d0f475788cef1da463919fc35abc6d0725cda8b47fa027a1a3f6af4872897567b8ba8104463be276a1524182138bdc15d04c0
diff --git a/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.14.ebuild b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.14.ebuild
new file mode 100644
index 000000000000..c6e49dbd4c32
--- /dev/null
+++ b/dev-php/PEAR-Net_SmartIRC/PEAR-Net_SmartIRC-1.1.14.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit php-pear-r2
+
+DESCRIPTION="PHP class to communicate with IRC networks"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples"
+DOCS=( CREDITS FEATURES docs/HOWTO README.md )
+
+src_install() {
+	local HTML_DOCS=( )
+	use examples && HTML_DOCS+=( docs/examples/ )
+
+	if use doc; then
+		DOCS+=( docs/DOCUMENTATION )
+		HTML_DOCS+=( docs/HTML/* )
+	fi
+	php-pear-r2_src_install
+}
diff --git a/dev-php/ming-php/Manifest b/dev-php/ming-php/Manifest
deleted file mode 100644
index 86e926c9e6dc..000000000000
--- a/dev-php/ming-php/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX php_ext-config.m4 2939 BLAKE2B cb3e65a0397b753fb6675425e3eaab0c68349b7d14f387160133312b96f5a8101cea87125d03eafbfdef7ede77b2a85dd0b32d428e6c78019a4a3d2c84f9cd05 SHA512 88e3eb6f42c38d66c050c3e6c956e239861b8c17ed7f7c4867be00b06c9b48b806af3254bd8fbd4c7349a4ff41981bfcb1c7256d671dc5b8bf6d0089d8bf62cc
-DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0
-EBUILD ming-php-0.4.8.ebuild 1392 BLAKE2B fbb2e06a7b56daf644275d3bd1bb22a87ae9fb96ee74b4f66136221559b92b1853cf43a9091d6e7aa1617b7399226c71ac575814bf7d575d6e802f337abf39a3 SHA512 0374a19eb15598b2c9a2e753f3b1b59431de81a0137554bcef45d180e45df98646bafe134ab5fba5f4e2ea356f7783d5d03188636fb31e2593459aea8afba1c8
-MISC metadata.xml 475 BLAKE2B 3f1db2ece7aef5e9f24e7fc1b2649422102cacb521ba830ae36a7cb7683957bcb89366d980c305fb9ad2a7fee9ecb87176e934f6ba328a6a2039d36f9c3ca207 SHA512 f5586b50f459b96dd287bb1ee2d1a166cb8086584c76f5b5b68cf1d8271afe22903f77d8641aee3c2d68ffd2b41441aed5f641a303b6f43243d67d65d41748c4
diff --git a/dev-php/ming-php/files/php_ext-config.m4 b/dev-php/ming-php/files/php_ext-config.m4
deleted file mode 100644
index 9f4cd19790b0..000000000000
--- a/dev-php/ming-php/files/php_ext-config.m4
+++ /dev/null
@@ -1,112 +0,0 @@
-PHP_LIBDIR=lib
-
-PHP_ARG_WITH(ming, for MING support,
-[  --with-ming[=DIR]       Include MING support])
-
-if test "$PHP_MING" != "no"; then
-  AC_CHECK_LIB(m, sin)
-
-  for i in $PHP_MING ../../src /usr/local /usr; do
-    if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libming.a; then
-      MING_DIR=$i
-      break
-    fi
-  done
-
-  if test -z "$MING_DIR"; then
-    AC_MSG_ERROR(Please reinstall ming distribution. libming.(a|so) not found.)
-  fi
-
-  for i in ../../src $MING_DIR/include $MING_DIR/include/ming $MING_DIR/ming/include; do
-    if test -f $i/ming.h; then
-      MING_INC_DIR=$i
-    fi
-  done
-
-  if test -z "$MING_INC_DIR"; then
-    AC_MSG_ERROR(Please reinstall ming distribution. ming.h not found.)
-  fi
-
-  PHP_CHECK_LIBRARY(ming, Ming_useSWFVersion, [
-    AC_DEFINE(HAVE_MING,1,[ ])
-  ],[
-    AC_MSG_ERROR([Ming library 0.2a or greater required.])
-  ],[
-    -L$MING_DIR/$PHP_LIBDIR
-  ])
-  
-  PHP_ADD_INCLUDE($MING_INC_DIR)
-  PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD)
-
-  old_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS=-I$MING_INC_DIR
-  AC_MSG_CHECKING([for destroySWFBlock])
-  AC_TRY_RUN([
-#include "ming.h"
-int destroySWFBlock(int a, int b) {
-	return a+b;
-}
-int main() {
-	return destroySWFBlock(-1,1); /* returns 0 only if function is not yet defined */
-}
-  ],[
-    AC_MSG_RESULT([missing])
-  ],[
-    AC_DEFINE(HAVE_DESTROY_SWF_BLOCK,1,[ ])
-    AC_MSG_RESULT([ok])
-  ],[
-    AC_MSG_RESULT([unknown])
-  ]) 
-
-dnl Check Ming version (FIXME: if/when ming has some better way to detect the version..)
-  AC_EGREP_CPP(yes, [
-#include <ming.h>
-#ifdef SWF_SOUND_COMPRESSION
-yes
-#endif
-  ], [
-    AC_DEFINE(HAVE_NEW_MING,  1, [ ]) 
-    dnl FIXME: This is now unconditional..better check coming later.
-  ])
-
-  dnl Check if SWFVideoStream_setFrameMode() is available
-  AC_TRY_COMPILE([
-#include <ming.h>
-  ], [
-int main(void) { SWFVideoStream_setFrameMode(0, 0); return 0; }
-  ], [
-    AC_DEFINE(HAVE_SWFVIDEOSTREAM_SETFRAMEMODE, 1, [Have SWFVideoStream_setFrameMode(SWFVideoStream, int)])
-  ], [])
-
-  dnl Check if SWFVideoStream_nextFrame() is available
-  AC_TRY_COMPILE([
-#include <ming.h>
-  ], [
-int main(void) { SWFVideoStream_nextFrame(0); return 0; }
-  ], [
-    AC_DEFINE(HAVE_SWFVIDEOSTREAM_NEXTFRAME, 1, [Have SWFVideoStream_nextFrame(SWFVideoStream)])
-  ], [])
-
-  dnl Check if SWFVideoStream_seek() is available
-  AC_TRY_COMPILE([
-#include <ming.h>
-  ], [
-int main(void) { SWFVideoStream_seek(0, 0, 0); return 0; }
-  ], [
-    AC_DEFINE(HAVE_SWFVIDEOSTREAM_SEEK, 1, [Have SWFVideoStream_seek(SWFVideoStream, int frame, int whence)])
-  ], [])
-
-
-  dnl Check if SWFMovie_output() accepts the 4th parameter
-  AC_TRY_COMPILE([
-#include <ming.h>
-  ], [
-int main(void) { SWFMovie_output(NULL, NULL, NULL, 0); return 0; }
-  ], [
-    AC_DEFINE(HAVE_MING_MOVIE_LEVEL, 1, [ ])
-  ], [])
-  CPPFLAGS=$old_CPPFLAGS
-
-  PHP_NEW_EXTENSION(ming, ming.c, $ext_shared)
-  PHP_SUBST(MING_SHARED_LIBADD)
-fi
diff --git a/dev-php/ming-php/metadata.xml b/dev-php/ming-php/metadata.xml
deleted file mode 100644
index 50367ee577fa..000000000000
--- a/dev-php/ming-php/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>grknight@gentoo.org</email>
-		<name>Brian Evans</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">ming</remote-id>
-		<remote-id type="github">libming/libming</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-php/ming-php/ming-php-0.4.8.ebuild b/dev-php/ming-php/ming-php-0.4.8.ebuild
deleted file mode 100644
index 91e42cafa688..000000000000
--- a/dev-php/ming-php/ming-php-0.4.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME=ming
-MY_P="${PHP_EXT_NAME}-${PV//./_}"
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
-PHP_EXT_S="${WORKDIR}/libming-${MY_P}/php_ext"
-inherit flag-o-matic php-ext-source-r3
-
-DESCRIPTION="PHP extension for the ming Flash movie generation library"
-HOMEPAGE="http://ming.sourceforge.net/"
-SRC_URI="https://github.com/libming/libming/archive/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-libs/ming"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/libming-${MY_P}"
-# Clear out near-empty README files which are not helpful to the user
-DOCS=( )
-
-src_prepare() {
-	local libdir=$(get_libdir)
-	cp "${FILESDIR}/php_ext-config.m4" "${PHP_EXT_S}/config.m4" || \
-		die "Failed to copy config.m4 to target"
-	rm "${PHP_EXT_S}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}"
-	# Fix for SYMYLINK_LIB=no
-	if [[ ${libdir} != 'lib' ]] ; then
-		sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${PHP_EXT_S}/config.m4" \
-			|| die "Failed to update lib directory"
-	fi
-	php-ext-source-r3_src_prepare
-}
-
-src_configure() {
-	# build is sensitive to -O3 (bug #297437)
-	replace-flags -O3 -O2
-
-	local PHP_EXT_EXTRA_ECONF="--with-ming=${S}"
-	php-ext-source-r3_src_configure
-}
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 314eb58a6846..8195ca9324c9 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -2,6 +2,6 @@ DIST apcu-4.0.11.tgz 119535 BLAKE2B 2c1f8a0463b2802b11ae679987807127556b04fb099e
 DIST apcu-5.1.12.tgz 105890 BLAKE2B 110a56ed1da8e33bd39c9d694007acdca2deb42219ae5d31b57296ff3729bab3fdbc508965b2cd0fccc425b2c2fea9249933cd7f45586beeee7cd3bd38ef2473 SHA512 f53b7840d5aecfc899e3e878f0bb9a5dc4a83628543963c20c25ce2b2a2adf14dd40d39a6a2014c139962453e0e9e5038fca7b1d0be205c0b9b2aa6e3fefb054
 DIST apcu-5.1.17.tgz 94814 BLAKE2B 2e49f08b9445f04fd036bc949c9099ee045c3ecd460b323e371a4906fdef77f8d3e7d338af14fe3e116a94aa548c7fb79cc0003556ed739e258370095cbec075 SHA512 7f6a6cd927ed4ff251497c2c79e8d832d1a44ddd59abdb175886d3c12ea27f26142e6b851ac5bb5acb49a0e3a998e9741ba0ff03310f51b9cd188cdf6cf12793
 EBUILD pecl-apcu-4.0.11.ebuild 1537 BLAKE2B e2e859314479c8986b097a904c50d0e23e09b4189144043664143a9fc1f8a6a6830803743eae047750cfe468d7dcdf716b03d61fec2ce406b0f7828f08890bd6 SHA512 b561c23514274933b5d27eed7425a1e007c052431502f6f9a1946a51201b0ec551b4a6bb1da6ff411ab3262c94f3e6fad2e8492a731fd4fb77df02d4e1e23744
-EBUILD pecl-apcu-5.1.12.ebuild 2093 BLAKE2B 84a4783d1e5f9fb621369986b1b6f53952a3c85154ab9984051abb63a9d8b6ffee8870cd47991434f32cd81d322f74ad51098a3a1f77a19882cb86613d95e585 SHA512 d93c6e848b15a7365bc38ae5ff0fed0ed7c8be3025e18e178fb3c6ac9855e9a91c32da9c91a3849bbe8f8ce88c2931404fe0c1366ed14bd8e02674fb1f2801bc
-EBUILD pecl-apcu-5.1.17.ebuild 2097 BLAKE2B 73c0e00ca20648b49c61270d2c9055ea299b7ab64ca73f9280f314f73d5a7afbc34627087b934a50321f3154fdbba7908ab3726e6f5652deba14ead193edae27 SHA512 f09b90919f1063e47b66f978244af5caee80096b76ce16c8f7b19142292b667b7c1e18f091339a071d57c6d77f31631576892c3ad4f89e576cecf10b584aacd3
+EBUILD pecl-apcu-5.1.12.ebuild 2091 BLAKE2B 4a3ce06048c44883c4040bfa94cadda04e89d1af5445549c7190d5cf9d12f4a2f04c5027a16f79392692f114a3eb475d01948092c08b2eb4af3653187018bd97 SHA512 951f84425c892468e1a868c6068b7b6bb6b59b31d5eaf138dcc9182c2b45bb945148dbb4fe9d70b7c9125136e2a90628978485cef9e7a82e28891a123c3d6bb1
+EBUILD pecl-apcu-5.1.17.ebuild 2095 BLAKE2B d1c9996042cf528fc76d330ded500c2e9aff45cc715bc46a8bf3dbb56806901580720d44b54d60dd9fa380ee7587c715393bb7c40648b229f038c55d82bf0705 SHA512 e8f871835a26657c014ed8ec4ebce447161509d5f0b0bba39dcb5bcca0b4ab3967931d7170d467d2647cfcb2b3b2245881d6afa6ba2a83e815531c7a8fff91c5
 MISC metadata.xml 540 BLAKE2B 87b95a306509825ceb5c27c471c496692da1efaf9fc04c357d9aa47c458db302456884401b077cd040bc70a6540706cc54ac2aa76f7da8a1d3b63b6af8661e5a SHA512 46b3e028a3632c8ebfa89a9e2053bc0bb8893fd0a75ee3f84e1d62daec9be5cadbe1f9fc55bb14931a91cde04ff04c5f7c19b2dcf57551ee08fa3eb64ed88232
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
index 907e9265b6ba..675490a1e856 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
@@ -71,7 +71,7 @@ src_install() {
 pkg_postinst() {
 	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
 		elog "The apc.php file shipped with this release of pecl-apcu was"
-		elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
+		elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
 		elog
 		elog "If you depend on the apc_* functions,"
 		elog "please install dev-php/pecl-apcu_bc as this extension no longer"
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
index 7da2fb1c7123..39a64219bf7e 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
@@ -71,7 +71,7 @@ src_install() {
 pkg_postinst() {
 	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
 		elog "The apc.php file shipped with this release of pecl-apcu was"
-		elog "installed into ${EPREFIX}/usr/share/php7/apcu/."
+		elog "installed to ${EPREFIX}/usr/share/php7/apcu/."
 		elog
 		elog "If you depend on the apc_* functions,"
 		elog "please install dev-php/pecl-apcu_bc as this extension no longer"
diff --git a/dev-php/pecl-radius/Manifest b/dev-php/pecl-radius/Manifest
index 38ec07dd981b..5371b1f2ae58 100644
--- a/dev-php/pecl-radius/Manifest
+++ b/dev-php/pecl-radius/Manifest
@@ -1,5 +1,3 @@
-DIST radius-1.3.0.tgz 43060 BLAKE2B e348ca5693872a7af142f2f60dd91613980046ff1479894518591a9db4229147963bfc70dd7f2797ace070d89015096b7877915df18decc03ae3cc092d8d02c6 SHA512 79126a852701e77f782283b0cf2ad99cb05418c69ed39d70608f62021f3da06f5e5867ac5b09cc75806feeb3d1a06f24eeb6ff4e56cb2fde5f05bcd198b5a661
 DIST radius-1.4.0b1.tgz 50953 BLAKE2B 1f6f2a4c4cfa7600a37b8bc30e4d263b899a687becac83fd01bac2466de08cad4233984ca694dc73eaf20b64ef94e1e6a6ca7f843474c8f0c9de2c39df9d9705 SHA512 db6ebe928673db1ff4c565338010ef5acf6029844994eb240f2e8eaeda4aff734ed300a7ddf16c09e245671aad377283f99cf1c485569b3bad0c7c7b24a19664
-EBUILD pecl-radius-1.3.0-r1.ebuild 445 BLAKE2B 3afb0fe648378416f7377c872a201effb1cac2802b064edbe332a6be18bdafc8645dedbedba2d8853b899d260eddb3c33b5be683f0a85eed5b4668622d159334 SHA512 b7ecd2945d33352f62bef13b7a91feebf1968ddc4fca208c8c040bbe6e8c15628a8f1e8dff0721f16117f6be862fc7629ccadccb9af064bd46c4bee2c2d91c49
 EBUILD pecl-radius-1.4.0_beta1-r2.ebuild 765 BLAKE2B 528d655a9ec455460a283bcf9aa1b15fbb9d43db094df533f38f9fbef0eadc12388608389a05bee9dada5b9a2bca7f5724cfafca037c0b65cb39c3650a4e4d79 SHA512 ee8a5bb86cfcec12b3342a3ee9f8b07bcee817e1f9a14093ee3f9cb1125b9ac8476675cedc8b52aace45665c5de6377d24a20262e5399c2cd985864532ff128d
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-radius/pecl-radius-1.3.0-r1.ebuild b/dev-php/pecl-radius/pecl-radius-1.3.0-r1.ebuild
deleted file mode 100644
index 0b5a3b4507f4..000000000000
--- a/dev-php/pecl-radius/pecl-radius-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="radius"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php5-6"
-
-inherit php-ext-pecl-r3
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)"
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples"
-
-RDEPEND="php_targets_php5-6? ( dev-lang/php:5.6[pcntl,sockets] )"
diff --git a/dev-php/pecl-yaz/Manifest b/dev-php/pecl-yaz/Manifest
index 1c87d9ef0486..e029dd2c5cd1 100644
--- a/dev-php/pecl-yaz/Manifest
+++ b/dev-php/pecl-yaz/Manifest
@@ -3,5 +3,5 @@ DIST yaz-1.2.2.tgz 20131 BLAKE2B 7aa0729ba6033870099ed7c0d4961eac02d74d5aed6c7a5
 DIST yaz-1.2.3.tgz 20059 BLAKE2B 3fbf6d57e8519f6d363dbf308cb6ba259098521ae352f8886e8e12ca2a0d8119eaa31fc30301aea6979b32c6c321c4de0ad63ebe72e8f52cbb630d7f136f3e60 SHA512 5e6ebccac05fa44b0758b6817530e8cb436e45ead659f6a5029383515213bcce8c8cc7ceb8ef5ff4ec2335ad5c3009c6ccf8786116b115c24a013329d107bd7a
 EBUILD pecl-yaz-1.2.1.ebuild 522 BLAKE2B 162fa067a1c7c9d2ed34612b5133513e7260d4f5fc3f06de16e11a4a37f30d86b22b80fc952aea8480f3007811baa7968b48d674f00d1e2fc7c3abc1a47fbae9 SHA512 80156ddce79ffa8a460fec70c99cbc68681cd4204ac6f0e18b40521ba17d81d2b4c0da6d162debb3070eb2d4477902203b431692d43a26037232a3424be54910
 EBUILD pecl-yaz-1.2.2-r1.ebuild 535 BLAKE2B a31945d38c6e736ae2cf07a7bc7d42364913fb5763285200be7039f61fa005da78acd7c24107c885afbd3a5101c15790da31c0d6e088b7bee244952ea92b6f36 SHA512 108633e57233124565ad41f06e2ca8b266068d328d4c815c98e2b0fcd61bcbfa2ba5b04495ea0c2c21dbc12f5abfb901fecb4af6182633478404586411dd07fa
-EBUILD pecl-yaz-1.2.3.ebuild 585 BLAKE2B ca0218a933d65dfa47f437743a409ff2909d5c1b79cf556453ee06edbc79fe1915580305208b5a3ba07e99332891ac9c3fa06a1af55be99307aa5223e391b9ac SHA512 679e751eb4ac8c7197c17ef0840d11a72edb29d5afcf857250ff48f5da379f3814acbaa83432d745953cfbb8538a2ce4dcffa76e68abfc2b859cdd6ccde37d39
+EBUILD pecl-yaz-1.2.3.ebuild 582 BLAKE2B b01868cb9f4036c528c0d92ec9b238af865e17267f470833622148389cc4e5da07d24241527603cc78a7e4b2493e59c1781133c3b3795541f9565ec68ef68cc7 SHA512 f17767ac8e26680ea75d408d9db7b6da91caff5f8c4e9e87a601851c4de9d08e40f4948d1cc8f1dc4f48fafafce18c4681193677e32fc99c883c35d051f72774
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
index ee31d36f6491..bfb55dcd9e52 100644
--- a/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
+++ b/dev-php/pecl-yaz/pecl-yaz-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
 
 inherit php-ext-pecl-r3
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 
 DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit"
 LICENSE="BSD"
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')"
+}