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>

diff --git a/app-emulation/libvirt/libvirt-6.0.0.ebuild b/app-emulation/libvirt/libvirt-6.0.0-r1.ebuild
similarity index 93%
rename from app-emulation/libvirt/libvirt-6.0.0.ebuild
rename to app-emulation/libvirt/libvirt-6.0.0-r1.ebuild
index 3c740c9ed1744db0b069f1e874bd78c232963454..477f8f977c060f82cc586e4fccdb8fbd415c97d7 100644 (file)
--- 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