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 C24BB138350 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 97119E08ED; Mon, 10 Feb 2020 16:04:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 7F84BE08ED for ; Mon, 10 Feb 2020 16:04:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 0DEB634E9A6 for ; Mon, 10 Feb 2020 16:04:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 89F2912F 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: <1581350637.9d0cc6913081b83e692189b025b7f781e344a183.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-6.0.0-r1.ebuild app-emulation/libvirt/libvirt-6.0.0.ebuild X-VCS-Directories: app-emulation/libvirt/ X-VCS-Committer: tamiko X-VCS-Committer-Name: Matthias Maier X-VCS-Revision: 9d0cc6913081b83e692189b025b7f781e344a183 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: ba8733da-086e-4e75-a2c1-9449a1c9c0a8 X-Archives-Hash: c11740f27be48964a08eaae6d0711835 commit: 9d0cc6913081b83e692189b025b7f781e344a183 Author: Matthias Maier gentoo org> AuthorDate: Mon Feb 10 16:03:11 2020 +0000 Commit: Matthias Maier gentoo org> CommitDate: Mon Feb 10 16:03:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d0cc691 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 gentoo.org> ...ibvirt-6.0.0.ebuild => libvirt-6.0.0-r1.ebuild} | 22 ++-------------------- 1 file 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 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 3c740c9ed17..477f8f977c0 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