From 7607bbceb4eed4057be1c613bc443e1aba3d687b Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Thu, 17 Aug 2023 14:22:44 +0200
Subject: [PATCH 01/16] dev-python/TakeTheTime: update SRC_URI

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-python/TakeTheTime/Manifest                 |  2 +-
 dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dev-python/TakeTheTime/Manifest b/dev-python/TakeTheTime/Manifest
index ff55b8211d..b920959efd 100644
--- a/dev-python/TakeTheTime/Manifest
+++ b/dev-python/TakeTheTime/Manifest
@@ -1 +1 @@
-DIST TakeTheTime-0.3.1.tar.gz 2072 BLAKE2B 2ac8001bc5afe01dd502a7580b9dbe7f4dea7e12c44ddca9e7e1b12a70f3dc38b417702cb69431df75bc81168187cf39d42c8e0860d98ae25b038c0b868b6b6c SHA512 fd31cd909717ed0ada764699e450caae3e0a12f90c563ade99e060acff88f663d9ba386944ee6f6571737785ada5aceb4fdc41a52d0f0ff7202e732c621396ea
+DIST TakeTheTime-0.3.1.gh.tar.gz 2916 BLAKE2B 841edd7e06d45ce6f2774a8464c391500651a9762ff85115d9b13d9f45e68f7ae7e0aef0d588d5e9cce0ee98b1c5343cef83fe9b026c074cbe27c2e6837ffb72 SHA512 ef33101d850ff39ed85b5f26fa90fb7ece1e85ee39e7f611b444e0d2cba181698cc99bd4183285b24da2a740b6fbf315f2f35d7f67ce67b53acefab0b2eaaee5
diff --git a/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild b/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild
index a8a43745f1..fd6d03ccb5 100644
--- a/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild
+++ b/dev-python/TakeTheTime/TakeTheTime-0.3.1.ebuild
@@ -3,18 +3,23 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} pypy3 )
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
 DISTUTILS_USE_PEP517=setuptools
 PYPI_NO_NORMALIZE=1
-inherit distutils-r1 pypi
+inherit distutils-r1
 
 DESCRIPTION="Take The Time, a super-neat Python library for timing chunks of code"
 HOMEPAGE="https://github.com/ErikBjare/TakeTheTime"
-LICENSE="MIT"
 
+# pypi doesn't contains the tests
+SRC_URI="https://github.com/ErikBjare/TakeTheTime/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+LICENSE="MIT"
 
 KEYWORDS="~amd64"
 SLOT="0"
 
-# Not available for now
-RESTRICT="test"
+distutils_enable_tests unittest
+
+python_test() {
+	eunittest tests
+}

From 1b0b1b2a90cdfab709f8f748729f47641515ff3f Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Thu, 17 Aug 2023 14:31:12 +0200
Subject: [PATCH 02/16] dev-python/schema: enable py3.12

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 dev-python/schema/schema-0.7.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-python/schema/schema-0.7.5.ebuild b/dev-python/schema/schema-0.7.5.ebuild
index 2b0287877e..d3f5d29b06 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_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1 pypi
 

From f75e829550641520489b7911fd68aefe89105d90 Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Thu, 17 Aug 2023 18:07:48 +0200
Subject: [PATCH 03/16] net-p2p/feather: drop 2.2.3, 2.3.0, 2.4.1_pre20230301

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 net-p2p/feather/Manifest                      |  24 ---
 net-p2p/feather/feather-2.2.3.ebuild          | 145 -----------------
 net-p2p/feather/feather-2.3.0.ebuild          | 144 -----------------
 .../feather/feather-2.4.1_pre20230301.ebuild  | 149 ------------------
 .../files/feather_remove_cflags-2.2.3.patch   |  18 ---
 .../files/feather_remove_cflags-2.3.0.patch   |  18 ---
 ...ther_remove_cflags-2.4.1_pre20230301.patch |  18 ---
 7 files changed, 516 deletions(-)
 delete mode 100644 net-p2p/feather/feather-2.2.3.ebuild
 delete mode 100644 net-p2p/feather/feather-2.3.0.ebuild
 delete mode 100644 net-p2p/feather/feather-2.4.1_pre20230301.ebuild
 delete mode 100644 net-p2p/feather/files/feather_remove_cflags-2.2.3.patch
 delete mode 100644 net-p2p/feather/files/feather_remove_cflags-2.3.0.patch
 delete mode 100644 net-p2p/feather/files/feather_remove_cflags-2.4.1_pre20230301.patch

diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index 37e26bba1c..e9d6f65e19 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -1,27 +1,3 @@
-DIST feather-2.2.3-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.2.3-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.2.3-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.2.3-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.2.3-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.2.3-monero.tar.gz 11615445 BLAKE2B b30f7e8b72989f14a482997a17e925afaef4ac198ecfe57e545f72f4923e26d3352db5bcb393252ab2488040b8fe82dba2c7be05c2c59cb5dff2499c6dd306a2 SHA512 cdb4f0634f50319622920faf56484f975fef7e94caf01f276118552ba7de284ec3ec06e43b1476de3255710f7bb47a47d75d974174a3c30657074943fa1f415a
-DIST feather-2.2.3-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.2.3.tar.gz 2197323 BLAKE2B 413b6acfbb1eaa55844a01c324325707a25b99f78e52c882c1b57e66ff0f85a0535811568c43f0746818592a8775341678c1f565abdff2eefa25a81ac8d1c97b SHA512 96f5e3a3bd401bea1c15b77b9180da8cfddecfff85138a7cace27876ebe56558e1cf884ef28d9b466bfbf5b7beaa4232d96144e71d458c0d4c647129406199a9
-DIST feather-2.3.0-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.3.0-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.3.0-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.3.0-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.3.0-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.3.0-monero.tar.gz 11624682 BLAKE2B cf4e53e4ba08d51a8b8b36181437ff531a37aa04888e0987152f7bc33e71acd8378848ad54caf3184494bf5071f0041fd8059c55047957dc4a973d7519165342 SHA512 a5246e5c1cc65cbc7c719979f07054f55016e8fcb9401b96809b1867d09f262850c7b24d42580f4aad2b0a2d25063b5c405dbc6537f72d87bd3109e52dc3196c
-DIST feather-2.3.0-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.3.0.tar.gz 2204981 BLAKE2B d2635a52b092e4f90783074b1041a7256fcaa0ae66ae25bd1e19e04e4112a2a5bfb043d78aeeb62e2ce508498d531e4eb9677d6f4f223a298c5fac5d020c434a SHA512 b85f9932ed347cd78f9153a1e50e4374836f5d169efeb0a21e1d319c7f10b3f027a28384cad6fbc322c7bad8766bd30da6cbaf4b64a7a0e501634fe02f5cded0
-DIST feather-2.4.1_pre20230301-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.4.1_pre20230301-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.4.1_pre20230301-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.4.1_pre20230301-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.4.1_pre20230301-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.4.1_pre20230301-monero.tar.gz 11621070 BLAKE2B 8361a9f44eeb8a2035d3e110481aada7607b4bac2b52efc04ac6003665585d4d56629e88ab8c501e51997b3c3fe514a81b6f981bc07f3070eb24b897169300a6 SHA512 1bc23d60bebd51fdf459244376406c3eaec698457d0fc58f9628081c4b6297a15fb12dc848bbbbaafc77c367c59811ff36dbe499ac0fbcafd4ea10e0c6771f7e
-DIST feather-2.4.1_pre20230301-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.4.1_pre20230301.tar.gz 5458207 BLAKE2B 40f754a19778c227fcf73350f4bc5b61df142d18d17227dc7d83f2beef160ad170d1d40eea589d003c19459c2821b6b8630220dc612ba3abb981ebe622225b6d SHA512 eb09f6c7d45e238110d2f7c60401aba147acbb38784e51d5e43966b077c52e4e26c1d08cfbf4093cdb777fc8a01932b927603cb834f0d1b4b8b41fa913a9987b
 DIST feather-2.4.2-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
 DIST feather-2.4.2-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
 DIST feather-2.4.2-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
