From 71212e8aedf0d51bed749b145b2e2ee6e7e5c7e4 Mon Sep 17 00:00:00 2001
From: Nicola Smaniotto <smaniotto.nicola@gmail.com>
Date: Mon, 5 Dec 2022 10:12:46 +0100
Subject: [PATCH 01/19] games-puzzle/aaaaxy: new package, add 1.2.377

Signed-off-by: Nicola Smaniotto <smaniotto.nicola@gmail.com>
---
 games-puzzle/aaaaxy/Manifest              |  2 +
 games-puzzle/aaaaxy/aaaaxy-1.2.377.ebuild | 47 +++++++++++++++++++++++
 games-puzzle/aaaaxy/metadata.xml          |  8 ++++
 3 files changed, 57 insertions(+)
 create mode 100644 games-puzzle/aaaaxy/Manifest
 create mode 100644 games-puzzle/aaaaxy/aaaaxy-1.2.377.ebuild
 create mode 100644 games-puzzle/aaaaxy/metadata.xml

diff --git a/games-puzzle/aaaaxy/Manifest b/games-puzzle/aaaaxy/Manifest
new file mode 100644
index 0000000000..3cb3a21493
--- /dev/null
+++ b/games-puzzle/aaaaxy/Manifest
@@ -0,0 +1,2 @@
+DIST aaaaxy-1.2.377-deps.tar.xz 351455932 BLAKE2B 0c634da2d9a2100825bdf38e4e7102f47e5d5ba37021e2a2087036b773a01e0599a495de81e4056ecbffdd7bcc1cc746100720599388b40202807a7798fe6ef7 SHA512 409967ec5eaafdd6a0fe2aee78121edab00c3fd38c33004c7f678ec90b7931f891a65a50c7442691f37819620bd5d0921c3494924da1cb1de5fdaf7b994a35d3
+DIST aaaaxy-1.2.377.tar.gz 26654270 BLAKE2B 7538a8a685129a3761aae8b79c6ce263a3f879d2a6b9ada2597a66717b608cd755af1e850c0f6c882c7182febe35031cf623a86a80a40b8ea7cf11a02d78d723 SHA512 d8e761381b2155b15ef4d365fbe503f92fe08bd4af8aa365f610cf80d7658c09489ccc48e4706beca406797517bf38c1c0f154ccb43bf32b9a863dc632c6aa9c
diff --git a/games-puzzle/aaaaxy/aaaaxy-1.2.377.ebuild b/games-puzzle/aaaaxy/aaaaxy-1.2.377.ebuild
new file mode 100644
index 0000000000..3b1e0a8722
--- /dev/null
+++ b/games-puzzle/aaaaxy/aaaaxy-1.2.377.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop go-module
+
+DEPS_DATE="2022-12-04" # when the deps archive has been created
+
+DESCRIPTION="A nonlinear 2D puzzle platformer taking place in impossible spaces"
+HOMEPAGE="https://divverent.github.io/aaaaxy/"
+SRC_URI="
+	https://github.com/divVerent/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gitlab.com/api/v4/projects/41581401/packages/generic/${PN}/${PV}+${DEPS_DATE}/${P}-deps.tar.xz
+"
+
+LICENSE="Apache-2.0 BSD MIT "
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	media-libs/alsa-lib
+	media-libs/libglvnd
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	x11-libs/libXcursor
+	x11-libs/libXi
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+"
+
+src_configure() {
+	GOFLAGS+=" -buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+}
+
+src_compile() {
+	emake AAAAXY_BUILD_USE_VERSION_FILE=true BUILDTYPE=release
+}
+
+src_install() {
+	dobin ${PN}
+	doicon -s scalable ${PN}.svg
+	doicon -s 128 ${PN}.png
+	domenu ${PN}.desktop
+}
diff --git a/games-puzzle/aaaaxy/metadata.xml b/games-puzzle/aaaaxy/metadata.xml
new file mode 100644
index 0000000000..be3f1030ef
--- /dev/null
+++ b/games-puzzle/aaaaxy/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">
+		<email>smaniotto.nicola@gmail.com</email>
+		<name>Nicola Smaniotto</name>
+	</maintainer>
+</pkgmetadata>

From b958e50641648c619c0a657027fd39e826e5163b Mon Sep 17 00:00:00 2001
From: Cara Salter <cara@devcara.com>
Date: Mon, 5 Dec 2022 09:31:18 -0500
Subject: [PATCH 02/19] app-misc/uwufetch: Respect LDFLAGS, CFLAGS, CC, and
 generate soname

Closes: https://bugs.gentoo.org/884441
Closes: https://bugs.gentoo.org/884431
Closes: https://bugs.gentoo.org/884439
Closes: https://bugs.gentoo.org/884437
Signed-off-by: Cara Salter <cara@devcara.com>
---
 app-misc/uwufetch/files/uwufetch-2.0-cc.patch | 11 ++++++++++
 .../files/uwufetch-2.0-cflags-ldflags.patch   | 20 +++++++++++++++++++
 .../uwufetch-2.0-no-install-soname.patch      | 12 +++++++++++
 .../uwufetch/files/uwufetch-2.0-soname.patch  | 18 ++++++++---------
 app-misc/uwufetch/uwufetch-2.0.ebuild         | 10 ++++++++--
 5 files changed, 60 insertions(+), 11 deletions(-)
 create mode 100644 app-misc/uwufetch/files/uwufetch-2.0-cc.patch
 create mode 100644 app-misc/uwufetch/files/uwufetch-2.0-cflags-ldflags.patch
 create mode 100644 app-misc/uwufetch/files/uwufetch-2.0-no-install-soname.patch

diff --git a/app-misc/uwufetch/files/uwufetch-2.0-cc.patch b/app-misc/uwufetch/files/uwufetch-2.0-cc.patch
new file mode 100644
index 0000000000..1e013a3297
--- /dev/null
+++ b/app-misc/uwufetch/files/uwufetch-2.0-cc.patch
@@ -0,0 +1,11 @@
+--- Makefile	2022-12-01 16:12:15.695821291 -0500
++++ Makefile	2022-12-05 08:00:42.879825137 -0500
+@@ -4,7 +4,7 @@
+ UWUFETCH_VERSION = $(shell git describe --tags)
+ CFLAGS = -O3 -DUWUFETCH_VERSION=\"$(UWUFETCH_VERSION)\"
+ CFLAGS_DEBUG = -Wall -Wextra -g -pthread -DUWUFETCH_VERSION=\"$(UWUFETCH_VERSION)\"
+-CC = cc
++CC ?= cc
+ AR = ar
+ DESTDIR = /usr
+ RELEASE_SCRIPTS = release_scripts/*.sh
diff --git a/app-misc/uwufetch/files/uwufetch-2.0-cflags-ldflags.patch b/app-misc/uwufetch/files/uwufetch-2.0-cflags-ldflags.patch
new file mode 100644
index 0000000000..32d6824ad7
--- /dev/null
+++ b/app-misc/uwufetch/files/uwufetch-2.0-cflags-ldflags.patch
@@ -0,0 +1,20 @@
+--- Makefile	2022-12-05 08:07:54.867207190 -0500
++++ Makefile-tmp	2022-12-05 08:14:19.101530405 -0500
+@@ -2,7 +2,7 @@
+ BIN_FILES = uwufetch.c
+ LIB_FILES = fetch.c
+ UWUFETCH_VERSION = $(shell git describe --tags)
+-CFLAGS = -O3 -DUWUFETCH_VERSION=\"$(UWUFETCH_VERSION)\"
++CFLAGS := $(CFLAGS) -O3 -DUWUFETCH_VERSION=\"$(UWUFETCH_VERSION)\"
+ CFLAGS_DEBUG = -Wall -Wextra -g -pthread -DUWUFETCH_VERSION=\"$(UWUFETCH_VERSION)\"
+ CC ?= cc
+ AR = ar
+@@ -64,7 +64,7 @@
+ endif
+ 
+ build: $(BIN_FILES) lib
+-	$(CC) $(CFLAGS) -o $(NAME) $(BIN_FILES) lib$(LIB_FILES:.c=.a)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(NAME) $(BIN_FILES) lib$(LIB_FILES:.c=.a)
+ 
+ lib: $(LIB_FILES)
+ 	$(CC) $(CFLAGS) -fPIC -c -o $(LIB_FILES:.c=.o) $(LIB_FILES)
diff --git a/app-misc/uwufetch/files/uwufetch-2.0-no-install-soname.patch b/app-misc/uwufetch/files/uwufetch-2.0-no-install-soname.patch
new file mode 100644
index 0000000000..1a39f94dcd
--- /dev/null
+++ b/app-misc/uwufetch/files/uwufetch-2.0-no-install-soname.patch
@@ -0,0 +1,12 @@
+--- Makefile	2022-12-05 08:42:56.586585774 -0500
++++ Makefile-tmp	2022-12-05 08:43:24.063183118 -0500
+@@ -92,8 +92,7 @@
+ 
+ install: build
+ 	mkdir -pv $(DESTDIR)/$(PREFIX) $(DESTDIR)/$(LIBDIR)/$(NAME) $(DESTDIR)/$(MANDIR) ${DESTDIR}/$(ETC_DIR)/$(NAME) ${DESTDIR}/include ${DESTDIR}/lib/uwufetch
+-	cp $(NAME) $(DESTDIR)/$(PREFIX)
+-	cp lib$(LIB_FILES:.c=.so) $(DESTDIR)/$(LIBDIR)
++	cp $(NAME) $(DESTDIR)/$(PREFIX)	
+ 	cp $(LIB_FILES:.c=.h) $(DESTDIR)/include/
+ 	cp -r res/* $(DESTDIR)/lib/$(NAME)
+ 	cp default.config ${DESTDIR}/$(ETC_DIR)/$(NAME)/config
diff --git a/app-misc/uwufetch/files/uwufetch-2.0-soname.patch b/app-misc/uwufetch/files/uwufetch-2.0-soname.patch
index 691b1e8054..133fd250c0 100644
--- a/app-misc/uwufetch/files/uwufetch-2.0-soname.patch
+++ b/app-misc/uwufetch/files/uwufetch-2.0-soname.patch
@@ -1,11 +1,11 @@
---- Makefile	2022-10-04 12:10:11.990564393 -0400
-+++ Makefile-tmp	2022-10-04 12:48:43.320067178 -0400
-@@ -64,7 +64,7 @@
- endif
- 
- build: $(BIN_FILES) lib
--	$(CC) $(CFLAGS) -o $(NAME) $(BIN_FILES) lib$(LIB_FILES:.c=.a)
-+	$(CC) $(CFLAGS) -Wl -soname -o $(NAME) $(BIN_FILES) lib$(LIB_FILES:.c=.a)
- 
+--- Makefile	2022-12-05 08:30:04.452071661 -0500
++++ Makefile	2022-12-05 08:35:10.611197290 -0500
+@@ -69,7 +69,7 @@
  lib: $(LIB_FILES)
  	$(CC) $(CFLAGS) -fPIC -c -o $(LIB_FILES:.c=.o) $(LIB_FILES)
+ 	$(AR) rcs lib$(LIB_FILES:.c=.a) $(LIB_FILES:.c=.o)
+-	$(CC) $(CFLAGS) -shared -o lib$(LIB_FILES:.c=.so) $(LIB_FILES:.c=.o)
++	$(CC) $(CFLAGS) -shared -Wl,-soname,lib$(LIB_FILES:.c=.so).$(UWUFETCH_VERSION) -o lib$(LIB_FILES:.c=.so) $(LIB_FILES:.c=.o)
+ 
+ release: build
+ 	mkdir -pv $(NAME)_$(UWUFETCH_VERSION)-$(PLATFORM_ABBR)
diff --git a/app-misc/uwufetch/uwufetch-2.0.ebuild b/app-misc/uwufetch/uwufetch-2.0.ebuild
index 8faba78df7..7eef0ac1b4 100644
--- a/app-misc/uwufetch/uwufetch-2.0.ebuild
+++ b/app-misc/uwufetch/uwufetch-2.0.ebuild
@@ -23,17 +23,21 @@ BDEPEND=""
 
 src_prepare() {
 	eapply -p0 "${FILESDIR}/${P}-destdir.patch"
-	#eapply -p0 "${FILESDIR}/${P}-soname.patch"
 	eapply -p0 "${FILESDIR}/${P}-lib64.patch"
 	eapply -p0 "${FILESDIR}/${P}-includedir.patch"
 	eapply -p0 "${FILESDIR}/${P}-reslib.patch"
 	eapply -p0 "${FILESDIR}/${P}-nocompressman.patch"
+	eapply -p0 "${FILESDIR}/${P}-cc.patch"
+	eapply -p0 "${FILESDIR}/${P}-cflags-ldflags.patch"
+	eapply -p0 "${FILESDIR}/${P}-soname.patch"
+	eapply -p0 "${FILESDIR}/${P}-no-install-soname.patch"
 
 	eapply_user
 }
 
 src_compile() {
 	emake build
+	cp libfetch.so "libfetch.so.1"
 }
 
 src_install() {
@@ -41,5 +45,7 @@ src_install() {
 
 	mv "${D}/usr/etc" "${D}/etc"
 
-	dodoc uwufetch.1
+	doman uwufetch.1
+	dolib.so libfetch.so.1
+	dosym "libfetch.so.1" "/usr/$(get_libdir)/libfetch.so.1"
 }

From 6237b03a3a0c7cac2aeafffe5b9d15be6b99f473 Mon Sep 17 00:00:00 2001
From: Adam Pimentel <adam.pimentel@protonmail.com>
Date: Mon, 5 Dec 2022 11:33:17 -0500
Subject: [PATCH 03/19] net-p2p/p2pool: shortened some lines in the ebuild

Signed-off-by: Adam Pimentel <adam.pimentel@protonmail.com>
---
 net-p2p/p2pool/p2pool-2.6-r1.ebuild | 51 ++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/net-p2p/p2pool/p2pool-2.6-r1.ebuild b/net-p2p/p2pool/p2pool-2.6-r1.ebuild
index c062d84d4a..14d4871b68 100644
--- a/net-p2p/p2pool/p2pool-2.6-r1.ebuild
+++ b/net-p2p/p2pool/p2pool-2.6-r1.ebuild
@@ -16,13 +16,21 @@ P2POOL_DIST_COMMIT="67bbfea87d87328a9ccd8159b21b2a4ff65087ca"
 DESCRIPTION="Decentralized pool for Monero mining"
 HOMEPAGE="https://p2pool.io"
 
-SRC_URI="https://github.com/SChernykh/p2pool/archive/${P2POOL_DIST_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMMIT}.tar.gz -> ${P}-randomx.tar.gz
-	https://github.com/SChernykh/cppzmq/archive/${CPPZMQ_DIST_COMMIT}.tar.gz -> ${P}-cppzmq.tar.gz
-	https://github.com/SChernykh/curl/archive/${CURL_DIST_COMMIT}.tar.gz -> ${P}-curl.tar.gz
-	https://github.com/SChernykh/libuv/archive/${LIBUV_DIST_COMMIT}.tar.gz -> ${P}-libuv.tar.gz
-	https://github.com/SChernykh/rapidjson/archive/${RAPIDJSON_DIST_COMMIT}.tar.gz -> ${P}-rapidjson.tar.gz
-	https://github.com/SChernykh/robin-hood-hashing/archive/${ROBIN_HOOD_HASHING_DIST_COMMIT}.tar.gz -> ${P}-robin-hood-hashing.tar.gz
+SRC_URI="
+	https://github.com/SChernykh/p2pool/archive/${P2POOL_DIST_COMMIT}.tar.gz -> \
+${P}.tar.gz
+	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMMIT}.tar.gz -> \
+${P}-randomx.tar.gz
+	https://github.com/SChernykh/cppzmq/archive/${CPPZMQ_DIST_COMMIT}.tar.gz -> \
+${P}-cppzmq.tar.gz
+	https://github.com/SChernykh/curl/archive/${CURL_DIST_COMMIT}.tar.gz -> \
+${P}-curl.tar.gz
+	https://github.com/SChernykh/libuv/archive/${LIBUV_DIST_COMMIT}.tar.gz -> \
+${P}-libuv.tar.gz
+	https://github.com/SChernykh/rapidjson/archive/${RAPIDJSON_DIST_COMMIT}.tar.gz -> \
+${P}-rapidjson.tar.gz
+	https://github.com/SChernykh/robin-hood-hashing/archive/${ROBIN_HOOD_HASHING_DIST_COMMIT}.tar.gz -> \
+${P}-robin-hood-hashing.tar.gz
 "
 KEYWORDS="~amd64 ~arm64 ~x86"
 
@@ -35,14 +43,27 @@ DEPEND="
 "
 
 src_unpack() {
-	unpack ${P}.tar.gz ${P}-randomx.tar.gz ${P}-cppzmq.tar.gz ${P}-curl.tar.gz ${P}-libuv.tar.gz ${P}-rapidjson.tar.gz ${P}-robin-hood-hashing.tar.gz
-	mv -T "${WORKDIR}"/p2pool-${P2POOL_DIST_COMMIT} "${WORKDIR}"/${P}
-	mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMMIT} "${WORKDIR}"/${P}/external/src/RandomX || die
-	mv -T "${WORKDIR}"/cppzmq-${CPPZMQ_DIST_COMMIT} "${WORKDIR}"/${P}/external/src/cppzmq || die
-	mv -T "${WORKDIR}"/curl-${CURL_DIST_COMMIT} "${WORKDIR}"/${P}/external/src/curl || die
-	mv -T "${WORKDIR}"/libuv-${LIBUV_DIST_COMMIT} "${WORKDIR}"/${P}/external/src/libuv || die
-	mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMMIT} "${WORKDIR}"/${P}/external/src/rapidjson || die
-	mv -T "${WORKDIR}"/robin-hood-hashing-${ROBIN_HOOD_HASHING_DIST_COMMIT} "${WORKDIR}"/${P}/external/src/robin-hood-hashing || die
+	unpack ${P}.tar.gz \
+		${P}-randomx.tar.gz \
+		${P}-cppzmq.tar.gz \
+		${P}-curl.tar.gz \
+		${P}-libuv.tar.gz \
+		${P}-rapidjson.tar.gz \
+		${P}-robin-hood-hashing.tar.gz
+	mv -T "${WORKDIR}"/p2pool-${P2POOL_DIST_COMMIT} \
+		"${WORKDIR}"/${P} || die
+	mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMMIT} \
+		"${WORKDIR}"/${P}/external/src/RandomX || die
+	mv -T "${WORKDIR}"/cppzmq-${CPPZMQ_DIST_COMMIT} \
+		"${WORKDIR}"/${P}/external/src/cppzmq || die
+	mv -T "${WORKDIR}"/curl-${CURL_DIST_COMMIT} \
+		"${WORKDIR}"/${P}/external/src/curl || die
+	mv -T "${WORKDIR}"/libuv-${LIBUV_DIST_COMMIT} \
+		"${WORKDIR}"/${P}/external/src/libuv || die
+	mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMMIT} \
+		"${WORKDIR}"/${P}/external/src/rapidjson || die
+	mv -T "${WORKDIR}"/robin-hood-hashing-${ROBIN_HOOD_HASHING_DIST_COMMIT} \
+		"${WORKDIR}"/${P}/external/src/robin-hood-hashing || die
 }
 
 src_configure() {

From 1d564a0d2fc20c60cc60f92f6ecc70d725fbf77c Mon Sep 17 00:00:00 2001
From: Adam Pimentel <adam.pimentel@protonmail.com>
Date: Mon, 5 Dec 2022 12:58:49 -0500
Subject: [PATCH 04/19] net-p2p/p2pool: fix metadata.xml

Signed-off-by: Adam Pimentel <adam.pimentel@protonmail.com>
---
 net-p2p/p2pool/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-p2p/p2pool/metadata.xml b/net-p2p/p2pool/metadata.xml
index c0659dc09b..c84ecd4d4d 100644
--- a/net-p2p/p2pool/metadata.xml
+++ b/net-p2p/p2pool/metadata.xml
@@ -5,7 +5,6 @@
 		<email>adam.pimentel@protonmail.com</email>
 		<name>Adam Pimentel</name>
 	</maintainer>
-	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">SChernykh/p2pool</remote-id>
 	</upstream>

From b010132352bb0f511b673b208ce080af29023b9a Mon Sep 17 00:00:00 2001
From: Yuan Liao <liaoyuan@gmail.com>
Date: Mon, 5 Dec 2022 10:01:05 -0800
Subject: [PATCH 05/19] games-emulation/dosbox-x: Enable unit tests

Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
---
 games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild | 8 ++++++++
 games-emulation/dosbox-x/dosbox-x-9999.ebuild      | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild b/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
index 55b6b1acc3..396f0023f1 100644
--- a/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-2022.08.0.ebuild
@@ -25,6 +25,8 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="X debug ffmpeg fluidsynth freetype opengl png slirp"
+# Unit tests are only available in debug builds
+RESTRICT="!debug? ( test )"
 
 BDEPEND="
 	dev-lang/nasm
@@ -151,6 +153,12 @@ src_compile() {
 	emake AR="$(tc-getAR)"
 }
 
+src_test() {
+	set -- src/dosbox-x -tests
+	echo "${@}" >&2
+	"${@}" || die "Unit tests failed"
+}
+
 pkg_preinst() {
 	xdg_pkg_preinst
 
diff --git a/games-emulation/dosbox-x/dosbox-x-9999.ebuild b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
index 3fb2d9f295..fba8467c01 100644
--- a/games-emulation/dosbox-x/dosbox-x-9999.ebuild
+++ b/games-emulation/dosbox-x/dosbox-x-9999.ebuild
@@ -25,6 +25,8 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="X debug ffmpeg fluidsynth freetype opengl png slirp"
+# Unit tests are only available in debug builds
+RESTRICT="!debug? ( test )"
 
 BDEPEND="
 	dev-lang/nasm
@@ -118,6 +120,12 @@ src_compile() {
 	emake AR="$(tc-getAR)"
 }
 
+src_test() {
+	set -- src/dosbox-x -tests
+	echo "${@}" >&2
+	"${@}" || die "Unit tests failed"
+}
+
 pkg_preinst() {
 	xdg_pkg_preinst
 

From b53bc9e194fec2e825006be14a113c5b28452ad1 Mon Sep 17 00:00:00 2001
From: Yuan Liao <liaoyuan@gmail.com>
Date: Mon, 5 Dec 2022 10:16:27 -0800
Subject: [PATCH 06/19] www-apps/gogs: Fix dev-vcs/git[threads] dependency
 resolution

USE="threads" has been removed since dev-vcs/git-2.37.3 because it has
effectively become always-enabled.

Bug: https://bugs.gentoo.org/868339
Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
---
 www-apps/gogs/gogs-0.12.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www-apps/gogs/gogs-0.12.3.ebuild b/www-apps/gogs/gogs-0.12.3.ebuild
index 05c81318ad..b55d3b1bf2 100644
--- a/www-apps/gogs/gogs-0.12.3.ebuild
+++ b/www-apps/gogs/gogs-0.12.3.ebuild
@@ -465,7 +465,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	app-shells/bash
-	dev-vcs/git[curl,threads]
+	dev-vcs/git[curl,threads(+)]
 	virtual/ssh
 	mysql? ( virtual/mysql )
 	pam? ( sys-libs/pam )

From 9d6929a2a50cc624068546c7e2ea34c509aeecad Mon Sep 17 00:00:00 2001
From: Yuan Liao <liaoyuan@gmail.com>
Date: Mon, 5 Dec 2022 10:21:10 -0800
Subject: [PATCH 07/19] www-apps/gogs: Add maintainer and github upstream
 metadata

Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
---
 www-apps/gogs/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www-apps/gogs/metadata.xml b/www-apps/gogs/metadata.xml
index 6b6c2acdfc..3f736dd2a0 100644
--- a/www-apps/gogs/metadata.xml
+++ b/www-apps/gogs/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">gogs/gogs</remote-id>
+	</upstream>
 	<use>
 		<flag name="cert">Adds support for self-signed certificates</flag>
 	</use>

From c5f19fe7a70f13a2c13c31608b326a4fae22bc73 Mon Sep 17 00:00:00 2001
From: Yuan Liao <liaoyuan@gmail.com>
Date: Mon, 5 Dec 2022 13:16:00 -0800
Subject: [PATCH 08/19] dev-util/blueprint-compiler: Build documentation in
 src_compile

Signed-off-by: Yuan Liao <liaoyuan@gmail.com>
---
 dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild | 3 +--
 dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild
index 4d97436461..24ee0bf146 100644
--- a/dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild
+++ b/dev-util/blueprint-compiler/blueprint-compiler-0.6.0.ebuild
@@ -53,6 +53,7 @@ src_configure() {
 
 src_compile() {
 	python_foreach_impl meson_src_compile
+	use doc && build_sphinx docs
 }
 
 src_test() {
@@ -83,6 +84,4 @@ src_install() {
 	}
 
 	python_foreach_impl my_src_install
-	use doc && build_sphinx docs
-	einstalldocs
 }
diff --git a/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild b/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild
index 4d97436461..24ee0bf146 100644
--- a/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild
+++ b/dev-util/blueprint-compiler/blueprint-compiler-9999.ebuild
@@ -53,6 +53,7 @@ src_configure() {
 
 src_compile() {
 	python_foreach_impl meson_src_compile
+	use doc && build_sphinx docs
 }
 
 src_test() {
@@ -83,6 +84,4 @@ src_install() {
 	}
 
 	python_foreach_impl my_src_install
-	use doc && build_sphinx docs
-	einstalldocs
 }

From 632629413d5fc525362ac20264a733b474b3520d Mon Sep 17 00:00:00 2001
From: Adam Pimentel <adam.pimentel@protonmail.com>
Date: Mon, 5 Dec 2022 16:48:21 -0500
Subject: [PATCH 09/19] net-p2p/feather: removed unused cmake vars

Signed-off-by: Adam Pimentel <adam.pimentel@protonmail.com>
---
 net-p2p/feather/feather-2.1.0.ebuild | 3 ---
 net-p2p/feather/feather-9999.ebuild  | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/net-p2p/feather/feather-2.1.0.ebuild b/net-p2p/feather/feather-2.1.0.ebuild
index 206d0843e8..eee1b7ae75 100644
--- a/net-p2p/feather/feather-2.1.0.ebuild
+++ b/net-p2p/feather/feather-2.1.0.ebuild
@@ -82,11 +82,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DARCH=x86-64
 		-DBUILD_64=ON
-		-DBUILD_SHARED_LIBS=Off # Vendored Monero libs collision
 		-DBUILD_TAG="linux-x64"
-		-DBUILD_TESTS=OFF
 		-DDONATE_BEG=OFF
-		-DINSTALL_VENDORED_LIBUNBOUND=OFF
 		-DMANUAL_SUBMODULES=1
 		-DSTATIC=OFF
 		-DSELF_CONTAINED=OFF
diff --git a/net-p2p/feather/feather-9999.ebuild b/net-p2p/feather/feather-9999.ebuild
index 5e59c6a34b..21fce42cf0 100644
--- a/net-p2p/feather/feather-9999.ebuild
+++ b/net-p2p/feather/feather-9999.ebuild
@@ -48,11 +48,8 @@ src_configure() {
 	local mycmakeargs=(
 		-DARCH=x86-64
 		-DBUILD_64=ON
-		-DBUILD_SHARED_LIBS=Off # Vendored Monero libs collision
 		-DBUILD_TAG="linux-x64"
-		-DBUILD_TESTS=OFF
 		-DDONATE_BEG=OFF
-		-DINSTALL_VENDORED_LIBUNBOUND=OFF
 		-DMANUAL_SUBMODULES=1
 		-DSTATIC=OFF
 		-DSELF_CONTAINED=OFF

From b57186a852e388199b6d6e2fb652fa54b64ffe86 Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Mon, 5 Dec 2022 23:20:00 +0100
Subject: [PATCH 10/19] dev-python/schema: enable py3.11

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-python/schema/metadata.xml        | 8 ++++++++
 dev-python/schema/schema-0.7.5.ebuild | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 dev-python/schema/metadata.xml

diff --git a/dev-python/schema/metadata.xml b/dev-python/schema/metadata.xml
new file mode 100644
index 0000000000..01c1fc8487
--- /dev/null
+++ b/dev-python/schema/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/schema/schema-0.7.5.ebuild b/dev-python/schema/schema-0.7.5.ebuild
index 507911b44c..ca58973643 100644
--- a/dev-python/schema/schema-0.7.5.ebuild
+++ b/dev-python/schema/schema-0.7.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517="setuptools"
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1
 

From a3455a245f3a2428903e2025556ac034db94467f Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Mon, 5 Dec 2022 23:20:45 +0100
Subject: [PATCH 11/19] dev-embedded/idf-component-manager: new package, add
 1.1.4

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-embedded/idf-component-manager/Manifest   |  1 +
 .../idf-component-manager-1.1.4.ebuild        | 23 +++++++++++++++++++
 .../idf-component-manager/metadata.xml        |  8 +++++++
 3 files changed, 32 insertions(+)
 create mode 100644 dev-embedded/idf-component-manager/Manifest
 create mode 100644 dev-embedded/idf-component-manager/idf-component-manager-1.1.4.ebuild
 create mode 100644 dev-embedded/idf-component-manager/metadata.xml

diff --git a/dev-embedded/idf-component-manager/Manifest b/dev-embedded/idf-component-manager/Manifest
new file mode 100644
index 0000000000..471042c758
--- /dev/null
+++ b/dev-embedded/idf-component-manager/Manifest
@@ -0,0 +1 @@
+DIST idf-component-manager-1.1.4.gh.tar.gz 135617 BLAKE2B e9bd7bdfbd8c8919791c3afbd3a777c06c01794755698c3adb819ec6725c6da2ffd791432bb29105d68af30ed203842dd7a5e80bce7d00bdf09e2b4fe44891fd SHA512 eb0bd12a6c6b574e2df46c2cc68db333e8dbf145c24aa6dc50660ec0d34cf36d21a47d79a94baafae8aa9e6cab75284bdd962436b2e5304d29d3a243454bb571
diff --git a/dev-embedded/idf-component-manager/idf-component-manager-1.1.4.ebuild b/dev-embedded/idf-component-manager/idf-component-manager-1.1.4.ebuild
new file mode 100644
index 0000000000..7013a2e865
--- /dev/null
+++ b/dev-embedded/idf-component-manager/idf-component-manager-1.1.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1
+
+DESCRIPTION="Tool for installing ESP-IDF components"
+HOMEPAGE="https://github.com/espressif/idf-component-manager"
+SRC_URI="https://github.com/espressif/${PN}/archive/refs/tags/v${PV}.tar.gz	-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/requests-toolbelt[${PYTHON_USEDEP}]
+	dev-python/schema[${PYTHON_USEDEP}]
+	dev-python/tqdm[${PYTHON_USEDEP}]
+"
diff --git a/dev-embedded/idf-component-manager/metadata.xml b/dev-embedded/idf-component-manager/metadata.xml
new file mode 100644
index 0000000000..01c1fc8487
--- /dev/null
+++ b/dev-embedded/idf-component-manager/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>

From 52a76d2f26e17bf8706bdcc1c9834b9ee9164420 Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Mon, 5 Dec 2022 23:53:11 +0100
Subject: [PATCH 12/19] dev-embedded/esp-idf: new package, add 5.0

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-embedded/esp-idf/Manifest                 |   6 +
 dev-embedded/esp-idf/esp-idf-5.0.ebuild       | 146 ++++++++++++++++++
 .../allow-system-install-esp-idf-5.0.patch    |  37 +++++
 dev-embedded/esp-idf/metadata.xml             |  14 ++
 4 files changed, 203 insertions(+)
 create mode 100644 dev-embedded/esp-idf/Manifest
 create mode 100644 dev-embedded/esp-idf/esp-idf-5.0.ebuild
 create mode 100644 dev-embedded/esp-idf/files/allow-system-install-esp-idf-5.0.patch
 create mode 100644 dev-embedded/esp-idf/metadata.xml

diff --git a/dev-embedded/esp-idf/Manifest b/dev-embedded/esp-idf/Manifest
new file mode 100644
index 0000000000..c02384ab50
--- /dev/null
+++ b/dev-embedded/esp-idf/Manifest
@@ -0,0 +1,6 @@
+DIST esp-idf-5.0.zip 880574300 BLAKE2B 25afdb2e6ee28b86b2072e86ce2de713574e59195480b0be0efbe720e849120585917b393f5de77bf52a7c0245857a09e5c44db41cf96ff966d79640d9138736 SHA512 0fa438ca9afbc02a65259ae21e4957950eb3a373174bbc288b2f316b57a9384ac668ce487ae31373ff27dda85b8300e4c63ef927afce7a35380f8d2e793a4ea0
+DIST openocd-esp32-linux-amd64-0.11.0-esp32-20221026.tar.gz 2051435 BLAKE2B 59fd510cf3c12514791fa85b76d81722685add64f0a690793b52c5d41101c727fefe064727b148577c3fc522ffae79e8f632d34f300a9543377027579b9cea70 SHA512 f8296460efa3d43b23a51c81a840a2e7c13272fa213770bfdb269decd23a3571be9c4ff4be6647d87e56e156284952d9a8c92b24244eaa6996fae18497ce15f8
+DIST riscv32-esp-elf-gcc11_2_0-esp-2022r1-linux-amd64.tar.xz 110107900 BLAKE2B 70688adf6eb613f6d0a3700d5730882b7ff9dec110cbc4157c822dfe1d2abfe21f902e52c695ed410fef39f9c03dfffa3b9c7effac04464dfce4e8b0dcf88814 SHA512 cf7443e1480456fbf5d0824d4745740d8f5e5858c403e70b3931adfa582816c2e0c53c53dc51d493809d9e6780077bc1b1fae51bc146ba1b6272dc3554c1fedb
+DIST xtensa-esp32-elf-gcc11_2_0-esp-2022r1-linux-amd64.tar.xz 64781328 BLAKE2B 7216df8a7a88f73f9beac705aa4a7703a8215301afb4c9ca64c9d16a2fafb574a06079d2e5288b2784e4cd3e5e8e2b3d03708e21c42bc48a30abb06199207616 SHA512 72cd2e5d3168d1ada66c53428ddec1ee47785fc9720e9c1b4aacc41021e59335a8e2d07cc14b064b1f3ea9c01bd747b7cdff69ff83e5586bf1abb4acf5986508
+DIST xtensa-esp32s2-elf-gcc11_2_0-esp-2022r1-linux-amd64.tar.xz 51546516 BLAKE2B f4f4bc5bc138f181819416f0b3b4a67270588f827afd64693da4caf8c1a100a04787aa23cfafedb535e5c26aea7af51ad9e08316a0abba99d5549fb62e73aae5 SHA512 72071cb911eb62eff22d46b98f3ac6af87c1b0af4adc036e7f093e24987048c388a689138627ce1a721b93ef9a63a4a6046cbcc91f92e033b5330e4aacf746ea
+DIST xtensa-esp32s3-elf-gcc11_2_0-esp-2022r1-linux-amd64.tar.xz 51899328 BLAKE2B 9ea6e702345fe158d5bbf8c86fffa11faaa4e74f58ab0ad22ba7c2e46fe41bb06897b6e2912852564b19d773642b23ad897a9f0655eb020a354a2d98c3296d97 SHA512 54afc2a307489d719d72c1a9506b325b1152395e87fa8fa78d90b79bc827625e23f86aa104e02f78fc1f074d191b552de5c1853a52ba1ccadae93865c58f5873
diff --git a/dev-embedded/esp-idf/esp-idf-5.0.ebuild b/dev-embedded/esp-idf/esp-idf-5.0.ebuild
new file mode 100644
index 0000000000..1edac2122b
--- /dev/null
+++ b/dev-embedded/esp-idf/esp-idf-5.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+
+VER="esp-2022r1"
+CROSSTOOL_URL="https://github.com/espressif/crosstool-NG/releases/download/${VER}"
+
+inherit python-single-r1
+
+DESCRIPTION="Espressif IoT Development Framework"
+HOMEPAGE="https://www.espressif.com/"
+
+#	https://github.com/espressif/binutils-esp32ulp/releases/download/v2.28.51-esp-20191205/binutils-esp32ulp-linux-amd64-2.28.51-esp-20191205.tar.gz
+SRC_URI="https://dl.espressif.com/github_assets/espressif/${PN}/releases/download/v${PV}/${PN}-v${PV}.zip -> ${P}.zip
+	https://github.com/espressif/openocd-esp32/releases/download/v0.11.0-esp32-20221026/openocd-esp32-linux-amd64-0.11.0-esp32-20221026.tar.gz
+	${CROSSTOOL_URL}/xtensa-esp32-elf-gcc11_2_0-${VER}-linux-amd64.tar.xz
+	${CROSSTOOL_URL}/xtensa-esp32s2-elf-gcc11_2_0-${VER}-linux-amd64.tar.xz
+	${CROSSTOOL_URL}/xtensa-esp32s3-elf-gcc11_2_0-${VER}-linux-amd64.tar.xz
+	${CROSSTOOL_URL}/riscv32-esp-elf-gcc11_2_0-${VER}-linux-amd64.tar.xz
+"
+#https://dl.espressif.com/dl/toolchains/preview/riscv32-esp-elf-gcc8_4_0-crosstool-ng-1.24.0-123-g64eb9ff-linux-amd64.tar.gz
+
+KEYWORDS="~amd64"
+LICENSE="Apache-2.0"
+IUSE="+esp32 esp32s2 esp32s3 riscv32"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+SLOT="0"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-embedded/esptool[${PYTHON_SINGLE_USEDEP}]
+
+	$(python_gen_cond_dep '
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/bitstring[${PYTHON_USEDEP}]
+		dev-python/construct[${PYTHON_USEDEP}]
+		dev-python/ecdsa[${PYTHON_USEDEP}]
+		dev-python/future[${PYTHON_USEDEP}]
+		dev-python/kconfiglib[${PYTHON_USEDEP}]
+		dev-python/pyelftools[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/pyserial[${PYTHON_USEDEP}]
+		dev-python/python-socketio[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/reedsolomon[${PYTHON_USEDEP}]
+		dev-embedded/idf-component-manager[${PYTHON_USEDEP}]
+	')
+"
+
+RESTRICT="strip"
+
+QA_PREBUILT="opt/* usr/lib* usr/share/esp-idf/*"
+QA_PRESTRIPPED="opt/*"
+
+PATCHES=("${FILESDIR}/allow-system-install-${P}.patch")
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+install_tool() {
+	shopt -s globstar
+
+	into /opt/${1}
+
+	if [[ -d "../${1}/lib" ]]; then
+		if stat *.so &>/dev/null; then
+		for i in ../${1}/lib/**/*.so*; do
+			dolib.so ${i}
+		done
+		fi
+
+		if stat *.a &>/dev/null; then
+		for i in ../${1}/lib/**/*.a*; do
+			dolib.a ${i}
+		done
+		fi
+
+		insinto /opt/${1}/lib
+		doins -r ../${1}/lib/*
+	fi
+
+	exeinto /opt/${1}/bin
+	doexe ../${1}/bin/*
+	(
+	cd ../${1}
+	for i in libexec/**/*; do
+		exeinto /opt/${1}/$(dirname ${i})
+		if [[ -x "${i}" && ! -d "${i}" ]]; then
+			doexe ${i}
+		fi
+	done
+
+	if [[ -d "include" ]]; then
+		insinto /opt/${1}
+		doins -r include
+	fi
+
+	if [[ -d "share" ]]; then
+		insinto /opt/${1}
+		doins -r share
+	fi
+	)
+
+	(
+		cd "${D}"/opt/${1}/bin/ || die
+		for i in *; do
+			dodir /opt/bin
+			cd "${D}"/opt/bin || die
+			dosym ../${1}/bin/${i} /opt/bin/${i}
+		done
+	)
+}
+
+src_install() {
+	echo -e "#!/bin/sh\npython /usr/share/${PN}/tools/idf.py \"\$@\"" > idf
+	dobin idf
+
+	if use esp32; then
+		install_tool xtensa-esp32-elf
+		install_tool xtensa-esp32-elf/xtensa-esp32-elf
+	fi
+
+	if use esp32s2; then
+		install_tool xtensa-esp32s2-elf
+	fi
+
+	if use esp32s3; then
+		install_tool xtensa-esp32s3-elf
+	fi
+
+	if use riscv32; then
+		install_tool riscv32-esp-elf
+	fi
+	install_tool openocd-esp32
+
+	echo "IDF_PATH=/usr/share/${PN}" > 99esp-idf || die
+	doenvd 99esp-idf
+
+	insinto /usr/share/${PN}
+
+	rm -r .git || die
+	doins -r .
+}
diff --git a/dev-embedded/esp-idf/files/allow-system-install-esp-idf-5.0.patch b/dev-embedded/esp-idf/files/allow-system-install-esp-idf-5.0.patch
new file mode 100644
index 0000000000..74fd3a3189
--- /dev/null
+++ b/dev-embedded/esp-idf/files/allow-system-install-esp-idf-5.0.patch
@@ -0,0 +1,37 @@
+diff --git a/tools/idf.py b/tools/idf.py
+index 0b91e13ff0..8ff1479f16 100755
+--- a/tools/idf.py
++++ b/tools/idf.py
+@@ -35,16 +35,11 @@ sys.dont_write_bytecode = True
+ 
+ import python_version_checker  # noqa: E402
+ 
+-try:
+-    from idf_py_actions.errors import FatalError  # noqa: E402
+-    from idf_py_actions.tools import (PropertyDict, executable_exists, get_target, idf_version,  # noqa: E402
++from idf_py_actions.errors import FatalError  # noqa: E402
++from idf_py_actions.tools import (PropertyDict, executable_exists, get_target, idf_version,  # noqa: E402
+                                       merge_action_lists, realpath)
+-    if os.getenv('IDF_COMPONENT_MANAGER') != '0':
+-        from idf_component_manager import idf_extensions
+-except ImportError:
+-    # For example, importing click could cause this.
+-    print('Please use idf.py only in an ESP-IDF shell environment.', file=sys.stderr)
+-    sys.exit(1)
++if os.getenv('IDF_COMPONENT_MANAGER') != '0':
++    from idf_component_manager import idf_extensions
+ 
+ # Use this Python interpreter for any subprocesses we launch
+ PYTHON = sys.executable
+diff --git a/tools/idf_tools.py b/tools/idf_tools.py
+index a388bbdb5f..63aa9c3cf4 100755
+--- a/tools/idf_tools.py
++++ b/tools/idf_tools.py
+@@ -2039,6 +2039,7 @@ def action_install_python_env(args):  # type: ignore
+ 
+ 
+ def action_check_python_dependencies(args):  # type: ignore
++    return
+     use_constraints = not args.no_constraints
+     req_paths = get_requirements('')  # no new features -> just detect the existing ones
+ 
diff --git a/dev-embedded/esp-idf/metadata.xml b/dev-embedded/esp-idf/metadata.xml
new file mode 100644
index 0000000000..fb3de0aa41
--- /dev/null
+++ b/dev-embedded/esp-idf/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+	<use>
+		<flag name="esp32">Enable support for esp32</flag>
+		<flag name="esp32s2">Enable support for esp32</flag>
+		<flag name="esp32s3">Enable support for esp32</flag>
+		<flag name="riscv32">Enable support for esp32</flag>
+	</use>
+</pkgmetadata>

From 8dac6c868503fab99edeb075adabc56e2c2b5281 Mon Sep 17 00:00:00 2001
From: Adam Pimentel <adam.pimentel@protonmail.com>
Date: Mon, 5 Dec 2022 18:02:34 -0500
Subject: [PATCH 13/19] net-p2p/feather: fix not "updating mime database" or
 something

Signed-off-by: Adam Pimentel <adam.pimentel@protonmail.com>
---
 net-p2p/feather/feather-2.1.0.ebuild | 2 +-
 net-p2p/feather/feather-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-p2p/feather/feather-2.1.0.ebuild b/net-p2p/feather/feather-2.1.0.ebuild
index eee1b7ae75..ac4b8c4780 100644
--- a/net-p2p/feather/feather-2.1.0.ebuild
+++ b/net-p2p/feather/feather-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake desktop
+inherit cmake desktop xdg
 
 #Note: this is like a tree, with dependencies-of-dependencies
 #You need to update all of these recursively every version bump.
diff --git a/net-p2p/feather/feather-9999.ebuild b/net-p2p/feather/feather-9999.ebuild
index 21fce42cf0..f986dbb15c 100644
--- a/net-p2p/feather/feather-9999.ebuild
+++ b/net-p2p/feather/feather-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake git-r3 desktop
+inherit cmake git-r3 desktop xdg
 
 DESCRIPTION="A free, open-source Monero wallet"
 HOMEPAGE="https://featherwallet.org"

From ac43f3bd8202e3452809f4b301df25309ca962d0 Mon Sep 17 00:00:00 2001
From: Adam Pimentel <adam.pimentel@protonmail.com>
Date: Mon, 5 Dec 2022 18:14:53 -0500
Subject: [PATCH 14/19] net-p2p/feather: fixed mime stuff again

Signed-off-by: Adam Pimentel <adam.pimentel@protonmail.com>
---
 net-p2p/feather/feather-2.1.0.ebuild | 2 ++
 net-p2p/feather/feather-9999.ebuild  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/net-p2p/feather/feather-2.1.0.ebuild b/net-p2p/feather/feather-2.1.0.ebuild
index ac4b8c4780..a8b19d2ae6 100644
--- a/net-p2p/feather/feather-2.1.0.ebuild
+++ b/net-p2p/feather/feather-2.1.0.ebuild
@@ -109,6 +109,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+
 	einfo "Ensure that Tor is running with 'rc-service tor start' before"
 	einfo "using Feather."
 }
