commit: 127f519eb936c7d6bca83c62f4b20a9deb953cac Author: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com> AuthorDate: Tue Dec 12 01:13:57 2017 +0000 Commit: Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com> CommitDate: Tue Dec 12 01:13:57 2017 +0000 URL: https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=127f519e
update libguestfs app-emulation/libguestfs/Manifest | 7 +- .../1.36/0001-Update-libtool-initialization.patch | 29 ++++ ...port-for-Gentoo-in-distribution-detection.patch | 25 +++ ...ound-autotools-utils-detection-of-gtk-doc.patch | 42 ++++++ app-emulation/libguestfs/libguestfs-1.36.11.ebuild | 167 +++++++++++++++++++++ 5 files changed, 269 insertions(+), 1 deletion(-) diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest index d7f9c7f..109c8eb 100644 --- a/app-emulation/libguestfs/Manifest +++ b/app-emulation/libguestfs/Manifest @@ -3,6 +3,11 @@ AUX 1.28/0001_add_gentoo_names_to_configure.patch 262 SHA256 0d18682bc8666cb3e6a AUX 1.28/0002_add_gentooway_to_remove_la_files.patch 555 SHA256 fc65ce8df2f910c1ac1c4466c8f529fc442b136914b9f50ce1b910834349ca59 SHA512 5dd8f7a8eeed6e2e4e842cd9fb5fde5104ab47bfddcbe218107e181c3891350eb425648667c4d70becb437bbf52506035b20778ea3a7954f020e4a2be76f959b WHIRLPOOL e776522e5a2e14c3dea2f35ac3de1f36763ec6eaa2c29e2d32a062c4df2946268d54bd6be5216caf861979dc442ac9b0c2ce8a6b765a09f53ea56258cb0b6ef2 AUX 1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch 508 SHA256 10d75b8c50995ac7ec07f7f7d98c41f4871dcb7094873398c8d71dff3cf8a7d9 SHA512 9801326dfd2fd39202f8bd0765b954c3947e829d9568bda9a50c14388b9e7d6855c2fd38976fe98cd1183163d220b3795ec1105becb49a9de34459bb2ea74112 WHIRLPOOL 595699b9084be65847de0bd5969d0f50392cd53d830dad30eca0a9a9c8f336e680c068db59864d9efa67f91e00268ef91ba6b843f192056eb09c291b113be05b AUX 1.28/0103_disable_php_bindings_makefile.patch 231 SHA256 f5b73f353746d7f945c8948e6b7bb2d192dd653a92124aefe578b49960179d1a SHA512 b359cd29ab9cb6edec5a4cab1d84b022ae6ff42c3adae75051ab0d8c87dda39fff17e02ada3a863177e3dd979dffd4958cbc3c71cdca89196c74f1ebd14a8da3 WHIRLPOOL 0e95d9b60744f4dae6c7599d899d57cbb9a8f656b3cbb5dc19667f679c472d749808932c8ec7826da26d3599f2d9f22b99410a2399048376e01ed9dde7284d5d -DIST libguestfs-1.28.5.tar.gz 12747537 SHA256 e9f38c6ad15cefe18b096a86334a60fc7df6367358f2641d8c5c5f3122ad9d91 SHA512 5ab25498fa9141950c1077cc52bae05a2781fa86a983b5fa49fbd4a4bca70710db3d4f7b9f45fb6f8b4ee8e3d77ffde7c4c0d9e9e526443e2a8251a62306ebb6 WHIRLPOOL cbbac5cce87dd41ad05b13732d0f5a3442c980152d8864522f5df47ffed7a260a131c819ceb40edd07cd74454fc9f4c0c7eb41fe734509a4e123d28bc58d813f +AUX 1.36/0001-Update-libtool-initialization.patch 984 SHA256 37541554f999938b089a732bc0b877748dd11abc72e4a5b9cd5e39e2aedde8dd SHA512 c1d72b214d2ae5d1ecebc9333e1926d475d84c992af22379d3eb94f1ce5dbd0444b4f24d757de038d0b941d3f720d13e53837b0655019cb82c136622bca7496c WHIRLPOOL ab4eab1074b81d96c6e70f173526b6e59f2755ed3a33eb06bfa71101c2faa9059812f0fb298f019dda78089e9636e2122d8493bcb2038edf509bfce5d04b1406 +AUX 1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch 725 SHA256 14f65aacc0c5a46391c57a6cd67b389aeb9e44a6afb63f8bc4a299f8ba30500d SHA512 89f4375aef8f025b4cc1271f92d33a58927a13d05167c14c02fa48849bbe7283af684ea0e63632c7f7b8b04c9be463d29c07e65ca52b606283c1e0270c4db167 WHIRLPOOL 8ef3b5e5e0cfe6625c1a3de11b5bcf445a3aea4f6417b88b413c82c0f005fb24ecf7f5679effc7aaedff7a1ac5dd441b271b56d997d66b44a7eaba965b2c7674 +AUX 1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch 1168 SHA256 5cd4028d943c607b440308f1cbff9dddabc988ae3f984ce655491a45d10c06f8 SHA512 8c45fb951ceecfc67bcbb426a1bd37bfd31981bde2b8235c1508ccf4eb3a1a44627beffc824a3cff333a40a425da17ef77962b5ea9c1a875acb6adf0d47e8931 WHIRLPOOL 353115465ecef08a357e43958deb5edd21e32f9c1d86099b0eed2977783dc11d1bb0ce71ee610a4520279887e26f39e27ffe1a63e2d965e34058aae1aecd2eff +DIST libguestfs-1.28.5.tar.gz 12747537 BLAKE2B b0cc023efef41955c4b448b68bd5578d88d305364afdc1fc24c7d26ba5fae4a1b81ee58799d42774ea28e162208edbf36a0e49c1a7e4f751c74e9c45e9a472a6 SHA512 5ab25498fa9141950c1077cc52bae05a2781fa86a983b5fa49fbd4a4bca70710db3d4f7b9f45fb6f8b4ee8e3d77ffde7c4c0d9e9e526443e2a8251a62306ebb6 +DIST libguestfs-1.36.11.tar.gz 23172504 SHA256 48a9205da215ea856b727d85251e5a747829f92c7a0abe9671d73d4b5c2b3813 SHA512 81217bc2be1755f108af815238f144ab72ecb5cc6a815bc50246463508bed739848b9b67c6cf8b1d68c3cfa0aca66857e9006c11e3a8fe20fc1ddcb22c562571 WHIRLPOOL a4a2ab4be541d031b979025e5051f0bacc5a42a7ece6c14c07a3bc567ab32cae24a1ddca634837753b9f609dab3b99b0e1dbbd8118868230ac63e8247b519161 EBUILD libguestfs-1.28.5_p1-r3.ebuild 3798 SHA256 419358fdc6f21d83392a82ebaf1bf381c1f88f9d04b09c0103be28615f63b09b SHA512 17a68acc079cb767c42886a950b85b48f27b3fc10221dc30a2ac032d3e2b2c7873ffa5dc5165b2cd80df8c8098c26ded3da3bfcfcd9a0bb282c30fcce60a1ab5 WHIRLPOOL e645182f9ee4bcc55d315771904055b5c2112e7bfa6e78bd35979b3525b6bd6fe8d0aafafafb2b76f32a070f57d66accee076fb0155a92ea8f75d5629881e1f1 +EBUILD libguestfs-1.36.11.ebuild 3877 SHA256 68129997b131a40388704762383f2460c4ea0fdeaa138df5d7b04d265da8e636 SHA512 749338dfb6c0dc81ff122085f71fd0861ee6b5b71cbd8591d0392896ee28d59f2f09f3a970dd2f93cc3f520f81767690c8d58bb6ed100de1066a23151b8d33e2 WHIRLPOOL 816b816f34779ce28845087747b6afe4a41e9c8afe343bcca40b30f4af39947b21e53f0a8390f45daf2d5766453c7663a8ff95b86c16c4ece51870433e6228ca MISC metadata.xml 894 SHA256 2b195f1494f336f53cc8d2018077ea431e90d05b5ec0cd08ff851dac5d383738 SHA512 ec4e41f3143e4f8128e59188cbd0a105d22c5f28d8c388489bd71177d6c0084b798a2d127308cc1e04406a5fe9cfb143dd5aaf3308dd1422f82a561abeae13af WHIRLPOOL 3a98164903c0cb1670315bc2e522cc3bcea4583d10f45e6f785179e96b52730e78a5073ca699e82fc796d843e32f2e3a5e5e42941e0fae0a006cb9931b9e7f30 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 new file mode 100644 index 0000000..24da76f --- /dev/null +++ b/app-emulation/libguestfs/files/1.36/0001-Update-libtool-initialization.patch @@ -0,0 +1,29 @@ +From a5fd133e001bb62d13c47ebc392fbb696a513640 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <[email protected]> +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 new file mode 100644 index 0000000..bf265f7 --- /dev/null +++ b/app-emulation/libguestfs/files/1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch @@ -0,0 +1,25 @@ +From 9c423cd2d24b6de924afc6e0d715594bb056288d Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <[email protected]> +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-Workaround-autotools-utils-detection-of-gtk-doc.patch b/app-emulation/libguestfs/files/1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch new file mode 100644 index 0000000..087708d --- /dev/null +++ b/app-emulation/libguestfs/files/1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch @@ -0,0 +1,42 @@ +From 9bfa78095f6090c377fb40970653d1105a343cb7 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <[email protected]> +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/libguestfs-1.36.11.ebuild b/app-emulation/libguestfs/libguestfs-1.36.11.ebuild new file mode 100644 index 0000000..941ac25 --- /dev/null +++ b/app-emulation/libguestfs/libguestfs-1.36.11.ebuild @@ -0,0 +1,167 @@ +# 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] + 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 +}
