gentoo resync : 13.10.2019

6 files changed, 84 insertions, 97 deletions

diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index 8195ca9324c9..dc05bf7e6ec6 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,7 +1,7 @@
 DIST apcu-4.0.11.tgz 119535 BLAKE2B 2c1f8a0463b2802b11ae679987807127556b04fb099e4872bff9d1ea51c633140d978b66373eb987d5207403ed9389e58f1afa7ca94360680d9a9693230fb87a SHA512 e3b97066240e33850419e96f0fd9df0e66ee3b0fa238c418e07ac639d07439e9edfa1696e56a620e33f1ffc0993c57bde585b0c170b22995e7d5c0ae550b7899
 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 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
+EBUILD pecl-apcu-4.0.11.ebuild 1537 BLAKE2B 36711117b55ff29299313a30dc336805330e38d263f2b1028639c7303293e424147e3bbdbb9be41c8f694ec720901d93367fb5743ee27ecd894835976b0ce8f7 SHA512 82cd877571c42a85a2e5bc31c68bc5ff3521ed77d968984942ecb95ff103e18d3796f32a222a1285e6630f020e4da732ef874a16f49e06d4da75909719e694c3
+EBUILD pecl-apcu-5.1.12.ebuild 2091 BLAKE2B f0d62746f48ad4110941d369da65f38858a1834152a33a56ab0b1eea53a5d1b52fbe5bc3effe2defc724729c6865b34e9a765092ecccf4b32ff2b1c76949ad97 SHA512 81f2c1edb96dc7383fb4b91774c1b985754031ce4f4796860825a7e226c345145c84662d80f0d8f834006697d45d5010863590107ab472574c715b3e85b857d6
+EBUILD pecl-apcu-5.1.17-r1.ebuild 1548 BLAKE2B d60a97e831b68873e09e79d3efa1042bdeb1b2a39858fc9e5eb18f6e690188989d950b0a919d26345d3bc8217d8e5e7b78410511248785698215045e2f5a7a96 SHA512 647e12e2a890ab531840bd9c87827e5bcf3bbd1ee82505420b16b69312dc20776ebe0df39b39f51277cb8959652faa33f52f044531494cc151f6ad0c8511192e
+MISC metadata.xml 540 BLAKE2B a29196911604b13d643db1b09cdae2c578c52f3b3ce92f9d6ae534c6fe9872435a46b15dca79ce8ccf5ca02070f2e694f518c69524ea9380eff8e597d8d4124d SHA512 acd09a9a8e52ddc7e4cde2f048db7f7721fcbe3e24b7b628bf1c14b17381a75b463dede6faa0acfecf8e270693001c30b83758f8ad761979fcbdccb454098e56
diff --git a/dev-php/pecl-apcu/metadata.xml b/dev-php/pecl-apcu/metadata.xml
index 4d7374447c6f..6344b62d774f 100644
--- a/dev-php/pecl-apcu/metadata.xml
+++ b/dev-php/pecl-apcu/metadata.xml
@@ -6,9 +6,9 @@
 		<name>PHP</name>
 	</maintainer>
 	<use>
-		<flag name="lock_semaphore">Enable semaphore locks instead of fcntl</flag>
-		<flag name="lock_pthreadmutex">Enable pthread mutex locking</flag>
-		<flag name="lock_pthreadrw">Enable pthread read/write locking</flag>
-		<flag name="lock_spinlock">Enable spin locks (EXPERIMENTAL)</flag>
+		<flag name="lock-semaphore">Enable semaphore locks instead of fcntl</flag>
+		<flag name="lock-pthreadmutex">Enable pthread mutex locking</flag>
+		<flag name="lock-pthreadrw">Enable pthread read/write locking</flag>
+		<flag name="lock-spinlock">Enable spin locks (EXPERIMENTAL)</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild b/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild
index f755261e9186..c808e24e7871 100644
--- a/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-4.0.11.ebuild
@@ -32,10 +32,10 @@ LOCKS="pthreadmutex pthreadrw spinlock semaphore"
 
 LUSE=""
 for l in ${LOCKS}; do
-	LUSE+="lock_${l} "
+	LUSE+="lock-${l} "
 done
 
-IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+IUSE+=" ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
 
 REQUIRED_USE="^^ ( $LUSE )"
 
