net-p2p/gridcoin: add 5.4.6.0, drop 5.4.5.0

Signed-off-by: Sven Eden <sven.eden@prydeworx.com>

3 files changed, 11 insertions, 26 deletions

diff --git a/net-p2p/gridcoin/Manifest b/net-p2p/gridcoin/Manifest
index dc2a303..d1e3491 100644
--- a/net-p2p/gridcoin/Manifest
+++ b/net-p2p/gridcoin/Manifest
@@ -1,7 +1,6 @@
-AUX gridcoin-5.4.5.0-add_missing_boost_array_include.patch 331 BLAKE2B b800e47fdea12434e07957a00bbfdbae6dd1b089752e99ab56deb9579cb76bc61e8dfdb6eaa206812608754db9e21ca6e7352695ffae1b72f3fa8797d38eb838 SHA512 2b1f9dff11d33c03b7523d4d578f669e8f7cea47e4168391a8abc18719363b20bed6baaf3d5d6bd822450ceffb3b99d75008cd235f78344e2f309be32aa9384d
 AUX gridcoin.init 313 BLAKE2B c816b1726418146e786e9d78802e0dd0e5cd9177d93a791488bb2a5c919bf37cf785b3a51da03754f732f1c69b49ef334d82e62eda0838b9a049764e22660c65 SHA512 1bc3cfb07ecc01563ab5aaf53d02c6b70b8516d60ec54c4a0df5e2738568af6b1146095c5d673b716b95540bb65385b63c28ded041a09c841c8a37f556122f80
 AUX gridcoin.service 191 BLAKE2B c828c4d95b3bc11da42221a8f3118d4a9af841fc19408e24d5aa657796e6e7697039f65e4fbd86287d35f81fef07af8157877dac5958f89c8acd4732a6e9359c SHA512 f892a5edbd9f2351e24adc6af4dcd35b5d450098c3eacd4a795ed959aef9e041c0a72aada59ef4a2076222fcedba7cef0f05f1726a2c5af970ec537665b6f81d
 AUX gridcoinresearch.conf 2880 BLAKE2B 75e768979cd317eff2cc9739e7eb11187f0330880121cecf025f6240164e1a0ccdd2e31d7614553ec8bdd5cade038809d53364c8fa868582b8b96d0361ffcc68 SHA512 bce85a30232fac19b8e207f4fa95acb388835ea12d9d7b9a461788898a3651d0d11dff3a208c28692b4d1f7cd2ec82421948e03b2130e72796ade6d53a31733d
-DIST gridcoin-5.4.5.0.tar.gz 42685774 BLAKE2B 18eeea5377da045bb77f720d1022933cd9f134bb6197e47023d99b565860273b4b274d6b23f872efbe861c7f38c219d6301684672fcb6f7fcf903154f82613aa SHA512 b7db9fcf510103908d495943a3106c3b192c968082fe4cb73295b49b1bd4d9431bdbc3e69994aa63a1fb3646fb6d49671c0c172b9fd090d39bde0dae0d66eafc
-EBUILD gridcoin-5.4.5.0.ebuild 4586 BLAKE2B dc3b3b4e4d3f937f1ac4b099c2b9a388e15817fd0bfebbef0f904776bf21697ae67f66e0075def638b6baef0b8d3843229ce426236edcc7a5881cdf15a37e307 SHA512 ee543f54d1bbfac479757941e3d7225404ee9fc540e7f74ab86a4f7f4fd6818d06cade9b0476e722cb7adac79da6c6dcda198b1f5a998850b4123365409b76d9
+DIST gridcoin-5.4.6.0.tar.gz 42842258 BLAKE2B 86ead45de3efc10bda607f86b799f93e46c394ad9eba4f4de9162113c06c88365c239f9fb1cd974220a7a83ff1b845ba45d2c1ed69016ea0bc7829d8431f5bad SHA512 a5c00b9b23bc1553e42bc95dba83f3370aeae13319c751895a35b6468d27260a98c3acc0e91233ac9769c2834a857be47ff2c42a632e64f4d410d36bfa8cde64
+EBUILD gridcoin-5.4.6.0.ebuild 4509 BLAKE2B b05aa1fc0450f20c81304801008681fd4399b2381c28d822366505e1b62545aca37a002192ebe258fdd7b5c159c482ca903751cb6275ddb29a3597fb8c0bc08e SHA512 9f167dd7be64d7c3ca269dc2f22472dca67886ffb79d0f80e2f72f1814159f2a8885ac06e926e776f319fabc78c8ebb752d07108a991dc87e86db8d7178d98c9
 MISC metadata.xml 1402 BLAKE2B 2d756f641e8236924dc2af0d9eef43ffdf3313f650d6a3a620480670d52ddc78889b82b0a4277e4fd1fb8c8c46fe9b076a35fbe472195a510f535746e1728608 SHA512 d5a83407d17e8f50ae6bb762c4e7ca3f5ea69acf249cd78696685323022c15605901b44d08fcec578ebd5209bf60a9d8ea5785ee518f521b2be01504ce7ecbd2
