commit:     e268e3aca20a867b8ed350d3e5b1679bc8222a15
Author:     Michal Privoznik <mprivozn <AT> redhat <DOT> com>
AuthorDate: Mon Feb 10 12:49:23 2020 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 15:59:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e268e3ac

app-emulation/libvirt-9999: Drop gnulib dance

Libvirt just dropped gnulib submodule and therefore all steps the
live ebuild took to make gnulib happy are no longer necessary.

Signed-off-by: Michal Privoznik <mprivozn <AT> redhat.com>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 app-emulation/libvirt/libvirt-9999.ebuild | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/app-emulation/libvirt/libvirt-9999.ebuild 
b/app-emulation/libvirt/libvirt-9999.ebuild
index e8d19df4415..648922f96f2 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -217,20 +217,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' '')/" \
@@ -304,12 +290,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() {

Reply via email to