gentoo auto-resync : 23:10:2023 - 20:37:30

6 files changed, 18 insertions, 19 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 9d3d8b08a29b..1af9dbc51505 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest
index ac4ebb4b6f4b..127f94726d79 100644
--- a/net-p2p/bitcoin-core/Manifest
+++ b/net-p2p/bitcoin-core/Manifest
@@ -5,5 +5,5 @@ AUX bitcoind.openrc 2690 BLAKE2B ef44f88f5d03e488ba4793954ff22949fdb293fac64c426
 AUX init.patch 1472 BLAKE2B 5974542d0890234ccb2cbbcbe022c45c94e5f0235ebb3b7cee3e2e6d61b9e45d7ec31c2ae7c560d38654fda3b6b7e6c4193b02985fe65502a26cb7bc3641dd8f SHA512 b303fa6adecc0d5aac6a9b78d0ab5d4df797e3af80568a0c08ba2b06296a80b9d5cb7e5b1e9af1fb0c83ad5d6e026fec492dfaee7fba56883325ee64f2b78840
 AUX org.bitcoin.bitcoin-qt.desktop 465 BLAKE2B 7ce8818cd967e478e6d41106b7111616b81856ae83db742ee53a28dde203cc6a2230daa562c78e7b59d1014bfe1633b4074685acb404966b2b9649c22c356262 SHA512 4f9e20094a6fb99dc47a799c9fd752d328efa2539aaab2230f9225cb80f8889fa7a28e1277694d04db72f7a052d208d6a208671dd3d0c77a9ec9d7a95169f148
 DIST bitcoin-25.1.tar.gz 12498596 BLAKE2B e8e4ea99cb40db420033c4df75e985af93cbb64f9862376e2de1a0731b4aeafbf43a95b33770e882ad77b73e454d48dbd5744902c78ade2b965e3d2d4e4b4656 SHA512 310e5d976a062496d2b99d0e64c4d5d2b536a747901e887f85b75151d94237f0de800163b534c812d390eb5e93b3f7284cd7f71843ec35e891f34634b6b142ab
-EBUILD bitcoin-core-25.1.ebuild 10372 BLAKE2B 38136da64c2e7bd9496c14c10553519549fab1a3c881f5691115046d93b3414aad5b6986c0305014ea0c537f414149ab408bc1b66c29407ee537e91eb74fb458 SHA512 10bdc41236ce6bb162b5f2b41042c955161c65c111016a976e55fdb246ce6d1d079ed7e14995c1ce3686ec37dfce29fd133824e7bfd7c54e603ee13fa6ab5b5a
-MISC metadata.xml 1689 BLAKE2B 2f08040af65acaf771756f70b5810d2a8857abe9b6f828f62bc038f0e5b35d4f434948c1d0ec0aa4fb552b70a025a8d697f6e18e4058928e8eb7363d50a29ed0 SHA512 bd19ff1c3e06210400df633ca424a19ad231404e2b8fb6d3db2e5a5ff61aca05eb0e51116335c047148fda5ec7b09a895b475d5f275559096e7b3e0bc268020f
+EBUILD bitcoin-core-25.1.ebuild 10364 BLAKE2B c5115d4bc79f7454b2f2bb5c4a19847b0bf52c65d644ca4121ef7f8ae18c37ed51e3f8eed57787a90d89d3c7199083dbde154098b90259afc09d6434c9f1e20d SHA512 edac13de8aad436180f978818558aa1a5438ca1ae02e1d08cc69a2ad80b7874a7e1c4f188339c147748c45c53978643a04a2d89a075d778bdd39e0076ae328ae
+MISC metadata.xml 1630 BLAKE2B 0e76ab08d978f6e5f5514806bb7712d3ed2a051c96b94d40fa980ec4f904095c469534a148a54c752fe98128849526ab7a0233bcaaeb1c03c91db171409f762a SHA512 a0be2eb6aeb79995f133d94eae5fef6b700f7150b0a8b3d375e8b34f190ac9993e573256ba9fb9cc7d23401f5f281567f9cf1e64c55b4685cfda059a6c98fdf9
diff --git a/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
index 0ed41f21df48..f512f8f4c517 100644
--- a/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
+++ b/net-p2p/bitcoin-core/bitcoin-core-25.1.ebuild
@@ -16,14 +16,14 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 # IUSE="+cli" doesn't work due to https://bugs.gentoo.org/831045#c3
-IUSE="+asm +berkdb +bitcoin-cli +daemon dbus examples +external-signer kde libs +man nat-pmp +qrcode qt5 +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq"
+IUSE="+asm +berkdb +bitcoin-cli +daemon dbus examples +external-signer kde libs +man nat-pmp +qrcode gui +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
-	dbus? ( qt5 )
-	kde? ( qt5 )
-	qrcode? ( qt5 )
-	system-leveldb? ( || ( daemon qt5 ) )
+	dbus? ( gui )
+	kde? ( gui )
+	qrcode? ( gui )
+	system-leveldb? ( || ( daemon gui ) )
 "
 # dev-libs/univalue is now bundled, as upstream dropped support for system copy
 # and their version in the Bitcoin repo has deviated a fair bit from upstream.
