gentoo resync : 15.01.2020

3 files changed, 30 insertions, 44 deletions

diff --git a/dev-php/pecl-mailparse/Manifest b/dev-php/pecl-mailparse/Manifest
index 52cfe5a97418..f8d7c742f048 100644
--- a/dev-php/pecl-mailparse/Manifest
+++ b/dev-php/pecl-mailparse/Manifest
@@ -1,7 +1,7 @@
-DIST mailparse-2.1.6.tgz 36538 BLAKE2B c079a5f9980384ea90113d3e295b3de4182c8c3006a62439bfb73ab39dc67bb03202298e7bf5e42f71d599d645cf4d79fbf2d09a536e621efe73f8fff6bce56a SHA512 a7337dd2e99a953a55b38c236da95a6bd2950c2bca16fc0ddfec39be8b0ffe01007353fc7b562d0509e0bb1623c3d2b03935d1c98a07dcd9f0b14bb508bce374
 DIST mailparse-3.0.2.tgz 38206 BLAKE2B f50b3f5abfc6e2e5a3647eb33ad07de9e3e66a94933be612a51c868210745b109ddca8e3e174a7a4abcfdc72856f34848e65972b277cfa3e836bef3ee4c79897 SHA512 be04e15cf3577542447186d7ead4e31159c171c99de0a255d4ee2f6f760b80ecb44be056bd9089180601f622b9a71f4331f194e1adaa702d1d964009682896f6
 DIST mailparse-3.0.3.tgz 940370 BLAKE2B 1454750a90e367a2c9ade2d689a0bd3290005db170e6c2f601c23790fd5de701061b8a9cd0dea64eb501e44b3d0a3e40ff75a58ce5bb633837bad682979c097c SHA512 8bc99cb1a3331ee5d40076abe20a15870deb6e28e2b0adb6227a36a01999648a9341168e05f1db96d2458394a13cad643ee1c5dce4d15669165d01c29d95417b
-EBUILD pecl-mailparse-2.1.6-r4.ebuild 839 BLAKE2B 518ecef31d10faf97091c9c7e8cd13789d47b42ecafd7c75822c5e91a10fa2a952e48440503b5697a3581d3723ebb279e134e42b66284b017b2d11ab7341bdc8 SHA512 0ca4e958f293f3dbef2cbbbd08248a11f9eeadc971c5e5f940b56fc721aaa841ae143e4a60989e344307c5641e3e1266c771397f422e8f30074b0d0041e716c9
+DIST mailparse-3.0.4.tgz 940428 BLAKE2B e3e33ecfa953766744a6980e0c681bb9b473d4cbf46179c8099f5483e8da46f47bba30d953d1c3629ea6d1719fcdfb0cca8536de3c3159a979cb7b2cde9ff9a2 SHA512 71eaebc1dc8a4698e60e170facaba16a5a9314bcb21c375b2f9a3069d7f1da819bfabc736b244e3f87131149d4efd9363120e77d8a078a0ede15113123d13ce3
 EBUILD pecl-mailparse-3.0.2-r1.ebuild 1215 BLAKE2B e11ab31a74778d1228285c6b472e461650f0b81fc524e6e7977bf8b9c863cf98b7e04d86a94a52182511cafbcf06263b02fa16f44ca21b94b0eb81fabfbbdccd SHA512 fb3956912162485dfd720d83200d5789ef11f0bb9bba527da658e8fb555083c32c83b7879897f2471e98c784089671be7cafc625ea2f5d979821aa445ed15429
 EBUILD pecl-mailparse-3.0.3-r1.ebuild 664 BLAKE2B 92833ec97a65087e72665d434c7693cd36c903d49dd9a1c5852c9f78a7540bc75902cd8ab64549968317be94357c237b5e9dd85d224b9a4ab1ca8cd400cfb383 SHA512 3373e0dd191259f087e8fbd3d1bf2d323a73500dd69c1bf0ffb5ca91d60cb7f38c54e520439b4d623eed9efbb33ccec5d766e5f27eac2cdb457db02e5208648e
+EBUILD pecl-mailparse-3.0.4.ebuild 664 BLAKE2B 92833ec97a65087e72665d434c7693cd36c903d49dd9a1c5852c9f78a7540bc75902cd8ab64549968317be94357c237b5e9dd85d224b9a4ab1ca8cd400cfb383 SHA512 3373e0dd191259f087e8fbd3d1bf2d323a73500dd69c1bf0ffb5ca91d60cb7f38c54e520439b4d623eed9efbb33ccec5d766e5f27eac2cdb457db02e5208648e
 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r4.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r4.ebuild
deleted file mode 100644
index aa8239c01eca..000000000000
--- a/dev-php/pecl-mailparse/pecl-mailparse-2.1.6-r4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PHP_EXT_NAME="mailparse"
-PHP_EXT_ECONF_ARGS=""
-DOCS=( README )
-
-USE_PHP="php5-6 php7-0 php7-1"
-
-inherit php-ext-pecl-r3
-
-USE_PHP="php5-6"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-DESCRIPTION="PHP extension for parsing RFC822 and RFC2045 (MIME) messages"
-LICENSE="PHP-2.02"
-SLOT="0"
-IUSE=""
-
-RDEPEND="php_targets_php5-6? ( dev-lang/php:5.6[unicode] )"
-DEPEND="${RDEPEND}
-	dev-util/re2c"
-PDEPEND="
-php_targets_php7-0? ( dev-php/pecl-mailparse:7[php_targets_php7-0] )
-php_targets_php7-1? ( dev-php/pecl-mailparse:7[php_targets_php7-1] )
-"
-
-src_prepare() {
-	if use php_targets_php5-6 ; then
-		php-ext-source-r3_src_prepare
-	else
-		eapply_user
-	fi
-}
-
-src_install() {
-	if use php_targets_php5-6 ; then
-		php-ext-pecl-r3_src_install
-	fi
-}
diff --git a/dev-php/pecl-mailparse/pecl-mailparse-3.0.4.ebuild b/dev-php/pecl-mailparse/pecl-mailparse-3.0.4.ebuild
new file mode 100644
index 000000000000..ba94254281ab
--- /dev/null
+++ b/dev-php/pecl-mailparse/pecl-mailparse-3.0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WANT_AUTOMAKE="none"
+PHP_EXT_NAME="mailparse"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+PHP_EXT_ECONF_ARGS=""
+USE_PHP="php7-1 php7-2 php7-3 php7-4"
+PHP_EXT_NEEDED_USE="unicode"
+DOCS=( README.md )
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DESCRIPTION="PHP extension for parsing and working with RFC822 and MIME compliant messages"
+LICENSE="PHP-3.01"
+SLOT="7"
+IUSE=""
+
+src_prepare() {
+	# Missing test source files in archive.  Fixed upstream in next release.
+	rm tests/011.phpt tests/bug001.phpt || die
+	php-ext-source-r3_src_prepare
+}