gentoo auto-resync : 30:12:2024 - 06:30:40

7 files changed, 27 insertions, 81 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 627d85978d49..885af4a529e7 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index f67f020aecc9..edca3eea96c4 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -15,6 +15,6 @@ EBUILD glib-2.76.4.ebuild 11145 BLAKE2B 9500014a458c528207d29e2ac5915803203456a5
 EBUILD glib-2.78.3.ebuild 11145 BLAKE2B 9500014a458c528207d29e2ac5915803203456a5c7d9c2480cef6d960601bbc6b5fe66ea019c3613e1e5c718b3eac1d1d8903bd24b555624bb1ec71e956d8f65 SHA512 c8100dd38f030caca84a54cd51cdd11646614efed488baff3695b33e0cef7bd3ab7490966011a72e87187bbc80e58349a20c544e67c9c675430405e3a876ca12
 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.5-r1.ebuild 15936 BLAKE2B 09bc2c227de3dff40571a13d344520c76d5ac114d701e2e9b09897614f805012a8ce5c6eb406ee741c45572bad1f24464378b4fb388057679e3dc52d774ad2eb SHA512 d699142d4b98fe0e6ebeb2751fb830b811e03829c2b0e74c14604b213ae9a3db1ff8a9fbbac340534a86eeeeb429e184e331a9b03e5b61c3058d055c9a1a1eee
-EBUILD glib-2.82.4-r1.ebuild 15551 BLAKE2B eb7c04f85476bb3106091ef8fe578056d6f88c5c1dbfc3cfc58c82d06c4bcae387fb9f3472cf7947fb56b164d1d6db1cdd69e390a5ce5f50c46efdaee1a2fad5 SHA512 e3765221ee2e300079097600ed38b03431d287e4a7e97baaa8700dbcb7f6588869a7ef8731931c71814be5f456a967f49dd6b60f833aa7beeac1f50db20c90f1
+EBUILD glib-2.80.5-r1.ebuild 16080 BLAKE2B a2db74f758c7f7c1e33642ad1bb98cda4deedb2d1d2876f4b87be8fcb200ba13ceefce070816e527c2a7821f78421feb8eec19c9a60b6a8001e62f5917c42adf SHA512 cd4ad7fe88920612581fea0a0765dc631f29f5cf0f15a942b6b9692f7042d3996029c8529866bbfdc9cbe4bbe2e86178d93bee20b86087e2390cafebd69c8127
+EBUILD glib-2.82.4-r1.ebuild 15695 BLAKE2B ff0f49db24d47ca45df3d11cc5597a0979e896ec1ad8e27c9733be87c25cd1bef2799fecc759940206a9bf9aecfd10d888894f6fca6b9cfb58c63668bb446ff3 SHA512 6873355977cae5b3e62e1f3610fe002439986d63d68c86b480f253c9afdae1fc5df4623f9b95d7a2ae680939f64450938ec0237ea3aec4f2855e7f8f2eb65215
 MISC metadata.xml 1499 BLAKE2B 5a75e3b360e4656fe9127f2dc3ba7e90df3eae0586a025b4eefc2317398e53815c98a8014ea6f0dd69ae8afdafa066eec61c18e9fa86d24c78a3f11404c2a7a8 SHA512 2b12c409bf16cf9e01e80c30a6707aac5b48ca4cdeac3852028c003c6cb2d50b5e82be73adeefb8341fd4f157e0f7d22505cebfc2ee0f6d64ca77a7d3cfa8271
