gentoo auto-resync : 20:10:2022 - 01:59:18

3 files changed, 4 insertions, 73 deletions

diff --git a/dev-util/github-cli/Manifest b/dev-util/github-cli/Manifest
index abb25bb9eb69..3ccadc560708 100644
--- a/dev-util/github-cli/Manifest
+++ b/dev-util/github-cli/Manifest
@@ -1,11 +1,8 @@
-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
-DIST github-cli-2.12.1-deps.tar.xz 76485020 BLAKE2B c2d7e31a2fba9c34fc75c8d8f6836accbd2029b8f6be51c4ffda3d96ec06b9f331700573ac8478550676ed9385b8bc34ffa02a81d91aec3bde4bece0addae668 SHA512 1aa684d5aad6c5da45d4e0d8fe2c282a563890d7f48260668b393b0e93674b5c75862a84c421c8600c92d09ebfe655baaa42e3e7a4dc2f7a0792384ea555b2fc
-DIST github-cli-2.12.1.tar.gz 717685 BLAKE2B b9782846185b8fd5295651cfdd082b987555edd0c3ae2ef7e0d69e100f331ea89e5ae9b8824af013f008677df2a0e8313b52cd7e0d95110884a62eb9e6e5c32e SHA512 508f02cfb12bec485a6123bf04056e879832a762d7563c73d1f006f4c382cad75cfb73ae74f66f9ed90b0cfd68956434f2100bab1dd7c93ec6d0d7b3a9d2c13f
 DIST github-cli-2.14.3-deps.tar.xz 77143036 BLAKE2B 7f06905270a7c9b17bbe8a83353c57da84cb365283fbb4bc488f2ce8873de79494adcf9d34aacd057d7610c3a68107f7fa19fcf74e885025a5e9f44ba49890a0 SHA512 da2b7d57160d22645b491fa8ffc93148c096a10b65aa9d4d4b8b4b1837460f3c5296d704e6f4fa0fd709d3f7c590cdf39c4c637c38b255c8b389ef106c35fb90
 DIST github-cli-2.14.3.tar.gz 716098 BLAKE2B 7b45f97859501be4e639584e287d2114b9ed87402d3f35cc56eebdef8bf2b3cf8b9ecff633cf44a822edf20a5000c38a5b1c38822b0bf670d6c4c9c4e5e1a052 SHA512 460f3c053c1f0bea458f7a891f2b1a4cbd68b754bc165e3b097215748fc220f96138cf010608092702c86403d4551b288faba4349a69ae0e92b93ef4564825b5
-EBUILD github-cli-2.11.3.ebuild 1624 BLAKE2B 8b7de36ee128f9873dca1923cc771036753b5ecd75de1b5e5a012e0fc25a79d4d866a5e113f86fd4d8ae04b7899c6709b200628950746635a4daa9789380cf7a SHA512 43f1b208a78258c22783d370e5133baf484402f2c7edfec2bfa90f81ceaf3e9ddbe19feeadbed523a63cd499bb80d29969d1c42cdefcf733951ac56b8057986e
-EBUILD github-cli-2.12.1.ebuild 1624 BLAKE2B f402ae15556c62bceac735cfed5691e0b4eaaea716f07b3e00b35c5190fa35613438c1a57024863b0cfae1fc1718219e83b183d5c426fc350733c94dd143db75 SHA512 e32dfb4c32a912da7ff5b10b752573408bd980fbe5318639fb36beff23830a2204ad1c743aea5377a140bff35bddefecc1080b38af8b8aa15258fd52096a2ae0
+DIST github-cli-2.18.0-deps.tar.xz 98885904 BLAKE2B 2ba1252ca1ddab0e0dda6dbbd6b262d19a701b6cb2a82420a29da5b08dab4369671f40adcdfb34760344d4d220bd91263cdefd7d57b92ce5770b2e682c6e4b44 SHA512 e9b1f87d4ec1c1e9d689df87c8a5d30180b0d60e074e292d262d0f204dc921bf09f13df8589892dccfde9ffd5579bd9c1c83169e36f6dc25b23ba3bfb2aa01be
+DIST github-cli-2.18.0.tar.gz 738480 BLAKE2B c56adae59ddbfa6693dff569c265db615e9609f7fee9942c349cb202d64f44ea1e2cccdb89632e65ebb954e133939e54053933b77782c741d768742403975e65 SHA512 3522d42016b165a8ffa5620bd2352023affceabb26d6c14ba5f5eeb5f42e3cfc002c71e7f0c1acbf4d626f0c3588c1609255802aabd1f4f700875ada82ef6826
 EBUILD github-cli-2.14.3.ebuild 1631 BLAKE2B 0534fbee7d0866ccf6b1c56dd7f4a61104403e83c54ac22a4d13617aeab22193adda2de47203d3876ffd3b9dae82b5db8fda5633145c3c109b2cc051e95c0114 SHA512 55f9c9df94a9c8ad27d1eb319988633e6f1809d4dad3a8b8d4785a6b47b79e85dc292d7d8309b8fc330f86d2057a2281898d26bcb2cbd43c8ee55657e0873ed3
+EBUILD github-cli-2.18.0.ebuild 1631 BLAKE2B 0534fbee7d0866ccf6b1c56dd7f4a61104403e83c54ac22a4d13617aeab22193adda2de47203d3876ffd3b9dae82b5db8fda5633145c3c109b2cc051e95c0114 SHA512 55f9c9df94a9c8ad27d1eb319988633e6f1809d4dad3a8b8d4785a6b47b79e85dc292d7d8309b8fc330f86d2057a2281898d26bcb2cbd43c8ee55657e0873ed3
 EBUILD github-cli-9999.ebuild 1617 BLAKE2B a87729766ea2024b042cf2da4d5eeae4ef982631aa6f33ba3eb17b339d662b58f48922d6a02c0570fb22c9124c382c81ed582e772f9c6162b6f481cd291fe963 SHA512 76004565ee008af52491dc297b2507a4dd0e1384a428daea01a2bb544daca450a661a49089897696fe0537ed60651a69f44f45378326d226297d93a1c1f4133d
 MISC metadata.xml 331 BLAKE2B 1ffd21cb61a7db81d5c8f1b3731dc6a23aa98e6db92e2af3101eefd99b18862a89bb42993cb770bc26307eb70c96966abee1bba45c73de31c1e47300caf170b3 SHA512 2a90a401ff9f5646bcb0a8e1b38bd95629f7b69d4fd485de5f5c32063cceb0d223b30696181d328e09c6f8191e8fbaabf81370f42577312c2eb8d22d9509d1b9
diff --git a/dev-util/github-cli/github-cli-2.11.3.ebuild b/dev-util/github-cli/github-cli-2.11.3.ebuild
deleted file mode 100644
index fdd2db7e3689..000000000000
--- a/dev-util/github-cli/github-cli-2.11.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit bash-completion-r1 flag-o-matic 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://github.com/ran-dall/portage-deps/raw/master/${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}"
-	# 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
-	# 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-2.12.1.ebuild b/dev-util/github-cli/github-cli-2.18.0.ebuild
index 77fd1c37e6b9..834906664386 100644
--- a/dev-util/github-cli/github-cli-2.12.1.ebuild
+++ b/dev-util/github-cli/github-cli-2.18.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 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 ~arm64 ~ppc64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv"
 	S="${WORKDIR}/cli-${PV}"
 fi