gentoo (valentine's day) resync : 14.02.2021

5 files changed, 56 insertions, 31 deletions

diff --git a/sys-libs/binutils-libs/Manifest b/sys-libs/binutils-libs/Manifest
index c2c0becf268c..ec2983178ebc 100644
--- a/sys-libs/binutils-libs/Manifest
+++ b/sys-libs/binutils-libs/Manifest
@@ -1,13 +1,13 @@
-DIST binutils-2.33.1-patches-2.tar.xz 18636 BLAKE2B 0e0757329b6a83aeff4f4c450c95e73fd48fcc89f83e63f294568632bee0972552cf2f57494352c5d9a7c16a51cdbc4108b38fa6028d4388c8e76046b3da9212 SHA512 d982f68d1f5fdb384309a2a1b7426bf840a90e7a85b37229b4223b62c36cab9dd9ec0c08382c85c68adf996dec21133df3180a2fc649363adae8645f8282f71d
-DIST binutils-2.33.1.tar.xz 21490848 BLAKE2B c336a8412938dc8c224f40a763a8bea9937cca0462a8fb80e62f14aabe590107fc061a3f4b9327e1f4652cb026384d36a91b4766d4d469d2d0680932874b638c SHA512 b7a6767c6c7ca6b5cafa7080e6820b7bb3a53b7148348c438d99905defbdf0d30c9744a484ee01c9441a8153901808513366b15ba9533e20c9673c262ade36ac
 DIST binutils-2.34-patches-6.tar.xz 103028 BLAKE2B d0e866d0941d2b550c7d7f23530c6ee393fa13b4f2f27832f07790989476f11d1beddb5ad5a9be5c65c1d4dff9d4598d21adcb00c1d0490f69a99127f4527447 SHA512 e05ed8886acb5cb95a3e97c5bc0564215f7d44b604610f5c4545997fd9625d6de909c37063127e819926cd1548a48d3529dd3e82e98ee6a5dbaced028c57355d
 DIST binutils-2.34.tar.xz 21637796 BLAKE2B 07dd23916a7d27f71c3f160c8c16abe2bd4fce294c738c665a012a3be6a87dbe8160d0c38740524f9025e01d438e99b2a94bcf9f9f79ee214f5dd033de8aad3d SHA512 2c7976939dcf5e8c5b7374cccd39bfe803b1bec73c6abfa0eb17c24e1942574c6bdb874c66a092a82adc443182eacd8a5a8001c19a76101f0c7ba40c27de0bbd
 DIST binutils-2.35.1-patches-2.tar.xz 72236 BLAKE2B 584cb3edbda28c69171ed64e941535f992150d86f25201cadd07b63daaa36bf76b07dc0aa8a4837da17d1672feb47a7b15f83efdeec5409e695965a10142147a SHA512 b704ebe82c4402f058f9c96991a89256a6b369d28f844bf020ed2c77766894d9a2ca0596cd609de7b389fa8cd52bfab674b6deb10ea2096e50aa57921be2083e
 DIST binutils-2.35.1.tar.xz 22031720 BLAKE2B d3468da90b75e9b5fa7fbd64d3fdb0a4bc445e4cb7da5ae058f73a1e9d948b3e9438bc9f1b5b351db369b76a25960c9c1f58f828fd2c7646f555de45fa3c052b SHA512 94ff72708403413b70b247f3af4099ebaa882b6659249869f1ed9941a0f1912e313f08357d470f9fd2359e7f5e5b0eb86285e5eaf883fa8187789d6b1bd304eb
-DIST binutils-2.36-patches-1.tar.xz 13200 BLAKE2B 82e8ef3c51984d4418466d7b838fa5c0a5a72c3bbe3e631b8aeb28503fd8b81e2b187908a2a4e1b286eba8af0db25eafadc5ffe42dd07677e6bd659cf5483b07 SHA512 88c5ac42d25d131c1507d94992fdd11a15700a0304da10cedd3b0db9bc689d3387189d6d97f847d77e8a5d053619b174695a0a6b3c6c1bb66ea8f122f0b38d63
-DIST binutils-2.36.tar.xz 22760136 BLAKE2B 6666841e26c89a07b7e6c1144d893bab112278906d7917f3ca6273aa78094951686f0d5893857cae1edde1e1ecd7c6798bc14eac88d03c5a1e6e3e480a788f9c SHA512 0b89b70d4ad5cfe5bd0011dc7e342ae9de96efdbfc3442a0d6b5f7660e38bbcad36f2c72ba8f074323f02bde022ff1cd723ae99f0ea55cf94ee2dbbc0e4efdb2
-EBUILD binutils-libs-2.33.1-r1.ebuild 3549 BLAKE2B 931ae3c38edbeed8cca61909b5e0897bc37f3855820ac49ed97955c611a2c8a58c50df2e87d4f13674ea7de511638205f49932663f25afd9f2b96970803dd91c SHA512 9e17954c198e39f725603fd9b6d1c3c24e39c99ee823a3e15b3d5c4838ae507787cb23aaf36e5dbfb9052656955b114a95b2cb3f8b0fc96ecfb0b5ed970053d0
+DIST binutils-2.35.2-patches-1.tar.xz 11836 BLAKE2B 0141349c9618992d1ab1e0309f7ed8fbc43b60a58be1dfed05eae8a8fee857241d9e112ae673da6fc9778767675f536ece818cb85567367bb1c8f87a0693623f SHA512 35de5f227c745c5fb800784fe657b2a6216faf43e2498e8481e7b0dc79b0d2f86b3b6a10b896e060319a77a51c61d2e1b7a951ae962b3a6ef8c1a2a261d9bb6c
+DIST binutils-2.35.2.tar.xz 22056908 BLAKE2B 9c392e0db2b482442f9476f30bd80cf2796321cbf7be79cf21af7bef167b6074c4ae009dcf9b438d2f2f4a23381c935176b2cfa85de1a526ab46e0fd844a7ca5 SHA512 9974ede5978d32e0d68fef23da48fa00bd06b0bff7ec45b00ca075c126d6bbe0cf2defc03ecc3f17bc6cc85b64271a13009c4049d7ba17de26e84e3a6e2c0348
+DIST binutils-2.36.1-patches-1.tar.xz 11392 BLAKE2B 8112dda3f000d29952cbf58101f842ca519054bf9de6e22908881fe4d46cc1ea9a26db74ab00c64aedd3746eb058c19a978b8dc025ad8de07b6365c70a1803b2 SHA512 c6f5645b09d0c149f2eef8e992ff7181716dfb961f1155207a1349168f2d2fb76857cc224c27b4d764cfbc4ddec0630ef8c0a91d7bac489896f28de64651b367
+DIST binutils-2.36.1.tar.xz 22772248 BLAKE2B 03fbfbedd6dba2beaa836b1ed254eddd7a54a163d3061fd93edd2b9591cae24ba049b26658c524b5ccecc2f22d431dfa168218d2531aa356945c994fbbe896fa SHA512 cc24590bcead10b90763386b6f96bb027d7594c659c2d95174a6352e8b98465a50ec3e4088d0da038428abe059bbc4ae5f37b269f31a40fc048072c8a234f4e9
 EBUILD binutils-libs-2.34-r2.ebuild 3686 BLAKE2B f6a8b9c39aa5946ca55e6e5dc0ea3cc0f4a7eeea780482364243e209193fc824e95cb9d2000473107c9f80b73dcbad9f01d33403d7cde6ec85400c6db08e0e9a SHA512 3f6e136ca78fc6ed1730480facf415eb916e1310a973cf5bc7bb234e3740247bf06b81f6939603a13b0f93c606d3819e8f93606f01113e5bb0880dd39253e67a
-EBUILD binutils-libs-2.35.1-r1.ebuild 3875 BLAKE2B a24c36ee1c7d1a14623f0efb8d14109f94d7e7be3e5e492b7e2d9a38a39dd0f0ec233a45777ffd41f1ee92c5e01dca363aed9f89ba477d05d862ff7435b78085 SHA512 7facf3d5e63e70e819dc52b0d192183906b726daf476ccd43f2ab863af9d4032dbb8d06b58369a635739c2316da95679cda94d91a060ab76acaa7e532369d822
-EBUILD binutils-libs-2.36.ebuild 3880 BLAKE2B 2870e14746410fe4c32fedefba0b8dcd305ddd5878391f24b9d30b38fbfdc92aeb07a4f1a10f57bf38af1f0c364ace47be917b53e41103bcbd33d54ee1131bb9 SHA512 2304ec110390a7e88dd27aba20aa25c195416585814167c5c5bab2d0c9a4231123c27808dad75247f79e5bb8492bb7ba1575a8af5fbfbb41a75f3eebad6b5246
-MISC metadata.xml 524 BLAKE2B 6f00793b2dc155b19d816b8acfd49e6bfc2ae35418ecc97fbbd3f9d0ed08b5f95a299b28fe6edad1a66f4d64abe99dc8a62a974fd70e28b535cd366239bf1cca SHA512 9db7c7a3082ee848ec4963831da06cced596d543e53660747fb56ac33998c219e1d7252892ffc32132d7db3c99ce9746fb6d9e85f866c3cba97552c31948342c
+EBUILD binutils-libs-2.35.1-r1.ebuild 4065 BLAKE2B 687f6e7221c767fd76f4c2ab4f4c2ca03dc6fb6d467074f7663a7062ac1750e7d14d59bacda85cdffb97890ae56a2dba97fe7ffe039e48a36e151653371bd975 SHA512 a0c2e5f6c01b1dc3a856b9447b0eb5106b78bf5e52b96b235512ad4136e12bc5f32ad96e292e1f6d4c1c638ba1c86bdcae5ab89d24dd5084c6745ccda632c823
+EBUILD binutils-libs-2.35.2.ebuild 4069 BLAKE2B 91a902a341b188328dba613c9bb5e466d917355ee2528871869e036668f321454f9f6d9c83688e769999c4c63c370f9c58d70e187b7a4e8631fc6f426f3d5eae SHA512 5497c74bdd031170f37a8618e8df8e6cf753eb50ffee4d01fe40224f305f3f01de022d439839cb68980344bc452fd1fe24e518055dc38d916f38a6735c503357
+EBUILD binutils-libs-2.36.1.ebuild 4070 BLAKE2B abfa6b76dee2e37a33ccd3e0748c6e2dd801dc781ea9c663f7ab980db7a9fd69f2c50f5209f30de7190eb55d3946b07f044a8ee6c89565d3df1da8cab4d669af SHA512 ce39f0fa2e0706e29e506eaaf7a86243231368bba4d4dc5ff2b443ef872c8675048dd4fc05bf0fa4b9233431a974546a323c205aeeb09c6367cd1f4a4069daac
+MISC metadata.xml 611 BLAKE2B 6093d3768ff4bc40fa0f8d1ebb3d9a5454f5e492030892d4791e7aafeef0ab4bd2902b818602725bf54e9045be762c1f495eeaf3742ec3ec4c4beda127e2c8d6 SHA512 21b771eb04b2e6f642e3ac48f13c2db19b728c8ed13821c39bfae696b8726f6f68ee65bb89ec0e90adfcee0e7f07a3109ab35e0699fd555ce0b84ad23ef81d1b
diff --git a/sys-libs/binutils-libs/binutils-libs-2.35.1-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.35.1-r1.ebuild
index 688ea58abcd1..340f2a556d5d 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.35.1-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.35.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0/${PV}"
-IUSE="64-bit-bfd multitarget nls static-libs"
+IUSE="64-bit-bfd cet multitarget nls static-libs"
 KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="nls? ( sys-devel/gettext )"
@@ -89,6 +89,11 @@ multilib_src_configure() {
 		# 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)
 	)
 
 	# mips can't do hash-style=gnu ...
diff --git a/sys-libs/binutils-libs/binutils-libs-2.33.1-r1.ebuild b/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild
index 7629a98e5fbd..9eabcacc31ef 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.33.1-r1.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PATCH_VER=2
-PATCH_DEV=slyfox
+PATCH_VER=1
+PATCH_DEV=dilfridge
 
 inherit eutils libtool toolchain-funcs multilib-minimal
 
@@ -20,16 +20,15 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0/${PV}"
-IUSE="64-bit-bfd multitarget nls static-libs"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+IUSE="64-bit-bfd cet multitarget nls static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
+BDEPEND="nls? ( sys-devel/gettext )"
+DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
 # Need a newer binutils-config that'll reset include/lib symlinks for us.
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	>=sys-devel/binutils-config-5
-	nls? ( !<sys-devel/gdb-7.10-r1[nls] )"
+"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -86,6 +85,15 @@ multilib_src_configure() {
 		# USE=multitarget change size of global arrays
 		# USE=64-bit-bfd changes data structures of exported API
 		--with-extra-soversion-suffix=gentoo-${CATEGORY}-${PN}-$(usex multitarget mt st)-$(usex 64-bit-bfd 64 def)
+
+		# 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)
 	)
 
 	# mips can't do hash-style=gnu ...
