gentoo auto-resync : 13:04:2023 - 23:44:17

3 files changed, 92 insertions, 1 deletions

diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index d3ad8b98a947..281774fb61f6 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,3 +1,4 @@
+AUX 1.1.0-meson-Use-install_symlink.patch 2399 BLAKE2B b38ed115a33786976472792db0297678c65efeb29a296db7e04f19649618ab2cf0063c1518d5c5fdb6d4c73d6e015cd79a451d6f6eb1876a8a04322114ab1631 SHA512 7779152808c1766b89e9f8c5896f61589fca3db50149301484c2a7cb4738aceb6a46bede36b74c6c3afc9b6a479e0cb04d9ef9719571b8da9ae4ed42371e90ea
 DIST libgit2-glib-1.1.0.tar.xz 140128 BLAKE2B e1e87fca17ec801059245c5687399f48886450f7ca7ea948f2179fed383543dec1b18b78abc3ec5581f570b488a166e1e03e99201385698877075be8b3205dbe SHA512 5e493b85a2bcbfea2a291e6dd243ee6948a31e7305c96c0bf04a750114de6ba3a06b435502eeae09bc1b91d34d5174e27bd4171fe969f1b376e820f82a3b5e1d
-EBUILD libgit2-glib-1.1.0.ebuild 1156 BLAKE2B dc2f3ae5c71ce3a99778ed18d170e43aa1a7015b2a01406104aa0f6f7202d7dc14d55b9eca716195d2fce9b55cac2c24c2ece8f1d7f87a43deab377f1fa51f7f SHA512 e50cb394f9a2ada31f9908d774f2938dc962d9450f32352952d5a038a9d6145a848357803982b338892cd715ccbeb0b2b096573560236ffe5259c445b21a1891
+EBUILD libgit2-glib-1.1.0.ebuild 1310 BLAKE2B d52e63399aa503feccbdad1e59f18f7edb6b697e5dc7f45eb756670cefabc4450fb1979c04be5206fc920b294ebef3faeb061d571a8baf9d7e64a6aecdf44277 SHA512 75b54453eb70026132b72f8e5a25ed67e07bcd557097efbac73ea924d45cc8a19028ed6b48517c885e86444f55347d3f28cb3f60b712890c1391c2ece4314545
 MISC metadata.xml 541 BLAKE2B 15c4b815fae2b173bb92c735fbcb57d0e2f7227cd6ec7b613676646a69bbab79fd95d0e43376f8dc5444ec8326e46f59e0c476228ee0816758568cd0bdb5a06e SHA512 420a424010054a85291977699691fb2626b224df9b24b99aaad9584e7d1944fb3e242cd989b7efe1cb393404490a0f798c985d4be80ccb5474b0681e86434fa8
diff --git a/dev-libs/libgit2-glib/files/1.1.0-meson-Use-install_symlink.patch b/dev-libs/libgit2-glib/files/1.1.0-meson-Use-install_symlink.patch
new file mode 100644
index 000000000000..d5ca886685ec
--- /dev/null
+++ b/dev-libs/libgit2-glib/files/1.1.0-meson-Use-install_symlink.patch
@@ -0,0 +1,80 @@
+https://gitlab.gnome.org/GNOME/libgit2-glib/-/merge_requests/37
+
+From 1659bb3a124c935848203828304c9efe943258db Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Thu, 13 Apr 2023 17:36:52 -0400
+Subject: [PATCH] meson: Use install_symlink
+
+New in v0.61.0, the install_symlink function lets us install symlinks
+directly from Meson, allowing us to remove the meson_vapi_link.py
+script.
+---
+ meson.build        | 10 ++++++++--
+ meson_vapi_link.py | 27 ---------------------------
+ 2 files changed, 8 insertions(+), 29 deletions(-)
+ delete mode 100755 meson_vapi_link.py
+
+diff --git a/meson.build b/meson.build
+index 8f30cda..5598e19 100644
+--- a/meson.build
++++ b/meson.build
+@@ -3,7 +3,7 @@ project(
+   version: '1.1.0',
+   default_options: 'buildtype=debugoptimized',
+   license: 'LGPL2+',
+-  meson_version: '>= 0.50.0',
++  meson_version: '>= 0.61.0',
+ )
+ 
+ libgit2_glib_version = meson.project_version()
+@@ -136,7 +136,13 @@ if enable_vapi
+   assert(enable_gir, 'vapi support was requested, but introspection support is mandatory.')
+   assert(add_languages('vala', required: false), 'vapi support was requested, but vala not found.')
+ 
+-  meson.add_install_script('meson_vapi_link.py', libgit2_glib_datadir)
++  foreach ext : ['vapi', 'deps']
++    install_symlink(
++      'ggit-1.0.' + ext,
++      install_dir: libgit2_glib_prefix / libgit2_glib_datadir / 'vala' / 'vapi',
++      pointing_to: 'libgit2-glib-1.0.' + ext,
++    )
++  endforeach
+ endif
+ 
+ # Check for libgit2 ssh support
+diff --git a/meson_vapi_link.py b/meson_vapi_link.py
+deleted file mode 100755
+index 20afe0c..0000000
+--- a/meson_vapi_link.py
++++ /dev/null
+@@ -1,27 +0,0 @@
+-#!/usr/bin/env python3
+-
+-import os
+-import shutil
+-import sys
+-
+-prefix = os.environ['MESON_INSTALL_DESTDIR_PREFIX'] if os.environ.get('DESTDIR') else os.environ['MESON_INSTALL_PREFIX']
+-
+-datadir = os.path.join(prefix, sys.argv[1])
+-
+-vapidir = os.path.join(datadir, 'vala', 'vapi')
+-os.chdir(vapidir)
+-
+-# FIXME: meson will not track the creation of these files
+-#        https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39
+-old = 'ggit-1.0'
+-new = 'libgit2-glib-1.0'
+-
+-for ext in ['vapi', 'deps']:
+-  src = '{}.{}'.format(new, ext)
+-  dest = '{}.{}'.format(old, ext)
+-  try:
+-      os.symlink(src, dest)
+-  except FileExistsError:
+-      pass
+-  except OSError:
+-      shutil.copy(src, dest)
+-- 
+2.39.2
+
diff --git a/dev-libs/libgit2-glib/libgit2-glib-1.1.0.ebuild b/dev-libs/libgit2-glib/libgit2-glib-1.1.0.ebuild
index 74abcf2694d0..121c3a8099ea 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-1.1.0.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-1.1.0.ebuild
@@ -33,6 +33,16 @@ BDEPEND="
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}-meson-Use-install_symlink.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)