gentoo resync : 25.11.2020

4 files changed, 23 insertions, 37 deletions

diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index 946a79ca3f75..2852a2c46f0f 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -1,9 +1,9 @@
 AUX gdb-8.3.1-verbose-build.patch 395 BLAKE2B e2e82307ceae64d16aa9b57a5e639eb5d217c4d977aed0847fdf125bb13ebc004906d9afb8e3f629c41efccca88df0040015e7799c1fd24de5fb50f62f5bbd90 SHA512 c2bb013e4fcabefddcd8042bd3cbb53471f83182cc8769fe0d19eed80ccc4a83bd84d120006fa25b3b7d0310dc2f2ec6b44a6ff74909cd312b7e491f371777a3
 AUX gdb-9.1-ia64.patch 305 BLAKE2B 06201f81db7b3b8059e818bf263fd1090927b3d23bda3d00891c751c62abe0faedc8a21acd4d97a6bcb0e397f31287b343e01627552c4e3df7fd8635e6b8d39b SHA512 e8219d0dccd192b47daab7de6ec8010ec39192225f29df0443bf54969dd6c39b59889a539a5a9ec0519c512377242a4311f3f3ba4dbbd9d8685ca5e617056ef8
 AUX gdb-9.2-sim-ppc-fno-common.patch 2581 BLAKE2B 56115a341ffefada00997bdba890dcf065b315c50e4ccf8f5cd8ccca5fd496b64ce0049819f6fd2bace42bb6391b4a9e1e9578ff233286a09704b67d5bb960d8 SHA512 ae2610ed3ce7c55526979fa9157aff7a46b008bf66b1a304e37c4ce20be74bc762de44a464238c37e0652e7c4bb5915f62c355d1a522d71b22a5819c13ce6e3d
-DIST gdb-9.1.tar.xz 20980824 BLAKE2B b84b1dc627d7ba697dfd76ba7c0f4f88f1725e1e1b83134d08cf53bf867ebfa07e1d01eff2acd9a57d22a779077bf6ed95d6098e8a58c4d86eaed034ca62ac30 SHA512 84cdd408d80a3fc5779de459c5b26154d31b329ebde7e3aa78799fb1eb245d8b64b8c8ee7242382a1dbd95b4e6f9d84fef41d12a0646aa75d3dee4709ea1f6e7
+DIST gdb-10.1.tar.xz 21507112 BLAKE2B 69d79cd667ecb6e936b41a03817ade5dd9b761f97bc123d668b5f968d123c37d048fc8ec1289151e989f01bb01a43cc3d8b5b54f1807f1e3eb5f43e6bf0aa55b SHA512 0dc54380435c6853db60f1e388b94836d294dfa9ad7f518385a27db4edd03cb970f8717d5f1e9c9a0d4a33d7fcf91bc2e5d6c9cf9e4b561dcc74e65b806c1537
 DIST gdb-9.2.tar.xz 20979436 BLAKE2B e83468f2d2fdcf4a7eb2943564750c7e9e9fa19b00bd832a9c149ad06b199cc7d6e7b8808d552e5f0e9e4f701a9262faf6b0b46ed4e0b4ecd3a0303d873d6d9a SHA512 73635f00f343117aa5e2436f1e1597099e2bfb31ef7bb162b273fa1ea282c3fa9b0f52762e70bfc7ad0334addb8d159e9ac7cbe5998ca4f755ea8cf90714d274
