gentoo auto-resync : 06:11:2022 - 09:19:37

8 files changed, 336 insertions, 30 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index f3041f1525ba..06a738b1aea0 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/gsm/Manifest b/media-sound/gsm/Manifest
index 7ce0f5dfde56..e55f71075c9c 100644
--- a/media-sound/gsm/Manifest
+++ b/media-sound/gsm/Manifest
@@ -1,6 +1,10 @@
 AUX gsm-1.0.12-64bit.patch 591 BLAKE2B f72688a27c9e52bd3e0b40018f2e035da4284c40e27cc0bb39b7ce0df361840304ee06d3d321ee39209e3dc7bb6424d64490b3174c5d24b3cd1cbe1ccde2787d SHA512 33b559da974d89487f41e24fe9fee4ac4df6383e27835f710f50deaca76c5077fc24b20fe4d306f1b8c2ca6f3e9cf99c5934796e3795354dee63061e305d4c72
 AUX gsm-1.0.12-memcpy.patch 301 BLAKE2B 887d9dd0c9220284f1ef69bad73e5e311994fb020bc06742cd931fead416937ae25d0e3364432be5c4cc408c57fad80bb524fddf7db75bf53e70158da4a8f089 SHA512 922999a35a5d8f646ebe61d7b7aacadbd75848a5446462a8173e040f7d4b0748c55196c1be0653752f076a01d7eb07e5bfce3fe23b81a38f1ee9f97d61cd6200
 AUX gsm-1.0.13-shared.patch 3750 BLAKE2B 62fda4c22ab90ab5c77211b9c6966eb8286e6c938f5c4b883b3b6efb6e787a0a84f2f5f9b5f124cf10d4ab3055c3c0e6f8ffb81998654720dd621353fe7b80c9 SHA512 b18273436158dc410e7c40a9a290d365f8bf89977663f35f38d783d46d858163cf0b6f73e88e57d928eafc5de7489643ac7194f72fc7a604ef7cba95e8bf6285
+AUX gsm-1.0.22-makefile.patch 4777 BLAKE2B e42ae0e6004aa2aaaf26b9a4911681d3ba20e29bff885bbd64334549e57e264a80d2052c8c9938592a62fce17d23b124bb657056ab19485a76c1349a87a143d8 SHA512 c130621500c11364a35b2565c1ba68c2d872efca4ee1a2f55651fcb864d06d152c9b49e7a4751e718f28d8a1416572829e285cb96791442f2f83eb36a781b0cc
 DIST gsm-1.0.13.tar.gz 65318 BLAKE2B 22bb79e3afd9a2e99041693288342b55969207223486200d4aebc61908930040b6b766a9bf673ec6b484eeb95833684c79f34c95d32da17cfb4c36d025004858 SHA512 0d0cf9e1e81e64cd84f588c1e4f0cb74b849d45e41fdebf860f63588084c73c7c5198bfe73a6c976bda5735ee516661d3db00afbb5cc5886a7ee3a7b31d673aa
+DIST gsm-1.0.22.tar.gz 66583 BLAKE2B 4c654997e2dd91bc5cee406bd664426f86479bfa8624abb0d7ec164eaebe83c3f534b5ee16952b302500630a6f53df26bbb2287f7a329c8878ae48e61fb770ab SHA512 f4284f096ed4d606ddece5c1b28edb63feacc26a0b664f1350c040dbf50113d27bedfd9896bf1620cb4fc3a6c8f6a5244955a6c625ded833dcee607c63c97dd2
+DIST libgsm_1.0.22-1.debian.tar.xz 10516 BLAKE2B 8839082ec446c3eb9dde5d1348806ac5015557257b0c1d319945c36080277b40b25f4903013c5242115467a73e425731661ad4882cf35bba51a90e4f44f284ae SHA512 21929f790d7c821e03113baf3e0690e8cb4b8b3c9015ca6fa05593dba9c4fb000ad41546826bc623c69b19689e81092afe0f7e266b22f9db35e8c735516c9de4
 EBUILD gsm-1.0.13-r1.ebuild 1618 BLAKE2B 5bed41ca314d68c3c56186d3cd27110ef64dab5ce30788122d60b6f2ccdd861bf9a67c6aebc904b123f27910145e39db8d355b6d408781e17d5726e21f37ef39 SHA512 0afe85dd7395efdd3b7d2572e011810dc085a060de4b7545f9a8c5a15f64b0b5df2635d268066c906529bbf55a2fc980ee8a385179929f4994aa4843688f4d28
