gentoo resync : 20.03.2022

4 files changed, 27 insertions, 18 deletions

diff --git a/dev-php/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest
index bfcccf70b230..09b2d57f867b 100644
--- a/dev-php/libvirt-php/Manifest
+++ b/dev-php/libvirt-php/Manifest
@@ -1,7 +1,7 @@
 AUX remove-imagick-check.patch 331 BLAKE2B 2d9c164055c3f54baf259326abe22d5aa478141df7f6ea05ba33f040701947038490c1898e89a7019cc1e41008fde5cb43c338730ef7ec3020f5005edd612d9c SHA512 1e949f8c704a2e6b541a276b8cb53e9cf09f009dadc01f4f50ad02e92258cfe30130b2d22b811e0b5b07e1bad4023fad05040c6031bd0063999212c2d6483bcf
-DIST libvirt-php-0.5.4.tar.gz 780793 BLAKE2B 8bb4577c26cc0ef8f2a0ae813ade7f5fdea9a2a7d70c97cab1033fde21d9a1c27b8c2ad7a8284096e143e955202bb564767b4d7e1a4bb9e15993895adc119288 SHA512 b5b204549e6810668203d1df8404a5cb71f646ae7e01ea223c6e9b9eec9b1f6500cc5bb4559859959d821a213ff992f22a97e4b683da2c683be3732710943487
 DIST libvirt-php-0.5.5.tar.gz 761250 BLAKE2B 9899d2f0e5ea387333decce5071afc81d4160d54ef570dcbe04422dc3e93479ee57520f9bf33a0275ee86cd4b1c87e5a3f7d5118e0cd87658faed44d2ccd4807 SHA512 2ea263561a0bf5d155314e06dcf3c3b5c278640bc5edfa674cdd777cb6d0810bda0492c6cf77a02bc88fb6aa99b0ff1f0cbaeea87ff2e45bff9b5774a2507684
-EBUILD libvirt-php-0.5.4-r1.ebuild 1412 BLAKE2B 7787eae4d938017a3ceb98835d90a2124952fc89b6160a97a6756d48d59495aae5e91846a63dc47915ae7fcf4c4cc16557147abfa3a60171248543e5ec738a89 SHA512 48964a88b87317f4c0af513793266862e2a0476f2ad29857e34688321554c63d19017811c24af8431e4021dbbfaee8151c61996fce7eabea90165ea9b111b7dc
-EBUILD libvirt-php-0.5.5-r1.ebuild 1503 BLAKE2B 6a5e46742e68f5f39b9d048f363416c479a83ee8d28ea9f22b3402628c08d5e4dfad0dc7031e475bed834a66b885850f69ffd3fb27d3c538589a0ccb84220373 SHA512 f68900a360319de263359ed32eed3670bc4e3994eef470417d832607549da44d43cec7269f3198bce7af9bc91ffc5f94c0904c026b6436f4661bbbe8ee5da7d0
-EBUILD libvirt-php-9999.ebuild 1456 BLAKE2B 290b01dd35b344f164a34fbc650f18d77ffc4a81856e5f9725b39169c676ed3405e840b327ffa6ca4be1638e5e0ff2a7d32ec2bad9ba5ca213fae7d32c08139e SHA512 91567d8f0938c3f023a47f5f8d0b9c66c15314bdda2b7bde3b44a91ebbfcf76ddf5c0dc25f1c071fc484723697729d23a33913f72560a3cb0d85146841ac29aa
+DIST libvirt-php-0.5.5_p20211020.tar.bz2 359477 BLAKE2B f4be3cf138364997911b58b07e128e4b5c9e6f1520d876b51466a30cd2ade4035a06488e07b8be4cce65b1bc6585b768997214c9d0ba72cc51855b4fc0827ff4 SHA512 b935c910e8754000de45e88f5d5e61e2e95fbb1b007f0d747bf4cd3531ee9cb0ff5bc2ec6f561c79711df9b70e1c4cdaf2e046774341d29d3f2382d27ab8c494
+EBUILD libvirt-php-0.5.5-r1.ebuild 1475 BLAKE2B 32551b061e397285edf1ba9a2165cd459c673aa415c1b743ab7745982f5eda7c13f55b0bcf7f685408a6d813803acd321abbbc56431cb935b0788a796acb7a3e SHA512 90cf2a297540f06e2535b689fdb94ac116574049277bcb453d8ed0883cc59b428f5ce7fb6ed4d860efff129d41955a14763e9cd47be4e7c1a400944b63102e30
+EBUILD libvirt-php-0.5.5_p20211020.ebuild 1604 BLAKE2B 32e9dadddeb6346b1f4a55e3f40da5a40ff3b72e2ff7e69cdcb24bfc54e19bbb0fca499d9c4a2183dc6459411c601f64b5ec6ef60a12d5f3da35d159f6f8627d SHA512 12b8ab762ba5bb356b6ce489cd2afb2195c3a551fecfab0eace606ef10e66d729f0782ba61d3ae425154b4de7971017054381791874b13c907f72bcfde16eb47
+EBUILD libvirt-php-9999.ebuild 1463 BLAKE2B d482021104136ac237690ed9ffec6ffde66d54fd8adec41d3c2e6caf68ff0bcde507f6792d27ea6727eb6279d0dc7fc972a3021157872d5cff02ddb391649395 SHA512 8d982f4c805b5a485c6a12cbb1604d5c6a9041c1b594dc74c3577ea217b567325ec034673362bb46381793e8fb918d116ecb2095aa78d293f62120d7328ec57f
 MISC metadata.xml 372 BLAKE2B 2dd1ade6ec545cb0a2574dcc308dfa41608de5d7d666adf0bffd8d0441230ce835c78507e23d02b2f3b2b10d8dde130e64985156f2de322710f05078c6690034 SHA512 eabd4a207f5e76a04d6de32b3c4e4b103ac795d310559d3278b2f39dc251795de60f2ba8b07b8bd91d2785a2e1f2e10fec1cbfe734926005f0aee600bf0ebca5
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild
index 093337c9e3c3..57415a26ee3c 100644
--- a/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-0.5.5-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 PHP_EXT_NAME="libvirt-php"
 PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php7-4"
 PHP_EXT_ECONF_ARGS=()
 
 inherit php-ext-source-r3 autotools flag-o-matic
