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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F1305158095 for ; Sat, 27 Aug 2022 23:55:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6025E0A89; Sat, 27 Aug 2022 23:55:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C8678E0A89 for ; Sat, 27 Aug 2022 23:55:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E8D24341504 for ; Sat, 27 Aug 2022 10:53:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 358FF576 for ; Sat, 27 Aug 2022 10:53:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1661597566.99201b14faf305a88326bbb59343cc4e3b272d1c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/grass/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/grass/grass-7.8.7-r1.ebuild sci-geosciences/grass/grass-7.8.7-r2.ebuild sci-geosciences/grass/grass-8.0.2-r1.ebuild sci-geosciences/grass/grass-8.0.2-r2.ebuild sci-geosciences/grass/grass-8.2.0-r1.ebuild sci-geosciences/grass/grass-8.2.0-r2.ebuild sci-geosciences/grass/grass-9999.ebuild X-VCS-Directories: sci-geosciences/grass/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 99201b14faf305a88326bbb59343cc4e3b272d1c X-VCS-Branch: master Date: Sat, 27 Aug 2022 10:53:34 +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: 85fdbcad-ac4c-406b-bbb4-3a241693af01 X-Archives-Hash: f22da19d6b2f7b4f011ed426b6bf6610 commit: 99201b14faf305a88326bbb59343cc4e3b272d1c Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Sat Aug 27 08:04:49 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Aug 27 10:52:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99201b14 sci-geosciences/grass: don't call eautoreconf Upstream have their own header which autoheader conflicts with. Just use the dist tarball's build system files instead. Closes: https://bugs.gentoo.org/866554 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/27030 Signed-off-by: Sam James gentoo.org> .../grass/{grass-7.8.7-r1.ebuild => grass-7.8.7-r2.ebuild} | 8 ++++++-- .../grass/{grass-8.0.2-r1.ebuild => grass-8.0.2-r2.ebuild} | 8 ++++++-- .../grass/{grass-8.2.0-r1.ebuild => grass-8.2.0-r2.ebuild} | 8 ++++++-- sci-geosciences/grass/grass-9999.ebuild | 8 ++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/sci-geosciences/grass/grass-7.8.7-r1.ebuild b/sci-geosciences/grass/grass-7.8.7-r2.ebuild similarity index 96% rename from sci-geosciences/grass/grass-7.8.7-r1.ebuild rename to sci-geosciences/grass/grass-7.8.7-r2.ebuild index d254c88caf17..2055352416fa 100644 --- a/sci-geosciences/grass/grass-7.8.7-r1.ebuild +++ b/sci-geosciences/grass/grass-7.8.7-r2.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="sqlite" # bug 572440 WX_GTK_VER="3.0-gtk3" -inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg +inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg MY_PM=${PN}$(ver_cut 1-2 ${PV}) MY_PM=${MY_PM/.} @@ -116,7 +116,11 @@ src_prepare() { sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die default - eautoreconf + + # When patching the build system, avoid running autoheader here. The file + # config.in.h is maintained manually upstream. Changes to it may lead to + # undefined behavior. See bug #866554. + # AT_NOEAUTOHEADER=1 eautoreconf ebegin "Fixing python shebangs" python_fix_shebang -q "${S}" diff --git a/sci-geosciences/grass/grass-8.0.2-r1.ebuild b/sci-geosciences/grass/grass-8.0.2-r2.ebuild similarity index 96% rename from sci-geosciences/grass/grass-8.0.2-r1.ebuild rename to sci-geosciences/grass/grass-8.0.2-r2.ebuild index 4bb9a92f3ba1..64fdec42f03c 100644 --- a/sci-geosciences/grass/grass-8.0.2-r1.ebuild +++ b/sci-geosciences/grass/grass-8.0.2-r2.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="sqlite" # bug 572440 WX_GTK_VER="3.0-gtk3" -inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg +inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" HOMEPAGE="https://grass.osgeo.org/" @@ -129,7 +129,11 @@ src_prepare() { sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die default - eautoreconf + + # When patching the build system, avoid running autoheader here. The file + # config.in.h is maintained manually upstream. Changes to it may lead to + # undefined behavior. See bug #866554. + # AT_NOEAUTOHEADER=1 eautoreconf ebegin "Fixing python shebangs" python_fix_shebang -q "${S}" diff --git a/sci-geosciences/grass/grass-8.2.0-r1.ebuild b/sci-geosciences/grass/grass-8.2.0-r2.ebuild similarity index 96% rename from sci-geosciences/grass/grass-8.2.0-r1.ebuild rename to sci-geosciences/grass/grass-8.2.0-r2.ebuild index 581cd7fa78cb..71dfdbf59d7f 100644 --- a/sci-geosciences/grass/grass-8.2.0-r1.ebuild +++ b/sci-geosciences/grass/grass-8.2.0-r2.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="sqlite" # bug 572440 WX_GTK_VER="3.0-gtk3" -inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg +inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" HOMEPAGE="https://grass.osgeo.org/" @@ -129,7 +129,11 @@ src_prepare() { sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die default - eautoreconf + + # When patching the build system, avoid running autoheader here. The file + # config.in.h is maintained manually upstream. Changes to it may lead to + # undefined behavior. See bug #866554. + # AT_NOEAUTOHEADER=1 eautoreconf ebegin "Fixing python shebangs" python_fix_shebang -q "${S}" diff --git a/sci-geosciences/grass/grass-9999.ebuild b/sci-geosciences/grass/grass-9999.ebuild index 8b286969e78a..7b5ec1408e74 100644 --- a/sci-geosciences/grass/grass-9999.ebuild +++ b/sci-geosciences/grass/grass-9999.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="sqlite" # bug 572440 WX_GTK_VER="3.0-gtk3" -inherit autotools desktop python-single-r1 toolchain-funcs wxwidgets xdg +inherit desktop python-single-r1 toolchain-funcs wxwidgets xdg DESCRIPTION="A free GIS with raster and vector functionality, as well as 3D vizualization" HOMEPAGE="https://grass.osgeo.org/" @@ -124,7 +124,11 @@ src_prepare() { sed -e "s:= python3:= ${EPYTHON}:" -i "${S}/include/Make/Platform.make.in" || die default - eautoreconf + + # When patching the build system, avoid running autoheader here. The file + # config.in.h is maintained manually upstream. Changes to it may lead to + # undefined behavior. See bug #866554. + # AT_NOEAUTOHEADER=1 eautoreconf ebegin "Fixing python shebangs" python_fix_shebang -q "${S}"