gentoo auto-resync : 16:12:2024 - 02:01:58

4 files changed, 23 insertions, 5 deletions

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 7624730126b7..fd391ad0f933 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -7,7 +7,6 @@ DIST glib-2.78.4.tar.xz 5331892 BLAKE2B ada7134597d7d863e581a2bb1097ac07a63b27b5
 DIST glib-2.78.6.tar.xz 5344808 BLAKE2B d16173794c4aa019459cf8c8c84d4107fb8393828f41ec6c631b9452890f34f9022ed848a543ed134fdb8a575faef6b941cea3e05de512eb1b7a99f7601a2485 SHA512 8d75f8fd77b6309215ca86a0c7648878efe11051f18b279840c137669017ea4066388f8682367e4ea3f154333d833c9dc28ccd4a66a91f0c3854a40a2838f8da
 DIST glib-2.80.4.tar.xz 5535760 BLAKE2B 1d2b301703b27a5c2def370e1d44b4f7b08a940969563ce9d8d7c38e5f0a32163b95523e09cedc4a57b2af84a57d63dc545abcb31b61a8066ef62ba396fb4f3c SHA512 efdc7dd1e0609b0f2d988a8cc8fd4a3fda96e8450832f905f7686f9063b727cb996e0e4e638aca62f60b76f9f04be62e089a615413e64cf298c7eef26e074570
 DIST glib-2.80.5.tar.xz 5538308 BLAKE2B 3f17ff85a85d20858b69c2dccc1e5d6ffd92661a8cfda8b8770dd391861999ff3381008f4fe382e90f0a7798fe218debda7f559f6e3ac8f9305e3be98b879969 SHA512 c9cc9f99e217fd950810fcfbfa7300c7850cae4dbfbabc03cdcadb6dcca2e51ea7979ceb68c09d8e9776fd1c04db73b89b81f748c8bd911e1f7ad9f704dff172
-DIST glib-2.82.2.tar.xz 5555528 BLAKE2B 930fa7816082e6ba4b7f394985840bb6abf4fe9a4451286cddd3cfc8a4f3d4e3b4f06f09fbb34486f6fd47d0b72363b06a280ccae62d061724a7a2e00734bc4c SHA512 d5b761ec0c088496f2f9e5767568076a30ff492c272f21133560689f4e6a177d403c78d71ef85da63de331152c4d1f27b65d3e927ebfaf0fb63592f66e564ea1
 DIST glib-2.82.4.tar.xz 5556896 BLAKE2B 62caecc7570b1639f6ddf1deb9debb6d3d6180b74f497f2fcace5ce65d6e28996555d51e5b4980f500bdc3f811b5b6214521b1170f553f2fa1fd240fd0eec835 SHA512 5df0b3c56fe6cf6c94019e29afb408174a5864cdb97cf58d5a12a0f83990b5c2004a49c8e3b0e195f5808874b5911a4a7b3d6aea8718aada1b40561e623cd08d
 DIST gobject-introspection-1.80.1.tar.xz 1040228 BLAKE2B 7a8c1da9bc8aef293deedde1eed97536fa2f42f79a9761ac8ededb0676e46b636545a69e20e63d812844aeb626fa4fb7ce3c7922e51554fdc79560f16443acd9 SHA512 f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a
 DIST gobject-introspection-1.82.0.tar.xz 1052872 BLAKE2B 8336ae26d48a71a203655d9d268076f603055ceabb55dbfa676f2c67b4096b83afc106d485dc45d02b3a8be806f9ef50d54806a82e61f2a252ae59543c61e934 SHA512 e139fadb4174c72b648914f3774d89fc0e5eaee45bba0c13edf05de883664dad8276dbc34006217bb09871ed4bad23adab51ff232a17b9eb131329b2926cafb7
@@ -16,7 +15,7 @@ EBUILD glib-2.78.3.ebuild 11145 BLAKE2B 9500014a458c528207d29e2ac5915803203456a5
 EBUILD glib-2.78.4-r1.ebuild 11390 BLAKE2B 569236b2fc6694eb09b999b94ce027b8fb9152aa2876ed08199fcbb52b894be1660a42da41c063926844b507d5e89eed8cc40c8049bb71b2a887494245974324 SHA512 8eface9ce9509f9661c8f2e7c51e1ede41e6d0db4589c9987a24a4168bf0c4cebf69835825d4d994c70802052bfe487b77629b45219c0c282351328ba476d26b
 EBUILD glib-2.78.6.ebuild 11340 BLAKE2B c53403ccbcbd18e678f8e2c6e53b39ccc6cb558be4e7f96df26f986a4c51ea86cf601bf0a122c2530dfc762af2a1cbe6e85f524687c738a8eb3940afeb6541a9 SHA512 7c1b4e8e69ca36d6b52855c7edbe4b584d549025d88783010359b96469c98b217dd50819ae971c7bfee637a30bd864b991c3a16cc538492b4c7075d719e30f4c
 EBUILD glib-2.80.4.ebuild 11467 BLAKE2B c0efaa4ab793d792f8ca300fddc586b1f09e477898c962d6ee528330992db8d1a633e176e2079f4302a1e5d904e919599ac9ca1e37cd5a542ccf14aa8c7d9f73 SHA512 7d6fb8190795ac10bb9b31f0f618452dc7ed7f3a1cd84aabb258c4fe6cfb3dcee96b0a4430a2d0b42055687c0736464efb218db22862c48c30e31f90f173b84e
