diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2020-02-10 10:03:11 -0600 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2020-02-10 10:03:57 -0600 |
| commit | 9d0cc6913081b83e692189b025b7f781e344a183 (patch) | |
| tree | db3de8d6a980ce1f3317275c60925b081c0de649 | |
| parent | app-emulation/libvirt-9999: Provide modern runtime directory (diff) | |
| download | gentoo-9d0cc6913081b83e692189b025b7f781e344a183.tar.gz gentoo-9d0cc6913081b83e692189b025b7f781e344a183.tar.bz2 gentoo-9d0cc6913081b83e692189b025b7f781e344a183.zip | |
app-emulation/libvirt: Also update 6.0.0
Closes: https://bugs.gentoo.org/708782
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
| -rw-r--r-- | app-emulation/libvirt/libvirt-6.0.0-r1.ebuild (renamed from app-emulation/libvirt/libvirt-6.0.0.ebuild) | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/app-emulation/libvirt/libvirt-6.0.0.ebuild b/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild index 3c740c9ed174..477f8f977c06 100644 --- a/app-emulation/libvirt/libvirt-6.0.0.ebuild +++ b/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild @@ -218,20 +218,6 @@ src_prepare() { default - if [[ ${PV} = *9999* ]]; then - # Reinitialize submodules as this is required for gnulib's bootstrap - git submodule init - # git checkouts require bootstrapping to create the configure script. - # Additionally the submodules must be cloned to the right locations - # bug #377279 - ./bootstrap || die "bootstrap failed" - ( - git submodule status .gnulib | awk '{ print $1 }' - git hash-object bootstrap.conf - git ls-tree -d HEAD gnulib/local | awk '{ print $3 }' - ) >.git-module-status - fi - # Tweak the init script: cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \ @@ -296,6 +282,7 @@ my_src_configure() { --disable-werror --localstatedir=/var + --with-runstatedir=/run --enable-dependency-tracking ) @@ -306,12 +293,6 @@ my_src_configure() { fi econf "${myeconfargs[@]}" - - if [[ ${PV} = *9999* ]]; then - # Restore gnulib's config.sub and config.guess - # bug #377279 - (cd "${S}"/.gnulib && git reset --hard > /dev/null) - fi } my_src_test() { @@ -336,6 +317,7 @@ my_src_install() { # libvirtd is able to create them on demand rm -rf "${D}"/etc/sysconfig rm -rf "${D}"/var + rm -rf "${D}"/run newbashcomp "${S}/tools/bash-completion/vsh" virsh bashcomp_alias virsh virt-admin |