9 files changed, 4 insertions, 266 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 96d35444b8b2..b27259faf429 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/c-blosc/Manifest b/dev-libs/c-blosc/Manifest
index 83abe082204c..2599c0fb61fe 100644
--- a/dev-libs/c-blosc/Manifest
+++ b/dev-libs/c-blosc/Manifest
@@ -1,7 +1,4 @@
 AUX c-blosc-1.21.4-no-unaligned.patch 1275 BLAKE2B 899242fa0cf21d1a177e9633b7e7b38c764f424c327b832b54a16da1f6b519bfcda0493056c1d6db35678e73109e0e766e724dcfabb65c828b1cfa81b3b84677 SHA512 75796e0aae655cc1099ed84c51082adb50db0f7376c7f32925423206bb82b86f995a6ae5d311551fba4fdfb1f0c86c17e0dd43c30f94344680f66a9b9d7e5761
-DIST c-blosc-1.21.4.gh.tar.gz 2458878 BLAKE2B 5b58e5069ed99e67adaef832871d45e4e3b88dede169833b07bb1800d35d6d43909c59645f79c003f9a80604e432c81f7d5da35fd19899fbb0378e81f015b0fa SHA512 cbe8406dc88318a582b6ea5e5ba1a25b66814f741743dd512b1a61664691977bfe0896baf24d2e998cdbb209a3ba83c6eb79e86bc1e7a2eb5ef2cde697e8eb65
 DIST c-blosc-1.21.5.gh.tar.gz 2458960 BLAKE2B f56e19146a1522554d5e8de23f580125a6181b50f1898c8e622e8ac50f2f40ab4cdaba62a5a2bc6ff437257550e205090ebe66bb8840202a26567abfc63fbf53 SHA512 01e6d80e1114d76c4bd1b413778c293d0455879ec38e1e1ec46e8e7eaf2997b47cc2de35bc52cdc4c2c70341b6f87d70626a9a9c24ffc8b7b170d760efa60c07
-EBUILD c-blosc-1.21.4-r1.ebuild 1252 BLAKE2B 2ebe48d324bf19279978c0c290bf2e510aca64899b65c38a9df4e12e541d38ea7d05feacb4a3ba43af8d673fee0963cc5c3cd457ad0252c6256a5928428fab8d SHA512 fb3563480aefddb0e7bf2be5c4f5282473e9cfda32b1286fce4116fb0ca465d996eb32b87c3a21211cc66979a97fc241b321318009172a1215a2c9f6c5f4df50
-EBUILD c-blosc-1.21.4.ebuild 1186 BLAKE2B f749ad26fdb344fb6db1e71652b45c04a1e34b17e0c605f6ddbe2b32218f62bbb96d0083912f7694c483d462e6722c51aa8903e5d7f17a9ed0d297b956da3b97 SHA512 f27ae6ae95b4cad296f26871bf79675f9a99301a57fcf5d4341daf3ad3309803e162cb33ae9a2c9687394e7c19a432203d3729f0d8ac3d9d139db99fdca46ae8
-EBUILD c-blosc-1.21.5.ebuild 1249 BLAKE2B efd5fe30923d8465d4d4bca2740bd3edfa2e0d5362e4fa7e276edb1296da3fca6e289daf47100e3d2fb64856b599b5c954eea173b375f290d9aeb2d8e8b2b73f SHA512 11381092adfcc91d60ac37644f214fb29882d3c3055b5841bdabc8bf7707f75a51cfa29c58d670646f78928e814da2f4bf0da079c1a697825cbf3353a3e5435e
+EBUILD c-blosc-1.21.5.ebuild 1246 BLAKE2B 8a987f8f9bd174ba790b79fd4046f93e3d19c1936b718768c0de040b47a385ccd63e266e337485a4cdf2313bfd4e0a22fd23bca8b58efc2900e350df4e65fbc5 SHA512 589fb24c41001a6cf005ccd51ce44d35316391b147dca7a5c8a4cc9520d986a1327461f9580292cbbbde7acea3cc54245d3ba75fe94f451b651840d4bf1c68bf
 MISC metadata.xml 839 BLAKE2B 108d89a888ba31f03eb42a0717c7c9458d599cdb67cf98940c88ff943ce2079c736b6a52ac4206d4ceda17f56ea67e52dae1c77b304d39fbb9ec249a8ac38576 SHA512 f4ed6f93992492a98499ad1dff54b3fcd14e35710e0307041e606ddfff54769c5ed6ccd3ef90a5ce7943425bcee93ea9b46211f643da30d94db88adb6be7d5f8