diff --git a/net-p2p/feather/feather-9999.ebuild b/net-p2p/feather/feather-9999.ebuild
index f986dbb15c..c8d4d36b4f 100644
--- a/net-p2p/feather/feather-9999.ebuild
+++ b/net-p2p/feather/feather-9999.ebuild
@@ -74,6 +74,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+
 	einfo "Ensure that Tor is running with 'rc-service tor start' before"
 	einfo "using Feather."
 }

From eafda6954b2094245578b1ca4e76ab4188888431 Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Tue, 6 Dec 2022 00:31:41 +0100
Subject: [PATCH 15/19] gui-apps/showmethekey: new package, add 1.7.3

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 gui-apps/showmethekey/Manifest                |  1 +
 gui-apps/showmethekey/metadata.xml            |  8 ++++++
 .../showmethekey/showmethekey-1.7.3.ebuild    | 26 +++++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 gui-apps/showmethekey/Manifest
 create mode 100644 gui-apps/showmethekey/metadata.xml
 create mode 100644 gui-apps/showmethekey/showmethekey-1.7.3.ebuild

diff --git a/gui-apps/showmethekey/Manifest b/gui-apps/showmethekey/Manifest
new file mode 100644
index 0000000000..f02787cfb8
--- /dev/null
+++ b/gui-apps/showmethekey/Manifest
@@ -0,0 +1 @@
+DIST showmethekey-1.7.3.tar.gz 6044309 BLAKE2B cf62baba0a15379bcec46da28ff68bea4eb8afd28f05df246e64ef43ad6ad2a6b213c21b6355fdebca78619e1a5cefa82dd2d07842850d2f891076cd59a0ba37 SHA512 a6a97b1ff6dea6ed950b565006953ecc52558ecdd7c2743d58eb0a9a5e6bd6636b1beeb1feb90b80425ab4024c5efb9302dda8433ed713624ac27ad0fb295396
diff --git a/gui-apps/showmethekey/metadata.xml b/gui-apps/showmethekey/metadata.xml
new file mode 100644
index 0000000000..01c1fc8487
--- /dev/null
+++ b/gui-apps/showmethekey/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/gui-apps/showmethekey/showmethekey-1.7.3.ebuild b/gui-apps/showmethekey/showmethekey-1.7.3.ebuild
new file mode 100644
index 0000000000..c3a9eeb5a3
--- /dev/null
+++ b/gui-apps/showmethekey/showmethekey-1.7.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome2 meson
+
+DESCRIPTION=" Show keys you typed on screen. "
+HOMEPAGE="https://showmethekey.alynx.one/"
+SRC_URI="https://github.com/AlynxZhou/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="
+	dev-libs/glib
+	dev-libs/json-glib
+	dev-libs/libevdev
+	dev-libs/libinput
+	gui-libs/gtk
+	virtual/udev
+	x11-libs/cairo
+	x11-libs/pango
+"
+RDEPEND="${DEPEND}"