+EBUILD gsm-1.0.22_p1.ebuild 1882 BLAKE2B 09c1735f904826d30da9e155e113f32efc6e067682ca0819506c951f55254f21a5c9fb25295710d245579e87a0200ee9e43a9debe21fc81cd637beec279ad3eb SHA512 3f7ed3c1e269c8a7c480ed1993365933ef6075c527e85f6725d50733cd3fcd784e4d9c76ef51980f3b7c8b833bc600a2670dba5d4265baec5c7a9c9129cb2b54
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/gsm/files/gsm-1.0.22-makefile.patch b/media-sound/gsm/files/gsm-1.0.22-makefile.patch
new file mode 100644
index 000000000000..9ef9e5a246c6
--- /dev/null
+++ b/media-sound/gsm/files/gsm-1.0.22-makefile.patch
@@ -0,0 +1,188 @@
+https://src.fedoraproject.org/rpms/gsm/blob/rawhide/f/gsm-makefile.patch
+
+--- a/Makefile
++++ b/Makefile
+@@ -44,13 +44,17 @@ WAV49	= -DWAV49
+ # CCFLAGS 	= -c -O
+ 
+ CC		= gcc -ansi -pedantic
+-CCFLAGS 	= -c -O2 -DNeedFunctionPrototypes=1 -Wall -Wno-comment
++CCFLAGS 	= -c -DNeedFunctionPrototypes=1 -Wall -Wno-comment -D_XOPEN_SOURCE=700 -D_REENTRANT -fPIC
+ 
+ LD 		= $(CC)
+ 
+ # LD		= gcc
+ # LDFLAGS 	=
+ 
++SO_MAJOR = 1
++SO_MINOR = 0
++SO_PATCH = 19
++SO_VER = $(SO_MAJOR).$(SO_MINOR).$(SO_PATCH)
+ 
+ # If your compiler needs additional flags/libraries, regardless of
+ # the source compiled, configure them here.
+@@ -81,7 +85,7 @@ INSTALL_ROOT	=
+ GSM_INSTALL_ROOT = $(INSTALL_ROOT)
+ GSM_INSTALL_LIB = $(GSM_INSTALL_ROOT)/lib
+ GSM_INSTALL_INC = $(GSM_INSTALL_ROOT)/inc
+-GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
++GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/share/man/man3
+ 
+ 
+ # Where do you want to install the toast binaries and their manpage?
+@@ -91,12 +95,12 @@ GSM_INSTALL_MAN = $(GSM_INSTALL_ROOT)/man/man3
+ 
+ TOAST_INSTALL_ROOT	  = $(INSTALL_ROOT)
+ TOAST_INSTALL_BIN = $(TOAST_INSTALL_ROOT)/bin
+-TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/man/man1
++TOAST_INSTALL_MAN = $(TOAST_INSTALL_ROOT)/share/man/man1
+ 
+ #  Other tools
+ 
+ SHELL		= /bin/sh
+-LN		= ln
++LN		= ln -s
+ BASENAME 	= basename
+ AR		= ar
+ ARFLAGS		= cr
+@@ -140,6 +144,7 @@ LFLAGS	= $(LDFLAGS) $(LDINC)
+ # Targets
+ 
+ LIBGSM	= $(LIB)/libgsm.a
++LIBGSMSO = $(LIB)/libgsm.so
+ 
+ TOAST	= $(BIN)/toast
+ UNTOAST	= $(BIN)/untoast
+@@ -257,7 +262,9 @@ STUFF = 	ChangeLog			\
+ # Install targets
+ 
+ GSM_INSTALL_TARGETS =	\
+-		$(GSM_INSTALL_LIB)/libgsm.a		\
++		$(GSM_INSTALL_LIB)/libgsm.so.$(SO_VER)	\
++		$(GSM_INSTALL_LIB)/libgsm.so.$(SO_MAJOR)\
++		$(GSM_INSTALL_LIB)/libgsm.so		\
+ 		$(GSM_INSTALL_INC)/gsm.h		\
+ 		$(GSM_INSTALL_MAN)/gsm.3		\
+ 		$(GSM_INSTALL_MAN)/gsm_explode.3	\
+@@ -279,7 +286,7 @@ TOAST_INSTALL_TARGETS =	\
+ 
+ # Target rules
+ 
+-all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
++all:		$(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST)
+ 		@-echo $(ROOT): Done.
+ 
+ tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
+@@ -299,24 +306,32 @@ install:	toastinstall gsminstall
+ 
+ # The basic API: libgsm
+ 
++$(LIBGSMSO).$(SO_VER): $(LIB) $(GSM_OBJECTS)
++		$(LD) $(LFLAGS) -o $@ -shared -Xlinker -soname -Xlinker libgsm.so.$(SO_MAJOR) $(GSM_OBJECTS) -lc
++
++$(LIBGSMSO).$(SO_MAJOR): $(LIBGSMSO).$(SO_VER)
++		ln -fs libgsm.so.$(SO_VER) lib/libgsm.so.$(SO_MAJOR)
++
++$(LIBGSMSO): $(LIBGSMSO).$(SO_VER)
++		ln -fs libgsm.so.$(SO_VER) lib/libgsm.so
++
+ $(LIBGSM):	$(LIB) $(GSM_OBJECTS)
+ 		-rm $(RMFLAGS) $(LIBGSM)
+ 		$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
+ 		$(RANLIB) $(LIBGSM)
+ 
+-
+ # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
+ 
+-$(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSM)
+-		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB)
++$(TOAST):	$(BIN) $(TOAST_OBJECTS) $(LIBGSMSO)
++		$(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB)
+ 
+ $(UNTOAST):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(UNTOAST)
+-		$(LN) $(TOAST) $(UNTOAST)
++		$(LN) toast $(UNTOAST)
+ 
+ $(TCAT):	$(BIN) $(TOAST)
+ 		-rm $(RMFLAGS) $(TCAT)
+-		$(LN) $(TOAST) $(TCAT)
++		$(LN) toast $(TCAT)
+ 
+ 
+ # The local bin and lib directories
+@@ -352,52 +367,55 @@ toastuninstall:
+ 
+ $(TOAST_INSTALL_BIN)/toast:	$(TOAST)
+ 		-rm $(RMFLAGS) $@
+-		cp $(TOAST) $@
+-		chmod 755 $@
++		install -pm755 $(TOAST) $@
+ 
+ $(TOAST_INSTALL_BIN)/untoast:	$(TOAST_INSTALL_BIN)/toast
+ 		-rm $(RMFLAGS) $@
+-		$(LN) $? $@
++		$(LN) -rs $? $@
+ 
+ $(TOAST_INSTALL_BIN)/tcat:	$(TOAST_INSTALL_BIN)/toast
+ 		-rm $(RMFLAGS) $@
+-		$(LN) $? $@
++		$(LN) -rs $? $@
+ 
+ $(TOAST_INSTALL_MAN)/toast.1:	$(MAN)/toast.1
+ 		-rm $(RMFLAGS) $@
+-		cp $? $@
+-		chmod 444 $@
++		install -pm644 $? $@
+ 
+ $(GSM_INSTALL_MAN)/gsm.3:	$(MAN)/gsm.3
+ 		-rm $(RMFLAGS) $@
+-		cp $? $@
+-		chmod 444 $@
++		install -pm644 $? $@
+ 
+ $(GSM_INSTALL_MAN)/gsm_option.3:	$(MAN)/gsm_option.3
+ 		-rm $(RMFLAGS) $@
+-		cp $? $@
+-		chmod 444 $@
++		install -pm644 $? $@
+ 
+ $(GSM_INSTALL_MAN)/gsm_explode.3:	$(MAN)/gsm_explode.3
+ 		-rm $(RMFLAGS) $@
+-		cp $? $@
+-		chmod 444 $@
++		install -pm644 $? $@
+ 
+ $(GSM_INSTALL_MAN)/gsm_print.3:	$(MAN)/gsm_print.3
+ 		-rm $(RMFLAGS) $@
+-		cp $? $@
+-		chmod 444 $@
++		install -pm644 $? $@
+ 
+ $(GSM_INSTALL_INC)/gsm.h:	$(INC)/gsm.h
+ 		-rm $(RMFLAGS) $@
+-		cp $? $@
+-		chmod 444 $@
++		install -pm644 $? $@
+ 
+ $(GSM_INSTALL_LIB)/libgsm.a:	$(LIBGSM)
+ 		-rm $(RMFLAGS) $@
+-		cp $? $@
+-		chmod 444 $@
++		install -pm644 $? $@
+ 
++$(GSM_INSTALL_LIB)/libgsm.so.$(SO_VER):	$(LIBGSMSO).$(SO_VER)
++		-rm $(RMFLAGS) $@
++		install -pm755 $? $@
++
++$(GSM_INSTALL_LIB)/libgsm.so.$(SO_MAJOR):	$(LIBGSMSO).$(SO_MAJOR)
++		-rm $(RMFLAGS) $@
++		ln -s libgsm.so.$(SO_VER) $@
++
++$(GSM_INSTALL_LIB)/libgsm.so:	$(LIBGSMSO)
++		-rm $(RMFLAGS) $@
++		ln -s libgsm.so.$(SO_VER) $@
+ 
+ # Distribution
+ 
+
diff --git a/media-sound/gsm/gsm-1.0.22_p1.ebuild b/media-sound/gsm/gsm-1.0.22_p1.ebuild
new file mode 100644
index 000000000000..44152f94e8de
--- /dev/null
+++ b/media-sound/gsm/gsm-1.0.22_p1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Lossy speech compression library and tool"
+HOMEPAGE="https://packages.qa.debian.org/libg/libgsm.html"
+SRC_URI="
+	https://www.quut.com/gsm/${PN}-$(ver_cut 1-3).tar.gz
+	mirror://debian/pool/main/libg/lib${PN}/lib${PN}_${PV/_p/-}.debian.tar.xz
+"
+S="${WORKDIR}/${PN}-$(ver_cut 1-2)-pl$(ver_cut 3)"
+
+LICENSE="gsm"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.12-memcpy.patch
+	"${FILESDIR}"/${PN}-1.0.12-64bit.patch
+	"${WORKDIR}"/debian/patches
+	"${FILESDIR}"/${PN}-1.0.22-makefile.patch
+)
+
+DOCS=( ChangeLog MACHINES MANIFEST README )
+
+src_prepare() {
+	# Use Fedora's instead as it handles install perms (bug #554358)
+	rm "${WORKDIR}"/debian/patches/01_makefile.patch || die
+
+	default
+
+	sed -e 's/\$(GSM_INSTALL_LIB)\/libgsm.a	//g' -i Makefile || die
+
+	multilib_copy_sources
+}
+
+src_configure() {
+	# From upstream Makefile. Define this if your host multiplies
+	# floats faster than integers, e.g. on a SPARCstation.
+	use sparc && append-flags -DUSE_FLOAT_MUL -DFAST
+}
+
+multilib_src_compile() {
+	emake -j1 CCFLAGS="${CFLAGS} -c -DNeedFunctionPrototypes=1 -fPIC" \
+		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)"
+}
+
+multilib_src_install() {
+	dodir /usr/bin /usr/$(get_libdir) /usr/include/gsm /usr/share/man/man{1,3}
+
+	emake -j1 INSTALL_ROOT="${ED}"/usr \
+		LD="$(tc-getCC)" AR="$(tc-getAR)" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)" \
+		GSM_INSTALL_LIB="${ED}"/usr/$(get_libdir) \
+		GSM_INSTALL_INC="${ED}"/usr/include/gsm \
+		GSM_INSTALL_MAN="${ED}"/usr/share/man/man3 \
+		TOAST_INSTALL_MAN="${ED}"/usr/share/man/man1 \
+		install
+
+	dosym ../gsm/gsm.h /usr/include/libgsm/gsm.h
+}
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 1ebcd53b3e1e..dc90ed7a7d41 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -6,7 +6,7 @@ AUX timidity++-2.14.0-CVE-2017-11547.patch 2480 BLAKE2B 6db9598d7f8c9b969163f8ce
 AUX timidity++-2.14.0-ar.patch 822 BLAKE2B ecd76b6297cfc6fa04fdc1760dad9879a2835db79378df98a224e758d22aaa08fa7cd6f82c16b394e6d6b4bd103b9f69b7ff84b2c7ebb1b0c82c487cc8eb5dd5 SHA512 b0c26daa94361bc471034431c0632052ceb2a8e001caabfb7e08bd3f401932724981dc2c903132f9319d16038f7bac05843ca8da1112a5a3bab626c88244514b
 AUX timidity++-2.14.0-configure-flags.patch 4241 BLAKE2B d1d083ad5e397aa0e827cd21eb98b4143638559c31d38d9541f41a6d4dc12358a1c17c8115f956e177359f9ca122ee44e775abd7b6009777ca1eaaaeeadd59a1 SHA512 be9ca5a580a47af5eb29e180c81b141628692e2cb538113b3ec596e4b800fb6d4792fa4c72921414ba41a8e6932ae655e9b9a1428021333471e2929fdab07b17
 AUX timidity++-2.14.0-params.patch 716 BLAKE2B d4426e36db91fea9561a81bacb5337c8da3e385a598ebd61a38cb00ff2ab8be5b07c6259068ea31e11d0e755b28ba5769ee0cf9e6a7c31a272d1145d70e0521c SHA512 b35596de8ba6ffc4ff91a8ab7a2a0a25c658af97f8aa4e226737e910227e2a11bf4b227a5f8c61ddc1452cd614e03f75736787a2240cc530e90aba437371a09a
