3 files changed, 122 insertions, 0 deletions
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 90b5a071feaf..1c0c67042b20 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,3 +1,5 @@
+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
 MISC metadata.xml 541 BLAKE2B 15c4b815fae2b173bb92c735fbcb57d0e2f7227cd6ec7b613676646a69bbab79fd95d0e43376f8dc5444ec8326e46f59e0c476228ee0816758568cd0bdb5a06e SHA512 420a424010054a85291977699691fb2626b224df9b24b99aaad9584e7d1944fb3e242cd989b7efe1cb393404490a0f798c985d4be80ccb5474b0681e86434fa8
diff --git a/dev-libs/libgit2-glib/files/libgit2-glib-1.2.0-libgit2-1.8.0.patch b/dev-libs/libgit2-glib/files/libgit2-glib-1.2.0-libgit2-1.8.0.patch
new file mode 100644
index 000000000000..2c61e32fec8b
--- /dev/null
+++ b/dev-libs/libgit2-glib/files/libgit2-glib-1.2.0-libgit2-1.8.0.patch
@@ -0,0 +1,54 @@
+https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/40 (modified to drop const changes, dep increase)
+
+From a76fdf96c3af9ce9d21a3985c4be8a1aa6eea661 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Fri, 5 Apr 2024 10:28:16 +0200
+Subject: [PATCH] build: Fix build against, and require, libgit2 1.8.0
+
+---
+ libgit2-glib/ggit-clone-options.c        | 1 +
+ libgit2-glib/ggit-cred-ssh-interactive.c | 2 +-
+ libgit2-glib/ggit-remote-callbacks.h     | 1 +
+ libgit2-glib/ggit-repository.c           | 4 ++--
+ libgit2-glib/ggit-types.h                | 3 ++-
+ meson.build                              | 2 +-
+ 6 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/libgit2-glib/ggit-clone-options.c b/libgit2-glib/ggit-clone-options.c
+index b47fdb1..30c7d86 100644
+--- a/libgit2-glib/ggit-clone-options.c
++++ b/libgit2-glib/ggit-clone-options.c
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <git2.h>
++#include <git2/sys/errors.h>
+ #include <gio/gio.h>
+ 
+ #include "ggit-clone-options.h"
+diff --git a/libgit2-glib/ggit-remote-callbacks.h b/libgit2-glib/ggit-remote-callbacks.h
+index 3005ff4..2340712 100644
+--- a/libgit2-glib/ggit-remote-callbacks.h
++++ b/libgit2-glib/ggit-remote-callbacks.h
+@@ -24,6 +24,7 @@
+ 
+ #include <glib-object.h>
+ #include <git2.h>
++#include <git2/sys/errors.h>
+ #include <libgit2-glib/ggit-cred.h>
+ 
+ G_BEGIN_DECLS
+diff --git a/libgit2-glib/ggit-types.h b/libgit2-glib/ggit-types.h
+index 7e28975..2a2ed99 100644
+--- a/libgit2-glib/ggit-types.h
++++ b/libgit2-glib/ggit-types.h
+@@ -355,7 +355,8 @@ typedef enum
+ 	GGIT_CONFIG_LEVEL_XDG         = 3,
+ 	GGIT_CONFIG_LEVEL_GLOBAL      = 4,
+ 	GGIT_CONFIG_LEVEL_LOCAL       = 5,
+-	GGIT_CONFIG_LEVEL_APP         = 6,
++	GGIT_CONFIG_LEVEL_WORKTREE    = 6,
++	GGIT_CONFIG_LEVEL_APP         = 7,
+ 	GGIT_CONFIG_LEVEL_HIGHEST     = -1
+ } GgitConfigLevel;
+ 
diff --git a/dev-libs/libgit2-glib/libgit2-glib-1.2.0-r1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..b2261570d891
--- /dev/null
+++ b/dev-libs/libgit2-glib/libgit2-glib-1.2.0-r1.ebuild
@@ -0,0 +1,66 @@
+# 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} )"
+
+RDEPEND="
+	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/libgit2-0.26.0:0=[ssh?]
+	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) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.0-libgit2-1.8.0.patch
+)
+
+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
+}