From eb0562246b6ae5ca7dcd196afe7e615fc0cb56e5 Mon Sep 17 00:00:00 2001
From: Julien Roy <julien@jroy.ca>
Date: Mon, 5 Dec 2022 22:54:21 -0500
Subject: [PATCH 16/19] gui-apps/eww: add QA_FLAGS_IGNORED

Closes bug https://bugs.gentoo.org/884455
Closes bug https://bugs.gentoo.org/884457

Signed-off-by: Julien Roy <julien@jroy.ca>
---
 gui-apps/eww/eww-0.4.0-r1.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gui-apps/eww/eww-0.4.0-r1.ebuild b/gui-apps/eww/eww-0.4.0-r1.ebuild
index 70aa8e313d..b206c950bb 100644
--- a/gui-apps/eww/eww-0.4.0-r1.ebuild
+++ b/gui-apps/eww/eww-0.4.0-r1.ebuild
@@ -269,6 +269,8 @@ RDEPEND="
 	$DEPEND
 "
 
+QA_FLAGS_IGNORED="usr/bin/.*"
+
 src_compile() {
 	use wayland && features="--no-default-features --features=wayland"
 	cargo_src_compile ${features}

From 7a05d067d8d1133ca39bddc6c7558a045eb29210 Mon Sep 17 00:00:00 2001
From: Alexey Zapparov <alexey@zapparov.com>
Date: Tue, 6 Dec 2022 05:00:13 +0100
Subject: [PATCH 17/19] sys-apps/hexyl: treeclean

Signed-off-by: Alexey Zapparov <alexey@zapparov.com>
---
 sys-apps/hexyl/Manifest           | 45 -------------------
 sys-apps/hexyl/hexyl-0.9.0.ebuild | 72 -------------------------------
 sys-apps/hexyl/metadata.xml       | 13 ------
 3 files changed, 130 deletions(-)
 delete mode 100644 sys-apps/hexyl/Manifest
 delete mode 100644 sys-apps/hexyl/hexyl-0.9.0.ebuild
 delete mode 100644 sys-apps/hexyl/metadata.xml

diff --git a/sys-apps/hexyl/Manifest b/sys-apps/hexyl/Manifest
deleted file mode 100644
index 8b32dbf953..0000000000
--- a/sys-apps/hexyl/Manifest
+++ /dev/null
@@ -1,45 +0,0 @@
-DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
-DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
-DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST anyhow-1.0.42.crate 34827 BLAKE2B adf276a869889819c78dc10cf9ceb310d57fc64dd00b603a16e7b6f111d446ca8ed43439c3f18f590c28c1e59a67cbe39fafb00c510d03b65eb8ba15a18d2b0d SHA512 7bbafa2fc5d78a6d8e68b44b104fd8d6a7882fc127b39e04c5a76240ee24ccf311004b754d93836d6daf1918be9c33fdb68a6baf55eab8f1e921b7aec3a35455
-DIST assert_cmd-1.0.7.crate 26777 BLAKE2B a27a6c59969b6202ceebc72b50331e056f02e05befe710f3f1fe77622a61ed4ed11e258cc2df43f52a7f57c18e4bc9b33c72946d012a4fd6f5417c1a5fedddff SHA512 9e0e67bdf14df8235cdd11d9c453bb2f0723188a39961d8aab26fd98f2c64629d085c8d3eb50ee88371ecdc2ea306bfe5dda1ca4872082b40f13a4cea99e05d1
-DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST bstr-0.2.16.crate 330346 BLAKE2B 75a345f3a5d428ec7278cd10fa676f5bb72685c65c4fe68163943cf3142b43ac45d458bce9323447b201ffcc91aa82cd8c762cb1954c055e34b1a5cebc686ee8 SHA512 33e82e5637efdc2f404ab9405331ae135df12586785491c3e61e70ea8406c67e2109e550cc70a4ab8e95d054e8519c48257fd3b55ef0b67b2530914a9a0b0fac
-DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
-DIST const_format-0.2.22.crate 72234 BLAKE2B 89d6f58458777d10e21bcf960e57d24069bf2325fd63904dddef10b6186570bf937fb1dc99d5302a1184d2946c35175d92970db583288bf5af45139aa8ac6e7f SHA512 3ed65106b3fa49fe7cbc0592a8a5b0fc9b99d9d44cb51c1fbdb2fb2eb916d801aa19d9ec568560d6df33373324ea226de3db6e82cbeb9a850426589472a1ec9c
-DIST const_format_proc_macros-0.2.22.crate 24274 BLAKE2B 61a41f89bb1302cd8a9b2b5b2bb6a90eea2aa6e331840c2b0033acdaef5ddb9cb7a63df028db9e6065a4883aa53002330c6af0bc0b8b3479ef8260c5d088cd71 SHA512 a0382a50502cff46c966fca1518ae1102cc749a9fff142a7fc29c3f3dce4b947ef05576e27248ed682aa9db2e1c0af149f41981d02d8415b63734a0ceccb68f4
-DIST difflib-0.4.0.crate 7638 BLAKE2B 57c703de0d467c997bcbedc4d6577569b3d72c612d3ccd929025a98f4bf8f72f2a0d43f3cd3bc616676c2569aed176b3c1362cfa868a4bb1197e05fe4dbce32f SHA512 fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9
-DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
-DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
-DIST float-cmp-0.8.0.crate 9640 BLAKE2B 5e4f7dfb115b558c517f704a7ed292801ec979b2d27c89d1a2a733c84317934fecb5cc9a92c25284f5d59ad8f284186f582e67285a67e99e67b05887fef334cb SHA512 6c98f5eb4fd748c8192cfeea1f2b9679ede01745ebfa01b08bf19d796c985c1b2779fdc77984f26ef9c9a06a979ae3f0b14676e0c8b28defb7717bf10119c718
-DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a
-DIST hexyl-0.9.0.tar.gz 30336 BLAKE2B 244c133a06e6432937803e84b2b64cd762a75c05490189533271522a069b68b639e7517904e5585d8b617b68885da1a092d6bdae2d6c15bd53d38bb89d96517f SHA512 a6fc8315dd115ac4b3e3717ffc6e218bf587749149405250796a435834252382fe51c613688729d7de6911340bf6f2002ae945c0f19b499dacc767e995958ce6
-DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
-DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.98.crate 522087 BLAKE2B 950686d7cde31322e1cdf82ae189192091b8543d14d0da0dcf3892910f4216e8e46bb1d5e7e8fcb1693a372577c57a6eb6538a0fef997c1c1a0466c3a1f7acb8 SHA512 2e730b8d46c42608c7da5ff4c5475667171b552b485c2684d3821310ac0f55c1a7a12d9a2cf68a05608cdd2a0928da5e290275c70a519a379d0ed25350689689
-DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
-DIST normalize-line-endings-0.3.0.crate 5737 BLAKE2B 935b2d20ccd37ca7469641a37aa0ae9b6872715d6ee88d568d0ee16fb76416cb1a0c585cff861825de8cef11d864b1dc1b350911c28d64e071d8fb444bbdf740 SHA512 f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea
-DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
-DIST predicates-2.0.0.crate 27026 BLAKE2B 42429cbf1ace7f8fc9837448f43968ea2b2d565877bac7cbd337f6d521a6ba00dd4033f82dcd865361313dd0a0fffa061c756c307abd6fd8e10c4160c1141c19 SHA512 39919bbdad3ff01151ddea985a26d2237df5af4cff429f982e131d405e2213fe8de9c2f8dbe183e5f8f6ac6a54abf57dc705ee5daa7ab3b139012f7ce43033e7
-DIST predicates-core-1.0.2.crate 8185 BLAKE2B f2525cf9d1444c0b6cfd981fb9f8555e4e797fe2a28edcbd75e719121d55eca593249d32a708e920c83549a2240dd04f154b19e59faf740ada773c3e59d52483 SHA512 bfeee297e7bb81c1cc63908ab47f10e21e53b9f690d9aaf08855bc1824e0c87cf05c92e5a8dbc57eace7490c0ce58bbe2e178ac33ad0553ad2772593d89f8aab
-DIST predicates-tree-1.0.2.crate 6341 BLAKE2B 6a701096226f37076d5fb0e62e37609b86f08ec32ff76191ff2717341979f946642d173fd9911929ab89562572817d377889c3a78af4cebad5e362c1675c6813 SHA512 d11b2b7d44ba5a00ed189d4455216f0c991c0f272776166a528136e26436e3f0cbbbdd001bf9a2b9aceaaf221fb9218fb497116e7957bf6bd9761616428c7ed2
-DIST proc-macro2-1.0.27.crate 38625 BLAKE2B a55e2404e3c7444c6da8aca6c0e7702b865ec56cfd2c20fec319e737fc83b00bbf505c15dadaa8740d5a6d07c089ed4854a173049b1be9872bba132ae7cbc8db SHA512 3227bcaa726e88bfdb1b4d1243a4eb216ad2394a7a3b4b258de342ac76a1ab1a39a07f28f3490e42e2c2034176bf0d84b1c1fcadba2444c0abcc5878b02f93a4
-DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
-DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
-DIST regex-automata-0.1.10.crate 114533 BLAKE2B 0e357229f6825f14339b1d7c40730b83e62bba12115d01ed20313320766e769a653a2fcd2c9d19af51a82c38e9e42c1a31d005e1f44f5b6fbb3ead7c9c74027f SHA512 56d64da361afce82c6cb49e70b99ce1fca3e1969c54bba5f9971db135f8544c65f49feb8827789947b3d1dcefc9c49a7a434a7ffe0d09c5900345a1733723c5f
-DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
-DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
-DIST syn-1.0.73.crate 232706 BLAKE2B c580f9ab914c54e731c8503c9b9d577d05032edb6bd12d7a183a3c0e3532fcf24196479a9ee40d09cb7e09ba6d94add36e338331affc2625058ce54419621ee4 SHA512 b37beb1b6d483cfdbc44d806af9955cdf52c4b0d5f918782019b089d06e107c7e23ced343a3bece20235a24752783795ebba8e603b61a6302e82ee7027843d8b
-DIST term_size-0.3.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
-DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
-DIST thiserror-1.0.26.crate 16711 BLAKE2B 4524c3ef351eaa1266cbbbafec6082695d5c1485cec7bcfdffd64719fd57efb4e40f119435eae5c6f574a80f59a68bd8c868e2493ddf36f4882e7de65fd4bf93 SHA512 bfe93a14006a3d9e0e996b310718223f8442802a384a1b999c15dd1a25f642c5cb2db7a50a69cbb097ec50ee3b0129b509f19225ca714a5c459d4dfc8255d84b
-DIST thiserror-impl-1.0.26.crate 13431 BLAKE2B dc753a4cc1e7b8b3eb44bd9462b6b19ee983fefbfe1f60a974195a536fdbc68395942a229a1d2ec7a8594669a439a6efd3cd22573a647a7fb7a371e793fba645 SHA512 43eea818b72469bc4d5c28e449c2e284c1e11b2674b9e67b1788af7ab66bd64afabfd8f5861938a7f9547a9c13387e0ce400419c6283bbe1e899d18d998cd921
-DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
-DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
-DIST unicode-xid-0.2.2.crate 14955 BLAKE2B 6c6da49ac08dbd8b3248272224d6bff96b9cd1f36029b1937a58a0b929c3a48326053305ed49e73edd70f572f5abbc4817cedc899c69e3457805ad056669f6af SHA512 92ffd0dd34e3ca235ecf110b38c447d3ec1faa23d76c112457f28d432f92fa6b5f428bc5e1bfd278f361f55426dd96e19ecb0d3eff6cf250892f069c52bd89a8
-DIST wait-timeout-0.2.0.crate 12441 BLAKE2B a99d3f57bc6e784ac06167f98b2dc2841f730dfab4fb9772b15e67707f756d6ba7daeb3e992d32291bed3daa85eaa8a8ddde64db5e1acf1cc4031fc9bdc82212 SHA512 db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066
-DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
-DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
-DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
diff --git a/sys-apps/hexyl/hexyl-0.9.0.ebuild b/sys-apps/hexyl/hexyl-0.9.0.ebuild
deleted file mode 100644
index 9eb9576603..0000000000
--- a/sys-apps/hexyl/hexyl-0.9.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CRATES="
-	aho-corasick-0.7.18
-	ansi_term-0.11.0
-	ansi_term-0.12.1
-	anyhow-1.0.42
-	assert_cmd-1.0.7
-	atty-0.2.14
-	autocfg-1.0.1
-	bitflags-1.2.1
-	bstr-0.2.16
-	clap-2.33.3
-	const_format-0.2.22
-	const_format_proc_macros-0.2.22
-	difflib-0.4.0
-	doc-comment-0.3.3
-	either-1.6.1
-	float-cmp-0.8.0
-	hermit-abi-0.1.19
-	itertools-0.10.1
-	lazy_static-1.4.0
-	libc-0.2.98
-	memchr-2.4.0
-	normalize-line-endings-0.3.0
-	num-traits-0.2.14
-	predicates-2.0.0
-	predicates-core-1.0.2
-	predicates-tree-1.0.2
-	proc-macro2-1.0.27
-	quote-1.0.9
-	regex-1.5.4
-	regex-automata-0.1.10
-	regex-syntax-0.6.25
-	strsim-0.8.0
-	syn-1.0.73
-	term_size-0.3.2
-	textwrap-0.11.0
-	thiserror-1.0.26
-	thiserror-impl-1.0.26
-	treeline-0.1.0
-	unicode-width-0.1.8
-	unicode-xid-0.2.2
-	wait-timeout-0.2.0
-	winapi-0.3.9
-	winapi-i686-pc-windows-gnu-0.4.0
-	winapi-x86_64-pc-windows-gnu-0.4.0
-	"
-inherit cargo
-
-DESCRIPTION="A command-line hex viewer"
-HOMEPAGE="https://github.com/sharkdp/hexyl"
-SRC_URI="
-	https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris)
-	"
-
-LICENSE="Apache-2.0 MIT ZLIB"
-SLOT="0"
-KEYWORDS="~amd64"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}"
-
-DOCS=( README.md CHANGELOG.md )
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-}
diff --git a/sys-apps/hexyl/metadata.xml b/sys-apps/hexyl/metadata.xml
deleted file mode 100644
index aa23f41e64..0000000000
--- a/sys-apps/hexyl/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alexey@zapparov.com</email>
-		<name>Alexey Zapparov</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">sharkdp/hexyl</remote-id>
-		<bugs-to>https://github.com/sharkdp/hexyl/issues</bugs-to>
-		<changelog>https://github.com/sharkdp/hexyl/raw/master/CHANGELOG.md</changelog>
-	</upstream>
-</pkgmetadata>

