gentoo auto-resync : 01:10:2022 - 07:10:12

14 files changed, 25 insertions, 181 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 8bfea8b31554..c495249f177d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/eventlog/Manifest b/dev-libs/eventlog/Manifest
index c3a3b2ac9c2d..e4791250dfa1 100644
--- a/dev-libs/eventlog/Manifest
+++ b/dev-libs/eventlog/Manifest
@@ -1,3 +1,3 @@
 DIST eventlog_0.2.12.tar.gz 303925 BLAKE2B 2321b26456380788752f8cb106f4e7b7ea30c9d463d04d536d46d0deb83a0640b86483f46acb33537f539c127a9dde484c121ad608ed43f1a8f525fd6c04aa3c SHA512 a681ab2961f5bf38e106a5b0b4492e74098808e2bf1a100f545736902649c705db124c0847796a47485faa8b0befe691a789d752f313c5b65ad50ed2763d2cce
-EBUILD eventlog-0.2.12.ebuild 668 BLAKE2B 762525f8b0f4de2f5200235a2dd6b115e1ba25d9d00cdfa1365e0270930fd47512f338a3723e5df80c4d4dc1947a3e1f266d28bf9765b29c21b357127f20cddd SHA512 8d09d20f9384442a4701918bbe97028d854ae6c4bfac2802daca98ccdd0c29b5af7545e9307218109604df896798c822b068861be5491f33b4add932f0151c9b
+EBUILD eventlog-0.2.12.ebuild 678 BLAKE2B a62e7066e6aedb8a93717851df8e8ba2ba9277732bc3c0fc7c924619c723bbd5bdc002c61b004fb401ee9e8d5e80bc5c3af0f819c1e55a911e717c401ecdb8bf SHA512 d1830cb2c659106545a53418ea19f64deb1d47a3441caeb4bfbf50f221bef7800c1591b6d33f51b6870084c51f419aa58131d75963cbf2c353d1db93765f0cb1
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/dev-libs/eventlog/eventlog-0.2.12.ebuild b/dev-libs/eventlog/eventlog-0.2.12.ebuild
index 528c481f39e5..63c44c31efbd 100644
--- a/dev-libs/eventlog/eventlog-0.2.12.ebuild
+++ b/dev-libs/eventlog/eventlog-0.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit libtool
 
 DESCRIPTION="Support library for syslog-ng"
 HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
-SRC_URI="http://www.balabit.com/downloads/files/eventlog/0.2//eventlog_${PV}.tar.gz"
+SRC_URI="http://www.balabit.com/downloads/files/eventlog/$(ver_cut 1-2)/eventlog_${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-libs/libmaxminddb/Manifest b/dev-libs/libmaxminddb/Manifest
index 7828abc03a97..4dfcf2b1e48d 100644
--- a/dev-libs/libmaxminddb/Manifest
+++ b/dev-libs/libmaxminddb/Manifest
@@ -1,8 +1,8 @@
 DIST libmaxminddb-1.5.2.tar.gz 604683 BLAKE2B 4dea7413be59169104adf3dc5dfe3e4f3bdb4639bbb4a0c6365d93216e279d505f01e32f737bf66d9f5b98f65f3eaefa46f630458bd6032a32be8c74acf12a1b SHA512 074ef6b62a74cede7be332eaeff5aa7442f43de92d39ea65b38430f0e1b65a5515f4343894ca5c28a7d50181eaec44e8db7083461b9e12e7014d2d1e0ff033b8
 DIST libmaxminddb-1.6.0.tar.gz 605099 BLAKE2B 6868e42b8a166d75f6fa3a1da0fc2bd47a381ff960496ec9348b88c72b1bae180e3c0ce8989149e60d7d9c795d6baedb8e9d984098914064db985f2d201983c2 SHA512 9394e8dd959982d4ef5d15a928d32700722ed9d6c9988d9cc1bf2f4e67de0a53cc6987e90aaef3a6926c9ff36ac378f7a1fe47818fda4f5a3a22539210b2d004
