From a1fb66eaefde8291f3908d44f0e1143117eceddb Mon Sep 17 00:00:00 2001
From: Kevin Thomas <me@kevinthomas.dev>
Date: Wed, 29 Jun 2022 12:46:29 -0700
Subject: [PATCH 01/36] net-misc/xmrig-mo: add 6.18.0

Signed-off-by: Kevin Thomas <me@kevinthomas.dev>
---
 net-misc/xmrig-mo/Manifest               |  1 +
 net-misc/xmrig-mo/xmrig-mo-6.18.0.ebuild | 59 ++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 net-misc/xmrig-mo/xmrig-mo-6.18.0.ebuild

diff --git a/net-misc/xmrig-mo/Manifest b/net-misc/xmrig-mo/Manifest
index b97f635daa..75ab12a585 100644
--- a/net-misc/xmrig-mo/Manifest
+++ b/net-misc/xmrig-mo/Manifest
@@ -2,3 +2,4 @@ DIST xmrig-mo-6.16.2-mo2.tar.gz 2480342 BLAKE2B cfb1078f67913f3719dd929a1a41ef20
 DIST xmrig-mo-6.16.3-mo1.tar.gz 2481805 BLAKE2B 7d134bc4294824e5a79b2782a07a5e0513e77ecff79deb8434c3b36c3ac21053679e451cc3cde97a84908e56fa151b4cd142711c6a7d5c016b6968cec4d21e7d SHA512 e27a529315ea819d2ac41cb28ff9c5cf386e8c687aad29c170acd1d84563ca4aecf97efdbb2c5d766c63439f65aa3f44f055e0d146b365084053a139398e5608
 DIST xmrig-mo-6.16.4-mo1.tar.gz 2482875 BLAKE2B 659d4020c51c6e6c56d0fcca1e9e7e5e07b5aeb84b24cc0dfeb2d3b10c8116a9cdfb904cf82afcff7d6cf5320f54528399a0b36146a11a2c0172e2e579246da9 SHA512 dd2bb1e2279ab42116814d8e1ed04115719007a438cec5b6da36b8e60e1965e6bb94802cc079a6878f68f89c24d4af8561068a81ec316827784aaf82c30156e4
 DIST xmrig-mo-6.16.5-mo1.tar.gz 2503078 BLAKE2B 24f9b4af7b55c27926b0c7a643b560e12e1995de48e9ab8a59c84b5a2880e3d4edf9afdbb8a64b06157c2e9af58d83bb8c2ec04a6645011531d7f119de3522ee SHA512 cc640d8bba7c2f34f57cd7c1f41568d4fbe526b0d65b579b22a5e6ede05b017c805e474cffc5661137cf4286b4fb0529a639d31525b6304f2330c44908c4b3c4
+DIST xmrig-mo-6.18.0-mo1.tar.gz 2445451 BLAKE2B 0234a4fb15e0271091c5700f047751b9ab245c4a894937ed2b17c52747f66e26e5d276063b6593fb3a60b4f43a4d30cb2607d64ccdaff04e621cc15c4b45d100 SHA512 f60fba0c230ec8a6307e55ddb1eca4801d6e036f3810c36edfcfd53c72185773f2c83745af39a8648db7a1ac37e78cecfcb408913a76ec4061441c07cafc6f5f
diff --git a/net-misc/xmrig-mo/xmrig-mo-6.18.0.ebuild b/net-misc/xmrig-mo/xmrig-mo-6.18.0.ebuild
new file mode 100644
index 0000000000..93bea0a1a7
--- /dev/null
+++ b/net-misc/xmrig-mo/xmrig-mo-6.18.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MO_PV="mo1"
+DESCRIPTION="MoneroOcean fork of xmrig that supports algo switching"
+HOMEPAGE="https://github.com/MoneroOcean/xmrig"
+SRC_URI="https://github.com/MoneroOcean/xmrig/archive/v${PV}-${MO_PV}.tar.gz -> ${P}-${MO_PV}.tar.gz"
+KEYWORDS="~amd64 ~arm64"
+
+LICENSE="Apache-2.0 GPL-3+ MIT"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 donate hwloc opencl +ssl"
+
+DEPEND="
+	dev-libs/libuv:=
+	hwloc? ( sys-apps/hwloc:= )
+	opencl? ( virtual/opencl )
+	ssl? ( dev-libs/openssl:= )
+"
+
+RDEPEND="
+	${DEPEND}
+	!arm64? ( sys-apps/msr-tools )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.12.2-nonotls.patch
+)
+
+S="${WORKDIR}/xmrig-${PV}-${MO_PV}"
+
+src_prepare() {
+	if ! use donate ; then
+		sed -i 's/1;/0;/g' src/donate.h || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+		-DWITH_HWLOC=$(usex hwloc)
+		-DWITH_TLS=$(usex ssl)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_CUDA=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	default
+	newbin "${BUILD_DIR}/xmrig" xmrig-mo
+}

From 1be6cb44980cf8233900889326d14aa054987a62 Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Wed, 29 Jun 2022 22:02:42 +0200
Subject: [PATCH 02/36] app-i18n/canna: don't call gcc directly

Bug: https://bugs.gentoo.org/855125
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 .../canna/files/canna-respect-flags.patch     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/app-i18n/canna/files/canna-respect-flags.patch b/app-i18n/canna/files/canna-respect-flags.patch
index 13fb1ed9c6..893fc9cd8d 100644
--- a/app-i18n/canna/files/canna-respect-flags.patch
+++ b/app-i18n/canna/files/canna-respect-flags.patch
@@ -1,5 +1,16 @@
---- /var/tmp/portage/app-i18n/canna-3.7_p3-r4/work/Canna37p3/canuum/Imakefile
-+++ Canna37p3/canuum/Imakefile
+--- a/Canna.conf
++++ b/Canna.conf
+@@ -548,7 +548,7 @@
+ Concat3(lib,libname,.dll):  solist					@@\
+ 	RemoveFile(LibraryTargetName(libname))				@@\
+ 	RemoveFile(Concat3(lib,libname,.dll))				@@\
+-	gcc -shared -nostartfiles -Wl,--out-implib=Concat(lib,libname.a) -o Concat3(lib,libname,.dll) solist $(REQUIREDLIBS)	@@\
++	$(CC) $(CFLAGS) $(LDFLAGS) -shared -nostartfiles -Wl,--out-implib=Concat(lib,libname.a) -o Concat3(lib,libname,.dll) solist $(REQUIREDLIBS)	@@\
+ 									@@\
+ clean::									@@\
+ 	RemoveFile(LibraryTargetName(libname))				@@\
+--- a/canuum/Imakefile
++++ b/canuum/Imakefile
 @@ -51,6 +51,8 @@
  	$(CONFIGURE_CMD)
  XCOMM Invoked from confwrapper
@@ -11,8 +22,8 @@
 +	$(CANNAROOT)/confwrapper mkenv AR $(AR) >> $@
  	$(CANNAROOT)/confwrapper mkenv CFLAGS $(PURE_CFLAGS) >> $@
 +	$(CANNAROOT)/confwrapper mkenv LDFLAGS $(LDFLAGS) >> $@
---- /var/tmp/portage/app-i18n/canna-3.7_p3-r4/work/Canna37p3/Imakefile
-+++ Canna37p3/Imakefile
+--- a/Imakefile
++++ b/Imakefile
 @@ -117,9 +117,11 @@
  	$(CONFIGURE_CMD)
  XCOMM Invoked from confwrapper

From 72b76768d44b26e3cde34cb186d160d9086b1549 Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Wed, 29 Jun 2022 22:22:40 +0200
Subject: [PATCH 03/36] dev-java/paceRegression: fix xml file

Closes: https://bugs.gentoo.org/855113
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 dev-java/paceRegression/paceRegression-1.0.1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-java/paceRegression/paceRegression-1.0.1.ebuild b/dev-java/paceRegression/paceRegression-1.0.1.ebuild
index 697cff92d7..9bc4b72d61 100644
--- a/dev-java/paceRegression/paceRegression-1.0.1.ebuild
+++ b/dev-java/paceRegression/paceRegression-1.0.1.ebuild
@@ -35,6 +35,7 @@ PATCHES=( "${FILESDIR}/${P}-no-build-docs.patch" )
 src_prepare() {
 	java-pkg_clean
 	default
+	java-ant_bsfix_files build_package.xml
 	java-ant_rewrite-classpath build_package.xml
 }
 

From 525025fe154805428f04e92e888b87622b1e2a58 Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Wed, 29 Jun 2022 22:20:32 +0200
Subject: [PATCH 04/36] dev-java/gluegen: fix build-test.xml

