gentoo resync : 20.03.2021

15 files changed, 13 insertions, 793 deletions

diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 794338aef128..46d899231f5b 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -1,20 +1,5 @@
-AUX 1.28/0000_bug_499150.patch 406 BLAKE2B 99ecdc6e98e9153f9939ea0318d7afc9cf852e8a575e5ff6731e2be272574510bdef1225303d131c099df5b39702b6cd7f141ec5ddcbeb2722c9cb7b6b63e080 SHA512 a131e49f9e9d3cf6080e0f3ad27805572a1e05a01f348a1ffad62b75d24cb72526bf68035b9a600fb1ae3864e813768a971c6b7d6f31f4a8467b4a6839ebb568
-AUX 1.28/0001_add_gentoo_names_to_configure.patch 262 BLAKE2B 13851f2abc4c979c337120d604e325a8a4bee77ebfb720456fb6e38255ccbca81f11b783d9aa9433842d44c4d1a6811310fd72c58ad99aeb79fdbd3a970c138f SHA512 9e6ef0c0475c5b180bc0ca7ded197901e25383e0359c429514e9c0217b7059d5f900a19d30d7d864a386279be0fd45bd9d41c56062b48c11dff31a8f92c5b789
-AUX 1.28/0002_add_gentooway_to_remove_la_files.patch 555 BLAKE2B 067ac24e6aa1a8b0df80378054f420660938cb9a2bbdc1cf3c00e9c74ba36f0add71e8c7b95776b2d965aa06c5feabd0ce4115c5ffeff3f5a78828f2ecb162ab SHA512 5dd8f7a8eeed6e2e4e842cd9fb5fde5104ab47bfddcbe218107e181c3891350eb425648667c4d70becb437bbf52506035b20778ea3a7954f020e4a2be76f959b
-AUX 1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch 508 BLAKE2B fd04c471a1eae62c0e3151ecb96dc540cae744e3eee85daf2eaeaa18515b6fead7f087757bfc46ab293865c6af73e745ab57e16934979c6ece95f4178ef74e48 SHA512 9801326dfd2fd39202f8bd0765b954c3947e829d9568bda9a50c14388b9e7d6855c2fd38976fe98cd1183163d220b3795ec1105becb49a9de34459bb2ea74112
-AUX 1.28/0103_disable_php_bindings_makefile.patch 231 BLAKE2B b86d1fb1d8b3fa45f9b2470f72e04737c105108ab8bbcb0be00437aee05931ee229228573a4d1f7388d1d754bb4c50d61c13c08f7876a9f52fc63f7803499667 SHA512 b359cd29ab9cb6edec5a4cab1d84b022ae6ff42c3adae75051ab0d8c87dda39fff17e02ada3a863177e3dd979dffd4958cbc3c71cdca89196c74f1ebd14a8da3
-AUX 1.36/0001-Update-libtool-initialization.patch 984 BLAKE2B afe8906c51c300493deec5a423b85634787e8dfe47841bd8d0c31eface0e40ac55698ca269f373381623ddd8d414241bc8775164ba43607a48cef1abed4d156d SHA512 c1d72b214d2ae5d1ecebc9333e1926d475d84c992af22379d3eb94f1ce5dbd0444b4f24d757de038d0b941d3f720d13e53837b0655019cb82c136622bca7496c
-AUX 1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch 725 BLAKE2B da5d03d8ba09577e30a954212a56ba1c182956cea00a290c380240e91aedf9c8b224d461c14b23d85eacc557b7c4600deb8dfd6cdc72355bd947087e2996c8ad SHA512 89f4375aef8f025b4cc1271f92d33a58927a13d05167c14c02fa48849bbe7283af684ea0e63632c7f7b8b04c9be463d29c07e65ca52b606283c1e0270c4db167
-AUX 1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch 1069 BLAKE2B 40838bbaa344984558de1f7281057f26905e3715ef4675e168c85afe5d0f9161547f1816c543bcd37a2e586e3390bfe2950b0e087a8ca1312e543e454cf001f8 SHA512 850df31f977a242bf9b314c7daef9481fa1f886389087b724de1643b57c70c6ec36296a141d3d63858bcd8602370c874d301d71a8e46920c6f7f809bdd26e6f9
-AUX 1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch 1168 BLAKE2B 50cf3ece759e8089d90f95e233c4a1a52ffd20f32a75e24e239e441163fc4d5ef852be3b347575e3285d5969ef7eed98f67340c190f423c2ec356d52a7c60629 SHA512 8c45fb951ceecfc67bcbb426a1bd37bfd31981bde2b8235c1508ccf4eb3a1a44627beffc824a3cff333a40a425da17ef77962b5ea9c1a875acb6adf0d47e8931
-AUX 1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2B 8062f548097fbcdb1c2cba45553eb22d315e618379d3fab8b87ee9c269c6e8de849de81511c6e9ed0aa1023a9ff31131b2ba507a0b1602e7485e192398fa3151 SHA512 a7cf03794c01b4386f7b78762381d17a37bf0abcf65800751126093b335f2e2dbde95f5016c9fc6813d8465370a96018c4aab6f9613104430d04b94a39b78ced
 AUX 1.38/0001-Fix-install-failure-when-not-built-with-OCaml-suppor.patch 1149 BLAKE2B 7b9f870370a3ff32cb9ae7ca75cad885c442d322b695349efa238dd27709e890d98bc1c4a093446a4ad3eacf6e1ac55057a4a4b757a5e5520d2df315bbac3a8d SHA512 83cee02636508ce674688584095954d90e1830d85d869a9c9bea73bbf5193da980116313ebc8726dce7708d464bca0f647c3738b36197d5e78adf398b2608d57
 AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2B b73cba74867f37ee3e640311a885ab46ae952fa9322469cb636a27da23e69762800f7d867273d1c9b439444d759c386877044bbc3ceb42dde96de9ffc942fcb5 SHA512 331e724a8978af2a608eb86fbf3744d0d97208a73c43ab919286369ade836b9d1f571b8990a1b92b68ebe01d6c9040e2293426a1c49de4e6a11ab1c60013de23
-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-r2.ebuild 4068 BLAKE2B e1ed4bed7e91b15ef764e02b9ea0b57f4445a15b42acb61c40e6713e2eca18159cfee126969089afd02d945564d778e3cdb4d94f50bd41d252073ee07159a79b SHA512 045a24d92a43ff064c70f7050264ff7187c838912da4852fe717edcfec820e864529cb1e0b81f5f5362b31604c1516d8665051a8070f34ce74f7bc9a97ab1f30
-EBUILD libguestfs-1.36.15-r2.ebuild 4272 BLAKE2B 4faaff876e59c79077f9222d3560f60443e11599c0862f25fdcada21a2e6ea6342a93b8cf8a228bf8f8bfdc9de0387724baa4ab8c2755f3690892331866dea71 SHA512 a04d6cc9d2a8c66979fae3e73ab292a9e3c5d0b958f3856411d57ed7928393acda8320faf3306a7a1bebd83231fab303cef67b9ead14ea8fb7782e17f1ef0559
-EBUILD libguestfs-1.38.6-r1.ebuild 3984 BLAKE2B 613029ed271bc50e83c1e25c7045ff433cdc1332d2f9ed09b191352b43268597955d6392245bb25dded3955c2e900b19c4526f0070baa70cc62bdb7bd1666d38 SHA512 00a7bea64c8e628b154c5d746f95c9d5830e23ea4709a4767758518e07192b66aaef5112a350769973c0d11992f38e18731f22464d7efc829d7f5983eddf7749
-EBUILD libguestfs-1.38.6-r102.ebuild 4259 BLAKE2B a3d079eb6f7669ffecfbfaeee4dc82ed7e4bcf3bd7f98185fb89696f076f1d2ae45a9fd6bd61edcc0939d417ca7e57172ac4c469d18addeb44f4eee60043977c SHA512 30af5d7d291555455b7a56061521a66e6cdbd6d011f030e0cc72ff7c6eea409517c711892a75284061eec1afc9913809c1bf5b7826a55718f5d22d2ea2aab5e1
+EBUILD libguestfs-1.38.6-r103.ebuild 4500 BLAKE2B fd0a456bee5c143ff2e05208f5cfa4e9816bdc06ca93527c3ddfa43140c532067056c5800f1a1db397f9c29b16aaac07a3e16fe04c647fe6e7066aac52aae148 SHA512 3c4fa805e1e55dda3e53db238c08e8bb509b655d7542be7617258bb3ad5f8214659317860454925da1a2b8d2db3682a29fb8efe46c455881c55e1611d957257b
 MISC metadata.xml 775 BLAKE2B a07bce73924d205f7c34b2951453745eb9dc022e9fe05729fcb7a2f2a30bcc298172cc5839479e78421427e40ad61b7c47586f4113933bf99edd59edcd23c7e5 SHA512 38f7c789ecedcb40c34f64ba9231a5706506b1ac52acb35757b3f51f954ce768b8958525d4343520e0c1b6560fc4cb9ac4a898010598c149cc661e1f5f151964
