gentoo resync : 22.01.2021

6 files changed, 40 insertions, 54 deletions

diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index e5038486927a..df5b28e64a5c 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -13,8 +13,8 @@ AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2
 DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae59ffff5 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb
 DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7
 DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
-EBUILD libguestfs-1.36.13-r1.ebuild 4180 BLAKE2B b75851e01f5ac7de049d9564692ca3d26d203f64ac543ca16d0f349d8e429934503ccaf7a9b5c3aa60f461f86806d2bca95b27ce979f7382138f3a992f094dfd SHA512 5ed05d84bf16c169508966ac8736f1c5b9d39535f3020e9ed9f5434ca077b7e9fc73eed3c1ea266809d8283828322e98775c266f9e1612b81b6111d43b982d8e
-EBUILD libguestfs-1.36.15-r1.ebuild 4384 BLAKE2B 8974197d9050926cfb2d3f016a42e89a943f9aa0fde18183e14ec54a3c677e1bddd123cd3273613b7289a4bd17808cecf86d68f60d0a04b9516b0704f488dff2 SHA512 52c450897b0eb4daa7a093678d91db1e9594af29b3061508619fa477c5e964b67212eaa309da3155fc5042c1c0e566f90875014bdf732c73249284cf323da91e
-EBUILD libguestfs-1.38.6-r1.ebuild 4117 BLAKE2B b7acb5937cdb72465d3a9b0ffcc9d291826dc8c5e12e80fbfe85175a0a89af4482306bbeb689c66ad9747a3e8fedb0efbb6081f8113400d31786a990e0194600 SHA512 521dfebba8682e5a1b0971eb34d000c8a13946d048a4c7add77837b2810ea0f125463b4429259ef46eba8eb1cfc0ddfb519fd047a128c4c26886875235c021c3
-EBUILD libguestfs-1.38.6-r101.ebuild 4359 BLAKE2B fea4573518abd3cb3f7afde60f53f6478fbddd0b0ab432597d0bb0ba9b9930a03a34e1f4954819dd988f722da44380cfd3097c91533f49615bc01467bfedb88f SHA512 b96f719044be1eaab27ecff8f5db80155dbb30c1e823f8860356a89f428c0fe3e192fbb171f1c6ee5513df7059ac068a2ba3eb3c2ed755bc9e19bd0d1e760d7d
-MISC metadata.xml 845 BLAKE2B 002345b189789a28d74b674c9f32cd5b6793cd84e50fa3f54212c0d05ba6463ffcf75629f2459979dd20a85312018054325660b16d4df04e87222b5ce9ac95c9 SHA512 c32515f853783a1935a2285305e1b54e7309be52b6ac3cd4084a26b28f2b53c4378faa95ae3e24e6b0349ed1e84c46df0a5337c258e3726870aa7d45e3ed5366
+EBUILD libguestfs-1.36.13-r2.ebuild 4076 BLAKE2B f696a859f85d99796e80d4e1a8a3a6321fbdbb462d2a9973540e98ed8d5565350f3f5c014edd8a1612ff2614ff34ee3093a0f67dcdf66aadfded07ee45eaed44 SHA512 44402367a66b8426e2599d5083af0d455c6ce49641b645c371c28e02bd917cd7b3ad9a8f198fb1708bdc38f87cae56cd66c606e2c9b0c88cca8fbeb98751256c
+EBUILD libguestfs-1.36.15-r2.ebuild 4280 BLAKE2B 6ce5ba5de75fb295ba38eaf57dd4ffa0b39b6665756b43ee114be0c7be6707545d72fbcf13b1bf26272e3b5d178011b1f2242c202c7981e2d0327978eee2e8d9 SHA512 6426e1613a2762558a0d364117e78df1cb8df23620c2b5481721170c94de28b501070f916c3bd6e7458a682b1f225ba04278954bdcd36642273903c826b7d62f
+EBUILD libguestfs-1.38.6-r1.ebuild 3982 BLAKE2B a3a620ad65c8f09f884c24c3d9cf59c552074bbd37603340bb9c58b423a0bb4e2a4ba0693be1999dca9a9d09bef699bc641d3b1cb50ce374cecd7b739ceaa9ea SHA512 461b83fc2e1abdbca3b1a6e43432889a31001ae3c118f35e202e9f137ac13c1d286fd4ff9e4fa2b4ac7a2461ccc6ff737c55e1a3755c88a95823227c49e5666e
+EBUILD libguestfs-1.38.6-r102.ebuild 4259 BLAKE2B a3d079eb6f7669ffecfbfaeee4dc82ed7e4bcf3bd7f98185fb89696f076f1d2ae45a9fd6bd61edcc0939d417ca7e57172ac4c469d18addeb44f4eee60043977c SHA512 30af5d7d291555455b7a56061521a66e6cdbd6d011f030e0cc72ff7c6eea409517c711892a75284061eec1afc9913809c1bf5b7826a55718f5d22d2ea2aab5e1
+MISC metadata.xml 775 BLAKE2B a07bce73924d205f7c34b2951453745eb9dc022e9fe05729fcb7a2f2a30bcc298172cc5839479e78421427e40ad61b7c47586f4113933bf99edd59edcd23c7e5 SHA512 38f7c789ecedcb40c34f64ba9231a5706506b1ac52acb35757b3f51f954ce768b8958525d4343520e0c1b6560fc4cb9ac4a898010598c149cc661e1f5f151964
diff --git a/app-emulation/libguestfs/libguestfs-1.36.13-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild
index 258c8907bcca..d7917faae2be 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.13-r1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils autotools linux-info perl-functions python-single-r1 versionator
+inherit eutils autotools linux-info perl-functions versionator
 
 MY_PV_1="$(get_version_component_range 1-2)"
 MY_PV_2="$(get_version_component_range 2)"
