commit:     fc1c525c544f7c4e4bc4a51ab71f7755e592eeef
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 15 21:11:24 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 21:18:23 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1c525c

dev-util/github-cli: drop now-obsolete flag mangling

The real issue is intrinsic to Go (or cgo, anyway) and so we shouldn't
do it per-package, but rather in go-env.eclass. That's done now, so
drop the package-local workaround.

Bug: https://bugs.gentoo.org/924496
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/github-cli/github-cli-2.27.0.ebuild | 9 +--------
 dev-util/github-cli/github-cli-2.31.0.ebuild | 9 +--------
 dev-util/github-cli/github-cli-2.32.1.ebuild | 9 +--------
 dev-util/github-cli/github-cli-2.33.0.ebuild | 9 +--------
 dev-util/github-cli/github-cli-2.42.0.ebuild | 9 +--------
 dev-util/github-cli/github-cli-2.52.0.ebuild | 9 +--------
 dev-util/github-cli/github-cli-9999.ebuild   | 9 +--------
 7 files changed, 7 insertions(+), 56 deletions(-)

diff --git a/dev-util/github-cli/github-cli-2.27.0.ebuild 
b/dev-util/github-cli/github-cli-2.27.0.ebuild
index 49f74d520f92..4484ca69c4ef 100644
--- a/dev-util/github-cli/github-cli-2.27.0.ebuild
+++ b/dev-util/github-cli/github-cli-2.27.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit bash-completion-r1 flag-o-matic go-module
+inherit bash-completion-r1 go-module
 
 DESCRIPTION="GitHub CLI"
 HOMEPAGE="https://github.com/cli/cli";
