app-emulation/libvirt-9999: Drop gnulib dance
authorMichal Privoznik <mprivozn@redhat.com>
Mon, 10 Feb 2020 12:49:23 +0000 (13:49 +0100)
committerMatthias Maier <tamiko@gentoo.org>
Mon, 10 Feb 2020 15:59:00 +0000 (09:59 -0600)
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@redhat.com>
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
app-emulation/libvirt/libvirt-9999.ebuild

index e8d19df4415c598b4106814c90cea2e76c1fdbac..648922f96f29de967358b1a1a691d31f4bec501d 100644 (file)
@@ -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() {