Skip to content

Commit

Permalink
app-emulation/libvirt: update live ebuild
Browse files Browse the repository at this point in the history
Thanks to Michal Privoznik for the updated patch.

Closes: https://bugs.gentoo.org/659206
Package-Manager: Portage-2.3.41, Repoman-2.3.9
  • Loading branch information
tamiko committed Jun 29, 2018
1 parent 0bf491b commit d908013
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions app-emulation/libvirt/libvirt-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"

PATCHES=(
"${FILESDIR}"/${PN}-4.2.0-do_not_use_sysconf.patch
"${FILESDIR}"/${PN}-4.5.0-do_not_use_sysconf.patch
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
"${FILESDIR}"/${PN}-3.10.0-r2-fix_paths_for_apparmor.patch
)
Expand Down Expand Up @@ -237,12 +237,6 @@ src_prepare() {
}

src_configure() {
#
# With 4.1.0 we should always enable networking support - otherwise not
# even minimal networking is available. Yes, this degrades
# USE=virt-network to a mere runtime-dep USE flag. But let's keep it
# for compatibility and convenience.
#
local myeconfargs=(
$(use_with apparmor)
$(use_with apparmor apparmor-profiles)
Expand Down Expand Up @@ -276,15 +270,14 @@ src_configure() {
$(use_with udev)
$(use_with uml)
$(use_with vepa virtualport)
$(use_with virt-network network)
$(use_with wireshark-plugins wireshark-dissector)
$(use_with xen)
$(use_with xen xen-inotify)
$(use_with xen libxl)
$(use_with zeroconf avahi)
$(use_with zfs storage-zfs)

--with-network

--without-hal
--without-netcf
--without-sanlock
Expand Down Expand Up @@ -343,9 +336,7 @@ src_install() {
# Remove bogus, empty directories. They are either not used, or
# libvirtd is able to create them on demand
rm -rf "${D}"/etc/sysconfig
rm -rf "${D}"/var/cache
rm -rf "${D}"/var/run
rm -rf "${D}"/var/log
rm -rf "${D}"/var

use libvirtd || return 0
# From here, only libvirtd-related instructions, be warned!
Expand Down

0 comments on commit d908013

Please sign in to comment.