gentoo resync : 08.01.2021

7 files changed, 2 insertions, 391 deletions

diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index b108a94c7796..6623986c824c 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -5,18 +5,12 @@ AUX timidity++-2.14.0-CVE-2017-11546.patch 1005 BLAKE2B e22fba2c36f8ff3dacbe6797
 AUX timidity++-2.14.0-CVE-2017-11547.patch 2480 BLAKE2B 6db9598d7f8c9b969163f8ceaab0832db0b2f1571ec3e23d276aa77464fad58c5db9de9a07507ecefed08840dc9ef6e9c5ce30b90188ae150536fc4fd3fdc8f3 SHA512 48083c7a59196c0cf4e82cf53ffd92edf995347a4e49e2450b2ea3ea2e6ad014d13b3881c54ca0c7ad312dd977c64d836cf543c66fc8367038271f3888c294c8
 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-gcc5.patch 1575 BLAKE2B 553ea15356aa070583b270dde7bfa8b92d3522a8c28baf6fd6286c99522436f7bc0f84d53a90de6e7b553bc7ca22a9749c9f63c83b2bd93edb1cf03626e91a7b SHA512 e4df5f5176915a21675cb0e833b88f87c7b766fe6c32beb715b538174b7118e0a80a7e0059fd32c16a4bdeabb3ecab2b8d845df805394a2f84052a894908f7bd
 AUX timidity++-2.14.0-params.patch 716 BLAKE2B d4426e36db91fea9561a81bacb5337c8da3e385a598ebd61a38cb00ff2ab8be5b07c6259068ea31e11d0e755b28ba5769ee0cf9e6a7c31a272d1145d70e0521c SHA512 b35596de8ba6ffc4ff91a8ab7a2a0a25c658af97f8aa4e226737e910227e2a11bf4b227a5f8c61ddc1452cd614e03f75736787a2240cc530e90aba437371a09a
-AUX timidity++-2.14.0-pkg-config.patch 3836 BLAKE2B 64757187ff860fbd4359dca0f567e7b71ad11ffa060e736deccd4994e0409bcc86f1f5151414e532e22f07e4dc9a6b5d75b1617c21deab616a319622a3ced0c4 SHA512 2dba5ca948d31d4498f44f8b4c67d59294e7cf722652b62f9502222867f1c93fa491b9741c049bde7ac976c74e52639bfc359a88e2c7f3728b723e272e40692d
-AUX timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch 701 BLAKE2B 32fa47b354cc3d9aedd0b3466eb69de08757f731c39d4b11fd8377d607918eedaedb0747b63ab031479790460303e971ad153875b448166632e90cab2af95598 SHA512 096ec664e401446bebe2395309cbe57c61c711a1ce4c23984ba668cdc9aef1a23a1c5d4f9111c0a2bb4e634368b57093f2dfb0aa1c60e281098bac646b8b9214
-AUX timidity++-2.14.0-tcltk86.patch 312 BLAKE2B 040b5c96771398e41adf62354bd48caeadcf030398128c39212f6226abb996d4f086d0476799726d761e0c93b84165c71d7b05a1060c1244483bbae7df782e8b SHA512 e6fd991cf5a1d568dccc1a47629e5562721325668e498b7474382b3f53f3161f1e0f40144ec5e2bb5d6f2b83ddc46fd22a2998d17763e142362cb7419a0bc31e
 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.14.0.tar.xz 1356476 BLAKE2B 8d4a360d1c16b250f3bef7c010e1e263fdda13446437ff2454dc2c2a717246c4d27836a3b40586b12b33e175bc54ee211a3a1798005733461cf5833eda11811a SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3
 DIST TiMidity++-2.15.0.tar.xz 1363040 BLAKE2B 63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7 SHA512 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f
-EBUILD timidity++-2.14.0-r3.ebuild 5315 BLAKE2B a1b395ebe1a733bd0eeebade1ee5e03a113c05d5afdcf5e5cb903a77f2e20fea730d5d4a989ef7d61dfee786af59fc46a3113f98fb8c6cea5e94b6875e2d644a SHA512 1fed33b633ce857bd813d404e3485efab67792404b99da7727e7c40014b5c658cbed887d3a222f633cc7f9423afcf642d01c7a38afb1da3f700cd4ae57c7d4ef
-EBUILD timidity++-2.15.0.ebuild 5202 BLAKE2B 21cc641ce89b10ccdbbe95e83570933e09fdf821bca230fa4fcf2f877f7949b4d01ff515600a3982bee96b3e54fc082b270f270f6a30437c5a2d950a9ff6e2ce SHA512 6a6f867216ab6ec240b1ea040bf6cb0a53049bd0541297dc706ef3edd1c4a5552d4f9b2e0c88ac408e69774d4dd2dfa98aec1b659651dd1e57db69f7bc6a3543
+EBUILD timidity++-2.15.0.ebuild 5199 BLAKE2B c18bd5a8f2af423325659a37db88cbd3382fe6e7644ee282d202646e72409ad3120fb54e858d0cd754bf3c27dc670e42d2d46621790069d91ab218a186b01174 SHA512 da54b66c4e9341d0be7f680e46fa82e32a9f0e21b1059449a2f2c413f15fa600900c2e810f49e8dde74cd83a355ef720ccbd3a81a0c169fd6b73d59a0b636157
 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-gcc5.patch b/media-sound/timidity++/files/timidity++-2.14.0-gcc5.patch
