diff options
Diffstat (limited to 'app-emulation/libguestfs')
| -rw-r--r-- | app-emulation/libguestfs/Manifest | 14 | ||||
| -rw-r--r-- | app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch | 40 | ||||
| -rw-r--r-- | app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch | 45 | ||||
| -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 | 45 | ||||
| -rw-r--r-- | app-emulation/libguestfs/libguestfs-1.36.15.ebuild (renamed from app-emulation/libguestfs/libguestfs-1.28.5-r3.ebuild) | 84 | ||||
| -rw-r--r-- | app-emulation/libguestfs/libguestfs-1.38.6.ebuild (renamed from app-emulation/libguestfs/libguestfs-1.36.5.ebuild) | 63 | ||||
| -rw-r--r-- | app-emulation/libguestfs/metadata.xml | 5 |
8 files changed, 269 insertions, 67 deletions
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest index f2cab21d3218..28d67eb7c293 100644 --- a/app-emulation/libguestfs/Manifest +++ b/app-emulation/libguestfs/Manifest @@ -5,11 +5,15 @@ AUX 1.28/0005_enable_gtk_docs_in_broken_autotools-utils-eclass.patch 508 BLAKE2B AUX 1.28/0103_disable_php_bindings_makefile.patch 231 BLAKE2B b86d1fb1d8b3fa45f9b2470f72e04737c105108ab8bbcb0be00437aee05931ee229228573a4d1f7388d1d754bb4c50d61c13c08f7876a9f52fc63f7803499667 SHA512 b359cd29ab9cb6edec5a4cab1d84b022ae6ff42c3adae75051ab0d8c87dda39fff17e02ada3a863177e3dd979dffd4958cbc3c71cdca89196c74f1ebd14a8da3 AUX 1.36/0001-Update-libtool-initialization.patch 984 BLAKE2B afe8906c51c300493deec5a423b85634787e8dfe47841bd8d0c31eface0e40ac55698ca269f373381623ddd8d414241bc8775164ba43607a48cef1abed4d156d SHA512 c1d72b214d2ae5d1ecebc9333e1926d475d84c992af22379d3eb94f1ce5dbd0444b4f24d757de038d0b941d3f720d13e53837b0655019cb82c136622bca7496c AUX 1.36/0002-Add-support-for-Gentoo-in-distribution-detection.patch 725 BLAKE2B da5d03d8ba09577e30a954212a56ba1c182956cea00a290c380240e91aedf9c8b224d461c14b23d85eacc557b7c4600deb8dfd6cdc72355bd947087e2996c8ad SHA512 89f4375aef8f025b4cc1271f92d33a58927a13d05167c14c02fa48849bbe7283af684ea0e63632c7f7b8b04c9be463d29c07e65ca52b606283c1e0270c4db167 +AUX 1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch 1069 BLAKE2B 40838bbaa344984558de1f7281057f26905e3715ef4675e168c85afe5d0f9161547f1816c543bcd37a2e586e3390bfe2950b0e087a8ca1312e543e454cf001f8 SHA512 850df31f977a242bf9b314c7daef9481fa1f886389087b724de1643b57c70c6ec36296a141d3d63858bcd8602370c874d301d71a8e46920c6f7f809bdd26e6f9 AUX 1.36/0003-Workaround-autotools-utils-detection-of-gtk-doc.patch 1168 BLAKE2B 50cf3ece759e8089d90f95e233c4a1a52ffd20f32a75e24e239e441163fc4d5ef852be3b347575e3285d5969ef7eed98f67340c190f423c2ec356d52a7c60629 SHA512 8c45fb951ceecfc67bcbb426a1bd37bfd31981bde2b8235c1508ccf4eb3a1a44627beffc824a3cff333a40a425da17ef77962b5ea9c1a875acb6adf0d47e8931 -DIST libguestfs-1.28.5.tar.gz 12747537 BLAKE2B b0cc023efef41955c4b448b68bd5578d88d305364afdc1fc24c7d26ba5fae4a1b81ee58799d42774ea28e162208edbf36a0e49c1a7e4f751c74e9c45e9a472a6 SHA512 5ab25498fa9141950c1077cc52bae05a2781fa86a983b5fa49fbd4a4bca70710db3d4f7b9f45fb6f8b4ee8e3d77ffde7c4c0d9e9e526443e2a8251a62306ebb6 +AUX 1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2B 8062f548097fbcdb1c2cba45553eb22d315e618379d3fab8b87ee9c269c6e8de849de81511c6e9ed0aa1023a9ff31131b2ba507a0b1602e7485e192398fa3151 SHA512 a7cf03794c01b4386f7b78762381d17a37bf0abcf65800751126093b335f2e2dbde95f5016c9fc6813d8465370a96018c4aab6f9613104430d04b94a39b78ced +AUX 1.38/0001-Fix-install-failure-when-not-built-with-OCaml-suppor.patch 1149 BLAKE2B 7b9f870370a3ff32cb9ae7ca75cad885c442d322b695349efa238dd27709e890d98bc1c4a093446a4ad3eacf6e1ac55057a4a4b757a5e5520d2df315bbac3a8d SHA512 83cee02636508ce674688584095954d90e1830d85d869a9c9bea73bbf5193da980116313ebc8726dce7708d464bca0f647c3738b36197d5e78adf398b2608d57 +AUX 1.38/0002-Loosen-build-time-requirement-on-bash-completion.patch 1920 BLAKE2B b73cba74867f37ee3e640311a885ab46ae952fa9322469cb636a27da23e69762800f7d867273d1c9b439444d759c386877044bbc3ceb42dde96de9ffc942fcb5 SHA512 331e724a8978af2a608eb86fbf3744d0d97208a73c43ab919286369ade836b9d1f571b8990a1b92b68ebe01d6c9040e2293426a1c49de4e6a11ab1c60013de23 DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae59ffff5 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb -DIST libguestfs-1.36.5.tar.gz 23012703 BLAKE2B 31dcbef2ae1c287c4a353f671e6073cdb4eb2c7173666ff9589ed0e0ce909c2dfa00f2da14b40a0a6a9384dd830082f1f721b0c1dafabe2862391f0f75ff3f3d SHA512 01f10ab902386130f0565f53d0c361b903d6790b572e5562a2180e896952ead2e7661795bd976a7e2442887ea17014a6767db8b6e575de634f32de82ca4124c6 -EBUILD libguestfs-1.28.5-r3.ebuild 3754 BLAKE2B ca8d0cdcb60e7ba34805c64c932e2f06cbd72bbdca8e7777744a37cd43a69bb6964db5f72835d7473c505450396a6f2fa544ffc17a856e541561ce95fbc1acce SHA512 098c67112a8ff3c648351c060837154cb4ccb666ddb056a6e54ee4901e3d7e9b78e20bd73cef7fcd6895a248522242456bd721ab9123faf4e09dc3c6cd6631bd +DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7 +DIST libguestfs-1.38.6.tar.gz 23284845 BLAKE2B 005aaef731e1711dc5f4552dbecff80f2c7a79fd8a13f6b79675b0a381dcd7b9ad16867ed0dda73a9f20ab0a7e03892b5ebffa5436b870613233fbd2024ca846 SHA512 20a254f1d6a4628a11f42c08947d1165430a020030da7e6ee7b22859b552245e8f3822a2d86c60055878ca00d8f17d346a0ad8274e8f0bb03ef4a9410b9630f1 EBUILD libguestfs-1.36.13.ebuild 4155 BLAKE2B e06f52284fea5b18165ff0308bec1af0c1b6166986da399a819a095fa2373940d10a2f386700ddc65e99558fe3e91974114367366a97969947b7358c29757c1b SHA512 c8069c35e30f96888016edbb88d9fa5b76dbd87d7e2d448beadd0d00df824a7aa51526d163f90ffb31b887398a1be41c28492b2861cedede8d6b6172f27cab4e -EBUILD libguestfs-1.36.5.ebuild 3877 BLAKE2B 6f64972ce85db716ae89a73c7f27248c9fcd8427e2eabbeb277a887b27937756463057805287ba955430b37561e034fa40f020ff32539ba77b9b7b9b5a7dd2b0 SHA512 749338dfb6c0dc81ff122085f71fd0861ee6b5b71cbd8591d0392896ee28d59f2f09f3a970dd2f93cc3f520f81767690c8d58bb6ed100de1066a23151b8d33e2 -MISC metadata.xml 1002 BLAKE2B 993cf56b6beea1ff609bf9be15d981426357cdaa15c5c6af9a054dbbb241bb2a12e0bb84b7f5f171ba111bd68545254f197c65b5f8956af4facced3bc1d9fc65 SHA512 56525b6489f81fd7555f5953e5ca0ccb468831a433264326f8cf2dee18f8bc5d12a6c479e7fed9c252d17d87efeebac77c0543e4e19207d0e8f720789bd68ce8 +EBUILD libguestfs-1.36.15.ebuild 4356 BLAKE2B a6f5d8292d9a24b3ab3559c036545c143dcc6bbaa6ac97fc9d3c827927b9b07d7e6f0f6bf9d452f6f5ecb4b6a982edee29955726aa4b582a1a5d49228e822d9f SHA512 2a12aa867f174e26b34c70173adb020bba7af637a226c6168f82fb4cec0c2b6b968f5e9303e13f8ddcecfdaf89eb6fd4dfbd4bb3584fe06413c068835b051e72 +EBUILD libguestfs-1.38.6.ebuild 4091 BLAKE2B 89b2e4ec1f45db67fa07bf7b7aa3b4590edec0c4344f9d26c1e43f21a169fbc99989de6fe4e13465c1ab73f6557b63b41d65297f153b00fcf37c3fde23023fff SHA512 2b751c10f3e4c251c9fbce0d8964a8087882cdf64e9eb6d92816b2cb960cd5f02db008e40584ec9c7c8f42ff8c5aeaf6d09bf3394f095f1199a74497813c9582 +MISC metadata.xml 1087 BLAKE2B 73bbd9edbb966fc64bd0d16f5cfea2545d8df03fcfb59d25459b0808c99bec6ac4b84d948f5adb1dbeff60dd1c4e9fadcedc5e5f547820c777b4f9e6495f3518 SHA512 390fd28d878c9a099ec88553ea4a09a969f08b52285c4ce72dc36cac02cb6a75cf8b2e658370622372397035274eb3302641bdb2f2aee2c59eb5ea4eda739fbf 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 new file mode 100644 index 000000000000..093a53f11632 --- /dev/null +++ b/app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch @@ -0,0 +1,40 @@ +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/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 new file mode 100644 index 000000000000..9bce9b05b051 --- /dev/null +++ b/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch @@ -0,0 +1,45 @@ +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/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 000000000000..cb608beca08f --- /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 <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 new file mode 100644 index 000000000000..e68a4b0bded4 --- /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 <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. +--- + 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.28.5-r3.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild index afc70750da9f..4fda3526f90b 100644 --- a/app-emulation/libguestfs/libguestfs-1.28.5-r3.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild @@ -1,17 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -WANT_LIBTOOL=latest -WANT_AUTOMAKE=1.14 -PYTHON_COMPAT=( python{2_7,3_{4,5}} ) +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) -inherit python-single-r1 autotools versionator linux-info perl-module +inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 xdg-utils -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" +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/" @@ -21,14 +19,13 @@ LICENSE="GPL-2 LGPL-2" SLOT="0/"${MY_PV_1}"" KEYWORDS="~amd64" -IUSE="bash-completion erlang +fuse debug ocaml doc +perl python ruby static-libs -selinux systemtap introspection inspect-icons test lua" +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 -# Failures - bash-completion, see GBZ #486306 +# FIXME: selinux support is automagic COMMON_DEPEND=" sys-libs/ncurses:0= sys-devel/gettext @@ -40,7 +37,7 @@ COMMON_DEPEND=" >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file - app-emulation/libvirt + libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-1.0.0 @@ -52,7 +49,8 @@ COMMON_DEPEND=" app-arch/lzma app-crypt/gnupg app-arch/unzip[natspec] - perl? ( virtual/perl-ExtUtils-MakeMaker + perl? ( + virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper @@ -63,30 +61,41 @@ COMMON_DEPEND=" 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 ) + selinux? ( + sys-libs/libselinux + sys-libs/libsemanage + ) systemtap? ( dev-util/systemtap ) - ocaml? ( dev-lang/ocaml[ocamlopt] + ocaml? ( + >=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 + 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 + >=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 @@ -94,6 +103,13 @@ RDEPEND="${COMMON_DEPEND} 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; @@ -102,11 +118,9 @@ pkg_setup () { } src_prepare() { - eapply "${FILESDIR}"/${MY_PV_1} - eapply_user - eaclocal - eautomake - eautoconf + default + xdg_environment_reset + eautoreconf } src_configure() { @@ -119,9 +133,8 @@ src_configure() { export vmchannel_test=no econf \ - $(use_enable test werror) \ - --with-libvirt \ - --with-default-backend=libvirt \ + --with-bashcompletiondir="$(get_bashcompdir)" \ + $(use_with libvirt) \ --disable-appliance \ --disable-daemon \ --with-extra="-gentoo" \ @@ -136,23 +149,30 @@ src_configure() { --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) + $(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 perl ; then - einfo "Perl based tools NOT build" + 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.36.5.ebuild b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild index 941ac259350e..7da9fbcf7a2b 100644 --- a/app-emulation/libguestfs/libguestfs-1.36.5.ebuild +++ b/app-emulation/libguestfs/libguestfs-1.38.6.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# 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}} ) +PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) -inherit autotools linux-info perl-module python-single-r1 versionator +inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 xdg-utils -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" +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/" @@ -19,13 +19,11 @@ 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" +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 -# Failures - bash-completion, see GBZ #486306 # FIXME: selinux support is automagic COMMON_DEPEND=" @@ -39,10 +37,10 @@ COMMON_DEPEND=" >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] sys-apps/fakeroot sys-apps/file - app-emulation/libvirt + libvirt? ( app-emulation/libvirt ) dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 - >=app-admin/augeas-1.0.0 + >=app-admin/augeas-1.8.0 sys-fs/squashfs-tools:* dev-libs/libconfig sys-libs/readline:0= @@ -65,17 +63,13 @@ COMMON_DEPEND=" 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 + ocaml? ( >=dev-lang/ocaml-4.03[ocamlopt] ) erlang? ( dev-lang/erlang ) inspect-icons? ( media-libs/netpbm @@ -84,18 +78,23 @@ COMMON_DEPEND=" 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 ) + net-libs/libtirpc + sys-libs/libxcrypt " DEPEND="${COMMON_DEPEND} dev-util/gperf - >=dev-util/gtk-doc-am-1.14 + >=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 @@ -103,6 +102,10 @@ RDEPEND="${COMMON_DEPEND} DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO ) +PATCHES=( + "${FILESDIR}"/${MY_PV_1}/ +) + pkg_setup () { CONFIG_CHECK="~KVM ~VIRTIO" [ -n "${CONFIG_CHECK}" ] && check_extra_config; @@ -111,8 +114,8 @@ pkg_setup () { } src_prepare() { - eapply "${FILESDIR}"/${MY_PV_1} - eapply_user + default + xdg_environment_reset eautoreconf } @@ -126,9 +129,8 @@ src_configure() { export vmchannel_test=no econf \ - $(use_enable test werror) \ - --with-libvirt \ - --with-default-backend=libvirt \ + --with-bashcompletiondir="$(get_bashcompdir)" \ + $(use_with libvirt) \ --disable-appliance \ --disable-daemon \ --with-extra="-gentoo" \ @@ -138,12 +140,14 @@ src_configure() { --without-java \ $(use_enable perl) \ $(use_enable fuse) \ - --enable-ocaml \ + $(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) \ @@ -153,15 +157,18 @@ src_configure() { 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 - if ! gtk ; then - einfo "virt-p2v NOT installed" - fi } diff --git a/app-emulation/libguestfs/metadata.xml b/app-emulation/libguestfs/metadata.xml index 8a1be2d16af7..5978f915af33 100644 --- a/app-emulation/libguestfs/metadata.xml +++ b/app-emulation/libguestfs/metadata.xml @@ -17,9 +17,10 @@ <longdescription>Libguestfs is a library and tool set for accessing and modifying virtual machine (VM) disk images</longdescription> <use> - <flag name="fuse">Enable image mount support via fuse</flag> <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> - <flag name="inspect-icons">Use <pkg>media-gfx/icoutils</pkg>for acces icon file in image and inspect it</flag> </use> </pkgmetadata> |