Adding metadata

4 files changed, 13 insertions, 69 deletions

diff --git a/dev-util/github-cli/Manifest b/dev-util/github-cli/Manifest
index 3ebc07fee176..aafc44154b04 100644
--- a/dev-util/github-cli/Manifest
+++ b/dev-util/github-cli/Manifest
@@ -1,4 +1,2 @@
-DIST github-cli-2.11.0-deps.tar.xz 76402168 BLAKE2B 210c9861199caf92aff566334530fe953cd66134219b88d83fc973920f9264b2343d1f3b16338b190b64333eaa825fd498e7e5011f03c87c2f8786316332e4f4 SHA512 f147e76cf0705d3e8da2296c038911c2b11e422d14dfdfce34bf31d0813189fba501878dcc5c37323b5ece37fa4948730c351c5438cc8a11e99677d2b8678801
-DIST github-cli-2.11.0.tar.gz 716133 BLAKE2B 10c35dd8dd52e930c8dbae32d4ad5e02f2cb17872f9f1a4652ca6be7df2f8d38b18b98a1cf3577a249830691431f3408e0c3e00fda588e8c35412e32efcf2597 SHA512 4cccaf9baf1486ab031ffc4b0caf96b0b8eb0f25b52a303cc642ff35586139c13727b20cc9d4dc90335ba5b630f8778c49c6d7dcfdeb709df8c0de536e033ada
-DIST github-cli-2.8.0-deps.tar.xz 157288896 BLAKE2B 92937cf3c0928c6b8b29e0731d7a94f1df59a59fcbebda9f5a71d9da01963581934fcb112675b648d46398b3b7b522a9c2f5d08103fd31acee77ecec50c79508 SHA512 b0bdc79ca14a5d8309bec336c36e3b95bc0f2aa868ee611fa87f295ac7e5ff24399971ff88109d3d399fedecc311ab10af0f708a812ff0277744c2dae3d80129
-DIST github-cli-2.8.0.tar.gz 700297 BLAKE2B 5a11d89532d57ecbe31a8e526d013f181f82f1c12148914f07f67ae20d6338ad7aa5aa25624136b276eb082f45c969da54744ce0d6398f0c22fe82805d635eab SHA512 c46248a4b2376ff9df07198e9c29bd37dcd6c3a8b50081bfe0686f329b2bec8087506b435a17161af59f06fa26cda630a473c3e9d5470f8cc0c6cf5e25d9cea7
+DIST github-cli-2.11.3-deps.tar.xz 76137064 BLAKE2B 6b8a224f8e0b05c32c8be83b4f5a0b05febb44b230c06ce0d14dfb5a814faf0361d24f32a5feb1ec348e9b80dd35635249bdf1febf6cd6202ba5ea1e3e6a3168 SHA512 f72909be8798a7efed8cb2ee2c37f51216056901fd285b4e2c894ebfc2f08194b99d846f2f0080da4c1c3359b47e36f7eece11b4bec93485da5330ad38c073f1
+DIST github-cli-2.11.3.tar.gz 716386 BLAKE2B dcb07cda11e03ffe75a9ec2fcb0ed33c1f2c6bb7599ed1b47ee9e1e0df609fa21ae2dd043be417cfee75dcb3686290f510c0fdffc0b1df08f816ab2ac79d940b SHA512 952cd7c2a327c7169e201a4aa7c26a0e5c09a1ecef51b8d7c620fa9a849c2e8cc61447333f785851487a68d058b869e10bb290188594bd2fb00b0384297bdfd8
diff --git a/dev-util/github-cli/github-cli-2.11.0.ebuild b/dev-util/github-cli/github-cli-2.11.3.ebuild
index ec899ad1ea48..fdd2db7e3689 100644
--- a/dev-util/github-cli/github-cli-2.11.0.ebuild
+++ b/dev-util/github-cli/github-cli-2.11.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit bash-completion-r1 go-module
+inherit bash-completion-r1 flag-o-matic go-module
 
 DESCRIPTION="GitHub CLI"
 HOMEPAGE="https://github.com/cli/cli"
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/cli/cli.git"
 else
 	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+	SRC_URI+=" https://github.com/ran-dall/portage-deps/raw/master/${P}-deps.tar.xz"
 	KEYWORDS="~amd64 ~riscv"
 	S="${WORKDIR}/cli-${PV}"
 fi
@@ -35,6 +35,10 @@ src_unpack() {
 
 src_compile() {
 	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
+	# Filter '-flto*' flags to avoid build failures.
+	filter-flags "-flto*"
+	# 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
 	# Once we set up cross compiling, this line will need to be adjusted
diff --git a/dev-util/github-cli/github-cli-2.8.0.ebuild b/dev-util/github-cli/github-cli-2.8.0.ebuild
deleted file mode 100644
index ec899ad1ea48..000000000000
--- a/dev-util/github-cli/github-cli-2.8.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 go-module
-
-DESCRIPTION="GitHub CLI"
-HOMEPAGE="https://github.com/cli/cli"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cli/cli.git"
-else
-	SRC_URI="https://github.com/cli/cli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
-	KEYWORDS="~amd64 ~riscv"
-	S="${WORKDIR}/cli-${PV}"
-fi
-
-LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0"
-SLOT="0"
-
-RDEPEND=">=dev-vcs/git-1.7.3"
-
-RESTRICT="test"
-
-src_unpack() {
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-		go-module_live_vendor
-	else
-		go-module_src_unpack
-	fi
-}
-
-src_compile() {
-	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
-	# Go LDFLAGS are not the same as GCC/Binutils LDFLAGS
-	unset LDFLAGS
-	# Once we set up cross compiling, this line will need to be adjusted
-	# to compile for the target.
-	# Everything else in this function happens on the host.
-	emake
-
-	einfo "Building man pages"
-	emake manpages
-
-	einfo "Building completions"
-	go run ./cmd/gh completion -s bash > gh.bash-completion || die
-	go run ./cmd/gh completion -s zsh > gh.zsh-completion || die
-}
-
-src_install() {
-	dobin bin/gh
-	dodoc README.md
-
-	doman share/man/man?/gh*.?
-
-	newbashcomp gh.bash-completion gh
-	insinto /usr/share/zsh/site-functions
-	newins gh.zsh-completion _gh
-}
diff --git a/dev-util/github-cli/github-cli-9999.ebuild b/dev-util/github-cli/github-cli-9999.ebuild
index ec899ad1ea48..e08b4ff2cbbe 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 go-module
+inherit bash-completion-r1 flag-o-matic go-module
 
 DESCRIPTION="GitHub CLI"
 HOMEPAGE="https://github.com/cli/cli"
@@ -35,6 +35,10 @@ src_unpack() {
 
 src_compile() {
 	[[ ${PV} == *9999 ]] || export GH_VERSION="v${PV}"
+	# Filter '-flto*' flags to avoid build failures.
+	filter-flags "-flto*"
+	# 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
 	# Once we set up cross compiling, this line will need to be adjusted