From 8b748e422ef9d820054ef5cb10926eef567f945c Mon Sep 17 00:00:00 2001
From: Viorel Munteanu <ceamac@gentoo.org>
Date: Tue, 6 Dec 2022 07:42:13 +0200
Subject: [PATCH 18/19] Move {virtual -> app-alternatives}/awk

Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
---
 app-backup/grub-btrfs/grub-btrfs-4.11-r1.ebuild | 2 +-
 app-backup/grub-btrfs/grub-btrfs-4.12.ebuild    | 2 +-
 app-backup/grub-btrfs/grub-btrfs-9999.ebuild    | 2 +-
 mpv-plugin/mpv-mpris/mpv-mpris-0.8.1.ebuild     | 2 +-
 sys-apps/sysz/sysz-1.4.1.ebuild                 | 2 +-
 sys-apps/sysz/sysz-1.4.3.ebuild                 | 2 +-
 sys-cluster/mcxx/mcxx-2021.06.ebuild            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app-backup/grub-btrfs/grub-btrfs-4.11-r1.ebuild b/app-backup/grub-btrfs/grub-btrfs-4.11-r1.ebuild
index 4cd7963d0e..7243cfe401 100644
--- a/app-backup/grub-btrfs/grub-btrfs-4.11-r1.ebuild
+++ b/app-backup/grub-btrfs/grub-btrfs-4.11-r1.ebuild
@@ -18,7 +18,7 @@ PATCHES=( "${FILESDIR}/${P}-remove-docs-from-make.patch" )
 DEPEND="
 	sys-fs/btrfs-progs
 	sys-boot/grub
