gentoo auto-resync : 07:08:2024 - 12:37:20

10 files changed, 129 insertions, 7 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 6061eff5dd0b..c55afb0f577a 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/mmc-utils/Manifest b/sys-block/mmc-utils/Manifest
index bd25913fad75..6f8f53fddee3 100644
--- a/sys-block/mmc-utils/Manifest
+++ b/sys-block/mmc-utils/Manifest
@@ -1,5 +1,5 @@
 DIST mmc-utils-0_p20231010.tar.gz 51083 BLAKE2B efa8bbae62ccc20ee4085c6b372ce3a35d41cf2aba12918d74d2edb0f779e7174250358d426a756075cf6dd93009b366dfb373a54bc0eb13441c4ee2e579a26f SHA512 c6ee6af49556261f1bee12580025452fa180f0bd913fac90847d86ffc5100f34905a0b0467707601a3638bfad6f3f4fca41df0cd59c7e3507981f991ede6ac10
 DIST mmc-utils-0_p20240402.tar.gz 53588 BLAKE2B 6acc9a60103d6bb83d3d5f2403f997abe616aed36e23a4b91dec7156a5e73ce559dcd87737a9a0fa38e7c6f609d4ebf02c6ebe931fbf169ec6fd2c57056578fa SHA512 7891c16cb447c9900225a15f273e167b6eaf21cc73fbb2b80d11ee95df9e63cb430267101b8887e3e00c3a6c9d20d7aa29613933c0b25221589991c1693c73bb
 EBUILD mmc-utils-0_p20231010-r2.ebuild 810 BLAKE2B 24618a94a6b6d35c85baecdd8f95b4936ad051bb23f08e59ec09e04e8593245114e59f82a6acc7d2cde2dfa46293bf78f60edcc00a7b6593c5b922fbbd789191 SHA512 277980661149ed88e02cc339b6db66f4ae1adf3ff3e237fc6777547b2546909a5d10be0818a4b25bc378f3d2ac6f22551472a78fdb15a1eed3b3c20cb6e38901
-EBUILD mmc-utils-0_p20240402.ebuild 818 BLAKE2B a77118c8f10aa632a1aeb6d5cfbf8ff015001740b58b3002c62e80224268a615c2f6faeae8c5360777ac7b70837e0c9ed5524a19bf2330feb052b21fffaca0fd SHA512 7ccef11abcea5aa812c9de6392d5d0af9eaab1f53b4fa8160efc26cc4a4c6ee5ade358cd3decaa84f0abda0e16dd2a74ccf8fe03c05c59903fff5c44f4d77273
+EBUILD mmc-utils-0_p20240402.ebuild 817 BLAKE2B 1339333952483f7a4f838ce4e9d4ad2b69e263a2e7643bc0a44a521e42d45431297f8a421411401d8e7ced8481d8899d38bce9aa2b60c26c6ad6efcc427a722b SHA512 0ca72922a4be3e27f5e08d8111f65092bc49833ec150c20684372900dceaf70e9adc9b1953a8da28238095e23141162cc94df15142df8426482f6666cdaa7ff0
 MISC metadata.xml 246 BLAKE2B 3d18899448c3810386e0fc45cf9d1e1521a77c448a3b643edb7ad7e4830881e4112a90a8c7383c9477258187baac81feb7e62fb3f0d05ea473585b9e00726d9a SHA512 023a3d4e2713d0251b78fd608d08ddfed97c3d52775efb75bd8718131e5863687c1e924271cf934cd2953029075cfd8de2e29d61cd3362ce18ebb2d4c5bef7c9
diff --git a/sys-block/mmc-utils/mmc-utils-0_p20240402.ebuild b/sys-block/mmc-utils/mmc-utils-0_p20240402.ebuild
index ce2b6cd1f9b4..531e6d8ccb2d 100644
--- a/sys-block/mmc-utils/mmc-utils-0_p20240402.ebuild
+++ b/sys-block/mmc-utils/mmc-utils-0_p20240402.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_COMMIT}"
 LICENSE="GPL-2 BSD"
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 
 RDEPEND="!dev-lang/mercury"
 