-DIST libmaxminddb-1.7.0.tar.gz 609484 BLAKE2B 7210b32e591116d6e5b3127cde082aace3080ce6ce0182908eb3c85fe36ae574633d4b99ee1a19f770ed6bd2ebb6dc478c1d94f1d60c607ce76f34d71eefe74e SHA512 b1d6bf8dc3f5d3cc594f670c8a51100d7f032ce40d6e8a620b90133d1f27c668a7362146e7973cb0e3b84649ec60fe145e82e85b459dd50ae1e168e87d936109
+DIST libmaxminddb-1.7.1.tar.gz 609542 BLAKE2B d67e09aecb1b250bae59c4165571e1ffdbea36e10a9994c5f26b5139fffab35b5e31dbe105b4f60eca3ed694177f623f471231d0b8b9d2777dd0daeb27596f17 SHA512 5ad6e5f20dd0fd094d2e44b950256e3e705f6b7d1a5ffcc08f46d92917a540ac23796c670fdd7292b040fd78d2fe0dc10b16cc07ae941b00140e6301d8c2ac30
 EBUILD libmaxminddb-1.5.2.ebuild 669 BLAKE2B 4b789f4f6389f90041907c455fe34765881a5722234800371371db435ee4fb9827b01b6a88209db22ee3ca74abcaa97706b3993e906b76277de0afb6356bc7fe SHA512 d51716ef0432573944954ac8cfacb00d559f78bea9b5b3ea82303ba06a554107ab993ff5af06e45c2a614481eb75370453f49633f5a8357a026add5ccaf731de
 EBUILD libmaxminddb-1.6.0.ebuild 886 BLAKE2B 0bb0544733b440fb8d2dd3aa9b25078fce928b58bd665c96f6c98d29f35e878cc64e75aaeff55c2a4351ce786086e54e204305f433fdb6ef655c153fad48b81e SHA512 d14c592c4977dd04bbb7d6473918bdb3199b327484e7186ba999fab021baabe46d3eb55c4a5e89823c46d1e277c694b5c8aa78bd2fab445e0a06e8ea28d6b27f
-EBUILD libmaxminddb-1.7.0.ebuild 878 BLAKE2B 863919557c92a23241904f7e2dd3849ccc2a80649fa6f299fe6692cd878797e5fd4f7fcaa5e3a2e97735b891af7efc8dd8deb222b3821b03c7bfa5ee65030cc7 SHA512 fcebcb0f750b2d051e68f8577df1dcea6b9f7a03c06789811a3d090a75e5ebed01020c53a4f9afbaf60e9757c6b2532bee250639a4d2f58e7092e5af46d03c31
+EBUILD libmaxminddb-1.7.1.ebuild 878 BLAKE2B 863919557c92a23241904f7e2dd3849ccc2a80649fa6f299fe6692cd878797e5fd4f7fcaa5e3a2e97735b891af7efc8dd8deb222b3821b03c7bfa5ee65030cc7 SHA512 fcebcb0f750b2d051e68f8577df1dcea6b9f7a03c06789811a3d090a75e5ebed01020c53a4f9afbaf60e9757c6b2532bee250639a4d2f58e7092e5af46d03c31
 EBUILD libmaxminddb-9999.ebuild 878 BLAKE2B 863919557c92a23241904f7e2dd3849ccc2a80649fa6f299fe6692cd878797e5fd4f7fcaa5e3a2e97735b891af7efc8dd8deb222b3821b03c7bfa5ee65030cc7 SHA512 fcebcb0f750b2d051e68f8577df1dcea6b9f7a03c06789811a3d090a75e5ebed01020c53a4f9afbaf60e9757c6b2532bee250639a4d2f58e7092e5af46d03c31
 MISC metadata.xml 366 BLAKE2B 391a64aa942bf9e1c352b404d253771843370f5d48da01f2e85e54af03eea10d66796adde9a158aa828877c9af021f5cfd58623f623fea9ae5cdf6b226e408d5 SHA512 c0d26d2b5100832047831580d41157b4cb0bd6816b009e9051edfb615548f115ad0dbed8c2267a7811f22c3610a79e809bf9b3b7bb6efb278ea693c06cd73ee5
