gentoo resync : 15.12.2019

4 files changed, 11 insertions, 48 deletions

diff --git a/dev-php/pecl-raphf/Manifest b/dev-php/pecl-raphf/Manifest
index 3c17083ea5e4..640fca8bfaa1 100644
--- a/dev-php/pecl-raphf/Manifest
+++ b/dev-php/pecl-raphf/Manifest
@@ -3,7 +3,6 @@ DIST raphf-2.0.0.tgz 15715 BLAKE2B bab2997d9ce8358efaa69f2e633f49e4dd16f640e8d30
 DIST raphf-2.0.1.tgz 16003 BLAKE2B 4eaf9f89e6572e17e0df347543dc99221f68d45103444f89e59862b9078574722278fbb1e2841b0a5952ffd6dfc4ea0fa81298f2014ffbe8a6b51ed6887f6692 SHA512 0a609fc21a62880963e7afb75297eb75a2598aab2c816cb61e84d665b0453e4952aa9bf25fe2c818cc94492a4b94aed965053c67899fdb984d88661364fffb1e
 EBUILD pecl-raphf-1.1.2-r1.ebuild 748 BLAKE2B 062779c09b82c1145df97742a6d970ddc0c687248b336995217f93c7c3ed7d7eaa500888e4818cfa8176dae10f7b74fa6bd90f9688bfc1d2f0744b49d0b90a0f SHA512 5d9a4f730c469b06822e7af96db120a28f4353d59b2200c2b68849c956999a574592326594749533c5d3ddb423d206822d7c8eb157ffae541cd7117c20537400
 EBUILD pecl-raphf-1.1.2-r2.ebuild 857 BLAKE2B 45d170823d7f9bcd8944f56241c17a6922ee813deec961c5b2dd7e0c659f08d56295e28ed3d187ab21b3c50d0d641c104ca19fc6f329a887cae4c4345bb82b55 SHA512 b2b4994345835fa4c68b07eb0102b0e041d0b7c4c7adea6da13fd5a7bd20cd998defcb759f91690776d81be00f8df0e8ef6bf022d0cebaf2b88de9e7348413dd
-EBUILD pecl-raphf-2.0.0-r1.ebuild 766 BLAKE2B 58af3a334c323199b9494c17bbb119aafcaa53e7b7d98f98aa42837777418bd3d920c6422ff35546a45b1aad84943e21c2eaebddf3af89e4726d578e4d1c2955 SHA512 9d12d7141ce035e9d8a901ee847d313b580192b4d71f441aa77d0ac501113eefada26186696ee9ab820b64eb635fb529b025e72a0400914f5085f0263514659e
-EBUILD pecl-raphf-2.0.0-r2.ebuild 870 BLAKE2B 6c77a40ffbec3f51cc787bd889118910197f0829927bb66c97e465aedbfd83800e78f202e9a1474dc1d62fe089e6264f7e9414136c8f48a2b2a461fe9d98b22f SHA512 c1f6fe551f063d69b39cc1e22a19749001639005a295e0111c4cc9480cfe20ad237288dae5593776d1db3d67b5dfd80f3deb10b854b292a6e55bde1843e98633
-EBUILD pecl-raphf-2.0.1.ebuild 870 BLAKE2B 6c77a40ffbec3f51cc787bd889118910197f0829927bb66c97e465aedbfd83800e78f202e9a1474dc1d62fe089e6264f7e9414136c8f48a2b2a461fe9d98b22f SHA512 c1f6fe551f063d69b39cc1e22a19749001639005a295e0111c4cc9480cfe20ad237288dae5593776d1db3d67b5dfd80f3deb10b854b292a6e55bde1843e98633
+EBUILD pecl-raphf-2.0.0-r2.ebuild 919 BLAKE2B 14dfe1232c27311d3606cb8ae7c7719db41a62d379dd22573868c208e1507958647d3132c31d71aa67c3402cf6baab00daed248e4fcb046e4e92ed4b48d5e4c9 SHA512 5af2ec4f69bd7d5ae63199bde5cdb486af2685b6e9174d7e83b1d5547f87e3852b98d22f3f7c4c07cc69c760f1aae864053fe87be89749accd7130fc2cd6eee6
+EBUILD pecl-raphf-2.0.1.ebuild 936 BLAKE2B 93e6dff75e26213d70f78b51f60875ea7f4d1a356935a2a2657bd1ee016980cb73f23b388c9095534fb6e8bca559c899e829aaaed2374a804d2cc879416f1452 SHA512 96af5e9198f568f0fa60d71eeb9022098c03105d5bd6407b41ccb788ad6adb309c50ca48558f26e54f7a5e7df03000ea869594cdd61b5f0fbc01fb3c01bdef3a
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.0-r1.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r1.ebuild
deleted file mode 100644
index 2883d3f333e7..000000000000
--- a/dev-php/pecl-raphf/pecl-raphf-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PHP_EXT_NAME="raphf"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-PHP_EXT_ECONF_ARGS=""
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-# Only really build for 7.x
-USE_PHP="php7-0 php7-1"
-
-KEYWORDS="amd64 x86"
-
-DESCRIPTION="A reusable, persistent handle and resource factory API"
-LICENSE="BSD-2"
-SLOT="7"
-IUSE=""
-
-RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		php-ext-source-r3_src_prepare
-	else
-		default_src_prepare
-	fi
-}
-
-src_install() {
-	if use php_targets_php7-0 || use php_targets_php7-1 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild
index f28c7a6bb551..e594718f2c51 100644
--- a/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild
+++ b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild
@@ -9,14 +9,14 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
 PHP_INI_NAME="30-${PHP_EXT_NAME}"
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-1 php7-2 php7-3"
 
 inherit php-ext-pecl-r3
 
 # Only really build for 7.x
 USE_PHP="php7-1 php7-2 php7-3"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="A reusable, persistent handle and resource factory API"
 LICENSE="BSD-2"
@@ -25,6 +25,9 @@ IUSE=""
 
 RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
 
+# Tests need pecl-http, which needs this
+RESTRICT="test"
+
 src_prepare() {
 	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3; then
 		php-ext-source-r3_src_prepare
diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.1.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.1.ebuild
index f28c7a6bb551..9923b1d0c97d 100644
--- a/dev-php/pecl-raphf/pecl-raphf-2.0.1.ebuild
+++ b/dev-php/pecl-raphf/pecl-raphf-2.0.1.ebuild
@@ -9,12 +9,12 @@ PHP_EXT_ZENDEXT="no"
 PHP_EXT_ECONF_ARGS=""
 PHP_INI_NAME="30-${PHP_EXT_NAME}"
 
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 
 inherit php-ext-pecl-r3
 
 # Only really build for 7.x
-USE_PHP="php7-1 php7-2 php7-3"
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -26,7 +26,7 @@ IUSE=""
 RDEPEND="php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6] )"
 
 src_prepare() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4; then
 		php-ext-source-r3_src_prepare
 	else
 		default_src_prepare
@@ -34,7 +34,7 @@ src_prepare() {
 }
 
 src_install() {
-	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3; then
+	if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4; then
 		php-ext-pecl-r3_src_install
 	fi
 }