Move non-binary files from /usr/lib/timidity to /usr/share/timidity #377245 by Michał Górny. Fix pkg-config handling and use it to get ncurses info #497362 by Dave Kemper.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 319 insertions, 15 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index a1a7e1b05280..c60615aec637 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.160 2014/04/29 02:45:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.161 2014/04/29 03:09:40 vapier Exp $
+
+*timidity++-2.14.0-r2 (29 Apr 2014)
+
+  29 Apr 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/timidity++-2.14.0-pkg-config.patch, +timidity++-2.14.0-r2.ebuild:
+  Move non-binary files from /usr/lib/timidity to /usr/share/timidity #377245 by
+  Michał Górny.  Fix pkg-config handling and use it to get ncurses info #497362
+  by Dave Kemper.
 
   29 Apr 2014; Mike Frysinger <vapier@gentoo.org>
   +files/timidity++-2.14.0-configure-flags.patch, timidity++-2.14.0-r1.ebuild:
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 8ce1832b48d9..2e9a1b003eeb 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -8,6 +8,7 @@ AUX init.d.timidity.4 509 SHA256 e982455e275d34c0f2b66b94203c7380ecb2d06a59210ce
 AUX timidity++-2.14.0-ar.patch 822 SHA256 83008c1c49e712de73d5757da950afb61f576aa40db75b6861e014737a8e50dd SHA512 b0c26daa94361bc471034431c0632052ceb2a8e001caabfb7e08bd3f401932724981dc2c903132f9319d16038f7bac05843ca8da1112a5a3bab626c88244514b WHIRLPOOL 2bfec4e128f58aa8cc14cce6070d19f79ca014cffd16597eb5fc73ad0970436c4125c016658cb4c694060c0375b5f52d64770ce5db9dc214ac168ab61d0e8424
 AUX timidity++-2.14.0-configure-flags.patch 4241 SHA256 4f3f9f2b3c652e61726eda54c43a18d32dca5322b996b4e27d8e44f0b202504c SHA512 be9ca5a580a47af5eb29e180c81b141628692e2cb538113b3ec596e4b800fb6d4792fa4c72921414ba41a8e6932ae655e9b9a1428021333471e2929fdab07b17 WHIRLPOOL ae0316647291b4081290ca491ef544c8bd073c10d344fce92dfe7af5618b58b7f2c1ca72e5e5d57b7ebfd87f82ce418e58bff95d43e4cac545d19deed11a371b
 AUX timidity++-2.14.0-params.patch 712 SHA256 cf78561c620f55c6dfc21f3650e9d0e55603aa991aef9c2179363bd3d608191f SHA512 63e2a1be6fec715680230de158d1fb09d5288a068288ac33b37320491ac29ec1c66f60d05ffb352c4a192540163e9c93369115fe606aa25295b727332e92874c WHIRLPOOL a6de7b97de6282980a2850636fc72a4ca47efc79afabe81417426015126d1e4f2cabbf040ca6b559b924d4ae44fe3ca930fb3a3042d54845d0c0095b0b7371d0
+AUX timidity++-2.14.0-pkg-config.patch 3836 SHA256 a2daa38a4da6240e76c52c19e02ea5ccca1419ab45950c8df37248c0e5c4dd1c SHA512 2dba5ca948d31d4498f44f8b4c67d59294e7cf722652b62f9502222867f1c93fa491b9741c049bde7ac976c74e52639bfc359a88e2c7f3728b723e272e40692d WHIRLPOOL f05b9476760061b7663e3aa12ef187e4466c26abab96d24d7c6f74d5f8b818dbc5cf2d399111e70310be1da74858c65499885ca3dbbf670d741b61cbaac1d498
 AUX timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch 697 SHA256 1c0c5f672679750289b65bd8bfb42bd6ced489c2b085b2a4024351548499e9b5 SHA512 d5716b7977f5c013c61da2e9f3e233b17e3b4b95cb14b2e459bae3c69316440be899278b44566a1640d8d82b683811348c22f5e859512c523baee4939bc2a497 WHIRLPOOL 58e2ac706564baa1520c586420dd3ac044eb468812d74b35455c0469b36c7c9a6581d5db26c2b2c0ee66f919708f55e1b352de3696ab77ef6ef33a665ff4f504
 AUX timidity++-2.14.0-tcltk86.patch 308 SHA256 aae1aa02206ffa62e1e48746d59d965ba0d3eec4096c4e7ab70afc2628871505 SHA512 37e8a97fe1a09382234011ab253443ba9e9be78cdb7bb4dd03ee5756bda8e614bc627a091d10b480a3ef5bca9e3961c2f14e92a548782145d2bb61da991d5f62 WHIRLPOOL 2efae14055ce713ee8f5079c5829b8a06e4cfa1af8ddda9ec620d328d00ac53817795ef393f6d661b2f60b859cde3a4d8a14f8773906c497f5069cb09f4a0792
 AUX timidity.cfg-r1 669 SHA256 50fb27ea57cc225fcb8e8368e8afc130f2bba22d0787ebb6beacd2112550f9ce SHA512 98f0690bda6deed6022e97e74a6114334d5f965d646d7c7d150ac177f6eb78277e931ed0b4c5613ef16ba648eaad66a3ed72ed933ca936698ca81365151b223b WHIRLPOOL d2e0e504275c59177b936591c703b5ad1f75e9e00ed0331d3c5a2c720bf6b85f39e4e531b5639f83be74f24144c3dd00b897e51de07d2248c268f342b8b52475
