gentoo resync : 22.12.2021

4 files changed, 2 insertions, 115 deletions

diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index ec9afb5c3367..ab64f6726d45 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,7 +1,4 @@
-AUX gn-gen-r4.patch 1559 BLAKE2B b92f487d4153ebd885d9cb1ca6889ca52b5afcccdb9a781fae568b861152a2cc3d9e61d5c406c5365311337a131fa99447528011af511b7aadd0975f692fe85b SHA512 b286651983f94894faf992da12a1ed51776c8207275e1b1e1776d0caf83615b02cb3d57198aec8b3736944b9cb8749028f79ebc7a700dd30babf122cfe5884d3
 AUX gn-gen-r5.patch 1563 BLAKE2B ff909ef01743ca36d866257ad3bc2a1ca7a4e894b6a0c7672d08d0e1cd412b1056477f77ab64c75fa67a5c21794cecdd87f6bb75ebd963fff0ee3599523c73f6 SHA512 bb18dc2900084ca15ee12addec56d32cce520cb0d229bddbb69e8da7cca144887a6eb7267ea449613505dca4cdeba8ef0e4e69595fc202289d2f3c5fed2e4971
-DIST gn-0.1807.tar.xz 682644 BLAKE2B 5beb3c03b0ae467cb98eff2069ef6e4355cba56c57e2717139b698fa563efc404dd1cf0b3fd196f432ca3a13b0402e895b46407cb90bc16b63963710fd5be060 SHA512 82f468e389d08a46e582f816d056813af9bfc810ad0bd84f02731c17c0e2c6140a62e827b8a3c5f89eef467f9bcfc2e88dd7aed325a7955d8584e753fcd09103
 DIST gn-0.1943.tar.xz 706792 BLAKE2B 51889ad85e86e702c2690c5c23010d666ef0467be92d982e6dea2eec2e20774c04425900cad64672c7782bf36e62984e612c04ff0f1c7e9598f2877270cf8504 SHA512 4e3270e13e35fa0ede3c81b563b72a9e9baee18b6412d32603d3c7a327315ceea86dc28c9c3b01c9e9f4d520e222dfeabe152f946eb0947d9285359568934864
-EBUILD gn-0.1807.ebuild 1270 BLAKE2B 8a5480578e8d7e7fca80018f33416ecd0b50fc5ef07ae4b6a230df73f1aab351c8fb094244ea2ecda1fa923d42ba9027d7c6d385ceb5b1d42eed037eb985d65d SHA512 314b48cfbdf1a7a73baac2d8e7e141bed9d740d7a75f9c7ebae372230c86f5bff6e1f288be248517f0473381ab95aad7805f7dbd83cc91f50b9da3ea8cd0093d
-EBUILD gn-0.1943.ebuild 1296 BLAKE2B aeabd2372704d1861b9cdab16e5b9ecfc5d9ae84419e80e7f170365aa757026cd81dab2f625f7141d40c27d39779b0b312556cfa8d5841874d25b42c3a63416b SHA512 6e6662163e194a72b7959725dc08d05b9b12a5f1d2ded55dc11609c34a4dd09e23afff049b1d31f81d338ffd36ca08977a5b2269dd733a9eb516d04a4d182625
+EBUILD gn-0.1943.ebuild 1294 BLAKE2B 702eebb55f4f625f6cf649a865e6801bb541249fe4d8abfbb2b4254dfb6557e8321304664ffe144794454014a6854ade8f90bca903568cb9a3aa41ff07947469 SHA512 28eac75e4ecd6d4e2323ce1ec9161ee5d80e10b1706edd6931ab9c5169b8c68d7e33af3aa9c061cd1f2c9397e312e82ec079d43846f83da1c0132d32393610bc
 MISC metadata.xml 221 BLAKE2B ce7615d8eda5f58e7729bf86156010821052ae580769c3be3922f1270f1211bc5cf297afc5c68db67a46c1c01450c08751fc3cda0995d62bbe60da64d21802d6 SHA512 6ffee27f859f923795e8ded3a5544a82473f72568e96475374b937adbf0963f81d46fbcf4752a9d4eef3f071cadd3dedf141f43802b58c6a788243c7f05114cf