-	virtual/awk
+	app-alternatives/awk
 	>=app-shells/bash-4
 "
 RDEPEND="${DEPEND}"
diff --git a/app-backup/grub-btrfs/grub-btrfs-4.12.ebuild b/app-backup/grub-btrfs/grub-btrfs-4.12.ebuild
index fbdf2148fe..e514663405 100644
--- a/app-backup/grub-btrfs/grub-btrfs-4.12.ebuild
+++ b/app-backup/grub-btrfs/grub-btrfs-4.12.ebuild
@@ -24,7 +24,7 @@ PATCHES=( "${FILESDIR}/${PN}-9999-remove-docs-from-make.patch" )
 DEPEND="
 	sys-fs/btrfs-progs
 	sys-boot/grub
-	virtual/awk
+	app-alternatives/awk
 	>=app-shells/bash-4
 	sys-fs/inotify-tools
 "
diff --git a/app-backup/grub-btrfs/grub-btrfs-9999.ebuild b/app-backup/grub-btrfs/grub-btrfs-9999.ebuild
index fbdf2148fe..e514663405 100644
--- a/app-backup/grub-btrfs/grub-btrfs-9999.ebuild
+++ b/app-backup/grub-btrfs/grub-btrfs-9999.ebuild
@@ -24,7 +24,7 @@ PATCHES=( "${FILESDIR}/${PN}-9999-remove-docs-from-make.patch" )
 DEPEND="
 	sys-fs/btrfs-progs
 	sys-boot/grub
