11 files changed, 102 insertions, 85 deletions
diff --git a/dev-libs/injeqt/Manifest b/dev-libs/injeqt/Manifest
deleted file mode 100644
index 9ac91cb6c7eb..000000000000
--- a/dev-libs/injeqt/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST injeqt-1.2.0.tar.gz 73787 BLAKE2B 1b265c14a04dff8380297905f1b717c09baff6e24aedf473a36ff37be83d7e58b7ccae7df0eaf9690cee8c40d5646cb0af43a54427630db5595a9fa59d10e194 SHA512 4783f662af3b7711ef639695350bf136e84a218c8e2f0ddd8a44cb9790e1db5dcb69168fd46c21a82bd76eaebc01e5067e11be87823409d6ca032d2b95bfb880
diff --git a/dev-libs/injeqt/files/injeqt-1.2.0-gcc7.patch b/dev-libs/injeqt/files/injeqt-1.2.0-gcc7.patch
deleted file mode 100644
index 33e51ce739e0..000000000000
--- a/dev-libs/injeqt/files/injeqt-1.2.0-gcc7.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From de025e0c472bdb2fcabbc9dc2fd443b91ab28e28 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bart=C5=82omiej=20Burdukiewicz?=
- <bartlomiej.burdukiewicz@gmail.com>
-Date: Wed, 24 May 2017 18:52:20 +0200
-Subject: [PATCH] fix compilation for GCC 7.1.0
-
----
- src/internal/containers.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/internal/containers.h b/src/internal/containers.h
-index 8da4298..78dd212 100644
---- a/src/internal/containers.h
-+++ b/src/internal/containers.h
-@@ -23,6 +23,7 @@
- #include "internal.h"
- 
- #include <algorithm>
-+#include <functional>
- #include <vector>
- 
- /**
diff --git a/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch b/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch
deleted file mode 100644
index ffb8aae9b1b7..000000000000
--- a/dev-libs/injeqt/files/injeqt-1.2.0-no-Werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN injeqt-1.2.0/CMakeLists.txt injeqt-my/CMakeLists.txt
---- injeqt-1.2.0/CMakeLists.txt	2017-04-21 11:40:08.000000000 +0200
-+++ injeqt-my/CMakeLists.txt	2020-10-14 02:04:12.645803149 +0200
-@@ -37,7 +37,7 @@
- 	cmake_policy (SET CMP0043 NEW)
- endif ()
- 
--set (WARNINGS "-Werror -W -Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -Woverloaded-virtual -Wnon-virtual-dtor -fno-common")
-+set (WARNINGS "-W -Wall -Wextra -Wundef -Wunused -Wuninitialized -Wcast-align -Wpointer-arith -Woverloaded-virtual -Wnon-virtual-dtor -fno-common")
- set (VISIBILITY "-fvisibility=hidden -fvisibility-inlines-hidden")
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${WARNINGS} ${VISIBILITY}")
- 
diff --git a/dev-libs/injeqt/injeqt-1.2.0.ebuild b/dev-libs/injeqt/injeqt-1.2.0.ebuild
deleted file mode 100644
index 42410678e47c..000000000000
--- a/dev-libs/injeqt/injeqt-1.2.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Dependency injection framework for Qt5"
-HOMEPAGE="https://github.com/vogel/injeqt"
-SRC_URI="https://github.com/vogel/injeqt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	>=dev-qt/qtcore-5.4.2:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qttest-5.4.2:5 )
-"
-
-# https://github.com/vogel/injeqt/issues/18
-RESTRICT=test
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc7.patch"
-	"${FILESDIR}/${PN}-1.2.0-no-Werror.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_EXAMPLES=ON
-		-DDISABLE_TESTS=$(usex !test)
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/injeqt/metadata.xml b/dev-libs/injeqt/metadata.xml
deleted file mode 100644
index ffd102e1a324..000000000000
--- a/dev-libs/injeqt/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>reavertm@gentoo.org</email>
-  <name>Maciej Mrozowski</name>
- </maintainer>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-libs/libbsd/Manifest b/dev-libs/libbsd/Manifest
index c47ce9ccb000..dcf305de4709 100644
--- a/dev-libs/libbsd/Manifest
+++ b/dev-libs/libbsd/Manifest
@@ -1,2 +1,4 @@
 DIST libbsd-0.11.3.tar.xz 399712 BLAKE2B 1af04b8fcbc0bfa59fba549639d61a33ac934fe7ee42b506d1b0452e0b836b0bfdd3d8739de90465be46fe6a9d326a2d11bcf72280aa19ccba81db5da6d63d89 SHA512 a7015ea1ffa3766b1a4690526a25231898ad8275149b31fb6801082450172249997c36165626d101ffce53b59767a46676eebc0806426922fe4e773a0376c1f5
 DIST libbsd-0.11.5.tar.xz 409972 BLAKE2B 00c89ad1be351e7851538eac2744f5aef87b5937330d514d17af8a20a04bc6eab0e2bda61d0080da1d1439306b3b191ab68b4bc4cd8558ff0adfe402bfbf5b52 SHA512 c52c19eddd53630aca14f9f6221f7b84aa9cc798b4bb91e867822b161793313aab872ac1c0350d29312a72fee6e2061f3910ff918b724ec171d8c9de5837c841
+DIST libbsd-0.11.6.tar.xz 416600 BLAKE2B 23f7a5ea765af559e0e63946014650074d4d33f9e6655afbe6f08fd38265408a9fe3cccff0d0827d08817354deee92e4c6fd5536fd6f08857813e8847989d15c SHA512 9dbbfb84340fc69f59667241701d81d176439ce168f123344805898a269f7bd0e98abf8c7fc12d9bf539d1effb19424d93b647cc9120f693327e736d339e6075
+DIST libbsd-0.11.6.tar.xz.asc 833 BLAKE2B 895dee6d441da5e5b5b202dc2b5ea3635ba93352fdcd979fc3e58939dbd327b516b107d4e3c12d18dc824b6bc9793886e2a168add313d50884b1bd38d4f5f001 SHA512 29d77e53d251c641b00924c9c42b69b66eeb160ef0534e84a4ad1afd9009f87bda82f1b91d271efe37c676295add3fab01ce55aa6cd96aa0c5f34f9837b870cd
diff --git a/dev-libs/libbsd/libbsd-0.11.6.ebuild b/dev-libs/libbsd/libbsd-0.11.6.ebuild
new file mode 100644
index 000000000000..bee79d737b6b
--- /dev/null
+++ b/dev-libs/libbsd/libbsd-0.11.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/guillemjover.asc
+inherit multilib-minimal verify-sig
+
+DESCRIPTION="Library to provide useful functions commonly found on BSD systems"
+HOMEPAGE="https://libbsd.freedesktop.org/wiki/ https://gitlab.freedesktop.org/libbsd/libbsd"
+SRC_URI="https://${PN}.freedesktop.org/releases/${P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://${PN}.freedesktop.org/releases/${P}.tar.xz.asc )"
+
+LICENSE="BSD BSD-2 BSD-4 ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="app-crypt/libmd[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-3.17
+"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-guillemjover )"
+
+multilib_src_configure() {
+	# The build system will install libbsd-ctor.a despite USE="-static-libs"
+	# which is correct, see:
+	# https://gitlab.freedesktop.org/libbsd/libbsd/commit/c5b959028734ca2281250c85773d9b5e1d259bc8
+	ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libofx/libofx-0.10.3.ebuild b/dev-libs/libofx/libofx-0.10.3.ebuild
index 1acb92d8616e..543e1ad45550 100644
--- a/dev-libs/libofx/libofx-0.10.3.ebuild
+++ b/dev-libs/libofx/libofx-0.10.3.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/10"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/redis-ipc/Manifest b/dev-libs/redis-ipc/Manifest
new file mode 100644
index 000000000000..a26f9034e2e9
--- /dev/null
+++ b/dev-libs/redis-ipc/Manifest
@@ -0,0 +1 @@
+DIST redis-ipc-0.0.6.tar.gz 74682 BLAKE2B 76d12482519e446c55ad9e050614184e04c76d1f5d5e05b4a056a3339d8d94aedba2f5bda11e52e118ae9364937ae62f512b37d649e0e35c83aa686f679c0764 SHA512 6c54a42b29192cc79f92f2318aaaff03a56770fc2aed3d5b8c3724634c59c6fd0acfab2daf609899d3872e309e973ace6d6400bf014134fdc8e851c001637c74
diff --git a/dev-libs/redis-ipc/metadata.xml b/dev-libs/redis-ipc/metadata.xml
new file mode 100644
index 000000000000..7a782582eb36
--- /dev/null
+++ b/dev-libs/redis-ipc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>nerdboy@gentoo.org</email>
+  <name>Stephen L Arnold</name>
+ </maintainer>
+ <longdescription lang="en">
+		Convenience library for using redis server and JSON as IPC
+		mechanism (command queues, settings, status, event channels).
+		Can use either local or network sockets via C or C++ interfaces.
+	</longdescription>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-libs/redis-ipc/redis-ipc-0.0.6.ebuild b/dev-libs/redis-ipc/redis-ipc-0.0.6.ebuild
new file mode 100644
index 000000000000..fec9bd9c2dd3
--- /dev/null
+++ b/dev-libs/redis-ipc/redis-ipc-0.0.6.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A (redis) client library for using redis as system IPC msg/event bus"
+HOMEPAGE="https://github.com/VCTLabs/redis-ipc"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/VCTLabs/redis-ipc.git"
+	EGIT_BRANCH="develop"
+else
+	SRC_URI="https://github.com/VCTLabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0/1"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/hiredis:=
+	dev-libs/json-c
+"
+RDEPEND="${DEPEND}
+	dev-db/redis
+"
+
+src_prepare() {
+	sed -i -e "s|/lib|/$(get_libdir)|" "${S}"/redis-ipc.pc.in || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DRIPC_BUILD_TESTING=$(usex test)
+		-DRIPC_DISABLE_SOCK_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}