gentoo resync : 08.01.2021

5 files changed, 31 insertions, 12 deletions

diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 5aec6274178e..6c58719d49d5 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -3,7 +3,7 @@ AUX gdb-9.1-ia64.patch 305 BLAKE2B 06201f81db7b3b8059e818bf263fd1090927b3d23bda3
 AUX gdb-9.2-sim-ppc-fno-common.patch 2581 BLAKE2B 56115a341ffefada00997bdba890dcf065b315c50e4ccf8f5cd8ccca5fd496b64ce0049819f6fd2bace42bb6391b4a9e1e9578ff233286a09704b67d5bb960d8 SHA512 ae2610ed3ce7c55526979fa9157aff7a46b008bf66b1a304e37c4ce20be74bc762de44a464238c37e0652e7c4bb5915f62c355d1a522d71b22a5819c13ce6e3d
 DIST gdb-10.1.tar.xz 21507112 BLAKE2B 69d79cd667ecb6e936b41a03817ade5dd9b761f97bc123d668b5f968d123c37d048fc8ec1289151e989f01bb01a43cc3d8b5b54f1807f1e3eb5f43e6bf0aa55b SHA512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537
 DIST gdb-9.2.tar.xz 20979436 BLAKE2B e83468f2d2fdcf4a7eb2943564750c7e9e9fa19b00bd832a9c149ad06b199cc7d6e7b8808d552e5f0e9e4f701a9262faf6b0b46ed4e0b4ecd3a0303d873d6d9a SHA512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274
