diff options
Diffstat (limited to 'app-emulation/libguestfs')
| -rw-r--r-- | app-emulation/libguestfs/Manifest | 3 | ||||
| -rw-r--r-- | app-emulation/libguestfs/files/1.38/0001-Fix-install-failure-when-not-built-with-OCaml-suppor.patch | 40 | ||||
| -rw-r--r-- | app-emulation/libguestfs/files/1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch | 39 | ||||
| -rw-r--r-- | app-emulation/libguestfs/files/1.44/0001-Check-for-caml_alloc_initialized_string-existence-ev.patch | 25 | ||||
| -rw-r--r-- | app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild | 191 | ||||
| -rw-r--r-- | app-emulation/libguestfs/libguestfs-1.48.6-r1.ebuild (renamed from app-emulation/libguestfs/libguestfs-1.44.1.ebuild) | 198 | ||||
| -rw-r--r-- | app-emulation/libguestfs/metadata.xml | 26 |
7 files changed, 132 insertions, 390 deletions
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest index 570f31abafff..5e4dfc6354e9 100644 --- a/app-emulation/libguestfs/Manifest +++ b/app-emulation/libguestfs/Manifest @@ -1,2 +1 @@ -DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1 -DIST libguestfs-1.44.1.tar.gz 23798268 BLAKE2B a2266d28e611204f03fc88c7a51331b49eb9fb908a318024bbc98af6a283ef4ba80be9caa0fb7e10f4d8bf67be5aaddae73d213828956e59f3233ab280a0185b SHA512 db6eab7350d9318a5ad5f968b24ed77ab411c9be3476b62b2b8448cf06db2462af1e3c9d8b02b54011d43651c281d74db7cb8023426a3f09667aa5b3597c7c33 +DIST libguestfs-1.48.6.tar.gz 19179600 BLAKE2B 22359ed4b55e29f985dbbbc4f0337eaec32f21a1413bd778656c3f0270891bec520a0b9590e104836eaf9367aeb9ac681b0bf85852fb7a2059da3f7062bc5111 SHA512 7d929db183fbb1d4d1c9159f28871ab4f1bd0be5b3d9fbc5137271666f50c067fd0906674cb1a52c1e070c11a18da4d2aa11bc64ddabda5cac54e72252c6abf2 diff --git a/app-emulation/libguestfs/files/1.38/0001-Fix-install-failure-when-not-built-with-OCaml-suppor.patch b/app-emulation/libguestfs/files/1.38/0001-Fix-install-failure-when-not-built-with-OCaml-suppor.patch deleted file mode 100644 index cb608beca08f..000000000000 --- a/app-emulation/libguestfs/files/1.38/0001-Fix-install-failure-when-not-built-with-OCaml-suppor.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3b06e1cbb25615495ef108d6ee194bb718e46408 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Fri, 7 Dec 2018 11:21:25 +0100 -Subject: [PATCH 1/2] 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 cc363341f..5d96093a1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -164,7 +164,6 @@ SUBDIRS += common/mlvisit - SUBDIRS += common/mlxml - SUBDIRS += common/mltools - SUBDIRS += customize --SUBDIRS += builder builder/templates - SUBDIRS += get-kernel - SUBDIRS += resize - SUBDIRS += sparsify -@@ -178,6 +177,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.38/0002-Loosen-build-time-requirement-on-bash-completion.patch b/app-emulation/libguestfs/files/1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch deleted file mode 100644 index 017ba699599b..000000000000 --- a/app-emulation/libguestfs/files/1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b8a31fcfe81a680ffed1fa0879ac20a3e0e8753a Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Fri, 7 Dec 2018 12:14:15 +0100 -Subject: [PATCH 2/2] 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. ---- 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/files/1.44/0001-Check-for-caml_alloc_initialized_string-existence-ev.patch b/app-emulation/libguestfs/files/1.44/0001-Check-for-caml_alloc_initialized_string-existence-ev.patch deleted file mode 100644 index a44743c9adc3..000000000000 --- a/app-emulation/libguestfs/files/1.44/0001-Check-for-caml_alloc_initialized_string-existence-ev.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://sources.debian.org/data/main/libg/libguestfs/1:1.44.0-2/debian/patches/0016-Check-for-caml_alloc_initialized_string-existence-ev.patch - -From: Hilko Bengen <bengen@debian.org> -Date: Tue, 10 Mar 2020 17:23:15 +0100 -Subject: Check for caml_alloc_initialized_string existence even if - --disable-ocaml - ---- - m4/guestfs-ocaml.m4 | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4 -index 18f95c2..bf07799 100644 ---- a/m4/guestfs-ocaml.m4 -+++ b/m4/guestfs-ocaml.m4 -@@ -214,8 +214,7 @@ AM_CONDITIONAL([HAVE_BYTES_COMPAT_ML], - [test "x$have_Bytes_module" = "xno"]) - - dnl Check if OCaml has caml_alloc_initialized_string (added 2017). --AS_IF([test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && \ -- test "x$enable_ocaml" = "xyes"],[ -+AS_IF([test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno"],[ - AC_MSG_CHECKING([for caml_alloc_initialized_string]) - cat >conftest.c <<'EOF' - #include <caml/alloc.h> diff --git a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild deleted file mode 100644 index 12a00b8b9477..000000000000 --- a/app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild +++ /dev/null @@ -1,191 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-1 ) -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit autotools bash-completion-r1 linux-info lua-single perl-functions python-single-r1 strip-linguas xdg-utils flag-o-matic - -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 python ruby selinux static-libs systemtap test" -RESTRICT="!test? ( test )" - -REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} )" - -# 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 - ) - python? ( ${PYTHON_DEPS} ) - 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? ( ${LUA_DEPS} ) - >=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[ocamlopt] - ) - dev-ml/ounit2[ocamlopt] - 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 - " -# Upstream build scripts compile and install Lua bindings for the ABI version -# obtained by running 'lua' on the build host -BDEPEND="lua? ( ${LUA_DEPS} )" - -DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO ) - -PATCHES=( - "${FILESDIR}"/${MY_PV_1}/ -) - -pkg_setup() { - CONFIG_CHECK="~KVM ~VIRTIO" - [ -n "${CONFIG_CHECK}" ] && check_extra_config; - - use lua && lua-single_pkg_setup - use python && python-single-r1_pkg_setup -} - -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 - - # Give a nudge to help find libxcrypt[-system] - # bug #703118, bug #789354 - append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt" - append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt" - - econf \ - --with-bashcompletiondir="$(get_bashcompdir)" \ - $(use_with libvirt) \ - --disable-appliance \ - --disable-daemon \ - --with-extra="-gentoo" \ - --with-readline \ - --disable-php \ - $(use_enable 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 (virt-resize, virt-sparsify, virt-sysprep, ...) NOT installed" - fi - - if ! use perl ; then - einfo "Perl based tools NOT build" - fi -} diff --git a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild b/app-emulation/libguestfs/libguestfs-1.48.6-r1.ebuild index a7311dc74bb0..5ebf7d85f162 100644 --- a/app-emulation/libguestfs/libguestfs-1.44.1.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.48.6-r1.ebuild @@ -1,58 +1,67 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + +# Bump with app-emulation/guestfs-tools and app-emulation/libguestfs-appliance (if any new release there) LUA_COMPAT=( lua5-1 ) -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{10..11} ) -inherit autotools bash-completion-r1 linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs xdg-utils flag-o-matic +inherit autotools flag-o-matic linux-info lua-single perl-functions python-single-r1 strip-linguas toolchain-funcs 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" +DESCRIPTION="Tools for accessing, inspecting, and modifying virtual machine (VM) disk images" HOMEPAGE="https://libguestfs.org/" -SRC_URI="https://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz" +SRC_URI="https://download.libguestfs.org/${MY_PV_1}-${SD}/${P}.tar.gz" LICENSE="GPL-2 LGPL-2" SLOT="0/${MY_PV_1}" - -KEYWORDS="~amd64" +if [[ ${SD} == "stable" ]] ; then + KEYWORDS="amd64 ~ppc64 ~x86" +fi 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} ) - python? ( ${PYTHON_REQUIRED_USE} )" +REQUIRED_USE=" + lua? ( ${LUA_REQUIRED_USE} ) + python? ( ${PYTHON_REQUIRED_USE} ) +" # 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-admin/augeas-1.8.0 + app-alternatives/cpio + app-arch/lzma + app-arch/rpm + app-arch/unzip[natspec] + app-arch/xz-utils + app-forensics/yara app-cdr/cdrtools + app-crypt/gnupg >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] - sys-apps/fakeroot - sys-apps/file - libvirt? ( app-emulation/libvirt ) + >=app-misc/hivex-1.3.1 + dev-lang/perl:= + dev-libs/libconfig:= + dev-libs/libpcre2 dev-libs/libxml2:2= + dev-libs/jansson:= + >=dev-libs/yajl-2.0.4 + net-libs/libtirpc:= + sys-libs/ncurses:0= >=sys-apps/fakechroot-2.8 - >=app-admin/augeas-1.8.0 + sys-apps/fakeroot + sys-apps/file + sys-devel/gettext sys-fs/squashfs-tools:* - dev-libs/libconfig:= - dev-libs/jansson:= - sys-libs/readline:0= - >=sys-libs/db-4.6:* - app-arch/xz-utils - app-arch/lzma - app-crypt/gnupg - app-arch/unzip[natspec] + sys-libs/libcap + sys-libs/readline:= + virtual/acl + virtual/libcrypt:= + erlang? ( dev-lang/erlang ) perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 @@ -63,39 +72,36 @@ COMMON_DEPEND=" dev-perl/String-ShellQuote ) python? ( ${PYTHON_DEPS} ) - fuse? ( sys-fs/fuse:= ) + fuse? ( sys-fs/fuse:0 ) + gtk? ( + sys-apps/dbus + x11-libs/gtk+:3 + ) 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 + libvirt? ( app-emulation/libvirt ) lua? ( ${LUA_DEPS} ) - >=dev-libs/yajl-2.0.4 - gtk? ( - sys-apps/dbus - x11-libs/gtk+:3 + ocaml? ( >=dev-lang/ocaml-4.03:=[ocamlopt] ) + selinux? ( + sys-libs/libselinux:= + sys-libs/libsemanage ) - net-libs/libtirpc:= - sys-libs/libxcrypt:= + systemtap? ( dev-debug/systemtap ) " # Some OCaml is always required # bug #729674 -DEPEND="${COMMON_DEPEND} - dev-util/gperf +DEPEND=" + ${COMMON_DEPEND} >=dev-lang/ocaml-4.03:=[ocamlopt] + dev-util/gperf dev-ml/findlib[ocamlopt] + doc? ( app-text/po4a ) ocaml? ( dev-ml/ounit2[ocamlopt] || ( @@ -103,22 +109,28 @@ DEPEND="${COMMON_DEPEND} dev-ml/ocaml-gettext-stub[ocamlopt] ) ) - doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) test? ( introspection? ( dev-libs/gjs ) ) " -BDEPEND="virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} +RDEPEND=" + ${COMMON_DEPEND} app-emulation/libguestfs-appliance + acct-group/kvm " # Upstream build scripts compile and install Lua bindings for the ABI version # obtained by running 'lua' on the build host -BDEPEND="lua? ( ${LUA_DEPS} )" +BDEPEND=" + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + lua? ( ${LUA_DEPS} ) +" DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO ) PATCHES=( - "${FILESDIR}"/${MY_PV_1}/ + #"${FILESDIR}"/${MY_PV_1}/ + #"${FILESDIR}"/1.44/ ) pkg_setup() { @@ -131,7 +143,7 @@ pkg_setup() { src_prepare() { default - xdg_environment_reset + eautoreconf } @@ -139,11 +151,25 @@ src_configure() { # bug #794877 tc-export AR + # Needs both bison+flex (bug #915339, see configure too) + unset LEX YACC + # Skip Bash test # (See 13-test-suite.log in linked bug) # bug #794874 export SKIP_TEST_COMPLETE_IN_SCRIPT_SH=1 + # Need to investigate (fails w/ 1.48.4) + export SKIP_TEST_QEMU_DRIVE_SH=1 + export SKIP_TEST_BIG_HEAP=1 + export SKIP_TEST_NOEXEC_STACK_PL=1 + + # Need to be in KVM group + export SKIP_TEST_MOUNTABLE_INSPECT_SH=1 + + # Missing test data (Fedora image) + export SKIP_TEST_JOURNAL_PL=1 + # Disable feature test for kvm for more reason # i.e: not loaded module in __build__ time, # build server not supported kvm, etc. ... @@ -153,33 +179,51 @@ src_configure() { export vmchannel_test=no # Give a nudge to help find libxcrypt[-system] + # We have a := dep on virtual/libcrypt to ensure this doesn't become stale. # bug #703118, bug #789354 - append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt" - append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt" + if ! has_version 'sys-libs/libxcrypt[system]' ; then + append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/xcrypt" + append-ldflags "-Wl,-R${ESYSROOT}/usr/$(get_libdir)/xcrypt" + fi - econf \ - $(use_with libvirt) \ + # Avoid automagic SELinux dependency + export ac_cv_header_selinux_selinux_h=$(usex selinux) + + # Test suite at least has a bunch of bashisms + SHELL="${BROOT}"/bin/bash CONFIG_SHELL="${BROOT}"/bin/bash econf \ --disable-appliance \ --disable-daemon \ - --with-extra="-gentoo" \ - --with-readline \ - --disable-php \ - $(use_enable python) \ - --without-java \ - $(use_enable perl) \ - $(use_enable fuse) \ - $(use_enable ocaml) \ - $(use_enable ruby) \ --disable-haskell \ --disable-golang \ --disable-rust \ + --disable-php \ + --without-java \ + --with-extra="-gentoo" \ + --with-readline \ + $(usex doc '' PO4A=no) \ + $(use_enable ocaml) \ + $(use_enable erlang) \ + $(use_enable fuse) \ $(use_enable introspection gobject) \ $(use_enable introspection) \ - $(use_enable erlang) \ - $(use_enable static-libs static) \ - $(use_enable systemtap probes) \ + $(use_with libvirt) \ $(use_enable lua) \ - $(usex doc '' PO4A=no) + $(use_enable python) \ + $(use_enable perl) \ + $(use_enable ruby) \ + $(use_enable static-libs static) \ + $(use_enable systemtap probes) +} + +src_test() { + local -x LIBGUESTFS_DEBUG=1 + local -x LIBGUESTFS_TRACE=1 + local -x LIBVIRT_DEBUG=1 + + # Try this? + #emake quickcheck + + default } src_install() { @@ -196,18 +240,16 @@ src_install() { doman "${ED}"/usr/man/man3/Sys::Guestfs.3pm rm -rf "${ED}"/usr/man || die fi + + use python && python_optimize } pkg_postinst() { + einfo "Please ensure you are in the 'kvm' group for decent performance!" + if ! use gtk ; then einfo "virt-p2v NOT installed" fi - if ! use ocaml ; then - einfo "OCaml based tools and bindings (virt-resize, virt-sparsify, virt-sysprep, ...) NOT installed" - fi - - if ! use perl ; then - einfo "Perl based tools NOT built" - fi + einfo "Note that common tools like virt-resize are now part of app-emulation/guestfs-tools" } diff --git a/app-emulation/libguestfs/metadata.xml b/app-emulation/libguestfs/metadata.xml index 4f3be3f3c1c2..67f481aca2fb 100644 --- a/app-emulation/libguestfs/metadata.xml +++ b/app-emulation/libguestfs/metadata.xml @@ -1,19 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- 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> - <flag name="inspect-icons">Use <pkg>media-gfx/icoutils</pkg> for acces icon file in image and inspect it</flag> - <flag name="libvirt">Use <pkg>app-emulation/libvirt</pkg> to manipulate VMs</flag> - <flag name="systemtap">Use <pkg>dev-util/systemtap</pkg> to inspect VM via "probes" way</flag> -</use> + <!-- maintainer-needed --> + <use> + <flag name="erlang">Build Erlang bindings</flag> + <flag name="fuse">Enable image mount support via <pkg>sys-fs/fuse</pkg></flag> + <flag name="inspect-icons">Use <pkg>media-gfx/icoutils</pkg> for accessing/inspecting icon file within images</flag> + <flag name="libvirt">Use <pkg>app-emulation/libvirt</pkg> to manipulate VMs</flag> + <flag name="systemtap">Use <pkg>dev-debug/systemtap</pkg> to inspect VM via "probes"</flag> + </use> + <upstream> + <remote-id type="github">libguestfs/libguestfs</remote-id> + </upstream> </pkgmetadata> |