diff --git a/net-p2p/feather/feather-2.2.3.ebuild b/net-p2p/feather/feather-2.2.3.ebuild
deleted file mode 100644
index 6a22d7eb07..0000000000
--- a/net-p2p/feather/feather-2.2.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="5e3c15637ed0ecbef44782247ce7364c2893a674"
-	MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
-	RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
-	RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
-	SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
-	TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
-
-DESCRIPTION="A free, open-source Monero wallet"
-HOMEPAGE="https://featherwallet.org"
-SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \
-${P}.tar.gz
-	https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
-${P}-singleapplication.tar.gz
-	https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
-${P}-monero.tar.gz
-	https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${P}-monero-miniupnp.tar.gz
-	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${P}-monero-randomx.tar.gz
-	https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${P}-monero-rapidjson.tar.gz
-	https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${P}-monero-supercop.tar.gz
-	https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${P}-monero-trezorcommon.tar.gz
-"
-
-# Feather is released under the terms of the BSD license, but it vendors
-# code from Monero and Tor too.
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qrcode xmrig localmonero"
-
-DEPEND="
-	dev-libs/libsodium:=
-	media-gfx/qrencode:=
-	media-gfx/zbar:=[v4l]
-	>=dev-libs/polyseed-1.0.0
-	dev-libs/libzip:=
-	dev-libs/boost:=[nls]
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtnetwork-5.15:5
-	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtxml-5.15:5
-	>=dev-qt/qtwebsockets-5.15:5
-	>=dev-qt/qtmultimedia-5.15:5[widgets]
-	>=dev-qt/qtconcurrent-5.15:5
-	dev-libs/libgcrypt:=
-	sys-libs/zlib
-	dev-libs/openssl:=
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-"
-RDEPEND="
-	${DEPEND}
-	net-vpn/tor
-	xmrig? ( net-misc/xmrig )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${P}.tar.gz \
-		${P}-singleapplication.tar.gz \
-		${P}-monero.tar.gz \
-		${P}-monero-miniupnp.tar.gz \
-		${P}-monero-randomx.tar.gz \
-		${P}-monero-rapidjson.tar.gz \
-		${P}-monero-supercop.tar.gz \
-		${P}-monero-trezorcommon.tar.gz
-	mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
-		"${WORKDIR}"/${P}/src/third-party/singleapplication || die
-	mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero || die
-	mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/miniupnp || die
-	mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/randomx || die
-	mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/rapidjson || die
-	mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/supercop || die
-	mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/trezor-common || die
-}
-
-src_prepare() {
-	default
-	echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
-	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
-	eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
-	pushd monero || die
-		eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
-		eapply "${FILESDIR}"/monero_add_some_includes-${PV}.patch
-	popd || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DBUILD_SHARED_LIBS=OFF
-		-DARCH=x86-64
-		-DBUILD_TAG="linux-x64"
-		-DBUILD_64=ON
-		-DSELF_CONTAINED=OFF
-		-DLOCALMONERO=$(usex localmonero)
-		-DXMRIG=$(usex xmrig)
-		-DCHECK_UPDATES=OFF
-		-DPLATFORM_INSTALLER=OFF
-		-DUSE_DEVICE_TREZOR=OFF
-		-DDONATE_BEG=OFF
-		-DWITH_SCANNER=$(usex qrcode)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_build feather
-}
-
-src_install() {
-	dobin "${BUILD_DIR}/bin/feather"
-
-	doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
-	domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop
-}
-
-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-2.3.0.ebuild b/net-p2p/feather/feather-2.3.0.ebuild
deleted file mode 100644
index 02e20aa061..0000000000
--- a/net-p2p/feather/feather-2.3.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="18bdad879d9f25f35f065354aedf1236e6b0a60b"
-	MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
-	RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
-	RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
-	SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
-	TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
-
-DESCRIPTION="A free, open-source Monero wallet"
-HOMEPAGE="https://featherwallet.org"
-SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \
-${P}.tar.gz
-	https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
-${P}-singleapplication.tar.gz
-	https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
-${P}-monero.tar.gz
-	https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${P}-monero-miniupnp.tar.gz
-	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${P}-monero-randomx.tar.gz
-	https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${P}-monero-rapidjson.tar.gz
-	https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${P}-monero-supercop.tar.gz
-	https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${P}-monero-trezorcommon.tar.gz
-"
-
-# Feather is released under the terms of the BSD license, but it vendors
-# code from Monero and Tor too.
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qrcode xmrig localmonero"
-
-DEPEND="
-	dev-libs/libsodium:=
-	media-gfx/qrencode:=
-	media-gfx/zbar:=[v4l]
-	>=dev-libs/polyseed-1.0.0
-	dev-libs/libzip:=
-	dev-libs/boost:=[nls]
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtnetwork-5.15:5
-	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtxml-5.15:5
-	>=dev-qt/qtwebsockets-5.15:5
-	>=dev-qt/qtmultimedia-5.15:5[widgets]
-	>=dev-qt/qtconcurrent-5.15:5
-	dev-libs/libgcrypt:=
-	sys-libs/zlib
-	dev-libs/openssl:=
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-"
-RDEPEND="
-	${DEPEND}
-	net-vpn/tor
-	xmrig? ( net-misc/xmrig )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${P}.tar.gz \
-		${P}-singleapplication.tar.gz \
-		${P}-monero.tar.gz \
-		${P}-monero-miniupnp.tar.gz \
-		${P}-monero-randomx.tar.gz \
-		${P}-monero-rapidjson.tar.gz \
-		${P}-monero-supercop.tar.gz \
-		${P}-monero-trezorcommon.tar.gz
-	mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
-		"${WORKDIR}"/${P}/src/third-party/singleapplication || die
-	mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero || die
-	mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/miniupnp || die
-	mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/randomx || die
-	mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/rapidjson || die
-	mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/supercop || die
-	mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/trezor-common || die
-}
-
-src_prepare() {
-	default
-	echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
-	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
-	eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
-	pushd monero || die
-		eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
-	popd || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DBUILD_SHARED_LIBS=OFF
-		-DARCH=x86-64
-		-DBUILD_TAG="linux-x64"
-		-DBUILD_64=ON
-		-DSELF_CONTAINED=OFF
-		-DLOCALMONERO=$(usex localmonero)
-		-DXMRIG=$(usex xmrig)
-		-DCHECK_UPDATES=OFF
-		-DPLATFORM_INSTALLER=OFF
-		-DUSE_DEVICE_TREZOR=OFF
-		-DDONATE_BEG=OFF
-		-DWITH_SCANNER=$(usex qrcode)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_build feather
-}
-
-src_install() {
-	dobin "${BUILD_DIR}/bin/feather"
-
-	doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
-	domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop
-}
-
-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-2.4.1_pre20230301.ebuild b/net-p2p/feather/feather-2.4.1_pre20230301.ebuild
deleted file mode 100644
index 2f597359e7..0000000000
--- a/net-p2p/feather/feather-2.4.1_pre20230301.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-# Comit that fixes qt5:
-FEATHER_DIST_COMIT="8e10731e37621e271eea481dd93065a55c0a74c8"
-
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="772d207026dac31f927efa733fda3f73b103e71a"
-	MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
-	RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
-	RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
-	SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
-	TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
-
-DESCRIPTION="A free, open-source Monero wallet"
-HOMEPAGE="https://featherwallet.org"
-SRC_URI="https://github.com/feather-wallet/feather/archive/${FEATHER_DIST_COMIT}.tar.gz -> \
-${P}.tar.gz
-	https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
-${P}-singleapplication.tar.gz
-	https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
-${P}-monero.tar.gz
-	https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${P}-monero-miniupnp.tar.gz
-	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${P}-monero-randomx.tar.gz
-	https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${P}-monero-rapidjson.tar.gz
-	https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${P}-monero-supercop.tar.gz
-	https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${P}-monero-trezorcommon.tar.gz
-"
-
-# Feather is released under the terms of the BSD license, but it vendors
-# code from Monero and Tor too.
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qrcode xmrig localmonero"
-
-DEPEND="
-	dev-libs/libsodium:=
-	media-gfx/qrencode:=
-	media-gfx/zbar:=[v4l]
-	>=dev-libs/polyseed-1.0.0
-	dev-libs/libzip:=
-	dev-libs/boost:=[nls]
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtnetwork-5.15:5
-	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtxml-5.15:5
-	>=dev-qt/qtwebsockets-5.15:5
-	>=dev-qt/qtmultimedia-5.15:5[widgets]
-	>=dev-qt/qtconcurrent-5.15:5
-	dev-libs/libgcrypt:=
-	sys-libs/zlib
-	dev-libs/openssl:=
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-"
-RDEPEND="
-	${DEPEND}
-	net-vpn/tor
-	xmrig? ( net-misc/xmrig )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${P}.tar.gz \
-		${P}-singleapplication.tar.gz \
-		${P}-monero.tar.gz \
-		${P}-monero-miniupnp.tar.gz \
-		${P}-monero-randomx.tar.gz \
-		${P}-monero-rapidjson.tar.gz \
-		${P}-monero-supercop.tar.gz \
-		${P}-monero-trezorcommon.tar.gz
-	mv -T "${WORKDIR}"/feather-${FEATHER_DIST_COMIT} \
-		"${WORKDIR}"/${P} || die
-	mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
-		"${WORKDIR}"/${P}/src/third-party/singleapplication || die
-	mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero || die
-	mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/miniupnp || die
-	mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/randomx || die
-	mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/rapidjson || die
-	mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/supercop || die
-	mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/trezor-common || die
-}
-
-src_prepare() {
-	default
-	echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
-	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
-	eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
-	pushd monero || die
-		eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
-	popd || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DBUILD_SHARED_LIBS=OFF
-		-DARCH=x86-64
-		-DBUILD_TAG="linux-x64"
-		-DBUILD_64=ON
-		-DSELF_CONTAINED=OFF
-		-DLOCALMONERO=$(usex localmonero)
-		-DXMRIG=$(usex xmrig)
-		-DCHECK_UPDATES=OFF
-		-DPLATFORM_INSTALLER=OFF
-		-DUSE_DEVICE_TREZOR=OFF
-		-DDONATE_BEG=OFF
-		-DWITH_SCANNER=$(usex qrcode)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_build feather
-}
-
-src_install() {
-	dobin "${BUILD_DIR}/bin/feather"
-
-	doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
-	domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop
-}
-
-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/files/feather_remove_cflags-2.2.3.patch b/net-p2p/feather/files/feather_remove_cflags-2.2.3.patch
deleted file mode 100644
index 480179a15f..0000000000
--- a/net-p2p/feather/files/feather_remove_cflags-2.2.3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -284,12 +284,8 @@
- add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
- add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
-
--message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
--message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
--message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
--
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
--set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
-+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
-
- add_subdirectory(src)
diff --git a/net-p2p/feather/files/feather_remove_cflags-2.3.0.patch b/net-p2p/feather/files/feather_remove_cflags-2.3.0.patch
deleted file mode 100644
index a3dbbb06ee..0000000000
--- a/net-p2p/feather/files/feather_remove_cflags-2.3.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -262,12 +262,8 @@
- add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
- add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
-
--message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
--message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
--message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
--
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
--set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
-+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
-
- add_subdirectory(src)
diff --git a/net-p2p/feather/files/feather_remove_cflags-2.4.1_pre20230301.patch b/net-p2p/feather/files/feather_remove_cflags-2.4.1_pre20230301.patch
deleted file mode 100644
index a3dbbb06ee..0000000000
--- a/net-p2p/feather/files/feather_remove_cflags-2.4.1_pre20230301.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -262,12 +262,8 @@
- add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
- add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
-
--message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
--message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
--message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
--
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
--set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
-+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
-
- add_subdirectory(src)

From af3ffc3cfd5ce3400f84e1fbd9a8762d944c7411 Mon Sep 17 00:00:00 2001
From: David Roman <davidroman96@gmail.com>
Date: Thu, 17 Aug 2023 18:11:32 +0200
Subject: [PATCH 04/16] net-p2p/feather: drop 2.4.2

Signed-off-by: David Roman <davidroman96@gmail.com>
---
 net-p2p/feather/Manifest                      |   8 -
 net-p2p/feather/feather-2.4.2.ebuild          | 144 ------------------
 .../files/feather_remove_cflags-2.4.2.patch   |  18 ---
 .../monero_add_some_includes-2.2.3.patch      |  25 ---
 .../files/monero_remove_cflags-2.2.3.patch    |  24 ---
 .../files/monero_remove_cflags-2.3.0.patch    |  25 ---
 ...nero_remove_cflags-2.4.1_pre20230301.patch |  25 ---
 .../files/monero_remove_cflags-2.4.2.patch    |  25 ---
 8 files changed, 294 deletions(-)
 delete mode 100644 net-p2p/feather/feather-2.4.2.ebuild
 delete mode 100644 net-p2p/feather/files/feather_remove_cflags-2.4.2.patch
 delete mode 100644 net-p2p/feather/files/monero_add_some_includes-2.2.3.patch
 delete mode 100644 net-p2p/feather/files/monero_remove_cflags-2.2.3.patch
 delete mode 100644 net-p2p/feather/files/monero_remove_cflags-2.3.0.patch
 delete mode 100644 net-p2p/feather/files/monero_remove_cflags-2.4.1_pre20230301.patch
 delete mode 100644 net-p2p/feather/files/monero_remove_cflags-2.4.2.patch

diff --git a/net-p2p/feather/Manifest b/net-p2p/feather/Manifest
index e9d6f65e19..54c83270ef 100644
--- a/net-p2p/feather/Manifest
+++ b/net-p2p/feather/Manifest
@@ -1,11 +1,3 @@
-DIST feather-2.4.2-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
-DIST feather-2.4.2-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
-DIST feather-2.4.2-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
-DIST feather-2.4.2-monero-supercop.tar.gz 346604 BLAKE2B 10e48076acb2e5de5acb2efee61b2fac40fdfec3bc4037a94199d56ee2446466126e1b9dade56ee69598f4bd3c64b45d86d0810f24f461f6e09fb84c87e1ef93 SHA512 06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648
-DIST feather-2.4.2-monero-trezorcommon.tar.gz 1327782 BLAKE2B 738f2833317d5b5f52c21582160c1bee331fda38615c7e2c29d68cec600e849209111aaa75cce059596e87b2711c5a5749d965c91f1cf15cbe98fc86a049b5a5 SHA512 9955aa160e9a969decee598584f788e4d36e9c65f2ee730cd8f128669e86175f2189e804ca53e405871ab698ae5e683f146e59e832d8ec58fa1cb46328665ddf
-DIST feather-2.4.2-monero.tar.gz 11618665 BLAKE2B a6d708b723c2ab1517b0c4de4070552f6ec5ba544f3cfc96438bb612d094d78d2d79185f12d064555fd7031300b2b62673ee46ff3f9b765340c8a80abd5afc64 SHA512 d29a5c5ca53a232d158f457188e58783e6fb64ff6172ff382801ded014515ba951ca8c98306b771cee97f97ac4f6ae3474a4ce3c635c0085df013a6ba0bb5273
-DIST feather-2.4.2-singleapplication.tar.gz 21630 BLAKE2B 403e187d0c9f5c591741ab1bdf879ae700cd255e0bcf3cc6e71aa2f6b9dcaf462aaa4e2142b5978d5e69c7660b1d094ac47cac3912c1b49a1dd003eebc641d6f SHA512 d16127412a97289edcb2bf86d2e4229d11408095ca6be6f2d7d63a6df573b31aa2e100382da3b12b93b45380fe68586c91cf3e774d1aedfeb88e151bc13bb4c4
-DIST feather-2.4.2.tar.gz 5459199 BLAKE2B 22b7afa15257ce6c21424ae0b81ef2c1d38ab5dc9d704720c9aaa3f5d3519ed9c0033bcfa44a93b121cdd522bed9b1e6c4c8f57e08aa8f0576d69476785a79e9 SHA512 38a7bcd7f3490bb8d71711975a21fb93cb0445ad85d3d44a39932eebf0d190db343f87e5034e7766d154303d03bfae5da88cf3b3a06a08278427589291f54c52
 DIST feather-2.4.5-monero-miniupnp.tar.gz 446961 BLAKE2B 802e3a99f2e129492be547eba0f7f87c0e0c7024b4a322fbabf973dab26cd33601d99b29d422f8bb2ebae078982ef25efcdfe7ce66149360ba974abcb80b95d4 SHA512 c544148b2f110a84dbc69b0de2a6ff95ea3b8ad49354320c557b29a548de3e87ac52e37566b7f809bbcf0afa395e5150049dde15383d8180a52a38fd8738fdc5
 DIST feather-2.4.5-monero-randomx.tar.gz 164390 BLAKE2B 704792f22d7e3e9e789b42f77176ef4687b7d599387edfa42f854ad7b0f692d704480a6c7e43a291acac0dde2adae12923ea11e615d132baf10c7cb8f59f5801 SHA512 959a8399ae85bbb57e875e0383e448b10241badcd6682c7b6dec9d172f489ccbf3bb9b8b9b657bf977b3f2280597eb99cef2270159dc77142615dfe8d6f438ad
 DIST feather-2.4.5-monero-rapidjson.tar.gz 1054330 BLAKE2B 5d18961b86a27516e42441ba46317ba811e06305dc754b5765b4fbfb697d93bc31ae9457fa2c3f213396909af726f775a7b371874ef1a0dc56a8577ed077a610 SHA512 dd4f103f84c4f32683ca9ccc82c35db3a60012c35acbb79405905c8b4e382389c52422b1a514e6128ae71f90f5eedb158f2a4f72f7c0f6025c2ef0787130bbe7
diff --git a/net-p2p/feather/feather-2.4.2.ebuild b/net-p2p/feather/feather-2.4.2.ebuild
deleted file mode 100644
index 54dbc41f48..0000000000
--- a/net-p2p/feather/feather-2.4.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake desktop xdg
-
-SINGLEAPPLICATION_DIST_COMIT="3e8e85d1a487e433751711a8a090659684d42e3b"
-MONERO_DIST_COMIT="72519d14203061b59191144ee8cab736bc88b978"
-	MINIUPNP_DIST_COMIT="544e6fcc73c5ad9af48a8985c94f0f1d742ef2e0"
-	RANDOMX_DIST_COMIT="261d58c77fc5547c0aa7fdfeb58421ba7e0e6e1c"
-	RAPIDJSON_DIST_COMIT="129d19ba7f496df5e33658527a7158c79b99c21c"
-	SUPERCOP_DIST_COMIT="633500ad8c8759995049ccd022107d1fa8a1bbc9"
-	TREZORCOMMON_DIST_COMIT="bff7fdfe436c727982cc553bdfb29a9021b423b0"
-
-DESCRIPTION="A free, open-source Monero wallet"
-HOMEPAGE="https://featherwallet.org"
-SRC_URI="https://github.com/feather-wallet/feather/archive/refs/tags/${PV}.tar.gz -> \
-${P}.tar.gz
-	https://github.com/itay-grudev/SingleApplication/archive/${SINGLEAPPLICATION_DIST_COMIT}.tar.gz -> \
-${P}-singleapplication.tar.gz
-	https://github.com/feather-wallet/monero/archive/${MONERO_DIST_COMIT}.tar.gz -> \
-${P}-monero.tar.gz
-	https://github.com/miniupnp/miniupnp/archive/${MINIUPNP_DIST_COMIT}.tar.gz -> \
-${P}-monero-miniupnp.tar.gz
-	https://github.com/tevador/RandomX/archive/${RANDOMX_DIST_COMIT}.tar.gz -> \
-${P}-monero-randomx.tar.gz
-	https://github.com/Tencent/rapidjson/archive/${RAPIDJSON_DIST_COMIT}.tar.gz -> \
-${P}-monero-rapidjson.tar.gz
-	https://github.com/monero-project/supercop/archive/${SUPERCOP_DIST_COMIT}.tar.gz -> \
-${P}-monero-supercop.tar.gz
-	https://github.com/trezor/trezor-common/archive/${TREZORCOMMON_DIST_COMIT}.tar.gz -> \
-${P}-monero-trezorcommon.tar.gz
-"
-
-# Feather is released under the terms of the BSD license, but it vendors
-# code from Monero and Tor too.
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="qrcode xmrig localmonero"
-
-DEPEND="
-	dev-libs/libsodium:=
-	media-gfx/qrencode:=
-	media-gfx/zbar:=[v4l]
-	=dev-libs/polyseed-1.0.0
-	dev-libs/libzip:=
-	dev-libs/boost:=[nls]
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtnetwork-5.15:5
-	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtxml-5.15:5
-	>=dev-qt/qtwebsockets-5.15:5
-	>=dev-qt/qtmultimedia-5.15:5[widgets]
-	>=dev-qt/qtconcurrent-5.15:5
-	dev-libs/libgcrypt:=
-	sys-libs/zlib
-	dev-libs/openssl:=
-	net-dns/unbound:=[threads]
-	net-libs/czmq:=
-"
-RDEPEND="
-	${DEPEND}
-	net-vpn/tor
-	xmrig? ( net-misc/xmrig )
-"
-BDEPEND="virtual/pkgconfig"
-
-src_unpack() {
-	unpack ${P}.tar.gz \
-		${P}-singleapplication.tar.gz \
-		${P}-monero.tar.gz \
-		${P}-monero-miniupnp.tar.gz \
-		${P}-monero-randomx.tar.gz \
-		${P}-monero-rapidjson.tar.gz \
-		${P}-monero-supercop.tar.gz \
-		${P}-monero-trezorcommon.tar.gz
-	mv -T "${WORKDIR}"/SingleApplication-${SINGLEAPPLICATION_DIST_COMIT} \
-		"${WORKDIR}"/${P}/src/third-party/singleapplication || die
-	mv -T "${WORKDIR}"/monero-${MONERO_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero || die
-	mv -T "${WORKDIR}"/miniupnp-${MINIUPNP_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/miniupnp || die
-	mv -T "${WORKDIR}"/RandomX-${RANDOMX_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/randomx || die
-	mv -T "${WORKDIR}"/rapidjson-${RAPIDJSON_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/rapidjson || die
-	mv -T "${WORKDIR}"/supercop-${SUPERCOP_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/supercop || die
-	mv -T "${WORKDIR}"/trezor-common-${TREZORCOMMON_DIST_COMIT} \
-		"${WORKDIR}"/${P}/monero/external/trezor-common || die
-}
-
-src_prepare() {
-	default
-	echo "#define FEATHER_VERSION \"${PV}\"" > "${WORKDIR}"/${PF}/src/config-feather.h || die
-	echo "#define TOR_VERSION \"NOT_EMBEDDED\"" >> "${WORKDIR}"/${PF}/src/config-feather.h || die
-	eapply "${FILESDIR}"/feather_remove_cflags-${PV}.patch
-	pushd monero || die
-		eapply "${FILESDIR}"/monero_remove_cflags-${PV}.patch
-	popd || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_BUILD_TYPE=Release
-		-DBUILD_SHARED_LIBS=OFF
-		-DARCH=x86-64
-		-DBUILD_TAG="linux-x64"
-		-DBUILD_64=ON
-		-DSELF_CONTAINED=OFF
-		-DLOCALMONERO=$(usex localmonero)
-		-DXMRIG=$(usex xmrig)
-		-DCHECK_UPDATES=OFF
-		-DPLATFORM_INSTALLER=OFF
-		-DUSE_DEVICE_TREZOR=OFF
-		-DDONATE_BEG=OFF
-		-DWITH_SCANNER=$(usex qrcode)
-	)
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_build feather
-}
-
-src_install() {
-	dobin "${BUILD_DIR}/bin/feather"
-
-	doicon "${WORKDIR}"/${PF}/src/assets/images/feather.png
-	domenu "${WORKDIR}"/${PF}/src/assets/feather.desktop
-}
-
-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/files/feather_remove_cflags-2.4.2.patch b/net-p2p/feather/files/feather_remove_cflags-2.4.2.patch
deleted file mode 100644
index a3dbbb06ee..0000000000
--- a/net-p2p/feather/files/feather_remove_cflags-2.4.2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -262,12 +262,8 @@
- add_c_flag_if_supported(-fPIC C_SECURITY_FLAGS)
- add_cxx_flag_if_supported(-fPIC CXX_SECURITY_FLAGS)
-
--message(STATUS "Using C security hardening flags: ${C_SECURITY_FLAGS}")
--message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
--message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
--
--set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${C_SECURITY_FLAGS}")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${CXX_SECURITY_FLAGS}")
--set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${STATIC_FLAGS}")
-+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 -Wa,--noexecstack")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wa,--noexecstack")
-+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack ${STATIC_FLAGS}")
-
- add_subdirectory(src)
diff --git a/net-p2p/feather/files/monero_add_some_includes-2.2.3.patch b/net-p2p/feather/files/monero_add_some_includes-2.2.3.patch
deleted file mode 100644
index d048d13de2..0000000000
--- a/net-p2p/feather/files/monero_add_some_includes-2.2.3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
-index e00421f873e..da144aca403 100644
---- a/src/common/dns_utils.cpp
-+++ b/src/common/dns_utils.cpp
-@@ -30,6 +30,8 @@
- // check local first (in the event of static or in-source compilation of libunbound)
- #include "unbound.h"
- 
-+#include <deque>
-+#include <set>
- #include <stdlib.h>
- #include "include_base_utils.h"
- #include "common/threadpool.h"
-diff --git a/src/common/threadpool.h b/src/common/threadpool.h
-index 53421e18b30..fcf8ca9455a 100644
---- a/src/common/threadpool.h
-+++ b/src/common/threadpool.h
-@@ -31,6 +31,7 @@
- #include <boost/thread/mutex.hpp>
- #include <boost/thread/thread.hpp>
- #include <cstddef>
-+#include <deque>
- #include <functional>
- #include <utility>
- #include <vector>
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch b/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch
deleted file mode 100644
index 23360c8179..0000000000
--- a/net-p2p/feather/files/monero_remove_cflags-2.2.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -773,8 +773,6 @@
-     message(STATUS "AES support disabled")
-   endif()
-
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
-
-   set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
-   if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-@@ -901,9 +899,9 @@
-   message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
-   message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
-
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
--  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-
-   # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
-   # is fixed in the code (Issue #847), force compiler to be conservative.
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch b/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch
deleted file mode 100644
index 869a7bdc85..0000000000
--- a/net-p2p/feather/files/monero_remove_cflags-2.3.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -773,9 +773,6 @@
-     message(STATUS "AES support disabled")
-   endif()
- 
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
--
-   set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
-   if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     if(ARM)
-@@ -901,9 +898,9 @@
-   message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
-   message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
- 
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
--  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
- 
-   # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
-   # is fixed in the code (Issue #847), force compiler to be conservative.
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.4.1_pre20230301.patch b/net-p2p/feather/files/monero_remove_cflags-2.4.1_pre20230301.patch
deleted file mode 100644
index 869a7bdc85..0000000000
--- a/net-p2p/feather/files/monero_remove_cflags-2.4.1_pre20230301.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -773,9 +773,6 @@
-     message(STATUS "AES support disabled")
-   endif()
- 
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
--
-   set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
-   if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     if(ARM)
-@@ -901,9 +898,9 @@
-   message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
-   message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
- 
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
--  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
- 
-   # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
-   # is fixed in the code (Issue #847), force compiler to be conservative.
diff --git a/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch b/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch
deleted file mode 100644
index 869a7bdc85..0000000000
--- a/net-p2p/feather/files/monero_remove_cflags-2.4.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -773,9 +773,6 @@
-     message(STATUS "AES support disabled")
-   endif()
- 
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARCH_FLAG}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARCH_FLAG}")
--
-   set(WARNINGS "-Wall -Wextra -Wpointer-arith -Wundef -Wvla -Wwrite-strings -Wno-error=extra -Wno-error=deprecated-declarations -Wno-unused-parameter -Wno-error=unused-variable -Wno-error=undef -Wno-error=uninitialized")
-   if(CMAKE_C_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-     if(ARM)
-@@ -901,9 +898,9 @@
-   message(STATUS "Using C++ security hardening flags: ${CXX_SECURITY_FLAGS}")
-   message(STATUS "Using linker security hardening flags: ${LD_SECURITY_FLAGS}")
- 
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG} ${C_SECURITY_FLAGS}")
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG} ${CXX_SECURITY_FLAGS}")
--  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_SECURITY_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_FLAG} ${WARNINGS} ${C_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GNU_SOURCE ${MINGW_FLAG} ${STATIC_ASSERT_CPP_FLAG} ${WARNINGS} ${CXX_WARNINGS} ${PIC_FLAG}")
-+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LD_BACKCOMPAT_FLAGS}")
- 
-   # With GCC 6.1.1 the compiled binary malfunctions due to aliasing. Until that
-   # is fixed in the code (Issue #847), force compiler to be conservative.

From 2054f998970f37a58100d432823d005103aed4db Mon Sep 17 00:00:00 2001
From: Julien Roy <julien@jroy.ca>
Date: Thu, 17 Aug 2023 12:27:44 -0400
Subject: [PATCH 05/16] www-client/nyxt: add 3.6.0

Signed-off-by: Julien Roy <julien@jroy.ca>
---
 www-client/nyxt/Manifest          |   1 +
 www-client/nyxt/nyxt-3.6.0.ebuild | 100 ++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 www-client/nyxt/nyxt-3.6.0.ebuild

diff --git a/www-client/nyxt/Manifest b/www-client/nyxt/Manifest
index 9296ff512b..283b04dd43 100644
--- a/www-client/nyxt/Manifest
+++ b/www-client/nyxt/Manifest
@@ -1,2 +1,3 @@
 DIST nyxt-3.3.0.gh.tar.xz 16742852 BLAKE2B 7c3b35cd8129dbe67da68595e31466965677235904dc9b924dcf5a8299b89b683b51b80abf1c52eac109837d5c299e3b27c74016965b04f0b5195566a6a937d4 SHA512 9dbd5808a4563f91920a4bdaaef24d5e9bd254979b8e962cae1508f7686fad8957aec7da0540b4abbcdfda7dd5c1e3f205dbf9b7141de5a4df4a9521c0af3815
 DIST nyxt-3.4.0.gh.tar.xz 16745700 BLAKE2B 7a611f594d1267101a1e0083092da58db48e167045b94dc063c23bb95e837e568388154dfd78d7f52876a41b16863a6c14d2e6c654f5ee61a91eaf1acf863fd1 SHA512 e104219f6e7f69e8fd51a5a07280924d9ba1703a9c1661acf80f6158b0c4262f32b80d760cf08b269e2e18ae9727fed0d59451a53bb1f175042a68fd686807ed
+DIST nyxt-3.6.0.gh.tar.xz 17424780 BLAKE2B 8a42263ddd0d000587f934a7dde6074d728bedf267bbf363ab5ab75e0e773fb9c6d506e7218dfa8219e140a0c757125323d4448c720a933952f65d5b6128714f SHA512 f8bd0437a8afa275f1c885b35c9c88f55a1f1fe6299e9ecdd9496c09ace7673b80b92511a22b2cb1eef738696847319309883bb3df18e91980b071a16e1b7893
diff --git a/www-client/nyxt/nyxt-3.6.0.ebuild b/www-client/nyxt/nyxt-3.6.0.ebuild
new file mode 100644
index 0000000000..5ef18c896a
--- /dev/null
+++ b/www-client/nyxt/nyxt-3.6.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature xdg-utils
+
+DESCRIPTION="Nyxt - the hacker's power-browser"
+HOMEPAGE="https://nyxt.atlas.engineer/"
+
+if [[ "${PV}" = *9999* ]]
+then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/atlas-engineer/${PN}.git"
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/atlas-engineer/${PN}/releases/download/${PV}/nyxt-${PV}-source-with-submodules.tar.xz -> ${PF}.gh.tar.xz"
+fi
+
+# Portage replaces the nyxt binary with scbl when stripping
+RESTRICT="mirror strip"
+
+LICENSE="BSD CC-BY-SA-3.0"
+SLOT="0"
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/gobject-introspection
+	gnome-base/gsettings-desktop-schemas
+	media-libs/gst-plugins-bad
+	media-libs/gst-plugins-base
+	media-libs/gst-plugins-good
+	media-libs/gst-plugins-ugly
+	media-plugins/gst-plugins-libav
+	net-libs/glib-networking
+	net-libs/webkit-gtk:4.1
+	sys-libs/libfixposix
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lisp/sbcl-2.0.0
+"
+
+src_unpack() {
+	default
+
+	# nyxt-3-source-with-submodules.tar.xz doesn't unpack in a subdirectory
+	# so we create it instead of working directly in ${WORKDIR}
+	if [[ "${PV}" != *9999* ]]
+	then
+		mkdir "${WORKDIR}/${P}" || die
+		mv "${WORKDIR}/assets" "${WORKDIR}/${P}/" || die
+		mv "${WORKDIR}/_build" "${WORKDIR}/${P}/" || die
+		mv "${WORKDIR}/build-scripts" "${WORKDIR}/${P}/" || die
+		mv "${WORKDIR}/documents" "${WORKDIR}/${P}/" || die
+		mv "${WORKDIR}/engineer.atlas.Nyxt.yaml" "${WORKDIR}/${P}/" || die
+		mv "${WORKDIR}/examples" "${WORKDIR}/${P}/" || die
+		mv "${WORKDIR}/INSTALL" "${WORKDIR}/${P}/" || die
+		mv "${WORKDIR}/libraries" "${WORKDIR}/${P}/" || die
+		mv "${WORKDIR}/licenses" "${WORKDIR}/${P}/" || die
+		mv "${WORKDIR}/makefile" "${WORKDIR}/${P}/" || die
+		mv "${WORKDIR}/nyxt.asd" "${WORKDIR}/${P}/" || die
+		mv "${WORKDIR}/README.org" "${WORKDIR}/${P}/" || die
+		mv "${WORKDIR}/source" "${WORKDIR}/${P}/" || die
+		mv "${WORKDIR}/tests" "${WORKDIR}/${P}/" || die
+	fi
+}
+
+src_compile() {
+	emake all
+	use doc && emake doc
+}
+
+src_install(){
+	dobin "${S}/nyxt"
+
+	if [ "$(use doc)" ]
+	then
+		docinto "/usr/share/doc/${P}"
+		dodoc "${S}/manual.html"
+	fi
+
+	newicon -s 512 "${S}/assets/nyxt_512x512.png" nyxt.png
+	domenu "${S}/assets/nyxt.desktop"
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	optfeature "for X11 clipboard support" "x11-misc/xclip"
+	optfeature "for spellchecking" "app-text/enchant"
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}

From 043a9017d67ef6035257e5d7a896b62c4a0e49ad Mon Sep 17 00:00:00 2001
From: Julien Roy <julien@jroy.ca>
Date: Thu, 17 Aug 2023 12:29:15 -0400
Subject: [PATCH 06/16] dev-python/portion: add 2.4.1

Signed-off-by: Julien Roy <julien@jroy.ca>
---
 dev-python/portion/Manifest             |  1 +
 dev-python/portion/portion-2.4.1.ebuild | 29 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 dev-python/portion/portion-2.4.1.ebuild

diff --git a/dev-python/portion/Manifest b/dev-python/portion/Manifest
index ec68e532a3..6807c005cd 100644
--- a/dev-python/portion/Manifest
+++ b/dev-python/portion/Manifest
@@ -1 +1,2 @@
 DIST portion-2.4.0.tar.gz 52866 BLAKE2B 5ce5d1ce35f5847eef1e7192eb04195e2c2ec25dfccee18b63073dd00d9950d1acd0b346e07dfbfbc5e09f9d5ac557066739e8d1da3c992b4b0d73965692e61f SHA512 6134fb5d32c08f5424f65ce88f721f93deaedcae9a7b5fa7380eb27dadf83f7df9b22c8577b9d1c54409dd7d3ae91f11d88214d4d8146682fcdf0f1a0a26d8a4
