[gentoo-commits] repo/gentoo:master commit in: dev-php/libvirt-php/

[Brian Evans]

commit:     316d999206a1ceb58f49bca13d896c4d38ff6a3c
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  2 02:31:49 2017 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Jul  2 02:31:49 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=316d9992

dev-php/libvirt-php: Update live ebuild to match 0.5.3 changes

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-php/libvirt-php/libvirt-php-9999.ebuild | 36 +++++++++++++++++------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild
index 2a00868a0aa..50e80eda8c4 100644
--- a/dev-php/libvirt-php/libvirt-php-9999.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-9999.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PHP_EXT_NAME="libvirt-php"
 PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php5-6 php5-5"
-# Automake 1.14 is broken.  Check this later
-WANT_AUTOMAKE="1.13"
+USE_PHP="php5-6 php7-0 php7-1"
 
-inherit php-ext-source-r2 git-r3 autotools
+inherit php-ext-source-r3 git-r3 autotools
 
-DESCRIPTION="PHP 5 bindings for libvirt"
+DESCRIPTION="PHP bindings for libvirt"
 HOMEPAGE="http://libvirt.org/php/"
 EGIT_REPO_URI="git://libvirt.org/libvirt-php.git"
 
@@ -21,19 +19,20 @@ KEYWORDS=""
 IUSE="doc"
 
 RDEPEND="app-emulation/libvirt
-	dev-libs/libxml2
-	dev-php/pecl-imagick"
+	dev-libs/libxml2"
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
+	virtual/pkgconfig
 	doc? ( app-text/xhtml1 )"
 
 RESTRICT="test"
+DOCS=( AUTHORS ChangeLog NEWS README )
 
 src_unpack() {
 	git-r3_src_unpack
 
 	# create the default modules directory to be able
-	# to use the php-ext-source-r2 eclass to configure/build
+	# to use the php-ext-source-r3 eclass to configure/build
 	ln -s src "${S}/modules"
 
 	for slot in $(php_get_slots); do
@@ -42,9 +41,13 @@ src_unpack() {
 }
 
 src_prepare() {
+	# Remove the insane check for pecl-imagick which is only used in examples
+	# and is not called upon in any build
 	local slot
 	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
+		php_init_slot_env "${slot}"
+		eapply "${FILESDIR}/remove-imagick-check.patch"
+		eapply_user
 		eautoreconf
 	done
 }
@@ -54,9 +57,12 @@ src_install() {
 	for slot in $(php_get_slots); do
 		php_init_slot_env ${slot}
 		insinto "${EXT_DIR}"
-		newins "src/.libs/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
+		doins "src/.libs/${PHP_EXT_NAME}.so"
 	done
-	php-ext-source-r2_createinifiles
-	dodoc AUTHORS ChangeLog NEWS README
-	use doc && dohtml docs/* docs/graphics/*
+	php-ext-source-r3_createinifiles
+	einstalldocs
+	if use doc ; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docs/*
+	fi
 }