-AUX timidity++-2.15.0-clang-15-configure.patch 1067 BLAKE2B 0d8bc594306b4f8fdb121639ffbaf4adc8c89a0959b3fb2b43f51dc9a590c926632f408f5427f3151350b2d1afc05c1665fe669a6596d6abff39332fbd1833a6 SHA512 60b5b06657ce441d52e8ce5f9372dd4a620b7f3d279a6ec92626d41fac83ccab6bbf679a1b24e22771eeffec1d7b3a33f37bb6ed2c93699e70d5828d731bfedf
+AUX timidity++-2.15.0-clang-16-configure.patch 2049 BLAKE2B 44b63118a07200ae9daf639363af684704e1a28af8c7834f3ba75d2a73e3c06501ec4bb4ca8b1419b1fc038f7258fefd88fae15db9e17676ac6b0ac7b28336e3 SHA512 d1dfb05e97e4f76d8037a7cb23c729421aee33616512ed814f47b17d47636fe63e905b021083be29066a8d8856eb78500044e259974dfa58640a6657b25e1ee3
 AUX timidity++-2.15.0-lto-workaround.patch 319 BLAKE2B a0aa616e6e3626a5694879e8e61bfb2242e71b5e216bdb5b4aa7d5eee95aa0a800a0ff4987e1492badf12e2e1aa1c3a4c58539994718e21839d8d2fe6db669c6 SHA512 ee7949bd54e2be657c3f45b1b4848162d2655682f86acf5474c69343c35dc7bff677b588820735ec2ad29a0e8d6e9a868c8c0ecdf9a9c79d4d4e69764ef9f214
 AUX timidity++-2.15.0-pkg-config.patch 4257 BLAKE2B f9e81fdc50ff485636aaab4b0c74e7a7caba49eb8884b5176b2a71a3a582542300872786ec56886d645f8b6ec23b5312908053c47c5b107d8ecf905dbdd27402 SHA512 e6ae48d17d0b7b9589df3e90e5923cd53c86b59b2730306c2ec76f8c20013e8befd70e36d4c2629bae906cb967c1404b3595334a6f208f8799d7fbd6e030fe08
 AUX timidity.cfg-r1 669 BLAKE2B 023edf8f503f23817c1941a0cb1a0341f0ff1475405fc906a9acf4adb36ca8769bc015df5c30af50a828dd522d214bf9d6c4feabe2db3419e8100ebd431fdbdb SHA512 98f0690bda6deed6022e97e74a6114334d5f965d646d7c7d150ac177f6eb78277e931ed0b4c5613ef16ba648eaad66a3ed72ed933ca936698ca81365151b223b
@@ -14,5 +14,5 @@ AUX timidity.desktop.2 257 BLAKE2B 6c7f88a3ccd9fc4ea90cd228e6d04d799430a78361d6d
 AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cacc7a89027ec1ce6a555ea01570328d75425b006752d6332cf278642ec9a7c27b9c9adb2cb7621e241e SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.15.0.tar.xz 1363040 BLAKE2B 63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7 SHA512 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f
-EBUILD timidity++-2.15.0-r5.ebuild 5991 BLAKE2B 90f322af98cb128d9fed68a4100004cb5fb0658b1cc9f2d9a9f47a21ec534bee00ba3a03e867d64bc6213c6f409331bd0a92ac7a2b7e9c143fce3406ef52c3a9 SHA512 b6522cc30aded35718924f7e72db792c410d32e65d7c1f937cad5f0b0713acbe99a07ae04be1fa0b873281561c77c35a0f4585e72ef2294c21d1a9fe56765894
+EBUILD timidity++-2.15.0-r6.ebuild 5991 BLAKE2B a11daae2fa01f65bb72a3afa1239abd5c33994104446dbcfab385dd20ed431e8325f5647876c76f6897780081b425e7909e3dd385d5a07540d65bd1f96570588 SHA512 d66c08e73055f24b5dafbe1515485502f1f7b5a42aa6435c35693c79d2dddc5b6597a12322f0b840dfd758ac2c3f887aac3b8ed00ca3e3700bfbdb8c00205606
 MISC metadata.xml 332 BLAKE2B 417167c38c5b331872b74c9dd82d3c386cf4ea5f963201eb20744ff043ff74943867190193f87d7c5220435b38550d6a01a2879803df12934ead428d5f684126 SHA512 5e8adfac2728f35a8bda3e042450c5554ab9aa4a5addbf3dd4fa4dbe3a426a98a9a79fa8cca64c27934707d3564a26bfdc9e5acdb4f79590681885e07cd32bbb
