gentoo auto-resync : 04:11:2023 - 22:13:37

4 files changed, 25 insertions, 14 deletions

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index c706a8b1c5f6..713a52c9cfa5 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -10,7 +10,7 @@ AUX db-6.0.35-sqlite-configure-path.patch 748 BLAKE2B 570c499549fddd62fa4d14a6eb
 DIST db-4.8.30.tar.gz 22887305 BLAKE2B 10487580a371fa97ef5e468e1fcc4af68490934a82467da88b723f7d4ce403cd5f2b77bd95c218dda58161fe30bfef81f5093a8e5176f5ad5f482251c07c6423 SHA512 d1a3c52b0ab54ae3fd6792e6396c9f74d25f36b2eb9e853b67ef9c872508a58c784c7818108d06d184f59601b70cc877916e67dfea6f0ee1ca2b07468c1041f1
 DIST db-5.3.28.tar.gz 35090431 BLAKE2B 5b77a4ec0945fa96ce6c2b452fb4b029295e037fa64d5ff8dcb3b5e01ee3501fd75d9a73b8f5fa54d8907717d93546fbb5348ee70119e877fa2f17d301ecf50d SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090
 DIST db-6.0.35.tar.gz 36532251 BLAKE2B 22fbe557ccc13e4b936db8ca7d6ba11ce42e477bbf39f7e472067e06fb5910b1147fa58a44ac944c24a51ea839f1c61edda6bd8f3c450acac0c13d7fdba11e89 SHA512 002db1553def44efa715095b04b2bac2de7450cdc7142586d1d8b5d8ce79ee5e98f824b3bd276cd586ca932dc51ed35a9ffbed95b2b9847264f262cfa092479d
-EBUILD db-4.8.30-r8.ebuild 4451 BLAKE2B 628a7ad196d6d67e5a9107f4c0c31d784e7c4cb335d02145296f39513daf62471ec4c636a608c2ed8b0e3beaa7fb29423b8cc83765f42ecb210abb0157c50c9d SHA512 ec423313003488ef87c6adadc666f8662cbecb827203eb9e3a77609025b8c4b233bf01f47b57bdca0905c31ad903e4e888bcc0ee9b2b9b7061fe2441df482e0f
-EBUILD db-5.3.28-r9.ebuild 6435 BLAKE2B 91d0829b5d2c3d9e4afb289b696c55b0034a3e212c3cfc1e87552aab104751dcf07a95c8fdf59d470d6228519aaae972202697a44a9c001dfa6c1a0b0e8e123c SHA512 895e9f229880df53ad39f90b43788e9e0952de7ebb480eda49ba059fc37097b2801ab5315ca22d40481838428b9ac8af007a86a9cc1fb73c4429f5d3bc59ff7b
-EBUILD db-6.0.35-r4.ebuild 6295 BLAKE2B f4670c1010430c9afa73f5fc0aadaa9257710e9df008c1d4cabb37a5d80249e62c23d0d6d616519afab07239cef81e333deb7e6d9f66b6cf7233543c3e2bc489 SHA512 9083b9d378fa318cddc2a0de7ca401952227d007e55961e4412264a8f80fe9657fc28cdc0591bf2db0d1830a5e6ae5d95da790d8e2c5bb3cb7d13a292f025100
+EBUILD db-4.8.30-r8.ebuild 4541 BLAKE2B 4abb508c496609f6c6c38d5b435587b07683215fb24f4b37633ba563e8d3e1f1af501e1145986fdd5407d88b0d986393349ba57625c020d936b2dbca98825fb4 SHA512 39ad03b4587b048b187c252ca5d2558d90a438a4e2016068761ff80ecb47333a240ebbfac35a1c547205bb05200e160c83f8c74e3ea7776ad1f2ae28333dba01
+EBUILD db-5.3.28-r9.ebuild 6515 BLAKE2B 5e63b91dee46899a394e8389c0449692bfaccba04ada69fbca1c08f8a29c792deec8766e3ee3a2435692507558b600b2b8cf54c96b68e7127b559c0cb45e0ea9 SHA512 5e51195ae4392ab836a91c6dbb012a29f6f4e558668766fb3686028f5fb0867443999575cdeb6efaeb4e9756d2786a456ae6ee88e19993cec90bdcce9d64b564
+EBUILD db-6.0.35-r4.ebuild 6375 BLAKE2B 17fd1b9519165b952fd6df73a79805f19a7b0794008201f7c2c64ab20b1d5daeab8a06b4ffecfb6f7b9f1f682a495bdddd97704cf87dfedd44a14388a0398e54 SHA512 2b24553ce58a2b0740b9898b2406c571ff2d949762c06fd667eca279296581c86e50def2d6507dbeb7f5744cf1b8a9f16b5c97ce797be98209b6f44157334821
 MISC metadata.xml 1261 BLAKE2B 81cfdd965f4e2e0342d812c6c1fd602c43ca8bbbb23bd12f230444d26bee578f9ba2af781a8390bb754b66b4699c6aada379dea90397798f8a489a7fd11b85fb SHA512 08d43450d54a8718639ae2637f13da7626415e99a8fa5948c5107b7a973161f31b3b0cf58dc538dd48a18db996f020d57d20edefbcdd8e37c6e58c206c3aab6e