@@ -42,7 +42,7 @@ RDEPEND="
 	libs? ( !<net-libs/libbitcoinconsensus-25.0 )
 	nat-pmp? ( >=net-libs/libnatpmp-20220705:= )
 	qrcode? ( >=media-gfx/qrencode-4.1.1:= )
-	qt5? (
+	gui? (
 		!<net-p2p/bitcoin-qt-25.0
 		>=dev-qt/qtcore-5.15.5:5
 		>=dev-qt/qtgui-5.15.5:5
@@ -66,11 +66,11 @@ BDEPEND="
 		acct-group/bitcoin
 		acct-user/bitcoin
 	)
-	qt5? ( >=dev-qt/linguist-tools-5.15.5:5 )
+	gui? ( >=dev-qt/linguist-tools-5.15.5:5 )
 	test? ( ${PYTHON_DEPS} )
 "
 IDEPEND="
-	qt5? ( dev-util/desktop-file-utils )
+	gui? ( dev-util/desktop-file-utils )
 "
 
 DOCS=(
@@ -116,7 +116,7 @@ src_prepare() {
 	sed -ne '/^  {/{h;:0;n;H;/^  }/!b0;g;\|"exec": *"\./bitcoin-util"|d};p' \
 		-i test/util/data/bitcoin-util-test.json || die
 
-	sed -e 's/^\(complete -F _bitcoind\b\).*$/\1'"$(usev daemon ' bitcoind')$(usev qt5 ' bitcoin-qt')/" \
+	sed -e 's/^\(complete -F _bitcoind\b\).*$/\1'"$(usev daemon ' bitcoind')$(usev gui ' bitcoin-qt')/" \
 		-i contrib/completions/bash/bitcoind.bash-completion || die
 }
 
@@ -146,7 +146,7 @@ src_configure() {
 		--disable-util-util
 		$(use_with libs)
 		$(use_with daemon)
-		$(use_with qt5 gui qt5)
+		$(use_with gui)
 		$(use_with dbus qtdbus)
 		$(use_with system-leveldb)
 		$(use_with system-libsecp256k1)
@@ -168,7 +168,7 @@ src_install() {
 
 	newbashcomp contrib/completions/bash/bitcoin-tx.bash-completion bitcoin-tx
 	use bitcoin-cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash-completion bitcoin-cli
-	use daemon || use qt5 && newbashcomp contrib/completions/bash/bitcoind.bash-completion bitcoind
+	use daemon || use gui && newbashcomp contrib/completions/bash/bitcoind.bash-completion bitcoind
 
 	if use daemon ; then
 		insinto /etc/bitcoin
@@ -190,7 +190,7 @@ src_install() {
 		newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
 	fi
 
-	if use qt5 ; then
+	if use gui ; then
 		insinto /usr/share/icons/hicolor/scalable/apps
 		newins src/qt/res/src/bitcoin.svg bitcoin128.svg
 
@@ -240,7 +240,7 @@ pkg_preinst() {
 
 pkg_postinst() {
 	# we don't use xdg.eclass because it adds unconditional IDEPENDs
-	if use qt5 ; then
+	if use gui ; then
 		xdg_desktop_database_update
 		xdg_icon_cache_update
 	fi
@@ -257,7 +257,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	if use qt5 ; then
+	if use gui ; then
 		xdg_desktop_database_update
 		xdg_icon_cache_update
 	fi
diff --git a/net-p2p/bitcoin-core/metadata.xml b/net-p2p/bitcoin-core/metadata.xml
index 3c0338bb1ad9..c5c7717fa5e5 100644
--- a/net-p2p/bitcoin-core/metadata.xml
+++ b/net-p2p/bitcoin-core/metadata.xml
@@ -18,7 +18,6 @@
 		<flag name="libs">Build and install libbitcoinconsensus</flag>
 		<flag name="nat-pmp">Enable NAT-PMP port forwarding</flag>
 		<flag name="qrcode">Enable generation of QR Codes for receiving payments</flag>
-		<flag name="qt5">Build and install Bitcoin-Qt GUI</flag>
 		<flag name="sqlite">Support descriptor wallets in SQLite format</flag>
 		<flag name="system-leveldb">Link with virtual/bitcoin-leveldb rather than embedding an internal copy</flag>
 		<flag name="system-libsecp256k1">Link with dev-libs/libsecp256k1 rather than embedding an internal copy</flag>
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 5b5635d0fc91..bb008100c056 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/Manifest
@@ -11,5 +11,5 @@ DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa9
 EBUILD bitcoin-qt-0.21.0-r1.ebuild 4979 BLAKE2B 6b942dc0957f5a32df13e0436753d0418866f13dd10d1115ec40a3b28e4bbe8ed0b874437ae02dfaae0331c1a1d85026f1ddc1d5e5a6d98807644d6f32318768 SHA512 cc27549fc91201d4a2f22affc1a24eb43517bdf1981f18980cfac36541121ebf099226e417f45b11ca30464d5df8f94d12f14dc99d785851e393b44c3d3a4e18
 EBUILD bitcoin-qt-22.0-r1.ebuild 6261 BLAKE2B 094ffc3923770a3fdf5f2583d72250c7d25c3bb694adbe53fb1a1e58d75514c76c9030f7091efacd5df644875f18d8ddb3ef1089272de7c1f5379a26c15d1f15 SHA512 22b1fbcd2cfe33bf7b7399b841350d77f4935e302483184d512747ecba3291f0c92272e93ab325619d89c4d09e855ece81dd4cf713b4e569aed1a5a674cf04bb
 EBUILD bitcoin-qt-24.0.1.ebuild 3915 BLAKE2B 61d3da1b5d104ee035553f9c667008e876b01bb213d6fdda14126b8bcec79b7d04e7fdd8378294305004e032f5c605d014356f7dedfab316ee5655a4150da801 SHA512 36c1113ef55d415bfebae5381b9acc9a1312591fec8b31209f4675a8f371d017cada9bb7d962e07139ea7c18ec96aeb542a20e93d9e601b043f348456f031488
-EBUILD bitcoin-qt-25.1.ebuild 683 BLAKE2B 5fd6b98079f4e08fcd4a30f7b00fe8a695cda1c313657a6b050bd3f32412ddb9f792b8aa488e42a8f1fe5673e481cca125b29fd21d5e0b59c634ddfb4b6c1990 SHA512 0e5be0da5da363b5d19d92bb8e891fc2a663f27ba3d62e7167b162f7dba9fceb9fac1e0ba5de4c75caf98667549213f195feb726eefdfa0f12715396dcf1961e
+EBUILD bitcoin-qt-25.1.ebuild 683 BLAKE2B 7053325413ba2fd0b5bf39b08c69bfbb5837bd5dd0b140ab0c5d8b4d64b386a06d66f970029e68a9c10dd01c5ff8ba387982e2748f6ab076eee7b26d3c31f543 SHA512 c5a3eba29e672321c97c51f966999259231f8187b07130705ca4cd401db72628e11512e7e116c58ff02c8a511da00222e279e06ec2968297eba7d221a58c657d
 MISC metadata.xml 1434 BLAKE2B e6e1f0ffac2e6be3bc19fe8bb8e9b18b5b50da6255d70d92fdc28a6e040b54ed4d5b94643835043eb64eae0273111f73c30e93a6d9b7203368aeedb880961c8a SHA512 5e7f2f044b27e4ac21d1e18d177bb1bd493feaad5598ad44abed8a0053403565100877498da29aa4f35e59d570d2a499daea58285dd59f3e62eafba7ee3460e7
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-25.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-25.1.ebuild
index a879e99badc9..7f2c0a077ffd 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-25.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-25.1.ebuild
@@ -13,6 +13,6 @@ IUSE="+asm +berkdb dbus +external-signer kde nat-pmp +qrcode +sqlite systemtap t
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	~net-p2p/bitcoin-core-${PV}[qt5,asm=,berkdb=,dbus=,external-signer=,kde=,nat-pmp=,qrcode=,sqlite=,systemtap=,test=,upnp=,zeromq=]
+	~net-p2p/bitcoin-core-${PV}[gui,asm=,berkdb=,dbus=,external-signer=,kde=,nat-pmp=,qrcode=,sqlite=,systemtap=,test=,upnp=,zeromq=]
 	wallet? ( || ( ~net-p2p/bitcoin-core-${PV}[berkdb] ~net-p2p/bitcoin-core-${PV}[sqlite] ) )
 "