-	virtual/awk
+	app-alternatives/awk
 	>=app-shells/bash-4
 	sys-fs/inotify-tools
 "
diff --git a/mpv-plugin/mpv-mpris/mpv-mpris-0.8.1.ebuild b/mpv-plugin/mpv-mpris/mpv-mpris-0.8.1.ebuild
index aeb13cc3da..fb8fd31a54 100644
--- a/mpv-plugin/mpv-mpris/mpv-mpris-0.8.1.ebuild
+++ b/mpv-plugin/mpv-mpris/mpv-mpris-0.8.1.ebuild
@@ -32,7 +32,7 @@ BDEPEND="virtual/pkgconfig
 		media-sound/playerctl
 		net-misc/socat
 		sys-apps/dbus
-		virtual/awk
+		app-alternatives/awk
 		x11-apps/xauth
 		x11-misc/xvfb-run
 		x11-themes/sound-theme-freedesktop
diff --git a/sys-apps/sysz/sysz-1.4.1.ebuild b/sys-apps/sysz/sysz-1.4.1.ebuild
index c4437c3e14..89bdb423d6 100644
--- a/sys-apps/sysz/sysz-1.4.1.ebuild
+++ b/sys-apps/sysz/sysz-1.4.1.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64"
 RDEPEND="
 	>=app-shells/bash-4.3
 	>=app-shells/fzf-0.27.1