@@ -20,23 +21,24 @@ DIST timidity++-2.13.2-patchset-2.tar.bz2 8465 SHA256 d71bf95d27a87cbf9fbfb3d0a0
 EBUILD timidity++-2.13.2-r13.ebuild 4972 SHA256 b7ab9879ef4fe049caeb19b4f1b5671806976059e5fbf1ffac05a2a5b5bafb70 SHA512 a0db93b463cfd8a5e8bafe477e2c53c71d17520087061a7afe0b9135dc17ca6e8e19e76f3e4f16f915babc26cb1d507c56ce2f5377c36805fdf1a611d7f385aa WHIRLPOOL 1e0dd9a53b0d782ac0be31096acb57e36eaa907a2f3e40e8c5d72dd85b51d3a16244c5ea6f95a0d60a969e6da1cfd6dd7ddbb214843520b44b3be50fc5e6410e
 EBUILD timidity++-2.13.2-r14.ebuild 4989 SHA256 a074ed8e58cdf8c0ac14d52837f4049b13346b45ba2405308852b44d533b398d SHA512 10232197e306bb25d50ee0dfde9cac76008a388acf15153d7f15dbe679434ad358980f1d3fcbd42576bbcf87aa831e4582fcb5adb19449fb20a7c8daf1a47a6d WHIRLPOOL 12601bcd1c81c27a55121aaa6fa6d5a58808de0285b10a541545dc3c2d65e306cf76183ee16f12d3136681acde86c9f74a057d7228b5dd56b72a38fa666e07b1
 EBUILD timidity++-2.14.0-r1.ebuild 5124 SHA256 e0cfb0ecca712c6f02ff9b501be7b8dbfec4271e9ab8049d851aa49d08e9cffc SHA512 7fa2099a6ce08a356e830bc3792333851dfbdf53cca37b46c2b33b615ec3c9021b5b3944626fff550f48f104523d9f252f51d80fca65a4e85aaa67e6aa15bebf WHIRLPOOL d040cd179683c12fa853bba21e862790f37a67f7c72bb8cb940ae3887ec0d574c57c3919dfcf1761b4cb211364932a43f67585996308075412f66f24f2f10866
+EBUILD timidity++-2.14.0-r2.ebuild 5218 SHA256 44e9dcb1ab19a211370ca6d88cd0529e407de7f01068708a5e48aef8fa3d57b5 SHA512 7b0cb3cf245cfd97facc675440b8f8f594874fd9eb3a678e044947eb46bd2b518bb7b02e983c1eaac82a7579efa25f0d1a6c1fb472132a2cbf4002fb7bb847f1 WHIRLPOOL 9f7935148ba149abd3dff5fd9a227ff045d88aaeae9990dbf61e2b03ffc4c517f378966b58d7cb7f0bf31bb234d4206ddb18a6f349cac2611c3f953b73b4ad6b
 EBUILD timidity++-2.14.0.ebuild 5063 SHA256 da011be8d0939143cb40e691197066fc4b59f9aee6c5d0de02303eb1cafe67ac SHA512 505bba4933fc5c0b4016301b71d212caf330084528d3fe7466ccb2a422f015e2ed3f6dab3e6ac326bc41e571e8a383713ebd5137ba82cca2acf1eb269fc4efb1 WHIRLPOOL 92f102c11202df54a153aa068e7d4cabd55d11cec2fbfafcd97ba2869ce4186ac6ba2bbd6aafa1d9845d42d081533fa7cf9737ad6d1bfd699ff43342437c9fcd