-EBUILD gdb-9.1.ebuild 7426 BLAKE2B 3e945db45755c81c0827b5ba88cd50a973a1b31b2fe1002c6952456305b23e74cf15b5883c66bad0b0dbe5a391cf339d5360a499783fece47a9a40d0b9b3149b SHA512 363f56c0cbcf235005ecfbe46c269bee068d99b75679c92d40e7608c631f0a51eedfd4163f865aae85749b9f994ca166535e711a5d5c7433b491091c6a3263ba
-EBUILD gdb-9.2.ebuild 7474 BLAKE2B 19765f828e406a95fc5781a11f30925b0c402fd80780846c58476dca027ed0cb2fe66d881e509c1947dd1d9b58c28d0e9fc175dc32aebc029469642ec582838b SHA512 2a164c4baeb4c356b091fe90e9bbb99b16a6117bc7a63a6810c4ea022216b3579384cedb3a3d291980ada3ea8b90ff7f749d1fcfc92fad907aa4bacffb933d96
-EBUILD gdb-9999.ebuild 7056 BLAKE2B 578a651d684da6f98fd6c0515863c1b90a4c32be826ed469490af1fb4d6b09f43d0a85bbc0bfe9b772e322bcf3598749c6b454d1868a3a6c02c30496995f9f39 SHA512 20277a9dfbf22c6fddf71924098fdb81eeb631bd574b33e674279dc1b13c66476b7cb63d552545a87ab7888473938684adf7ad200346244ba6aee5270bc1cf64
+EBUILD gdb-10.1.ebuild 7076 BLAKE2B cc0cbcde1cbf8c185d5ae39b83090724e413e663e3efd6a6f4482b9c8efa2e07b2e1da1621ad428819cea1898656f7f333c6ea38866b087bdfd2c9696840cde4 SHA512 6897fcde4d5becdad1b97a22ff10595c56aa50ff0d60d277d9f6499cc4b28e69986fbe67bba08341266b481e6bc8791c459993973a8aa43048aecdb0badb975f
+EBUILD gdb-9.2.ebuild 7469 BLAKE2B 9fcca08080e8fd0b31e85ad4e292988a13617ec826f0fea442a19b6244f245a6d9c0e3983d20fef97177e3cbe41528f062e21eb7e540f60bc88131576f6d8d06 SHA512 3f4e01a010783d72d68bcf3ffe478fdf1fb46a41b308673b943461651e5c1436fc76e6c7082e7e5611abc2a031e25e0a8b5c553f30e15aff1759c7348663c265
+EBUILD gdb-9999.ebuild 7076 BLAKE2B cc0cbcde1cbf8c185d5ae39b83090724e413e663e3efd6a6f4482b9c8efa2e07b2e1da1621ad428819cea1898656f7f333c6ea38866b087bdfd2c9696840cde4 SHA512 6897fcde4d5becdad1b97a22ff10595c56aa50ff0d60d277d9f6499cc4b28e69986fbe67bba08341266b481e6bc8791c459993973a8aa43048aecdb0badb975f
 MISC metadata.xml 1110 BLAKE2B 9958c755c2276b00b47550593e37bda9cdd5050834650654e796b9aca622fd4e7b094e80e2648b622fdb46943d3dca00208f11e1ea0c9bfdb32ad891b9acaad1 SHA512 f58a0166980a8ef71d36872736afc8f86ded7f731864cc3d302e84818c3afc01eca49748e4533bc305c2d3d73521a008260097b9533dd3392a451528f3794a0d
diff --git a/sys-devel/gdb/gdb-9.1.ebuild b/sys-devel/gdb/gdb-10.1.ebuild
index a9201f627dee..4805e0131ff3 100644
--- a/sys-devel/gdb/gdb-9.1.ebuild
+++ b/sys-devel/gdb/gdb-10.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit eutils flag-o-matic python-single-r1 toolchain-funcs
 
@@ -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 ~ppc-aix ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-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="
@@ -90,11 +90,8 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-8.3.1-verbose-build.patch
-	"${FILESDIR}"/${PN}-9.1-ia64.patch
 )
 
