gentoo resync : 23.03.2018

3 files changed, 14 insertions, 20 deletions

diff --git a/dev-php/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest
index f6fbd19a07c7..58a9fc193caa 100644
--- a/dev-php/libvirt-php/Manifest
+++ b/dev-php/libvirt-php/Manifest
@@ -1,5 +1,5 @@
 AUX remove-imagick-check.patch 331 BLAKE2B 2d9c164055c3f54baf259326abe22d5aa478141df7f6ea05ba33f040701947038490c1898e89a7019cc1e41008fde5cb43c338730ef7ec3020f5005edd612d9c SHA512 1e949f8c704a2e6b541a276b8cb53e9cf09f009dadc01f4f50ad02e92258cfe30130b2d22b811e0b5b07e1bad4023fad05040c6031bd0063999212c2d6483bcf
 DIST libvirt-php-0.5.3.tar.gz 778604 BLAKE2B 40fe4bb2f1e3fd81f1aaf09b8b92c509e79186a1a6c0dc97aa55c7164ed36cc0088141ed46c3d82cf277e25eaf3b017edac9466684e1060b5a22c18aaa7a576f SHA512 b4cbfd8840d8f114fde762b5d6ada155ebdb231b554e28e8526a7af45a802a18f28e90fa52f3d7ca9f616996fe0a8289b70c2d14dca51a52a7bf8a501c3ff44f
-EBUILD libvirt-php-0.5.3.ebuild 1432 BLAKE2B d9b41d0c3f2e326f8e4f5283ded409222866bb933472d33ab6a25a048c15d7fdc7d3262b051bccdf3115a64697e749e7b781bd45e08b4e959159d6586273fa77 SHA512 9b3615b60eaf3524ede5985e4ccafdaee674862a6869fb2acec6926fd859db39c186c3ae9085f642e82ee5a2ab57b9cb3c0d4ef50c07aeb3d16fcf3864b11c7f
-EBUILD libvirt-php-9999.ebuild 1432 BLAKE2B a84cb71e268232387e0457f4edf5ae57d139c796b0f17012c1588585e508735d30ef8ca05dba2a975af52738bcec1c6c12fb632ed5e18556aa8d0d822bd0d60a SHA512 804d7a2885b642ed15232e2910743ed630d1eef465e5edf792477e8bdc9e670f53975e3c3deeb538203782c740c7046fea00e73854db78a17493d6dc5a6ae82e
+EBUILD libvirt-php-0.5.3.ebuild 1395 BLAKE2B 647e79ece9175fd70fc2dbecc0de440ac4db17e5ff4a19621d78d1c1e508047233fd2311df550d2da492676b97d328cef3e92aaa66cbfc924a0c97ce01afb8a2 SHA512 aa855f216e4a71fc69be4214a70cbe2dabcc5871100c0e90a3911de1a88958ed40a53a19584d406ce7777911889166535d838ffe9d25dd8596f170e8e6bd1f0e
+EBUILD libvirt-php-9999.ebuild 1395 BLAKE2B 33519844407a23d2954eff8bf7041d1fb93d5223231636b8d9a200e972c4aba5852f0bc2d69a4d56c5e361354fb20276373f91cc099736acc587eaa9cd98f4b6 SHA512 9d5ddcfff6fbd42f9b708fb5c4de4ace1ae722a04e9ec3104f603b8cde2a7417a7275461020e7df337bdae95a5e8fe87672342dafa9dc07868759dcd01949fdf
 MISC metadata.xml 482 BLAKE2B cc2209c8b662f3b122bcc87896f43a37767539e7cb4c2d4f5aa6dfceee8104f63b4af24a17cc05e0775e3dd2bddac36a341a7b0f8044821cc888dee594bf75bb SHA512 a1a8469c2e56cb1d32673057a3919a8f4799a921b67568a6109c60f5bacf61b879e7c07055d6b8d1b0c67faa5f7c1b468080875b7b2ce857b8e1af199d193547
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.3.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.3.ebuild
index fa770b1f6aff..4c6eda7c043c 100644
--- a/dev-php/libvirt-php/libvirt-php-0.5.3.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,6 +6,7 @@ EAPI=6
 PHP_EXT_NAME="libvirt-php"
 PHP_EXT_SKIP_PHPIZE="yes"
 USE_PHP="php5-6 php7-0 php7-1"
+PHP_EXT_ECONF_ARGS=()
 
 inherit php-ext-source-r3 autotools
 
@@ -27,6 +28,9 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 DOCS=( AUTHORS ChangeLog NEWS README )
+# Remove the insane check for pecl-imagick which is only used in examples
+# and is not called upon in any build
+PATCHES=( "${FILESDIR}/remove-imagick-check.patch" )
 
 src_unpack() {
 	default
@@ -34,20 +38,13 @@ src_unpack() {
 	# create the default modules directory to be able
 	# to use the php-ext-source-r3 eclass to configure/build
 	ln -s src "${S}/modules"
-
-	for slot in $(php_get_slots); do
-		cp -r "${S}" "${WORKDIR}/${slot}"
-	done
 }
 
 src_prepare() {
-	# Remove the insane check for pecl-imagick which is only used in examples
-	# and is not called upon in any build
+	php-ext-source-r3_src_prepare
 	local slot
 	for slot in $(php_get_slots); do
 		php_init_slot_env "${slot}"
-		eapply "${FILESDIR}/remove-imagick-check.patch"
-		eapply_user
 		eautoreconf
 	done
 }
diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild
index 4e24b63e0ab6..2943eb7e578a 100644
--- a/dev-php/libvirt-php/libvirt-php-9999.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,6 +6,7 @@ EAPI=6
 PHP_EXT_NAME="libvirt-php"
 PHP_EXT_SKIP_PHPIZE="yes"
 USE_PHP="php5-6 php7-0 php7-1"
+PHP_EXT_ECONF_ARGS=()
 
 inherit php-ext-source-r3 git-r3 autotools
 
@@ -27,6 +28,9 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 DOCS=( ChangeLog NEWS README )
+# Remove the insane check for pecl-imagick which is only used in examples
+# and is not called upon in any build
+PATCHES=( "${FILESDIR}/remove-imagick-check.patch" )
 
 src_unpack() {
 	git-r3_src_unpack
@@ -34,20 +38,13 @@ src_unpack() {
 	# create the default modules directory to be able
 	# to use the php-ext-source-r3 eclass to configure/build
 	ln -s src "${S}/modules"
-
-	for slot in $(php_get_slots); do
-		cp -r "${S}" "${WORKDIR}/${slot}"
-	done
 }
 
 src_prepare() {
-	# Remove the insane check for pecl-imagick which is only used in examples
-	# and is not called upon in any build
+	php-ext-source-r3_src_prepare
 	local slot
 	for slot in $(php_get_slots); do
 		php_init_slot_env "${slot}"
-		eapply "${FILESDIR}/remove-imagick-check.patch"
-		eapply_user
 		eautoreconf
 	done
 }