-EBUILD glib-2.80.5.ebuild 14999 BLAKE2B 083862c3396eed2a73bd9ad65fa5aae30dca0080150f0c89b1a40ab3e0ca127e3bdd4646cc1029d2067ff337825b8e5249e4335e5ff4bd39f85b1481f282b442 SHA512 b2d4d43224309e7089086f09e2aeb0770db81fd04657881386a2d0fa9bb3dda3367663054e3e452e2d7cdba2a178968ad07a1fc505378bc6a49be08c4aa7981c
-EBUILD glib-2.82.2.ebuild 14999 BLAKE2B a2687ecb20c0f4f7d60bcc7d7762f3a56898d9bfa6f3141c555a42f56411590a9d7c5b06bd1f8f300143d8ed326e54e6bd11f2f28d7bb81600e3d846ddaa1d78 SHA512 de491994a5c86a1acf32f81e688d414b489827b2e8e594b4ccf3d15a8f65c6d4ef1db44d2b3567b950b3966f109b31300c0971b8f9465009d0b615949a169c81
-EBUILD glib-2.82.4.ebuild 14999 BLAKE2B a2687ecb20c0f4f7d60bcc7d7762f3a56898d9bfa6f3141c555a42f56411590a9d7c5b06bd1f8f300143d8ed326e54e6bd11f2f28d7bb81600e3d846ddaa1d78 SHA512 de491994a5c86a1acf32f81e688d414b489827b2e8e594b4ccf3d15a8f65c6d4ef1db44d2b3567b950b3966f109b31300c0971b8f9465009d0b615949a169c81
+EBUILD glib-2.80.5-r1.ebuild 15399 BLAKE2B a6f813d0f0a69e1457c4cefc3de17d8f994368f943972c951c1500e1b2a1003e237bfe7b3574c2cb9e2b0db960a19ca9781ba9fe89838a52fd84b79302430eb7 SHA512 22b5da24628db8a8ea72263a8682bc0be77ab8547fd5f1a04a4e71e06077bead0d51dc621326ede93850cc8d82bf83668038a72b06518de720a05e59e64b2d6c
+EBUILD glib-2.80.5.ebuild 15291 BLAKE2B c939b8e376c803270074061f2702d643d6d713a3775157df0effe1bbf270803a52c9f2021f03273185cc723ca0958a83d3c3712dc86fd8177557a96762165806 SHA512 101b872a11dcc09e3b249b8f586729e80361f1d270595d19140d57967aa2a3984c619eeab9413d8214041eb9c74aeb89d61add32393d6a4c55284ebe93a4be3d
+EBUILD glib-2.82.4-r1.ebuild 15399 BLAKE2B be43d3de64c1a42b391c4d150f98d875a69c7bbf0bec7e7cc220ebed317c736fdfcf68266aef44eb2e52892ae33d414f8f80424f0789ede1f94e4a66d64dc592 SHA512 51dd8fb72b3532cd48e7ff1291b806403d69f1b3fea1ffd405f9294feea1c145dee509b5e5fdbf9e351aa6813763d9ddefa8f8047e304b330f24dac0d457bb3f
 MISC metadata.xml 1499 BLAKE2B 5a75e3b360e4656fe9127f2dc3ba7e90df3eae0586a025b4eefc2317398e53815c98a8014ea6f0dd69ae8afdafa066eec61c18e9fa86d24c78a3f11404c2a7a8 SHA512 2b12c409bf16cf9e01e80c30a6707aac5b48ca4cdeac3852028c003c6cb2d50b5e82be73adeefb8341fd4f157e0f7d22505cebfc2ee0f6d64ca77a7d3cfa8271
