update libguestfs and libguestfs-appliance

Signed-off-by: Samuel Bernardo <samuelbernardo.mail@gmail.com>

6 files changed, 261 insertions, 0 deletions

diff --git a/app-emulation/libguestfs-appliance/Manifest b/app-emulation/libguestfs-appliance/Manifest
index 69900b1..d171432 100644
--- a/app-emulation/libguestfs-appliance/Manifest
+++ b/app-emulation/libguestfs-appliance/Manifest
@@ -1,4 +1,6 @@
 AUX env.file 47 BLAKE2B 2b9034e60acea9f2300ec234a7ccdd6b438d2370808f8c30c8470c735287d1ed5ee6f75f0c1fa05423a39e558ca5daa258de44b1125999ac47e289c7c4df332d SHA512 74b5c63ab4421238b4e2c54dfc9579dea719101c0b9066341ddf3aa64ff1ed739e6d38e837b388ded1f741bc57c47a52772bf22ee52318acc5cb34908f1df1fd
 DIST appliance-1.38.0.tar.xz 96537604 BLAKE2B 8b425b624dec274f2913ab9ff89cc02fea6c9244d6e3ee64f054d2a91f7959d9dbc03d55e9f5b4f5df835007581a18914b5c790f55b01c3398412ce5a7e9309d SHA512 a423fd54627ffb9c2ae05b26ad60b9089f8119a99d30612a33921a2662ba42332ad0a7a7ad6c33b7042fc02a5c4dc9b563158650c6cb4a3eaaae6b764f7d7082
+DIST appliance-1.40.1.tar.xz 111566640 BLAKE2B b6ddd3b120a466ce343d67d9e058c201a78f5e605b8bbc2d47fc30c5eaaa874cc032b879a67c5f134b8fa65c58fc27893b062de0c3a21705b64766dd86df648f SHA512 2d63b2ce8850929b42ddc91518b0e2b37d13e358be94bb54899da6c310afa308d708a3443b9f3b3aa3c46f4f2079036a6a4b34027788f183c17a20b68fcf4e6e
 EBUILD libguestfs-appliance-1.38.0.ebuild 1062 BLAKE2B 4279472548f0bbafdc592974217c8267ece2304838d21344035fcff6d1a15292699607c7f9454f2cdbf95f55ada9cadde4ec10a7e74e64a02da6e449c48299f1 SHA512 12f8ffa19b7d8a318e3b1234a4fa42f9a97b9b849e78a978b0b663b76568921ef5675f87698e18c4638c5e473acc1a3ddba2402e67ddd6dfbe2064e9510f3335
+EBUILD libguestfs-appliance-1.40.1.ebuild 1062 BLAKE2B 4279472548f0bbafdc592974217c8267ece2304838d21344035fcff6d1a15292699607c7f9454f2cdbf95f55ada9cadde4ec10a7e74e64a02da6e449c48299f1 SHA512 12f8ffa19b7d8a318e3b1234a4fa42f9a97b9b849e78a978b0b663b76568921ef5675f87698e18c4638c5e473acc1a3ddba2402e67ddd6dfbe2064e9510f3335
 MISC metadata.xml 596 BLAKE2B 3d94e13ab097a9428d8025d2215fb17faa5a838a256aabb535b7060e2d9fbdc86ceac11c26dd62524703a580a5b6686497213d3278540a341c12ef321346a733 SHA512 cb83cbc7c3bd7bbaf82cd5aa9915416916d70cfb77f8b668d1ddce19e674fbf38998d7d9791204b7e666dc972d25f60d5d74ac6114726ca2ff5aa9071e067623
