gentoo resync : 04.01.2022

3 files changed, 87 insertions, 4 deletions

diff --git a/media-sound/daudio/Manifest b/media-sound/daudio/Manifest
index 2fd52acde700..ee679cddff76 100644
--- a/media-sound/daudio/Manifest
+++ b/media-sound/daudio/Manifest
@@ -1,6 +1,7 @@
 AUX daudio-0.3-makefile.patch 1683 BLAKE2B a1b54557e238fbe0d727948a0594e1e142d852362bd35da25a8b2be0106884666bb4d88783f6fff202f83a1545f27f52ee88ec34075ff2b4940d89538533f985 SHA512 4ca11073dcfef61fede2cdb7d99be6f3ec7d6c3c8e587faf33c6e06c4468c8e25b4726aa66ba119fc871c4930b42accff331db9a4bd76cac37f56a15c32bc5aa
+AUX daudio-0.3-musl-stdint.patch 2400 BLAKE2B 4c90dfdb97bc1f82249e83817b1b257121be451a9a4f357d62cd246f501873c0484bdd58139b2c5668f6850f3346d5853ddb3d30b0ca3e8a516e12ad2fe6720b SHA512 e6650407a2d2ce35ba0ac99ba2e4344041d92c341faa5c63d88d1f00654eee5a66c7206abb8e240b3c6b15fc5e7d215c2cf41b30f1fa5bb5b87842673f4b33cc
 AUX daudio-0.3-qa-implicit-declarations.patch 1980 BLAKE2B d31a67d6234c667e726907cdf41f18b2ea0e7dbf88d0a13fedae9690327fa6450f3bd2d3f46b5f387997e1dbdf0c40a910026b2260b0c1dcda9cd1c74ef3602d SHA512 0da091005e36825ef0f35e4029e48781a23d2c8ab00af33528de4999dcb7d2e98006b2623852ab7cadd6e129d1847a6a85f8f60b7340c755939d9fa45d094a5e
 AUX daudio.rc 425 BLAKE2B 6859ce9adb4668ce7528f9371272dfab206f2bb4880819995634b88c1c3902edbd49c3e84ceb8c4abbec84be5cadb547ee44e9ed462cc27ee928060d2c738a6b SHA512 c6f816faeac497e31365d9bf7b2c37c4c8688d88820c0dbc9e4819be13119e477cc3aea2fe3ca249d82b8d84ebb485d9516f0b93180a7c756d573dcb5f1e1900
 DIST daudio-0.3.tar.gz 76683 BLAKE2B da8c674be38224153af26b6a690a0fe23c4d24e90422260799657ff80242d2c8baaa2de85603d68e8daf6e880335fe84dc7467f10571590814b647aa65f88e9b SHA512 63266348c8235b09efb6958646b003a5e7ae1cfd7d97aeff928ed8e7b9ffc71666c0bcd93ee89db6c28cae5019056748631e9fef850ebf6ead7aefecc3037e3c
-EBUILD daudio-0.3-r1.ebuild 936 BLAKE2B 754573797a29b6ad8eb510e2e77ac1ba9f2ebb0c1a6a39a6ad60a67e54882e5d10a3cc2fc604abaa5865f06f44adac377681e1d7ec64d77c1663749561f24e78 SHA512 47c7d41b0acc85ea817bdad219f94566718e6b27c4a1f955d825868692962f23d52c441d12e897c5007b7c9302ae3967fd373233b9403239b0ab7f5608f4bdd3
+EBUILD daudio-0.3-r1.ebuild 967 BLAKE2B 0ddcaaf96aeecd5a7ce15bea26905ead1234aabc931ef28a78d72e8d71940a70068abf0a5ff8baf55e1398fd5f72ce1cbb40d03ae499abb5da20c605f1922a29 SHA512 5d56dedc9dc4c3368d2afea186c7d391b23c351bc34d967f041c5313da2c4c89d349fa6da505c58c7d6cf7db4812ad9f1b9db7c01b0a05b542bbfa44244e1808
 MISC metadata.xml 330 BLAKE2B 7bed91ca8797a4ad2fc012fb6595d192706c46e66aa9b95ee32a5dcc46d15e1a394e29d4db0a950581206bf83e412bc14e3deb38cc19085c6f13bf510f2efc14 SHA512 967eef88ca746c0cd9c18a6eac7c65597fdb872e3ea1897848c6c92d150b0a73bb64c1e105f51b3a78a96e7003dcd771700dd2340b2ceee53f3b5ce73dff90dc
diff --git a/media-sound/daudio/daudio-0.3-r1.ebuild b/media-sound/daudio/daudio-0.3-r1.ebuild
index 88cd0bcb1e04..0f7ca5bea943 100644
--- a/media-sound/daudio/daudio-0.3-r1.ebuild
+++ b/media-sound/daudio/daudio-0.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic toolchain-funcs
 
@@ -11,16 +11,16 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-#-sparc: 0.3: static audio on local daemon. No audio when client connects to amd64 daemon
+# -sparc: 0.3: static audio on local daemon. No audio when client connects to amd64 daemon
 KEYWORDS="amd64 ~ppc -sparc x86"
 
-IUSE=""
 DEPEND=">=media-libs/libmad-0.15.0b-r1"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-makefile.patch"
 	"${FILESDIR}/${P}-qa-implicit-declarations.patch"
+	"${FILESDIR}/${P}-musl-stdint.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/daudio/files/daudio-0.3-musl-stdint.patch b/media-sound/daudio/files/daudio-0.3-musl-stdint.patch
new file mode 100644
index 000000000000..ff70b900d1f8
--- /dev/null
+++ b/media-sound/daudio/files/daudio-0.3-musl-stdint.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/715246
+--- a/client/net.c
++++ b/client/net.c
+@@ -20,6 +20,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <errno.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+@@ -69,7 +70,7 @@ int netinit(char *hostname, int port) {
+     }
+     net_raddr.sin_family = AF_INET;
+     net_raddr.sin_port = htons(port);
+-    net_raddr.sin_addr.s_addr = *((u_int32_t *) host->h_addr);
++    net_raddr.sin_addr.s_addr = *((uint32_t *) host->h_addr);
+     return(s);
+ }
+ 
+--- a/server/bcast.c
++++ b/server/bcast.c
+@@ -21,6 +21,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <stdio.h>
++#include <stdint.h>
+ 
+ #include "../common/port.h"
+ #include "timer.h"
+@@ -75,11 +76,11 @@ int b_init(void) {
+     
+     addr.sin_family = AF_INET;
+     addr.sin_port = htons(BROADCASTPORT_D);
+-    addr.sin_addr.s_addr = (u_int32_t) INADDR_ANY;
++    addr.sin_addr.s_addr = (uint32_t) INADDR_ANY;
+     
+     baddr.sin_family = AF_INET;
+     baddr.sin_port = htons(BROADCASTPORT_C);
+-    baddr.sin_addr.s_addr = (u_int32_t) INADDR_BROADCAST;
++    baddr.sin_addr.s_addr = (uint32_t) INADDR_BROADCAST;
+     
+     if(bind(b_sock, (struct sockaddr *) &addr, sizeof(struct sockaddr_in)) == -1)
+ 	return(-1);
+--- a/server/local.c
++++ b/server/local.c
+@@ -21,6 +21,7 @@
+ #include <unistd.h>
+ #include <mad.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -207,7 +208,7 @@ int l_init(void) {
+     
+     addr.sin_family = AF_INET;
+     addr.sin_port = htons(LISTENPORT);
+-    addr.sin_addr.s_addr = (u_int32_t) INADDR_ANY;
++    addr.sin_addr.s_addr = (uint32_t) INADDR_ANY;
+     
+     if(bind(*s, (struct sockaddr *) &addr, sizeof(struct sockaddr_in)) == -1)
+ 	return(-1);
+--- a/streamer/streamer.c
++++ b/streamer/streamer.c
+@@ -25,6 +25,7 @@
+ #include <sys/socket.h>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -129,7 +130,7 @@ int main(int argc, char *argv[]) {
+     }
+     addr.sin_family = AF_INET;
+     addr.sin_port = htons(LISTENPORT);
+-    addr.sin_addr.s_addr = (u_int32_t) htonl(INADDR_LOOPBACK);
++    addr.sin_addr.s_addr = (uint32_t) htonl(INADDR_LOOPBACK);
+ 
+     if(connect(s, (struct sockaddr *) &addr, sizeof(struct sockaddr_in)) == -1) {
+ 	perror("Failed to connect to localhost:5555");