diff --git a/dev-php/libvirt-php/libvirt-php-0.5.4-r1.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.5_p20211020.ebuild
index cc5be73d2db7..8e019aab4abe 100644
--- a/dev-php/libvirt-php/libvirt-php-0.5.4-r1.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-0.5.5_p20211020.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PHP_EXT_NAME="libvirt-php"
 PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+USE_PHP="php7-4 php8-0 php8-1"
 PHP_EXT_ECONF_ARGS=()
+SNAPSHOT="23dde4ddc42fabee0b8c6625b80183b3cbe96a67"
 
 inherit php-ext-source-r3 autotools
 
 DESCRIPTION="PHP bindings for libvirt"
 HOMEPAGE="http://libvirt.org/php/"
-SRC_URI="http://libvirt.org/sources/php/${P}.tar.gz"
+SRC_URI="https://gitlab.com/libvirt/${PN}/-/archive/${SNAPSHOT}/${PN}-${SNAPSHOT}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS=""
 IUSE="doc"
 
 RDEPEND="app-emulation/libvirt
@@ -26,9 +27,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-text/xhtml1 )"
 
-RESTRICT="test"
-# ChangeLog and NEWS are empty files
-DOCS=( AUTHORS README )
+S="${WORKDIR}/${PN}-${SNAPSHOT}"
+PHP_EXT_S="${S}"
+
+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" )
@@ -38,7 +40,7 @@ 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"
+	ln -s src "${S}/modules" || die
 }
 
 src_prepare() {
@@ -67,3 +69,10 @@ src_install() {
 		dodoc -r docs/*
 	fi
 }
+
+src_test() {
+	for slot in $(php_get_slots); do
+		php_init_slot_env ${slot}
+		default
+	done
+}
diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild
index 0d75a2ce62a7..df851fcfe3a0 100644
--- a/dev-php/libvirt-php/libvirt-php-9999.ebuild
+++ b/dev-php/libvirt-php/libvirt-php-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PHP_EXT_NAME="libvirt-php"
 PHP_EXT_SKIP_PHPIZE="yes"
-USE_PHP="php7-3 php7-4"
+USE_PHP="php7-4 php8-0 php8-1"
 PHP_EXT_ECONF_ARGS=()
 
 inherit php-ext-source-r3 git-r3 autotools