diff --git a/dev-libs/libmaxminddb/libmaxminddb-1.7.0.ebuild b/dev-libs/libmaxminddb/libmaxminddb-1.7.1.ebuild
index 0b83ce40a0f6..0b83ce40a0f6 100644
--- a/dev-libs/libmaxminddb/libmaxminddb-1.7.0.ebuild
+++ b/dev-libs/libmaxminddb/libmaxminddb-1.7.1.ebuild
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index c9ebf1cb0dae..7253bb361653 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -1,9 +1,7 @@
 AUX libvterm-0.1.4-slibtool.patch 2251 BLAKE2B d8484447c8a7e352514b298634d3e39bf606a5669cda67ef906f29b4a411737d81277e060fdd01cb14d1d04d329af1207dbeee475baff5cabc7afe9b5573ac78 SHA512 dd8d3b8c192bd6f6b357f7c5849a0b2a94661410e7f3cf5f6301a3cd34884362a54dc3ac593895f186ce3ce3628c2a8804f555107fb57d9a82a91ddd8cdca39e
-AUX libvterm-0.2-slibtool.patch 2328 BLAKE2B 9a03c8fae1228e07eb7245c06f46fe489760a6c2e4b183fa27444169254369f8ce71e27b011b9b6370eed6422d04993f0bdf3662266ac5f88e16d567aec55230 SHA512 fc714e88f3dcbaf48667e49377639ed2d58bdc9000b1f909108ee6d98dbdadd390f6b66f311524a57ce2ca83488d3d745e431816b572cdd73f9d63714eb85d16
 DIST libvterm-0.1.4.tar.gz 69122 BLAKE2B 4f0acc9ec6755c4a840e5df6c32c44e12c5316b5c5918d0e8eada19d819736c3e5b9090b468e32b3141a7fbb5ba226e365be27d6d1d9ca22f9f5e365fc3971c2 SHA512 90b5d47417e3f469df5c6574a27d12bd6bd1571d17cab7c4ac0ee61b1dbcb6361987f6fdfd11e314ea32f8958ec165c319a34d0f77288947c7cbc11de697d524
-DIST libvterm-0.2.tar.gz 79712 BLAKE2B db17d15550a595652368edd7ee0ccab2a69effa79677a23d6ee94731fc05d685df0de843d2e953cd59d2077922e72834d7ab09eaf5260aed869d9511cfd224a7 SHA512 bc99ae4fbdc165ced92c10fb0168ae6da2ed702208064616fefcd42aba71c57b7d42a08bc5b0e7e1ebda8cc4b5682d16059bdd2edfb12fbd8ac97527e854b14c
+DIST libvterm-0.3.tar.gz 83861 BLAKE2B a2e8e9d80698880d87f9d26977a4e3dec7b520c3096d0ca6f7823254eeebe51666380ed2a5c05c923dd8b138f15c87e671fdfb03e5511c01711e112cdda9867a SHA512 2a7b6831476465d6a9f7c792406f4e3c4eca0c3dbce4b7031f2646c87e33692128a3d3ce27e1541403772cc0b5eface7bd41325e1e5300c3915bfc0bac97a896
 EBUILD libvterm-0.1.4-r1.ebuild 728 BLAKE2B 463cd2bf20ef1c8eba98789969bb2dab24599a2923c13e204d73ddbe407cd957ed37938f388603b4a542b71b369eed2aab249f3061c0c7b417f1e365b4fd5085 SHA512 45bdbde642172c252b94375f44207a1a011cdc5fd36a2330ced3434c9059dcb27277f076ba5d82542b7851f4699f3f673da3c85295c0e4c2ef1cfd77050f3f05
 EBUILD libvterm-0.1.4.ebuild 882 BLAKE2B e4f2e22e191ce35883e9fa2700222e55b8c5d482251aa5dd9f35d982fa18d20371ff3781a5962a07aeade487ee0c0e4df474023894c035154aa79425e477dc81 SHA512 70201223cdcad83064d87b949525040294d925002e4b12faf318353a211171a596d3992413731c8d71b377bc866095d9811a4bb110d03b414022b1bcf64b33e3
