Version bump; Drop 5.3 support; Fix LICENSE to LGPL-2.1; Block automake-1.14 on live build

(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 67C78E1D)

4 files changed, 30 insertions, 63 deletions

diff --git a/dev-php/libvirt-php/ChangeLog b/dev-php/libvirt-php/ChangeLog
index 675e997fd8f4..88ba6a13b6d5 100644
--- a/dev-php/libvirt-php/ChangeLog
+++ b/dev-php/libvirt-php/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php/libvirt-php
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/libvirt-php/ChangeLog,v 1.8 2014/08/10 21:00:07 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/libvirt-php/ChangeLog,v 1.9 2014/10/02 13:50:42 grknight Exp $
+
+*libvirt-php-0.4.8 (02 Oct 2014)
+
+  02 Oct 2014;  <grknight@gentoo.org> +libvirt-php-0.4.8.ebuild,
+  -libvirt-php-0.4.6.ebuild, -libvirt-php-0.4.7.ebuild, libvirt-php-9999.ebuild:
+  Version bump; Drop 5.3 support; Fix LICENSE to LGPL-2.1; Block automake-1.14
+  on live build
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> libvirt-php-0.4.6.ebuild,
   libvirt-php-0.4.7.ebuild, libvirt-php-9999.ebuild:
diff --git a/dev-php/libvirt-php/libvirt-php-0.4.7.ebuild b/dev-php/libvirt-php/libvirt-php-0.4.7.ebuild
deleted file mode 100644
index c9b69ace7bf3..000000000000
--- a/dev-php/libvirt-php/libvirt-php-0.4.7.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/libvirt-php/libvirt-php-0.4.7.ebuild,v 1.2 2014/08/10 21:00:07 slyfox Exp $
-
-EAPI=4
-
-PHP_EXT_NAME="libvirt-php"
-PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php5-3 php5-4"
-
-inherit php-ext-source-r2 eutils
-
-DESCRIPTION="PHP 5 bindings for libvirt"
-HOMEPAGE="http://libvirt.org/php/"
-SRC_URI="http://libvirt.org/sources/php/${P}.tar.gz"
-
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND="app-emulation/libvirt
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	doc? ( app-text/xhtml1 )"
-
-RESTRICT="test"
-
-src_unpack() {
-	default
-	# create the default modules directory to be able
-	# to use the php-ext-source-r2 eclass to configure/build
-	ln -s src "${S}/modules"
-
-	for slot in $(php_get_slots); do
-		cp -r "${S}" "${WORKDIR}/${slot}"
-	done
-}
-
-src_install() {
-	for slot in $(php_get_slots); do
-		php_init_slot_env ${slot}
-		insinto "${EXT_DIR}"
-		newins "src/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
-	done
-	php-ext-source-r2_createinifiles
-	dodoc AUTHORS ChangeLog NEWS README
-	use doc && dohtml docs/* docs/graphics/*
-}
diff --git a/dev-php/libvirt-php/libvirt-php-0.4.6.ebuild b/dev-php/libvirt-php/libvirt-php-0.4.8.ebuild
index 79929c2d93f1..c36f8f7cc023 100644
--- a/dev-php/libvirt-php/libvirt-php-0.4.6.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-0.4.8.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/libvirt-php/libvirt-php-0.4.6.ebuild,v 1.3 2014/08/10 21:00:07 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/libvirt-php/libvirt-php-0.4.8.ebuild,v 1.1 2014/10/02 13:50:42 grknight Exp $
 
-EAPI=4
+EAPI=5
 
 PHP_EXT_NAME="libvirt-php"
 PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php5-3 php5-4"
+USE_PHP="php5-6 php5-5 php5-4"
 
 inherit php-ext-source-r2 eutils
 
@@ -14,7 +14,7 @@ DESCRIPTION="PHP 5 bindings for libvirt"
 HOMEPAGE="http://libvirt.org/php/"
 SRC_URI="http://libvirt.org/sources/php/${P}.tar.gz"
 
-LICENSE="PHP-3.01"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="doc"
@@ -39,6 +39,7 @@ src_unpack() {
 }
 
 src_install() {
+	local slot
 	for slot in $(php_get_slots); do
 		php_init_slot_env ${slot}
 		insinto "${EXT_DIR}"
diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild
index 075888a2c925..0d8925158ca5 100644
--- a/dev-php/libvirt-php/libvirt-php-9999.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-9999.ebuild
@@ -1,20 +1,22 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/libvirt-php/libvirt-php-9999.ebuild,v 1.5 2014/08/10 21:00:07 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/libvirt-php/libvirt-php-9999.ebuild,v 1.6 2014/10/02 13:50:42 grknight Exp $
 
-EAPI=4
+EAPI=5
 
 PHP_EXT_NAME="libvirt-php"
 PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php5-3 php5-4"
+USE_PHP="php5-6 php5-5 php5-4"
+# Automake 1.14 is broken.  Check this later
+WANT_AUTOMAKE="1.13"
 
-inherit php-ext-source-r2 git-2
+inherit php-ext-source-r2 git-r3 autotools
 
 DESCRIPTION="PHP 5 bindings for libvirt"
 HOMEPAGE="http://libvirt.org/php/"
 EGIT_REPO_URI="git://libvirt.org/libvirt-php.git"
 
-LICENSE="PHP-3.01"
+LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
 IUSE="doc"
@@ -27,10 +29,9 @@ DEPEND="${RDEPEND}
 
 RESTRICT="test"
 
-EGIT_BOOTSTRAP="autogen.sh"
-
 src_unpack() {
-	git-2_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
 	ln -s src "${S}/modules"
@@ -40,6 +41,14 @@ src_unpack() {
 	done
 }
 
+src_prepare() {
+	local slot
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		eautoreconf
+	done
+}
+
 src_install() {
 	for slot in $(php_get_slots); do
 		php_init_slot_env ${slot}