From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E1907138351 for ; Mon, 10 Feb 2020 16:04:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 049E1E08F7; Mon, 10 Feb 2020 16:04:29 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E077AE08F7 for ; Mon, 10 Feb 2020 16:04:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EEE4534E9A3 for ; Mon, 10 Feb 2020 16:04:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6279110D for ; Mon, 10 Feb 2020 16:04:24 +0000 (UTC) From: "Matthias Maier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthias Maier" Message-ID: <1581350340.e268e3aca20a867b8ed350d3e5b1679bc8222a15.tamiko@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/libvirt/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/libvirt/libvirt-9999.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: e268e3aca20a867b8ed350d3e5b1679bc8222a15 X-VCS-Branch: master Date: Mon, 10 Feb 2020 16:04:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ecf0a620-284f-4de3-bb3f-a11d9c15ee80 X-Archives-Hash: 7e56736b5e6d7b326fc199f9ff290336 commit: e268e3aca20a867b8ed350d3e5b1679bc8222a15 Author: Michal Privoznik redhat com> AuthorDate: Mon Feb 10 12:49:23 2020 +0000 Commit: Matthias Maier gentoo 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 redhat.com> Signed-off-by: Matthias Maier 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() {