* [gentoo-commits] repo/gentoo:master commit in: app-emulation/libguestfs/, app-emulation/libguestfs/files/1.28/, ...
@ 2021-03-13 16:14 Sam James
0 siblings, 0 replies; only message in thread
From: Sam James @ 2021-03-13 16:14 UTC (permalink / raw
To: gentoo-commits
commit: 865ff63a89b53de190d9ed9c7b8a4af920a0a25a
Author: Hank Leininger <hlein <AT> korelogic <DOT> com>
AuthorDate: Sun Jan 24 01:37:21 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 13 16:13:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865ff63a
app-emulation/libguestfs: libxcrypt fix, restore and update py3, cleanup
Current version won't build with libxcrypt 4.x, which has been
stabilized. Added workaround. Also restored and bumped supported
Python versions. Removed libguestfs-1.36 because it has been
unbuildable ever since libguestfs-appliance-1.36 was removed in
d0c2104377b00b4b6b029ba2e6390a00c58057b2.
Signed-off-by: Hank Leininger <hlein <AT> korelogic.com>
Closes: https://bugs.gentoo.org/703118
Bug: https://bugs.gentoo.org/734634
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/16965
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-emulation/libguestfs/Manifest | 1 -
.../libguestfs/files/1.28/0000_bug_499150.patch | 10 --
.../1.28/0001_add_gentoo_names_to_configure.patch | 15 --
.../0002_add_gentooway_to_remove_la_files.patch | 16 --
...gtk_docs_in_broken_autotools-utils-eclass.patch | 21 ---
.../1.28/0103_disable_php_bindings_makefile.patch | 13 --
.../1.36/0001-Update-libtool-initialization.patch | 29 ----
...port-for-Gentoo-in-distribution-detection.patch | 25 ---
...-failure-when-not-built-with-OCaml-suppor.patch | 40 -----
...ound-autotools-utils-detection-of-gtk-doc.patch | 42 -----
...build-time-requirement-on-bash-completion.patch | 45 ------
.../libguestfs/libguestfs-1.36.15-r2.ebuild | 175 ---------------------
...6-r102.ebuild => libguestfs-1.38.6-r103.ebuild} | 15 +-
13 files changed, 11 insertions(+), 436 deletions(-)
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 7e07310a76c..7a223e5b588 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -1,2 +1 @@
-DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7
DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
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 1e0f1a32185..00000000000
--- 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 9d209ff5358..00000000000
--- 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 38a591b811e..00000000000
--- 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 69b3ae6d0d2..00000000000
--- 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 34ab42d2790..00000000000
--- 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 24da76fbab5..00000000000
--- 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 bf265f718c7..00000000000
--- 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 093a53f1163..00000000000
--- 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 087708db396..00000000000
--- 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 9bce9b05b05..00000000000
--- 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.15-r2.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15-r2.ebuild
deleted file mode 100644
index ed267915f05..00000000000
--- 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-r102.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
similarity index 91%
rename from app-emulation/libguestfs/libguestfs-1.38.6-r102.ebuild
rename to app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
index 9e213a0a941..8ba478699de 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
@@ -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) \
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-03-13 16:14 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-13 16:14 [gentoo-commits] repo/gentoo:master commit in: app-emulation/libguestfs/, app-emulation/libguestfs/files/1.28/, Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox