gentoo resync : 22.12.2021

3 files changed, 41 insertions, 6 deletions

diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index d2ff953dbce6..ebf21a7ca12c 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -6,11 +6,12 @@ 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-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
 AUX timidity.desktop.2 257 BLAKE2B 6c7f88a3ccd9fc4ea90cd228e6d04d799430a78361d6df3428e127c1eb7ea2b82750c86932239c8a6ceb507d06fce2bc5e5ee963d56fd0e8daf2ff7890a9e68a SHA512 34312594866d77244d0eb77b4111a8e7998bd20bcb3542b036b1626d73bf4672eef677a926badceaaee517f1d32752b3e3b1ea4d3f2cc0703d66c1c740e0dc2e
 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-r1.ebuild 5087 BLAKE2B 67b4f4d28eeb90d54b2a4a0f91d5f6a4fcb03b73a11399cf58cca20eafd55721b66460756dc38c82ed1629e2f3f9fde99b1656afec6191deae1f2964e7483e98 SHA512 1c012edc9053866237147b16d2a1742a4a622249a9a34be8a8433b65b558e864e8b57a9d53bd467d0ce92fa4e995f57ce7ee2408ab9ac70dea31553c656ccb45
+EBUILD timidity++-2.15.0-r3.ebuild 5952 BLAKE2B dc8243e719c2ca236090aab5d19965c08423697ef2e32f40e7618ec22c7c2d2529ec842d2d3ba72e308b6e4d83bbdb0932c2ddb1ccf6999bb2ea32d2acacd746 SHA512 e0a3402e2887c0ad956959a581304ca7e32082647f1f61f5b52a751e10a30eeee0cd00ec38ee445856dd1440c01c6525ae23d50bc9e6df2f74109bf8388bd488
 MISC metadata.xml 332 BLAKE2B 417167c38c5b331872b74c9dd82d3c386cf4ea5f963201eb20744ff043ff74943867190193f87d7c5220435b38550d6a01a2879803df12934ead428d5f684126 SHA512 5e8adfac2728f35a8bda3e042450c5554ab9aa4a5addbf3dd4fa4dbe3a426a98a9a79fa8cca64c27934707d3564a26bfdc9e5acdb4f79590681885e07cd32bbb
diff --git a/media-sound/timidity++/files/timidity++-2.15.0-lto-workaround.patch b/media-sound/timidity++/files/timidity++-2.15.0-lto-workaround.patch
new file mode 100644
index 000000000000..2a9c9e8282e4
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.15.0-lto-workaround.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/763612
+--- a/timidity/Makefile.am
++++ b/timidity/Makefile.am
+@@ -480,3 +480,6 @@ $(top_builddir)/utils/libutils.a:
+ 
+ objs: $(timidity_OBJECTS) $(timidity_DEPENDENCIES)
+ 	@:
++
++# Prevent .symver mixup with buggy alsa headers (global asm vs. LTO partitions)
++alsa_a.$(OBJEXT): CFLAGS += -fno-lto
diff --git a/media-sound/timidity++/timidity++-2.15.0-r1.ebuild b/media-sound/timidity++/timidity++-2.15.0-r3.ebuild
index 786cb1c609b4..9d6db7b8acf6 100644
--- a/media-sound/timidity++/timidity++-2.15.0-r1.ebuild
+++ b/media-sound/timidity++/timidity++-2.15.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools desktop elisp-common systemd toolchain-funcs xdg
+inherit autotools desktop elisp-common flag-o-matic systemd toolchain-funcs xdg
 
 MY_PV="${PV/_/-}"
 MY_P="TiMidity++-${MY_PV}"
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
+IUSE="alsa ao emacs flac gtk jack motif nas ncurses ogg oss selinux slang speex tk vorbis X Xaw3d"
 
 REQUIRED_USE="tk? ( X )"
 
@@ -30,14 +30,17 @@ DEPEND="
 	motif? ( >=x11-libs/motif-2.3:0 )
 	nas? ( >=media-libs/nas-1.4 )
 	ncurses? ( sys-libs/ncurses:0= )
+	ogg? ( media-libs/libogg )
 	slang? ( sys-libs/slang )
 	speex? ( media-libs/speex )
-	tk? ( dev-lang/tk:0= )
+	tk? ( dev-lang/tk:= )
 	vorbis? ( media-libs/libvorbis )
 	X? (
-		media-libs/libpng:0=
-		x11-libs/libXaw
+		media-libs/libpng:=
+		x11-libs/libX11
 		x11-libs/libXext
+		Xaw3d? ( x11-libs/libXaw3d )
+		!Xaw3d? ( x11-libs/libXaw )
 	)
 "
 
@@ -63,10 +66,14 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.14.0-configure-flags.patch
 	"${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
 )
 
 src_prepare() {
 	default
+
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }
 
@@ -74,6 +81,21 @@ src_configure() {
 	export EXTRACFLAGS="${CFLAGS}" #385817
 
 	local audios
+	# List by preference
+	local xaw_provider=$(usex Xaw3d 'xaw3d' 'xaw')
+
+	# configure workarounds: configure.in here is written for an old version
+	# of autoconf and upstream seems quite dead.
+	#
+	# 1. Avoid janky configure test breaking
+	# ```checking for sys/wait.h that is POSIX.1 compatible... yes
+	# ./configure: 7995: test: =: unexpected operator```
+	export ac_cv_header_sys_time_h=yes
+	#
+	# 2. And yes, we expect standard header locations (this configure test is flaky for us too)
+	# This avoids a bunch of implicit decl. errors which only happen with USE=-Xaw3d(?!)
+	append-cppflags -DSTDC_HEADERS
+
 	local myeconfargs=(
 		--localstatedir=/var/state/${PN}
 		--with-module-dir="${EPREFIX}/usr/share/timidity"
@@ -95,11 +117,13 @@ src_configure() {
 		$(use_enable gtk)
 		$(use_enable tk tcltk)
 		$(use_enable motif)
+		$(use_with Xaw3d xawlib ${xaw_provider})
 	)
 
 	use flac && audios+=",flac"
 	use speex && audios+=",speex"
 	use vorbis && audios+=",vorbis"
+	use ogg && audios+=",ogg"
 	use oss && audios+=",oss"
 	use jack && audios+=",jack"
 	use ao && audios+=",ao"