diff --git a/dev-libs/c-blosc/c-blosc-1.21.4-r1.ebuild b/dev-libs/c-blosc/c-blosc-1.21.4-r1.ebuild
deleted file mode 100644
index bfeb84b2d188..000000000000
--- a/dev-libs/c-blosc/c-blosc-1.21.4-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="
-	https://www.blosc.org/
-	https://github.com/Blosc/c-blosc/
-"
-SRC_URI="
-	https://github.com/Blosc/c-blosc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="+lz4 +snappy test zlib zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	lz4? ( >=app-arch/lz4-1.7.5:= )
-	snappy? ( app-arch/snappy:= )
-	zlib? ( sys-libs/zlib:= )
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.21.4-no-unaligned.patch
-)
-
-src_configure() {
-	# remove bundled libs (just in case)
-	rm -rf internal-complibs || die
-
-	local mycmakeargs=(
-		-DBUILD_STATIC=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_BENCHMARKS=OFF
-		-DBUILD_FUZZERS=OFF
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
-		-DDEACTIVATE_ZLIB=$(usex !zlib)
-		-DDEACTIVATE_ZSTD=$(usex !zstd)
-		-DPREFER_EXTERNAL_LZ4=ON
-		# snappy is always external
-		-DPREFER_EXTERNAL_ZLIB=ON
-		-DPREFER_EXTERNAL_ZSTD=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/c-blosc/c-blosc-1.21.4.ebuild b/dev-libs/c-blosc/c-blosc-1.21.4.ebuild
deleted file mode 100644
index 3f604ce7bde4..000000000000
--- a/dev-libs/c-blosc/c-blosc-1.21.4.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Blocking, shuffling and lossless compression library"
-HOMEPAGE="
-	https://www.blosc.org/
-	https://github.com/Blosc/c-blosc/
-"
-SRC_URI="
-	https://github.com/Blosc/c-blosc/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="+lz4 +snappy test zlib zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	lz4? ( >=app-arch/lz4-1.7.5:= )
-	snappy? ( app-arch/snappy:= )
-	zlib? ( sys-libs/zlib:= )
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-"
-
-src_configure() {
-	# remove bundled libs (just in case)
-	rm -rf internal-complibs || die
-
-	local mycmakeargs=(
-		-DBUILD_STATIC=OFF
-		-DBUILD_TESTS=$(usex test)
-		-DBUILD_BENCHMARKS=OFF
-		-DBUILD_FUZZERS=OFF
-		-DDEACTIVATE_LZ4=$(usex !lz4)
-		-DDEACTIVATE_SNAPPY=$(usex !snappy)
-		-DDEACTIVATE_ZLIB=$(usex !zlib)
-		-DDEACTIVATE_ZSTD=$(usex !zstd)
-		-DPREFER_EXTERNAL_LZ4=ON
-		# snappy is always external
-		-DPREFER_EXTERNAL_ZLIB=ON
-		-DPREFER_EXTERNAL_ZSTD=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/c-blosc/c-blosc-1.21.5.ebuild b/dev-libs/c-blosc/c-blosc-1.21.5.ebuild
index 2e1f9ad15a7e..5003f52c8089 100644
--- a/dev-libs/c-blosc/c-blosc-1.21.5.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.21.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+lz4 +snappy test zlib zstd"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index a4bcfcc32b38..7e967f7a9225 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,6 +1,3 @@
-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
 DIST libgit2-glib-1.2.0.tar.xz 140576 BLAKE2B f49f808e7f97c45d7df49d780fdf036422b794e551f2e42d934b015fb227b1cb80d5067198a5ef7ac0539460bf6c0eab74025bcf367a0aebb43518448015e22e SHA512 37004e86c663ce5fe1bd54878b908575eb9195c1012e88e39c2efdb0b6cfa1de3d2ed9754cecc1b942d001698870025c87d95856f2a0a9f2d0dba1979b07b1f8
-EBUILD libgit2-glib-1.1.0.ebuild 1310 BLAKE2B d52e63399aa503feccbdad1e59f18f7edb6b697e5dc7f45eb756670cefabc4450fb1979c04be5206fc920b294ebef3faeb061d571a8baf9d7e64a6aecdf44277 SHA512 75b54453eb70026132b72f8e5a25ed67e07bcd557097efbac73ea924d45cc8a19028ed6b48517c885e86444f55347d3f28cb3f60b712890c1391c2ece4314545
-EBUILD libgit2-glib-1.2.0.ebuild 1247 BLAKE2B 4e25b135e81378a6ad8b9ce0684db99b3ca0013f274f3ed29e7eb46d59513ab288ef73c7c18178ffd5389433b5c7c389e8c2ec4cc9be2c81f801845be64e1a6d SHA512 ca6f249b9a8b2f5e7ec8b090fe1c2de736e3ee079023be2d3ebe9b9d4198742c5c1636310909b3551a76a95a3f9593f13ec10a98d8037c6455f7e4d666676add
+EBUILD libgit2-glib-1.2.0.ebuild 1245 BLAKE2B 7c5c3ab1c1b9a0e03a1697915deecb2bc9af6b8b54b884c948aae27154aff12f540a6d93e5684b87459a579f01bcf27177265661b7e658b44804843f6cfda6fc SHA512 4bbb16281e264e7474db2e2dd86160251563054c53c8d5ac810258ff293982ce771454ae5077b44b35dc020745b625368d1561b26dbe7b6020ed9d3b9ee18cba
 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
deleted file mode 100644
index d5ca886685ec..000000000000
--- a/dev-libs/libgit2-glib/files/1.1.0-meson-Use-install_symlink.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-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
deleted file mode 100644
index 121c3a8099ea..000000000000
--- a/dev-libs/libgit2-glib/libgit2-glib-1.1.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-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}/${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)
-		-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
-}
diff --git a/dev-libs/libgit2-glib/libgit2-glib-1.2.0.ebuild b/dev-libs/libgit2-glib/libgit2-glib-1.2.0.ebuild
index 5ed7edcfdeef..b1572974d3dc 100644
--- a/dev-libs/libgit2-glib/libgit2-glib-1.2.0.ebuild
+++ b/dev-libs/libgit2-glib/libgit2-glib-1.2.0.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} )"