-EBUILD gdb-10.1.ebuild 7156 BLAKE2B 86a20db064f9b1df327b6e712a27c89edbc54e8e4bec9a00606e9c6426d3f2a70b4ea0f9e2aafb35acb622bffc701d77ddb74d0af104403f69c0a1e615e2cd00 SHA512 c5702e966c4ccbf18b56d8748f9e77637d21809036baf3a24a387bd6015ac3837dd40e1ba011fcf3458690a2e4d36a7dcc9aea70bab904ff0022e64fc83f952b
-EBUILD gdb-9.2.ebuild 7461 BLAKE2B b5fc2d421a64ec8e0e08e9c43e5009f4355083dee05041b42f4d08bddc968297b310949bbdfe6871343b92f29889dfccc56cb304df1d5c1a4b37f79d3b88b4b5 SHA512 c4a583574c6ac0e9121991778a89df122ecc280974394aca2b5e107ebf049a84d35e72a3a52e2bd48f7b0ad1f2c22b4c40e9443dd885f70da0934d845e18b745
-EBUILD gdb-9999.ebuild 7164 BLAKE2B 3b55f8a4e0b37f886398da704d24a602c4e853bccee9a1ea8a213acce6de9b60d9c9ac46777ce0f2f89805962f1441df655bfabd29871ebac2139b67bb6bc2fd SHA512 e5dcfca04991c32405e691dcb352dfec1e56521393af778016dee9958c4d6777856224d2279901c5a6712fa723ecce162c6b379798e31580cef0517b6a90e551
-MISC metadata.xml 1110 BLAKE2B 9958c755c2276b00b47550593e37bda9cdd5050834650654e796b9aca622fd4e7b094e80e2648b622fdb46943d3dca00208f11e1ea0c9bfdb32ad891b9acaad1 SHA512 f58a0166980a8ef71d36872736afc8f86ded7f731864cc3d302e84818c3afc01eca49748e4533bc305c2d3d73521a008260097b9533dd3392a451528f3794a0d
+EBUILD gdb-10.1.ebuild 7469 BLAKE2B 63e5171252340a76a3981b9eb33acec060b1adc3774848b131b8b04ba3ead8317dfc7e7a1efd2a286bb7a41355d9a326b05774966cb81984ddad126eb8e77991 SHA512 c239e036e77044c50881181f176b2c243a28cfba92e3e0235c85385ae3d125a258a8ae029208b8db47048ba63ee7da485750598c6f6fac8556d8857858377e8b
+EBUILD gdb-9.2.ebuild 7450 BLAKE2B b8221d0500d8449f154e6d7a721984a81027344cc0a1fac5da00edd62120f1df1502833241c2f7bf0a67d4af554ca37ee579eb2d935d54a985a09363a3ed2583 SHA512 9bccab2de9081ad42ad2ffb05b67ebb8c09f43e5d86d9946eb194689fe5c81f3e2b97211fede00e9d22cd6640eff1bf56f43e26584de98634df8ce2e4cae5c84
+EBUILD gdb-9999.ebuild 7477 BLAKE2B bdf5877a262946d8e98f573e6477b3c1610203c001a582ccad3e91df02f198c673a2cd2626bf21a5d78755dd0422ced81bccaa0f2d6ae7af97776e4e3a793269 SHA512 24107459db353cd31ef54e8b1f77786f56beb07c51dd9f712dd79d16a3fae471933aa55850d5533bb6ec93c8aa8201c076a0220ae6b81df570090f45649bd0cb
+MISC metadata.xml 1185 BLAKE2B 524a340429b56430dcebf53fb141336f5c7b785865a9b2f407c548a79b0babb60b7771687a41a048d2877ced1d81ce2ab0e602bc8745abe01cce4d3baff48ea7 SHA512 cbd91ca72a0284fdb5b848af05f05f7e6895f68a35ecabe841c0b3d32aade02cc46f2bcc13c6a6a991097500487666410fff51959b38e278e1adc21d5691b01f
diff --git a/sys-devel/gdb/gdb-10.1.ebuild b/sys-devel/gdb/gdb-10.1.ebuild
index 44862575ac40..4ceff54454c8 100644
--- a/sys-devel/gdb/gdb-10.1.ebuild
+++ b/sys-devel/gdb/gdb-10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,9 +44,9 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
-IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
+IUSE="cet +client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	|| ( client server )
@@ -129,6 +129,15 @@ src_configure() {
 		--disable-werror
 		# Disable modules that are in a combined binutils/gdb tree. #490566
 		--disable-{binutils,etc,gas,gold,gprof,ld}
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
 	)
 	local sysroot="${EPREFIX}/usr/${CTARGET}"
 	is_cross && myconf+=(
diff --git a/sys-devel/gdb/gdb-9.2.ebuild b/sys-devel/gdb/gdb-9.2.ebuild
index 18bd40687e66..78740b7e1b64 100644
--- a/sys-devel/gdb/gdb-9.2.ebuild
+++ b/sys-devel/gdb/gdb-9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,7 +44,7 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
diff --git a/sys-devel/gdb/gdb-9999.ebuild b/sys-devel/gdb/gdb-9999.ebuild
index c423dd7af766..c257b4df7b7d 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,9 +44,9 @@ SRC_URI="${SRC_URI}
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
 if [[ ${PV} != 9999* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
-IUSE="+client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
+IUSE="cet +client lzma multitarget nls +python +server source-highlight test vanilla xml xxhash"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
 	|| ( client server )
@@ -129,6 +129,15 @@ src_configure() {
 		--disable-werror
 		# Disable modules that are in a combined binutils/gdb tree. #490566
 		--disable-{binutils,etc,gas,gold,gprof,ld}
+
+		# avoid automagic dependency on (currently prefix) systems
+		# systems with debuginfod library, bug #754753
+		--without-debuginfod
+
+		# Allow user to opt into CET for host libraries.
+		# Ideally we would like automagic-or-disabled here.
+		# But the check does not quite work on i686: bug #760926.
+		$(use_enable cet)
 	)
 	local sysroot="${EPREFIX}/usr/${CTARGET}"
 	is_cross && myconf+=(
diff --git a/sys-devel/gdb/metadata.xml b/sys-devel/gdb/metadata.xml
index c0ef0493f2a0..9595bbc9f457 100644
--- a/sys-devel/gdb/metadata.xml
+++ b/sys-devel/gdb/metadata.xml
@@ -6,6 +6,7 @@
  <name>Gentoo Toolchain Project</name>
 </maintainer>
 <use>
+ <flag name="cet">Enable Intel Control-flow Enforcement Technology.</flag>
  <flag name="client">Install the main "gdb" program (most people want this)</flag>
  <flag name="lzma">Support lzma compression in ELF debug info</flag>
  <flag name="multitarget">Support all known targets in one gdb binary</flag>