-EBUILD libvterm-0.2-r1.ebuild 941 BLAKE2B af9950eb2c5ecad18c968814394ffac2cebb41199df8b06f208ca58594a884f6b95f3f62c9ca2d42313998b4181aa2852cfd0aee43da9eedfed4d18e62d4a19b SHA512 d9d6fd02caf0e0541ccd74f2690237216664c5d6a6eea928b2c6b4c4a88ab89ae80f7ca7737cb82295213f1dfcbb9d8b743cb96b6afb9d24e4137806166073e5
-EBUILD libvterm-0.2.ebuild 1098 BLAKE2B afaf31a7a3da3eb8817b796f70d8388a26f8006bbbed97d4906ff365e5f81864be7009e91c94aebfa0c76b56f396e7f3d58920733ad0108578b4acf9834be6c0 SHA512 ad3e3b00c078bf7d59682e8072058223cae92251e7fdbf9095efd37c4b4555a0c1da2f21f8712a4f712c17e8f3a0ba47001d9e5e9f8220e930f6496e1e455613
+EBUILD libvterm-0.3.ebuild 777 BLAKE2B a25765bcd54f73ac1f6bc552e253675bc69edd372b2851f130d51705e8c8679d4e080a2051b608a41d97dc327a76a3132b08657cebac2ce973974a6976fabe95 SHA512 f125bf30f72d4ea72cccdbaf7ce2bc077f533dd0bc0cb6ad1f451c1d9c86d3685d5b54d56b3da9cf121889a4b46db96e685ab6ae9eb26abf364d64799f617b1a
 MISC metadata.xml 326 BLAKE2B 1ede96c6ed5288e9f8603f2c1fd2daad8bf48384c09b01de355628fd970e3f252b6d064cff58d70fb5838cdf0edaa71c6d83e65f240e0ce48559ef74cbff43b3 SHA512 951e8795d8482cd230a256c4084f5d0e28d9cfb7fdae75f239f72b7d67d900c9545b47bdafc8260eec393c302eed4fdd70912e965521312705fcb4ddb281d814