+DIST portion-2.4.1.tar.gz 52894 BLAKE2B bdb5c387c9ab6ee0fec9e4aea71be40a51cc1f9be6f40b1f71389947e6e60f84c7f2a89e0d617923b835e72e524b80f8f2fbcdb14895a5307d09ee3d67fd01f0 SHA512 72181519dcadae036025be36fde63bd70ab7e7fa448400dd91e639e8eef5bc70b2ad490cd48a882d1b2be0cdc04f57cd63de44690181462f31afe771108f5c51
diff --git a/dev-python/portion/portion-2.4.1.ebuild b/dev-python/portion/portion-2.4.1.ebuild
new file mode 100644
index 0000000000..6ad18e5235
--- /dev/null
+++ b/dev-python/portion/portion-2.4.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A Python library providing data structure and operations for intervals."
+HOMEPAGE="https://github.com/AlexandreDecan/portion"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/black[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest

From d3968bbcb3f98a1885149a0bb48adc0cf434d6eb Mon Sep 17 00:00:00 2001
From: Julien Roy <julien@jroy.ca>
Date: Thu, 17 Aug 2023 12:32:21 -0400
Subject: [PATCH 07/16] www-client/nyxt: drop 3.3.0

Signed-off-by: Julien Roy <julien@jroy.ca>
---
 www-client/nyxt/Manifest          |   1 -
 www-client/nyxt/nyxt-3.3.0.ebuild | 100 ------------------------------
 2 files changed, 101 deletions(-)
 delete mode 100644 www-client/nyxt/nyxt-3.3.0.ebuild

diff --git a/www-client/nyxt/Manifest b/www-client/nyxt/Manifest
index 283b04dd43..897d03c170 100644
--- a/www-client/nyxt/Manifest
+++ b/www-client/nyxt/Manifest
@@ -1,3 +1,2 @@
-DIST nyxt-3.3.0.gh.tar.xz 16742852 BLAKE2B 7c3b35cd8129dbe67da68595e31466965677235904dc9b924dcf5a8299b89b683b51b80abf1c52eac109837d5c299e3b27c74016965b04f0b5195566a6a937d4 SHA512 9dbd5808a4563f91920a4bdaaef24d5e9bd254979b8e962cae1508f7686fad8957aec7da0540b4abbcdfda7dd5c1e3f205dbf9b7141de5a4df4a9521c0af3815
 DIST nyxt-3.4.0.gh.tar.xz 16745700 BLAKE2B 7a611f594d1267101a1e0083092da58db48e167045b94dc063c23bb95e837e568388154dfd78d7f52876a41b16863a6c14d2e6c654f5ee61a91eaf1acf863fd1 SHA512 e104219f6e7f69e8fd51a5a07280924d9ba1703a9c1661acf80f6158b0c4262f32b80d760cf08b269e2e18ae9727fed0d59451a53bb1f175042a68fd686807ed
 DIST nyxt-3.6.0.gh.tar.xz 17424780 BLAKE2B 8a42263ddd0d000587f934a7dde6074d728bedf267bbf363ab5ab75e0e773fb9c6d506e7218dfa8219e140a0c757125323d4448c720a933952f65d5b6128714f SHA512 f8bd0437a8afa275f1c885b35c9c88f55a1f1fe6299e9ecdd9496c09ace7673b80b92511a22b2cb1eef738696847319309883bb3df18e91980b071a16e1b7893
diff --git a/www-client/nyxt/nyxt-3.3.0.ebuild b/www-client/nyxt/nyxt-3.3.0.ebuild
deleted file mode 100644
index 5ef18c896a..0000000000
--- a/www-client/nyxt/nyxt-3.3.0.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop optfeature xdg-utils
-
-DESCRIPTION="Nyxt - the hacker's power-browser"
-HOMEPAGE="https://nyxt.atlas.engineer/"
-
-if [[ "${PV}" = *9999* ]]
-then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/atlas-engineer/${PN}.git"
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/atlas-engineer/${PN}/releases/download/${PV}/nyxt-${PV}-source-with-submodules.tar.xz -> ${PF}.gh.tar.xz"
-fi
-
-# Portage replaces the nyxt binary with scbl when stripping
-RESTRICT="mirror strip"
-
-LICENSE="BSD CC-BY-SA-3.0"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	gnome-base/gsettings-desktop-schemas
-	media-libs/gst-plugins-bad
-	media-libs/gst-plugins-base
-	media-libs/gst-plugins-good
-	media-libs/gst-plugins-ugly
-	media-plugins/gst-plugins-libav
-	net-libs/glib-networking
-	net-libs/webkit-gtk:4.1
-	sys-libs/libfixposix
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lisp/sbcl-2.0.0
-"
-
-src_unpack() {
-	default
-
-	# nyxt-3-source-with-submodules.tar.xz doesn't unpack in a subdirectory
-	# so we create it instead of working directly in ${WORKDIR}
-	if [[ "${PV}" != *9999* ]]
-	then
-		mkdir "${WORKDIR}/${P}" || die
-		mv "${WORKDIR}/assets" "${WORKDIR}/${P}/" || die
-		mv "${WORKDIR}/_build" "${WORKDIR}/${P}/" || die
-		mv "${WORKDIR}/build-scripts" "${WORKDIR}/${P}/" || die
-		mv "${WORKDIR}/documents" "${WORKDIR}/${P}/" || die
-		mv "${WORKDIR}/engineer.atlas.Nyxt.yaml" "${WORKDIR}/${P}/" || die
-		mv "${WORKDIR}/examples" "${WORKDIR}/${P}/" || die
-		mv "${WORKDIR}/INSTALL" "${WORKDIR}/${P}/" || die
-		mv "${WORKDIR}/libraries" "${WORKDIR}/${P}/" || die
-		mv "${WORKDIR}/licenses" "${WORKDIR}/${P}/" || die
-		mv "${WORKDIR}/makefile" "${WORKDIR}/${P}/" || die
-		mv "${WORKDIR}/nyxt.asd" "${WORKDIR}/${P}/" || die
-		mv "${WORKDIR}/README.org" "${WORKDIR}/${P}/" || die
-		mv "${WORKDIR}/source" "${WORKDIR}/${P}/" || die
-		mv "${WORKDIR}/tests" "${WORKDIR}/${P}/" || die
-	fi
-}
-
-src_compile() {
-	emake all
-	use doc && emake doc
-}
-
-src_install(){
-	dobin "${S}/nyxt"
-
-	if [ "$(use doc)" ]
-	then
-		docinto "/usr/share/doc/${P}"
-		dodoc "${S}/manual.html"
-	fi
-
-	newicon -s 512 "${S}/assets/nyxt_512x512.png" nyxt.png
-	domenu "${S}/assets/nyxt.desktop"
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	optfeature "for X11 clipboard support" "x11-misc/xclip"
-	optfeature "for spellchecking" "app-text/enchant"
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}

From 815b00e1c01965c8a07d52dd9baa0c056541adf8 Mon Sep 17 00:00:00 2001
From: Julien Roy <julien@jroy.ca>
Date: Thu, 17 Aug 2023 12:36:55 -0400
Subject: [PATCH 08/16] gui-apps/hyprpaper: add 0.4.0

Signed-off-by: Julien Roy <julien@jroy.ca>
---
 gui-apps/hyprpaper/Manifest               |  1 +
 gui-apps/hyprpaper/hyprpaper-0.4.0.ebuild | 34 +++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 gui-apps/hyprpaper/hyprpaper-0.4.0.ebuild

diff --git a/gui-apps/hyprpaper/Manifest b/gui-apps/hyprpaper/Manifest
index 7169accbc4..14f55d0192 100644
--- a/gui-apps/hyprpaper/Manifest
+++ b/gui-apps/hyprpaper/Manifest
@@ -1,2 +1,3 @@
 DIST hyprpaper-0.2.0.gh.tar.gz 26200 BLAKE2B b55e6ccb9bff431a411dfa5c6b43176804b4c89d2b048453830ed3a746c2b71739ba518306a38b0f07ad4885b06e104a9c86e55564a6aeede7f8900b81bf34a3 SHA512 f6f8d117bbf52e8f353cf2b3d9dee3b3e1fae1f6bab78f9bdbd437c403696fab615c3c4ef8acc818b585937e8adf1a4b7c7efd3b390e06a8d38ad4888f4e0da5
 DIST hyprpaper-0.3.0.gh.tar.gz 26787 BLAKE2B 114ef9c68372a4081035282c1826d66fdb5306eea18e91663dd31645bcb6972d1fd7ad913b0c1f452001025f6c54b5dd8cefbb634702a4440901102822b5a82d SHA512 6b1ccdc7257db89f435c0d4b4afb6f42a46f9d0635d211d4c0408d6a801c4438eecad53a512e5ea51a768e883e4e446b8a8efdca4b1336dc51499e586cbe070f
+DIST hyprpaper-0.4.0.gh.tar.gz 27092 BLAKE2B f7e10edf6e4f0f23476d872f77c7c4a69e2f563ad0ab30cadc0195a3be7431eb50be5ed53db24087d38a2de4c524e3010396ca59664d022b7b43748a394f2031 SHA512 cdd8aba060ecbe7e0ec5680f285d8fa06cd6cc429251351ac62e4d50b5ac1767b420d64ec6d0ac4a14f877847158b3795f84be0a99e70babbe1c2a6bb285723c
diff --git a/gui-apps/hyprpaper/hyprpaper-0.4.0.ebuild b/gui-apps/hyprpaper/hyprpaper-0.4.0.ebuild
new file mode 100644
index 0000000000..8e1fa582b4
--- /dev/null
+++ b/gui-apps/hyprpaper/hyprpaper-0.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="A blazing fast wayland wallpaper utility"
+HOMEPAGE="https://github.com/hyprwm/hyprpaper"
+SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	dev-libs/wayland
+	dev-libs/wayland-protocols
+	dev-util/cmake
+	dev-util/wayland-scanner
+	media-libs/libglvnd
+	media-libs/libjpeg-turbo
+	x11-libs/cairo
+	x11-libs/pango
+"
+
+src_compile() {
+	emake protocols
+	cmake_src_compile
+}
+
+src_install() {
+	dobin "${BUILD_DIR}/${PN}"
+}

From 9e1b2edc3d3a7a1c52d6247b1e45aea237de1bff Mon Sep 17 00:00:00 2001
From: Julien Roy <julien@jroy.ca>
Date: Thu, 17 Aug 2023 12:37:07 -0400
Subject: [PATCH 09/16] gui-apps/hyprpaper: drop 0.2.0-r1

Signed-off-by: Julien Roy <julien@jroy.ca>
---
 gui-apps/hyprpaper/Manifest                  |  1 -
 gui-apps/hyprpaper/hyprpaper-0.2.0-r1.ebuild | 34 --------------------
 2 files changed, 35 deletions(-)
 delete mode 100644 gui-apps/hyprpaper/hyprpaper-0.2.0-r1.ebuild

diff --git a/gui-apps/hyprpaper/Manifest b/gui-apps/hyprpaper/Manifest
index 14f55d0192..f48bb29cdc 100644
--- a/gui-apps/hyprpaper/Manifest
+++ b/gui-apps/hyprpaper/Manifest
@@ -1,3 +1,2 @@
-DIST hyprpaper-0.2.0.gh.tar.gz 26200 BLAKE2B b55e6ccb9bff431a411dfa5c6b43176804b4c89d2b048453830ed3a746c2b71739ba518306a38b0f07ad4885b06e104a9c86e55564a6aeede7f8900b81bf34a3 SHA512 f6f8d117bbf52e8f353cf2b3d9dee3b3e1fae1f6bab78f9bdbd437c403696fab615c3c4ef8acc818b585937e8adf1a4b7c7efd3b390e06a8d38ad4888f4e0da5
 DIST hyprpaper-0.3.0.gh.tar.gz 26787 BLAKE2B 114ef9c68372a4081035282c1826d66fdb5306eea18e91663dd31645bcb6972d1fd7ad913b0c1f452001025f6c54b5dd8cefbb634702a4440901102822b5a82d SHA512 6b1ccdc7257db89f435c0d4b4afb6f42a46f9d0635d211d4c0408d6a801c4438eecad53a512e5ea51a768e883e4e446b8a8efdca4b1336dc51499e586cbe070f
 DIST hyprpaper-0.4.0.gh.tar.gz 27092 BLAKE2B f7e10edf6e4f0f23476d872f77c7c4a69e2f563ad0ab30cadc0195a3be7431eb50be5ed53db24087d38a2de4c524e3010396ca59664d022b7b43748a394f2031 SHA512 cdd8aba060ecbe7e0ec5680f285d8fa06cd6cc429251351ac62e4d50b5ac1767b420d64ec6d0ac4a14f877847158b3795f84be0a99e70babbe1c2a6bb285723c
diff --git a/gui-apps/hyprpaper/hyprpaper-0.2.0-r1.ebuild b/gui-apps/hyprpaper/hyprpaper-0.2.0-r1.ebuild
deleted file mode 100644
index 8e1fa582b4..0000000000
--- a/gui-apps/hyprpaper/hyprpaper-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="A blazing fast wayland wallpaper utility"
-HOMEPAGE="https://github.com/hyprwm/hyprpaper"
-SRC_URI="https://github.com/hyprwm/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-BDEPEND="
-	dev-libs/wayland
-	dev-libs/wayland-protocols
-	dev-util/cmake
-	dev-util/wayland-scanner
-	media-libs/libglvnd
-	media-libs/libjpeg-turbo
-	x11-libs/cairo
-	x11-libs/pango
-"
-
-src_compile() {
-	emake protocols
-	cmake_src_compile
-}
-
-src_install() {
-	dobin "${BUILD_DIR}/${PN}"
-}

From ad79b032ba063ccb94db6afb88ff18d00436a59e Mon Sep 17 00:00:00 2001
From: Julien Roy <julien@jroy.ca>
Date: Thu, 17 Aug 2023 12:46:49 -0400
Subject: [PATCH 10/16] net-im/heisenbridge: add 1.14.5

Signed-off-by: Julien Roy <julien@jroy.ca>
---
 net-im/heisenbridge/Manifest                  |  1 +
 .../heisenbridge/heisenbridge-1.14.5.ebuild   | 60 +++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 net-im/heisenbridge/heisenbridge-1.14.5.ebuild

diff --git a/net-im/heisenbridge/Manifest b/net-im/heisenbridge/Manifest
index 3fa0c7a26c..373f3f9274 100644
--- a/net-im/heisenbridge/Manifest
+++ b/net-im/heisenbridge/Manifest
@@ -1 +1,2 @@
 DIST heisenbridge-1.14.2.gh.tar.gz 67778 BLAKE2B 50b1fbd76f4bec3a75198735b68762453f1c0b54b29e77024920c11f38218ff464faff086f74b3db0d8251b943dcae43a41189582dab7335930fbcd5e6658b2e SHA512 2ba51f3786aea5d0f4e743db4a9196d800103d96ad68cd37009c2e82a3bde27eff8233e473c74aca0ccd1d64521a5e0a99337a3c6e97008e1800ff099be6499f
+DIST heisenbridge-1.14.5.gh.tar.gz 68042 BLAKE2B e959762bfe1180b2bd66f71bca04c8eccafd61551a1cb6664acf4d5bf8b835488511178e1bbad2b59c45c38ba913e8ee010e4c6fe390b8ca29715f853de01d16 SHA512 eaee99415796b898caed6f31207081fd70a5d7d437c722bfd3e54924c20cfabff854b0f4a8118320375d29c42f045dc67bd4c5ccaea247bc3e22d71f75f616dc
diff --git a/net-im/heisenbridge/heisenbridge-1.14.5.ebuild b/net-im/heisenbridge/heisenbridge-1.14.5.ebuild
new file mode 100644
index 0000000000..d8c2d4edbd
--- /dev/null
+++ b/net-im/heisenbridge/heisenbridge-1.14.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="A bouncer-style Matrix IRC bridge"
+HOMEPAGE="https://github.com/hifi/heisenbridge/"
+SRC_URI="https://github.com/hifi/heisenbridge/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/${PN}
+	dev-python/irc[${PYTHON_USEDEP}]
+	dev-python/mautrix[${PYTHON_USEDEP}]
+	dev-python/python-socks[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/heisenbridge-1.14.1-qanotice.patch"
+)
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	newinitd "${FILESDIR}/heisenbridge.initd" "${PN}"
+	newconfd "${FILESDIR}/heisenbridge.confd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	einfo
+	elog "Before you can use ${PN}, you must configure it correctly"
+	elog "The configuration file is located at /etc/conf.d/${PN}"
+	elog "Then, you must generate the registration file using the following command"
+	elog "If you are using synapse:"
+	elog "/usr/bin/python -m ${PN} -c /var/lib/${PN}/registration.yaml --generate https://example.com"
+	elog "If you are using Dendrite, Conduit or others:"
+	elog "/usr/bin/python -m ${PN} -c /var/lib/${PN}/registration.yaml --generate-compat https://example.com"
+	elog "Notice the URL at the end, replace it with your homeserver's URL"
+	elog "Then, you must register the bridge with your homeserver"
+	elog "Refer to your homeserver's documentation for instructions"
+	elog "The registration file is located at /var/lib/${PN}/registration.yaml"
+	elog "Finally, you may start the ${PN} daemon"
+	einfo
+
+}

