1 |
commit: 04f7e992bebab5eb33872a7a77d4872067c406b0 |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 7 12:38:03 2018 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 7 13:02:16 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f7e992 |
7 |
|
8 |
app-emulation/libguestfs: 1.36.13 → 1.36.15 |
9 |
|
10 |
Do not RDEPEND on bash-completion and drop unused USE flag. Fix |
11 |
static-libs USE flag to actually do something. Fix build failure |
12 |
with USE=-ocaml, bug #670968. Make libvirt support optional, |
13 |
bug #672452. Remove unused debug USE flag. Switch from versionator |
14 |
eclass to eapi7-ver. gjs is a test dependency only. Fix sandbox issues, |
15 |
bug #653104. |
16 |
|
17 |
Closes: https://bugs.gentoo.org/653104 |
18 |
Closes: https://bugs.gentoo.org/670968 |
19 |
Closes: https://bugs.gentoo.org/672452 |
20 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
21 |
Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org> |
22 |
|
23 |
app-emulation/libguestfs/Manifest | 1 + |
24 |
...-failure-when-not-built-with-OCaml-suppor.patch | 40 +++++ |
25 |
...build-time-requirement-on-bash-completion.patch | 45 ++++++ |
26 |
app-emulation/libguestfs/libguestfs-1.36.15.ebuild | 178 +++++++++++++++++++++ |
27 |
app-emulation/libguestfs/metadata.xml | 5 +- |
28 |
5 files changed, 267 insertions(+), 2 deletions(-) |
29 |
|
30 |
diff --git a/app-emulation/libguestfs/Manifest b/app-emulation/libguestfs/Manifest |
31 |
index 6dd41368a28..7a661171f96 100644 |
32 |
--- a/app-emulation/libguestfs/Manifest |
33 |
+++ b/app-emulation/libguestfs/Manifest |
34 |
@@ -1,3 +1,4 @@ |
35 |
DIST libguestfs-1.28.5.tar.gz 12747537 BLAKE2B b0cc023efef41955c4b448b68bd5578d88d305364afdc1fc24c7d26ba5fae4a1b81ee58799d42774ea28e162208edbf36a0e49c1a7e4f751c74e9c45e9a472a6 SHA512 5ab25498fa9141950c1077cc52bae05a2781fa86a983b5fa49fbd4a4bca70710db3d4f7b9f45fb6f8b4ee8e3d77ffde7c4c0d9e9e526443e2a8251a62306ebb6 |
36 |
DIST libguestfs-1.36.13.tar.gz 22886310 BLAKE2B b0961cc6b941f1b68bba23af72e8b5478ed33da6f343e453f90decd7454cfc6a94cf67a81ad59c443df744727afa9bd4e98c77411efc4134e3422eaae59ffff5 SHA512 7c9799d5d563ffd8296f70a8402582aba85f3bf3c0dcaa18c44ecff5b7f771a3bc3f297aa85a4056351758298c79752d456a4b46e41924ff9acf196c992d51fb |
37 |
+DIST libguestfs-1.36.15.tar.gz 22256729 BLAKE2B 7ed9c0010ffe6b904b055068e86544f12a884ff52f1f3322a3014574310de9a69077d1865e641ad8304149d1a2eb0d0fbc5e107c93a9790135dc543592da68a6 SHA512 a918bc886b60340d748093bdcca3a048ed26b31508ba256cd7903b76798816e54f836446d9286f7c452fa0d4fa82c0c1216606d01fce2ada9d7386fa463857c7 |
38 |
DIST libguestfs-1.36.5.tar.gz 23012703 BLAKE2B 31dcbef2ae1c287c4a353f671e6073cdb4eb2c7173666ff9589ed0e0ce909c2dfa00f2da14b40a0a6a9384dd830082f1f721b0c1dafabe2862391f0f75ff3f3d SHA512 01f10ab902386130f0565f53d0c361b903d6790b572e5562a2180e896952ead2e7661795bd976a7e2442887ea17014a6767db8b6e575de634f32de82ca4124c6 |
39 |
|
40 |
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 |
41 |
new file mode 100644 |
42 |
index 00000000000..093a53f1163 |
43 |
--- /dev/null |
44 |
+++ b/app-emulation/libguestfs/files/1.36/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch |
45 |
@@ -0,0 +1,40 @@ |
46 |
+From dc35ce2ba774a9284360bfd6532acb527a2f73d7 Mon Sep 17 00:00:00 2001 |
47 |
+From: Gilles Dartiguelongue <eva@g.o> |
48 |
+Date: Fri, 7 Dec 2018 11:21:25 +0100 |
49 |
+Subject: [PATCH 3/4] Fix install failure when not built with OCaml support |
50 |
+ |
51 |
+Makefile rules in po/ require builder/index-parse.c to be generated to |
52 |
+allow translation utilities to work on it, however builder/ is |
53 |
+completely masked behind OCaml conditional build even if some tools do |
54 |
+not require it and proper guards are in place already. |
55 |
+ |
56 |
+Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1614502 |
57 |
+--- |
58 |
+ Makefile.am | 4 +++- |
59 |
+ 1 file changed, 3 insertions(+), 1 deletion(-) |
60 |
+ |
61 |
+diff --git a/Makefile.am b/Makefile.am |
62 |
+index 7eefacbeb..c0a68151f 100644 |
63 |
+--- a/Makefile.am |
64 |
++++ b/Makefile.am |
65 |
+@@ -155,7 +155,6 @@ if HAVE_OCAML |
66 |
+ SUBDIRS += \ |
67 |
+ mllib \ |
68 |
+ customize \ |
69 |
+- builder builder/templates \ |
70 |
+ get-kernel \ |
71 |
+ resize \ |
72 |
+ sparsify \ |
73 |
+@@ -169,6 +168,9 @@ SUBDIRS += dib |
74 |
+ endif |
75 |
+ endif |
76 |
+ |
77 |
++# Tools mixed with more OCAML based tools |
78 |
++SUBDIRS += builder builder/templates |
79 |
++ |
80 |
+ # Perl tools. |
81 |
+ if HAVE_TOOLS |
82 |
+ SUBDIRS += tools |
83 |
+-- |
84 |
+2.19.2 |
85 |
+ |
86 |
|
87 |
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 |
88 |
new file mode 100644 |
89 |
index 00000000000..9bce9b05b05 |
90 |
--- /dev/null |
91 |
+++ b/app-emulation/libguestfs/files/1.36/0004-Loosen-build-time-requirement-on-bash-completion.patch |
92 |
@@ -0,0 +1,45 @@ |
93 |
+From 1f51b8ef921ad804022fc39b7465f9f731cbb6be Mon Sep 17 00:00:00 2001 |
94 |
+From: Gilles Dartiguelongue <eva@g.o> |
95 |
+Date: Fri, 7 Dec 2018 12:14:15 +0100 |
96 |
+Subject: [PATCH 4/5] Loosen build time requirement on bash-completion |
97 |
+ |
98 |
+Distributions might avoid pulling bash-completion during build as it is |
99 |
+an optional feature and would only make sense at runtime anyway. Since |
100 |
+this setting is well-known across a given distribution, allow them to |
101 |
+provide the value and avoid the dependency. |
102 |
+--- |
103 |
+ m4/guestfs_bash_completion.m4 | 21 ++++++++++----------- |
104 |
+ 1 file changed, 10 insertions(+), 11 deletions(-) |
105 |
+ |
106 |
+diff --git a/m4/guestfs_bash_completion.m4 b/m4/guestfs_bash_completion.m4 |
107 |
+index 1f171b79d..9e877f6ab 100644 |
108 |
+--- a/m4/guestfs_bash_completion.m4 |
109 |
++++ b/m4/guestfs_bash_completion.m4 |
110 |
+@@ -16,14 +16,13 @@ |
111 |
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
112 |
+ |
113 |
+ dnl Bash completion. |
114 |
+-PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], [ |
115 |
+- bash_completion=yes |
116 |
+- AC_MSG_CHECKING([for bash-completions directory]) |
117 |
+- BASH_COMPLETIONS_DIR="`pkg-config --variable=completionsdir bash-completion`" |
118 |
+- AC_MSG_RESULT([$BASH_COMPLETIONS_DIR]) |
119 |
+- AC_SUBST([BASH_COMPLETIONS_DIR]) |
120 |
+-],[ |
121 |
+- bash_completion=no |
122 |
+- AC_MSG_WARN([bash-completion not installed]) |
123 |
+-]) |
124 |
+-AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test "x$bash_completion" = "xyes"]) |
125 |
++AC_ARG_WITH([bashcompletiondir], |
126 |
++ AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]), |
127 |
++ [], |
128 |
++ [AS_IF([$($PKG_CONFIG --exists bash-completion)], [ |
129 |
++ with_bashcompletiondir=$($PKG_CONFIG --variable=completionsdir bash-completion) |
130 |
++ ] , [ |
131 |
++ with_bashcompletiondir=${datadir}/bash-completion/completions |
132 |
++ ])]) |
133 |
++AC_SUBST([BASH_COMPLETIONS_DIR], [$with_bashcompletiondir]) |
134 |
++AM_CONDITIONAL([HAVE_BASH_COMPLETION],[test -n "$with_bashcompletiondir"]) |
135 |
+-- |
136 |
+2.19.2 |
137 |
+ |
138 |
|
139 |
diff --git a/app-emulation/libguestfs/libguestfs-1.36.15.ebuild b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild |
140 |
new file mode 100644 |
141 |
index 00000000000..4fda3526f90 |
142 |
--- /dev/null |
143 |
+++ b/app-emulation/libguestfs/libguestfs-1.36.15.ebuild |
144 |
@@ -0,0 +1,178 @@ |
145 |
+# Copyright 1999-2018 Gentoo Authors |
146 |
+# Distributed under the terms of the GNU General Public License v2 |
147 |
+ |
148 |
+EAPI=6 |
149 |
+ |
150 |
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) |
151 |
+ |
152 |
+inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 xdg-utils |
153 |
+ |
154 |
+MY_PV_1="$(ver_cut 1-2)" |
155 |
+MY_PV_2="$(ver_cut 2)" |
156 |
+[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development" |
157 |
+ |
158 |
+DESCRIPTION="Tools for accessing, inspect and modifying virtual machine (VM) disk images" |
159 |
+HOMEPAGE="http://libguestfs.org/" |
160 |
+SRC_URI="http://libguestfs.org/download/${MY_PV_1}-${SD}/${P}.tar.gz" |
161 |
+ |
162 |
+LICENSE="GPL-2 LGPL-2" |
163 |
+SLOT="0/"${MY_PV_1}"" |
164 |
+ |
165 |
+KEYWORDS="~amd64" |
166 |
+IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test" |
167 |
+ |
168 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
169 |
+ |
170 |
+# Failures - doc |
171 |
+ |
172 |
+# FIXME: selinux support is automagic |
173 |
+COMMON_DEPEND=" |
174 |
+ sys-libs/ncurses:0= |
175 |
+ sys-devel/gettext |
176 |
+ >=app-misc/hivex-1.3.1 |
177 |
+ dev-libs/libpcre:3 |
178 |
+ app-arch/cpio |
179 |
+ dev-lang/perl |
180 |
+ virtual/cdrtools |
181 |
+ >=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps] |
182 |
+ sys-apps/fakeroot |
183 |
+ sys-apps/file |
184 |
+ libvirt? ( app-emulation/libvirt ) |
185 |
+ dev-libs/libxml2:2 |
186 |
+ >=sys-apps/fakechroot-2.8 |
187 |
+ >=app-admin/augeas-1.0.0 |
188 |
+ sys-fs/squashfs-tools:* |
189 |
+ dev-libs/libconfig |
190 |
+ sys-libs/readline:0= |
191 |
+ >=sys-libs/db-4.6:* |
192 |
+ app-arch/xz-utils |
193 |
+ app-arch/lzma |
194 |
+ app-crypt/gnupg |
195 |
+ app-arch/unzip[natspec] |
196 |
+ perl? ( |
197 |
+ virtual/perl-ExtUtils-MakeMaker |
198 |
+ >=dev-perl/Sys-Virt-0.2.4 |
199 |
+ virtual/perl-Getopt-Long |
200 |
+ virtual/perl-Data-Dumper |
201 |
+ dev-perl/libintl-perl |
202 |
+ >=app-misc/hivex-1.3.1[perl?] |
203 |
+ dev-perl/String-ShellQuote |
204 |
+ ) |
205 |
+ python? ( ${PYTHON_DEPS} ) |
206 |
+ fuse? ( sys-fs/fuse:= ) |
207 |
+ introspection? ( |
208 |
+ >=dev-libs/glib-2.26:2 |
209 |
+ >=dev-libs/gobject-introspection-1.30.0:= |
210 |
+ ) |
211 |
+ selinux? ( |
212 |
+ sys-libs/libselinux |
213 |
+ sys-libs/libsemanage |
214 |
+ ) |
215 |
+ systemtap? ( dev-util/systemtap ) |
216 |
+ ocaml? ( |
217 |
+ >=dev-lang/ocaml-4.02[ocamlopt] |
218 |
+ dev-ml/findlib[ocamlopt] |
219 |
+ dev-ml/ocaml-gettext |
220 |
+ >=dev-ml/ounit-2 |
221 |
+ ) |
222 |
+ erlang? ( dev-lang/erlang ) |
223 |
+ inspect-icons? ( |
224 |
+ media-libs/netpbm |
225 |
+ media-gfx/icoutils |
226 |
+ ) |
227 |
+ virtual/acl |
228 |
+ sys-libs/libcap |
229 |
+ lua? ( dev-lang/lua:* ) |
230 |
+ >=dev-libs/yajl-2.0.4 |
231 |
+ gtk? ( |
232 |
+ sys-apps/dbus |
233 |
+ x11-libs/gtk+:3 |
234 |
+ ) |
235 |
+ net-libs/libtirpc |
236 |
+ sys-libs/libxcrypt |
237 |
+ " |
238 |
+DEPEND="${COMMON_DEPEND} |
239 |
+ dev-util/gperf |
240 |
+ doc? ( app-text/po4a ) |
241 |
+ ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) |
242 |
+ test? ( introspection? ( dev-libs/gjs ) ) |
243 |
+ " |
244 |
+RDEPEND="${COMMON_DEPEND} |
245 |
+ app-emulation/libguestfs-appliance |
246 |
+ " |
247 |
+ |
248 |
+DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO ) |
249 |
+ |
250 |
+PATCHES=( |
251 |
+ "${FILESDIR}"/${MY_PV_1}/0001-Update-libtool-initialization.patch |
252 |
+ "${FILESDIR}"/${MY_PV_1}/0002-Add-support-for-Gentoo-in-distribution-detection.patch |
253 |
+ "${FILESDIR}"/${MY_PV_1}/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch |
254 |
+ "${FILESDIR}"/${MY_PV_1}/0004-Loosen-build-time-requirement-on-bash-completion.patch |
255 |
+) |
256 |
+ |
257 |
+pkg_setup () { |
258 |
+ CONFIG_CHECK="~KVM ~VIRTIO" |
259 |
+ [ -n "${CONFIG_CHECK}" ] && check_extra_config; |
260 |
+ |
261 |
+ use python && python-single-r1_pkg_setup |
262 |
+} |
263 |
+ |
264 |
+src_prepare() { |
265 |
+ default |
266 |
+ xdg_environment_reset |
267 |
+ eautoreconf |
268 |
+} |
269 |
+ |
270 |
+src_configure() { |
271 |
+ # Disable feature test for kvm for more reason |
272 |
+ # i.e: not loaded module in __build__ time, |
273 |
+ # build server not supported kvm, etc. ... |
274 |
+ # |
275 |
+ # In fact, this feature is virtio support and requires |
276 |
+ # configured kernel. |
277 |
+ export vmchannel_test=no |
278 |
+ |
279 |
+ econf \ |
280 |
+ --with-bashcompletiondir="$(get_bashcompdir)" \ |
281 |
+ $(use_with libvirt) \ |
282 |
+ --disable-appliance \ |
283 |
+ --disable-daemon \ |
284 |
+ --with-extra="-gentoo" \ |
285 |
+ --with-readline \ |
286 |
+ --disable-php \ |
287 |
+ $(use_enable python) \ |
288 |
+ --without-java \ |
289 |
+ $(use_enable perl) \ |
290 |
+ $(use_enable fuse) \ |
291 |
+ $(use_enable ocaml) \ |
292 |
+ $(use_enable ruby) \ |
293 |
+ --disable-haskell \ |
294 |
+ --disable-golang \ |
295 |
+ $(use_enable introspection gobject) \ |
296 |
+ $(use_enable introspection) \ |
297 |
+ $(use_enable erlang) \ |
298 |
+ $(use_enable static-libs static) \ |
299 |
+ $(use_enable systemtap probes) \ |
300 |
+ $(use_enable lua) \ |
301 |
+ --with-gtk=$(usex gtk 3 no) \ |
302 |
+ $(usex doc '' PO4A=no) |
303 |
+} |
304 |
+ |
305 |
+src_install() { |
306 |
+ strip-linguas -i po |
307 |
+ emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}""" |
308 |
+ find "${ED}" -name '*.la' -delete || die |
309 |
+ use perl && perl_delete_localpod |
310 |
+} |
311 |
+ |
312 |
+pkg_postinst() { |
313 |
+ if ! use gtk ; then |
314 |
+ einfo "virt-p2v NOT installed" |
315 |
+ fi |
316 |
+ if ! use ocaml ; then |
317 |
+ einfo "Ocaml based tools ( sysprep , ... ) NOT installed" |
318 |
+ fi |
319 |
+ if ! use perl ; then |
320 |
+ einfo "Perl based tools NOT build" |
321 |
+ fi |
322 |
+} |
323 |
|
324 |
diff --git a/app-emulation/libguestfs/metadata.xml b/app-emulation/libguestfs/metadata.xml |
325 |
index 8a1be2d16af..5978f915af3 100644 |
326 |
--- a/app-emulation/libguestfs/metadata.xml |
327 |
+++ b/app-emulation/libguestfs/metadata.xml |
328 |
@@ -17,9 +17,10 @@ |
329 |
<longdescription>Libguestfs is a library and tool set for accessing and |
330 |
modifying virtual machine (VM) disk images</longdescription> |
331 |
<use> |
332 |
- <flag name="fuse">Enable image mount support via fuse</flag> |
333 |
<flag name="erlang">Build Erlang bindings</flag> |
334 |
+ <flag name="fuse">Enable image mount support via fuse</flag> |
335 |
+ <flag name="inspect-icons">Use <pkg>media-gfx/icoutils</pkg> for acces icon file in image and inspect it</flag> |
336 |
+ <flag name="libvirt">Use <pkg>app-emulation/libvirt</pkg> to manipulate VMs</flag> |
337 |
<flag name="systemtap">Use <pkg>dev-util/systemtap</pkg> to inspect VM via "probes" way</flag> |
338 |
- <flag name="inspect-icons">Use <pkg>media-gfx/icoutils</pkg>for acces icon file in image and inspect it</flag> |
339 |
</use> |
340 |
</pkgmetadata> |