@@ -19,11 +17,9 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0/"${MY_PV_1}""
 
 KEYWORDS="~amd64"
-IUSE="bash-completion debug doc erlang +fuse gtk inspect-icons introspection lua ocaml +perl python ruby selinux static-libs systemtap test"
+IUSE="bash-completion debug doc erlang +fuse gtk inspect-icons introspection lua ocaml +perl ruby selinux static-libs systemtap test"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 # Failures - doc
 # Failures - bash-completion, see GBZ #486306
 
@@ -60,7 +56,6 @@ COMMON_DEPEND="
 		>=app-misc/hivex-1.3.1[perl?]
 		dev-perl/String-ShellQuote
 	)
-	python? ( ${PYTHON_DEPS} )
 	fuse? ( sys-fs/fuse:= )
 	introspection? (
 		>=dev-libs/glib-2.26:2
@@ -75,8 +70,11 @@ COMMON_DEPEND="
 	ocaml? (
 		>=dev-lang/ocaml-4.02:=[ocamlopt]
 		dev-ml/findlib[ocamlopt]
-		dev-ml/ocaml-gettext:=
-		>=dev-ml/ounit-2
+		|| (
+			<dev-ml/ocaml-gettext-0.4.2[ocamlopt]
+			dev-ml/ocaml-gettext-stub[ocamlopt]
+		)
+		>=dev-ml/ounit-2[ocamlopt]
 	)
 	erlang? ( dev-lang/erlang )
 	inspect-icons? (
@@ -109,8 +107,6 @@ DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
 pkg_setup() {
 		CONFIG_CHECK="~KVM ~VIRTIO"
 		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-
-		use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -137,7 +133,7 @@ src_configure() {
 		--with-extra="-gentoo" \
 		--with-readline \
 		--disable-php \
-		$(use_enable python) \
+		--disable-python \
 		--without-java \
 		$(use_enable perl) \
 		$(use_enable fuse) \
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild
index 0bc5439dea8e..9b008144a845 100644
--- a/app-emulation/libguestfs/libguestfs-1.36.15-r1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 xdg-utils
+inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions xdg-utils
 
 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
@@ -19,11 +17,9 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0/"${MY_PV_1}""
 
 KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
+IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 # Failures - doc
 
 # FIXME: selinux support is automagic
@@ -59,7 +55,6 @@ COMMON_DEPEND="
 		>=app-misc/hivex-1.3.1[perl?]
 		dev-perl/String-ShellQuote
 	)
-	python? ( ${PYTHON_DEPS} )
 	fuse? ( sys-fs/fuse:= )
 	introspection? (
 		>=dev-libs/glib-2.26:2
@@ -73,8 +68,11 @@ COMMON_DEPEND="
 	ocaml? (
 		>=dev-lang/ocaml-4.02:=[ocamlopt]
 		dev-ml/findlib[ocamlopt]
-		dev-ml/ocaml-gettext:=
-		>=dev-ml/ounit-2
+		|| (
+			<dev-ml/ocaml-gettext-0.4.2[ocamlopt]
+			dev-ml/ocaml-gettext-stub[ocamlopt]
+		)
+		>=dev-ml/ounit-2[ocamlopt]
 	)
 	erlang? ( dev-lang/erlang )
 	inspect-icons? (
@@ -114,8 +112,6 @@ PATCHES=(
 pkg_setup() {
 		CONFIG_CHECK="~KVM ~VIRTIO"
 		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-
-		use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -141,7 +137,7 @@ src_configure() {
 		--with-extra="-gentoo" \
 		--with-readline \
 		--disable-php \
-		$(use_enable python) \
+		--disable-python \
 		--without-java \
 		$(use_enable perl) \
 		$(use_enable fuse) \
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild
index 8764f049efc3..007b01984ed2 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 xdg-utils
+inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions xdg-utils
 
 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
@@ -19,11 +17,9 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0/"${MY_PV_1}""
 
 KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
+IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
 # Failures - doc
 
 # FIXME: selinux support is automagic
@@ -59,7 +55,6 @@ COMMON_DEPEND="
 		>=app-misc/hivex-1.3.1[perl?]
 		dev-perl/String-ShellQuote
 	)
-	python? ( ${PYTHON_DEPS} )
 	fuse? ( sys-fs/fuse:= )
 	introspection? (
 		>=dev-libs/glib-2.26:2
@@ -91,7 +86,10 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	>=dev-lang/ocaml-4.03[ocamlopt]
 	dev-ml/findlib[ocamlopt]
-	dev-ml/ocaml-gettext
+	|| (
+		<dev-ml/ocaml-gettext-0.4.2
+		dev-ml/ocaml-gettext-stub
+	)
 	>=dev-ml/ounit-2
 	doc? ( app-text/po4a )
 	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
@@ -110,8 +108,6 @@ PATCHES=(
 pkg_setup() {
 		CONFIG_CHECK="~KVM ~VIRTIO"
 		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-
-		use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -137,7 +133,7 @@ src_configure() {
 		--with-extra="-gentoo" \
 		--with-readline \
 		--disable-php \
-		$(use_enable python) \
+		--disable-python \
 		--without-java \
 		$(use_enable perl) \
 		$(use_enable fuse) \
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r101.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild
index 63600cbe2d16..9e213a0a9410 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r101.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild
@@ -4,9 +4,8 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 )
-PYTHON_COMPAT=( python3_6 )
 
-inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions python-single-r1 xdg-utils
+inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions xdg-utils
 
 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
@@ -20,11 +19,10 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0/"${MY_PV_1}""
 
 KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
+IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
 
 # Failures - doc
 
@@ -61,7 +59,6 @@ COMMON_DEPEND="
 		>=app-misc/hivex-1.3.1[perl?]
 		dev-perl/String-ShellQuote
 	)
-	python? ( ${PYTHON_DEPS} )
 	fuse? ( sys-fs/fuse:= )
 	introspection? (
 		>=dev-libs/glib-2.26:2
@@ -93,8 +90,11 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/gperf
 	>=dev-lang/ocaml-4.03:=[ocamlopt]
 	dev-ml/findlib[ocamlopt]
-	dev-ml/ocaml-gettext:=
-	>=dev-ml/ounit-2
+	|| (
+		<dev-ml/ocaml-gettext-0.4.2
+		dev-ml/ocaml-gettext-stub[ocamlopt]
+	)
+	>=dev-ml/ounit-2[ocamlopt]
 	doc? ( app-text/po4a )
 	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
 	test? ( introspection? ( dev-libs/gjs ) )
@@ -117,7 +117,6 @@ pkg_setup() {
 		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
 
 		use lua && lua-single_pkg_setup
-		use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -143,7 +142,7 @@ src_configure() {
 		--with-extra="-gentoo" \
 		--with-readline \
 		--disable-php \
-		$(use_enable python) \
+		--disable-python \
 		--without-java \
 		$(use_enable perl) \
 		$(use_enable fuse) \
diff --git a/app-emulation/libguestfs/metadata.xml b/app-emulation/libguestfs/metadata.xml
index 5a7068237965..c8cefa609d7b 100644
--- a/app-emulation/libguestfs/metadata.xml
+++ b/app-emulation/libguestfs/metadata.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
+<!-- maintainer-needed -->
+<!--
 <maintainer type="person">
 	<email>rich@annexia.org</email>
 	<name>Richard Jones</name>
 	<description>Upstream - please CC on bugs that concerns upstream</description>
 </maintainer>
+-->
 <use>
 	<flag name="erlang">Build Erlang bindings</flag>
 	<flag name="fuse">Enable image mount support via fuse</flag>