Diff libguestfs-1.36.13 with a libguestfs-1.36.15

/usr/portage/app-emulation/libguestfs/libguestfs-1.36.15.ebuild 2020-02-23 00:40:00.000000000 +0300
5 5

  
6 6
PYTHON_COMPAT=( python3_6 )
7 7

  
8
inherit eutils autotools linux-info perl-functions python-single-r1 versionator
8
inherit autotools bash-completion-r1 eapi7-ver eutils linux-info perl-functions python-single-r1 xdg-utils
9 9

  
10
MY_PV_1="$(get_version_component_range 1-2)"
11
MY_PV_2="$(get_version_component_range 2)"
12
[[ $(( $(get_version_component_range 2) % 2 )) -eq 0 ]] && SD="stable" || SD="development"
10
MY_PV_1="$(ver_cut 1-2)"
11
MY_PV_2="$(ver_cut 2)"
12
[[ $(( ${MY_PV_2} % 2 )) -eq 0 ]] && SD="stable" || SD="development"
13 13

  
14 14
DESCRIPTION="Tools for accessing, inspect  and modifying virtual machine (VM) disk images"
15 15
HOMEPAGE="http://libguestfs.org/"
......
19 19
SLOT="0/"${MY_PV_1}""
20 20

  
21 21
KEYWORDS="~amd64"
22
IUSE="bash-completion debug doc erlang +fuse gtk inspect-icons introspection lua ocaml +perl python ruby selinux static-libs systemtap test"
22
IUSE="doc erlang +fuse gtk inspect-icons introspection libvirt lua ocaml +perl python ruby selinux static-libs systemtap test"
23 23
RESTRICT="!test? ( test )"
24 24

  
25 25
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
26 26

  
27 27
# Failures - doc
28
# Failures - bash-completion, see GBZ #486306
29 28

  
30 29
# FIXME: selinux support is automagic
31 30
COMMON_DEPEND="
......
39 38
	>=app-emulation/qemu-2.0[qemu_softmmu_targets_x86_64,systemtap?,selinux?,filecaps]
40 39
	sys-apps/fakeroot
41 40
	sys-apps/file
42
	app-emulation/libvirt
41
	libvirt? ( app-emulation/libvirt )
43 42
	dev-libs/libxml2:2
44 43
	>=sys-apps/fakechroot-2.8
45 44
	>=app-admin/augeas-1.0.0
......
65 64
	introspection? (
66 65
		>=dev-libs/glib-2.26:2
67 66
		>=dev-libs/gobject-introspection-1.30.0:=
68
		dev-libs/gjs
69 67
	)
70 68
	selinux? (
71 69
		sys-libs/libselinux
......
86 84
	virtual/acl
87 85
	sys-libs/libcap
88 86
	lua? ( dev-lang/lua:* )
89
	>=app-shells/bash-completion-2.0
90 87
	>=dev-libs/yajl-2.0.4
91 88
	gtk? (
92 89
		sys-apps/dbus
......
99 96
	dev-util/gperf
100 97
	doc? ( app-text/po4a )
101 98
	ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake )
99
	test? ( introspection? ( dev-libs/gjs ) )
102 100
	"
103 101
RDEPEND="${COMMON_DEPEND}
104 102
	app-emulation/libguestfs-appliance
......
106 104

  
107 105
DOCS=( AUTHORS BUGS ChangeLog HACKING README TODO )
108 106

  
107
PATCHES=(
108
	"${FILESDIR}"/${MY_PV_1}/0001-Update-libtool-initialization.patch
109
	"${FILESDIR}"/${MY_PV_1}/0002-Add-support-for-Gentoo-in-distribution-detection.patch
110
	"${FILESDIR}"/${MY_PV_1}/0003-Fix-install-failure-when-not-built-with-OCaml-suppor.patch
111
	"${FILESDIR}"/${MY_PV_1}/0004-Loosen-build-time-requirement-on-bash-completion.patch
112
)
113

  
109 114
pkg_setup() {
110 115
		CONFIG_CHECK="~KVM ~VIRTIO"
111 116
		[ -n "${CONFIG_CHECK}" ] && check_extra_config;
......
114 119
}
115 120

  
116 121
src_prepare() {
117
	eapply "${FILESDIR}"/${MY_PV_1}/0001-Update-libtool-initialization.patch
118
	eapply "${FILESDIR}"/${MY_PV_1}/0002-Add-support-for-Gentoo-in-distribution-detection.patch
119
	eapply_user
122
	default
123
	xdg_environment_reset
120 124
	eautoreconf
121 125
}
122 126

  
......
130 134
	export vmchannel_test=no
131 135

  
132 136
	econf \
133
		--with-libvirt \
134
		--with-default-backend=libvirt \
137
		--with-bashcompletiondir="$(get_bashcompdir)" \
138
		$(use_with libvirt) \
135 139
		--disable-appliance \
136 140
		--disable-daemon \
137 141
		--with-extra="-gentoo" \
......
148 152
		$(use_enable introspection gobject) \
149 153
		$(use_enable introspection) \
150 154
		$(use_enable erlang) \
155
		$(use_enable static-libs static) \
151 156
		$(use_enable systemtap probes) \
152 157
		$(use_enable lua) \
153 158
		--with-gtk=$(usex gtk 3 no) \
......
157 162
src_install() {
158 163
	strip-linguas -i po
159 164
	emake DESTDIR="${D}" install "LINGUAS=""${LINGUAS}"""
160

  
165
	find "${ED}" -name '*.la' -delete || die
161 166
	use perl && perl_delete_localpod
162 167
}
163 168

  
Thank you!