From 66ed522c3e97dbf50781c29a9ae73d4b992a1bfe Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Thu, 17 Aug 2023 22:28:16 +0200
Subject: [PATCH 11/16] games-emulation/duckstation: Assign myself as
 maintainer

This ebuild has been broken for quite a while, notably due to the
Qt5 to Qt6 migration and hasn't seen activity since 2021.

Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
---
 games-emulation/duckstation/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-emulation/duckstation/metadata.xml b/games-emulation/duckstation/metadata.xml
index b5b6b11216..c036224ef1 100644
--- a/games-emulation/duckstation/metadata.xml
+++ b/games-emulation/duckstation/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>myrvogna@electrosphe.re</email>
-		<name>Octiabrina Terrien-Puig</name>
+		<email>contact@hacktivis.me</email>
+		<name>Haelwenn (lanodan) Monnier</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">stenzek/duckstation</remote-id>

From 3cbffff4d177930d0dc750c7a9942152d859347b Mon Sep 17 00:00:00 2001
From: Alexander Barker <alex@1stleg.com>
Date: Sat, 8 Jul 2023 10:54:54 -0700
Subject: [PATCH 12/16] games-emulation/duckstation: Fix discord cmake flag and
 install filenames

Note from lanodan: While this commit isn't signed off properly, I believe it
is too small a change to be copyrightable anyway.

Closes: https://github.com/gentoo/guru/pull/99
Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
---
 .../duckstation/duckstation-9999.ebuild         | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/games-emulation/duckstation/duckstation-9999.ebuild b/games-emulation/duckstation/duckstation-9999.ebuild