deleted file mode 100644
index 50d64e3bcbb5..000000000000
--- a/media-sound/timidity++/files/timidity++-2.14.0-gcc5.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream commit 6e189f6073e979ceccaf05c3bb5f495a1b9ed87e
-
-inline, defaults to "extern inline" with newer gcc versions
-
-With newer versions of gcc, "inline" defaults to extern, and not static if
-not specified. This causes linking problems at the end of the compile. Most
-of this occurences are fixed (or #ifdef'ed away) except these two small
-ones in timidity/mfi.c
-
-Signed-off-by: Stian Skjelstad <stian.skjelstad@...>
-
---- a/timidity/mfi.c   2004-02-17 17:02:18.000000000 +0100 
-+++ b/timidity/mfi.c   2017-02-14 04:41:24.000000000 +0100 
-@@ -344,7 +344,7 @@
- #define SEND_LASTNOTEINFO(lni, ch)				if (LASTNOTEINFO_HAS_DATA((lni)[ch])) SendLastNoteInfo(lni, ch);
- #define SEND_AND_CLEAR_LASTNOTEINFO(lni, ch)	if (LASTNOTEINFO_HAS_DATA((lni)[ch])) { SendLastNoteInfo(lni, ch); (lni)[ch].on = NO_LAST_NOTE_INFO; }
- 
--inline void StoreLastNoteInfo(LastNoteInfo *info, int channel, int time, int duration, int note, int velocity)
-+static inline void StoreLastNoteInfo(LastNoteInfo *info, int channel, int time, int duration, int note, int velocity)
- {
- 	info[channel].on = time;
- 	info[channel].off = time + duration;
-@@ -352,7 +352,7 @@
- 	info[channel].velocity = velocity;
- }
- 
--inline void SendLastNoteInfo(const LastNoteInfo *info, int channel)
-+static inline void SendLastNoteInfo(const LastNoteInfo *info, int channel)
- {
- 	NOTE_BUF_EV_DEBUGSTR(channel, info[channel].on, note_name[info[channel].note % 12], info[channel].note / 12, info[channel].velocity, info[channel].off);
- 	MIDIEVENT(info[channel].on, ME_NOTEON, channel, info[channel].note, info[channel].velocity);
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-pkg-config.patch b/media-sound/timidity++/files/timidity++-2.14.0-pkg-config.patch
deleted file mode 100644
index 15d6a4ec43f4..000000000000
--- a/media-sound/timidity++/files/timidity++-2.14.0-pkg-config.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-use $PKG_CONFIG rather than `pkg-config`
-
-https://bugs.gentoo.org/497362
-get ncurses info via pkg-config while we're at it
-
-patch by Mike Frysinger <vapier@gentoo.org>
-
---- a/configure.in
-+++ b/configure.in
-@@ -148,6 +148,7 @@ AC_SUBST(xawresdir)
- 
- # Checks for programs.
- AM_PATH_LISPDIR
-+PKG_PROG_PKG_CONFIG
- AC_PROG_CC
- AC_PROG_GCC_TRADITIONAL
- AC_PROG_INSTALL
-@@ -1318,8 +1319,8 @@ AC_MSG_CHECKING(enable_audio=jack)
- if test "x$au_enable_jack" = xyes; then
-   AC_MSG_RESULT(yes)
-   SYSEXTRAS="$SYSEXTRAS jack_a.c"
--  EXTRALIBS="$EXTRALIBS $(pkg-config --libs jack)"
--  EXTRADEFS="$EXTRADEFS -DAU_JACK $(pkg-config --cflags jack)"
-+  EXTRALIBS="$EXTRALIBS $(${PKG_CONFIG} --libs jack)"
-+  EXTRADEFS="$EXTRADEFS -DAU_JACK $(${PKG_CONFIG} --cflags jack)"
- else
-   AC_MSG_RESULT(no)
- fi
-@@ -1635,60 +1636,8 @@ dnl ncurses
- AM_CONDITIONAL(ENABLE_NCURSES, false)
- CONFIG_INTERFACE(ncurses,NCURSES,n,
-   AS_HELP_STRING([--enable-ncurses], [Enable ncurses interface        (default is no)]),
--  [ AC_CHECK_HEADERS(ncurses.h ncurses/curses.h curses.h)
--
--dnl #include <ncurses/curses.h> is failure on Plamo Linux 1.3/ncurses 1.9.9e
--dnl because <ncurses/curses.h> includes <unctrl.h>:
--dnl /usr/include/ncurses/curses.h:34: unctrl.h: No such file or directory
--dnl But surely there is unctl.h at /usr/include/ncurses/unctrl.h.
--dnl configure must check ncurses header with -I/usr/include/ncurses option.
--
--  case "$ac_cv_header_curses_h$ac_cv_header_ncurses_curses_h$ac_cv_header_ncurses_h" in
--    *yes*);;
--    *)	for i in /usr/include /usr/local/include; do
--	  if test -f "$i/ncurses/curses.h" -a -f "$i/ncurses/unctrl.h"; then
--	    AC_MSG_WARN(ncurses test is failure.  Please check config.h and common.makefile later)
--	    CPPFLAGS="$CPPFLAGS -I$i/ncurses"
--	    break
--	  fi
--	done
--	;;
--    esac
--
--    AC_CHECK_LIB(ncurses,initscr,lib_curses_opt=-lncurses,
--      [ dnl checking pdcurses
--	AC_CHECK_LIB(curses,PDC_set_ctrl_break,
--          [ lib_curses_opt=-lcurses
--	    AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses)
--	    lib_user32_opt="$lib_user32_test"
--	  ],
--	  [ dnl checking libpdcurses
--	    AC_CHECK_LIB(pdcurses,PDC_set_ctrl_break,
--	    [ lib_curses_opt=-lpdcurses
--	      AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses)
--	      lib_user32_opt="$lib_user32_test"
--	    ],
--	    [ dnl OpenBSD use -lcurses instead of -lncurses.
--	      case "$target" in
--		*openbsd*)
--		  AC_CHECK_LIB(curses,initscr,lib_curses_opt=-lcurses,
--		    [ AC_MSG_WARN(ncurses interface is not enabled)
--		      enable_ncurses=no ])
--		  ;;
--		*)
--		  if test "x$VCPP" = xyes || test "x$BORLANDC" = xyes || test "x$WATCOM_C" = xyes || test "x$DMC" = xyes || test "x$POCC" = xyes; then
--		    lib_curses_opt=libpdcurses.lib
--		    AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses)
--		  else
--		    AC_MSG_WARN(ncurses interface is not enabled)
--		    enable_ncurses=no
--		  fi
--		  ;;
--	      esac
--	    ])
--	],
--	$lib_user32_test)
--      ])
-+  [ CPPFLAGS="$CPPFLAGS $(${PKG_CONFIG} --cflags ncurses)"
-+    lib_curses_opt=$(${PKG_CONFIG} --libs ncurses)
-   ],
-   [ LIBS="$LIBS $lib_curses_opt"
-     case "$target" in
-@@ -1855,7 +1804,7 @@ CONFIG_INTERFACE(xaw,XAW,a,
-     lib_xmu_opt=-lXmu
-     lib_xt_opt=-lXt
-     if test "x$enable_xft" = "xyes" && test "x$have_xaw" != "xno"; then
--      XFT_CFLAGS="$(pkg-config --cflags xft)";
-+      XFT_CFLAGS="$(${PKG_CONFIG} --cflags xft)";
-       EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$XFT_CFLAGS)
-       lib_xft_opt="-lXft";
-     fi
-@@ -1909,7 +1858,7 @@ CONFIG_INTERFACE(xaw,XAW,a,
- 	;;
-     esac
-     if test "x$enable_xft" = "xyes" && test "x$have_xaw" != "xno"; then
--      XFT_CFLAGS="$(pkg-config --cflags xft)";
-+      XFT_CFLAGS="$(${PKG_CONFIG} --cflags xft)";
-       EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$XFT_CFLAGS)
-       a_so_libs="$a_so_libs -lXft";
-     fi
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch b/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch
deleted file mode 100644
index 6f901eab8bc0..000000000000
--- a/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-This will revert part of the commit from:
-
-http://timidity.git.sourceforge.net/git/gitweb.cgi?p=timidity/timidity;a=commit;h=e73b53437dbc1e57e61dd4d0c1407784797b08d9
-
-Because otherwise TiMidity++ simply won't build as per:
-
-../interface/libinterface.a(xskin_c.o): In function `ctl_event':
-xskin_c.c:(.text+0x17c): undefined reference to `ctl_speana_data'
-collect2: error: ld returned 1 exit status
-
---- a/interface/xskin_c.c
-+++ b/interface/xskin_c.c
-@@ -228,7 +228,6 @@
-     }
- }
- 
--#if 0
- static void ctl_speana_data(double *val, int size) {
- 
-   /* 0 <= val[n] <= (AMP*NCOLOR) */
-@@ -280,7 +279,6 @@
- 
-   return;
- }
--#endif
- 
- /*ARGSUSED*/
- static int ctl_open(int using_stdin, int using_stdout) {
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch b/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch
deleted file mode 100644
index 23ef62aa03e5..000000000000
--- a/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/451296
-
---- a/interface/tk_c.c
-+++ b/interface/tk_c.c
-@@ -913,7 +913,7 @@
- 	vsnprintf(buf, sizeof(buf), fmt, ap);
- 	Tcl_Eval(my_interp, buf);
- 	va_end(ap);
--	return my_interp->result;
-+	return Tcl_GetStringResult(my_interp);
- }
- 
- static const char *v_get2(const char *v1, const char *v2)
diff --git a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
deleted file mode 100644
index 647057fac1e7..000000000000
--- a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop elisp-common systemd toolchain-funcs user xdg-utils
-
-MY_PV=${PV/_/-}
-MY_P=TiMidity++-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
-HOMEPAGE="http://timidity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
-
-REQUIRED_USE="tk? ( X )"
-
-DEPEND="
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.5 )
-	emacs? ( >=app-editors/emacs-23.1:* )
-	flac? ( media-libs/flac )
-	gtk? ( x11-libs/gtk+:2 )
-	jack? ( virtual/jack )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	nas? ( >=media-libs/nas-1.4 )
-	ncurses? ( sys-libs/ncurses:0= )
-	slang? ( sys-libs/slang )
-	speex? ( media-libs/speex )
-	tk? ( dev-lang/tk:0= )
-	vorbis? ( media-libs/libvorbis )
-	X? (
-		media-libs/libpng:0=
-		x11-libs/libXaw
-		x11-libs/libXext
-	)
-"
-RDEPEND="${DEPEND}
-	app-eselect/eselect-timidity
-	alsa? ( media-sound/alsa-utils )
-	selinux? ( sec-policy/selinux-timidity )
-"
-
-PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	enewgroup audio 18 # Just make sure it exists
-	enewuser timidity -1 -1 /var/lib/timidity audio
-}
-
-DOCS=( AUTHORS ChangeLog NEWS README "${FILESDIR}"/timidity.cfg-r1 )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-params.patch
-	"${FILESDIR}"/${P}-revert-for-required-ctl_speana_data-function.patch
-	"${FILESDIR}"/${P}-tcltk86.patch
-	"${FILESDIR}"/${P}-ar.patch
-	"${FILESDIR}"/${P}-configure-flags.patch
-	"${FILESDIR}"/${P}-pkg-config.patch
-	"${FILESDIR}"/${P}-CVE-2017-1154{6,7}.patch
-	"${FILESDIR}"/${P}-gcc5.patch # bug 606894
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	export EXTRACFLAGS="${CFLAGS}" #385817
-
-	local myconf=()
-	local audios
-
-	use flac && audios+=",flac"
-	use speex && audios+=",speex"
-	use vorbis && audios+=",vorbis"
-	use oss && audios+=",oss"
-	use jack && audios+=",jack"
-	use ao && audios+=",ao"
-
-	if use nas; then
-		audios+=",nas"
-		myconf+=( --with-nas-library="/usr/$(get_libdir)/libaudio.so" --with-x )
-		use X || ewarn "Basic X11 support will be enabled because required by nas."
-	fi
-
-	if use alsa; then
-		audios+=",alsa"
-		myconf+=( --with-default-output=alsa --enable-alsaseq )
-	fi
-
-	# We disable motif by default and then only enable it if it's requested.
-	if use motif; then
-		myconf+=( --enable-motif --with-x )
-		use X || ewarn "Basic X11 support will be enabled because required by motif."
-	fi
-
-	econf \
-		--localstatedir=/var/state/timidity++ \
-		--with-module-dir="${EPREFIX}/usr/share/timidity" \
-		--with-lispdir="${SITELISP}/${PN}" \
-		--with-elf \
-		--enable-audio=${audios} \
-		--enable-server \
-		--enable-network \
-		--enable-dynamic \
-		--enable-vt100 \
-		--enable-spline=cubic \
-		$(use_enable emacs) \
-		$(use_enable slang) \
-		$(use_enable ncurses) \
-		$(use_with X x) \
-		$(use_enable X spectrogram) \
-		$(use_enable X wrd) \
-		$(use_enable X xskin) \
-		$(use_enable X xaw) \
-		$(use_enable gtk) \
-		$(use_enable tk tcltk) \
-		--disable-motif \
-		"${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	einstalldocs
-
-	# these are only for the ALSA sequencer mode
-	if use alsa; then
-		newconfd "${FILESDIR}"/conf.d.timidity.2 timidity
-		newinitd "${FILESDIR}"/init.d.timidity.4 timidity
-
-		systemd_dounit "${FILESDIR}"/timidity.service
-	fi
-
-	insinto /etc
-	newins "${FILESDIR}"/timidity.cfg-r1 timidity.cfg
-
-	dodir /usr/share/timidity
-	dosym ../../../etc/timidity.cfg /usr/share/timidity/timidity.cfg
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	diropts -o timidity -g nobody -m 0700
-	keepdir /var/lib/timidity
-
-	doicon "${FILESDIR}"/timidity.xpm
-	newmenu "${FILESDIR}"/timidity.desktop.2 timidity.desktop
-
-	# Order of preference: gtk, X (Xaw), ncurses, slang
-	# Do not create menu item for terminal ones
-	local interface="-id"
-	local terminal="true"
-	local nodisplay="true"
-	if use gtk || use X; then
-		interface="-ia"
-		terminal="false"
-		nodisplay="false"
-		use gtk && interface="-ig"
-	elif use ncurses || use slang; then
-		local interface="-is"
-		use ncurses && interface="-in"
-	fi
-	sed -e "s/Exec=timidity/Exec=timidity ${interface}/" \
-		-e "s/Terminal=.*/Terminal=${terminal}/" \
-		-e "s/NoDisplay=.*/NoDisplay=${nodisplay}/" \
-		-i "${D}"/usr/share/applications/timidity.desktop || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "A timidity config file has been installed in /etc/timidity.cfg."
-	elog "Do not edit this file as it will interfere with the eselect timidity tool."
-	elog "The tool 'eselect timidity' can be used to switch between installed patchsets."
-
-	if use alsa; then
-		elog "An init script for the alsa timidity sequencer has been installed."
-		elog "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
-		elog "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
-	fi
-
-	if use sparc; then
-		elog "Only saving to wave file and ALSA soundback has been tested working."
-	fi
-
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	xdg_desktop_database_update
-}
diff --git a/media-sound/timidity++/timidity++-2.15.0.ebuild b/media-sound/timidity++/timidity++-2.15.0.ebuild
index ad2957733f15..fdf335c638f8 100644
--- a/media-sound/timidity++/timidity++-2.15.0.ebuild
+++ b/media-sound/timidity++/timidity++-2.15.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
 
 REQUIRED_USE="tk? ( X )"