diff --git a/dev-libs/glib/glib-2.80.5-r1.ebuild b/dev-libs/glib/glib-2.80.5-r1.ebuild
index cdc1222f8c58..5cd0b2716ca0 100644
--- a/dev-libs/glib/glib-2.80.5-r1.ebuild
+++ b/dev-libs/glib/glib-2.80.5-r1.ebuild
@@ -223,18 +223,21 @@ multilib_src_configure() {
 		#esac
 	#fi
 
-	# Build internal copy of gobject-introspection to avoid circular dependency (Built for native abi only)
+	# Build internal copy of gobject-introspection to avoid circular dependency (built for native abi only)
 	if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then
 		einfo "Bootstrapping gobject-introspection..."
-		INTROSPECTION_BIN_DIR="${T}/${EPREFIX}/usr/bin"
-		INTROSPECTION_LIB_DIR="${T}/${EPREFIX}/usr/$(get_libdir)"
+		INTROSPECTION_BIN_DIR="${T}/bootstrap-gi-prefix/usr/bin"
+		INTROSPECTION_LIB_DIR="${T}/bootstrap-gi-prefix/usr/$(get_libdir)"
 
 		local emesonargs=(
+			--prefix="${T}/bootstrap-gi-prefix/usr"
 			-Dpython="${EPYTHON}"
 			-Dbuild_introspection_data=true
 			# Build an internal copy of glib for the internal copy of gobject-introspection
 			--force-fallback-for=glib
-			# Tell meson to make paths in pkgconfig files relative, because we arent doing an actual install
+			# Make the paths in pkgconfig files relative as we used to not
+			# do a proper install here and it seems less risky to keep it
+			# this way.
 			-Dpkgconfig.relocatable=true
 
 			# We want as minimal a build as possible here to speed things up
@@ -270,8 +273,10 @@ multilib_src_configure() {
 
 		meson_src_configure
 		meson_src_compile
-		# Install to the portage temp directory so that pkgconfig relative paths resolve correctly
-		meson_src_install --destdir "${T}" --skip-subprojects glib
+		# We already provide a prefix in ${T} above. Blank DESTDIR
+		# as it may be set in the environment by Portage (though not
+		# guaranteed in src_configure).
+		meson_src_install --destdir ""
 
 		popd || die
 
diff --git a/dev-libs/glib/glib-2.82.4-r1.ebuild b/dev-libs/glib/glib-2.82.4-r1.ebuild
index 4c84301e4ef8..9cb47e594084 100644
--- a/dev-libs/glib/glib-2.82.4-r1.ebuild
+++ b/dev-libs/glib/glib-2.82.4-r1.ebuild
@@ -211,18 +211,21 @@ multilib_src_configure() {
 		#esac
 	#fi
 
-	# Build internal copy of gobject-introspection to avoid circular dependency (Built for native abi only)
+	# Build internal copy of gobject-introspection to avoid circular dependency (built for native abi only)
 	if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then
 		einfo "Bootstrapping gobject-introspection..."
-		INTROSPECTION_BIN_DIR="${T}/${EPREFIX}/usr/bin"
-		INTROSPECTION_LIB_DIR="${T}/${EPREFIX}/usr/$(get_libdir)"
+		INTROSPECTION_BIN_DIR="${T}/bootstrap-gi-prefix/usr/bin"
+		INTROSPECTION_LIB_DIR="${T}/bootstrap-gi-prefix/usr/$(get_libdir)"
 
 		local emesonargs=(
+			--prefix="${T}/bootstrap-gi-prefix/usr"
 			-Dpython="${EPYTHON}"
 			-Dbuild_introspection_data=true
 			# Build an internal copy of glib for the internal copy of gobject-introspection
 			--force-fallback-for=glib
-			# Tell meson to make paths in pkgconfig files relative, because we arent doing an actual install
+			# Make the paths in pkgconfig files relative as we used to not
+			# do a proper install here and it seems less risky to keep it
+			# this way.
 			-Dpkgconfig.relocatable=true
 
 			# We want as minimal a build as possible here to speed things up
@@ -258,8 +261,10 @@ multilib_src_configure() {
 
 		meson_src_configure
 		meson_src_compile
-		# Install to the portage temp directory so that pkgconfig relative paths resolve correctly
-		meson_src_install --destdir "${T}" --skip-subprojects glib
+		# We already provide a prefix in ${T} above. Blank DESTDIR
+		# as it may be set in the environment by Portage (though not
+		# guaranteed in src_configure).
+		meson_src_install --destdir ""
 
 		popd || die
 
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 1c0c67042b20..fc53263fdf3a 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,5 +1,4 @@
 AUX libgit2-glib-1.2.0-libgit2-1.8.0.patch 1845 BLAKE2B c949e25707e5e748ace78d65879fb4b2c57d6a1722784426eaa1de795a6637d5b3b1fc1e024a325310661dba1e85865c1adb4b16e6f9511c949592f9b5e7d27e SHA512 b86f5e7a1850fa979e59af22fff0489e682e7d34fc9db1f625e785c7781cf2b76941344e11b70c0e87aabf7164dad01d110f61f3ec4931bc0bb4f911e7599e1a
 DIST libgit2-glib-1.2.0.tar.xz 140576 BLAKE2B f49f808e7f97c45d7df49d780fdf036422b794e551f2e42d934b015fb227b1cb80d5067198a5ef7ac0539460bf6c0eab74025bcf367a0aebb43518448015e22e SHA512 37004e86c663ce5fe1bd54878b908575eb9195c1012e88e39c2efdb0b6cfa1de3d2ed9754cecc1b942d001698870025c87d95856f2a0a9f2d0dba1979b07b1f8
-EBUILD libgit2-glib-1.2.0-r1.ebuild 1305 BLAKE2B 97f70809a1f1b6aaa1712573577ae208d8386f52e26a34b62aae0bcf9fb412da38dd98d7bb4664feb6570eea9852438e94dc0d49bf7de9ec1af0269365e8b5c1 SHA512 65bd882f76cad1d39746c4d194e3484a39c9dd7e74f2bf2737fa7c5575ebcae49978c1fb5f1cec172e0b1212e483da0057cf3ebc5ff2d542274a4a2117a526f3
-EBUILD libgit2-glib-1.2.0.ebuild 1312 BLAKE2B c688975f36202017adfc21b217b7cf8b40f1c0de439e485c8fccb03128e4ba9e3d50fd918a86e39cb0c058629b4360cb3e457adfa93587b230fd5d9fa91483b7 SHA512 be1f23ef5b84a1b4902e8d0533639ca6db6b2f1bf26369e84b2aa6cb6307b7819df9c514c93af0b9b6e30f81349975de94dacfc4f3999dcbaa33f6848a25b3fc
+EBUILD libgit2-glib-1.2.0-r2.ebuild 1327 BLAKE2B 52164b29a861a8a6d712e422ef6726d4a421e52fe8642850cd5602033bd561ca182081168eb6d4377b0845790c8c64d21540c27afcdd06ae7f8d2d6c4edc6e86 SHA512 af6798e00d232dc47936a5f5064d0c5b7772e54308077d07867ecdde2c12c3b6e3afd6210bf66478a597ae046eba9cab3f0e438c5ebcaa55274be0f7b23213fe
 MISC metadata.xml 541 BLAKE2B 15c4b815fae2b173bb92c735fbcb57d0e2f7227cd6ec7b613676646a69bbab79fd95d0e43376f8dc5444ec8326e46f59e0c476228ee0816758568cd0bdb5a06e SHA512 420a424010054a85291977699691fb2626b224df9b24b99aaad9584e7d1944fb3e242cd989b7efe1cb393404490a0f798c985d4be80ccb5474b0681e86434fa8
diff --git a/dev-libs/libgit2-glib/libgit2-glib-1.2.0-r1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-1.2.0-r2.ebuild
index b2261570d891..05cb8b3582c7 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-1.2.0-r1.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-1.2.0-r2.ebuild
@@ -19,7 +19,8 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="
 	>=dev-libs/gobject-introspection-1.54:=
 	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libgit2-0.26.0:0=[ssh?]
+	<dev-libs/libgit2-1.9:=[ssh?]
+	>=dev-libs/libgit2-0.26.0
 	python? (
 		${PYTHON_DEPS}
 		dev-python/pygobject:3[${PYTHON_USEDEP}]
diff --git a/dev-libs/libgit2-glib/libgit2-glib-1.2.0.ebuild b/dev-libs/libgit2-glib/libgit2-glib-1.2.0.ebuild
deleted file mode 100644
index ecf161614762..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-1.2.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit gnome.org meson python-r1 vala xdg
-
-DESCRIPTION="Git library for GLib"
-HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
-IUSE="gtk-doc python +ssh +vala"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# see bug #927383 wrt libgit2 upper bound
-RDEPEND="
-	>=dev-libs/gobject-introspection-1.54:=
-	>=dev-libs/glib-2.44.0:2
-	>=dev-libs/libgit2-0.26.0:0=[ssh?]
-	<dev-libs/libgit2-1.8.0
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gi-docgen )
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	default
-
-	sed -i -e '/meson_python_compile.py/d' meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtk_doc)
-		-Dintrospection=true
-		-Dpython=false # we install python scripts manually
-		$(meson_use ssh)
-		$(meson_use vala vapi)
-	)
-
-	use vala && vala_setup
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule libgit2-glib/Ggit.py
-	fi
-}