diff --git a/net-p2p/gridcoin/files/gridcoin-5.4.5.0-add_missing_boost_array_include.patch b/net-p2p/gridcoin/files/gridcoin-5.4.5.0-add_missing_boost_array_include.patch
deleted file mode 100644
index dc0e17e..0000000
--- a/net-p2p/gridcoin/files/gridcoin-5.4.5.0-add_missing_boost_array_include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/wallet/diagnose.h	2024-01-08 23:51:01.722151300 +0100
-+++ b/src/wallet/diagnose.h	2024-01-08 23:52:35.935154175 +0100
-@@ -14,6 +14,7 @@
- #include "net.h"
- #include "util.h"
- #include <atomic>
-+#include <boost/array.hpp>
- #include <boost/asio.hpp>
- #include <boost/asio/ip/udp.hpp>
- #include <boost/asio/system_timer.hpp>
diff --git a/net-p2p/gridcoin/gridcoin-5.4.5.0.ebuild b/net-p2p/gridcoin/gridcoin-5.4.6.0.ebuild
index 97c04eb..43baa64 100644
--- a/net-p2p/gridcoin/gridcoin-5.4.5.0.ebuild
+++ b/net-p2p/gridcoin/gridcoin-5.4.6.0.ebuild
@@ -8,9 +8,11 @@ inherit flag-o-matic systemd desktop
 DESCRIPTION="Gridcoin Proof-of-Stake based crypto-currency that rewards BOINC computation"
 HOMEPAGE="https://gridcoin.us/"
 SRC_URI="https://github.com/${PN}-community/${PN^}-Research/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN^}-Research-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
+
 KEYWORDS="~amd64 ~x86"
 
 IUSE_GUI="dbus qt5"
@@ -18,19 +20,19 @@ IUSE_DAEMON="daemon"
 IUSE_OPTIONAL="+bench +boinc +ccache debug +harden +libraries pic +qrcode static test +upnp +utils systemd"
 IUSE="${IUSE_GUI} ${IUSE_DAEMON} ${IUSE_OPTIONAL}"
 
-# Note: The client *CAN* *NOT* connect to the daemon like the BOINc client does.
-#       Therefore either run the daemon or the gui client. Furthermore starting the gui client while
+RESTRICT="!test? ( test )"
+
+# Note: The client *CAN* *NOT* connect to the daemon like the BOINC client does.
+#       Therefore either run the daemon or the GUI client. Furthermore starting the GUI client while
 #       the daemon is running will kill the latter.
 #  See: https://www.reddit.com/r/gridcoin/comments/9x0zsy/comment/e9r85vf/
-#       "The GUI instance will not rpc to another wallet process."
+#       "The GUI instance will not RPC to another wallet process."
 REQUIRED_USE="
-	^^ ( daemon qt5 )
+	?? ( daemon qt5 )
 	dbus? ( qt5 )
 	qrcode? ( qt5 )
 "
 
-RESTRICT="!test? ( test )"
-
 RDEPEND="
 	>=dev-libs/libevent-2.1.12
 	daemon? (
@@ -46,19 +48,13 @@ RDEPEND="
 	qrcode? ( media-gfx/qrencode )
 	upnp? ( net-libs/miniupnpc )
 	boinc? ( sci-misc/boinc )
-	utils? ( net-p2p/bitcoin-cli dev-util/bitcoin-tx )
+	utils? ( net-p2p/bitcoin-core[bitcoin-cli] )
 "
 DEPEND="
 	${RDEPEND}
 	qt5? ( dev-qt/linguist-tools:5 )
 "
 
-PATCHES="
-	"${FILESDIR}"/${P}-add_missing_boost_array_include.patch
-"
-
-S="${WORKDIR}/${PN^}-Research-${PV}"
-
 pkg_setup() {
 	BDB_VER="$(best_version sys-libs/db:5.3)"
 	export BDB_CFLAGS="-I/usr/include/db${BDB_VER:12:3}"