diff --git a/dev-libs/glib/glib-2.82.4.ebuild b/dev-libs/glib/glib-2.80.5-r1.ebuild
index 16ca673a8268..a07569da4316 100644
--- a/dev-libs/glib/glib-2.82.4.ebuild
+++ b/dev-libs/glib/glib-2.80.5-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The GLib library of C routines"
 HOMEPAGE="https://www.gtk.org/"
 
 INTROSPECTION_PN="gobject-introspection"
-INTROSPECTION_PV="1.82.0"
+INTROSPECTION_PV="1.80.1"
 INTROSPECTION_P="${INTROSPECTION_PN}-${INTROSPECTION_PV}"
 SRC_URI="
 	${SRC_URI}
@@ -246,6 +246,11 @@ multilib_src_configure() {
 		ORIG_SOURCE_DIR=${EMESON_SOURCE}
 		EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR}
 
+		# g-ir-scanner has some relocatable logic but it searches
+		# for 'lib', not 'lib64', so it can't find itself and eventually
+		# falls back to the system installation. See bug #946221.
+		sed -i -e "/^pylibdir =/s:'lib:'$(get_libdir):" "${EMESON_SOURCE}"/tools/g-ir-tool-template.in || die
+
 		ORIG_BUILD_DIR=${BUILD_DIR}
 		BUILD_DIR=${INTROSPECTION_BUILD_DIR}
 
@@ -282,11 +287,13 @@ multilib_src_configure() {
 		export PYTHONPATH="${INTROSPECTION_LIB_DIR}/gobject-introspection:${PYTHONPATH}"
 	fi
 
+	# TODO: Can this be cleaned up now we have -Dglib_debug? (bug #946485)
 	use debug && EMESON_BUILD_TYPE=debug
 
 	local emesonargs=(
 		-Ddefault_library=$(usex static-libs both shared)
 		-Druntime_dir="${EPREFIX}"/run
+		$(meson_feature debug glib_debug)
 		$(meson_feature selinux)
 		$(meson_use xattr)
 		-Dlibmount=enabled # only used if host_system == 'linux'
diff --git a/dev-libs/glib/glib-2.80.5.ebuild b/dev-libs/glib/glib-2.80.5.ebuild
index d27759baf6d3..2c8085382ed4 100644
--- a/dev-libs/glib/glib-2.80.5.ebuild
+++ b/dev-libs/glib/glib-2.80.5.ebuild
@@ -246,6 +246,11 @@ multilib_src_configure() {
 		ORIG_SOURCE_DIR=${EMESON_SOURCE}
 		EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR}
 
+		# g-ir-scanner has some relocatable logic but it searches
+		# for 'lib', not 'lib64', so it can't find itself and eventually
+		# falls back to the system installation. See bug #946221.
+		sed -i -e "/^pylibdir =/s:'lib:'$(get_libdir):" "${EMESON_SOURCE}"/tools/g-ir-tool-template.in || die
+
 		ORIG_BUILD_DIR=${BUILD_DIR}
 		BUILD_DIR=${INTROSPECTION_BUILD_DIR}
 
diff --git a/dev-libs/glib/glib-2.82.2.ebuild b/dev-libs/glib/glib-2.82.4-r1.ebuild
index 16ca673a8268..ac8c41e59cfb 100644
--- a/dev-libs/glib/glib-2.82.2.ebuild
+++ b/dev-libs/glib/glib-2.82.4-r1.ebuild
@@ -246,6 +246,11 @@ multilib_src_configure() {
 		ORIG_SOURCE_DIR=${EMESON_SOURCE}
 		EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR}
 
+		# g-ir-scanner has some relocatable logic but it searches
+		# for 'lib', not 'lib64', so it can't find itself and eventually
+		# falls back to the system installation. See bug #946221.
+		sed -i -e "/^pylibdir =/s:'lib:'$(get_libdir):" "${EMESON_SOURCE}"/tools/g-ir-tool-template.in || die
+
 		ORIG_BUILD_DIR=${BUILD_DIR}
 		BUILD_DIR=${INTROSPECTION_BUILD_DIR}
 
@@ -282,11 +287,13 @@ multilib_src_configure() {
 		export PYTHONPATH="${INTROSPECTION_LIB_DIR}/gobject-introspection:${PYTHONPATH}"
 	fi
 
+	# TODO: Can this be cleaned up now we have -Dglib_debug? (bug #946485)
 	use debug && EMESON_BUILD_TYPE=debug
 
 	local emesonargs=(
 		-Ddefault_library=$(usex static-libs both shared)
 		-Druntime_dir="${EPREFIX}"/run
+		$(meson_feature debug glib_debug)
 		$(meson_feature selinux)
 		$(meson_use xattr)
 		-Dlibmount=enabled # only used if host_system == 'linux'