diff --git a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.40.1.ebuild b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.40.1.ebuild
new file mode 100644
index 0000000..7f91b08
--- /dev/null
+++ b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.40.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+CHECKREQS_DISK_USR=500M
+CHECKREQS_DISK_BUILD=500M
+
+inherit check-reqs
+
+DESCRIPTION="VM appliance disk image used in libguestfs package"
+HOMEPAGE="http://libguestfs.org/"
+SRC_URI="http://libguestfs.org/download/binaries/appliance/appliance-${PV}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/xz-utils"
+# Mixing libguestfs versions causes weird problems. #501588
+RDEPEND="!<app-emulation/libguestfs-${PV}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	# We'll unpack the tarball directly into ${D} to speed up install.
+	# Otherwise we need to duplicate hundreds of data.
+	:
+}
+
+src_install() {
+	dodir /usr/share/guestfs
+	cd "${ED}"/usr/share/guestfs
+	unpack ${A}
+	cd appliance || die
+	dodoc README*
+	# Don't rm README.* here, at least README.fixed is needed for libguestfs, see
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1183780
+	chmod 755 . || die
+	chmod 644 * || die
+
+	newenvd "${FILESDIR}"/env.file 99"${PN}"
+}
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest
index 957ad2d..1d209c2 100644
--- a/app-emulation/libguestfs/Manifest
+++ b/app-emulation/libguestfs/Manifest
@@ -8,12 +8,16 @@ AUX 1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch 725 BLAKE2B
 AUX 1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch 1168 BLAKE2B 50cf3ece759e8089d90f95e233c4a1a52ffd20f32a75e24e239e441163fc4d5ef852be3b347575e3285d5969ef7eed98f67340c190f423c2ec356d52a7c60629 SHA512 8c45fb951ceecfc67bcbb426a1bd37bfd31981bde2b8235c1508ccf4eb3a1a44627beffc824a3cff333a40a425da17ef77962b5ea9c1a875acb6adf0d47e8931
 AUX 1.38/0001-Update-libtool-initialization.patch 984 BLAKE2B 10b7c49519b9ba91ce8f4e15140c2dbca70e6bbd578d4af71872a150b2656c1ab7a05f0c6a7f7c181b74cae47599a9ddb86474f31881c375c74d6f350f156d38 SHA512 1ce8466de53fda7d51dc55b8bbfc8bd86caa995e663d287ee28344d1224f722c9c58ba8d9ae0b6ed8dd8a29671765c76b6cd77e75c7572a85c77c8f86fc803f2
 AUX 1.38/0002-Add-support-for-Gentoo-in-distribution-detection.patch 637 BLAKE2B c5c5cb9359e0d5f6c4732668546e26a4550f739bb42e0be2f8389227fa8f78a76b29dc52f76e11d4685ec93b13497b85c6cd5355eff886d677e4febeb52d7411 SHA512 9fd06b2c62fb3f245e8e114e1b7e34e157e0c75c12c25d4b01dccedd797036e21b16f4d030ef7b484d12e1364b3db5a3191d3f402270e8098b3e2970cd77da8e
+AUX 1.40/0001-Update-libtool-initialization.patch 984 BLAKE2B 10b7c49519b9ba91ce8f4e15140c2dbca70e6bbd578d4af71872a150b2656c1ab7a05f0c6a7f7c181b74cae47599a9ddb86474f31881c375c74d6f350f156d38 SHA512 1ce8466de53fda7d51dc55b8bbfc8bd86caa995e663d287ee28344d1224f722c9c58ba8d9ae0b6ed8dd8a29671765c76b6cd77e75c7572a85c77c8f86fc803f2
+AUX 1.40/0002-Add-support-for-Gentoo-in-distribution-detection.patch 637 BLAKE2B c5c5cb9359e0d5f6c4732668546e26a4550f739bb42e0be2f8389227fa8f78a76b29dc52f76e11d4685ec93b13497b85c6cd5355eff886d677e4febeb52d7411 SHA512 9fd06b2c62fb3f245e8e114e1b7e34e157e0c75c12c25d4b01dccedd797036e21b16f4d030ef7b484d12e1364b3db5a3191d3f402270e8098b3e2970cd77da8e
 DIST libguestfs-1.28.5.tar.gz 12747537 BLAKE2B b0cc023efef41955c4b448b68bd5578d88d305364afdc1fc24c7d26ba5fae4a1b81ee58799d42774ea28e162208edbf36a0e49c1a7e4f751c74e9c45e9a472a6 SHA512 5ab25498fa9141950c1077cc52bae05a2781fa86a983b5fa49fbd4a4bca70710db3d4f7b9f45fb6f8b4ee8e3d77ffde7c4c0d9e9e526443e2a8251a62306ebb6
 DIST libguestfs-1.36.11.tar.gz 23172504 BLAKE2B 4686f27bbef90cb0392d044cb7784cd0e9929222647698da504512ce389b5a9dbd14d6870cafa97eb0af8b9eb901ed637f32c5d893b6746f973a944820450d48 SHA512 81217bc2be1755f108af815238f144ab72ecb5cc6a815bc50246463508bed739848b9b67c6cf8b1d68c3cfa0aca66857e9006c11e3a8fe20fc1ddcb22c562571
 DIST libguestfs-1.37.35.tar.gz 23519100 BLAKE2B 353947b2a8500b46986ffe9d96a51639ba806e1f8b766b2b7612a617310d69b473ae0aaecdd996ba3f11847266712892a96c3ef7cd14a61a2c313321c18340d1 SHA512 864ce2080f42c73f47e7ca99d3d07323e7dda5868551c029b55d122964a7c030ea6148e10112f7c25ce16651bcb16db29edfc71f2b87b42251383cdcab250bf1
 DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1