index e6a8c28cfb..355e99caa9 100644
--- a/games-emulation/duckstation/duckstation-9999.ebuild
+++ b/games-emulation/duckstation/duckstation-9999.ebuild
@@ -50,7 +50,7 @@ src_configure() {
 		-DBUILD_NOGUI_FRONTEND=$(usex nogui)
 		-DBUILD_QT_FRONTEND=$(usex qt5)
 		-DENABLE_CHEEVOS=$(usex retroachievements)
-		–DENABLE_DISCORD_PRESENCE=$(usex discord)
+		-DENABLE_DISCORD_PRESENCE=$(usex discord)
 		-DUSE_DRMKMS=$(usex gbm)
 		-DUSE_EGL=$(usex egl)
 		-DUSE_EVDEV=$(usex evdev)
@@ -68,13 +68,12 @@ src_install() {
 
 	# Binary and resources files must be in same directory – installing in /opt
 	insinto /opt/${PN}
-	doins -r "${BUILD_DIR}"/bin/{database,inputprofiles,resources,shaders,translations}
+	doins -r "${BUILD_DIR}"/bin/resources
+	doins -r "${BUILD_DIR}"/bin/translations
 
 	if use nogui; then
-		for i in {16,32,48,64,128,256}; do
-			newicon -s ${i} extras/icons/icon-${i}px.png duckstation-nogui.png
-		done
-		domenu extras/linux-desktop-files/duckstation-nogui.desktop
+		newicon "${BUILD_DIR}"/bin/resources/images/duck.png duckstation-nogui.png
+		make_desktop_entry "${PN}-nogui %f" "DuckStation NoGUI" "${PN}-nogui" "Game"
 
 		doins "${BUILD_DIR}"/bin/duckstation-nogui
 		dosym ../../opt/${PN}/duckstation-nogui usr/bin/duckstation-nogui
@@ -82,10 +81,8 @@ src_install() {
 	fi
 
 	if use qt5; then
-		for i in {16,32,48,64,128,256}; do
-			newicon -s ${i} extras/icons/icon-${i}px.png duckstation-qt.png
-		done
-		domenu extras/linux-desktop-files/duckstation-qt.desktop
+		newicon "${BUILD_DIR}"/bin/resources/images/duck.png duckstation-qt.png
+		make_desktop_entry "${PN}-qt %f" "DuckStation Qt" "${PN}-qt" "Game"
 
 		doins "${BUILD_DIR}"/bin/duckstation-qt
 		dosym ../../opt/${PN}/duckstation-qt usr/bin/duckstation-qt

From a4727bcf53bb4d44a4bbe64d127ad6ab6f258f86 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Thu, 17 Aug 2023 22:37:53 +0200
Subject: [PATCH 13/16] games-emulation/duckstation: qt5 to qt6 migration, dbus
 flag, cubeb dep

Closes: https://bugs.gentoo.org/883721
Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
---
 .../duckstation/duckstation-9999.ebuild       | 23 +++++++++++--------
 games-emulation/duckstation/metadata.xml      |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/games-emulation/duckstation/duckstation-9999.ebuild b/games-emulation/duckstation/duckstation-9999.ebuild
index 355e99caa9..21c10a0bdb 100644
--- a/games-emulation/duckstation/duckstation-9999.ebuild
+++ b/games-emulation/duckstation/duckstation-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ EGIT_SUBMODULES=()
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="discord +egl +evdev fbdev +gamepad gbm +nogui qt5 retroachievements wayland X"
+IUSE="+dbus discord +egl +evdev fbdev +gamepad gbm +nogui qt6 retroachievements wayland X"
 
 # Either or both frontends must be built
 REQUIRED_USE="
@@ -27,13 +27,14 @@ BDEPEND="
 	wayland? ( kde-frameworks/extra-cmake-modules )
 "
 DEPEND="
+	media-libs/cubeb
 	evdev? ( dev-libs/libevdev )
+	dbus? ( sys-apps/dbus )
 	gamepad? ( media-libs/libsdl2 )
 	gbm? ( x11-libs/libdrm )
-	qt5? (
-			dev-qt/qtcore
-			dev-qt/qtgui
-			dev-qt/qtnetwork
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets]
+		dev-qt/qttools:6[linguist]
 	)
 	retroachievements? ( net-misc/curl[curl_ssl_gnutls] )
 	X? (
@@ -47,10 +48,12 @@ S="${WORKDIR}/${PN}"
 
 src_configure() {
 	local mycmakeargs=(
+		-DENABLE_CUBEB=ON
 		-DBUILD_NOGUI_FRONTEND=$(usex nogui)
-		-DBUILD_QT_FRONTEND=$(usex qt5)
+		-DBUILD_QT_FRONTEND=$(usex qt6)
 		-DENABLE_CHEEVOS=$(usex retroachievements)
 		-DENABLE_DISCORD_PRESENCE=$(usex discord)
+		-DUSE_DBUS=$(usex dbus)
 		-DUSE_DRMKMS=$(usex gbm)
 		-DUSE_EGL=$(usex egl)
 		-DUSE_EVDEV=$(usex evdev)
@@ -68,8 +71,7 @@ src_install() {
 
 	# Binary and resources files must be in same directory – installing in /opt
 	insinto /opt/${PN}
-	doins -r "${BUILD_DIR}"/bin/resources
-	doins -r "${BUILD_DIR}"/bin/translations
+	doins -r "${BUILD_DIR}"/bin/resources/
 
 	if use nogui; then
 		newicon "${BUILD_DIR}"/bin/resources/images/duck.png duckstation-nogui.png
@@ -80,10 +82,11 @@ src_install() {
 		fperms +x /opt/${PN}/duckstation-nogui
 	fi
 
-	if use qt5; then
+	if use qt6; then
 		newicon "${BUILD_DIR}"/bin/resources/images/duck.png duckstation-qt.png
 		make_desktop_entry "${PN}-qt %f" "DuckStation Qt" "${PN}-qt" "Game"
 
+		doins -r "${BUILD_DIR}"/bin/translations/
 		doins "${BUILD_DIR}"/bin/duckstation-qt
 		dosym ../../opt/${PN}/duckstation-qt usr/bin/duckstation-qt
 		fperms +x /opt/${PN}/duckstation-qt
diff --git a/games-emulation/duckstation/metadata.xml b/games-emulation/duckstation/metadata.xml
index c036224ef1..fbfcacde18 100644
--- a/games-emulation/duckstation/metadata.xml
+++ b/games-emulation/duckstation/metadata.xml
@@ -20,7 +20,7 @@
 		<flag name="gamepad">Link with SDL2 for controller support</flag>
 		<flag name="gbm">Support DRM/KMS OpenGL contexts</flag>
 		<flag name="nogui">Build the NoGUI frontend</flag>
-		<flag name="qt5">Build the QT frontend</flag>
+		<flag name="qt6">Build the QT frontend</flag>
 		<flag name="retroachievements">Build with RetroAchievements supports</flag>
 	</use>
 </pkgmetadata>

From 811c870c58b39051ea2387f4277df0c557430a61 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Fri, 18 Aug 2023 00:27:12 +0200
Subject: [PATCH 14/16] dev-libs/lexbor: add 2.3.0, drop 2.2.0

Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
---
 dev-libs/lexbor/Manifest                                     | 2 +-
 dev-libs/lexbor/{lexbor-2.2.0.ebuild => lexbor-2.3.0.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename dev-libs/lexbor/{lexbor-2.2.0.ebuild => lexbor-2.3.0.ebuild} (100%)

diff --git a/dev-libs/lexbor/Manifest b/dev-libs/lexbor/Manifest
index fa9d813659..09850cd04a 100644
--- a/dev-libs/lexbor/Manifest
+++ b/dev-libs/lexbor/Manifest
@@ -1 +1 @@
-DIST lexbor-2.2.0.tar.gz 2844872 BLAKE2B cc473a7509d3eaacfbcc5122f5f5517762529318bb3bfb725df7ad6f438347d5618882b03226c22664f4b76cea3dd51c55f4df2e73b8b0ae425719716047558f SHA512 26bbca3b41a417cbc59ba8cf736e1611966fc2202de85aabf621b840565d835e7e5ffc1b0294defc16ec883f9fb94e802bd19ed704be35fa79b41566acc05cbc
+DIST lexbor-2.3.0.tar.gz 4213726 BLAKE2B d0124822d5ada65495adf7db5323bdd7e73d92e33bd737aa13b337168129b653bddac7871f42ee3f81861e6ebb873a5bdf41bd4bbe0de0696e3c1c6e1db4c165 SHA512 add1832f2e1927538206329703cd717fb30cb6ae2f52e1a0042961062cbcafd2e3ce4437ee2081ad7b2d51c6b63b910be06987e47c4a7007321db52b2812e515
diff --git a/dev-libs/lexbor/lexbor-2.2.0.ebuild b/dev-libs/lexbor/lexbor-2.3.0.ebuild
similarity index 100%
rename from dev-libs/lexbor/lexbor-2.2.0.ebuild
rename to dev-libs/lexbor/lexbor-2.3.0.ebuild

From 665fde7e795577cd233303b0acd0dec6748b49be Mon Sep 17 00:00:00 2001
From: Viorel Munteanu <ceamac@gentoo.org>
Date: Fri, 18 Aug 2023 09:15:30 +0300
Subject: [PATCH 15/16] net-im/discord-canary-bin: add 0.0.166

Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
---
 net-im/discord-canary-bin/Manifest            |  1 +
 .../discord-canary-bin-0.0.166.ebuild         | 91 +++++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 net-im/discord-canary-bin/discord-canary-bin-0.0.166.ebuild

diff --git a/net-im/discord-canary-bin/Manifest b/net-im/discord-canary-bin/Manifest
index 587b2dcfa5..a468897ef3 100644
--- a/net-im/discord-canary-bin/Manifest
+++ b/net-im/discord-canary-bin/Manifest
@@ -1 +1,2 @@
 DIST discord-canary-0.0.165.deb 93798834 BLAKE2B f6011345d8cb07283c844e777ab8a5ee3e9e0050b5519e25c1e7194eefce403a6ceb2c74e8efcbd7aa34c51b66812ef74a138ebb729af1f4242c3d383ce1d9ef SHA512 4b295550079ed872e8a8c6be727057e6bddb6482f65113e9414a3b1c55adaaeb191605b49826496ad725b34db0ad7e6ca2b315cba91a54f3c099e1c66a5f8961
+DIST discord-canary-0.0.166.deb 93799190 BLAKE2B 8ca14d4bafc614cf823f18d135b0b6374b049b0c8da1295110b7fc0a91675f81797d1208c49d6536d768ed333124f96928ae0f5d4f0846e2c4968871c3433e6e SHA512 a7e64e082b8f8f3857131de26ea4e02cdb0e462c5d5cd2e02e74015d6a84cf7d664df970f2c742b8be72f0e0c0bbf38803cd407ce0e3310f32b546318f6a203a
diff --git a/net-im/discord-canary-bin/discord-canary-bin-0.0.166.ebuild b/net-im/discord-canary-bin/discord-canary-bin-0.0.166.ebuild
new file mode 100644
index 0000000000..8024346a71
--- /dev/null
+++ b/net-im/discord-canary-bin/discord-canary-bin-0.0.166.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=${PN/-bin/}
+MY_BIN="D${MY_PN/d/}"
+MY_BIN="${MY_BIN/-canary/}Canary"
+
+inherit desktop linux-info pax-utils unpacker xdg
+
+DESCRIPTION="All-in-one voice and text chat"
+HOMEPAGE="https://discord.com/"
+SRC_URI="https://dl-canary.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"
+S="${WORKDIR}"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="bindist mirror strip test"
+
+RDEPEND="
+	>=app-accessibility/at-spi2-core-2.46.0
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	sys-apps/util-linux
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libxkbcommon
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+"
+
+QA_PREBUILT="
+	opt/discord-canary/${MY_BIN}
+	opt/discord-canary/chrome_crashpad_handler
+	opt/discord-canary/chrome-sandbox
+	opt/discord-canary/libffmpeg.so
+	opt/discord-canary/libvk_swiftshader.so
+	opt/discord-canary/libvulkan.so
+	opt/discord-canary/libvulkan.so.1
+	opt/discord-canary/libEGL.so
+	opt/discord-canary/libGLESv2.so
+	opt/discord-canary/libVkICD_mock_icd.so
+	opt/discord-canary/swiftshader/libEGL.so
+	opt/discord-canary/swiftshader/libGLESv2.so
+	opt/discord-canary/swiftshader/libvk_swiftshader.so
+"
+
+CONFIG_CHECK="~USER_NS"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s:/usr/share/${MY_PN}/${MY_BIN}:/opt/${MY_PN}/${MY_BIN}:g" \
+		usr/share/${MY_PN}/${MY_PN}.desktop || die
+}
+
+src_install() {
+	newicon usr/share/${MY_PN}/${MY_PN//-canary/}.png ${MY_PN}.png
+	domenu usr/share/${MY_PN}/${MY_PN}.desktop
+
+	insinto /opt/${MY_PN}
+	doins -r usr/share/${MY_PN}/.
+	fperms +x /opt/${MY_PN}/${MY_BIN}
+	dosym ../../opt/${MY_PN}/${MY_BIN} usr/bin/${MY_PN}
+
+	pax-mark -m "${ED}"/opt/${MY_PN}/${MY_PN}
+}

From 61fa0e6d172f8855d5a757f82cd0cd8d37db7828 Mon Sep 17 00:00:00 2001
From: Viorel Munteanu <ceamac@gentoo.org>
Date: Fri, 18 Aug 2023 09:15:37 +0300
Subject: [PATCH 16/16] net-im/discord-canary-bin: drop 0.0.165

Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
---
 net-im/discord-canary-bin/Manifest            |  1 -
 .../discord-canary-bin-0.0.165.ebuild         | 91 -------------------
 2 files changed, 92 deletions(-)
 delete mode 100644 net-im/discord-canary-bin/discord-canary-bin-0.0.165.ebuild

diff --git a/net-im/discord-canary-bin/Manifest b/net-im/discord-canary-bin/Manifest
index a468897ef3..798b1be380 100644
--- a/net-im/discord-canary-bin/Manifest
+++ b/net-im/discord-canary-bin/Manifest
@@ -1,2 +1 @@
-DIST discord-canary-0.0.165.deb 93798834 BLAKE2B f6011345d8cb07283c844e777ab8a5ee3e9e0050b5519e25c1e7194eefce403a6ceb2c74e8efcbd7aa34c51b66812ef74a138ebb729af1f4242c3d383ce1d9ef SHA512 4b295550079ed872e8a8c6be727057e6bddb6482f65113e9414a3b1c55adaaeb191605b49826496ad725b34db0ad7e6ca2b315cba91a54f3c099e1c66a5f8961
 DIST discord-canary-0.0.166.deb 93799190 BLAKE2B 8ca14d4bafc614cf823f18d135b0b6374b049b0c8da1295110b7fc0a91675f81797d1208c49d6536d768ed333124f96928ae0f5d4f0846e2c4968871c3433e6e SHA512 a7e64e082b8f8f3857131de26ea4e02cdb0e462c5d5cd2e02e74015d6a84cf7d664df970f2c742b8be72f0e0c0bbf38803cd407ce0e3310f32b546318f6a203a
diff --git a/net-im/discord-canary-bin/discord-canary-bin-0.0.165.ebuild b/net-im/discord-canary-bin/discord-canary-bin-0.0.165.ebuild
deleted file mode 100644
index 8024346a71..0000000000
--- a/net-im/discord-canary-bin/discord-canary-bin-0.0.165.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN=${PN/-bin/}
-MY_BIN="D${MY_PN/d/}"
-MY_BIN="${MY_BIN/-canary/}Canary"
-
-inherit desktop linux-info pax-utils unpacker xdg
-
-DESCRIPTION="All-in-one voice and text chat"
-HOMEPAGE="https://discord.com/"
-SRC_URI="https://dl-canary.discordapp.net/apps/linux/${PV}/${MY_PN}-${PV}.deb"
-S="${WORKDIR}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="bindist mirror strip test"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	media-libs/mesa
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libxkbcommon
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-"
-
-QA_PREBUILT="
-	opt/discord-canary/${MY_BIN}
-	opt/discord-canary/chrome_crashpad_handler
-	opt/discord-canary/chrome-sandbox
-	opt/discord-canary/libffmpeg.so
-	opt/discord-canary/libvk_swiftshader.so
-	opt/discord-canary/libvulkan.so
-	opt/discord-canary/libvulkan.so.1
-	opt/discord-canary/libEGL.so
-	opt/discord-canary/libGLESv2.so
-	opt/discord-canary/libVkICD_mock_icd.so
-	opt/discord-canary/swiftshader/libEGL.so
-	opt/discord-canary/swiftshader/libGLESv2.so
-	opt/discord-canary/swiftshader/libvk_swiftshader.so
-"
-
-CONFIG_CHECK="~USER_NS"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:/usr/share/${MY_PN}/${MY_BIN}:/opt/${MY_PN}/${MY_BIN}:g" \
-		usr/share/${MY_PN}/${MY_PN}.desktop || die
-}
-
-src_install() {
-	newicon usr/share/${MY_PN}/${MY_PN//-canary/}.png ${MY_PN}.png
-	domenu usr/share/${MY_PN}/${MY_PN}.desktop
-
-	insinto /opt/${MY_PN}
-	doins -r usr/share/${MY_PN}/.
-	fperms +x /opt/${MY_PN}/${MY_BIN}
-	dosym ../../opt/${MY_PN}/${MY_BIN} usr/bin/${MY_PN}
-
-	pax-mark -m "${ED}"/opt/${MY_PN}/${MY_PN}
-}