-	virtual/awk
+	app-alternatives/awk
 "
 #	removed to make GURU CI happy
 #	sys-apps/systemd
diff --git a/sys-apps/sysz/sysz-1.4.3.ebuild b/sys-apps/sysz/sysz-1.4.3.ebuild
index c4437c3e14..89bdb423d6 100644
--- a/sys-apps/sysz/sysz-1.4.3.ebuild
+++ b/sys-apps/sysz/sysz-1.4.3.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64"
 RDEPEND="
 	>=app-shells/bash-4.3
 	>=app-shells/fzf-0.27.1
-	virtual/awk
+	app-alternatives/awk
 "
 #	removed to make GURU CI happy
 #	sys-apps/systemd
diff --git a/sys-cluster/mcxx/mcxx-2021.06.ebuild b/sys-cluster/mcxx/mcxx-2021.06.ebuild
index c3d2ae1c21..4d806fb046 100644
--- a/sys-cluster/mcxx/mcxx-2021.06.ebuild
+++ b/sys-cluster/mcxx/mcxx-2021.06.ebuild
@@ -46,7 +46,7 @@ BDEPEND="
 
 	test? (
 		sys-devel/bc
-		virtual/awk
+		app-alternatives/awk
 	)
 "
 

From b4cfa583d67e8980846a5401305b3b80181af216 Mon Sep 17 00:00:00 2001
From: Viorel Munteanu <ceamac@gentoo.org>
Date: Tue, 6 Dec 2022 07:43:50 +0200
Subject: [PATCH 19/19] Move {virtual -> app-alternatives}/yacc

Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
---
 dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild | 2 +-
 dev-libs/cubelib/cubelib-4.7-r2.ebuild         | 2 +-
 dev-vcs/got/got-0.78.ebuild                    | 2 +-
 dev-vcs/got/got-0.79.ebuild                    | 2 +-
 net-misc/gmid/gmid-1.8.3.ebuild                | 2 +-
 net-misc/gmid/gmid-1.8.5.ebuild                | 2 +-
 net-misc/gmid/gmid-9999.ebuild                 | 2 +-
 net-nntp/inn/inn-2.6.4-r1.ebuild               | 2 +-
 net-nntp/inn/inn-2.6.5.ebuild                  | 2 +-
 sci-mathematics/mccs/mccs-1.1.ebuild           | 2 +-
 sys-cluster/mcxx/mcxx-2021.06.ebuild           | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild b/dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild
index e3e1edfbb7..98dccd723b 100644
--- a/dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild
+++ b/dev-lang/aldor/aldor-1.2.0_p20190730-r1.ebuild
@@ -47,7 +47,7 @@ DEPEND="
 	java? ( virtual/jdk:1.8 )
 "
 BDEPEND="
-	virtual/yacc
+	app-alternatives/yacc
 
 	doc? ( virtual/latex-base )
 	emacs? ( app-text/noweb )
diff --git a/dev-libs/cubelib/cubelib-4.7-r2.ebuild b/dev-libs/cubelib/cubelib-4.7-r2.ebuild
index 3500e446e5..e2d95f04f9 100644
--- a/dev-libs/cubelib/cubelib-4.7-r2.ebuild
+++ b/dev-libs/cubelib/cubelib-4.7-r2.ebuild
@@ -35,7 +35,7 @@ DEPEND="
 "
 BDEPEND="
 	sys-devel/flex
-	virtual/yacc
+	app-alternatives/yacc
 "
 
 REQUIRED_USE="^^ ( ${IUSE_CUBELIB_STRATEGY/+/} )"
diff --git a/dev-vcs/got/got-0.78.ebuild b/dev-vcs/got/got-0.78.ebuild
index 8224981b61..998462dd8e 100644
--- a/dev-vcs/got/got-0.78.ebuild
+++ b/dev-vcs/got/got-0.78.ebuild
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig
-	virtual/yacc
+	app-alternatives/yacc
 "
 
 DOCS=( CHANGELOG CHANGES README TODO )
diff --git a/dev-vcs/got/got-0.79.ebuild b/dev-vcs/got/got-0.79.ebuild
index 8224981b61..998462dd8e 100644
--- a/dev-vcs/got/got-0.79.ebuild
+++ b/dev-vcs/got/got-0.79.ebuild
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="
 	virtual/pkgconfig
-	virtual/yacc
+	app-alternatives/yacc
 "
 
 DOCS=( CHANGELOG CHANGES README TODO )
diff --git a/net-misc/gmid/gmid-1.8.3.ebuild b/net-misc/gmid/gmid-1.8.3.ebuild
index f7138233fe..184d8c365e 100644
--- a/net-misc/gmid/gmid-1.8.3.ebuild
+++ b/net-misc/gmid/gmid-1.8.3.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	virtual/yacc
+	app-alternatives/yacc
 	seccomp? ( sys-kernel/linux-headers )
 "
 if [[ ${PV} != 9999 ]]; then
diff --git a/net-misc/gmid/gmid-1.8.5.ebuild b/net-misc/gmid/gmid-1.8.5.ebuild
index dd7c358ebb..448271f270 100644
--- a/net-misc/gmid/gmid-1.8.5.ebuild
+++ b/net-misc/gmid/gmid-1.8.5.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	virtual/yacc
+	app-alternatives/yacc
 	seccomp? ( sys-kernel/linux-headers )
 "
 if [[ ${PV} != 9999 ]]; then
diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild
index dd7c358ebb..448271f270 100644
--- a/net-misc/gmid/gmid-9999.ebuild
+++ b/net-misc/gmid/gmid-9999.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="
 	virtual/pkgconfig
-	virtual/yacc
+	app-alternatives/yacc
 	seccomp? ( sys-kernel/linux-headers )
 "
 if [[ ${PV} != 9999 ]]; then
diff --git a/net-nntp/inn/inn-2.6.4-r1.ebuild b/net-nntp/inn/inn-2.6.4-r1.ebuild
index 910a7babb9..e2832bce18 100644
--- a/net-nntp/inn/inn-2.6.4-r1.ebuild
+++ b/net-nntp/inn/inn-2.6.4-r1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	sys-devel/flex
-	virtual/yacc
+	app-alternatives/yacc
 	verify-sig? ( sec-keys/openpgp-keys-russallbery )
 "
 
diff --git a/net-nntp/inn/inn-2.6.5.ebuild b/net-nntp/inn/inn-2.6.5.ebuild
index fccdcb5d4c..51d37f6006 100644
--- a/net-nntp/inn/inn-2.6.5.ebuild
+++ b/net-nntp/inn/inn-2.6.5.ebuild
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	sys-devel/flex
-	virtual/yacc
+	app-alternatives/yacc
 	verify-sig? ( sec-keys/openpgp-keys-russallbery )
 "
 
diff --git a/sci-mathematics/mccs/mccs-1.1.ebuild b/sci-mathematics/mccs/mccs-1.1.ebuild
index ee3a56aaac..5cd59202ba 100644
--- a/sci-mathematics/mccs/mccs-1.1.ebuild
+++ b/sci-mathematics/mccs/mccs-1.1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 BDEPEND="
 	dev-util/quilt
 	sys-devel/bison
-	virtual/yacc
+	app-alternatives/yacc
 "
 
 src_prepare() {
diff --git a/sys-cluster/mcxx/mcxx-2021.06.ebuild b/sys-cluster/mcxx/mcxx-2021.06.ebuild
index 4d806fb046..82915a02fc 100644
--- a/sys-cluster/mcxx/mcxx-2021.06.ebuild
+++ b/sys-cluster/mcxx/mcxx-2021.06.ebuild
@@ -42,7 +42,7 @@ BDEPEND="
 	dev-util/gperf
 	sys-devel/flex
 	virtual/pkgconfig
-	virtual/yacc
+	app-alternatives/yacc
 
 	test? (
 		sys-devel/bc