summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2017-01-22 09:17:42 -0600
committerMatthias Maier <tamiko@gentoo.org>2017-01-22 09:34:25 -0600
commit2266fe4a16125bdda5e99e85fd1d0ba6459205fe (patch)
tree939017b9ea14d4cf311ba1ac2b8ffc3312211f00 /app-emulation/libvirt/libvirt-9999.ebuild
parentprofiles: Lift app-emulation/libvirt wireshark-plugins mask (diff)
downloadgentoo-2266fe4a16125bdda5e99e85fd1d0ba6459205fe.tar.gz
gentoo-2266fe4a16125bdda5e99e85fd1d0ba6459205fe.tar.bz2
gentoo-2266fe4a16125bdda5e99e85fd1d0ba6459205fe.zip
app-emulation/libvirt: update live ebuild, bug #602762
Package-Manager: Portage-2.3.0, Repoman-2.3.1
Diffstat (limited to 'app-emulation/libvirt/libvirt-9999.ebuild')
-rw-r--r--app-emulation/libvirt/libvirt-9999.ebuild6
1 files changed, 3 insertions, 3 deletions
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 1cb69c847135..63d636d87537 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -123,7 +123,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-1.3.0-do_not_use_sysconf.patch
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
- "${FILESDIR}"/${PN}-1.3.1-fix_paths_for_apparmor.patch
+ "${FILESDIR}"/${PN}-3.0.0-fix_paths_for_apparmor.patch
"${FILESDIR}"/${PN}-1.3.4-glibc-2.23.patch
)
@@ -216,6 +216,8 @@ pkg_setup() {
src_prepare() {
touch "${S}/.mailmap"
+ default
+
if [[ ${PV} = *9999* ]]; then
# git checkouts require bootstrapping to create the configure script.
# Additionally the submodules must be cloned to the right locations
@@ -227,8 +229,6 @@ src_prepare() {
) >.git-module-status
fi
- default
-
# Tweak the init script:
cp "${FILESDIR}/libvirtd.init-r16" "${S}/libvirtd.init" || die
sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \