gentoo resync : 15.12.2019

3 files changed, 7 insertions, 53 deletions

diff --git a/dev-php/pecl-dbase/Manifest b/dev-php/pecl-dbase/Manifest
index fab988a8e977..5113240e302b 100644
--- a/dev-php/pecl-dbase/Manifest
+++ b/dev-php/pecl-dbase/Manifest
@@ -1,7 +1,5 @@
 DIST dbase-5.1.1.tgz 20751 BLAKE2B 36b7f3e0d03cfd3852333b2ed062dc5c408c29db7c5c05b1f6e57744ea651e291d958ec6216804a4328bb344b8188f6db29ffdcf9134ed7938640a08885c4a71 SHA512 52dac3e253f88de898c43864e8aff62990b33eb770fb27534bd25896c3eb330ca05e0205a1f387296637e553cf6de16a3f7b3eff082e1403a56c60decfbce33f
-DIST dbase-7.0.0.tgz 32845 BLAKE2B c3a0e838b365fb998de8ccd47f5849fc41f8a9fc4b6acebd82e8823be252f52e9b730d1fd558f0d0db5e9c4d0794ebaf727a03d0ba4e53e2d2bfe86eaed0f3aa SHA512 3e092cd641220228313867d3e7a9ec95f89ccb73d13267509fb30657f95d661f81bb1ecae0d3a86618d453a41e2f727bb7740ad25248721d0144d1ce11548bb0
-DIST dbase-7.0.0beta1.tgz 16206 BLAKE2B 3921257aacb915deaad854ab54c8263646561dc2593bb4c5706fd9f27659cb1d22c0df9f88cbc7acf115d3358c25b366e5c3d1ef48eee2af17049094808113bd SHA512 623222e826509fa9b3f65353a66479fe4a5924de1b6dd4e73c106f2179f8af59740c758cf90ed8d0e9c61c31a7e5bef434cd858cde074f983b1dda69927442af
+DIST dbase-7.0.1.tgz 33588 BLAKE2B 50cc5b4e0096dbdd7067e9c05cb7b580ff5a9d548ec6acb8a777fa3ba62ac4fa06b30e040bdec2a77b87736cdd0684a662aab344db11806e6ca2c6824cee6908 SHA512 8aa743545e807773be6a3f74cd9ae686a982a5455e494ff2bc0e3fe6f1fdf25574702054253eaefc55a6e9529b3e70c8390a02bd317b74db17bfe6b7797d4ba2
 EBUILD pecl-dbase-5.1.1.ebuild 775 BLAKE2B 35a3ab094b0a14a33c672d59ef605803bbbf5e18d09b65030107f1c79dce4bdbcbf4b5c6556639e3289c4c90cb2f6315da54e8784a42e252aef0d1cb1883aa2b SHA512 7d431710fe8a380d085bde23b49c10906677d3444ef9af999a269c371296f3396df7ccaa5d52cac9bf571f6ae4477445587ceaab4abd8c457dae6bbd10db11d8
-EBUILD pecl-dbase-7.0.0.ebuild 1161 BLAKE2B 0e29015161cfb237e602551a9ab0b87639be6dc727c314ff5f142d48f1ae679c16c210bf7d412f54accfe3bca2f2a7a29ad6fd1b3ef26ab5ec818f1801f57b58 SHA512 7277612dba51c2a717990dbd14425dedaddcf07afba170c1c89842fe42348b11a7a50b359ee2a08bb7c07e613701bbe40ea07a6bef4715c15ed50d930aa27f96
-EBUILD pecl-dbase-7.0.0_beta1-r1.ebuild 1070 BLAKE2B 0cb69e3a4bf7f1c06fdb7967690cf74a97852568b2e55856a84c2ab8a9292dc5b200d827eec4e1d3cf6b04cf585318362fead248023bdee7bd8438f86d034abd SHA512 7eef9511bc14644ab5cc4b81a4a5bcd424a12f53a251c2a464c0aae00c8e9e9b6207fa398dd9f56d1f651a340bb789894f539e05404f9299c589459b1a16deb4
+EBUILD pecl-dbase-7.0.1.ebuild 1253 BLAKE2B 9f4a54c11fd4d308d9db68e33556aa8fd418c46150235c4e340779ec4bfac9104fbc4361ea47661145a7a58d4bd107f3173f2f2f1f615bd70aaec4bd00f45766 SHA512 24041868a3af76468991bc27145cd715248da6a1c8144e6d4e26a97a47a438d01e31ad49fa7e0e2a191e0c2c27148eda8e88754933b6f6c38acf3e2caa948592
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-dbase/pecl-dbase-7.0.0_beta1-r1.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.0.0_beta1-r1.ebuild
deleted file mode 100644
index 72bf7b340134..000000000000
--- a/dev-php/pecl-dbase/pecl-dbase-7.0.0_beta1-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# 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"
-
-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"
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="dBase database file access functions"
-LICENSE="PHP-3.01"
-SLOT="7"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-dbase:0[php_targets_php5-6] )"
-
-src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; 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 ; then
-		local PHP_EXT_ECONF_ARGS=( )
-		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 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-dbase/pecl-dbase-7.0.0.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild
index 0eecaf7babb8..43d998a62c33 100644
--- a/dev-php/pecl-dbase/pecl-dbase-7.0.0.ebuild
+++ b/dev-php/pecl-dbase/pecl-dbase-7.0.1.ebuild
@@ -5,12 +5,12 @@ EAPI="7"
 
 # 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"
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4"
 
 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"
+USE_PHP="php7-0 php7-1 php7-2 php7-3 php7-4"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -23,7 +23,7 @@ DEPEND=""
 RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-dbase:0[php_targets_php5-6] )"
 
 src_prepare() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-0 || 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
 		eapply_user
@@ -31,14 +31,14 @@ src_prepare() {
 }
 
 src_configure() {
-	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then
+	if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 || use php_targets_php7-4 ; then
 		local PHP_EXT_ECONF_ARGS=( )
 		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
+	if use php_targets_php7-0 || 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
 }