gentoo resync : 20.03.2022

4 files changed, 2 insertions, 95 deletions

diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index f528cc480948..677b42af11b4 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,6 +1,3 @@
-AUX libgit2-glib-0.99.0.1-vapilink.patch 848 BLAKE2B f37a6220afa807eb45c5e0fa45792c863c2b64d6217f40466f72771e0ff708b9952316c2f354d0d0b303cbf26615155d5ef75e494d9e92d6b1e93ffcfc61dcfb SHA512 86ba5754300ec4852aa09f475e6ad29fb8dcadb7634a919d14c88525b8299e0af6fd2a5640feff6c07ae94f2116584933e58466dd5ebc6bae09c17e58b3e0e34
-DIST libgit2-glib-0.99.0.1.tar.xz 140996 BLAKE2B 0c163467ea43ab236b2c856416940b1ed7c93e6ed8ce9980d2d146f0633830ab3765d8bd34bdaab31efdb4096e88e0513c9585b9e06a3efc800d5c32a0d29479 SHA512 48b34ba84b5315d23d0429a684753c3a64c62086d70a67fdb4dfbf8f2ee883f5a90d7e59cfcfd229682794c455b668eb9bd7bf6159d6bfa45a99ddc2461d7c25
 DIST libgit2-glib-1.0.0.1.tar.xz 141664 BLAKE2B a99ad6db55d0d4bee4d7d96b92e92d12712843e41e25e5ab57f5722926fe3e95109a33654d0ab94b7f919bd5d51a0b159dcae720eee763200c964d0327b8a37d SHA512 8e156791783f79d585fa83267a5e14a4a93324fcca75e836478ddd5b5c53d9e827b07a3738c67116478435613639aab0992f32413b9a4de5fc4ff641dd042e80
-EBUILD libgit2-glib-0.99.0.1-r2.ebuild 1303 BLAKE2B a78542a2d8b2f822d1624c5ba098ea681ccad65feeef0db9f34648925e1d41cbad9e7d4f799a957e650fae3b5789f67e3c9afee6284d1dad66237f0d5a0dc2e8 SHA512 1c177814b210279e7d82e34f452d24dee5a959d3a05c84f10ab5aad2cc36c37ada017974b494332dda1c20fb75fbab52a01422818e7af9e0ab54ddf3a94e8dd0
-EBUILD libgit2-glib-1.0.0.1.ebuild 1255 BLAKE2B a443a02233fc3487ce0cd7ebd415bbea61c663b42135c1da4fcdad9f48ee73011e54d96dca7b0728ac9dd6ed5513beda99fcee96b558a4d182f4c1e7511f1306 SHA512 e06912996abbd6186b37458a09e774e0216acc5aac0edd4e126224e2abb05592321523187abc27defad05d8a55ac398ae53e14f0b2e4702cecd924f0abc3f0fc
+EBUILD libgit2-glib-1.0.0.1.ebuild 1253 BLAKE2B 69db594f58807be22ad29aceed690eb17f96387403ade7577de007238556f1aa172cf380b874aee29e23c416e2924ea80ffdd3a0b1682f400b06ecfdabc2e4e6 SHA512 551dd9264d1f2a3e052b4dfe3bd829b136b1ecd20a0b4fb40256a6d47dbabd32f80027e853c64c3ae31b379c369020076cea073046685dcfe42914dec9720313
 MISC metadata.xml 432 BLAKE2B 69d6aa326333089515925cd4c8cc5c2d86318cbe148349f2e2f1554afd8c659a5ce3aed28ad02562d8552317bb010f866e10e3793e47f5a7a5c82d11d8702e51 SHA512 bf228fa30f58c6d860b7648eb40e841c72398390539980fd48e35860f6874e141c3b81c373ee3ca1cb8bbbde5dec36a94c5381b102e1ec33e91962455d9fa8ee
diff --git a/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch b/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch
deleted file mode 100644
index a1838b403ab8..000000000000
--- a/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7f63349fd0405439532f2ff0896a3697c73ccaaf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 27 Feb 2020 15:20:20 +0100
-Subject: [PATCH] Fix meson_vapi_link.py to respect DESTDIR
-
-Fixes #5
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 6d314b5..3a423b3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -135,7 +135,7 @@ 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)
-+  meson.add_install_script('meson_vapi_link.py', get_option('datadir'))
- endif
- 
- # Check for libgit2 ssh support
--- 
-2.25.1
-
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
deleted file mode 100644
index 24d9151a5225..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-VALA_USE_DEPEND="vapigen"
-
-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 ~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/gtk-doc
-		app-text/docbook-xml-dtd:4.1.2 )
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/libgit2-glib-0.99.0.1-vapilink.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-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)
-	)
-
-	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
-}
diff --git a/dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild
index 72d8c26339c1..ee3a43c9aa88 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-1.0.0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 IUSE="gtk-doc python +ssh +vala"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"