@@ -99,6 +107,12 @@ multilib_src_configure() {
 		&& myconf+=( --without-included-gettext ) \
 		|| myconf+=( --disable-nls )
 
+	if [[ ${CHOST} == *-darwin* ]] && use nls ; then
+		# fix underlinking in opcodes
+		sed -i -e 's/@SHARED_LDFLAGS@/@SHARED_LDFLAGS@ -lintl/' \
+			"${S}"/opcodes/Makefile.in || die
+	fi
+
 	ECONF_SOURCE=${S} \
 	econf "${myconf[@]}"
 
diff --git a/sys-libs/binutils-libs/binutils-libs-2.36.ebuild b/sys-libs/binutils-libs/binutils-libs-2.36.1.ebuild
index c30d96e6bb49..c4c2a9d4ffa5 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.36.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.36.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
 
 LICENSE="|| ( GPL-3 LGPL-3 )"
 SLOT="0/${PV}"
-IUSE="64-bit-bfd multitarget nls static-libs"
+IUSE="64-bit-bfd cet multitarget nls static-libs"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="nls? ( sys-devel/gettext )"
@@ -89,6 +89,11 @@ multilib_src_configure() {
 		# 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)
 	)
 
 	# mips can't do hash-style=gnu ...
diff --git a/sys-libs/binutils-libs/metadata.xml b/sys-libs/binutils-libs/metadata.xml
index 80f41eae3f2b..f1528f82ed90 100644
--- a/sys-libs/binutils-libs/metadata.xml
+++ b/sys-libs/binutils-libs/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>toolchain@gentoo.org</email>
-	<name>Gentoo Toolchain Project</name>
-</maintainer>
-<use>
-	<flag name="64-bit-bfd">Support 64-bit targets even on 32-bit hosts (is ignored on 64-bit hosts)</flag>
-	<flag name="multitarget">Enable all possible targets in libbfd</flag>
-</use>
-<upstream>
-	<remote-id type="cpe">cpe:/a:gnu:binutils</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<use>
+		<flag name="cet">Enable Intel Control-flow Enforcement Technology.</flag>
+		<flag name="64-bit-bfd">Support 64-bit targets even on 32-bit hosts (is ignored on 64-bit hosts)</flag>
+		<flag name="multitarget">Enable all possible targets in libbfd</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:gnu:binutils</remote-id>
+	</upstream>
 </pkgmetadata>