-GDB_BUILD_DIR="${WORKDIR}"/${P}-build
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
@@ -103,6 +100,7 @@ src_prepare() {
 	default
 
 	strip-linguas -u bfd/po opcodes/po
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
 }
 
 gdb_branding() {
@@ -139,7 +137,7 @@ src_configure() {
 
 	if use server && ! use client ; then
 		# just configure+build in the gdbserver subdir to speed things up
-		cd gdb/gdbserver
+		cd gdbserver
 		myconf+=( --program-transform-name='' )
 	else
 		# gdbserver only works for native targets (CHOST==CTARGET).
@@ -160,6 +158,7 @@ src_configure() {
 			--disable-install-libiberty
 			# Disable guile for now as it requires guile-2.x #562902
 			--without-guile
+			--enable-obsolete
 			# This only disables building in the readline subdir.
 			# For gdb itself, it'll use the system version.
 			--disable-readline
@@ -187,28 +186,14 @@ src_configure() {
 	# source-highlight is detected with pkg-config: bug #716558
 	export ac_cv_path_pkg_config_prog_path="$(tc-getPKG_CONFIG)"
 
-	mkdir "${GDB_BUILD_DIR}" || die
-	pushd "${GDB_BUILD_DIR}" || die
-		ECONF_SOURCE=${S}
-		econf "${myconf[@]}"
-	popd
-}
-
-src_compile() {
-	emake -C "${GDB_BUILD_DIR}"
-}
-
-src_test() {
-	emake -C "${GDB_BUILD_DIR}" check
+	econf "${myconf[@]}"
 }
 
 src_install() {
 	if use server && ! use client; then
-		emake -C "${GDB_BUILD_DIR}"/gdb/gdbserver DESTDIR="${D}" install
-	else
-		emake -C "${GDB_BUILD_DIR}" DESTDIR="${D}" install
+		cd gdbserver || die
 	fi
-
+	default
 	if use client; then
 		find "${ED}"/usr -name libiberty.a -delete || die
 	fi
@@ -236,7 +221,7 @@ src_install() {
 	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
 	# Only install if it exists due to the twisted behavior (see
 	# notes in src_configure above).
-	[[ -e "${GDB_BUILD_DIR}"/gdb/gdbserver/gdbreplay ]] && dobin "${GDB_BUILD_DIR}"/gdb/gdbserver/gdbreplay
+	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
 
 	if use client ; then
 		docinto gdb
@@ -247,7 +232,7 @@ src_install() {
 	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
 	if use server ; then
 		docinto gdbserver
-		dodoc gdb/gdbserver/{ChangeLog,README}
+		dodoc gdbserver/{ChangeLog,README}
 	fi
 
 	if [[ -n ${PATCH_VER} ]] ; then
diff --git a/sys-devel/gdb/gdb-9.2.ebuild b/sys-devel/gdb/gdb-9.2.ebuild
index db11e62d03ab..cb10cf1b5d50 100644
--- a/sys-devel/gdb/gdb-9.2.ebuild
+++ b/sys-devel/gdb/gdb-9.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit eutils flag-o-matic python-single-r1 toolchain-funcs
 
@@ -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 ~ppc-aix ~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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-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 ada72ec65c4d..4805e0131ff3 100644
--- a/sys-devel/gdb/gdb-9999.ebuild
+++ b/sys-devel/gdb/gdb-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit eutils flag-o-matic python-single-r1 toolchain-funcs
 
@@ -100,6 +100,7 @@ src_prepare() {
 	default
 
 	strip-linguas -u bfd/po opcodes/po
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
 }
 
 gdb_branding() {
@@ -136,7 +137,7 @@ src_configure() {
 
 	if use server && ! use client ; then
 		# just configure+build in the gdbserver subdir to speed things up
-		cd gdb/gdbserver
+		cd gdbserver
 		myconf+=( --program-transform-name='' )
 	else
 		# gdbserver only works for native targets (CHOST==CTARGET).
@@ -157,6 +158,7 @@ src_configure() {
 			--disable-install-libiberty
 			# Disable guile for now as it requires guile-2.x #562902
 			--without-guile
+			--enable-obsolete
 			# This only disables building in the readline subdir.
 			# For gdb itself, it'll use the system version.
 			--disable-readline
@@ -189,13 +191,12 @@ src_configure() {
 
 src_install() {
 	if use server && ! use client; then
-		cd gdb/gdbserver || die
+		cd gdbserver || die
 	fi
 	default
 	if use client; then
 		find "${ED}"/usr -name libiberty.a -delete || die
 	fi
-	cd "${S}" || die
 
 	# Delete translations that conflict with binutils-libs. #528088
 	# Note: Should figure out how to store these in an internal gdb dir.
@@ -220,7 +221,7 @@ src_install() {
 	# https://sourceware.org/ml/gdb-patches/2011-12/msg00915.html
 	# Only install if it exists due to the twisted behavior (see
 	# notes in src_configure above).
-	[[ -e gdb/gdbserver/gdbreplay ]] && dobin gdb/gdbserver/gdbreplay
+	[[ -e gdbserver/gdbreplay ]] && dobin gdbserver/gdbreplay
 
 	if use client ; then
 		docinto gdb
@@ -231,7 +232,7 @@ src_install() {
 	dodoc sim/{ChangeLog,MAINTAINERS,README-HACKING}
 	if use server ; then
 		docinto gdbserver
-		dodoc gdb/gdbserver/{ChangeLog,README}
+		dodoc gdbserver/{ChangeLog,README}
 	fi
 
 	if [[ -n ${PATCH_VER} ]] ; then