| 1 |
commit: 39422d51690a1d8349d0c338af9ac17eac4819bb |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 22 17:25:42 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 22 17:26:37 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39422d51 |
| 7 |
|
| 8 |
dev-php/libvirt-php: Adjust unpack and prepare wrt eclass changes |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
dev-php/libvirt-php/libvirt-php-0.5.3.ebuild | 15 ++++++--------- |
| 13 |
dev-php/libvirt-php/libvirt-php-9999.ebuild | 15 ++++++--------- |
| 14 |
2 files changed, 12 insertions(+), 18 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.3.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.3.ebuild |
| 17 |
index fa770b1f6af..4c6eda7c043 100644 |
| 18 |
--- a/dev-php/libvirt-php/libvirt-php-0.5.3.ebuild |
| 19 |
+++ b/dev-php/libvirt-php/libvirt-php-0.5.3.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2017 Gentoo Foundation |
| 22 |
+# Copyright 1999-2018 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=6 |
| 26 |
@@ -6,6 +6,7 @@ EAPI=6 |
| 27 |
PHP_EXT_NAME="libvirt-php" |
| 28 |
PHP_EXT_SKIP_PHPIZE="yes" |
| 29 |
USE_PHP="php5-6 php7-0 php7-1" |
| 30 |
+PHP_EXT_ECONF_ARGS=() |
| 31 |
|
| 32 |
inherit php-ext-source-r3 autotools |
| 33 |
|
| 34 |
@@ -27,6 +28,9 @@ DEPEND="${RDEPEND} |
| 35 |
|
| 36 |
RESTRICT="test" |
| 37 |
DOCS=( AUTHORS ChangeLog NEWS README ) |
| 38 |
+# Remove the insane check for pecl-imagick which is only used in examples |
| 39 |
+# and is not called upon in any build |
| 40 |
+PATCHES=( "${FILESDIR}/remove-imagick-check.patch" ) |
| 41 |
|
| 42 |
src_unpack() { |
| 43 |
default |
| 44 |
@@ -34,20 +38,13 @@ src_unpack() { |
| 45 |
# create the default modules directory to be able |
| 46 |
# to use the php-ext-source-r3 eclass to configure/build |
| 47 |
ln -s src "${S}/modules" |
| 48 |
- |
| 49 |
- for slot in $(php_get_slots); do |
| 50 |
- cp -r "${S}" "${WORKDIR}/${slot}" |
| 51 |
- done |
| 52 |
} |
| 53 |
|
| 54 |
src_prepare() { |
| 55 |
- # Remove the insane check for pecl-imagick which is only used in examples |
| 56 |
- # and is not called upon in any build |
| 57 |
+ php-ext-source-r3_src_prepare |
| 58 |
local slot |
| 59 |
for slot in $(php_get_slots); do |
| 60 |
php_init_slot_env "${slot}" |
| 61 |
- eapply "${FILESDIR}/remove-imagick-check.patch" |
| 62 |
- eapply_user |
| 63 |
eautoreconf |
| 64 |
done |
| 65 |
} |
| 66 |
|
| 67 |
diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild |
| 68 |
index 4e24b63e0ab..2943eb7e578 100644 |
| 69 |
--- a/dev-php/libvirt-php/libvirt-php-9999.ebuild |
| 70 |
+++ b/dev-php/libvirt-php/libvirt-php-9999.ebuild |
| 71 |
@@ -1,4 +1,4 @@ |
| 72 |
-# Copyright 1999-2017 Gentoo Foundation |
| 73 |
+# Copyright 1999-2018 Gentoo Foundation |
| 74 |
# Distributed under the terms of the GNU General Public License v2 |
| 75 |
|
| 76 |
EAPI=6 |
| 77 |
@@ -6,6 +6,7 @@ EAPI=6 |
| 78 |
PHP_EXT_NAME="libvirt-php" |
| 79 |
PHP_EXT_SKIP_PHPIZE="yes" |
| 80 |
USE_PHP="php5-6 php7-0 php7-1" |
| 81 |
+PHP_EXT_ECONF_ARGS=() |
| 82 |
|
| 83 |
inherit php-ext-source-r3 git-r3 autotools |
| 84 |
|
| 85 |
@@ -27,6 +28,9 @@ DEPEND="${RDEPEND} |
| 86 |
|
| 87 |
RESTRICT="test" |
| 88 |
DOCS=( ChangeLog NEWS README ) |
| 89 |
+# Remove the insane check for pecl-imagick which is only used in examples |
| 90 |
+# and is not called upon in any build |
| 91 |
+PATCHES=( "${FILESDIR}/remove-imagick-check.patch" ) |
| 92 |
|
| 93 |
src_unpack() { |
| 94 |
git-r3_src_unpack |
| 95 |
@@ -34,20 +38,13 @@ src_unpack() { |
| 96 |
# create the default modules directory to be able |
| 97 |
# to use the php-ext-source-r3 eclass to configure/build |
| 98 |
ln -s src "${S}/modules" |
| 99 |
- |
| 100 |
- for slot in $(php_get_slots); do |
| 101 |
- cp -r "${S}" "${WORKDIR}/${slot}" |
| 102 |
- done |
| 103 |
} |
| 104 |
|
| 105 |
src_prepare() { |
| 106 |
- # Remove the insane check for pecl-imagick which is only used in examples |
| 107 |
- # and is not called upon in any build |
| 108 |
+ php-ext-source-r3_src_prepare |
| 109 |
local slot |
| 110 |
for slot in $(php_get_slots); do |
| 111 |
php_init_slot_env "${slot}" |
| 112 |
- eapply "${FILESDIR}/remove-imagick-check.patch" |
| 113 |
- eapply_user |
| 114 |
eautoreconf |
| 115 |
done |
| 116 |
} |
Archives