@@ -52,8 +52,8 @@ src_configure() {
 		local PHP_EXT_ECONF_ARGS=(
 			--enable-apcu
 			$(use_enable mmap apcu-mmap)
-			$(use_enable lock_pthreadrw apcu-rwlocks)
-			$(use_enable lock_spinlock apcu-spinlocks)
+			$(use_enable lock-pthreadrw apcu-rwlocks)
+			$(use_enable lock-spinlock apcu-spinlocks)
 		)
 
 		php-ext-source-r3_src_configure
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 675490a1e856..da6a7f85c523 100644
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.12.ebuild
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.12.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
@@ -31,10 +31,10 @@ LOCKS="pthreadmutex pthreadrw spinlock semaphore"
 
 LUSE=""
 for l in ${LOCKS}; do
-	LUSE+="lock_${l} "
+	LUSE+="lock-${l} "
 done
 
-IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
+IUSE+=" ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
 
 REQUIRED_USE="^^ ( $LUSE )"
 
@@ -51,8 +51,8 @@ src_configure() {
 		local PHP_EXT_ECONF_ARGS=(
 			--enable-apcu
 			$(use_enable mmap apcu-mmap)
-			$(use_enable lock_pthreadrw apcu-rwlocks)
-			$(use_enable lock_spinlock apcu-spinlocks)
+			$(use_enable lock-pthreadrw apcu-rwlocks)
+			$(use_enable lock-spinlock apcu-spinlocks)
 		)
 
 		php-ext-source-r3_src_configure
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.17-r1.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.17-r1.ebuild
new file mode 100644
index 000000000000..19f8e009175b
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.17-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PHP_EXT_NAME="apcu"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( NOTICE README.md TECHNOTES.txt )
+
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+LICENSE="PHP-3.01"
+SLOT="7"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock-${l} "
+done
+
+IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
+
+REQUIRED_USE="^^ ( $LUSE )"
+
+src_prepare() {
+	php-ext-source-r3_src_prepare
+	# Remove broken tests from php 7.4 due to trivial output differences
+	if use php_targets_php7-4 ; then
+		php_init_slot_env "php7.4"
+		rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die
+	fi
+}
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-apcu
+		$(use_enable mmap apcu-mmap)
+		$(use_enable lock-spinlock apcu-spinlocks)
+	)
+	# Broken upstream autoconf test disables if present at all
+	use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks )
+
+	php-ext-source-r3_src_configure
+}
+
+src_install() {
+	php-ext-pecl-r3_src_install
+
+	insinto /usr/share/php7/apcu
+	doins apc.php
+}
+
+pkg_postinst() {
+	elog "The apc.php file shipped with this release of pecl-apcu was"
+	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"
+	elog "provides backwards compatibility."
+}
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
deleted file mode 100644
index 39a64219bf7e..000000000000
--- a/dev-php/pecl-apcu/pecl-apcu-5.1.17.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="apcu"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( NOTICE README.md TECHNOTES.txt )
-
-# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass
-# This allows us to depend on the other slot
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
-
-inherit php-ext-pecl-r3
-
-# However, we only really build for 7.x; so redefine it here
-USE_PHP="php7-0 php7-1 php7-2 php7-3"
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DESCRIPTION="Stripped down version of APC supporting only user cache"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE="+mmap"
-
-DEPEND=""
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-apcu:0[php_targets_php5-6] )"
-
-LOCKS="pthreadmutex pthreadrw spinlock semaphore"
-
-LUSE=""
-for l in ${LOCKS}; do
-	LUSE+="lock_${l} "
-done
-
-IUSE+=" ${LUSE/lock_pthreadrw/+lock_pthreadrw}"
-
-REQUIRED_USE="^^ ( $LUSE )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		php-ext-source-r3_src_prepare
-	else
-		eapply_user
-	fi
-}
-
-src_configure() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		local PHP_EXT_ECONF_ARGS=(
-			--enable-apcu
-			$(use_enable mmap apcu-mmap)
-			$(use_enable lock_pthreadrw apcu-rwlocks)
-			$(use_enable lock_spinlock apcu-spinlocks)
-		)
-
-		php-ext-source-r3_src_configure
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
-		php-ext-pecl-r3_src_install
-
-		insinto /usr/share/php7/apcu
-		doins apc.php
-	fi
-}
-
-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 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"
-		elog "provides backwards compatibility."
-	fi
-}