diff --git a/media-sound/timidity++/files/timidity++-2.15.0-clang-15-configure.patch b/media-sound/timidity++/files/timidity++-2.15.0-clang-15-configure.patch
deleted file mode 100644
index 80fa7a904d12..000000000000
--- a/media-sound/timidity++/files/timidity++-2.15.0-clang-15-configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-conftest.c:114:4: error: call to undeclared library function 'exit' with type 'void (int) __attribute__((noreturn))'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
---- a/configure.in
-+++ b/configure.in
-@@ -696,6 +696,7 @@ dnl ***
- AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
- 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- 	#include <stdarg.h>
-+	#include <stdlib.h>
- 	void f (int i, ...) {
- 	va_list args1, args2;
- 	va_start (args1, i);
-@@ -715,6 +716,7 @@ AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
- AC_CACHE_CHECK([for an implementation of __va_copy()],lib_cv___va_copy,[
- 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- 	#include <stdarg.h>
-+	#include <stdlib.h>
- 	void f (int i, ...) {
- 	va_list args1, args2;
- 	va_start (args1, i);
-@@ -745,6 +747,7 @@ fi
- AC_CACHE_CHECK([whether va_lists can be copied by value],lib_cv_va_val_copy,[
- 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- 	#include <stdarg.h>
-+	#include <stdlib.h>
- 	void f (int i, ...) {
- 	va_list args1, args2;
- 	va_start (args1, i);
diff --git a/media-sound/timidity++/files/timidity++-2.15.0-clang-16-configure.patch b/media-sound/timidity++/files/timidity++-2.15.0-clang-16-configure.patch
new file mode 100644
index 000000000000..6e29a11cad3b
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.15.0-clang-16-configure.patch
@@ -0,0 +1,78 @@
+From 41c0a19ae6e67e518f9f9c43bc7d7b61971bef4e Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 6 Nov 2022 03:27:57 +0000
+Subject: [PATCH] Fix configure with Clang 15
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/autoconf/utils.m4
++++ b/autoconf/utils.m4
+@@ -62,11 +62,12 @@ yes) i_dlfcn=define;;
+ *)   i_dlfcn=undef;;
+ esac
+ cat > dyna.c <<EOM
+-fred () { }
++int fred (void) { }
+ EOM
+ 
+ cat > fred.c <<EOM
+ #include <stdio.h>
++#include <stdlib,h>
+ #$i_dlfcn I_DLFCN
+ #ifdef I_DLFCN
+ #include <dlfcn.h>      /* the dynamic linker include file for Sunos/Solaris */
+@@ -76,9 +77,9 @@ cat > fred.c <<EOM
+ #include <link.h>
+ #endif
+ 
+-extern int fred() ;
++extern int fred(void) ;
+ 
+-main()
++int main(void)
+ {
+     void * handle ;
+     void * symbol ;
+--- a/configure.in
++++ b/configure.in
+@@ -696,6 +696,7 @@ dnl ***
+ AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
+ 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ 	#include <stdarg.h>
++	#include <stdlib.h>
+ 	void f (int i, ...) {
+ 	va_list args1, args2;
+ 	va_start (args1, i);
+@@ -704,7 +705,7 @@ AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
+ 	  exit (1);
+ 	va_end (args1); va_end (args2);
+ 	}
+-	int main() {
++	int main(void) {
+ 	  f (0, 42);
+ 	  return 0;
+ 	}]])],
+@@ -715,6 +716,7 @@ AC_CACHE_CHECK([for an implementation of va_copy()],lib_cv_va_copy,[
+ AC_CACHE_CHECK([for an implementation of __va_copy()],lib_cv___va_copy,[
+ 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ 	#include <stdarg.h>
++	#include <stdlib.h>
+ 	void f (int i, ...) {
+ 	va_list args1, args2;
+ 	va_start (args1, i);
+@@ -723,7 +725,7 @@ AC_CACHE_CHECK([for an implementation of __va_copy()],lib_cv___va_copy,[
+ 	  exit (1);
+ 	va_end (args1); va_end (args2);
+ 	}
+-	int main() {
++	int main(void) {
+ 	  f (0, 42);
+ 	  return 0;
+ 	}]])],
+@@ -745,6 +747,7 @@ fi
+ AC_CACHE_CHECK([whether va_lists can be copied by value],lib_cv_va_val_copy,[
+ 	AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ 	#include <stdarg.h>
++	#include <stdlib.h>
+ 	void f (int i, ...) {
+ 	va_list args1, args2;
+ 	va_start (args1, i);
diff --git a/media-sound/timidity++/timidity++-2.15.0-r5.ebuild b/media-sound/timidity++/timidity++-2.15.0-r6.ebuild
index 0cfd3912605d..df0a65c5b44c 100644
--- a/media-sound/timidity++/timidity++-2.15.0-r5.ebuild
+++ b/media-sound/timidity++/timidity++-2.15.0-r6.ebuild
@@ -67,7 +67,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.15.0-pkg-config.patch
 	"${FILESDIR}"/${PN}-2.14.0-CVE-2017-1154{6,7}.patch
 	"${FILESDIR}"/${PN}-2.15.0-lto-workaround.patch
-	"${FILESDIR}"/${PN}-2.15.0-clang-15-configure.patch
+	"${FILESDIR}"/${PN}-2.15.0-clang-16-configure.patch
 )
 
 src_prepare() {