diff --git a/app-crypt/intel-ipsec-mb/files/intel-ipsec-mb-1.2_remove-werror-and-O3.patch b/app-crypt/intel-ipsec-mb/files/intel-ipsec-mb-1.2_remove-werror-and-O3.patch
new file mode 100644
index 0000000000..3c2cfb1f38
--- /dev/null
+++ b/app-crypt/intel-ipsec-mb/files/intel-ipsec-mb-1.2_remove-werror-and-O3.patch
@@ -0,0 +1,159 @@
+diff --git a/lib/Makefile b/lib/Makefile
+index f364b619..854357db 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -117,10 +117,10 @@ YASM_INCLUDES := $(foreach i,$(ASM_INCLUDE_DIRS),-I $i)
+ NASM_INCLUDES := $(foreach i,$(ASM_INCLUDE_DIRS),-I$i/)
+ ifneq ($(MINGW),0)
+ YASM_FLAGS := -f x64 -f win64 -X gnu -g dwarf2 -DWIN_ABI $(YASM_INCLUDES)
+-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI $(NASM_INCLUDES)
++NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI $(NASM_INCLUDES)
+ else
+ YASM_FLAGS := -f x64 -f elf64 -X gnu -g dwarf2 -DLINUX -D__linux__ $(YASM_INCLUDES)
+-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ $(NASM_INCLUDES)
++NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ $(NASM_INCLUDES)
+ endif
+ 
+ DEBUG_OPT ?= -O0
+@@ -170,7 +170,6 @@ endif
+ 
+ # prevent SIMD optimizations for non-aesni modules
+ CFLAGS_NO_SIMD = $(CFLAGS) -O1
+-CFLAGS += $(OPT)
+ 
+ # Set generic architectural optimizations
+ OPT_X86 := -msse4.2
+@@ -746,7 +745,7 @@ install: $(LIB_DIR)/$(LIBNAME)
+ 	install -m 0444 $(MAN2) $(MAN_DIR)
+ 	install -d $(LIB_INSTALL_DIR)
+ ifeq ($(SHARED),y)
+-	install -s -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR)
++	install -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR)
+ else
+ 	# must not strip symbol table for static libs
+ 	install -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR)
+diff --git a/lib/win_x64.mak b/lib/win_x64.mak
+index 17c58f72..93da855a 100644
+--- a/lib/win_x64.mak
++++ b/lib/win_x64.mak
+@@ -131,7 +131,7 @@ LINK_TOOL = link
+ LINKFLAGS = $(DLFLAGS) /nologo /machine:X64
+ 
+ AS = nasm
+-AFLAGS = $(DAFLAGS) -Werror -fwin64 -Xvc -DWIN_ABI -Iinclude/ \
++AFLAGS = $(DAFLAGS) -fwin64 -Xvc -DWIN_ABI -Iinclude/ \
+ 	-I./ -Iavx/ -Iavx2/ -Iavx512/ -Isse/
+ 
+ # dependency
+diff --git a/perf/Makefile b/perf/Makefile
+index f204e575..9db08180 100644
+--- a/perf/Makefile
++++ b/perf/Makefile
+@@ -45,9 +45,9 @@ endif
+ 
+ ifeq ($(MINGW),0)
+ CFLAGS += -DLINUX
+-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__
++NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__
+ else
+-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI
++NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI
+ endif
+ 
+ # if "-z ibt" is supported then assume "-z shstk, -z cet-report=error" are also supported
+@@ -62,21 +62,21 @@ CFLAGS += -fcf-protection=full
+ endif
+ 
+ ifeq ($(MINGW),0)
+-LDFLAGS = -fPIE -z noexecstack -z relro -z now -pthread
++LDFLAGS += -fPIE -z noexecstack -z relro -z now -pthread
+ endif
+ ifeq ($(CC_HAS_CET),1)
+ LDFLAGS += -fcf-protection=full -Wl,-z,ibt -Wl,-z,shstk -Wl,-z,cet-report=error
+ endif
+ LDLIBS = -lIPSec_MB
+ 
+-ifeq ("$(shell test -e $(INSTPATH) && echo -n yes)","yes")
++#ifeq ("$(shell test -e $(INSTPATH) && echo -n yes)","yes")
+ # library installed
+-CFLAGS +=
+-else
++#CFLAGS +=
++#else
+ # library not installed
+ CFLAGS +=  -I../lib/include -I../lib
+ LDFLAGS += -L$(LIB_DIR)
+-endif
++#endif
+ 
+ DEBUG_OPT ?= -O0
+ ifeq ($(DEBUG),y)
+diff --git a/perf/win_x64.mak b/perf/win_x64.mak
+index b0b864db..03c3b584 100644
+--- a/perf/win_x64.mak
++++ b/perf/win_x64.mak
+@@ -75,7 +75,7 @@ LNK = link
+ LFLAGS = /out:$(APP).exe $(DLFLAGS)
+ 
+ AS = nasm
+-AFLAGS = -Werror -fwin64 -Xvc -DWIN_ABI
++AFLAGS = -fwin64 -Xvc -DWIN_ABI
+ 
+ OBJECTS = ipsec_perf.obj msr.obj misc.obj
+ 
+diff --git a/test/Makefile b/test/Makefile
+index b03700a5..380a954a 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -66,15 +66,15 @@ endif
+ YASM_FLAGS := -f x64 -f elf64 -X gnu -g dwarf2 -DLINUX -D__linux__
+ ifeq ($(MINGW),0)
+ CFLAGS += -DLINUX
+-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__
++NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__
+ else
+-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI
++NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI
+ endif
+ 
+ ifeq ($(MINGW),0)
+-LDFLAGS = -fPIE -z noexecstack -z relro -z now
++LDFLAGS += -fPIE -z noexecstack -z relro -z now
+ else
+-LDFLAGS = -fPIE
++LDFLAGS += -fPIE
+ endif
+ 
+ ifeq ($(CC_HAS_CET),1)
+@@ -82,14 +82,14 @@ LDFLAGS += -fcf-protection=full -Wl,-z,ibt -Wl,-z,shstk -Wl,-z,cet-report=error
+ endif
+ LDLIBS = -lIPSec_MB
+ 
+-ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes")
++#ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes")
+ # library installed
+-CFLAGS +=
+-else
++#CFLAGS +=
++#else
+ # library not installed
+ CFLAGS +=  -I../lib/include -I../lib
+ LDFLAGS += -L$(LIB_DIR)
+-endif
++#endif
+ 
+ FUZZ_CFLAGS = -I../lib -L../lib $(CFLAGS) -g -fsanitize=fuzzer,address,leak
+ 
+diff --git a/test/win_x64.mak b/test/win_x64.mak
+index a3bd0b00..a7ff51f5 100644
+--- a/test/win_x64.mak
++++ b/test/win_x64.mak
+@@ -74,7 +74,7 @@ TEST_LFLAGS = /out:$(TEST_APP).exe $(DLFLAGS)
+ XVALID_LFLAGS = /out:$(XVALID_APP).exe $(DLFLAGS)
+ 
+ AS = nasm
+-AFLAGS = -Werror -fwin64 -Xvc -DWIN_ABI
++AFLAGS = -fwin64 -Xvc -DWIN_ABI
+ 
+ # dependency
+ !ifndef DEPTOOL
diff --git a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.2.ebuild b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.2.ebuild
index 7650520da8..4d8f17f15a 100644
--- a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.2.ebuild
+++ b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.2.ebuild
@@ -25,7 +25,7 @@ BDEPEND="
 	>=dev-lang/nasm-2.13.03
 "
 
-PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.1_remove-werror-and-O3.patch" )
+PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.2_remove-werror-and-O3.patch" )
 
 src_configure(){
 	tc-export CC LD AR
diff --git a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild
index 7650520da8..4d8f17f15a 100644
--- a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild
+++ b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild
@@ -25,7 +25,7 @@ BDEPEND="
 	>=dev-lang/nasm-2.13.03
 "
 
-PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.1_remove-werror-and-O3.patch" )
+PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.2_remove-werror-and-O3.patch" )
 
 src_configure(){
 	tc-export CC LD AR
diff --git a/app-misc/aw-client/aw-client-0.11.0.ebuild b/app-misc/aw-client/aw-client-0.11.0.ebuild
new file mode 100644
index 0000000000..85b6314560
--- /dev/null
+++ b/app-misc/aw-client/aw-client-0.11.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10})
+
+inherit distutils-r1
+
+DESCRIPTION="Client library for ActivityWatch"
+HOMEPAGE="https://activitywatch.net"
+LICENSE="MPL-2.0"
+
+inherit git-r3
+EGIT_REPO_URI="https://github.com/ActivityWatch/${PN}.git"
+EGI_COMMIT="f7a8dbb3f81be81224368970054fd33d2814c9d7"
+
+KEYWORDS=""
+SLOT="0"
+# Test tries to connect to aw-server
+RESTRICT="test"
+
+RDEPEND="
+	app-misc/aw-core[${PYTHON_USEDEP}]
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/persist-queue[${PYTHON_USEDEP}]
+	dev-python/tabulate[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+"
diff --git a/app-misc/aw-client/metadata.xml b/app-misc/aw-client/metadata.xml
new file mode 100644
index 0000000000..01c1fc8487
--- /dev/null
+++ b/app-misc/aw-client/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-misc/aw-core/aw-core-0.11.0.ebuild b/app-misc/aw-core/aw-core-0.11.0.ebuild
new file mode 100644
index 0000000000..34e0cdad06
--- /dev/null
+++ b/app-misc/aw-core/aw-core-0.11.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core library for ActivityWatch"
+HOMEPAGE="https://activitywatch.net"
+LICENSE="MPL-2.0"
+
+inherit git-r3
+EGIT_REPO_URI="https://github.com/ActivityWatch/${PN}.git"
+EGI_COMMIT="8aaa35376a4f0b270a1927dff4b4d34caee7707b"
+
+KEYWORDS=""
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/deprecation[${PYTHON_USEDEP}]
+	dev-python/iso8601[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/peewee[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+	dev-python/TakeTheTime[${PYTHON_USEDEP}]
+	dev-python/timeslot[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+distutils_enable_tests pytest
diff --git a/app-misc/aw-core/metadata.xml b/app-misc/aw-core/metadata.xml
new file mode 100644
index 0000000000..01c1fc8487
--- /dev/null
+++ b/app-misc/aw-core/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-libs/cubelib/cubelib-4.7.ebuild b/dev-libs/cubelib/cubelib-4.7-r1.ebuild
similarity index 62%
rename from dev-libs/cubelib/cubelib-4.7.ebuild
rename to dev-libs/cubelib/cubelib-4.7-r1.ebuild
index 56f15aa3bc..4b53db2bb3 100644
--- a/dev-libs/cubelib/cubelib-4.7.ebuild
+++ b/dev-libs/cubelib/cubelib-4.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="General purpose C++ library and tools"
 HOMEPAGE="https://www.scalasca.org/scalasca/software/cube-4.x"
@@ -12,8 +12,24 @@ SRC_URI="https://apps.fz-juelich.de/scalasca/releases/cube/${PV}/dist/${P}.tar.g
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="R"
 
-DEPEND="dev-cpp/gtest"
+RDEPEND="
+	sys-libs/zlib
+	R? (
+		dev-lang/R
+		dev-R/Rcpp
+		dev-R/RInside
+	)
+"
+DEPEND="
+	${RDEPEND}
+	dev-cpp/gtest
+"
+BDEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
 
 src_prepare() {
 	rm -r vendor/googletest || die
@@ -24,8 +40,9 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		--disable-platform-mic
+		$(use_with R cube_dump_r)
 	)
-	econf "${myconf[@]}"
+	econf CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" "${myconf[@]}"
 }
 
 src_install() {
@@ -33,6 +50,7 @@ src_install() {
 	mv "${ED}/usr/share/doc/cubelib/example" "${ED}/usr/share/doc/${PF}/" || die
 	rm -r "${ED}/usr/share/doc/cubelib" || die
 	dodoc OPEN_ISSUES README
-	docompress -x "${ED}/usr/share/doc/${PF}/example"
+	docompress -x "/usr/share/doc/${PF}/example"
 	find "${ED}" -name '*.a' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/cubelib/metadata.xml b/dev-libs/cubelib/metadata.xml
index 6c0bdfd682..cdac0cffd2 100644
--- a/dev-libs/cubelib/metadata.xml
+++ b/dev-libs/cubelib/metadata.xml
@@ -5,4 +5,7 @@
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<use>
+		<flag name="R">Use R for cube_dump</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/libdwarf/libdwarf-20210528.ebuild b/dev-libs/libdwarf/libdwarf-20210528-r1.ebuild
similarity index 94%
rename from dev-libs/libdwarf/libdwarf-20210528.ebuild
rename to dev-libs/libdwarf/libdwarf-20210528-r1.ebuild
index 0cd0cae386..a1fdd9a05f 100644
--- a/dev-libs/libdwarf/libdwarf-20210528.ebuild
+++ b/dev-libs/libdwarf/libdwarf-20210528-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="The DWARF Debugging Information Format"
 HOMEPAGE="
@@ -17,7 +17,7 @@ IUSE="dwarfexample dwarfgen +elf global-alloc-sums namestable nonstandardprintf
 
 DEPEND="
 	sys-libs/zlib
-	elf? ( virtual/libelf )
+	elf? ( virtual/libelf:= )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/flask-restx/Manifest b/dev-python/flask-restx/Manifest
new file mode 100644
index 0000000000..7fe71e9d3f
--- /dev/null
+++ b/dev-python/flask-restx/Manifest
@@ -0,0 +1 @@
+DIST flask-restx-0.5.1.tar.gz 398653 BLAKE2B 605c66decc83d8d7fc3449d3b7053cc2bb589d23f4db22d3a61b9422a97ceefdc0335af8c002762ec7693844b005f5562fdfda09e95c1e83fa266709af640a9d SHA512 0e4ca95a6bb45f7dfba1758387aded6215ec64fa55060889e6843fb50eed09fda96ba936eacd0d8f27b29f5dec2468d4945386f25ff4de6a51f571e16617cf52
diff --git a/dev-python/flask-restx/flask-restx-0.5.1.ebuild b/dev-python/flask-restx/flask-restx-0.5.1.ebuild
new file mode 100644
index 0000000000..10eaf9b26b
--- /dev/null
+++ b/dev-python/flask-restx/flask-restx-0.5.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10})
+inherit distutils-r1
+
+DESCRIPTION="Framework API development with Flask"
+HOMEPAGE="https://flask-restx.readthedocs.io"
+SRC_URI="https://github.com/python-restx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="
+	dev-python/aniso8601[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/blinker[${PYTHON_USEDEP}]
+		dev-python/Faker[${PYTHON_USEDEP}]
+		dev-python/pytest-flask[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	skip_tests=" \
+		not ReqParseTest and \
+		not EmailTest and \
+		not URLTest and \
+		not LoggingTest"
+
+	epytest tests/test_*.py -k "${skip_tests}"
+}
diff --git a/dev-python/flask-restx/metadata.xml b/dev-python/flask-restx/metadata.xml
new file mode 100644
index 0000000000..7ba40ca605
--- /dev/null
+++ b/dev-python/flask-restx/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>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/persist-queue/Manifest b/dev-python/persist-queue/Manifest
new file mode 100644
index 0000000000..faba57d9db
--- /dev/null
+++ b/dev-python/persist-queue/Manifest
@@ -0,0 +1 @@
+DIST persist-queue-0.8.0.tar.gz 29108 BLAKE2B 6b8891544140331f6f0f7072cf474b2f4f344e5d55ae078f814f9c6b2e5aa9876d6dbd731dac3a6b7ad69bc5143c29d2baf541e01dbe473d8b1bf36be641bb06 SHA512 85a6f66df902ee45e07a8611930549d0c8ae028338b09e0408a3d47fd5989f72477a91965cbb8b4919d2be8b6306777d2f83346f7c0fa4e9601b2a4d15891121
diff --git a/dev-python/persist-queue/metadata.xml b/dev-python/persist-queue/metadata.xml
new file mode 100644
index 0000000000..01c1fc8487
--- /dev/null
+++ b/dev-python/persist-queue/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/persist-queue/persist-queue-0.8.0.ebuild b/dev-python/persist-queue/persist-queue-0.8.0.ebuild
new file mode 100644
index 0000000000..6c795e57fe
--- /dev/null
+++ b/dev-python/persist-queue/persist-queue-0.8.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10})
+
+inherit distutils-r1
+
+DESCRIPTION="A thread-safe disk based persistent queue in Python"
+HOMEPAGE="https://github.com/peter-wangxu/persist-queue"
+LICENSE="BSD"
+
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+SLOT="0"
+
+# It tries to connecto to a local MySQL server
+RESTRICT="test"
+
+DEPEND="
+	dev-python/dbutils[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/pymysql[${PYTHON_USEDEP}]
+"
+
+RDEPEND="${DEPEND}"
+
+#distutils_enable_tests nose
diff --git a/dev-python/pytest-flask/metadata.xml b/dev-python/pytest-flask/metadata.xml
new file mode 100644
index 0000000000..7ba40ca605
--- /dev/null
+++ b/dev-python/pytest-flask/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>davidroman96@gmail.com</email>
+		<name>David Roman</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pytest-flask/pytest-flask-1.2.0.ebuild b/dev-python/pytest-flask/pytest-flask-1.2.0.ebuild
new file mode 100644
index 0000000000..570bd9222e
--- /dev/null
+++ b/dev-python/pytest-flask/pytest-flask-1.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A set of pytest fixtures to test Flask applications "
+HOMEPAGE="http://pytest-flask.readthedocs.org"
+
+inherit git-r3
+EGIT_REPO_URI="https://github.com/pytest-dev/${PN}.git"
+EGI_COMMIT="1.2.0"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+
+RDEPEND="
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-util/blueprint-compiler/Manifest b/dev-util/blueprint-compiler/Manifest
index a0a3dc033f..7535fa13b7 100644
--- a/dev-util/blueprint-compiler/Manifest
+++ b/dev-util/blueprint-compiler/Manifest
@@ -1,2 +1,2 @@
-DIST blueprint-compiler-0.1.0_pre20220319.tar.gz 52091 BLAKE2B 84184cada20257dd2717bd5ecd4f2493deca67c63a6005417310f1d7dd9e049398d341a037e71ca08d87417af7627d2bdc5dfd56f2e8ca73f0076eec7bcd671d SHA512 6acfc1b9000e99ca270ee940c47824e8683a3433d7846548b488563b1ce924b8a893cba475bc3b28b971bb3d7a6634c8539dfb34fa12e0bc7ce81c1aed959452
 DIST blueprint-compiler-0.1.0_pre20220419.tar.gz 53439 BLAKE2B 1683356aa10ffdc6b1f6b5d072a301bbc2cdde2eb986f22aa83c269af1fa8cc100910ca790b2b94056db926221b42d2f8309019ee10442374d7e915ab5ec2ed3 SHA512 9017667728723d0e9358ffe9e868f743093cadc7434275c5805f406da72d5cd7afcb5af394c5610446ab6cebdddafc52f65723e16950b3aae47c8739b77e3ef1
+DIST blueprint-compiler-v0.2.0.tar.bz2 45480 BLAKE2B 64c477070ea684002dc1e38eac8d22633ae7b46efb9887733118838c04d2c4e386d3825b3e07dcba1adada83afad439025d082d3bd74d2d737c1f5552085a716 SHA512 dfb16354a13a18c0e6db52dc0b88ab7339fbf3eb56541d0a273551c009c7f05c651d41814397986ef2cebdefb6d4e57d0eb3690dd2a7a9eebfb0cfb23e96e3e6
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-0.1.0_pre20220319.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-0.1.0_pre20220319.ebuild
deleted file mode 100644
index 871c0eae10..0000000000
--- a/dev-util/blueprint-compiler/blueprint-compiler-0.1.0_pre20220319.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit meson python-r1
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler.git"
-else
-	# Upstream has not started to tag releases yet, so each keyworded (normal)
-	# ebuild is to be based on a Git commit snapshot at this moment.
-	# Live ebuild: Might be intentionally left blank
-	# Normal ebuild: Fill in commit SHA-1 object name to this variable's value
-	GIT_COMMIT="3f37380c25c66d81166d2871ffa1c7bc16c6af1d"
-	KEYWORDS="~amd64"
-
-	SRC_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/${GIT_COMMIT}/blueprint-compiler-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
-fi
-
-DESCRIPTION="Compiler for Blueprint, a markup language for GTK user interfaces"
-HOMEPAGE="https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-
-IUSE="doc test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/furo[${PYTHON_USEDEP}]
-	)
-"
-
-DEPEND="
-	test? (
-		gui-libs/gtk:4[introspection]
-	)
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-"
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use doc docs)
-	)
-	python_foreach_impl meson_src_configure
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	python_foreach_impl meson_src_test
-}
-
-src_install() {
-	my_src_install() {
-		local exe="${ED}/usr/bin/${PN}"
-
-		# Meson installs a Python script at ${ED}/usr/bin/${PN}; on
-		# Gentoo, the script should go into ${ED}/usr/lib/python-exec,
-		# and ${ED}/usr/bin/${PN} should be a symbolic link to
-		# ${ED}/usr/lib/python-exec/python-exec2.
-		#
-		# When multiple PYTHON_TARGETS are enabled, then after the
-		# package has been installed for one Python implementation,
-		# Meson will follow the ${ED}/usr/bin/${PN} symbolic link and
-		# install the script at ${ED}/usr/lib/python-exec/python-exec2
-		# for the remaining implementations, leading to file collision.
-		if [[ -L "${exe}" ]]; then
-			rm -v "${exe}" || die "Failed to remove symbolic link ${exe}"
-		fi
-
-		meson_src_install
-		python_doscript "${exe}"
-		python_optimize
-
-		# Install Sphinx-generated documentation only once
-		# since the documentation is supposed to be identical
-		# between different Python implementations
-		use doc && HTML_DOCS=( "${BUILD_DIR}/docs"/* )
-	}
-
-	python_foreach_impl my_src_install
-	einstalldocs
-}
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-0.2.0.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-0.2.0.ebuild
new file mode 100644
index 0000000000..0fc9a3e312
--- /dev/null
+++ b/dev-util/blueprint-compiler/blueprint-compiler-0.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit meson python-single-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler.git"
+else
+	SRC_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/v${PV}/blueprint-compiler-v${PV}.tar.bz2"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Compiler for Blueprint, a markup language for GTK user interfaces"
+HOMEPAGE="https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+
+IUSE="doc test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	doc? (
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/furo[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+DEPEND="
+	test? (
+		gui-libs/gtk:4[introspection]
+	)
+"
+
+RDEPEND="
+	${PYTHON_DEPS}
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc docs)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	use doc && HTML_DOCS=( "${BUILD_DIR}/docs"/* )
+	meson_src_install
+	python_optimize "${D}/usr/share/${PN}"
+	python_fix_shebang "${D}/usr/bin/${PN}"
+}
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild
index 219419000c..0fc9a3e312 100644
--- a/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild
+++ b/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild
@@ -5,21 +5,15 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{9..10} )
 
-inherit meson python-r1
+inherit meson python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler.git"
 else
-	# Upstream has not started to tag releases yet, so each keyworded (normal)
-	# ebuild is to be based on a Git commit snapshot at this moment.
-	# Live ebuild: Might be intentionally left blank
-	# Normal ebuild: Fill in commit SHA-1 object name to this variable's value
-	GIT_COMMIT=""
+	SRC_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/v${PV}/blueprint-compiler-v${PV}.tar.bz2"
+	S="${WORKDIR}/${PN}-v${PV}"
 	KEYWORDS="~amd64"
-
-	SRC_URI="https://gitlab.gnome.org/jwestman/blueprint-compiler/-/archive/${GIT_COMMIT}/blueprint-compiler-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
 fi
 
 DESCRIPTION="Compiler for Blueprint, a markup language for GTK user interfaces"
@@ -35,8 +29,10 @@ RESTRICT="!test? ( test )"
 BDEPEND="
 	${PYTHON_DEPS}
 	doc? (
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/furo[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/furo[${PYTHON_USEDEP}]
+		')
 	)
 "
 
@@ -54,45 +50,12 @@ src_configure() {
 	local emesonargs=(
 		$(meson_use doc docs)
 	)
-	python_foreach_impl meson_src_configure
-}
-
-src_compile() {
-	python_foreach_impl meson_src_compile
-}
-
-src_test() {
-	python_foreach_impl meson_src_test
+	meson_src_configure
 }
 
 src_install() {
-	my_src_install() {
-		local exe="${ED}/usr/bin/${PN}"
-
-		# Meson installs a Python script at ${ED}/usr/bin/${PN}; on
-		# Gentoo, the script should go into ${ED}/usr/lib/python-exec,
-		# and ${ED}/usr/bin/${PN} should be a symbolic link to
-		# ${ED}/usr/lib/python-exec/python-exec2.
-		#
-		# When multiple PYTHON_TARGETS are enabled, then after the
-		# package has been installed for one Python implementation,
-		# Meson will follow the ${ED}/usr/bin/${PN} symbolic link and
-		# install the script at ${ED}/usr/lib/python-exec/python-exec2
-		# for the remaining implementations, leading to file collision.
-		if [[ -L "${exe}" ]]; then
-			rm -v "${exe}" || die "Failed to remove symbolic link ${exe}"
-		fi
-
-		meson_src_install
-		python_doscript "${exe}"
-		python_optimize
-
-		# Install Sphinx-generated documentation only once
-		# since the documentation is supposed to be identical
-		# between different Python implementations
-		use doc && HTML_DOCS=( "${BUILD_DIR}/docs"/* )
-	}
-
-	python_foreach_impl my_src_install
-	einstalldocs
+	use doc && HTML_DOCS=( "${BUILD_DIR}/docs"/* )
+	meson_src_install
+	python_optimize "${D}/usr/share/${PN}"
+	python_fix_shebang "${D}/usr/bin/${PN}"
 }
diff --git a/media-gfx/nsxiv/nsxiv-29.ebuild b/media-gfx/nsxiv/nsxiv-29.ebuild
index 20d5ea1cc7..6aa11c5352 100644
--- a/media-gfx/nsxiv/nsxiv-29.ebuild
+++ b/media-gfx/nsxiv/nsxiv-29.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit desktop xdg-utils savedconfig toolchain-funcs linux-info
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/nsxiv/nsxiv.git"
+	EGIT_REPO_URI="https://codeberg.org/nsxiv/nsxiv.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/nsxiv/nsxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
-HOMEPAGE="https://github.com/nsxiv/nsxiv"
+HOMEPAGE="https://codeberg.org/nsxiv/nsxiv"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-gfx/nsxiv/nsxiv-9999.ebuild b/media-gfx/nsxiv/nsxiv-9999.ebuild
index b338999932..0b27fee7f6 100644
--- a/media-gfx/nsxiv/nsxiv-9999.ebuild
+++ b/media-gfx/nsxiv/nsxiv-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit desktop xdg-utils savedconfig toolchain-funcs linux-info
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/nsxiv/nsxiv.git"
+	EGIT_REPO_URI="https://codeberg.org/nsxiv/nsxiv.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/nsxiv/nsxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
-HOMEPAGE="https://github.com/nsxiv/nsxiv"
+HOMEPAGE="https://codeberg.org/nsxiv/nsxiv"
 
 LICENSE="GPL-2"
 SLOT="0"