+DIST libguestfs-1.40.2.tar.gz 24312753 BLAKE2B d452b8c01993de76ffa05237433cc4ca7e6deee89aab8b5ba7ec475de63cb60d4ff6ebc6e9d86081958daf5cff4486671e4a2a5194f80cc8e3a11d3ad6256b82 SHA512 d288f15d5a70b4b87a4271ea2eb7dc0ec4f48fdb136b8f62003352a069f75573de873e1063763889f410fb1b99951252e9a48dd73bf0233047f21aae43ac6de2
 EBUILD libguestfs-1.28.5_p1-r3.ebuild 3798 BLAKE2B f7b37fb4f3470fe6293b0ed2519cf6994ee639a6c3ac7b4ca32baafd8d4bfdb78b88cc3d4e68c17769529984691dc98aef11b26b7a02f06240ec10baf2d941b2 SHA512 17a68acc079cb767c42886a950b85b48f27b3fc10221dc30a2ac032d3e2b2c7873ffa5dc5165b2cd80df8c8098c26ded3da3bfcfcd9a0bb282c30fcce60a1ab5
 EBUILD libguestfs-1.36.11.ebuild 3877 BLAKE2B 6f64972ce85db716ae89a73c7f27248c9fcd8427e2eabbeb277a887b27937756463057805287ba955430b37561e034fa40f020ff32539ba77b9b7b9b5a7dd2b0 SHA512 749338dfb6c0dc81ff122085f71fd0861ee6b5b71cbd8591d0392896ee28d59f2f09f3a970dd2f93cc3f520f81767690c8d58bb6ed100de1066a23151b8d33e2
 EBUILD libguestfs-1.37.35.ebuild 3922 BLAKE2B b2e32ddba78a1710c7d72c54d09b0320f8bdc615ed28fa6206775a3e67bc3554721de199e0cd5a3450b66b9b9afbdd5982ddb6cc1defe6db05d7150ac43f8b83 SHA512 ac7b30314d887f2f4cf8247384d38981527b5ebe0da44649468f5c7ff250af4fd08b4982696b598405a346b6976fa95fdf038f68ebcb421ddc967c6ffdba7b31
 EBUILD libguestfs-1.38.6.ebuild 3877 BLAKE2B 6f64972ce85db716ae89a73c7f27248c9fcd8427e2eabbeb277a887b27937756463057805287ba955430b37561e034fa40f020ff32539ba77b9b7b9b5a7dd2b0 SHA512 749338dfb6c0dc81ff122085f71fd0861ee6b5b71cbd8591d0392896ee28d59f2f09f3a970dd2f93cc3f520f81767690c8d58bb6ed100de1066a23151b8d33e2
+EBUILD libguestfs-1.40.2.ebuild 3910 BLAKE2B fc57d080fdb8a4de84058dafb170354733e93fc22e20297a6765b01b42f49850fab7b4e49d8bf298ecef02047c36fd3c3789b796ee6e6ff5b28d3fb79694b4d1 SHA512 c580cc42afac6096eb16207f00c18ebe2bd6b5b1b0c8738ee01507b72691a248db3792a1434ee0a255ce7e371d473cf32bd7300c9baf1c625bde17da83a7b1af
 MISC metadata.xml 1171 BLAKE2B 66a752f4398c6cadc61051ca88bbb4f10a80ffc06204e687be37abfb07180eec9e63b1361d26f04ac9d5cfcbadfc5ad5462c5fe420fd876404015fc5346de2c2 SHA512 51465467b803cf5eb40bea289834e913466081e6fbbd6a7649a5f84813ee325a294be2642a08426edb60ea4eaf9818b0f2e15b9914ddb68e769505240472390f