@@ -25,13 +25,6 @@ RDEPEND=">=dev-vcs/git-1.7.3"
 RESTRICT="test"
 
 src_unpack() {
-       # Filter LTO flags to avoid build failures.
-       filter-lto
-       # Filter '-ggdb3' flag to avoid build failures. bugs.gentoo.org/847991
-       filter-flags "-ggdb3"
-       # Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
-       unset LDFLAGS
-
        if [[ ${PV} == *9999 ]]; then
                git-r3_src_unpack
                go-module_live_vendor

diff --git a/dev-util/github-cli/github-cli-2.31.0.ebuild 
b/dev-util/github-cli/github-cli-2.31.0.ebuild
index 49f74d520f92..4484ca69c4ef 100644
--- a/dev-util/github-cli/github-cli-2.31.0.ebuild
+++ b/dev-util/github-cli/github-cli-2.31.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit bash-completion-r1 flag-o-matic go-module
+inherit bash-completion-r1 go-module
 
 DESCRIPTION="GitHub CLI"
 HOMEPAGE="https://github.com/cli/cli";
@@ -25,13 +25,6 @@ RDEPEND=">=dev-vcs/git-1.7.3"
 RESTRICT="test"
 
 src_unpack() {
-       # Filter LTO flags to avoid build failures.
-       filter-lto
-       # Filter '-ggdb3' flag to avoid build failures. bugs.gentoo.org/847991
-       filter-flags "-ggdb3"
-       # Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
-       unset LDFLAGS
-
        if [[ ${PV} == *9999 ]]; then
                git-r3_src_unpack
                go-module_live_vendor

diff --git a/dev-util/github-cli/github-cli-2.32.1.ebuild 
b/dev-util/github-cli/github-cli-2.32.1.ebuild
index 49f74d520f92..4484ca69c4ef 100644
--- a/dev-util/github-cli/github-cli-2.32.1.ebuild
+++ b/dev-util/github-cli/github-cli-2.32.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit bash-completion-r1 flag-o-matic go-module
+inherit bash-completion-r1 go-module
 
 DESCRIPTION="GitHub CLI"
 HOMEPAGE="https://github.com/cli/cli";
@@ -25,13 +25,6 @@ RDEPEND=">=dev-vcs/git-1.7.3"
 RESTRICT="test"
 
 src_unpack() {
-       # Filter LTO flags to avoid build failures.
-       filter-lto
-       # Filter '-ggdb3' flag to avoid build failures. bugs.gentoo.org/847991
-       filter-flags "-ggdb3"
-       # Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
-       unset LDFLAGS
-
        if [[ ${PV} == *9999 ]]; then
                git-r3_src_unpack
                go-module_live_vendor

diff --git a/dev-util/github-cli/github-cli-2.33.0.ebuild 
b/dev-util/github-cli/github-cli-2.33.0.ebuild
index 49f74d520f92..4484ca69c4ef 100644
--- a/dev-util/github-cli/github-cli-2.33.0.ebuild
+++ b/dev-util/github-cli/github-cli-2.33.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit bash-completion-r1 flag-o-matic go-module
+inherit bash-completion-r1 go-module
 
 DESCRIPTION="GitHub CLI"
 HOMEPAGE="https://github.com/cli/cli";
@@ -25,13 +25,6 @@ RDEPEND=">=dev-vcs/git-1.7.3"
 RESTRICT="test"
 
 src_unpack() {
-       # Filter LTO flags to avoid build failures.
-       filter-lto
-       # Filter '-ggdb3' flag to avoid build failures. bugs.gentoo.org/847991
-       filter-flags "-ggdb3"
-       # Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
-       unset LDFLAGS
-
        if [[ ${PV} == *9999 ]]; then
                git-r3_src_unpack
                go-module_live_vendor

diff --git a/dev-util/github-cli/github-cli-2.42.0.ebuild 
b/dev-util/github-cli/github-cli-2.42.0.ebuild
index 49f74d520f92..4484ca69c4ef 100644
--- a/dev-util/github-cli/github-cli-2.42.0.ebuild
+++ b/dev-util/github-cli/github-cli-2.42.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit bash-completion-r1 flag-o-matic go-module
+inherit bash-completion-r1 go-module
 
 DESCRIPTION="GitHub CLI"
 HOMEPAGE="https://github.com/cli/cli";
@@ -25,13 +25,6 @@ RDEPEND=">=dev-vcs/git-1.7.3"
 RESTRICT="test"
 
 src_unpack() {
-       # Filter LTO flags to avoid build failures.
-       filter-lto
-       # Filter '-ggdb3' flag to avoid build failures. bugs.gentoo.org/847991
-       filter-flags "-ggdb3"
-       # Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
-       unset LDFLAGS
-
        if [[ ${PV} == *9999 ]]; then
                git-r3_src_unpack
                go-module_live_vendor

diff --git a/dev-util/github-cli/github-cli-2.52.0.ebuild 
b/dev-util/github-cli/github-cli-2.52.0.ebuild
index 49f74d520f92..4484ca69c4ef 100644
--- a/dev-util/github-cli/github-cli-2.52.0.ebuild
+++ b/dev-util/github-cli/github-cli-2.52.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit bash-completion-r1 flag-o-matic go-module
+inherit bash-completion-r1 go-module
 
 DESCRIPTION="GitHub CLI"
 HOMEPAGE="https://github.com/cli/cli";
@@ -25,13 +25,6 @@ RDEPEND=">=dev-vcs/git-1.7.3"
 RESTRICT="test"
 
 src_unpack() {
-       # Filter LTO flags to avoid build failures.
-       filter-lto
-       # Filter '-ggdb3' flag to avoid build failures. bugs.gentoo.org/847991
-       filter-flags "-ggdb3"
-       # Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
-       unset LDFLAGS
-
        if [[ ${PV} == *9999 ]]; then
                git-r3_src_unpack
                go-module_live_vendor

diff --git a/dev-util/github-cli/github-cli-9999.ebuild 
b/dev-util/github-cli/github-cli-9999.ebuild
index a6d2c60b5a03..2ec1463144a6 100644
--- a/dev-util/github-cli/github-cli-9999.ebuild
+++ b/dev-util/github-cli/github-cli-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit bash-completion-r1 flag-o-matic go-module
+inherit bash-completion-r1 go-module
 
 DESCRIPTION="GitHub CLI"
 HOMEPAGE="https://github.com/cli/cli";
@@ -25,13 +25,6 @@ RDEPEND=">=dev-vcs/git-1.7.3"
 RESTRICT="test"
 
 src_unpack() {
-       # Filter LTO flags to avoid build failures.
-       filter-lto
-       # Filter '-ggdb3' flag to avoid build failures. bugs.gentoo.org/847991
-       filter-flags "-ggdb3"
-       # Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
-       unset LDFLAGS
-
        if [[ ${PV} == *9999 ]]; then
                git-r3_src_unpack
                go-module_live_vendor

Reply via email to