Closes: https://bugs.gentoo.org/855110
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 dev-java/gluegen/gluegen-2.3.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-java/gluegen/gluegen-2.3.2.ebuild b/dev-java/gluegen/gluegen-2.3.2.ebuild
index 37ec4bb344..a1946b5764 100644
--- a/dev-java/gluegen/gluegen-2.3.2.ebuild
+++ b/dev-java/gluegen/gluegen-2.3.2.ebuild
@@ -66,7 +66,7 @@ src_prepare() {
 	mv "${WORKDIR}"/jcpp-${PV}/* jcpp/ || die
 	rm -rf make/lib || die
 	default
-	java-ant_bsfix_files "${S}/make/build-test.xml"
+	java-ant_bsfix_files "${S}/make/build-test.xml" "${S}/make/jogamp-env.xml"
 
 	#it want a git repo
 	git init || die

From 2cb08a32f206e226b19691ff3f64a7a64bb614ca Mon Sep 17 00:00:00 2001
From: Jonas Frei <freijon@pm.me>
Date: Wed, 29 Jun 2022 22:44:28 +0200
Subject: [PATCH 05/36] gui-apps/swaync: Added gnome2-utils eclass to update
 GSettings

Signed-off-by: Jonas Frei <freijon@pm.me>
---
 .../{swaync-0.6.3.ebuild => swaync-0.6.3-r1.ebuild}    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
 rename gui-apps/swaync/{swaync-0.6.3.ebuild => swaync-0.6.3-r1.ebuild} (89%)

diff --git a/gui-apps/swaync/swaync-0.6.3.ebuild b/gui-apps/swaync/swaync-0.6.3-r1.ebuild
similarity index 89%
rename from gui-apps/swaync/swaync-0.6.3.ebuild
rename to gui-apps/swaync/swaync-0.6.3-r1.ebuild
index b9f015b2d9..403c1b610f 100644
--- a/gui-apps/swaync/swaync-0.6.3.ebuild
+++ b/gui-apps/swaync/swaync-0.6.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit meson vala
+inherit meson vala gnome2-utils
 
 MY_PN="SwayNotificationCenter"
 DESCRIPTION="A simple notification daemon with a GTK gui for notifications and control center"
@@ -46,3 +46,11 @@ src_configure() {
 	)
 	meson_src_configure
 }
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}

From 2498602be41804eb6ea533d10f835f3783809825 Mon Sep 17 00:00:00 2001
From: Ethan Nijmeh <ethannij@gmail.com>
Date: Wed, 29 Jun 2022 21:59:29 -0700
Subject: [PATCH 06/36] x11-drivers/OpenTabletDriver-bin added 0.6.0.4

Signed-off-by: Ethan Nijmeh <ethannij@gmail.com>
---
 x11-drivers/OpenTabletDriver-bin/Manifest     |  2 +
 .../OpenTabletDriver-bin-0.6.0.4.ebuild       | 65 +++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.6.0.4.ebuild

diff --git a/x11-drivers/OpenTabletDriver-bin/Manifest b/x11-drivers/OpenTabletDriver-bin/Manifest
index 64d2ecb2dc..b154bbe818 100644
--- a/x11-drivers/OpenTabletDriver-bin/Manifest
+++ b/x11-drivers/OpenTabletDriver-bin/Manifest
@@ -1,4 +1,6 @@
 DIST OpenTabletDriver-source-0.5.3.3.tar.gz 175040 BLAKE2B 117a32683dfbcec54c8a8d2e75350e4fc81f0e7592ad55468079d1bd85fb670acc60404befcad3704138ad59927d7237a5c2dac592c0a8f9a0eff1a44cd2c36c SHA512 f2ba081463b4a3e02564430c925db077693d681f72bbc6fd104ece395e21a9db6383cd4b5e69fcb5774c6c3c24f67464f72e670cc3bdf1fe21edec2bdf5c42fc
 DIST OpenTabletDriver-source-0.6.0.2.tar.gz 247519 BLAKE2B a84db9d7e1d86e8b6bf90231187800e4fb355c66e1c9e732a9e3687de0afeaeb0d69f397b5d3387bdb7a1e88393ddb26bb6c0d2920fa8d1ca51bc9992a818dae SHA512 0414a033e5bf3c5498676433502d44deb320d69a26823a1c731ab750c8ba71a3ff5af31662255e0c6c45e4d17f3009500e0a87967ca132bf309cf006cdb640b3
+DIST OpenTabletDriver-source-0.6.0.4.tar.gz 256483 BLAKE2B 5d6377f0591ac35d0e2e7b516efc76dbeb3737d37eae3bd38b19cbfe54c62bf4c98a3ba4b0ec60d3fcbdf4ed70493ca107cdfa8b8c728f1b04d12c1492661a71 SHA512 7b16f49c56f97ce8342b91ab92f96a5a7aad9ac2deba13b0fe93ef299d9c9404743d4c6c791a72a4dfbf3b96e0fb07bf98d91d1b5fe23b334a8b671b7ec7bb58
 DIST OpenTabletDriver-v0.5.3.3.tar.gz 4052905 BLAKE2B 36c60dc87368dbe9595182ad2439447692cec8444bc005cc320d22c3f1b13e501e57ad038decd86d4c1129a44ba27cf1c3ebd4ca4bd666732a1dac755095c787 SHA512 83415abea4b67ed4af499c1edf91f2b81959a3888c9d64e4854086ade50da883c690b784fd5641307d0ac1d75ee8120090a834c3e910eb57bed92a20b4cc10b3
 DIST OpenTabletDriver-v0.6.0.2.tar.gz 4199076 BLAKE2B 754822c707388e8ac3c79a829ad67edad766381e4dcf96728b2f74e908daea1d7fb90b47ee3a922326cbf87ddd2a615ac1a85ca37d36ec7938b22c9f7c58d82e SHA512 0ff63e94ce36d4afc7d8862ee51c0444e734640b9ae468e733231dbfc3ecdcd6cf90f0128a0be1934a64ee79f0c5860a0812681537d4d9e1b478581a7c2acc22
+DIST OpenTabletDriver-v0.6.0.4.tar.gz 4208336 BLAKE2B b22f980fcd2e684d3fe109e0282cc6c10b1320a01a14de6268305c925ef9f2780d311913bae78304c6e2d281e30d29252581262d99cb6f77db5b1fe65212c090 SHA512 4b1978edc0ec9e47b809b7f2528c4bde6417205339f92a2e2f3007aa74a682e5a9f47770be92ad8ad91df3ef0222622961fc8553cfaf4c8201f05e750e992929
diff --git a/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.6.0.4.ebuild b/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.6.0.4.ebuild
new file mode 100644
index 0000000000..ebfc8711de
--- /dev/null
+++ b/x11-drivers/OpenTabletDriver-bin/OpenTabletDriver-bin-0.6.0.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop
+
+MY_PN=OpenTabletDriver
+
+DESCRIPTION="Cross platform tablet driver (binary package)"
+HOMEPAGE="https://github.com/OpenTabletDriver"
+SRC_URI="https://github.com/OpenTabletDriver/OpenTabletDriver/archive/refs/tags/v${PV}.tar.gz -> OpenTabletDriver-source-${PV}.tar.gz https://github.com/OpenTabletDriver/OpenTabletDriver/releases/download/v${PV}/OpenTabletDriver.linux-x64.tar.gz -> OpenTabletDriver-v${PV}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXrandr
+	dev-libs/libevdev
+	x11-libs/gtk+:3
+	virtual/udev
+	dev-dotnet/dotnet-sdk-bin:6.0
+"
+
+QA_PREBUILT="*"
+
+S="${WORKDIR}/${MY_PN}"
+src_install() {
+	local LP=opentabletdriver
+	local SP="otd"
+
+	cd "${S}" || die
+
+	exeinto "/usr/share/${MY_PN}"
+	exeopts -o root -Dm755
+
+	for binary in *.dll *.json; do
+		doexe "$binary"
+	done
+
+	for bin in *.Daemon *.UX.Gtk *.Console; do
+		doexe "$bin"
+	done
+
+	insinto "/lib/udev/rules.d"
+	doins -r "${S}/99-${LP}.rules"
+
+	cd "${FILESDIR}" || die
+	dobin "${SP}"
+	dobin "${SP}-gui"
+
+	cd "${WORKDIR}/${MY_PN}-${PV}/${MY_PN}.UX/Assets" || die
+	doicon "otd.png"
+	make_desktop_entry /usr/bin/otd-gui OpenTabletDriver otd Settings
+}
+
+pkg_postinst() {
+	udevadm control --reload || die
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Please replug your tablet before attempting to use the driver"
+	fi
+}

From b7324e1773240c86b267b5086afed0dae91d1144 Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 00:20:52 +0500
Subject: [PATCH 07/36] nimble.eclass: force ninja

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 eclass/nimble.eclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eclass/nimble.eclass b/eclass/nimble.eclass
index 177a2fbd4d..1a6dc24afc 100644
--- a/eclass/nimble.eclass
+++ b/eclass/nimble.eclass
@@ -51,6 +51,12 @@ if [[ ! ${_NIMBLE_ECLASS} ]]; then
 # Build directory, location where all generated files should be placed.
 # If this isn't set, it defaults to ${WORKDIR}/${P}-build.
 
+# @ECLASS_VARIABLE: NINJA
+# @INTERNAL
+# @DESCRIPTION:
+# Force ninja because samu doesn't work correctly.
+NINJA="ninja"
+
 inherit edo nim-utils ninja-utils
 
 BDEPEND="${NINJA_DEPEND}

From 52b789ed42980918bb0710f4310819e4f6a558fd Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 00:22:25 +0500
Subject: [PATCH 08/36] dev-nim/asynctools: new package, add 0.1.1_p20210606

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 dev-nim/asynctools/Manifest                   |  1 +
 .../asynctools-0.1.1_p20210606.ebuild         | 28 +++++++++++++++++++
 dev-nim/asynctools/metadata.xml               | 11 ++++++++
 3 files changed, 40 insertions(+)
 create mode 100644 dev-nim/asynctools/Manifest
 create mode 100644 dev-nim/asynctools/asynctools-0.1.1_p20210606.ebuild
 create mode 100644 dev-nim/asynctools/metadata.xml

diff --git a/dev-nim/asynctools/Manifest b/dev-nim/asynctools/Manifest
new file mode 100644
index 0000000000..24b0fa8d01
--- /dev/null
+++ b/dev-nim/asynctools/Manifest
@@ -0,0 +1 @@
+DIST asynctools-0.1.1_p20210606.tar.gz 30003 BLAKE2B 200127abb72aa692470c55fc8346594cf9220db63a9b1b7ce3b3b97ecf21686b4c6fd0efcae2baf169f3677731e5ed05fa28ad8ce1b5892a573b4522dba99110 SHA512 16433e81b46251eefdac254e6d2496883d867ff8560c1d11ff898cf3a5689da33c6e55ed5ce81db07c73ae20e6a0d3563346c3e686c9f3395a1a517945249f6f
diff --git a/dev-nim/asynctools/asynctools-0.1.1_p20210606.ebuild b/dev-nim/asynctools/asynctools-0.1.1_p20210606.ebuild
new file mode 100644
index 0000000000..2fa0c869b4
--- /dev/null
+++ b/dev-nim/asynctools/asynctools-0.1.1_p20210606.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+COMMIT="84ced6d002789567f2396c75800ffd6dff2866f7"
+DESCRIPTION="Various asynchronous tools for Nim language"
+HOMEPAGE="
+	https://github.com/cheatfate/asynctools
+	https://nimble.directory/pkg/asynctools
+"
+SRC_URI="https://github.com/cheatfate/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~amd64"
+
+set_package_url "https://github.com/cheatfate/asynctools"
+
+src_prepare() {
+	default
+
+	# disable tests that require network
+	sed "/asyncdns/d" -i ${PN}.nimble || die
+}
diff --git a/dev-nim/asynctools/metadata.xml b/dev-nim/asynctools/metadata.xml
new file mode 100644
index 0000000000..4a0a87879f
--- /dev/null
+++ b/dev-nim/asynctools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">cheatfate/asynctools</remote-id>
+	</upstream>
+</pkgmetadata>

From 9dc9a5b426aff323fc67cfa36b7c046614875ccb Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 00:27:47 +0500
Subject: [PATCH 09/36] dev-nim/frosty: drop custom src_test

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 dev-nim/frosty/frosty-3.0.0.ebuild | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dev-nim/frosty/frosty-3.0.0.ebuild b/dev-nim/frosty/frosty-3.0.0.ebuild
index bfe77b968c..070901b4fc 100644
--- a/dev-nim/frosty/frosty-3.0.0.ebuild
+++ b/dev-nim/frosty/frosty-3.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit edo nimble
+inherit nimble
 
 DESCRIPTION="Serialize native Nim types to strings, streams, sockets, or anything else"
 HOMEPAGE="https://github.com/disruptek/frosty"
@@ -22,7 +22,3 @@ BDEPEND="test? (
 )"
 
 set_package_url "https://github.com/disruptek/frosty"
-
-src_test() {
-	edo balls
-}

From b8f810b54ddf7867efa63454896fe07af9f482bf Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 00:29:48 +0500
Subject: [PATCH 10/36] dev-nim/ups: drop custom src_test

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 dev-nim/ups/ups-0.0.7.ebuild | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/dev-nim/ups/ups-0.0.7.ebuild b/dev-nim/ups/ups-0.0.7.ebuild
index 35f517fdb9..a004789cc0 100644
--- a/dev-nim/ups/ups-0.0.7.ebuild
+++ b/dev-nim/ups/ups-0.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit edo nimble
+inherit nimble
 
 DESCRIPTION="a package handler"
 HOMEPAGE="https://github.com/disruptek/ups"
@@ -17,15 +17,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="=dev-nim/npeg-0*"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-nim/balls
-	)
-"
+DEPEND="test? ( ${RDEPEND} )"
+BDEPEND="test? ( dev-nim/balls )"
 
 set_package_url "https://github.com/disruptek/ups"
-
-src_test() {
-	edo balls
-}

From c4c4ee8ac824c1f83c963e9ca9c0055a2d3ec5bb Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 00:52:19 +0500
Subject: [PATCH 11/36] nimble.eclass: add nimble_comment_requires

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 eclass/nimble.eclass | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/eclass/nimble.eclass b/eclass/nimble.eclass
index 1a6dc24afc..60bd286892 100644
--- a/eclass/nimble.eclass
+++ b/eclass/nimble.eclass
@@ -87,6 +87,20 @@ get_package_url() {
 	echo "${_PACKAGE_URL}"
 }
 
+# @FUNCTION: nimble_comment_requires
+# @USAGE: <dep...>
+# @DESCRIPTION:
+# Comment out one or more 'requires' calls in the Nimble file.
+nimble_comment_requires() {
+	debug-print-function ${FUNCNAME} "${@}"
+
+	local dep
+	for dep in "${@}"; do
+		dep=${dep//\//\\/}
+		sed "/requires[[:space:]]*\"${dep}\>.*\"/ s/^/#/" -i *.nimble || die
+	done
+}
+
 # @FUNCTION: nimble_src_configure
 # @USAGE:
 # @DESCRIPTION:

From 68f0c20f6d8a252304d15725bee23dd474b6e7e5 Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 01:00:00 +0500
Subject: [PATCH 12/36] dev-nim/httpbeast: new package, add 0.4.1

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 dev-nim/httpbeast/Manifest               |  1 +
 dev-nim/httpbeast/httpbeast-0.4.1.ebuild | 36 ++++++++++++++++++++++++
 dev-nim/httpbeast/metadata.xml           | 11 ++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 dev-nim/httpbeast/Manifest
 create mode 100644 dev-nim/httpbeast/httpbeast-0.4.1.ebuild
 create mode 100644 dev-nim/httpbeast/metadata.xml

diff --git a/dev-nim/httpbeast/Manifest b/dev-nim/httpbeast/Manifest
new file mode 100644
index 0000000000..7e3af5b063
--- /dev/null
+++ b/dev-nim/httpbeast/Manifest
@@ -0,0 +1 @@
+DIST httpbeast-0.4.1.tar.gz 12581 BLAKE2B 47b07a11192f3554ac0e127c94a9309dc963f3d00dd839aae7b3cadb5825fd3a227224f0e215a421150c70e5fa44ad71754da113e0dd00c688e0ed28f115ff7c SHA512 cb06765d89ebc948f3ffc4121b50ff75f5710c5a196ee97ef3c0efa1e3d53fc3fb3d3bb724c4dab49687c7f6754ea44722f672f07293c3c9da9c06c67ccf34c8
diff --git a/dev-nim/httpbeast/httpbeast-0.4.1.ebuild b/dev-nim/httpbeast/httpbeast-0.4.1.ebuild
new file mode 100644
index 0000000000..30fb218ab4
--- /dev/null
+++ b/dev-nim/httpbeast/httpbeast-0.4.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="A super-fast epoll-backed and parallel HTTP server"
+HOMEPAGE="
+	https://github.com/dom96/httpbeast
+	https://nimble.directory/pkg/httpbeast
+"
+SRC_URI="https://github.com/dom96/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( dev-nim/asynctools )"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+set_package_url "https://github.com/dom96/httpbeast"
+
+src_prepare() {
+	default
+
+	use test || nimble_comment_requires asynctools
+	sed "s/nimble c -y/nim c/g" -i tests/tester.nim || die
+}
+
+src_test() {
+	enim r tests/tester
+}
diff --git a/dev-nim/httpbeast/metadata.xml b/dev-nim/httpbeast/metadata.xml
new file mode 100644
index 0000000000..0baac30a29
--- /dev/null
+++ b/dev-nim/httpbeast/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dom96/httpbeast</remote-id>
+	</upstream>
+</pkgmetadata>

From 27213ed12afb4e8a820ef58f4efa2728424e2213 Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 01:11:27 +0500
Subject: [PATCH 13/36] dev-nim/jester: new package, add 0.5.0

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 dev-nim/jester/Manifest            |  1 +
 dev-nim/jester/jester-0.5.0.ebuild | 47 ++++++++++++++++++++++++++++++
 dev-nim/jester/metadata.xml        | 11 +++++++
 3 files changed, 59 insertions(+)
 create mode 100644 dev-nim/jester/Manifest
 create mode 100644 dev-nim/jester/jester-0.5.0.ebuild
 create mode 100644 dev-nim/jester/metadata.xml

diff --git a/dev-nim/jester/Manifest b/dev-nim/jester/Manifest
new file mode 100644
index 0000000000..1c79db935d
--- /dev/null
+++ b/dev-nim/jester/Manifest
@@ -0,0 +1 @@
+DIST jester-0.5.0.tar.gz 27750 BLAKE2B 488d2076ecb84e75b50582084a69a8810fea4953421d2fd7aafc282629c2c636511ede82cf05ebaed8b84295d9c7b76fa244b59a35a8349f4e78ec25dd8142ad SHA512 e000635e89560aa267056f1753eec1718e8ccbf9ee966745a5bfe5db7337f102f43a76a0e8d89961f607c517ecab40919027e3a8a12e86355c76db01897a21b8
diff --git a/dev-nim/jester/jester-0.5.0.ebuild b/dev-nim/jester/jester-0.5.0.ebuild
new file mode 100644
index 0000000000..997f3745d3
--- /dev/null
+++ b/dev-nim/jester/jester-0.5.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="A sinatra-like web framework for Nim"
+HOMEPAGE="
+	https://github.com/dom96/jester
+	https://nimble.directory/pkg/jester
+"
+SRC_URI="https://github.com/dom96/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# can't deselect broken tests
+RESTRICT="test"
+
+RDEPEND="dev-nim/httpbeast"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-nim/asynctools
+	)
+"
+
+DOCS=( {changelog,readme,todo}.markdown )
+
+set_package_url "https://github.com/dom96/jester"
+
+src_prepare() {
+	default
+
+	sed "s|https://github.com/timotheecour/\(asynctools\)|\1|g" \
+		-i *.nimble || die
+	use test || nimble_comment_requires asynctools
+
+	sed "s/nimble \(c --hints:off\) -y/nim \1/g" -i tests/tester.nim || die
+}
+
+src_test() {
+	enim r tests/tester
+}
diff --git a/dev-nim/jester/metadata.xml b/dev-nim/jester/metadata.xml
new file mode 100644
index 0000000000..6c984f1c94
--- /dev/null
+++ b/dev-nim/jester/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">dom96/jester</remote-id>
+	</upstream>
+</pkgmetadata>

From 9228cc58d0ff44a3c82fee30c56fbf9d4aae540e Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 01:26:52 +0500
Subject: [PATCH 14/36] nimble.eclass: drop edo

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 eclass/nimble.eclass | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eclass/nimble.eclass b/eclass/nimble.eclass
index 60bd286892..4c80bd2a9f 100644
--- a/eclass/nimble.eclass
+++ b/eclass/nimble.eclass
@@ -57,7 +57,7 @@ if [[ ! ${_NIMBLE_ECLASS} ]]; then
 # Force ninja because samu doesn't work correctly.
 NINJA="ninja"
 
-inherit edo nim-utils ninja-utils
+inherit nim-utils ninja-utils
 
 BDEPEND="${NINJA_DEPEND}
 	dev-lang/nim
@@ -138,7 +138,9 @@ nimble_src_configure() {
 		"${mynimargs[@]}"
 	)
 
-	edo nimbus "${nimbusargs[@]}" "${S}" "${BUILD_DIR}"
+	set -- nimbus "${nimbusargs[@]}" "${S}" "${BUILD_DIR}"
+	echo "${@}" >&2
+	"${@}" || die "${*} failed"
 }
 
 # @FUNCTION: nimble_build

From ba5efefdaf75d1bfc059d71ba8c10d3a8dc4bfdf Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 01:37:42 +0500
Subject: [PATCH 15/36] dev-nim/dotenv: new package, add 2.0.1

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 dev-nim/dotenv/Manifest            |  1 +
 dev-nim/dotenv/dotenv-2.0.1.ebuild | 20 ++++++++++++++++++++
 dev-nim/dotenv/metadata.xml        | 11 +++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 dev-nim/dotenv/Manifest
 create mode 100644 dev-nim/dotenv/dotenv-2.0.1.ebuild
 create mode 100644 dev-nim/dotenv/metadata.xml

diff --git a/dev-nim/dotenv/Manifest b/dev-nim/dotenv/Manifest
new file mode 100644
index 0000000000..750e99904e
--- /dev/null
+++ b/dev-nim/dotenv/Manifest
@@ -0,0 +1 @@
+DIST dotenv-2.0.1.tar.gz 5368 BLAKE2B 7b442145cfbc401626a2ed8b9d28813dfa7bcdd7ae6ed9b02daae7c3dc7bd8103092040848773346209c69db3225fc368d3b3c4a7f52733ea57d1a1888d957c5 SHA512 0fcc777076f48d2ba6ffd352ac5574d8feda5a3b7fd750955321c430914489896e82cf6eb791305403cefa1981e1df6c5ed03ddb530c3458ef34712d23a4b83b
diff --git a/dev-nim/dotenv/dotenv-2.0.1.ebuild b/dev-nim/dotenv/dotenv-2.0.1.ebuild
new file mode 100644
index 0000000000..5926115140
--- /dev/null
+++ b/dev-nim/dotenv/dotenv-2.0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="dotenv implementation for Nim"
+HOMEPAGE="
+	https://github.com/euantorano/dotenv.nim
+	https://nimble.directory/pkg/dotenv
+"
+SRC_URI="https://github.com/euantorano/${PN}.nim/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}.nim-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+set_package_url "https://github.com/euantorano/dotenv.nim"
diff --git a/dev-nim/dotenv/metadata.xml b/dev-nim/dotenv/metadata.xml
new file mode 100644
index 0000000000..fc84d6e525
--- /dev/null
+++ b/dev-nim/dotenv/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">euantorano/dotenv.nim</remote-id>
+	</upstream>
+</pkgmetadata>

From 5f7f60752b44636b107fae6e6208c22b57758c1e Mon Sep 17 00:00:00 2001
From: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
Date: Thu, 30 Jun 2022 11:25:18 +0400
Subject: [PATCH 16/36] media-sound/nulloy: build fix

Fix https://bugs.gentoo.org/855221

Signed-off-by: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
---
 media-sound/nulloy/nulloy-0.9.3.ebuild | 2 +-
 media-sound/nulloy/nulloy-9999.ebuild  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-sound/nulloy/nulloy-0.9.3.ebuild b/media-sound/nulloy/nulloy-0.9.3.ebuild
index 2a8ed1a329..10d3f11a7e 100644
--- a/media-sound/nulloy/nulloy-0.9.3.ebuild
+++ b/media-sound/nulloy/nulloy-0.9.3.ebuild
@@ -54,7 +54,7 @@ src_configure() {
 		--libdir "$(get_libdir)"
 	)
 
-	./configure "${myconfargs[@]}" || die
+	QMAKE=/usr/bin/qmake5 LRELEASE=/usr/lib64/qt5/bin/lrelease ./configure "${myconfargs[@]}" || die
 }
 
 src_install() {
diff --git a/media-sound/nulloy/nulloy-9999.ebuild b/media-sound/nulloy/nulloy-9999.ebuild
index 4cd2267fd7..adeb165de1 100644
--- a/media-sound/nulloy/nulloy-9999.ebuild
+++ b/media-sound/nulloy/nulloy-9999.ebuild
@@ -29,6 +29,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+
 src_unpack() {
 	git-r3_src_unpack
 
@@ -61,7 +62,7 @@ src_configure() {
 		--libdir "$(get_libdir)"
 	)
 
-	./configure "${myconfargs[@]}" || die
+	QMAKE=/usr/bin/qmake5 LRELEASE=/usr/lib64/qt5/bin/lrelease ./configure "${myconfargs[@]}" || die
 }
 
 src_install() {

From 892348f1c0bf6a4024ad25377c5e03ad2a2a873e Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Wed, 29 Jun 2022 23:55:05 +0200
Subject: [PATCH 17/36] sys-cluster/otf2: add 3.0, use custom compiler

Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 sys-cluster/otf2/Manifest                     |   1 +
 .../otf2/files/otf2-2.3-respect-flags.patch   | 264 ------------------
 .../otf2/files/otf2-3.0-respect-flags.patch   |  95 +++++++
 ...{otf2-2.3-r2.ebuild => otf2-2.3-r3.ebuild} |  47 +++-
 sys-cluster/otf2/otf2-3.0.ebuild              |  95 +++++++
 5 files changed, 227 insertions(+), 275 deletions(-)
 create mode 100644 sys-cluster/otf2/files/otf2-3.0-respect-flags.patch
 rename sys-cluster/otf2/{otf2-2.3-r2.ebuild => otf2-2.3-r3.ebuild} (58%)
 create mode 100644 sys-cluster/otf2/otf2-3.0.ebuild

diff --git a/sys-cluster/otf2/Manifest b/sys-cluster/otf2/Manifest
index 4ff1ad5251..1bb17c4096 100644
--- a/sys-cluster/otf2/Manifest
+++ b/sys-cluster/otf2/Manifest
@@ -1 +1,2 @@
 DIST otf2-2.3.tar.gz 5321226 BLAKE2B a217ac2bcc0fa777dccc99a0f90a143b3cfea66ff717cfe66f68d2d59407023b1f0e419d9c4275d27f201fa3df0c5a89d4730052039144b02a2136e390e85fbb SHA512 c27c768f178e512c46683667d70bc2ad3871b17b8978356b13917d3fc12b49b4ee5d5767e9e10a247bbc7f2e911aaae7455bfec8f36704236d55c16454fa0a4c
+DIST otf2-3.0.tar.gz 5260678 BLAKE2B cb783c8466e2be424452284ac03df13306f1bad1163adcf113b4bcf93fe2be4e7fb05053ccf09d825db3e3f21b40667d4c03365be96ab240b4e1376ba6943703 SHA512 63cef15091d4071860211a5f52c375be089a3c8dc5ce28df0078197f2a2b7c45c2ecd9e677cb7ecf02339716bd0b2b692d1cb17c1ad1114978ffaa29cd28ff43
diff --git a/sys-cluster/otf2/files/otf2-2.3-respect-flags.patch b/sys-cluster/otf2/files/otf2-2.3-respect-flags.patch
index ff1db4dcdf..091e6f80ba 100644
--- a/sys-cluster/otf2/files/otf2-2.3-respect-flags.patch
+++ b/sys-cluster/otf2/files/otf2-2.3-respect-flags.patch
@@ -1,267 +1,3 @@
---- a/build-config/common/platforms/compiler-frontend-clang
-+++ b/build-config/common/platforms/compiler-frontend-clang
-@@ -1,12 +1,12 @@
--CC_FOR_BUILD=clang
--CXX_FOR_BUILD=clang++
--F77_FOR_BUILD=flang
--FC_FOR_BUILD=flang
-+CC_FOR_BUILD="$(CC)"
-+CXX_FOR_BUILD="$(CXX)"
-+F77_FOR_BUILD="$(F77)"
-+FC_FOR_BUILD="$(FC)"
- 
--#CPPFLAGS_FOR_BUILD=
--#CFLAGS_FOR_BUILD=
--#CXXFLAGS_FOR_BUILD=
--#FFLAGS_FOR_BUILD=
--#FCFLAGS_FOR_BUILD=
--#LDFLAGS_FOR_BUILD=
-+CPPFLAGS_FOR_BUILD="$(CPPFLAGS)"
-+CFLAGS_FOR_BUILD="$(CFLAGS)"
-+CXXFLAGS_FOR_BUILD="$(CXXFLAGS)"
-+FFLAGS_FOR_BUILD="$(FFLAGS)"
-+FCFLAGS_FOR_BUILD="$(FCFLAGS)"
-+LDFLAGS_FOR_BUILD="$(LDFLAGS)"
- #LIBS_FOR_BUILD=
---- a/build-config/common/platforms/compiler-frontend-gcc
-+++ b/build-config/common/platforms/compiler-frontend-gcc
-@@ -1,12 +1,12 @@
--CC_FOR_BUILD=gcc
--CXX_FOR_BUILD=g++
--F77_FOR_BUILD=gfortran
--FC_FOR_BUILD=gfortran
-+CC_FOR_BUILD="$(CC)"
-+CXX_FOR_BUILD="$(CXX)"
-+F77_FOR_BUILD="$(F77)"
-+FC_FOR_BUILD="$(FC)"
- 
--#CPPFLAGS_FOR_BUILD=
--#CFLAGS_FOR_BUILD=
--#CXXFLAGS_FOR_BUILD=
--#FFLAGS_FOR_BUILD=
--#FCFLAGS_FOR_BUILD=
--#LDFLAGS_FOR_BUILD=
-+CPPFLAGS_FOR_BUILD="$(CPPFLAGS)"
-+CFLAGS_FOR_BUILD="$(CFLAGS)"
-+CXXFLAGS_FOR_BUILD="$(CXXFLAGS)"
-+FFLAGS_FOR_BUILD="$(FFLAGS)"
-+FCFLAGS_FOR_BUILD="$(FCFLAGS)"
-+LDFLAGS_FOR_BUILD="$(LDFLAGS)"
- #LIBS_FOR_BUILD=
---- a/build-config/common/platforms/compiler-mpi-mpich
-+++ b/build-config/common/platforms/compiler-mpi-mpich
-@@ -1,10 +1,10 @@
--MPICC=mpicc -cc={CC}
-+#MPICC=mpicc -cc={CC}
- #MPI_CFLAGS
--MPICXX=mpicxx -CC={CXX}
-+#MPICXX=mpicxx -CC={CXX}
- #MPI_CXXFLAGS=
--MPIF77=mpif77 -f77={F77}
-+#MPIF77=mpif77 -f77={F77}
- #MPI_FFLAGS=
--MPIFC=mpif90 -f90={FC}
-+#MPIFC=mpif90 -f90={FC}
- #MPI_FCFLAGS=
- #MPI_CPPFLAGS=
- #MPI_LDFLAGS=
---- a/build-config/common/platforms/compiler-mpi-mpich2
-+++ b/build-config/common/platforms/compiler-mpi-mpich2
-@@ -1,12 +1,12 @@
--MPICC=mpicc -cc={CC}
-+#MPICC=mpicc -cc={CC}
- #MPI_CFLAGS
--MPICXX=mpicxx -cxx={CXX}
-+#MPICXX=mpicxx -cxx={CXX}
- #MPI_CXXFLAGS=
--MPIF77=mpif77 -f77={F77}
-+#MPIF77=mpif77 -f77={F77}
- #MPI_FFLAGS=
--MPIFC=mpif90 -f90={FC}
-+#MPIFC=mpif90 -f90={FC}
- #MPI_FCFLAGS=
--MPI_CPPFLAGS=-DMPICH_SKIP_MPICXX
-+MPI_CPPFLAGS="${MPI_CPPFLAGS} -DMPICH_SKIP_MPICXX"
- #MPI_LDFLAGS=
- #MPI_LIBS=
- 
---- a/build-config/common/platforms/compiler-mpi-mpich3
-+++ b/build-config/common/platforms/compiler-mpi-mpich3
-@@ -1,12 +1,12 @@
--MPICC=mpicc -cc={CC}
-+#MPICC=mpicc -cc={CC}
- #MPI_CFLAGS
--MPICXX=mpicxx -cxx={CXX}
-+#MPICXX=mpicxx -cxx={CXX}
- #MPI_CXXFLAGS=
--MPIF77=mpif77 -fc={F77}
-+#MPIF77=mpif77 -fc={F77}
- #MPI_FFLAGS=
--MPIFC=mpif90 -fc={FC}
-+#MPIFC=mpif90 -fc={FC}
- #MPI_FCFLAGS=
--MPI_CPPFLAGS=-DMPICH_SKIP_MPICXX
-+MPI_CPPFLAGS="${MPI_CPPFLAGS} -DMPICH_SKIP_MPICXX"
- #MPI_LDFLAGS=
- #MPI_LIBS=
- 
---- a/build-config/common/platforms/compiler-mpi-openmpi
-+++ b/build-config/common/platforms/compiler-mpi-openmpi
-@@ -1,10 +1,10 @@
--MPICC=mpicc
-+#MPICC=mpicc
- #MPI_CFLAGS
--MPICXX=mpicxx
-+#MPICXX=mpicxx
- #MPI_CXXFLAGS=
--MPIF77=mpif77
-+#MPIF77=mpif77
- #MPI_FFLAGS=
--MPIFC=mpif90
-+#MPIFC=mpif90
- #MPI_FCFLAGS=
- #MPI_CPPFLAGS=
- #MPI_LDFLAGS=
---- a/build-config/common/platforms/compiler-mpi-openmpi3
-+++ b/build-config/common/platforms/compiler-mpi-openmpi3
-@@ -1,10 +1,10 @@
--MPICC=mpicc
-+#MPICC=mpicc
- #MPI_CFLAGS
--MPICXX=mpicxx
-+#MPICXX=mpicxx
- #MPI_CXXFLAGS=
--MPIF77=mpif77
-+#MPIF77=mpif77
- #MPI_FFLAGS=
--MPIFC=mpif90
-+#MPIFC=mpif90
- #MPI_FCFLAGS=
- #MPI_CPPFLAGS=
- #MPI_LDFLAGS=
---- a/build-config/common/platforms/compiler-nocross-clang
-+++ b/build-config/common/platforms/compiler-nocross-clang
-@@ -1,7 +1,7 @@
--CC=clang
--CXX=clang++
--F77=flang
--FC=flang
-+#CC=clang
-+#CXX=clang++
-+#F77=flang
-+#FC=flang
- 
- #CPPFLAGS=
- #CFLAGS=
---- a/build-config/common/platforms/compiler-nocross-gcc
-+++ b/build-config/common/platforms/compiler-nocross-gcc
-@@ -1,7 +1,7 @@
--CC=gcc
--CXX=g++
--F77=gfortran
--FC=gfortran
-+#CC=gcc
-+#CXX=g++
-+#F77=gfortran
-+#FC=gfortran
- 
- #CPPFLAGS=
- #CFLAGS=
---- a/build-config/common/platforms/platform-backend-linux
-+++ b/build-config/common/platforms/platform-backend-linux
-@@ -1,7 +1,7 @@
--CC=gcc
--CXX=g++
--F77=gfortran
--FC=gfortran
-+#CC=gcc
-+#CXX=g++
-+#F77=gfortran
-+#FC=gfortran
- 
- #CPPFLAGS=
- #CFLAGS=
---- a/build-config/common/platforms/platform-backend-user-provided
-+++ b/build-config/common/platforms/platform-backend-user-provided
-@@ -1,7 +1,7 @@
--CC=
--CXX=
--F77=
--FC=
-+#CC=
-+#CXX=
-+#F77=
-+#FC=
- 
- #CPPFLAGS=
- #CFLAGS=
---- a/build-config/common/platforms/platform-frontend-linux
-+++ b/build-config/common/platforms/platform-frontend-linux
-@@ -1,14 +1,14 @@
- # not a cross compile platform, frontend ignored
- 
--#CC_FOR_BUILD=
--#CXX_FOR_BUILD=
--#F77_FOR_BUILD=
--#FC_FOR_BUILD=
-+#CC_FOR_BUILD="$(CC)"
-+#CXX_FOR_BUILD="$(CXX)"
-+#F77_FOR_BUILD="$(F77)"
-+#FC_FOR_BUILD="$(FC)"
- 
--#CPPFLAGS_FOR_BUILD=
--#CFLAGS_FOR_BUILD=
--#CXXFLAGS_FOR_BUILD=
--#FFLAGS_FOR_BUILD=
--#FCFLAGS_FOR_BUILD=
--#LDFLAGS_FOR_BUILD=
-+#CPPFLAGS_FOR_BUILD="$(CPPFLAGS)"
-+#CFLAGS_FOR_BUILD="$(CFLAGS)"
-+#CXXFLAGS_FOR_BUILD="$(CXXFLAGS)"
-+#FFLAGS_FOR_BUILD="$(FFLAGS)"
-+#FCFLAGS_FOR_BUILD="$(FCFLAGS)"
-+#LDFLAGS_FOR_BUILD="$(LDFLAGS)"
- #LIBS_FOR_BUILD=
---- a/build-config/common/platforms/platform-frontend-user-provided
-+++ b/build-config/common/platforms/platform-frontend-user-provided
-@@ -1,12 +1,12 @@
--CC_FOR_BUILD=
--CXX_FOR_BUILD=
--F77_FOR_BUILD=
--FC_FOR_BUILD=
-+CC_FOR_BUILD="$(CC)"
-+CXX_FOR_BUILD="$(CXX)"
-+F77_FOR_BUILD="$(F77)"
-+FC_FOR_BUILD="$(FC)"
- 
--CPPFLAGS_FOR_BUILD=
--CFLAGS_FOR_BUILD=
--CXXFLAGS_FOR_BUILD=
--FFLAGS_FOR_BUILD=
--FCFLAGS_FOR_BUILD=
--LDFLAGS_FOR_BUILD=
--LIBS_FOR_BUILD=
-+CPPFLAGS_FOR_BUILD="$(CPPFLAGS)"
-+CFLAGS_FOR_BUILD="$(CFLAGS)"
-+CXXFLAGS_FOR_BUILD="$(CXXFLAGS)"
-+FFLAGS_FOR_BUILD="$(FFLAGS)"
-+FCFLAGS_FOR_BUILD="$(FCFLAGS)"
-+LDFLAGS_FOR_BUILD="$(LDFLAGS)"
-+#LIBS_FOR_BUILD=
---- a/build-config/common/platforms/platform-mpi-user-provided
-+++ b/build-config/common/platforms/platform-mpi-user-provided
-@@ -1,7 +1,7 @@
--MPICC=
--MPICXX=
--MPIF77=
--MPIFC=
-+#MPICC=
-+#MPICXX=
-+#MPIF77=
-+#MPIFC=
- 
- #MPI_LDFLAGS=
- #MPI_LIBS=
 --- a/doc/examples/Makefile
 +++ b/doc/examples/Makefile
 @@ -37,78 +37,78 @@
diff --git a/sys-cluster/otf2/files/otf2-3.0-respect-flags.patch b/sys-cluster/otf2/files/otf2-3.0-respect-flags.patch
new file mode 100644
index 0000000000..6fd8c6ca59
--- /dev/null
+++ b/sys-cluster/otf2/files/otf2-3.0-respect-flags.patch
@@ -0,0 +1,95 @@
+--- a/doc/examples/Makefile
++++ b/doc/examples/Makefile
+@@ -37,78 +37,78 @@
+ pthread: $(ALL_PTHREAD)
+ 
+ otf2_reader_example.o: otf2_reader_example.c
+-	gcc -std=c99 `otf2-config --cflags` \
++	$(CC) $(CFLAGS) -fPIC -std=c99 `otf2-config --cflags` \
+             -c otf2_reader_example.c \
+             -o otf2_reader_example.o
+ 
+ otf2_reader_example: otf2_reader_example.o
+-	gcc otf2_reader_example.o \
++	$(CC) $(CFLAGS) $(LDFLAGS) -fPIE otf2_reader_example.o \
+             `otf2-config --ldflags` \
+             `otf2-config --libs` \
+             -o otf2_reader_example
+ 
+ otf2_writer_example.o: otf2_writer_example.c
+-	gcc -std=c99 `otf2-config --cflags` \
++	$(CC) $(CFLAGS) -fPIC -std=c99 `otf2-config --cflags` \
+             -c otf2_writer_example.c \
+             -o otf2_writer_example.o
+ 
+ otf2_writer_example: otf2_writer_example.o
+-	gcc otf2_writer_example.o \
++	$(CC) $(CFLAGS) $(LDFLAGS) -fPIE otf2_writer_example.o \
+             `otf2-config --ldflags` \
+             `otf2-config --libs` \
+             -o otf2_writer_example
+ 
+ otf2_mpi_reader_example.o: otf2_mpi_reader_example.c
+-	mpicc -std=c99 `otf2-config --cflags` \
++	$(MPICC) $(CFLAGS) -fPIC -std=c99 `otf2-config --cflags` \
+             -c otf2_mpi_reader_example.c \
+             -o otf2_mpi_reader_example.o
+ 
+ otf2_mpi_reader_example: otf2_mpi_reader_example.o
+-	mpicc otf2_mpi_reader_example.o \
++	$(MPICC) $(CFLAGS) $(LDFLAGS) -fPIE otf2_mpi_reader_example.o \
+             `otf2-config --ldflags` \
+             `otf2-config --libs` \
+             -o otf2_mpi_reader_example
+ 
+ otf2_mpi_reader_example_cc.o: otf2_mpi_reader_example.cc
+-	mpic++ `otf2-config --cflags` \
++	$(MPICXX) $(CXXFLAGS) -fPIC \
+             -c otf2_mpi_reader_example.cc \
+             -o otf2_mpi_reader_example_cc.o
+ 
+ otf2_mpi_reader_example_cc: otf2_mpi_reader_example_cc.o
+-	mpic++ otf2_mpi_reader_example_cc.o \
++	$(MPICXX) $(CXXFLAGS) $(LDFLAGS) -fPIE otf2_mpi_reader_example_cc.o \
+             `otf2-config --ldflags` \
+             `otf2-config --libs` \
+             -o otf2_mpi_reader_example_cc
+ 
+ otf2_mpi_writer_example.o: otf2_mpi_writer_example.c
+-	mpicc -std=c99 `otf2-config --cflags` \
++	$(MPICC) $(CFLAGS) -fPIC -std=c99 `otf2-config --cflags` \
+             -c otf2_mpi_writer_example.c \
+             -o otf2_mpi_writer_example.o
+ 
+ otf2_mpi_writer_example: otf2_mpi_writer_example.o
+-	mpicc otf2_mpi_writer_example.o \
++	$(MPICC) $(CFLAGS) $(LDFLAGS) -fPIE otf2_mpi_writer_example.o \
+             `otf2-config --ldflags` \
+             `otf2-config --libs` \
+             -o otf2_mpi_writer_example
+ 
+ otf2_openmp_writer_example.o: otf2_openmp_writer_example.c
+-	gcc -std=c99 -fopenmp `otf2-config --cflags` \
++	$(CC) $(CFLAGS) -fPIC -std=c99 -fopenmp `otf2-config --cflags` \
+             -c otf2_openmp_writer_example.c \
+             -o otf2_openmp_writer_example.o
+ 
+ otf2_openmp_writer_example: otf2_openmp_writer_example.o
+-	gcc -fopenmp otf2_openmp_writer_example.o \
++	$(CC) $(CFLAGS) $(LDFLAGS) -fPIE -fopenmp otf2_openmp_writer_example.o \
+             `otf2-config --ldflags` \
+             `otf2-config --libs` \
+             -o otf2_openmp_writer_example
+ 
+ otf2_pthread_writer_example.o: otf2_pthread_writer_example.c
+-	gcc -std=c99 -pthread `otf2-config --cflags` \
++	$(CC) $(CFLAGS) -fPIC -std=c99 -pthread `otf2-config --cflags` \
+             -c otf2_pthread_writer_example.c \
+             -o otf2_pthread_writer_example.o
+ 
+ otf2_pthread_writer_example: otf2_pthread_writer_example.o
+-	gcc -pthread otf2_pthread_writer_example.o \
++	$(CC) $(CFLAGS) $(LDFLAGS) -fPIE -pthread otf2_pthread_writer_example.o \
+             `otf2-config --ldflags` \
+             `otf2-config --libs` \
+             -o otf2_pthread_writer_example
diff --git a/sys-cluster/otf2/otf2-2.3-r2.ebuild b/sys-cluster/otf2/otf2-2.3-r3.ebuild
similarity index 58%
rename from sys-cluster/otf2/otf2-2.3-r2.ebuild
rename to sys-cluster/otf2/otf2-2.3-r3.ebuild
index 8bc4694784..32afecbb0f 100644
--- a/sys-cluster/otf2/otf2-2.3-r2.ebuild
+++ b/sys-cluster/otf2/otf2-2.3-r3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.vi-hps.org/projects/score-p"
 SRC_URI="https://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/2.3"
 KEYWORDS="~amd64"
 IUSE="debug sionlib test"
 
@@ -31,23 +31,48 @@ PATCHES=( "${FILESDIR}/${P}-respect-flags.patch" )
 
 src_configure() {
 	tc-export CC CXX FC F77 CPP
+	rm build-config/common/platforms/platform-* || die
 
-	export MPICC=/usr/bin/mpicc
-	export MPICXX=/usr/bin/mpicxx
-	export MPIF77=/usr/bin/mpif77
-	export MPIFC=/usr/bin/mpifc
+	cat > build-config/common/platforms/platform-backend-user-provided <<-EOF || die
+	CC=${CC}
+	CXX=${CXX}
+	FC=${FC}
+	F77=${F77}
+	CPP=${CPP}
+	CXXCPP=${CPP}
+	EOF
 
-	export MPI_CFLAGS="${CFLAGS}"
-	export MPI_CXXFLAGS="${CXXFLAGS}"
-	export MPI_CPPFLAGS="${CPPFLAGS}"
-	export MPI_F77LAGS="${F77FLAGS}"
-	export MPI_FCLAGS="${FCFLAGS}"
-	export MPI_LDFLAGS="${LDFLAGS}"
+	cat > build-config/common/platforms/platform-frontend-user-provided <<-EOF || die
+	CC_FOR_BUILD=${CC}
+	F77_FOR_BUILD=${F77}
+	FC_FOR_BUILD=${FC}
+	CXX_FOR_BUILD=${CXX}
+	LDFLAGS_FOR_BUILD=${LDFLAGS}
+	CFLAGS_FOR_BUILD=${CFLAGS}
+	CXXFLAGS_FOR_BUILD=${CXXFLAGS}
+	CPPFLAGS_FOR_BUILD=${CPPFLAGS}
+	FCFLAGS_FOR_BUILD=${FCFLAGS}
+	FFLAGS_FOR_BUILD=${FFLAGS}
+	EOF
+
+	cat > build-config/common/platforms/platform-mpi-user-provided <<-EOF || die
+	MPICC=mpicc
+	MPICXX=mpicxx
+	MPIF77=mpif77
+	MPIFC=mpif90
+	MPI_CPPFLAGS=${CPPFLAGS}
+	MPI_CFLAGS=${CFLAGS}
+	MPI_CXXFLAGS=${CXXFLAGS}
+	MPI_FFLAGS=${FFLAGS}
+	MPI_FCFLAGS=${FCFLAGS}
+	MPI_LDFLAGS=${LDFLAGS}
+	EOF
 
 	local myconf=(
 		--disable-platform-mic
 		--disable-static
 		--enable-shared
+		--with-custom-compilers
 
 		$(use_enable test backend-test-runs)
 		$(use_enable debug)
diff --git a/sys-cluster/otf2/otf2-3.0.ebuild b/sys-cluster/otf2/otf2-3.0.ebuild
new file mode 100644
index 0000000000..d311a9f030
--- /dev/null
+++ b/sys-cluster/otf2/otf2-3.0.ebuild
@@ -0,0 +1,95 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="highly scalable, memory efficient event trace data format"
+HOMEPAGE="https://www.vi-hps.org/projects/score-p"
+SRC_URI="https://perftools.pages.jsc.fz-juelich.de/cicd/otf2/tags/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/3.0"
+KEYWORDS="~amd64"
+IUSE="debug sionlib test"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/six[${PYTHON_USEDEP}]')
+
+	sionlib? ( sys-cluster/sionlibl:= )
+"
+DEPEND="${RDEPEND}"
+
+#RESTRICT="!test? ( test )"
+RESTRICT="test" #tests are failing
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+PATCHES=( "${FILESDIR}/${P}-respect-flags.patch" )
+
+src_configure() {
+	tc-export CC CXX FC F77 CPP
+	rm build-config/common/platforms/platform-* || die
+
+	cat > build-config/common/platforms/platform-backend-user-provided <<-EOF || die
+	CC=${CC}
+	CXX=${CXX}
+	FC=${FC}
+	F77=${F77}
+	CPP=${CPP}
+	CXXCPP=${CPP}
+	EOF
+
+	cat > build-config/common/platforms/platform-frontend-user-provided <<-EOF || die
+	CC_FOR_BUILD=${CC}
+	F77_FOR_BUILD=${F77}
+	FC_FOR_BUILD=${FC}
+	CXX_FOR_BUILD=${CXX}
+	LDFLAGS_FOR_BUILD=${LDFLAGS}
+	CFLAGS_FOR_BUILD=${CFLAGS}
+	CXXFLAGS_FOR_BUILD=${CXXFLAGS}
+	CPPFLAGS_FOR_BUILD=${CPPFLAGS}
+	FCFLAGS_FOR_BUILD=${FCFLAGS}
+	FFLAGS_FOR_BUILD=${FFLAGS}
+	EOF
+
+	cat > build-config/common/platforms/platform-mpi-user-provided <<-EOF || die
+	MPICC=mpicc
+	MPICXX=mpicxx
+	MPIF77=mpif77
+	MPIFC=mpif90
+	MPI_CPPFLAGS=${CPPFLAGS}
+	MPI_CFLAGS=${CFLAGS}
+	MPI_CXXFLAGS=${CXXFLAGS}
+	MPI_FFLAGS=${FFLAGS}
+	MPI_FCFLAGS=${FCFLAGS}
+	MPI_LDFLAGS=${LDFLAGS}
+	EOF
+
+	local myconf=(
+		--disable-platform-mic
+		--disable-static
+		--enable-shared
+		--with-custom-compilers
+
+		$(use_enable test backend-test-runs)
+		$(use_enable debug)
+	)
+
+	if use sionlib; then
+		myconf+=( "--with-sionlib=${EPREFIX}/usr" )
+		myconf+=( "--with-sionlib-headers=${EPREFIX}/usr/include/sionlibl" )
+	else
+		myconf+=( "--without-sionlib" )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}

From 04983033307881b3ce86f6f632bad2042da465d1 Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Thu, 30 Jun 2022 05:36:07 +0200
Subject: [PATCH 18/36] x11-terms/mlterm-canna: also install fb and wl modules

Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 ....2.ebuild => mlterm-canna-3.9.2-r1.ebuild} | 48 +++++++++++++++++--
 1 file changed, 43 insertions(+), 5 deletions(-)
 rename x11-terms/mlterm-canna/{mlterm-canna-3.9.2.ebuild => mlterm-canna-3.9.2-r1.ebuild} (55%)

diff --git a/x11-terms/mlterm-canna/mlterm-canna-3.9.2.ebuild b/x11-terms/mlterm-canna/mlterm-canna-3.9.2-r1.ebuild
similarity index 55%
rename from x11-terms/mlterm-canna/mlterm-canna-3.9.2.ebuild
rename to x11-terms/mlterm-canna/mlterm-canna-3.9.2-r1.ebuild
index 8f05bab497..59c02f644d 100644
--- a/x11-terms/mlterm-canna/mlterm-canna-3.9.2.ebuild
+++ b/x11-terms/mlterm-canna/mlterm-canna-3.9.2-r1.ebuild
@@ -14,13 +14,29 @@ S="${WORKDIR}/${MYP}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="cairo fbcon wayland X xft"
 
-DEPEND="app-i18n/canna"
+DEPEND="
+	app-i18n/canna
+	cairo? ( x11-libs/cairo[X(+)] )
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+	)
+	xft? ( x11-libs/libXft )
+"
 RDEPEND="
 	${DEPEND}
-	~x11-terms/mlterm-${PV}
+	~x11-terms/mlterm-${PV}[cairo=,fbcon=,wayland=,X=,xft=]
 "
 
+REQUIRED_USE="|| ( X fbcon wayland )"
+
 src_configure() {
 	local myconf=(
 		--disable-brlapi
@@ -40,11 +56,12 @@ src_configure() {
 		--disable-vt52
 		--disable-wnn
 		--enable-canna
-		--with-gui=console
+		--with-gui=$(usex X "xlib" "")$(usex fbcon ",fb" "")$(usex wayland ",wayland" "")
+		--with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
 		--without-gtk
-		--without-type-engines
 		--without-utmp
-		--without-x
+
+		$(use_with X x)
 	)
 
 	addpredict /dev/ptmx
@@ -60,6 +77,16 @@ src_compile() {
 	popd || die
 	pushd inputmethod/canna || die
 	emake
+	popd || die
+	pushd gui/fb/inputmethod/canna/ || die
+	emake
+	popd || die
+
+	if use wayland; then
+		pushd gui/wayland/inputmethod/canna/ || die
+		emake
+		popd || die
+	fi
 }
 
 src_test() {
@@ -69,5 +96,16 @@ src_test() {
 src_install() {
 	pushd inputmethod/canna || die
 	DESTDIR="${D}" emake install
+	popd || die
+	pushd gui/fb/inputmethod/canna/ || die
+	DESTDIR="${D}" emake install
+	popd || die
+
+	if use wayland; then
+		pushd gui/wayland/inputmethod/canna/ || die
+		DESTDIR="${D}" emake install
+		popd || die
+	fi
+
 	find "${ED}" -name '*.la' -delete || die
 }

From fe6fcdd17ca1f612a11b4e5d25c91eecd7d954fc Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Thu, 30 Jun 2022 12:25:11 +0200
Subject: [PATCH 19/36] sys-cluster/scorep: new version that respect *FLAGS

Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 sys-cluster/scorep/Manifest             |   1 +
 sys-cluster/scorep/scorep-7.1-r1.ebuild | 167 ++++++++++++++++++++++++
 2 files changed, 168 insertions(+)
 create mode 100644 sys-cluster/scorep/scorep-7.1-r1.ebuild

diff --git a/sys-cluster/scorep/Manifest b/sys-cluster/scorep/Manifest
index 1464caa239..73dec39d82 100644
--- a/sys-cluster/scorep/Manifest
+++ b/sys-cluster/scorep/Manifest
@@ -1 +1,2 @@
 DIST scorep-7.1.tar.gz 19979160 BLAKE2B be0f3d6534410c9c510e22110f92227dcdf52b77eba735913c92bcd67fed915d59a6988090f90abd777a9c4b0d821de7264d7b40d0687c8f684e4af72e42c43b SHA512 19da94e64eb9e3fb27f2c37087df2acc511645aa16abf80bb73c19eddab9efa004325d64eb0031df2f10a250976c9c2b1faf3169ebd32909703bf678c9abeb1a
+DIST scorep-edf930df.tar.gz 20238984 BLAKE2B 9a469102a5bace67633efcf8d90908bd42f7b3a90b34139034d94aace9ebf31d38a96266257df41c3b1c754eef69b9bc5fa32be5565d1b3f59f00314a04b8e98 SHA512 1332c12facc64f68c3e382fbc578834a845eec69528603eb860b6e46b9d69c079d0c962e343f02fbe51976546c02860c3f0b4a8b96882bdb606a9577020f5c84
diff --git a/sys-cluster/scorep/scorep-7.1-r1.ebuild b/sys-cluster/scorep/scorep-7.1-r1.ebuild
new file mode 100644
index 0000000000..e44d04bb61
--- /dev/null
+++ b/sys-cluster/scorep/scorep-7.1-r1.ebuild
@@ -0,0 +1,167 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FORTRAN_NEED_OPENMP=1
+FORTRAN_STANDARD=90
+LLVM_MAX_SLOT=14
+
+inherit llvm fortran-2 toolchain-funcs
+
+DESCRIPTION="Scalable Performance Measurement Infrastructure for Parallel Codes"
+HOMEPAGE="https://www.vi-hps.org/projects/score-p"
+SRC_URI="https://perftools.pages.jsc.fz-juelich.de/cicd/${PN}/branches/gentoo-${PN}-score/sources.edf930df.tar.gz -> ${PN}-edf930df.tar.gz"
+#	https://perftools.pages.jsc.fz-juelich.de/cicd/${PN}/tags/${P}/${P}.tar.gz
+S="${WORKDIR}/sources.edf930df"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug gcc-plugin llvm mpi online-access opencl openshmem pmi unwind"
+#TODO: openacc
+
+CDEPEND="
+	dev-libs/cubelib
+	dev-libs/cubew
+	dev-libs/papi
+	sys-cluster/opari2
+	>=sys-cluster/otf2-3.0
+	sys-libs/binutils-libs:=
+	sys-libs/zlib
+
+	llvm? (
+		sys-devel/clang:"${LLVM_MAX_SLOT}"
+		<sys-devel/llvm-"${LLVM_MAX_SLOT}":=
+		|| (
+			sys-devel/llvm:12
+			sys-devel/llvm:13
+			sys-devel/llvm:"${LLVM_MAX_SLOT}"
+		)
+	)
+	mpi? ( virtual/mpi )
+	openshmem? ( sys-cluster/SOS )
+	pmi? ( || ( sys-cluster/slurm sys-cluster/pmix[pmi] ) )
+	unwind? ( || ( sys-libs/libunwind sys-libs/llvm-libunwind ) )
+"
+RDEPEND="
+	${CDEPEND}
+	opencl? ( virtual/opencl )
+"
+DEPEND="
+	${CDEPEND}
+	opencl? ( dev-util/opencl-headers )
+"
+
+pkg_setup() {
+	use llvm && llvm_pkg_setup
+	fortran-2_pkg_setup
+}
+
+src_prepare() {
+	tc-export CC CXX FC F77 CPP AR
+	# eautoreconf will need custom autotools
+	rm build-config/common/platforms/platform-* || die
+
+	cat > build-config/common/platforms/platform-backend-user-provided <<-EOF || die
+	CC=${CC}
+	CXX=${CXX}
+	FC=${FC}
+	F77=${F77}
+	CPP=${CPP}
+	CXXCPP=${CPP}
+	EOF
+
+	cat > build-config/common/platforms/platform-frontend-user-provided <<-EOF || die
+	CC_FOR_BUILD=${CC}
+	F77_FOR_BUILD=${F77}
+	FC_FOR_BUILD=${FC}
+	CXX_FOR_BUILD=${CXX}
+	LDFLAGS_FOR_BUILD=${LDFLAGS}
+	CFLAGS_FOR_BUILD=${CFLAGS}
+	CXXFLAGS_FOR_BUILD=${CXXFLAGS}
+	CPPFLAGS_FOR_BUILD=${CPPFLAGS}
+	FCFLAGS_FOR_BUILD=${FCFLAGS}
+	FFLAGS_FOR_BUILD=${FFLAGS}
+	EOF
+
+	cat > build-config/common/platforms/platform-mpi-user-provided <<-EOF || die
+	MPICC=mpicc
+	MPICXX=mpicxx
+	MPIF77=mpif77
+	MPIFC=mpif90
+	MPI_CPPFLAGS=${CPPFLAGS}
+	MPI_CFLAGS=${CFLAGS}
+	MPI_CXXFLAGS=${CXXFLAGS}
+	MPI_FFLAGS=${FFLAGS}
+	MPI_FCFLAGS=${FCFLAGS}
+	MPI_LDFLAGS=${LDFLAGS}
+	EOF
+
+	cat > build-config/common/platforms/platform-shmem-user-provided <<-EOF || die
+	SHMEMCC=oshcc
+	SHMEMCXX=oshc++
+	SHMEMF77=oshfort
+	SHMEMFC=oshfort
+	SHMEM_CPPFLAGS=${CPPFLAGS}
+	SHMEM_CFLAGS=${CFLAGS}
+	SHMEM_CXXFLAGS=${CXXFLAGS}
+	SHMEM_FFLAGS=${FFLAGS}
+	SHMEM_FCFLAGS=${FCFLAGS}
+	SHMEM_LDFLAGS=${LDFLAGS}
+	SHMEM_LIBS=-lsma
+	SHMEM_LIB_NAME=libsma
+	SHMEM_NAME=sandia-openshmem
+	EOF
+
+	rm -r vendor || die
+	default
+}
+
+src_configure() {
+
+	local myconf=(
+		--disable-cuda
+		--disable-experimental-platform
+		--disable-openacc
+		--disable-platform-mic
+		--disable-static
+		--enable-shared
+		--with-cubelib
+		--with-cubew
+		--with-custom-compilers
+		--with-libbfd
+		--with-opari2
+		--with-otf2
+		--with-papi-header="/usr/include"
+		--with-papi-lib="/usr/$(get_libdir)"
+		--without-libcuda
+		--without-libcudart
+		--without-libcupti
+		--without-liblustreapi
+		--without-libnvidia-ml
+		--without-librca
+		--without-pdt
+
+		$(use_enable debug)
+		$(use_with gcc-plugin)
+		$(use_with online-access)
+		$(use_with opencl libOpenCL)
+		$(use_with openshmem shmem openshmem)
+		$(use_with pmi)
+		$(use_with unwind libunwind)
+	)
+	if use llvm; then
+		myconf+=( "--with-llvm=$(get_llvm_prefix)/bin" )
+	else
+		myconf+=( "--without-llvm" )
+	fi
+	use mpi || myconf+=( "--without-mpi" )
+
+	econf CXXFLAGS_FOR_BUILD_SCORE="${CXXFLAGS}" CFLAGS_FOR_BUILD_SCORE="${CFLAGS}" LDFLAGS_FOR_BUILD_SCORE="${LDFLAGS}" "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}

From 109655c2023470abe74ee4cc2d32c55521ae6e76 Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Thu, 30 Jun 2022 12:29:26 +0200
Subject: [PATCH 20/36] dev-python/confluent-kafka: set librdkafka version

Closes: https://bugs.gentoo.org/855320
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild b/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild
index bb04a6a993..11a247957d 100644
--- a/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild
+++ b/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild
@@ -21,7 +21,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="dev-libs/librdkafka"
+RDEPEND="~dev-libs/librdkafka-1.9.0"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	test? (

From fa951a9846b402be0c7b3f30f892d06f80abc983 Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Thu, 30 Jun 2022 12:30:34 +0200
Subject: [PATCH 21/36] dev-python/confluent-kafka: unkeyword 1.9.0 for ~amd64

Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild b/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild
index 11a247957d..80ad56422e 100644
--- a/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild
+++ b/dev-python/confluent-kafka/confluent-kafka-1.9.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MYPN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS=""
 
 RDEPEND="~dev-libs/librdkafka-1.9.0"
 DEPEND="${RDEPEND}"

From 6c96c09ff21b606009ffec2a81b41b9aebbaf33b Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Thu, 30 Jun 2022 12:40:39 +0200
Subject: [PATCH 22/36] dev-python/axisregistry: redo the patch

Closes: https://bugs.gentoo.org/855323
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 dev-python/axisregistry/axisregistry-0.3.2.ebuild      |  2 +-
 ...gistry-0.3.2-remove-setuptools_scm-constraint.patch | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 dev-python/axisregistry/files/axisregistry-0.3.2-remove-setuptools_scm-constraint.patch

diff --git a/dev-python/axisregistry/axisregistry-0.3.2.ebuild b/dev-python/axisregistry/axisregistry-0.3.2.ebuild
index 0339faa33d..39fdb1de24 100644
--- a/dev-python/axisregistry/axisregistry-0.3.2.ebuild
+++ b/dev-python/axisregistry/axisregistry-0.3.2.ebuild
@@ -24,7 +24,7 @@ DEPEND="
 	>=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
 "
 
-PATCHES=( "${FILESDIR}/${PN}-0.2.0-remove-setuptools_scm-constraint.patch" )
+PATCHES=( "${FILESDIR}/${P}-remove-setuptools_scm-constraint.patch" )
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/axisregistry/files/axisregistry-0.3.2-remove-setuptools_scm-constraint.patch b/dev-python/axisregistry/files/axisregistry-0.3.2-remove-setuptools_scm-constraint.patch
new file mode 100644
index 0000000000..c50745baac
--- /dev/null
+++ b/dev-python/axisregistry/files/axisregistry-0.3.2-remove-setuptools_scm-constraint.patch
@@ -0,0 +1,10 @@
+--- a/setup.py
++++ b/setup.py
+@@ -42,6 +42,6 @@
+         "Programming Language :: Python :: 3",
+     ],
+     python_requires=">=3.7",
+-    setup_requires=["setuptools_scm>=4,<6.1"],
++    setup_requires=["setuptools_scm>=4"],
+     install_requires=["protobuf"],
+ )

From 31147228dd567a3c9917a92c94e36b3a6aa24edc Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 14:11:45 +0500
Subject: [PATCH 23/36] dev-nim/flatty: new package, add 0.3.4

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 dev-nim/flatty/Manifest            |  1 +
 dev-nim/flatty/flatty-0.3.4.ebuild | 26 ++++++++++++++++++++++++++
 dev-nim/flatty/metadata.xml        | 11 +++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 dev-nim/flatty/Manifest
 create mode 100644 dev-nim/flatty/flatty-0.3.4.ebuild
 create mode 100644 dev-nim/flatty/metadata.xml

diff --git a/dev-nim/flatty/Manifest b/dev-nim/flatty/Manifest
new file mode 100644
index 0000000000..af87a285bf
--- /dev/null
+++ b/dev-nim/flatty/Manifest
@@ -0,0 +1 @@
+DIST flatty-0.3.4.tar.gz 17517 BLAKE2B 0fb7a0a752ab97f84ed7ba21b8751e960c14a69d18eb681190ca12b4eb85dfad873c11ba27a83240f5f02ebf5667e2ecfa1c177e595baaa1c7f2f2eb09636f8c SHA512 ce0845fa89b47128b0ed18821e9687c7fa3edeacac6030972a9865a13afa8c21f450d773ac0a82326d37973b83ee4007b284e9513e13bc081be772005f3dc906
diff --git a/dev-nim/flatty/flatty-0.3.4.ebuild b/dev-nim/flatty/flatty-0.3.4.ebuild
new file mode 100644
index 0000000000..b077b4a372
--- /dev/null
+++ b/dev-nim/flatty/flatty-0.3.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="Tools and serializer for plain flat binary files"
+HOMEPAGE="
+	https://github.com/treeform/flatty
+	https://nimble.directory/pkg/flatty
+"
+SRC_URI="https://github.com/treeform/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+
+set_package_url "https://github.com/treeform/flatty"
+
+src_prepare() {
+	default
+
+	# remove failing tests
+	rm tests/test_hexprint.nim || die
+}
diff --git a/dev-nim/flatty/metadata.xml b/dev-nim/flatty/metadata.xml
new file mode 100644
index 0000000000..b1eab6ca89
--- /dev/null
+++ b/dev-nim/flatty/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">treeform/flatty</remote-id>
+	</upstream>
+</pkgmetadata>

From 290814fbf13562e39dba808bb304daffbb3741a2 Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 14:23:30 +0500
Subject: [PATCH 24/36] dev-nim/jsony: new package, add 1.1.3

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 dev-nim/jsony/Manifest           |  1 +
 dev-nim/jsony/jsony-1.1.3.ebuild | 19 +++++++++++++++++++
 dev-nim/jsony/metadata.xml       | 11 +++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 dev-nim/jsony/Manifest
 create mode 100644 dev-nim/jsony/jsony-1.1.3.ebuild
 create mode 100644 dev-nim/jsony/metadata.xml

diff --git a/dev-nim/jsony/Manifest b/dev-nim/jsony/Manifest
new file mode 100644
index 0000000000..acf72d468e
--- /dev/null
+++ b/dev-nim/jsony/Manifest
@@ -0,0 +1 @@
+DIST jsony-1.1.3.tar.gz 18352 BLAKE2B c8a9942001535e823a8137fade1db2fad5549af97e0cdd75543660b267e0a260016b5979eba4031ae37ca8849acda2de540acfc595d95b895bbc3f8215eb8f29 SHA512 bc7b4282d4250836b04f0b04d1bc33ddfc5bdd4fb26fa6d313bff2972c0e83055a8b2212027443f70c209bdf0e0316d73c73cfc7f6211e6c824937ba10439558
diff --git a/dev-nim/jsony/jsony-1.1.3.ebuild b/dev-nim/jsony/jsony-1.1.3.ebuild
new file mode 100644
index 0000000000..311ee455c1
--- /dev/null
+++ b/dev-nim/jsony/jsony-1.1.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="A loose direct to object json parser with hooks"
+HOMEPAGE="
+	https://github.com/treeform/jsony
+	https://nimble.directory/pkg/jsony
+"
+SRC_URI="https://github.com/treeform/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+
+set_package_url "https://github.com/treeform/jsony"
diff --git a/dev-nim/jsony/metadata.xml b/dev-nim/jsony/metadata.xml
new file mode 100644
index 0000000000..a9dae2c467
--- /dev/null
+++ b/dev-nim/jsony/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">treeform/jsony</remote-id>
+	</upstream>
+</pkgmetadata>

From f4e34cb781333eab630fae45753dc0e824952ed6 Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 14:25:13 +0500
Subject: [PATCH 25/36] dev-nim/*: fix copyright year

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 dev-nim/balls/balls-3.7.0.ebuild | 2 +-
 dev-nim/grok/grok-0.5.3.ebuild   | 2 +-
 dev-nim/npeg/npeg-0.26.0.ebuild  | 2 +-
 dev-nim/sync/sync-1.5.0.ebuild   | 2 +-
 dev-nim/ups/ups-0.0.7.ebuild     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-nim/balls/balls-3.7.0.ebuild b/dev-nim/balls/balls-3.7.0.ebuild
index e7de1a9100..ff2e1ca3b0 100644
--- a/dev-nim/balls/balls-3.7.0.ebuild
+++ b/dev-nim/balls/balls-3.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-nim/grok/grok-0.5.3.ebuild b/dev-nim/grok/grok-0.5.3.ebuild
index 2a569d3c09..55a0454594 100644
--- a/dev-nim/grok/grok-0.5.3.ebuild
+++ b/dev-nim/grok/grok-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-nim/npeg/npeg-0.26.0.ebuild b/dev-nim/npeg/npeg-0.26.0.ebuild
index 66034bdc05..ece40d508c 100644
--- a/dev-nim/npeg/npeg-0.26.0.ebuild
+++ b/dev-nim/npeg/npeg-0.26.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-nim/sync/sync-1.5.0.ebuild b/dev-nim/sync/sync-1.5.0.ebuild
index 5ef306697b..243c838e01 100644
--- a/dev-nim/sync/sync-1.5.0.ebuild
+++ b/dev-nim/sync/sync-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-nim/ups/ups-0.0.7.ebuild b/dev-nim/ups/ups-0.0.7.ebuild
index a004789cc0..40620ccd58 100644
--- a/dev-nim/ups/ups-0.0.7.ebuild
+++ b/dev-nim/ups/ups-0.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8

From fddc5f19a39ab59182772702ddcf9d1f5bb0a135 Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 15:54:03 +0500
Subject: [PATCH 26/36] dev-nim/ws: new package, add 0.5.0

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 dev-nim/ws/Manifest        |  1 +
 dev-nim/ws/metadata.xml    | 11 +++++++++++
 dev-nim/ws/ws-0.5.0.ebuild | 26 ++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 dev-nim/ws/Manifest
 create mode 100644 dev-nim/ws/metadata.xml
 create mode 100644 dev-nim/ws/ws-0.5.0.ebuild

diff --git a/dev-nim/ws/Manifest b/dev-nim/ws/Manifest
new file mode 100644
index 0000000000..d5e5c8dbff
--- /dev/null
+++ b/dev-nim/ws/Manifest
@@ -0,0 +1 @@
+DIST ws-0.5.0.tar.gz 2279043 BLAKE2B 3bfce18e21113fa9d2b604a29bd0ed13929318885ba0e3012998848c043fc3348fc7a742103c0d10bc6d4a7754b15e08ec922609c063229fda26a7e36a0c796e SHA512 f0a4a54f42bddd1fb61400c2b5e2db08a1d2d47e533c0b2b3c65e6ee47e171c9339e85d38531e255b5520103f587c44c5722907d4f5b621f240273c460ac0f2f
diff --git a/dev-nim/ws/metadata.xml b/dev-nim/ws/metadata.xml
new file mode 100644
index 0000000000..94123b7b6d
--- /dev/null
+++ b/dev-nim/ws/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">treeform/ws</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-nim/ws/ws-0.5.0.ebuild b/dev-nim/ws/ws-0.5.0.ebuild
new file mode 100644
index 0000000000..601325bfc6
--- /dev/null
+++ b/dev-nim/ws/ws-0.5.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit nimble
+
+DESCRIPTION="Simple WebSocket library for nim"
+HOMEPAGE="
+	https://github.com/treeform/ws
+	https://nimble.directory/pkg/ws
+"
+SRC_URI="https://github.com/treeform/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64"
+
+set_package_url "https://github.com/treeform/ws"
+
+src_prepare() {
+	default
+
+	# remove failing tests
+	rm tests/test_timeout.nim || die
+}

From 0e7939e3f17ebab94cc9e679cb59ad60d546739d Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 15:54:43 +0500
Subject: [PATCH 27/36] app-vim/qt-support: add metadata.xml

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 app-vim/qt-support/metadata.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 app-vim/qt-support/metadata.xml

diff --git a/app-vim/qt-support/metadata.xml b/app-vim/qt-support/metadata.xml
new file mode 100644
index 0000000000..7592e011d6
--- /dev/null
+++ b/app-vim/qt-support/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>cyber+gentoo@sysrq.in</email>
+		<name>Anna</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<email>leonid@fedorenchik.com</email>
+			<name>Leonid Fedorenchik</name>
+		</maintainer>
+		<remote-id type="github">fedorenchik/qt-support.vim</remote-id>
+	</upstream>
+</pkgmetadata>

From 0afcb0c0d3736350fcf64b454f1a09ebb5fd5747 Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Thu, 30 Jun 2022 15:55:17 +0500
Subject: [PATCH 28/36] dev-libs/sealcurses: add metadata.xml

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 dev-libs/sealcurses/metadata.xml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 dev-libs/sealcurses/metadata.xml

diff --git a/dev-libs/sealcurses/metadata.xml b/dev-libs/sealcurses/metadata.xml
new file mode 100644
index 0000000000..6ec671d564
--- /dev/null
+++ b/dev-libs/sealcurses/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>cyber+gentoo@sysrq.in</email>
+	<name>Anna</name>
+</maintainer>
+<longdescription>
+	the_Foundation is a C11 library and a coding convention for
+	object-oriented programming that has been designed from the point of
+	view of someone who appreciates the user-friendliness of Qt and some of
+	the thinking behind C++ STL. The preprocessor is used heavily to provide
+	flexibility and convenience for the programmer.
+</longdescription>
+<upstream>
+	<maintainer>
+		<email>jaakko.keranen@iki.fi</email>
+		<name>Jaakko Keränen</name>
+	</maintainer>
+	<bugs-to>https://codeberg.org/skyjake/the_Foundation/issues/</bugs-to>
+</upstream>
+</pkgmetadata>

From f96e664d9bb9ba467f7eb143a1db26898969d8c9 Mon Sep 17 00:00:00 2001
From: YOSHIOKA Takuma <lo48576@hard-wi.red>
Date: Fri, 1 Jul 2022 00:10:04 +0900
Subject: [PATCH 29/36] app-misc/watchexec: fix test file for release build

Closes: https://bugs.gentoo.org/855326
Signed-off-by: YOSHIOKA Takuma <lo48576@hard-wi.red>
---
 app-misc/watchexec/watchexec-1.20.2.ebuild | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app-misc/watchexec/watchexec-1.20.2.ebuild b/app-misc/watchexec/watchexec-1.20.2.ebuild
index 3d7e96ab14..5165d9a9d6 100644
--- a/app-misc/watchexec/watchexec-1.20.2.ebuild
+++ b/app-misc/watchexec/watchexec-1.20.2.ebuild
@@ -318,6 +318,14 @@ HTML_DOCS=( doc/watchexec.1.html )
 
 QA_FLAGS_IGNORED="usr/bin/watchexec"
 
+src_prepare() {
+	default_src_prepare
+
+	# Not using `.patch` file since this the file contains the version number.
+	sed -e '/^⚠ DEBUG BUILD ⚠$/,+1d' -i "${S}"/crates/cli/tests/snapshots/help__help_unix.snap
+
+}
+
 src_compile() {
 	cargo_src_compile --manifest-path=crates/cli/Cargo.toml
 }

From cca5952a0d3f9ef96cfd0e4bbae6201ed5589268 Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Thu, 30 Jun 2022 17:12:15 +0200
Subject: [PATCH 30/36] dev-cpp/parallel-hashmap: restrict tests

Closes: https://bugs.gentoo.org/855329
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 dev-cpp/parallel-hashmap/parallel-hashmap-1.35.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-cpp/parallel-hashmap/parallel-hashmap-1.35.ebuild b/dev-cpp/parallel-hashmap/parallel-hashmap-1.35.ebuild
index 036b306d5d..46dd6b3552 100644
--- a/dev-cpp/parallel-hashmap/parallel-hashmap-1.35.ebuild
+++ b/dev-cpp/parallel-hashmap/parallel-hashmap-1.35.ebuild
@@ -21,7 +21,9 @@ CDEPEND="dev-libs/cereal"
 DEPEND="test? ( ${CDEPEND} )"
 RDEPEND="${CDEPEND}"
 
-RESTRICT="!test? ( test )"
+# tests will download gtest, not trivial to use the system one
+# https://github.com/greg7mdp/parallel-hashmap/issues/154
+RESTRICT="test"
 
 src_compile() {
 	mycmakeargs=(

From 06aa86d4c1b40d8f527bea344eabab7f1d7bd9ce Mon Sep 17 00:00:00 2001
From: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
Date: Thu, 30 Jun 2022 20:22:49 +0400
Subject: [PATCH 31/36] x11-apps/organicmaps: new package, add 9999

Signed-off-by: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
---
 x11-apps/organicmaps/Manifest                 |  2 +
 .../files/organicmaps-9999-zlib-compile.patch | 10 +++++
 x11-apps/organicmaps/metadata.xml             |  8 ++++
 x11-apps/organicmaps/organicmaps-9999.ebuild  | 40 +++++++++++++++++++
 4 files changed, 60 insertions(+)
 create mode 100644 x11-apps/organicmaps/Manifest
 create mode 100644 x11-apps/organicmaps/files/organicmaps-9999-zlib-compile.patch
 create mode 100644 x11-apps/organicmaps/metadata.xml
 create mode 100644 x11-apps/organicmaps/organicmaps-9999.ebuild

diff --git a/x11-apps/organicmaps/Manifest b/x11-apps/organicmaps/Manifest
new file mode 100644
index 0000000000..401d1c2280
--- /dev/null
+++ b/x11-apps/organicmaps/Manifest
@@ -0,0 +1,2 @@
+AUX organicmaps-9999-zlib-compile.patch 291 BLAKE2B 627e0897134993fab63357dbaf59e16ca26fc180edfc0e05aefe557fa32d666ecdb6ad5a168b4564f2b9ef9a3b32200552faf0521594ce17a501b9b884b3b506 SHA512 a52c2a0068f929154a7c31479531db66c545328e2c069fe62cf8b3a41cc0eaf501a4885128d11be30a1037006f67b879015adcf4b126b0a13e316bffb5971e75
+EBUILD organicmaps-9999.ebuild 693 BLAKE2B a7a70da1baa43091bbfe47d6c49059a8f5cfc52e48abe3962a7f7fa141ed2301e6e3dbc31061f7f34791acfeb178c3603bbcfc607f47bfe27480d2d7fa2034b3 SHA512 94cc54583b77be1dbf54c421263c1580b05dd1dd166fa867d9e20c3f98bdafa9140581a212b47e617f8def08f8d2f0c2eb5de6137374b4e3b5427bb1bb464fa2
diff --git a/x11-apps/organicmaps/files/organicmaps-9999-zlib-compile.patch b/x11-apps/organicmaps/files/organicmaps-9999-zlib-compile.patch
new file mode 100644
index 0000000000..953dd01247
--- /dev/null
+++ b/x11-apps/organicmaps/files/organicmaps-9999-zlib-compile.patch
@@ -0,0 +1,10 @@
+--- git/3party/minizip/CMakeLists.txt   2022-06-07 12:52:32.337814533 +0200
++++ organicmaps/3party/minizip/CMakeLists.txt   2022-05-31 13:38:50.604235282 +0200
+@@ -15,6 +15,7 @@
+ 
+ target_compile_definitions(${PROJECT_NAME}
+   PUBLIC
++    OF=_Z_OF
+     USE_FILE32API
+   PRIVATE
+     NOCRYPT
diff --git a/x11-apps/organicmaps/metadata.xml b/x11-apps/organicmaps/metadata.xml
new file mode 100644
index 0000000000..e473d21c76
--- /dev/null
+++ b/x11-apps/organicmaps/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>zdanevich.vitaly@ya.ru</email>
+		<name>Vitaly Zdanevich</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/organicmaps/organicmaps-9999.ebuild b/x11-apps/organicmaps/organicmaps-9999.ebuild
new file mode 100644
index 0000000000..e6090e70b3
--- /dev/null
+++ b/x11-apps/organicmaps/organicmaps-9999.ebuild
@@ -0,0 +1,40 @@
+EAPI=7
+
+inherit git-r3 cmake-utils
+EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Offline maps and navigation using OpenStreetMap data"
+HOMEPAGE="https://organicmaps.app"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+DEPEND="sys-devel/clang
+	>=dev-util/cmake-3.18.1
+	dev-util/ninja
+	media-libs/freetype
+	dev-libs/icu
+	sys-libs/libstdc++-v3
+	dev-qt/qtcore
+	dev-qt/qtsvg
+	dev-db/sqlite
+	sys-libs/zlib[minizip]"
+RDEPEND=""
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-zlib-compile.patch"
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	CMAKE_BUILD_TYPE="RelWithDebInfo"
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=False
+	)
+
+	echo | ./configure.sh
+
+	cmake-utils_src_configure
+}

From 9d1fa10856ec2aab96e8f4ff16bf11aa1f71db1b Mon Sep 17 00:00:00 2001
From: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
Date: Thu, 30 Jun 2022 20:28:21 +0400
Subject: [PATCH 32/36] x11-apps/organicmaps: remove KEYWORDS for 9999

Because of pkgcheck error: VisibleVcsPkg

Signed-off-by: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
---
 x11-apps/organicmaps/organicmaps-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/x11-apps/organicmaps/organicmaps-9999.ebuild b/x11-apps/organicmaps/organicmaps-9999.ebuild
index e6090e70b3..3d7a2e414f 100644
--- a/x11-apps/organicmaps/organicmaps-9999.ebuild
+++ b/x11-apps/organicmaps/organicmaps-9999.ebuild
@@ -2,7 +2,6 @@ EAPI=7
 
 inherit git-r3 cmake-utils
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-KEYWORDS="~amd64"
 
 DESCRIPTION="Offline maps and navigation using OpenStreetMap data"
 HOMEPAGE="https://organicmaps.app"

From 64958cbabe6f2ea6c7e26b9851e260035dcee211 Mon Sep 17 00:00:00 2001
From: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
Date: Thu, 30 Jun 2022 20:36:14 +0400
Subject: [PATCH 33/36] x11-apps/organicmaps: to EAPI 8, cmake-utils -> cmake

Signed-off-by: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
---
 x11-apps/organicmaps/organicmaps-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-apps/organicmaps/organicmaps-9999.ebuild b/x11-apps/organicmaps/organicmaps-9999.ebuild
index 3d7a2e414f..6e13ee7376 100644
--- a/x11-apps/organicmaps/organicmaps-9999.ebuild
+++ b/x11-apps/organicmaps/organicmaps-9999.ebuild
@@ -1,6 +1,6 @@
-EAPI=7
+EAPI=8
 
-inherit git-r3 cmake-utils
+inherit git-r3 cmake
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 DESCRIPTION="Offline maps and navigation using OpenStreetMap data"

From d47605aad52c1a8f6ff1bb50a9bcca98867700c8 Mon Sep 17 00:00:00 2001
From: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
Date: Thu, 30 Jun 2022 20:42:03 +0400
Subject: [PATCH 34/36] x11-apps/organicmaps: fix building

Signed-off-by: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
---
 x11-apps/organicmaps/organicmaps-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-apps/organicmaps/organicmaps-9999.ebuild b/x11-apps/organicmaps/organicmaps-9999.ebuild
index 6e13ee7376..3d7a2e414f 100644
--- a/x11-apps/organicmaps/organicmaps-9999.ebuild
+++ b/x11-apps/organicmaps/organicmaps-9999.ebuild
@@ -1,6 +1,6 @@
-EAPI=8
+EAPI=7
 
-inherit git-r3 cmake
+inherit git-r3 cmake-utils
 EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 
 DESCRIPTION="Offline maps and navigation using OpenStreetMap data"

From ac022896326a23ff0def86092c77b444fdb6facf Mon Sep 17 00:00:00 2001
From: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
Date: Thu, 30 Jun 2022 20:47:22 +0400
Subject: [PATCH 35/36] organicmaps: move from x11-apps to gui-apps

Signed-off-by: Vitaly Zdanevich <zdanevich.vitaly@ya.ru>
---
 {x11-apps => gui-apps}/organicmaps/Manifest                       | 0
 .../organicmaps/files/organicmaps-9999-zlib-compile.patch         | 0
 {x11-apps => gui-apps}/organicmaps/metadata.xml                   | 0
 {x11-apps => gui-apps}/organicmaps/organicmaps-9999.ebuild        | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename {x11-apps => gui-apps}/organicmaps/Manifest (100%)
 rename {x11-apps => gui-apps}/organicmaps/files/organicmaps-9999-zlib-compile.patch (100%)
 rename {x11-apps => gui-apps}/organicmaps/metadata.xml (100%)
 rename {x11-apps => gui-apps}/organicmaps/organicmaps-9999.ebuild (100%)

diff --git a/x11-apps/organicmaps/Manifest b/gui-apps/organicmaps/Manifest
similarity index 100%
rename from x11-apps/organicmaps/Manifest
rename to gui-apps/organicmaps/Manifest
diff --git a/x11-apps/organicmaps/files/organicmaps-9999-zlib-compile.patch b/gui-apps/organicmaps/files/organicmaps-9999-zlib-compile.patch
similarity index 100%
rename from x11-apps/organicmaps/files/organicmaps-9999-zlib-compile.patch
rename to gui-apps/organicmaps/files/organicmaps-9999-zlib-compile.patch
diff --git a/x11-apps/organicmaps/metadata.xml b/gui-apps/organicmaps/metadata.xml
similarity index 100%
rename from x11-apps/organicmaps/metadata.xml
rename to gui-apps/organicmaps/metadata.xml
diff --git a/x11-apps/organicmaps/organicmaps-9999.ebuild b/gui-apps/organicmaps/organicmaps-9999.ebuild
similarity index 100%
rename from x11-apps/organicmaps/organicmaps-9999.ebuild
rename to gui-apps/organicmaps/organicmaps-9999.ebuild

From 4c20895db2092c03d412ebc05d3a7dace9342366 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flow@gentoo.org>
Date: Thu, 30 Jun 2022 19:38:37 +0200
Subject: [PATCH 36/36] media-sound/hushboard: add 0.0_pre20220518

Closes: https://bugs.gentoo.org/817185
Signed-off-by: Florian Schmaus <flow@gentoo.org>
---
 media-sound/hushboard/Manifest                            | 2 +-
 ...0210317-r1.ebuild => hushboard-0.0_pre20220518.ebuild} | 8 ++++----
 media-sound/hushboard/hushboard-9999.ebuild               | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename media-sound/hushboard/{hushboard-0.0_pre20210317-r1.ebuild => hushboard-0.0_pre20220518.ebuild} (81%)

diff --git a/media-sound/hushboard/Manifest b/media-sound/hushboard/Manifest
index 7fc0e59686..d0315113db 100644
--- a/media-sound/hushboard/Manifest
+++ b/media-sound/hushboard/Manifest
@@ -1 +1 @@
-DIST hushboard-0.0_pre20210317.tar.gz 109253 BLAKE2B 337e68b0a99780d3d62cf0e447de372842734832f81a12106cbbc1955fc673006790615719c3041220e5b3989eb1e28419eb676228c65a7dddadd4ae5b5d3267 SHA512 431b7bb99bb98725b337b79387a69ea9b1833ee9e2686125014d3ef2bfc609d8cf3eefffaffe23d2fc4a24ac489681eba9c430dc84fa3c7316f9caa26c70750d
+DIST hushboard-0.0_pre20220518.tar.gz 111373 BLAKE2B 438ddc7ab4d7aa7a9542afc1c4a7ff4a86af858617be77bc06b1967a84ad56b3824fb2df099c7022ff2da9753bfc01b591058dfdd01ab7580e9602a7983e87a6 SHA512 99a65b8d6e166b2e5185f16727409ed12a1a596aaa7e76bfcebfa0650e82fd16f9b920e6797ea90c9dcdb1897b491fb39590285571fa5b650a1380ae372de644
diff --git a/media-sound/hushboard/hushboard-0.0_pre20210317-r1.ebuild b/media-sound/hushboard/hushboard-0.0_pre20220518.ebuild
similarity index 81%
rename from media-sound/hushboard/hushboard-0.0_pre20210317-r1.ebuild
rename to media-sound/hushboard/hushboard-0.0_pre20220518.ebuild
index be4e0dcb20..9c8183d168 100644
--- a/media-sound/hushboard/hushboard-0.0_pre20210317-r1.ebuild
+++ b/media-sound/hushboard/hushboard-0.0_pre20220518.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/stuartlangridge/hushboard.git"
 	inherit git-r3
 else
-	HUSHBOARD_COMMIT_ID="c16611c539be111891116a737b02c5fb359ad1fc"
+	HUSHBOARD_COMMIT_ID="5d62c2aacb876f7178d8002a22e44128ac312c98"
 	SRC_URI="https://github.com/stuartlangridge/hushboard/archive/${HUSHBOARD_COMMIT_ID}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${HUSHBOARD_COMMIT_ID}"
 	KEYWORDS="~amd64"
diff --git a/media-sound/hushboard/hushboard-9999.ebuild b/media-sound/hushboard/hushboard-9999.ebuild
index be4e0dcb20..9c8183d168 100644
--- a/media-sound/hushboard/hushboard-9999.ebuild
+++ b/media-sound/hushboard/hushboard-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/stuartlangridge/hushboard.git"
 	inherit git-r3
 else
-	HUSHBOARD_COMMIT_ID="c16611c539be111891116a737b02c5fb359ad1fc"
+	HUSHBOARD_COMMIT_ID="5d62c2aacb876f7178d8002a22e44128ac312c98"
 	SRC_URI="https://github.com/stuartlangridge/hushboard/archive/${HUSHBOARD_COMMIT_ID}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${HUSHBOARD_COMMIT_ID}"
 	KEYWORDS="~amd64"