diff --git a/sys-libs/db/db-4.8.30-r8.ebuild b/sys-libs/db/db-4.8.30-r8.ebuild
index f5906a0c970e..7d3883eeb360 100644
--- a/sys-libs/db/db-4.8.30-r8.ebuild
+++ b/sys-libs/db/db-4.8.30-r8.ebuild
@@ -80,6 +80,12 @@ src_prepare() {
 		-i configure || die
 }
 
+src_configure() {
+	# Force bfd before calling multilib_toolchain_setup
+	tc-ld-force-bfd #470634 #729510
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local myconf=(
 		--enable-compat185
@@ -93,9 +99,6 @@ multilib_src_configure() {
 		$(use_enable test)
 	)
 
-	# bug #470634 and bug #729510
-	tc-ld-force-bfd
-
 	# compilation with -O0 fails on amd64, see bug #171231
 	if [[ ${ABI} == amd64 ]]; then
 		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
diff --git a/sys-libs/db/db-5.3.28-r9.ebuild b/sys-libs/db/db-5.3.28-r9.ebuild
index 1d029d38e96b..a86fe5ad0d1f 100644
--- a/sys-libs/db/db-5.3.28-r9.ebuild
+++ b/sys-libs/db/db-5.3.28-r9.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools db flag-o-matic multilib multilib-minimal toolchain-funcs
+inherit autotools db flag-o-matic multilib-minimal toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -24,7 +24,7 @@ DESCRIPTION="Oracle Berkeley DB"
 HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
 SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
 for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
-	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
+	SRC_URI+=" http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
 done
 
 LICENSE="Sleepycat"
@@ -111,6 +111,12 @@ src_prepare() {
 		-i "${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
+src_configure() {
+	# Force bfd before calling multilib_toolchain_setup
+	tc-ld-force-bfd #470634 #729510
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local myconf=(
 		# sql_compat will cause a collision with sqlite3
@@ -132,8 +138,6 @@ multilib_src_configure() {
 		$(use_enable test)
 	)
 
-	tc-ld-force-bfd #470634 #729510
-
 	# compilation with -O0 fails on amd64, see bug #171231
 	if [[ ${ABI} == amd64 ]]; then
 		local CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
diff --git a/sys-libs/db/db-6.0.35-r4.ebuild b/sys-libs/db/db-6.0.35-r4.ebuild
index 20268a5c9996..422b7e8188a8 100644
--- a/sys-libs/db/db-6.0.35-r4.ebuild
+++ b/sys-libs/db/db-6.0.35-r4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools db flag-o-matic multilib multilib-minimal toolchain-funcs
+inherit autotools db flag-o-matic multilib-minimal toolchain-funcs
 
 #Number of official patches
 #PATCHNO=`echo ${PV}|sed -e "s,\(.*_p\)\([0-9]*\),\2,"`
@@ -24,7 +24,7 @@ DESCRIPTION="Oracle Berkeley DB"
 HOMEPAGE="http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
 SRC_URI="http://download.oracle.com/berkeley-db/${MY_P}.tar.gz"
 for (( i=1 ; i<=${PATCHNO} ; i++ )) ; do
-	export SRC_URI="${SRC_URI} http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
+	SRC_URI+=" http://www.oracle.com/technology/products/berkeley-db/db/update/${MY_PV}/patch.${MY_PV}.${i}"
 done
 
 LICENSE="AGPL-3"
@@ -104,6 +104,12 @@ src_prepare() {
 		-i "${S_BASE}"/test/tcl/reputils.tcl || die
 }
 
+src_configure() {
+	# Force bfd before calling multilib_toolchain_setup
+	tc-ld-force-bfd #470634 #729510
+	multilib-minimal_src_configure
+}
+
 multilib_src_configure() {
 	local myconf=(
 		--enable-compat185
@@ -121,8 +127,6 @@ multilib_src_configure() {
 		$(use_enable test)
 	)
 
-	tc-ld-force-bfd #470634 #729510
-
 	# compilation with -O0 fails on amd64, see bug #171231
 	if [[ ${ABI} == amd64 ]]; then
 		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}