diff --git a/app-emulation/libguestfs/files/1.28/0000_bug_499150.patch b/app-emulation/libguestfs/files/1.28/0000_bug_499150.patch
deleted file mode 100644
index 1e0f1a32185e..000000000000
--- a/app-emulation/libguestfs/files/1.28/0000_bug_499150.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/configure.ac	2014-01-24 19:04:05.633056872 +0100
-+++ b/configure.ac	2014-01-24 19:04:34.685691757 +0100
-@@ -24,6 +24,7 @@
- 
- AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
- AC_CONFIG_AUX_DIR([build-aux])
-+AM_GNU_GETTEXT_VERSION(0.18.3)
- 
- dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
- dnl gives an error if it sees this, but for automake >= 1.13
diff --git a/app-emulation/libguestfs/files/1.28/0001_add_gentoo_names_to_configure.patch b/app-emulation/libguestfs/files/1.28/0001_add_gentoo_names_to_configure.patch
deleted file mode 100644
index 9d209ff53584..000000000000
--- a/app-emulation/libguestfs/files/1.28/0001_add_gentoo_names_to_configure.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -482,6 +482,11 @@
-         DISTRO=UBUNTU
-     fi
- fi
-+
-+if test -f /etc/gentoo-release; then
-+    DISTRO=GENTOO
-+fi
-+
- if test -f /etc/arch-release; then
-     DISTRO=ARCHLINUX
- fi
diff --git a/app-emulation/libguestfs/files/1.28/0002_add_gentooway_to_remove_la_files.patch b/app-emulation/libguestfs/files/1.28/0002_add_gentooway_to_remove_la_files.patch
deleted file mode 100644
index 38a591b811ed..000000000000
--- a/app-emulation/libguestfs/files/1.28/0002_add_gentooway_to_remove_la_files.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -1487,8 +1487,10 @@
- 
- dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
- dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
--LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
--AC_SUBST([LIBTOOL])
-+dnl LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
-+dnl AC_SUBST([LIBTOOL])
-+LT_INIT
-+
- 
- dnl Produce output files.
- AC_CONFIG_HEADERS([config.h])
diff --git a/app-emulation/libguestfs/files/1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch b/app-emulation/libguestfs/files/1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
deleted file mode 100644
index 69b3ae6d0d2d..000000000000
--- a/app-emulation/libguestfs/files/1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -1491,11 +1491,12 @@
- ])
- 
- # check for gtk-doc
--m4_ifdef([GTK_DOC_CHECK], [
--    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
--],[
--    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
--])
-+#m4_ifdef([GTK_DOC_CHECK], [
-+#    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-+#],[
-+#    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
-+#])
-+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
- 
- dnl Library versioning.
- MAX_PROC_NR=`cat $srcdir/src/MAX_PROC_NR`
diff --git a/app-emulation/libguestfs/files/1.28/0103_disable_php_bindings_makefile.patch b/app-emulation/libguestfs/files/1.28/0103_disable_php_bindings_makefile.patch
deleted file mode 100644
index 34ab42d27903..000000000000
--- a/app-emulation/libguestfs/files/1.28/0103_disable_php_bindings_makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -88,9 +88,6 @@
- if HAVE_HASKELL
- SUBDIRS += haskell
- endif
--if HAVE_PHP
--SUBDIRS += php
--endif
- if HAVE_ERLANG
- SUBDIRS += erlang erlang/examples
- endif
diff --git a/app-emulation/libguestfs/files/1.36/0001-Update-libtool-initialization.patch b/app-emulation/libguestfs/files/1.36/0001-Update-libtool-initialization.patch
deleted file mode 100644
index 24da76fbab5e..000000000000
--- a/app-emulation/libguestfs/files/1.36/0001-Update-libtool-initialization.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a5fd133e001bb62d13c47ebc392fbb696a513640 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
-Date: Wed, 30 Aug 2017 11:30:56 +0200
-Subject: [PATCH 1/3] Update libtool initialization
-
-Use the recommanded macro post libtool-2 release.
----
- m4/guestfs_misc.m4 | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/m4/guestfs_misc.m4 b/m4/guestfs_misc.m4
-index 5dce207d7..a2bb39c0d 100644
---- a/m4/guestfs_misc.m4
-+++ b/m4/guestfs_misc.m4
-@@ -17,10 +17,7 @@
- 
- dnl Miscellaneous configuration that doesn't fit anywhere else.
- 
--dnl Replace libtool with a wrapper that clobbers dependency_libs in *.la files
--dnl http://lists.fedoraproject.org/pipermail/devel/2010-November/146343.html
--LIBTOOL='bash $(top_srcdir)/libtool-kill-dependency_libs.sh $(top_builddir)/libtool'
--AC_SUBST([LIBTOOL])
-+LT_INIT
- 
- dnl Only build boot-analysis program on x86-64 and aarch64.  It
- dnl requires custom work to port to each architecture.
--- 
-2.14.1
-
diff --git a/app-emulation/libguestfs/files/1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch b/app-emulation/libguestfs/files/1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch
deleted file mode 100644
index bf265f718c73..000000000000
--- a/app-emulation/libguestfs/files/1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9c423cd2d24b6de924afc6e0d715594bb056288d Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
-Date: Wed, 30 Aug 2017 11:27:50 +0200
-Subject: [PATCH 2/3] Add support for Gentoo in distribution detection
-
----
- m4/guestfs_appliance.m4 | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/m4/guestfs_appliance.m4 b/m4/guestfs_appliance.m4
-index 890b1999c..9b79e1a41 100644
---- a/m4/guestfs_appliance.m4
-+++ b/m4/guestfs_appliance.m4
-@@ -114,6 +114,8 @@ elif test -f /etc/frugalware-release; then
-     DISTRO=FRUGALWARE
- elif test -f /etc/mageia-release; then
-     DISTRO=MAGEIA
-+elif test -f /etc/gentoo-release; then
-+    DISTRO=GENTOO
- else
- dnl fallback option
-     DISTRO=REDHAT
--- 
-2.14.1
-
diff --git a/app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch b/app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch
deleted file mode 100644
index 093a53f11632..000000000000
--- a/app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From dc35ce2ba774a9284360bfd6532acb527a2f73d7 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 7 Dec 2018 11:21:25 +0100
-Subject: [PATCH 3/4] Fix install failure when not built with OCaml support
-
-Makefile rules in po/ require builder/index-parse.c to be generated to
-allow translation utilities to work on it, however builder/ is
-completely masked behind OCaml conditional build even if some tools do
-not require it and proper guards are in place already.
-
-Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1614502
----
- Makefile.am | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 7eefacbeb..c0a68151f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -155,7 +155,6 @@ if HAVE_OCAML
- SUBDIRS += \
- 	mllib \
- 	customize \
--	builder builder/templates \
- 	get-kernel \
- 	resize \
- 	sparsify \
-@@ -169,6 +168,9 @@ SUBDIRS += dib
- endif
- endif
- 
-+# Tools mixed with more OCAML based tools
-+SUBDIRS += builder builder/templates
-+
- # Perl tools.
- if HAVE_TOOLS
- SUBDIRS += tools
--- 
-2.19.2
-
diff --git a/app-emulation/libguestfs/files/1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch b/app-emulation/libguestfs/files/1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch
deleted file mode 100644
index 087708db396a..000000000000
--- a/app-emulation/libguestfs/files/1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9bfa78095f6090c377fb40970653d1105a343cb7 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
-Date: Wed, 30 Aug 2017 11:33:58 +0200
-Subject: [PATCH 3/3] Workaround autotools-utils detection of gtk-doc
-
----
- configure.ac          | 3 +++
- m4/guestfs_gobject.m4 | 7 -------
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 268e6a182..65f4231bc 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -121,6 +121,9 @@ m4_include([m4/guestfs_lua.m4])
- m4_include([m4/guestfs_golang.m4])
- m4_include([m4/guestfs_gobject.m4])
- 
-+dnl check for gtk-doc
-+GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
-+
- dnl Bash completion.
- m4_include([m4/guestfs_bash_completion.m4])
- 
-diff --git a/m4/guestfs_gobject.m4 b/m4/guestfs_gobject.m4
-index 4b4eab80d..4304f7b00 100644
---- a/m4/guestfs_gobject.m4
-+++ b/m4/guestfs_gobject.m4
-@@ -59,10 +59,3 @@ m4_ifdef([GOBJECT_INTROSPECTION_CHECK], [
- ],[
-     AM_CONDITIONAL([HAVE_INTROSPECTION], [false])
- ])
--
--# check for gtk-doc
--m4_ifdef([GTK_DOC_CHECK], [
--    GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
--],[
--    AM_CONDITIONAL([ENABLE_GTK_DOC], false)
--])
--- 
-2.14.1
-
diff --git a/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch b/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch
deleted file mode 100644
index 9bce9b05b051..000000000000
--- a/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 1f51b8ef921ad804022fc39b7465f9f731cbb6be Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Fri, 7 Dec 2018 12:14:15 +0100
-Subject: [PATCH 4/5] Loosen build time requirement on bash-completion
-
-Distributions might avoid pulling bash-completion during build as it is
-an optional feature and would only make sense at runtime anyway. Since
-this setting is well-known across a given distribution, allow them to
-provide the value and avoid the dependency.
----
- m4/guestfs_bash_completion.m4 | 21 ++++++++++-----------
- 1 file changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/m4/guestfs_bash_completion.m4 b/m4/guestfs_bash_completion.m4
-index 1f171b79d..9e877f6ab 100644
---- a/m4/guestfs_bash_completion.m4
-+++ b/m4/guestfs_bash_completion.m4
-@@ -16,14 +16,13 @@
- # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
- dnl Bash completion.
--PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [
--    bash_completion=yes
--    AC_MSG_CHECKING([for bash-completions directory])
--    BASH_COMPLETIONS_DIR="`pkg-config --variable=completionsdir bash-completion`"
--    AC_MSG_RESULT([$BASH_COMPLETIONS_DIR])
--    AC_SUBST([BASH_COMPLETIONS_DIR])
--],[
--    bash_completion=no
--    AC_MSG_WARN([bash-completion not installed])
--])
--AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"])
-+AC_ARG_WITH([bashcompletiondir],
-+        AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]),
-+        [],
-+        [AS_IF([$($PKG_CONFIG --exists bash-completion)], [
-+                with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion)
-+        ] , [
-+                with_bashcompletiondir=${datadir}/bash-completion/completions
-+        ])])
-+AC_SUBST([BASH_COMPLETIONS_DIR], [$with_bashcompletiondir])
-+AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test -n "$with_bashcompletiondir"])
--- 
-2.19.2
-
diff --git a/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild b/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild
deleted file mode 100644
index da60a79915f1..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.36.13-r2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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)"
-[[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-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 ruby selinux static-libs systemtap test"
-RESTRICT="!test? ( test )"
-
-# Failures - doc
-# Failures - bash-completion, see GBZ #486306
-
-# FIXME: selinux support is automagic
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	sys-devel/gettext
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre:3
-	app-arch/cpio
-	dev-lang/perl:=
-	app-cdr/cdrtools
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	sys-apps/fakeroot
-	sys-apps/file
-	app-emulation/libvirt
-	dev-libs/libxml2:2=
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-1.0.0
-	sys-fs/squashfs-tools:*
-	dev-libs/libconfig:=
-	sys-libs/readline:0=
-	>=sys-libs/db-4.6:*
-	app-arch/xz-utils
-	app-arch/lzma
-	app-crypt/gnupg
-	app-arch/unzip[natspec]
-	perl? (
-		virtual/perl-ExtUtils-MakeMaker
-		>=dev-perl/Sys-Virt-0.2.4
-		virtual/perl-Getopt-Long
-		virtual/perl-Data-Dumper
-		dev-perl/libintl-perl
-		>=app-misc/hivex-1.3.1[perl?]
-		dev-perl/String-ShellQuote
-	)
-	fuse? ( sys-fs/fuse:= )
-	introspection? (
-		>=dev-libs/glib-2.26:2
-		>=dev-libs/gobject-introspection-1.30.0:=
-		dev-libs/gjs
-	)
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-	ocaml? (
-		>=dev-lang/ocaml-4.02:=[ocamlopt]
-		dev-ml/findlib[ocamlopt]
-		|| (
-			<dev-ml/ocaml-gettext-0.4.2
-			dev-ml/ocaml-gettext-stub[ocamlopt]
-		)
-		>=dev-ml/ounit-2[ocamlopt]
-	)
-	erlang? ( dev-lang/erlang )
-	inspect-icons? (
-		media-libs/netpbm
-		media-gfx/icoutils
-	)
-	virtual/acl
-	sys-libs/libcap
-	lua? ( dev-lang/lua:0= )
-	>=app-shells/bash-completion-2.0
-	>=dev-libs/yajl-2.0.4
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
-	)
-	net-libs/libtirpc:=
-	sys-libs/libxcrypt:=
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	doc? ( app-text/po4a )
-	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
-	"
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/libguestfs-appliance
-	"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-pkg_setup() {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-}
-
-src_prepare() {
-	eapply "${FILESDIR}"/${MY_PV_1}/0001-Update-libtool-initialization.patch
-	eapply "${FILESDIR}"/${MY_PV_1}/0002-Add-support-for-Gentoo-in-distribution-detection.patch
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	econf \
-		--with-libvirt \
-		--with-default-backend=libvirt \
-		--disable-appliance \
-		--disable-daemon \
-		--with-extra="-gentoo" \
-		--with-readline \
-		--disable-php \
-		--disable-python \
-		--without-java \
-		$(use_enable perl) \
-		$(use_enable fuse) \
-		$(use_enable ocaml) \
-		$(use_enable ruby) \
-		--disable-haskell \
-		--disable-golang \
-		$(use_enable introspection gobject) \
-		$(use_enable introspection) \
-		$(use_enable erlang) \
-		$(use_enable systemtap probes) \
-		$(use_enable lua) \
-		--with-gtk=$(usex gtk 3 no) \
-		$(usex doc '' PO4A=no)
-}
-
-src_install() {
-	strip-linguas -i po
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-
-	use perl && perl_delete_localpod
-}
-
-pkg_postinst() {
-	if ! use gtk ; then
-		einfo "virt-p2v NOT installed"
-	fi
-	if ! use ocaml ; then
-		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
-	fi
-	if ! use perl ; then
-		einfo "Perl based tools NOT build"
-	fi
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild
deleted file mode 100644
index ed267915f05c..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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)"
-[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/"${MY_PV_1}""
-
-KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
-RESTRICT="!test? ( test )"
-
-# Failures - doc
-
-# FIXME: selinux support is automagic
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	sys-devel/gettext
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre:3
-	app-arch/cpio
-	dev-lang/perl:=
-	app-cdr/cdrtools
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	sys-apps/fakeroot
-	sys-apps/file
-	libvirt? ( app-emulation/libvirt )
-	dev-libs/libxml2:2=
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-1.0.0
-	sys-fs/squashfs-tools:*
-	dev-libs/libconfig:=
-	sys-libs/readline:0=
-	>=sys-libs/db-4.6:*
-	app-arch/xz-utils
-	app-arch/lzma
-	app-crypt/gnupg
-	app-arch/unzip[natspec]
-	perl? (
-		virtual/perl-ExtUtils-MakeMaker
-		>=dev-perl/Sys-Virt-0.2.4
-		virtual/perl-Getopt-Long
-		virtual/perl-Data-Dumper
-		dev-perl/libintl-perl
-		>=app-misc/hivex-1.3.1[perl?]
-		dev-perl/String-ShellQuote
-	)
-	fuse? ( sys-fs/fuse:= )
-	introspection? (
-		>=dev-libs/glib-2.26:2
-		>=dev-libs/gobject-introspection-1.30.0:=
-	)
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-	ocaml? (
-		>=dev-lang/ocaml-4.02:=[ocamlopt]
-		dev-ml/findlib[ocamlopt]
-		|| (
-			<dev-ml/ocaml-gettext-0.4.2
-			dev-ml/ocaml-gettext-stub[ocamlopt]
-		)
-		>=dev-ml/ounit-2[ocamlopt]
-	)
-	erlang? ( dev-lang/erlang )
-	inspect-icons? (
-		media-libs/netpbm
-		media-gfx/icoutils
-	)
-	virtual/acl
-	sys-libs/libcap
-	lua? ( dev-lang/lua:0= )
-	>=dev-libs/yajl-2.0.4
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
-	)
-	net-libs/libtirpc:=
-	sys-libs/libxcrypt:=
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	doc? ( app-text/po4a )
-	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
-	test? ( introspection? ( dev-libs/gjs ) )
-	"
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/libguestfs-appliance
-	"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${MY_PV_1}/0001-Update-libtool-initialization.patch
-	"${FILESDIR}"/${MY_PV_1}/0002-Add-support-for-Gentoo-in-distribution-detection.patch
-	"${FILESDIR}"/${MY_PV_1}/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch
-	"${FILESDIR}"/${MY_PV_1}/0004-Loosen-build-time-requirement-on-bash-completion.patch
-)
-
-pkg_setup() {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	eautoreconf
-}
-
-src_configure() {
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	econf \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		$(use_with libvirt) \
-		--disable-appliance \
-		--disable-daemon \
-		--with-extra="-gentoo" \
-		--with-readline \
-		--disable-php \
-		--disable-python \
-		--without-java \
-		$(use_enable perl) \
-		$(use_enable fuse) \
-		$(use_enable ocaml) \
-		$(use_enable ruby) \
-		--disable-haskell \
-		--disable-golang \
-		$(use_enable introspection gobject) \
-		$(use_enable introspection) \
-		$(use_enable erlang) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap probes) \
-		$(use_enable lua) \
-		--with-gtk=$(usex gtk 3 no) \
-		$(usex doc '' PO4A=no)
-}
-
-src_install() {
-	strip-linguas -i po
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-	find "${ED}" -name '*.la' -delete || die
-	use perl && perl_delete_localpod
-}
-
-pkg_postinst() {
-	if ! use gtk ; then
-		einfo "virt-p2v NOT installed"
-	fi
-	if ! use ocaml ; then
-		einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
-	fi
-	if ! use perl ; then
-		einfo "Perl based tools NOT build"
-	fi
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild
deleted file mode 100644
index b522fb1d4797..000000000000
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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)"
-[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
-
-DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
-HOMEPAGE="https://libguestfs.org/"
-SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0/"${MY_PV_1}""
-
-KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
-RESTRICT="!test? ( test )"
-
-# Failures - doc
-
-# FIXME: selinux support is automagic
-COMMON_DEPEND="
-	sys-libs/ncurses:0=
-	sys-devel/gettext
-	>=app-misc/hivex-1.3.1
-	dev-libs/libpcre:3
-	app-arch/cpio
-	dev-lang/perl:=
-	app-cdr/cdrtools
-	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
-	sys-apps/fakeroot
-	sys-apps/file
-	libvirt? ( app-emulation/libvirt )
-	dev-libs/libxml2:2=
-	>=sys-apps/fakechroot-2.8
-	>=app-admin/augeas-1.8.0
-	sys-fs/squashfs-tools:*
-	dev-libs/libconfig:=
-	sys-libs/readline:0=
-	>=sys-libs/db-4.6:*
-	app-arch/xz-utils
-	app-arch/lzma
-	app-crypt/gnupg
-	app-arch/unzip[natspec]
-	perl? (
-		virtual/perl-ExtUtils-MakeMaker
-		>=dev-perl/Sys-Virt-0.2.4
-		virtual/perl-Getopt-Long
-		virtual/perl-Data-Dumper
-		dev-perl/libintl-perl
-		>=app-misc/hivex-1.3.1[perl?]
-		dev-perl/String-ShellQuote
-	)
-	fuse? ( sys-fs/fuse:= )
-	introspection? (
-		>=dev-libs/glib-2.26:2
-		>=dev-libs/gobject-introspection-1.30.0:=
-	)
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsemanage
-	)
-	systemtap? ( dev-util/systemtap )
-	ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] )
-	erlang? ( dev-lang/erlang )
-	inspect-icons? (
-		media-libs/netpbm
-		media-gfx/icoutils
-	)
-	virtual/acl
-	sys-libs/libcap
-	lua? ( dev-lang/lua:0= )
-	>=dev-libs/yajl-2.0.4
-	gtk? (
-		sys-apps/dbus
-		x11-libs/gtk+:3
-	)
-	net-libs/libtirpc:=
-	sys-libs/libxcrypt:=
-	"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	>=dev-lang/ocaml-4.03[ocamlopt]
-	dev-ml/findlib[ocamlopt]
-	|| (
-		<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 )
-	test? ( introspection? ( dev-libs/gjs ) )
-	"
-RDEPEND="${COMMON_DEPEND}
-	app-emulation/libguestfs-appliance
-	"
-
-DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${MY_PV_1}/
-)
-
-pkg_setup() {
-		CONFIG_CHECK="~KVM ~VIRTIO"
-		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-	eautoreconf
-}
-
-src_configure() {
-	# Disable feature test for kvm for more reason
-	# i.e: not loaded module in __build__ time,
-	# build server not supported kvm, etc. ...
-	#
-	# In fact, this feature is virtio support and requires
-	# configured kernel.
-	export vmchannel_test=no
-
-	econf \
-		--with-bashcompletiondir="$(get_bashcompdir)" \
-		$(use_with libvirt) \
-		--disable-appliance \
-		--disable-daemon \
-		--with-extra="-gentoo" \
-		--with-readline \
-		--disable-php \
-		--disable-python \
-		--without-java \
-		$(use_enable perl) \
-		$(use_enable fuse) \
-		$(use_enable ocaml) \
-		$(use_enable ruby) \
-		--disable-haskell \
-		--disable-golang \
-		$(use_enable introspection gobject) \
-		$(use_enable introspection) \
-		$(use_enable erlang) \
-		$(use_enable static-libs static) \
-		$(use_enable systemtap probes) \
-		$(use_enable lua) \
-		--with-gtk=$(usex gtk 3 no) \
-		$(usex doc '' PO4A=no)
-}
-
-src_install() {
-	strip-linguas -i po
-	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
-	find "${ED}" -name '*.la' -delete || die
-	use perl && perl_delete_localpod
-}
-
-pkg_postinst() {
-	if ! use gtk ; then
-		einfo "virt-p2v NOT installed"
-	fi
-	if ! use ocaml ; then
-		einfo "Ocaml based tools and bindings (sysprep, ...) NOT installed"
-	fi
-	if ! use perl ; then
-		einfo "Perl based tools NOT build"
-	fi
-}
diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
index 9e213a0a9410..718edf8e60d5 100644
--- a/app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
@@ -4,8 +4,9 @@
 EAPI=7
 
 LUA_COMPAT=( lua5-1 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions xdg-utils
+inherit autotools bash-completion-r1 l10n linux-info lua-single perl-functions python-single-r1 xdg-utils flag-o-matic
 
 MY_PV_1="$(ver_cut 1-2)"
 MY_PV_2="$(ver_cut 2)"
@@ -19,10 +20,11 @@ LICENSE="GPL-2 LGPL-2"
 SLOT="0/"${MY_PV_1}""
 
 KEYWORDS="~amd64"
-IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl ruby selinux static-libs systemtap test"
+IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
 RESTRICT="!test? ( test )"
 
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 # Failures - doc
 
@@ -59,6 +61,7 @@ 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
@@ -94,7 +97,7 @@ DEPEND="${COMMON_DEPEND}
 		<dev-ml/ocaml-gettext-0.4.2
 		dev-ml/ocaml-gettext-stub[ocamlopt]
 	)
-	>=dev-ml/ounit-2[ocamlopt]
+	dev-ml/ounit2[ocamlopt]
 	doc? ( app-text/po4a )
 	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
 	test? ( introspection? ( dev-libs/gjs ) )
@@ -117,6 +120,7 @@ pkg_setup() {
 		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
 
 		use lua && lua-single_pkg_setup
+		use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -134,6 +138,9 @@ src_configure() {
 	# configured kernel.
 	export vmchannel_test=no
 
+	# bug #703118
+	append-ldflags "-L/usr/$(get_libdir)/xcrypt"
+
 	econf \
 		--with-bashcompletiondir="$(get_bashcompdir)" \
 		$(use_with libvirt) \
@@ -142,7 +149,7 @@ src_configure() {
 		--with-extra="-gentoo" \
 		--with-readline \
 		--disable-php \
-		--disable-python \
+		$(use_enable python) \
 		--without-java \
 		$(use_enable perl) \
 		$(use_enable fuse) \