Version bump.

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

5 files changed, 261 insertions, 17 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 7dd1a2d32b9b..0b85c36edfeb 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.146 2012/06/09 23:24:27 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.147 2012/07/07 07:48:46 ssuominen Exp $
+
+*timidity++-2.14.0 (07 Jul 2012)
+
+  07 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  +timidity++-2.14.0.ebuild, +files/timidity++-2.14.0-params.patch,
+  +files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch:
+  Version bump.
 
   09 Jun 2012; Zac Medico <zmedico@gentoo.org> timidity++-2.13.2-r13.ebuild,
   timidity++-2.13.2-r14.ebuild:
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 5f181ef24b16..1fdffc8aa124 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -1,23 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 50timidity++-gentoo.el 180 RMD160 120c40280826edc0e6c746ed2b09372222235492 SHA1 0489f1a36d33c6d6402c30000af21274c85e2a5b SHA256 a5ca92074ec2b79251bf33a1fb9c4007f528c036f951c6e4fa87311d7acc11a0
-AUX conf.d.timidity.2 972 RMD160 60bd6643d195fd846185ca23132a969eef950f55 SHA1 c74e787f048229b7e3795e2783207d85ec9c3dad SHA256 a3a6fc74fc1353f2c5e7eda51a244fb3212cd5f33b407fe5ce1245ca2757593e
-AUX init.d.timidity.3 502 RMD160 45dcebcc3e2dd3048b4551941464a6ffcf1b8b0e SHA1 4e9f0069d14bdd121c83163d95f75a02801707a9 SHA256 b11e108210446221ccc8344f07a780349197248194bde5956ca69552f7aa5b14
-AUX init.d.timidity.4 509 RMD160 258ba7d4755ddcff250e8436766d614e845963a0 SHA1 d304200de8f256f84d4e9d6215934bf2d2dbb462 SHA256 e982455e275d34c0f2b66b94203c7380ecb2d06a59210ce7702564c858817161
-AUX timidity.cfg-r1 669 RMD160 856294ef64ab459a03375cb86e5f0fbcdef88ab3 SHA1 a1aec57e46d953082d1e59cf80eb1cb15627bb4c SHA256 50fb27ea57cc225fcb8e8368e8afc130f2bba22d0787ebb6beacd2112550f9ce
-AUX timidity.desktop.2 257 RMD160 9820f1876d172775bc69a25c577d4f2e5efd6edc SHA1 73e517e9ca9cd31d8017381986b71c3017a1fd21 SHA256 9e9d89fe6c03067d90d2786f0c41415cfa379b6d8635e1b206fffd7dd68e65aa
-AUX timidity.xpm 1522 RMD160 2b64234979909343fc2775e5eedfe8960a3190d1 SHA1 181555a128d9a512bb74192c85cbfa20099f41d1 SHA256 4b085a4b8af1648495dccc36bcb7b7637318ffb3e9c2011cc8ac43119a8b4db6
-DIST TiMidity++-2.13.2.tar.bz2 1581230 RMD160 0156221846a88abef9312700a050972d85084fd8 SHA1 8e603146e1164335303a5ac5dff291f369241b4e SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260
-DIST timidity++-2.13.2-patchset-2.tar.bz2 8465 RMD160 4b1e37c734d124757cbaf7cdf35b487c95a3660a SHA1 4805580e618bddac42bbb4ba9d035f5d1d162caa SHA256 d71bf95d27a87cbf9fbfb3d0a04dfc391f0413e0663b13622111c6325d2fb2dc
-EBUILD timidity++-2.13.2-r13.ebuild 5013 RMD160 a692f099093b9feed40c00f869a3f3cb5d4bc3f6 SHA1 427788213b2b5a5d783862d1e83101f846e29c51 SHA256 79af35b9b5255d5e5b3c9fb3f35f51a80ff938a9cacedbbec80e0912573fd523
-EBUILD timidity++-2.13.2-r14.ebuild 5030 RMD160 6326b28842dd5718f49b63224ce79c922c04fa25 SHA1 824c9f7a0bef6d8e0638ff82bfa9570f991898c4 SHA256 aec1994e0ae149c0b878898f18e5135526a0b30dc51239f64cc6c7718a29dec6
-MISC ChangeLog 23188 RMD160 4c5b8b4791bdb1dd707fd00d1c38d821e360144a SHA1 e3e7b7aaf9a4b5a446a85a2ad26a6b363a0e58cf SHA256 c6af2b6c7b4da87cc75603beeb0a935e7fa7483b65cb045e42ab59a1879cc085
-MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+AUX 50timidity++-gentoo.el 180 SHA256 a5ca92074ec2b79251bf33a1fb9c4007f528c036f951c6e4fa87311d7acc11a0 SHA512 21df87bf47d56c1072fc3942f3c988293106028dd0473dd1a03b66edc4e7586a3cf5150abdf3c932e44dc32a97ce9cbaa8016dcb28e5e60195f1fe9418ab3bd6 WHIRLPOOL 6b48cab95dc59524d11972ce36e81ac1b3bc13f38a4a45eb9e1098b3c2a47ee300ba82e618edb7f518544477ff5d34de1a47a7fc4bfe1659d5308ef6ae5f1764
+AUX conf.d.timidity.2 972 SHA256 a3a6fc74fc1353f2c5e7eda51a244fb3212cd5f33b407fe5ce1245ca2757593e SHA512 67668a6a00408ecc1e467be8f372b78be318e940d75c0fb856fadc5e5446e5d1a461c004856ab851968d6c146e662e766c09da6b815fd14b7675b92b975cabd9 WHIRLPOOL fe67d80414a6b4a88eae3bc3ae35a466f8e66378aa9190b804852d613392ba765d0e02b7743ee890ac37cdcb986fbf1b868c6f1cabf640e66cdd7b91c2b12c2c
+AUX init.d.timidity.3 502 SHA256 b11e108210446221ccc8344f07a780349197248194bde5956ca69552f7aa5b14 SHA512 ae3dac83f309eb2e6e2d364baaa3fc14dbba9be8b972798f910b6c4e98a5a135af4629b52e752fe42707d2ee6df36b2bfe67f004c73d52324a807ed0d986f741 WHIRLPOOL 9cc32f287a36541a887a0124bebbedb3eb124271982a2dccaccd20f090dee6b0266baf6942ff380639ca6bf07c25fd6a73e89d5136306e522f22f0777507187b
+AUX init.d.timidity.4 509 SHA256 e982455e275d34c0f2b66b94203c7380ecb2d06a59210ce7702564c858817161 SHA512 f1e723ff2cfed1766e636f8a71d8f12379fee0f49e723b2e3f51341239a8de238ac243f06fdc114f9b15ae6334e64ddad6c22fbd95936fafaf510bb2d485c130 WHIRLPOOL 7c75865342b8b9c9f31820d3b4d30c071afc76b2cbef093d2587a92509b06c301feac9a9d5d9d1b4fd0f928a4717f80d3ad6b0203c0c229603aa37dd6724bdb4
+AUX timidity++-2.14.0-params.patch 712 SHA256 cf78561c620f55c6dfc21f3650e9d0e55603aa991aef9c2179363bd3d608191f SHA512 63e2a1be6fec715680230de158d1fb09d5288a068288ac33b37320491ac29ec1c66f60d05ffb352c4a192540163e9c93369115fe606aa25295b727332e92874c WHIRLPOOL a6de7b97de6282980a2850636fc72a4ca47efc79afabe81417426015126d1e4f2cabbf040ca6b559b924d4ae44fe3ca930fb3a3042d54845d0c0095b0b7371d0
+AUX timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch 697 SHA256 1c0c5f672679750289b65bd8bfb42bd6ced489c2b085b2a4024351548499e9b5 SHA512 d5716b7977f5c013c61da2e9f3e233b17e3b4b95cb14b2e459bae3c69316440be899278b44566a1640d8d82b683811348c22f5e859512c523baee4939bc2a497 WHIRLPOOL 58e2ac706564baa1520c586420dd3ac044eb468812d74b35455c0469b36c7c9a6581d5db26c2b2c0ee66f919708f55e1b352de3696ab77ef6ef33a665ff4f504
+AUX timidity.cfg-r1 669 SHA256 50fb27ea57cc225fcb8e8368e8afc130f2bba22d0787ebb6beacd2112550f9ce SHA512 98f0690bda6deed6022e97e74a6114334d5f965d646d7c7d150ac177f6eb78277e931ed0b4c5613ef16ba648eaad66a3ed72ed933ca936698ca81365151b223b WHIRLPOOL d2e0e504275c59177b936591c703b5ad1f75e9e00ed0331d3c5a2c720bf6b85f39e4e531b5639f83be74f24144c3dd00b897e51de07d2248c268f342b8b52475
+AUX timidity.desktop.2 257 SHA256 9e9d89fe6c03067d90d2786f0c41415cfa379b6d8635e1b206fffd7dd68e65aa SHA512 34312594866d77244d0eb77b4111a8e7998bd20bcb3542b036b1626d73bf4672eef677a926badceaaee517f1d32752b3e3b1ea4d3f2cc0703d66c1c740e0dc2e WHIRLPOOL 8fe3b0df3377c9146399c6b2cad7c9fa497dfae433cd903843caef1eb21ac2bc1b39631d5334ab4bc033e1e3e4525bfaecefe4c8f73b1a32d42b98d2b7fb8a55
+AUX timidity.xpm 1522 SHA256 4b085a4b8af1648495dccc36bcb7b7637318ffb3e9c2011cc8ac43119a8b4db6 SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e WHIRLPOOL 8d1279dac550131b15639602972861b90e724f5391eefa7f72b3c190681b2e5a081ab2380e3717e94ed0b05b4738bad627021588d872d76ff48ff8e8a142f56a
+DIST TiMidity++-2.13.2.tar.bz2 1581230 SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260 SHA512 0e35ad4c8745878daf63932143e60dc4bda0f3ef5d6f046cad74c8c57edf39a7d1d3f0f36758d5b11ace72e2661fba1629d30d90202e9573c07d1ea2b66a6bc1 WHIRLPOOL 134a903ce7f943b538783ee610e074ff279103443bf0b2a9ff10822af376bd31d291197202913aba1325e55ee55b9d20c6087e13a79f135018ed945e8e8c8ff4
+DIST TiMidity++-2.14.0.tar.xz 1356476 SHA256 abf0c8367959e85c9e635b8fbd5183fc27bd380e0ef5e45de4158784538c86fc SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3 WHIRLPOOL 0031a0e6519ead34c73ed3383d1d74b91b3e25c257854bd3325d25ec9c00bb55c036936ef4ef162ad13c255fefc4e46b802173e93b7ed575c92cf076ab03929b
+DIST timidity++-2.13.2-patchset-2.tar.bz2 8465 SHA256 d71bf95d27a87cbf9fbfb3d0a04dfc391f0413e0663b13622111c6325d2fb2dc SHA512 5199a608518f0d92a5dc2d469babe922949b6dd7c07197af3eca167024b20e57466e99baf731abda58a4025fd842d7670dbc01130cdb6eebef11d04f4c2a32ea WHIRLPOOL 2d7281a13512090a22498d5198b4ef2d6b3e74ed23a351b8b187686fdcadea59565b924c5887b04bedf4d3ff289f73952f1bb026ff4e37c30df28d7437453462
+EBUILD timidity++-2.13.2-r13.ebuild 5013 SHA256 79af35b9b5255d5e5b3c9fb3f35f51a80ff938a9cacedbbec80e0912573fd523 SHA512 b55eb3acc89d0979d9d18208a18200764ad93083658d903cb194e059971ddd46d6ca45133ffea8debdbc39fe7e36b854f7b807f3c38b14c4ed7083e5480702df WHIRLPOOL a68279f1a2f6dbaabc5af86c611699f6c6110b880aa29414c9aac988857d7fa1c196b11ec70cd96a920ebfadd6d66b15adc5dc9d1afa5321eab849c2247e5e97
+EBUILD timidity++-2.13.2-r14.ebuild 5030 SHA256 aec1994e0ae149c0b878898f18e5135526a0b30dc51239f64cc6c7718a29dec6 SHA512 ee5b58654027021a57ee98c59444058ad1ac34f3d3c08c8b8377ff3720742054875fabf53203d5dec4d8bbe87f80a06cdca8e2ab2e3abd769abbde0ab4c9f9d6 WHIRLPOOL 37200741e8f0da61fc5ca3a7985d3fb3269c62299c06212d7dfabe34669cab5f6c13d8796c05dbe9c858d55fa2964f96ebd8e96d71f71204893520e651b2a3db
+EBUILD timidity++-2.14.0.ebuild 5054 SHA256 1cf3538f7f948067ea15da70b13e915b2284868783500357b87a803fad8c529b SHA512 2661ea33c632c3eeb365073f70cff0836b9540d6b8e492849c35ff6cf58a13f7d6b085f4e59160c8e04b4136f82437f3b6131121f218b872d4843c5dc6b11743 WHIRLPOOL f3174812de8cd4c6dd39b6e51789a824f997c737c4274a6afcd569faf8bbb54dec0e4f8cf5493925a293fcfd59d75fc20f023d8538eb025bbe1cb31aed87b544
+MISC ChangeLog 23442 SHA256 d9e2cf37d26b6041ca3211fa5a44193e1e8fd4d28653f64689cb0722968fa54d SHA512 34af100db4a23a80d9102b609f658d0050a2af19f977604c5866e1361baf765e528a88235dbfc1fc034ac8485a54cc96e5011be72793ba98fa274b821e8cf561 WHIRLPOOL 4ca4b8f0450af67ceae2c1400a9988bc3b17e85a3f62f9164864b46f74f2b7c8f861c56a95a47feb9706ddc8807dba4a6f213404b86dddc9a2c12825c606c587
+MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/T2zEACgkQ/ejvha5XGaPmKgCgiP5gDoUu2KeoV/uOmR4YWyup
-nXMAoKvJ7Tsa40vn+iImVeN/Oo1YRVSy
-=b/MN
+iQEcBAEBAgAGBQJP9+iLAAoJEEdUh39IaPFNpWQIAIFKXoBKL0p96va8KMUAKvwD
++f8/gfAmZeV5qJC9dYmv2BcFeUil/coXsgVlcTYehXmqnlQbYxWQ+rhbBvfm+h+6
+xqgXFfaGVu5PliY5BCMN4uT86XlFhS0rVEfRSJW+jw/kXaySxKozWcsTA+3c3rVh
+qdKW7zfbQJJLhkbWt1e1QN557MYrvv4tCh/lox6GMWJG3i6yr3v5SAxzzsaQdfat
+vyT7JEId+2r6lYcY1iiL0bkz18AYTmP7uWWX0W7he1UnRQAc9LL84tqKjTsy0HLi
+HPcYFVuAUvZbRr/ZTjQ/KO6ZlHhUbcH7jpX1uMHbP2fQE+BJUlfjLYR4QuzJ3FY=
+=ahiG
 -----END PGP SIGNATURE-----
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-params.patch b/media-sound/timidity++/files/timidity++-2.14.0-params.patch
new file mode 100644
index 000000000000..d56448b8761b
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.14.0-params.patch
@@ -0,0 +1,22 @@
+--- configure.in
++++ configure.in
+@@ -2245,10 +2245,15 @@
+ 
+ AM_CONDITIONAL(W32READDIR, test "x$W32READDIR" = "xyes")
+ 
+-SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS)
+-SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS)
+-SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS)
+-SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS)
++# These break flags like --param wrt #276433
++# SET_UNIQ_WORDS(LDFLAGS,$LDFLAGS)
++# SET_UNIQ_WORDS(SHLDFLAGS,$SHLDFLAGS)
++# SET_UNIQ_WORDS(CFLAGS,$EXTRACFLAGS $CFLAGS)
++# SET_UNIQ_WORDS(CPPFLAGS,$CPPFLAGS $EXTRADEFS)
++LDFLAGS="$LDFLAGS"
++SHLDFLAGS="$SHLDFLAGS"
++CFLAGS="$EXTRACFLAGS $CFLAGS"
++CPPFLAGS="$CPPFLAGS $EXTRADEFS"
+ 
+ if test "x$oss_device" != x; then
+   AC_DEFINE_UNQUOTED(OSS_DEVICE,"$oss_device", oss device name)
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
new file mode 100644
index 000000000000..a83a7db993f8
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch
@@ -0,0 +1,28 @@
+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
+
+--- interface/xskin_c.c
++++ 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++/timidity++-2.14.0.ebuild b/media-sound/timidity++/timidity++-2.14.0.ebuild
new file mode 100644
index 000000000000..8ceb3dbf1b77
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.14.0.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2012 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.ebuild,v 1.1 2012/07/07 07:48:46 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils elisp-common user
+
+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 )
+	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/openmotif-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-shompatches 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
+
+	eautoreconf
+}
+
+src_configure() {
+	export EXTRACFLAGS="${CFLAGS}" #385817
+
+	local myconf
+	local audios
+
+	use flac && audios="${audios},flac"
+	use speex && audios="${audios},speex"
+	use vorbis && audios="${audios},vorbis"
+
+	use oss && audios="${audios},oss"
+	use jack && audios="${audios},jack"
+	use ao && audios="${audios},ao"
+
+	if use nas; then
+		audios="${audios},nas"
+		myconf="${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="${audios},alsa"
+		myconf="${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="${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-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
+	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 "sed failed"
+}
+
+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
+}