diff --git a/app-emulation/libguestfs/files/1.40/0001-Update-libtool-initialization.patch b/app-emulation/libguestfs/files/1.40/0001-Update-libtool-initialization.patch
new file mode 100644
index 0000000..02b1acf
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.40/0001-Update-libtool-initialization.patch
@@ -0,0 +1,29 @@
+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.40/0002-Add-support-for-Gentoo-in-distribution-detection.patch b/app-emulation/libguestfs/files/1.40/0002-Add-support-for-Gentoo-in-distribution-detection.patch
new file mode 100644
index 0000000..6a0e38e
--- /dev/null
+++ b/app-emulation/libguestfs/files/1.40/0002-Add-support-for-Gentoo-in-distribution-detection.patch
@@ -0,0 +1,13 @@
+diff -Naur a/m4/guestfs-appliance.m4 b/m4/guestfs-appliance.m4
+--- a/m4/guestfs-appliance.m4	2018-09-21 16:05:40.719638121 +0100
++++ b/m4/guestfs-appliance.m4	2018-11-21 23:46:42.371118647 +0000
+@@ -108,6 +108,9 @@
+                     [OPENSUSE | SLED | SLES],[DISTRO=SUSE],
+                     [ARCH],[DISTRO=ARCHLINUX])
+             AC_MSG_RESULT([$DISTRO (from /etc/os-release)])
++	elif test -f /etc/gentoo-release; then
++		DISTRO=GENTOO
++		AC_MSG_RESULT([$DISTRO (from /etc/gentoo-release)])
+         else
+             AC_MSG_ERROR([/etc/os-release not available, please specify the distro using --with-distro=DISTRO])
+         fi
diff --git a/app-emulation/libguestfs/libguestfs-1.40.2.ebuild b/app-emulation/libguestfs/libguestfs-1.40.2.ebuild
new file mode 100644
index 0000000..d3a42ed
--- /dev/null
+++ b/app-emulation/libguestfs/libguestfs-1.40.2.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+
+inherit autotools linux-info perl-module python-single-r1 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="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="bash-completion erlang +fuse debug doc +perl python ruby static-libs
+selinux systemtap introspection inspect-icons test lua gtk"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# 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
+	virtual/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]
+	net-misc/wget
+	dev-libs/jansson
+	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:=
+		dev-libs/gjs
+	)
+	selinux? (
+		sys-libs/libselinux
+		sys-libs/libsemanage
+	)
+	systemtap? ( dev-util/systemtap )
+	>=dev-lang/ocaml-4.02[ocamlopt]
+	dev-ml/findlib[ocamlopt]
+	dev-ml/ocaml-gettext
+	>=dev-ml/ounit-2
+	erlang? ( dev-lang/erlang )
+	inspect-icons? (
+		media-libs/netpbm
+		media-gfx/icoutils
+	)
+	virtual/acl
+	sys-libs/libcap
+	lua? ( dev-lang/lua:* )
+	>=app-shells/bash-completion-2.0
+	>=dev-libs/yajl-2.0.4
+	gtk? (
+		sys-apps/dbus
+		x11-libs/gtk+:3
+	)
+	"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	>=dev-util/gtk-doc-am-1.14
+	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;
+
+		use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${MY_PV_1}
+	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 \
+		$(use_enable test werror) \
+		--with-libvirt \
+		--with-default-backend=libvirt \
+		--disable-appliance \
+		--disable-daemon \
+		--with-extra="-gentoo" \
+		--with-readline \
+		--disable-php \
+		$(use_enable python) \
+		--without-java \
+		$(use_enable perl) \
+		$(use_enable fuse) \
+		--enable-ocaml \
+		$(use_enable ruby) \
+		--disable-haskell \
+		--disable-golang \
+		$(use_enable introspection gobject) \
+		$(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 perl ; then
+		einfo "Perl based tools NOT build"
+	fi
+	if ! gtk ; then
+		einfo "virt-p2v NOT installed"
+	fi
+}