diff --git a/sys-block/nbd/Manifest b/sys-block/nbd/Manifest
index 93733d711340..25eefab37e90 100644
--- a/sys-block/nbd/Manifest
+++ b/sys-block/nbd/Manifest
@@ -1,4 +1,6 @@
+AUX nbd-3.25-fix-build-on-musl-gcc14.patch 1511 BLAKE2B f87b1c1a3885305e70c7bfdaa620ec7382da015777fc93476617cb6c28ccc9d27bb0d9cca5d35214ec7df8b355382ba74e9f7f83059921d77c8c8b2247743118 SHA512 f974042e310e90927a94b2a9e6a6d85066c47179c5731f63c72ef47e44e59ef3d5615d82556ef879e523122d15cde0eda192819254db0768214452fc5968ac6b
 DIST nbd-3.25.tar.xz 566360 BLAKE2B dce56fb91f6358955b0173b589df19ce2682e3cd6810b0bd74eeb973c24e52307ed55e197c13dcb9c2a62ac92e0dddb046fd1f4348862c7f7dc17bc479ba8cad SHA512 e8b83475a698b5c3718331b55a2c28fd10ca031e347aac7c439f1653d78a405fefa5cb2618e60f73b2f170a8c93d68e79a2cd5875e5c6a970cb1ef9d8e08ebda
+EBUILD nbd-3.25-r1.ebuild 1725 BLAKE2B f52517e2c5c2c2331c7d2f78ed19265c43891c4c176116a71bdd2df60ebdf0d3ab57b7d97038f87bbb6e1af154d9c105f3909729534046b228301e32d72beea6 SHA512 fb1306395c3a50a042ee251a0ebe040e32e1b8380c1aea7a6c00817f7dc391192a5e4dc86f8f95a5871c6ab8cf81b69e6adcdc5f76c4405ec6f0ba889722e4f7
 EBUILD nbd-3.25.ebuild 1651 BLAKE2B fd65808ca76d49d873ee721392550e652acd3c6952e94fa552e2ff577202095f2753b59d34c85bd82d031cecf1ddbf94a842144271f2ce3e27827779e3a03ff9 SHA512 a9c421936302dae5c225e7ca09f5db6af3ef22d5f113c3d2ec31b882f1dbdb445534a0860e02c48cc39597ae1e4b1bee232d80f72868901882eaa0fe1e90c9df
 EBUILD nbd-9999.ebuild 1649 BLAKE2B 771fc8d4df921ade7212e3efa6732cab71fe67a90a77f4d1644052ac666a1de446b6a70acbafb41f8879f04dca79b86f14fbc2bf3d602758a35ed317dfc44324 SHA512 da88e0e172d1cc0fdc7aa3a7b698d4c0ac18b2a01d6ad17bba0d43176874c23a1bfc57e5c3eadfb3f14b4a192208fe64020ec754fbc3e2f1a3ac2cc880a2e6a6
 MISC metadata.xml 490 BLAKE2B b6fff304d62aee96038650fd12b2f4f9d82f7a8be72214766699437563da6f4d305effe58c0beba58ad1c537d8d3ec9ee4d3a698480977be6020317f3279335b SHA512 3e495bb823aae9aa2ce314b31cfe49dc40721e01f45b0d2179f18701b18fef89732d831cd1c0ebbdf1dcef1044a0b507262c586f81897e594ef1394a41211665