-MISC ChangeLog 25462 SHA256 6874728c50f87056081370d44e556bbb02d1aa08bfffca44c01882437216f45f SHA512 b2e2e293a69aa4645a4395af64d8f0bf935a17416d5b035e54651efc36728238b4755bb5f7326e768be1761924f275ae0472773fe5dc09d8be4d40b205249c17 WHIRLPOOL 70e6e573e2165c8ea418b6fd8b7c6579ded7f988a6bf6d1b24997dd0d76d471854ae2f99ce21d4e2c3aa76e5bd92223141ca616c8e49126d64b1f0ae29c32b20
+MISC ChangeLog 25806 SHA256 5aad500ccdeb6f967d1eabc8239ed3199aab13fbbbf66a3336ae31005160fe34 SHA512 ee317f7e5ac4b01dc33d4fa5f565699d8ffb75f0152ac0f85a8206f0486a06b742bde5899e316d4079104a66e141ebb588c11f0f7256844d88bfe0103ebe5bac WHIRLPOOL 546d4cd7cbcf002b7f844019f268740c7c2a42060ab9db45384612531e7ba820e89451fc11efdaf789589146bb5d56cf1c96ad6c4c005a52f584377e2db740ba
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTXxJGAAoJEPGu1DbS6WIADZkP/i/9fydD6w6+Xm7FAMFDi/a0
-0tFzeiszdfMZM66TAfvik/gMiQ4DhddGvdK3GHBJxSLsmDiWU1c9BJyM7su9VEzc
-wdBmA349MN5KwCOHCyHtnKkk2Owx7OG0u+55cHycIDBDpMqZ8XNm3RTi7GWiiIbH
-aHY+M8l85a1TFRMFtDVNwguP66j6V6VNviK2mC8NRmvSf7v4TaObIhMSKrLW6i6K
-dWM5SetPQBqWDPO33h9xE2DxuC+MbbWQUYQPHMGQhCdMH1F0NlCnULCBcDkA/rc4
-RnhU9Pbc88hUdGbD95Bg7/QLV92BQ34elazKPegY1FfK/QyOKUAFKN3GwLRaCEvT
-5na5XoQEhJXm70+vmdELTQIVZckodb0X589KWoDLywiXmfj0uwNBxQc/MbZxPchQ
-75jz0RuF7UHXdaFlKfvyUdBxRQV6VduNnoaf7seQ5z+PjbxEOQ7GCWvVyYxnzl7D
-+HjBm0CkuJhlTY3jxqqWbOQOMZxo2VZTkbQOux0wT0uUxSd21iZnI/Szmn81hiE+
-Tjz9nGb8xEKxCLgopfnDPH0/vMOqWIt4V7hqBOfWNqTaG896Vl/Iom23IhpfxGZ9
-lnA5VaRKC5T6KyNNx8CZShtltLZ8cKncGhCmQWCkr32g7/6ijYJ0OAEBbfSzVyZB
-ruNh1+GLzQyMXkbGIpWB
-=vk8d
+iQIcBAEBCAAGBQJTXxf8AAoJEPGu1DbS6WIAy64P/3MlTXKNJbxBAjVFjWXlrY7q
+iwrSi/VsYBcq4a72ofybGDsssHhQyZlffPgtnq130cfG0gwb/4jw7oFgkNPaCWEA
+kUWSIFceltuRti7c5BjzFOKYXpQfpRMfgBT8tt234vu7MTy1Y5iBtqgM4QS0PJqS
+6T+3z8dKJfx6rYsaX4RTV4/qGtZtdb8NOy0C/xfInsCnBjO7MRrr0P0R2mvg4ELU
+YzO46VEPucXEp8yb1dJRIhKrL3mvsEI1Dg9PlF8z0jkutC0PIgKxfzIICYC6JDHf
+I/AertedghAY0/m5TRd5pASmVgdfcUDVBEAkhEqRuJiOS/1v6PuLtkxwlULlitGC
+fiqvTTzJgc3zXSOFxGWTvoRXBhldQrPRftpcsg9BlX/P2m3ELBoeIy4crBFjpxzy
+fOR9a5YUf0p4rPwuJ1OEOXmNAkIVYpmMvraAc+mxhd+jPAPPAgFbThxrDdFGYJMs
+FdxoqB+1RjzcL1vjEMZ9idHCph8nYc26LClI7Ax37H4Z3gMDBw/weNP2JWrttiu4
+GsXwDcJbcx+feeLvhiP+yE2e5SqX58DjnJ9rEAg5hhNbtaP12jDvAoLQ6DGtCzCD
+oncqo7/e/17f23IZ8cSBDIizxnJlKcrIoO22V5qHdMijpIMR0EPDc7JrWLhUgr3T
+Z+OSjzDd0uOdn2WU4Ixb
+=MZnT
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..15d6a4ec43f4
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.14.0-pkg-config.patch
@@ -0,0 +1,109 @@
+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++/timidity++-2.14.0-r2.ebuild b/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
new file mode 100644
index 000000000000..fac54c0c6eb1
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.14.0-r2.ebuild,v 1.1 2014/04/29 03:09:40 vapier Exp $
+
+EAPI=5
+inherit autotools eutils elisp-common user systemd toolchain-funcs
+
+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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="motif oss nas X gtk vorbis tk slang alsa jack emacs ao speex flac ncurses"
+
+DEPEND="ncurses? ( >=sys-libs/ncurses-5 )
+	emacs? ( virtual/emacs )
+	gtk? ( x11-libs/gtk+:2 )
+	tk? ( >=dev-lang/tk-8.5.13 )
+	nas? ( >=media-libs/nas-1.4 )
+	alsa? ( media-libs/alsa-lib )
+	slang? ( sys-libs/slang )
+	jack? ( media-sound/jack-audio-connection-kit )
+	vorbis? ( media-libs/libvorbis )
+	flac? ( media-libs/flac )
+	speex? ( media-libs/speex )
+	ao? ( >=media-libs/libao-0.8.5 )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 )"
+RDEPEND="${DEPEND}
+	alsa? ( media-sound/alsa-utils )
+	app-admin/eselect-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
+}
+
+src_prepare() {
+	epatch \
+		"${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
+
+	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
+
+	dodoc AUTHORS ChangeLog*
+	dodoc NEWS README* "${FILESDIR}"/timidity.cfg-r1
+
+	# 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
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}