mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
app-emulation/libguestfs: version bump 1.28.5-r3 → 1.36.5, bug #601162.
Fix build with newer glibc, bug #610998. Package-Manager: Portage-2.3.8, Repoman-2.3.3
This commit is contained in:
Gilles Dartiguelongue
@@ -1 +1,2 @@
|
||||
DIST libguestfs-1.28.5.tar.gz 12747537 SHA256 e9f38c6ad15cefe18b096a86334a60fc7df6367358f2641d8c5c5f3122ad9d91 SHA512 5ab25498fa9141950c1077cc52bae05a2781fa86a983b5fa49fbd4a4bca70710db3d4f7b9f45fb6f8b4ee8e3d77ffde7c4c0d9e9e526443e2a8251a62306ebb6 WHIRLPOOL cbbac5cce87dd41ad05b13732d0f5a3442c980152d8864522f5df47ffed7a260a131c819ceb40edd07cd74454fc9f4c0c7eb41fe734509a4e123d28bc58d813f
|
||||
DIST libguestfs-1.36.5.tar.gz 23012703 SHA256 c2f7c10c42de04567a9b5cfd8345a995fb951ded9a7fbe72fae061d66dfe8f98 SHA512 01f10ab902386130f0565f53d0c361b903d6790b572e5562a2180e896952ead2e7661795bd976a7e2442887ea17014a6767db8b6e575de634f32de82ca4124c6 WHIRLPOOL aec77d2f3070722d6f39b172054ae1f526f731757a7d539ad1b7dc93c328259560172c91b77ca182526b73f1cbebfd037dea441a7c386f8398a0628145580502
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
From 9c423cd2d24b6de924afc6e0d715594bb056288d Mon Sep 17 00:00:00 2001
|
||||
From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
|
||||
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
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
From 9bfa78095f6090c377fb40970653d1105a343cb7 Mon Sep 17 00:00:00 2001
|
||||
From: Gilles Dartiguelongue <g.dartiguelongue@lexfo.fr>
|
||||
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
|
||||
|
||||
171
app-emulation/libguestfs/libguestfs-1.36.5.ebuild
Normal file
171
app-emulation/libguestfs/libguestfs-1.36.5.ebuild
Normal file
@@ -0,0 +1,171 @@
|
||||
# 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 ocaml 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 )
|
||||
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
|
||||
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) \
|
||||
$(use_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 ! use ocaml ; then
|
||||
einfo "Ocaml based tools ( sysprep , ... ) NOT installed"
|
||||
fi
|
||||
if ! gtk ; then
|
||||
einfo "virt-p2v NOT installed"
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user