dev-php/libvirt-php: Adjust unpack and prepare wrt eclass changes

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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 fa770b1f6aff27f73c0e5c58d049a2cd10e07cb0..4c6eda7c043c2b414fbac54748a3bba7c3d47c1d 100644 (file)
--- 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 4e24b63e0ab64d9fb2ae411931cbe1ca93f806c2..2943eb7e578a5e7a9285d2caadac8f40c45870d9 100644 (file)
--- 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
 }