diff --git a/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch b/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch
deleted file mode 100644
index 5f6356da2761..000000000000
--- a/dev-libs/libvterm/files/libvterm-0.2-slibtool.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From: orbea <orbea@riseup.net>
-Date: Thu, 14 Jul 2022 13:18:26 -0700
-Subject: [PATCH] build: Add a minimal configures script
-
-When building libvterm with slibtool using the rlibtool symlink the
-build will fail when the generated libtool is not found. This file is
-required with rlibtool so that the build can determine if the build
-should be shared, static or both.
-
-This can be solved by adding a minimal configure script.
-
-The build steps are now:
-
-autoreconf -fi
-./configure
-make
-make install
-
-diff --git a/Makefile b/Makefile.in
-similarity index 90%
-rename from Makefile
-rename to Makefile.in
-index e3c1c39..70e7ca2 100644
---- a/Makefile
-+++ b/Makefile.in
-@@ -1,13 +1,13 @@
--ifeq ($(shell uname),Darwin)
--  LIBTOOL ?= glibtool
--else
--  LIBTOOL ?= libtool
--endif
-+top_builddir = @top_builddir@
-+
-+LIBTOOL = @LIBTOOL@
- 
- ifneq ($(VERBOSE),1)
-   LIBTOOL +=--quiet
- endif
- 
-+CC = @CC@
-+
- override CFLAGS +=-Wall -Iinclude -std=c99 -Wpedantic
- 
- ifeq ($(shell uname),SunOS)
-@@ -36,20 +36,21 @@ INCFILES=$(TBLFILES:.tbl=.inc)
- 
- HFILES_INT=$(sort $(wildcard src/*.h)) $(HFILES)
- 
--VERSION_MAJOR=0
--VERSION_MINOR=2
-+VERSION_MAJOR=@VERSION_MAJOR@
-+VERSION_MINOR=@VERSION_MINOR@
- 
- VERSION_CURRENT=0
- VERSION_REVISION=0
- VERSION_AGE=0
- 
--VERSION=$(VERSION_MAJOR).$(VERSION_MINOR)
-+VERSION=@PACKAGE_VERSION@
- 
--PREFIX=/usr/local
--BINDIR=$(PREFIX)/bin
--LIBDIR=$(PREFIX)/lib
--INCDIR=$(PREFIX)/include
--MANDIR=$(PREFIX)/share/man
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+BINDIR=@bindir@
-+LIBDIR=@libdir@
-+INCDIR=@includedir@
-+MANDIR=@mandir@
- MAN3DIR=$(MANDIR)/man3
- 
- all: $(LIBRARY) $(BINFILES)
-@@ -73,7 +74,7 @@ src/encoding.lo: $(INCFILES)
- 
- bin/%: bin/%.c $(LIBRARY)
- 	@echo CC $<
--	@$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $< -lvterm $(LDFLAGS)
-+	@$(LIBTOOL) --mode=link --tag=CC $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
- 
- t/harness.lo: t/harness.c $(HFILES)
- 	@echo CC $<
-diff --git a/configure.ac b/configure.ac
-new file mode 100644
-index 0000000..39f7767
---- /dev/null
-+++ b/configure.ac
-@@ -0,0 +1,14 @@
-+m4_define([version_major], [0])
-+m4_define([version_minor], [2])
-+
-+AC_INIT([libvterm], [version_major.version_minor])
-+AC_CONFIG_FILES([Makefile])
-+
-+LT_INIT
-+
-+AC_SUBST([top_builddir], [$abs_builddir])
-+
-+AC_SUBST([VERSION_MAJOR], [version_major])
-+AC_SUBST([VERSION_MINOR], [version_minor])
-+
-+AC_OUTPUT
diff --git a/dev-libs/libvterm/libvterm-0.2.ebuild b/dev-libs/libvterm/libvterm-0.2.ebuild
deleted file mode 100644
index 84e1e689e51e..000000000000
--- a/dev-libs/libvterm/libvterm-0.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
-HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/"
-SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-# Fedora have a revert patch for now:
-# https://src.fedoraproject.org/rpms/libvterm/blob/rawhide/f/libvterm-0.2-fix-resize-buffer.patch
-# so let's see if 0.2.1 is any better or if this is actually needed for us?
-#KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-
-BDEPEND="
-	dev-lang/perl
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-RDEPEND="!dev-libs/libvterm-neovim"
-
-src_compile() {
-	tc-export CC
-
-	append-cflags -fPIC
-	emake VERBOSE=1 PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
-}
-
-src_install() {
-	emake \
-		VERBOSE=1 \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" install
-
-	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
-}
diff --git a/dev-libs/libvterm/libvterm-0.2-r1.ebuild b/dev-libs/libvterm/libvterm-0.3.ebuild
index 3e8037c9ec7b..5011f386127d 100644
--- a/dev-libs/libvterm/libvterm-0.2-r1.ebuild
+++ b/dev-libs/libvterm/libvterm-0.3.ebuild
@@ -3,38 +3,26 @@
 
 EAPI=8
 
-inherit autotools
-
 DESCRIPTION="An abstract library implementation of a VT220/xterm/ECMA-48 terminal emulator"
 HOMEPAGE="https://www.leonerd.org.uk/code/libvterm/"
 SRC_URI="https://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-# Fedora have a revert patch for now:
-# https://src.fedoraproject.org/rpms/libvterm/blob/rawhide/f/libvterm-0.2-fix-resize-buffer.patch
-# so let's see if 0.2.1 is any better or if this is actually needed for us?
-#KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
 
 BDEPEND="
 	dev-lang/perl
-	virtual/pkgconfig
+	sys-devel/libtool
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-slibtool.patch # 779034
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_compile() {
-	emake VERBOSE=1
+	emake VERBOSE=1 PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 }
 
 src_install() {
-	emake VERBOSE=1 DESTDIR="${D}" install
+	emake VERBOSE=1 DESTDIR="${D}" PREFIX="${EPREFIX}"/usr LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
 	find "${ED}" -name '*.la' -delete || die "Failed to prune libtool files"
+	find "${ED}" -name '*.a' -delete || die
 }
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index f16b96170079..9655fd583680 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -1,6 +1,6 @@
 AUX unibilium-2.1.0-no-compress-man.patch 576 BLAKE2B a99123e8be6e229c0661b2ca9df0a56c5280e9f0a3f1e2fffae10537f5dfcd1e6ba5b35a78ceda8b52437b42442e30d1793c5a79ade78bbe2755e2d17c84d505 SHA512 501f93e537dcf8e2b5cd03e63d6c03b91c422bea52a4f615fbdd0acd64ba839d95dcf2f209ca28dcdeece902445a19d5777329a40af7b795529ea8cd9755ce53
 AUX unibilium-2.1.1-libtool.patch 2273 BLAKE2B f6104f56510f2b876bf05f6985f1d8c8d0cf4282329999c3c2b911549f46bc4c4dc2a3b1e503dfa3146c8c1cb43f22f724a8dc4235a9a8d7a268c4ecbd8b18ab SHA512 8229eac14a6cf7859a08fd12eca00a2849a1872564d4313a751c4d618e1c784ff4ecb31f5a92c103c84a0ba9c96b98c7d73f30006ed51754170fdfd8cf23fa87
 DIST unibilium-2.1.1.tar.gz 121998 BLAKE2B 0bd032d0cc32011fa66604b39412116824b79aeb3cebb394efcad7591d5bd18031d465f7736ff1e65914f2fcf7beca1cbee4c7ad07426cdbf45e1c82e1894d94 SHA512 ebcdcddc6c3a540d086b113bb83470c1c17cf59056b28308a484b20dc3df71de0f5d6e5bf105f9e4a8347c78500c65ae46c2b53ec87692a898c321a047664ee2
-EBUILD unibilium-2.1.1-r1.ebuild 651 BLAKE2B 5273545f3c0ed05837ebe803eecdc87f4e02a83d6df4193c9e598d81a5ddd5419877821efbd2c151a60ef357b4a10c852557222927764d57fdad994002eb7a1c SHA512 c2e62a9855b1366decd890b2975c11c2217e5612d6a31292c5c93d32549f14b02b17f0ee6e39d52c647dba874531eeb30dd9d2c27b5b518a103252b84095c535
+EBUILD unibilium-2.1.1-r1.ebuild 649 BLAKE2B 2ce91b37e60326eaccf582183d65a45f6a86a0f8de9d0ec9d94a1d4f83611bb8932d2c260e8e70de8e61d7c26a0561c8a3716a82da7296f837ae9f56d8d7beae SHA512 05c70f5080878cd907e42ab6be2aa14193cdb0b906ffb1caf68152de4841497f0ec9d337166cc5475dc4c1411ddcf7d2ce604137d227aa3d6f34e647590a5fec
 EBUILD unibilium-2.1.1.ebuild 883 BLAKE2B c3621a4920d75123cff0e4b1cffbdad962e52984f7c20d186a1b5c7203f83e11b66a5658c4c6f9438cd5f4d17a9d5efeab254151a62e8fc3f4febf40d148b757 SHA512 03746e24f81a6700a4dd72d18417bf1d795ee96464850491719cae7ac51e5f9398a98516e056de16854ad2bbf271dbf3f25a4ee68bbd2f32460e96b36eed46ef
 MISC metadata.xml 340 BLAKE2B fbc2fee17ce03a1aafb74a76eee00909ec9d6ab01a62bb0fc0fbf7a9e0e30fab6390ab964d908b9d3b3c22400e5720856da6aac6a3c5ac77a0f3c8e1493f7316 SHA512 bb01973af5dc1a5240f268e62428a227fc4f575bb2d359c4b1f9d129d5c5693a17054aca080a72dcb938b325c493d9690bcfc5e15feab675f02c50bc855f8dc9
diff --git a/dev-libs/unibilium/unibilium-2.1.1-r1.ebuild b/dev-libs/unibilium/unibilium-2.1.1-r1.ebuild
index 361950435198..faef5821c970 100644
--- a/dev-libs/unibilium/unibilium-2.1.1-r1.ebuild
+++ b/dev-libs/unibilium/unibilium-2.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+ MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~x64-macos"
 
 BDEPEND="dev-lang/perl"
 
diff --git a/dev-libs/xbyak/Manifest b/dev-libs/xbyak/Manifest
index 2f1ecca63ac6..eac4a08f9bac 100644
--- a/dev-libs/xbyak/Manifest
+++ b/dev-libs/xbyak/Manifest
@@ -1,3 +1,3 @@
 DIST xbyak-5.73.tar.gz 214021 BLAKE2B bf7ab78df7ac3f5a8860b3a613957bad8b6faba523126f6f4ce94be4ce25da8b91a418ac2445d8d706f09fc7434a8ab9ef6f63c56ef0b7860290fe6801849fe7 SHA512 1c2eb73c2e9b66d4b4f7689e071ea8ba8a3b7f0e05ef885ad35ca89f706772bd6e8ad448581c954b1a24f424ebd2db4e420410450a951fda7e02d6fd2e5e9a67
-EBUILD xbyak-5.73.ebuild 467 BLAKE2B d826f6cebb8f5bbe2cada4325e58e44df2c1f7834586a236bb41aede02737047938c741d336a519e949f604fbaf276c6cfa3caea2a1cc35b8cc1ae2a67456876 SHA512 678b36a0a5eca831168cf6d97b4495d592f0114003c6104c108e5546acb9e09093fa98a9b24d69e32244a80e3a5fb638a88f32990406787bafc5b0431d5c4bef
-MISC metadata.xml 213 BLAKE2B 836159b1fcb0071741f6524eae1f052532c6853928f987ae8a032163b087f4a0d715a3f71252dcdf0e86b9ff3badbf2835b5af788f240569b82f840303f69590 SHA512 ee88ccf1397b9d29bc34982bd9acd7477e6faf8b70400695d4d492d4b1121a3ceb806f2f87574bb923c73adf30c77ac6e8a150a4f76da1b244c7aecef77b3ccd
+EBUILD xbyak-5.73.ebuild 468 BLAKE2B d11002414f35a75260141eafeede0f8ac7a0e1f96a0689f574493ef793c8048b77ec8b02db3cc675ac0ab8c496ccfeb3a7f4fcf34f60f6ef62679357cc1e0000 SHA512 8a2bd5194914eb0123fe7edeba613c2e4d8431beb8b1226b0d824a24ce7700fcc9516838b4b7e6b28602239416df4c0d670be93238984c161c32f9dd74ae6c66
+MISC metadata.xml 294 BLAKE2B 6ff08f098a11aeedc66f4d1a7f11063f90e97707b1761c18859dfe849ad5263b251667eb9076df58a0a3abde48a0e3a468a7df22230df38bebedb62ff3cfb68e SHA512 fd0a122d24814090c80745bf2ecead1fe87722bcdd19464bd3a48f4d09d067c9dae8153d8c04c62cbf5008ba13f44509080a950f2acad9710bed04e6fc040b76
diff --git a/dev-libs/xbyak/metadata.xml b/dev-libs/xbyak/metadata.xml
index 1b142c23f268..afe279a31d30 100644
--- a/dev-libs/xbyak/metadata.xml
+++ b/dev-libs/xbyak/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>zx2c4@gentoo.org</email>
-</maintainer>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">herumi/xbyak</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-libs/xbyak/xbyak-5.73.ebuild b/dev-libs/xbyak/xbyak-5.73.ebuild
index 4cfd5772e810..751793158e94 100644
--- a/dev-libs/xbyak/xbyak-5.73.ebuild
+++ b/dev-libs/xbyak/xbyak-5.73.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="JIT assembler for x86(IA-32)/x64(AMD64, x86-64)"
 HOMEPAGE="https://github.com/herumi/xbyak"
-SRC_URI="https://github.com/herumi/xbyak/archive/v5.73.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/herumi/xbyak/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"