commit: 978cfedeaa8ab81f979532d0a8e5f4140201cdd0 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Fri Dec 7 14:37:20 2018 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Fri Dec 7 16:24:37 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=978cfede
app-emulation/libguestfs: 1.36.15 → 1.38.6 Closes: https://bugs.gentoo.org/663380 Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org> app-emulation/libguestfs/Manifest | 1 + ...-failure-when-not-built-with-OCaml-suppor.patch | 40 +++++ ...build-time-requirement-on-bash-completion.patch | 45 ++++++ app-emulation/libguestfs/libguestfs-1.38.6.ebuild | 174 +++++++++++++++++++++ 4 files changed, 260 insertions(+) diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest index 59a48fc2b5e..b72e0e45769 100644 --- a/app-emulation/libguestfs/Manifest +++ b/app-emulation/libguestfs/Manifest @@ -1,2 +1,3 @@ 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 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 new file mode 100644 index 00000000000..cb608beca08 --- /dev/null +++ b/app-emulation/libguestfs/files/1.38/0001-Fix-install-failure-when-not-built-with-OCaml-suppor.patch @@ -0,0 +1,40 @@ +From 3b06e1cbb25615495ef108d6ee194bb718e46408 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <e...@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 new file mode 100644 index 00000000000..e68a4b0bded --- /dev/null +++ b/app-emulation/libguestfs/files/1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch @@ -0,0 +1,45 @@ +From b8a31fcfe81a680ffed1fa0879ac20a3e0e8753a Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <e...@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. +--- + 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 1975b8c03..9a38ab2d6 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.38.6.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild new file mode 100644 index 00000000000..7da9fbcf7a2 --- /dev/null +++ b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild @@ -0,0 +1,174 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) + +inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 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="http://libguestfs.org/"; +SRC_URI="http://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" + +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 + virtual/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? ( dev-lang/lua:* ) + >=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 + >=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; + + 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 + + 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 (sysprep, ...) NOT installed" + fi + if ! use perl ; then + einfo "Perl based tools NOT build" + fi +}