diff --git a/dev-util/gn/files/gn-gen-r4.patch b/dev-util/gn/files/gn-gen-r4.patch
deleted file mode 100644
index 717c908f29dd..000000000000
--- a/dev-util/gn/files/gn-gen-r4.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ad008cd029c995226fef36554e2e3cc657ef1380 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sat, 14 Mar 2020 18:02:51 +0000
-Subject: [PATCH] Remove unwanted cflags/ldflags parameters
-
----
- build/gen.py | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/build/gen.py b/build/gen.py
-index bcd9f15d..b48e844c 100755
---- a/build/gen.py
-+++ b/build/gen.py
-@@ -288,11 +288,6 @@ def WriteGNNinja(path, platform, host, options):
-     if options.debug:
-       cflags.extend(['-O0', '-g'])
-     else:
--      cflags.append('-DNDEBUG')
--      cflags.append('-O3')
--      if options.no_strip:
--        cflags.append('-g')
--      ldflags.append('-O3')
-       # Use -fdata-sections and -ffunction-sections to place each function
-       # or data item into its own section so --gc-sections can eliminate any
-       # unused functions and data items.
-@@ -325,7 +320,6 @@ def WriteGNNinja(path, platform, host, options):
-         '-D_FILE_OFFSET_BITS=64',
-         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
-         '-pthread',
--        '-pipe',
-         '-fno-exceptions',
-         '-fno-rtti',
-         '-fdiagnostics-color',
-@@ -341,9 +335,6 @@ def WriteGNNinja(path, platform, host, options):
-       if not options.no_static_libstdcpp:
-         ldflags.append('-static-libstdc++')
- 
--      # This is needed by libc++.
--      if not platform.is_mingw():
--        libs.append('-ldl')
-     elif platform.is_darwin():
-       min_mac_version_flag = '-mmacosx-version-min=10.9'
-       cflags.append(min_mac_version_flag)
--- 
-2.24.1
-
diff --git a/dev-util/gn/gn-0.1807.ebuild b/dev-util/gn/gn-0.1807.ebuild
deleted file mode 100644
index caa1341fa845..000000000000
--- a/dev-util/gn/gn-0.1807.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2018-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit ninja-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
-HOMEPAGE="https://gn.googlesource.com/"
-SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
-IUSE="vim-syntax"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/ninja
-"
-
-PATCHES=(
-	"${FILESDIR}"/gn-gen-r4.patch
-)
-
-pkg_setup() {
-	:
-}
-
-src_configure() {
-	python_setup
-	tc-export AR CC CXX
-	unset CFLAGS
-	set -- ${EPYTHON} build/gen.py --no-last-commit-position --no-strip --no-static-libstdc++
-	echo "$@" >&2
-	"$@" || die
-	cat >out/last_commit_position.h <<-EOF || die
-	#ifndef OUT_LAST_COMMIT_POSITION_H_
-	#define OUT_LAST_COMMIT_POSITION_H_
-	#define LAST_COMMIT_POSITION_NUM ${PV##0.}
-	#define LAST_COMMIT_POSITION "${PV}"
-	#endif  // OUT_LAST_COMMIT_POSITION_H_
-	EOF
-}
-
-src_compile() {
-	eninja -C out gn
-}
-
-src_test() {
-	eninja -C out gn_unittests
-	out/gn_unittests || die
-}
-
-src_install() {
-	dobin out/gn
-	einstalldocs
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r misc/vim/{autoload,ftdetect,ftplugin,syntax}
-	fi
-}
diff --git a/dev-util/gn/gn-0.1943.ebuild b/dev-util/gn/gn-0.1943.ebuild
index 57230dc162ed..ef244f02caf3 100644
--- a/dev-util/gn/gn-0.1943.ebuild
+++ b/dev-util/gn/gn-0.1943.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~sultan/distfiles/dev-util/gn/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="vim-syntax"
 
 BDEPEND="