gentoo resync : 25.08.2020

4 files changed, 19 insertions, 69 deletions

diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 5b3657c16116..7c1ae3db9b9b 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,7 +1,6 @@
-AUX gn-gen-r1.patch 2045 BLAKE2B dcc370a2625f59475cc5c818800e5b8aa6d3ff0b24a356dc7defb42041ce525230fa691d0ead08ec32581aebda188121bd9115985a3d2bda65bff38557cbdd08 SHA512 77ea25769255879903556961446c731cbc609e911288f64f0600dfc364e2a05896251c3e02b241f94072b2a67c4a6fb7541f7bf7f409339a13902446476c2993
 AUX gn-gen-r4.patch 1559 BLAKE2B b92f487d4153ebd885d9cb1ca6889ca52b5afcccdb9a781fae568b861152a2cc3d9e61d5c406c5365311337a131fa99447528011af511b7aadd0975f692fe85b SHA512 b286651983f94894faf992da12a1ed51776c8207275e1b1e1776d0caf83615b02cb3d57198aec8b3736944b9cb8749028f79ebc7a700dd30babf122cfe5884d3
-DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281
 DIST gn-0.1726.tar.xz 663480 BLAKE2B 26920a1594e9cc664293efaeaa8725568b78ecc1f2ac8c9a3cd27333e5fe89f1fa5bdee9e42c408f3c4a7cfb630e79220926c5694e31131d3e7627be49b5d6b2 SHA512 3e93ba02f251386c4aa320a45b8a045c2a1fa686a8f170455f3c06bb25b1a628c44530ae2e56bcbb2ff4b2a84dd065d54dde90955a55a325a8d219acce69ec2f
-EBUILD gn-0.1463.ebuild 1034 BLAKE2B b415c7f196a387de4d3460b9b56f4546a76da2c400d246d14cb9e56ca2eb30c3aa8647b5f58ba73c51f7be41793fd799ffc0152a70f81d47c40407eb2e9756f7 SHA512 8a02e407c0a6b78107932705df99ffc1d8180f66f5d3e23ef3c3121d6d42434ba176012ede5ef1b21d47a3a3bda61578af7165d177c4f8d5b1350af0f57a1790
-EBUILD gn-0.1726.ebuild 1269 BLAKE2B 4228d3b89f26c9922e8f4163436d98fa275706f07e66dc2559c4f02d2c6da0b8d1f3e88f027a4e7e9d8f51bde2b5dd1f832160024c755baa5dc31327e984adbf SHA512 6e52b38170bfd5a9937ef65f0812e273c4507f4dadcb97a70cd9ab08afaa6892395de551e5bd060652c31d873c862e6ea81dbfd59c7429103f956be70490a9b5
+DIST gn-0.1807.tar.xz 682644 BLAKE2B 5beb3c03b0ae467cb98eff2069ef6e4355cba56c57e2717139b698fa563efc404dd1cf0b3fd196f432ca3a13b0402e895b46407cb90bc16b63963710fd5be060 SHA512 82f468e389d08a46e582f816d056813af9bfc810ad0bd84f02731c17c0e2c6140a62e827b8a3c5f89eef467f9bcfc2e88dd7aed325a7955d8584e753fcd09103
+EBUILD gn-0.1726.ebuild 1268 BLAKE2B cbd02136dd154f3329f31d5faf527e6a55e84502d594128141961ad714ce35921e1f04fe758fb55f76221247be7848d0757a659308a5af73329ec1c753af5051 SHA512 fe5e6c500d344018445167db6be97380885e4386935e6419aa3be491a956b61fa6a95240c4c093ae1c055967b9f3cbc61a243cd6ff05fef14cddf46f9bc63732
+EBUILD gn-0.1807.ebuild 1272 BLAKE2B 01d94736cd1d2674605c9b097452e6e2bfb096f9a3f81b9a85ec83e5eeb23033624916787cfb9a5047dbfdd544dd77cf1fd2242dc61bc3f0c936c78a110ab8b2 SHA512 13ab3b60df643fa8596b1990e5eb6e1506ac4a73a9453b7652a1d055a706b7b69ba700b2948d1429734d91da284fb6a07015de78657ac6f92ca8688f37696b81
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/files/gn-gen-r1.patch b/dev-util/gn/files/gn-gen-r1.patch
deleted file mode 100644
index 77fdefcf222d..000000000000
--- a/dev-util/gn/files/gn-gen-r1.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/build/gen.py b/build/gen.py
-index 76f88e84..5e088b2a 100755
---- a/build/gen.py
-+++ b/build/gen.py
-@@ -326,9 +326,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-     if options.debug:
-       cflags.extend(['-O0', '-g'])
-     else:
--      cflags.append('-DNDEBUG')
--      cflags.append('-O3')
--      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.
-@@ -340,14 +337,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-         # Garbage collection is done by default on aix.
-         ldflags.append('-Wl,--gc-sections')
- 
--      # Omit all symbol information from the output file.
--      if platform.is_darwin():
--        ldflags.append('-Wl,-S')
--      elif platform.is_aix():
--        ldflags.append('-Wl,-s')
--      else:
--        ldflags.append('-Wl,-strip-all')
--
-       # Enable identical code-folding.
-       if options.use_icf:
-         ldflags.append('-Wl,--icf=all')
-@@ -356,26 +345,17 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
-         '-D_FILE_OFFSET_BITS=64',
-         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
-         '-pthread',
--        '-pipe',
-         '-fno-exceptions',
-         '-fno-rtti',
-     ])
-     cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
-+    ldflags.append('-pthread')
- 
-     if platform.is_linux():
-       if linux_sysroot:
-         # Use the sid sysroot that UpdateLinuxSysroot() downloads.
-         cflags.append('--sysroot=' + linux_sysroot)
-         ldflags.append('--sysroot=' + linux_sysroot)
--      ldflags.extend([
--          '-static-libstdc++',
--          '-Wl,--as-needed',
--      ])
--      libs.extend([
--          # These are needed by libc++.
--          '-ldl',
--          '-lpthread',
--      ])
-     elif platform.is_darwin():
-       min_mac_version_flag = '-mmacosx-version-min=10.9'
-       cflags.append(min_mac_version_flag)
diff --git a/dev-util/gn/gn-0.1726.ebuild b/dev-util/gn/gn-0.1726.ebuild
index aa2740074a01..5f6a1e3c26f2 100644
--- a/dev-util/gn/gn-0.1726.ebuild
+++ b/dev-util/gn/gn-0.1726.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
 IUSE="vim-syntax"
 
 BDEPEND="
diff --git a/dev-util/gn/gn-0.1463.ebuild b/dev-util/gn/gn-0.1807.ebuild
index 6ef882d71205..ac1d4f6df4be 100644
--- a/dev-util/gn/gn-0.1463.ebuild
+++ b/dev-util/gn/gn-0.1807.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2018-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,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.gz"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+IUSE="vim-syntax"
 
 BDEPEND="
 	${PYTHON_DEPS}
@@ -20,7 +21,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/gn-gen-r1.patch
+	"${FILESDIR}"/gn-gen-r4.patch
 )
 
 pkg_setup() {
@@ -30,12 +31,14 @@ pkg_setup() {
 src_configure() {
 	python_setup
 	tc-export AR CC CXX
-	set -- ${EPYTHON} build/gen.py --no-sysroot --no-last-commit-position
-	echo "$@"
+	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
@@ -53,4 +56,9 @@ src_test() {
 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
 }