diff --git a/sys-block/nbd/files/nbd-3.25-fix-build-on-musl-gcc14.patch b/sys-block/nbd/files/nbd-3.25-fix-build-on-musl-gcc14.patch
new file mode 100644
index 000000000000..91828c159d76
--- /dev/null
+++ b/sys-block/nbd/files/nbd-3.25-fix-build-on-musl-gcc14.patch
@@ -0,0 +1,34 @@
+https://github.com/NetworkBlockDevice/nbd/commit/4664b8dd3bc124c27b160720113339c1da97c2c4.patch
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 20 May 2024 17:50:51 -0700
+Subject: [PATCH] nbd-client: Fix build on musl + gcc14
+
+GCC-14 has promoted incompatible-pointer-types warning into error which is
+now flagged especially with when building on musl
+
+Fixes following error
+
+| ../nbd-3.26.1/nbd-client.c: In function 'openunix':
+| ../nbd-3.26.1/nbd-client.c:345:27: error: passing argument 2 of 'connect' from incompatible pointer type [-Wincompatible-pointer-types]
+|   345 |         if (connect(sock, &un_addr, sizeof(un_addr)) == -1) {
+|       |                           ^~~~~~~~
+|       |                           |
+|       |                           struct sockaddr_un *
+| In file included from ../nbd-3.26.1/nbd-client.c:25:
+| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux-musl/nbd/3.26.1/recipe-sysroot/usr/include/sys/socket.h:386:19: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *'
+|   386 | int connect (int, const struct sockaddr *, socklen_t);
+|       |                   ^~~~~~~~~~~~~~~~~~~~~~~
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+--- a/nbd-client.c
++++ b/nbd-client.c
+@@ -342,7 +342,7 @@ int openunix(const char *path) {
+ 		return -1;
+ 	};
+ 
+-	if (connect(sock, &un_addr, sizeof(un_addr)) == -1) {
++	if (connect(sock, (struct sockaddr*)&un_addr, sizeof(un_addr)) == -1) {
+ 		err_nonfatal("CONNECT failed");
+ 		close(sock);
+ 		return -1;
+
diff --git a/sys-block/nbd/nbd-3.25-r1.ebuild b/sys-block/nbd/nbd-3.25-r1.ebuild
new file mode 100644
index 000000000000..731fdfff88c4
--- /dev/null
+++ b/sys-block/nbd/nbd-3.25-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd
+
+DESCRIPTION="Userland client/server for kernel network block device"
+HOMEPAGE="https://nbd.sourceforge.io/"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/NetworkBlockDevice/nbd.git"
+else
+	SRC_URI="https://github.com/NetworkBlockDevice/nbd/releases/download/${P}/${P}.tar.xz"
+	SRC_URI+=" https://downloads.sourceforge.net/nbd/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug gnutls netlink zlib"
+
+RDEPEND="
+	>=dev-libs/glib-2.32.0
+	gnutls? ( >=net-libs/gnutls-2.12.0 )
+	netlink? ( >=dev-libs/libnl-3.1 )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.25-fix-build-on-musl-gcc14.patch"
+)
+
+if [[ ${PV} == 9999 ]] ; then
+	BDEPEND+="
+		app-text/docbook-sgml-dtd:4.5
+		app-text/docbook-sgml-utils
+		dev-build/autoconf-archive
+	"
+fi
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		emake -C man -f mans.mk \
+			nbd-server.1.sh.in \
+			nbd-server.5.sh.in \
+			nbd-client.8.sh.in \
+			nbd-trdump.1.sh.in \
+			nbd-trplay.1.sh.in \
+			nbdtab.5.sh.in
+
+		emake -C systemd -f Makefile.am nbd@.service.sh.in
+
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	# Needs Bison
+	unset YACC
+
+	local myeconfargs=(
+		--enable-lfs
+		# https://github.com/NetworkBlockDevice/nbd/issues/149
+		--disable-gznbd
+		$(use_enable !debug syslog)
+		$(use_enable debug)
+		$(use_with gnutls)
+		$(use_with netlink libnl)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	systemd_dounit systemd/nbd@.service
+}
diff --git a/sys-block/partitionmanager/Manifest b/sys-block/partitionmanager/Manifest
index 47a61aaa434f..a2ee2a5ffd7d 100644
--- a/sys-block/partitionmanager/Manifest
+++ b/sys-block/partitionmanager/Manifest
@@ -1,5 +1,5 @@
 DIST partitionmanager-23.08.5.tar.xz 2148168 BLAKE2B c755a3f828de0acd70f785896c0837a8730b4429b678033d206d67684e648dc43af3d4ae001125fe5a843cc51ef9544c69619e68452936b734afa7d75d37b62f SHA512 5eb6ee5f021a40c597d7f21bc4ae63d05a94564caa32ee72e4a44eb1d21ae7d4628e8bbf5b6645dcf5be2ac3162e5acc712f2982a14ce60ec5acc87409252f1a
 DIST partitionmanager-24.05.2.tar.xz 2314400 BLAKE2B e9c20e2fb909d8377d7c4ee9a202a17fd58b0d651666804349402317f80728de3bc2624f82df7f78c81e2fb3ab90b2044f71503045124947497d86f833676e3a SHA512 1cf48e39d24204b2289c6c67554c9a635acede5c444c7f1b4e55e4d9d8f3b14aa8bbc5aabc267e695eb6ff791248dd70ad8dc03fb08db26103b1e6e401d8cee1
 EBUILD partitionmanager-23.08.5.ebuild 1008 BLAKE2B d85417e4967840b5232a967e01b9b6ee054961ad8490c765e442a753509f9d12571675ad440dffecaa2ebf368a1009a58cc1a60b0d435fb4ec77f151bdae5fa9 SHA512 582e1223b896c255bed3c6ac4be1a3433f706a136f32da026e7c1de6f3f468538ebca43f8217c0fba348588e749c6835ca8dbd1c2f56cd081aa17f2b50fafb3a
-EBUILD partitionmanager-24.05.2.ebuild 964 BLAKE2B 83e7fd9cf02e61e8717987da3e6c67e2d1be3b0138f7f67a31826e17f525f99663e0d6fce0ee0e13415253f1259cb6d61eb9e666c69713e1017001c6cdd8fa6c SHA512 9e3e18b77d591f04da2892348c4169bb37c7f0cedb9ab8834a56631f23688d971a83dfa4df2a155f0d3f61fa447cd81a97faa65e5db9117a56c757e757abd084
+EBUILD partitionmanager-24.05.2.ebuild 969 BLAKE2B 0346224460f1f78863432f30b41d0dfa934b499845cac537e5a00aaa6ed567d9b4184a01ff3cf5c3494c00e7c72cacab6fd6ae6aa9be35d491f28615483c52d0 SHA512 1ea384a557875bbc2ef72641ea0e9dc20bdad50aedd14381f12558d25fc2d72e8cb038d6d86ca164d0baa46e7613c6fac3f2133d9d338240bc795e46f219328c
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/sys-block/partitionmanager/partitionmanager-24.05.2.ebuild b/sys-block/partitionmanager/partitionmanager-24.05.2.ebuild
index b21f143a5515..6ceab9f73442 100644
--- a/sys-block/partitionmanager/partitionmanager-24.05.2.ebuild
+++ b/sys-block/partitionmanager/partitionmanager-24.05.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/partitionmanager/"
 
 LICENSE="GPL-3"
 SLOT="6"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/sys-block/seekwatcher/Manifest b/sys-block/seekwatcher/Manifest
index 951d32cdff02..ef92ef4e00f6 100644
--- a/sys-block/seekwatcher/Manifest
+++ b/sys-block/seekwatcher/Manifest
@@ -1,5 +1,5 @@
 DIST seekwatcher-0.13.tar.gz 25811 BLAKE2B 72c574e239a346620eb5a1c574365f18dc745e926bfb4f191dd9997ff73b26e716ded9679481be34149c3e5e424077a23a264e7dabe9423eafb396f687085dbd SHA512 687c1190a4d62ee4d7237c6930358d69d2045a7fd5af19caf9fdde8dfae8fcc64ba2d382445af2b038bc31f77c356f31b8dbff2d52cdaf4320881d1b1340dd17
 DIST seekwatcher-0.14.tar.gz 26282 BLAKE2B bd6fbadce452384e8998e16040ec5920c67122a4f2e44f76f6ca858bee89af18ab734b60b66bfb15e8134f59b6d54fdaf21c5f2a06b0249af6e974922f9b900d SHA512 664a3af6aaec218c0628cec5317f414993ef087e8302f906fc21c32f85ae90939aee8c2d620e39fc80947af09f13ea35888dec2678390840c8398d061a8b0f39
 EBUILD seekwatcher-0.13.ebuild 758 BLAKE2B d68bbb9e87b2f03150fdf7547d6565f81ab9b57240501da0f44e94ca4153302f929bbd62ab268ea80cd9409ee07ededa6c5c8c2823c38ebbac5a34b62af0dfbc SHA512 237afb6899d4aaff7ad620346e631c7c46a8d0016f318c20b292ab1ecb56a0b7614bd95508d321578417362d45f1ae73191c184a858076f1442c0ca9bc2d30ea
-EBUILD seekwatcher-0.14.ebuild 703 BLAKE2B eb104af60d11fa6696087c897bcf50e610aa1a310fc69428e5d7d84729363c2a4fdcff9d758d3dcc106ca887aac5f5fe7ba4f09c7a653a187cba1533faca317c SHA512 1510d477ecac43a4c3b0aa3b39c360d1625026909b0065ebb26a4047069cd720a7d425b771e4dd0c293a25c0223a74846d632cc2e48ec173665172b41a892adc
+EBUILD seekwatcher-0.14.ebuild 703 BLAKE2B 0163beba1bf4fd1c18af4ba25c8cd88775826e645b8c1292c1e95691328d92060e4b3b65bac6eecfd23e9796d78961fba5a911abe72d8ad30ac465439a51542b SHA512 82a14f89bac7814d995bbf0e703efb02e903c9979b0a3c7dfc8f9549668f9111716dce5559d63df7763ee0aed80b3b451f3f0a1cfa659a9c7cc1e64a309530ad
 MISC metadata.xml 301 BLAKE2B 88f2ad51ba1fa2c71288480dcee9a29e3c4927aaafe6d3bcfd64489dd747abdc7df146a05aba256d4f8a7b5b4ecb9604d167f55ac738b142184880ec973e2a6a SHA512 b744ef659d2e8e8aa2e951350efba592ede09af3e75fda1a96c37ca9fd050355c641c63cb5f30e44d177a53b79465e96c1fd03e91793f4bc1a6a62b130181533
diff --git a/sys-block/seekwatcher/seekwatcher-0.14.ebuild b/sys-block/seekwatcher/seekwatcher-0.14.ebuild
index 06cc3475743f..6e5d001aec3c 100644
--- a/sys-block/seekwatcher/seekwatcher-0.14.ebuild
+++ b/sys-block/seekwatcher/seekwatcher-0.14.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_EXT=1
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit distutils-r1