Fix compability with dev-lang/tk >= 8.6.0 wrt #451296 by Helmut Jarausch and others

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 214 insertions, 16 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index aa33eb0bb3b8..b538ec70ee98 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.155 2012/10/24 19:17:46 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.156 2013/02/10 06:54:44 ssuominen Exp $
+
+*timidity++-2.14.0-r1 (10 Feb 2013)
+
+  10 Feb 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +timidity++-2.14.0-r1.ebuild, +files/timidity++-2.14.0-tcltk86.patch:
+  Fix compability with dev-lang/tk >= 8.6.0 wrt #451296 by Helmut Jarausch and
+  others
 
   24 Oct 2012; Ulrich Müller <ulm@gentoo.org> timidity++-2.13.2-r13.ebuild,
   timidity++-2.13.2-r14.ebuild, timidity++-2.14.0.ebuild:
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 24e84beff20f..90e9438d5964 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -7,6 +7,7 @@ AUX init.d.timidity.3 502 SHA256 b11e108210446221ccc8344f07a780349197248194bde59
 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++-2.14.0-tcltk86.patch 308 SHA256 aae1aa02206ffa62e1e48746d59d965ba0d3eec4096c4e7ab70afc2628871505 SHA512 37e8a97fe1a09382234011ab253443ba9e9be78cdb7bb4dd03ee5756bda8e614bc627a091d10b480a3ef5bca9e3961c2f14e92a548782145d2bb61da991d5f62 WHIRLPOOL 2efae14055ce713ee8f5079c5829b8a06e4cfa1af8ddda9ec620d328d00ac53817795ef393f6d661b2f60b859cde3a4d8a14f8773906c497f5069cb09f4a0792
 AUX timidity.cfg-r1 669 SHA256 50fb27ea57cc225fcb8e8368e8afc130f2bba22d0787ebb6beacd2112550f9ce SHA512 98f0690bda6deed6022e97e74a6114334d5f965d646d7c7d150ac177f6eb78277e931ed0b4c5613ef16ba648eaad66a3ed72ed933ca936698ca81365151b223b WHIRLPOOL d2e0e504275c59177b936591c703b5ad1f75e9e00ed0331d3c5a2c720bf6b85f39e4e531b5639f83be74f24144c3dd00b897e51de07d2248c268f342b8b52475
 AUX timidity.desktop.2 257 SHA256 9e9d89fe6c03067d90d2786f0c41415cfa379b6d8635e1b206fffd7dd68e65aa SHA512 34312594866d77244d0eb77b4111a8e7998bd20bcb3542b036b1626d73bf4672eef677a926badceaaee517f1d32752b3e3b1ea4d3f2cc0703d66c1c740e0dc2e WHIRLPOOL 8fe3b0df3377c9146399c6b2cad7c9fa497dfae433cd903843caef1eb21ac2bc1b39631d5334ab4bc033e1e3e4525bfaecefe4c8f73b1a32d42b98d2b7fb8a55
 AUX timidity.service 190 SHA256 e0490abaded5d7a7d6c82e6a61669f486461c1e39c7d64ddd63b056f7b888c2f SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49 WHIRLPOOL 895c0bc5f8a6f0730f4c24fb7a4c68dee6a1e72abf4c9252a912752c047fae22ef14523a6a83d664e5faeb96cc8534d95dde000382519a9fb7f9bd741901964f
@@ -16,23 +17,18 @@ DIST TiMidity++-2.14.0.tar.xz 1356476 SHA256 abf0c8367959e85c9e635b8fbd5183fc27b
 DIST timidity++-2.13.2-patchset-2.tar.bz2 8465 SHA256 d71bf95d27a87cbf9fbfb3d0a04dfc391f0413e0663b13622111c6325d2fb2dc SHA512 5199a608518f0d92a5dc2d469babe922949b6dd7c07197af3eca167024b20e57466e99baf731abda58a4025fd842d7670dbc01130cdb6eebef11d04f4c2a32ea WHIRLPOOL 2d7281a13512090a22498d5198b4ef2d6b3e74ed23a351b8b187686fdcadea59565b924c5887b04bedf4d3ff289f73952f1bb026ff4e37c30df28d7437453462
 EBUILD timidity++-2.13.2-r13.ebuild 5005 SHA256 5fdcc167aa6d8c48302df3a8f79483cefc03d4231127c4b5c4b17bba730037d9 SHA512 79a6948b75a18c975ece79735ffbee2ac80d1b384bb790e9a5468c5bf6daf6f2f219078be1176b8b056e79f0b8e7161ff6286ddacdd7b00689b520e3a37c262d WHIRLPOOL aa06c415b582a141d644744872928f47f25fdfdb085678d2068ec1a8379b7e52d27621e4dd284ef4b3850eb1caf66b919a4bf769c5bd0d20143aae59c9ec62eb
 EBUILD timidity++-2.13.2-r14.ebuild 5022 SHA256 ab80eb1065457f912f91c9f06688a24ee92c86febf975067a4f0ece99ae96066 SHA512 94ede5ee34a841590b961655658da174514c0d79ad277baf88cd4a95400ae35ef291ffc7fdcffcf1c4c9e9b8f89df42c60ab37e4a9806a76978c9f95cb7363d0 WHIRLPOOL ac18fbd320268523b6682fef17190ce7a5b29a4703647cb662d1ca3b92580698cc61cbdffc13b6a499a84771a928564921cb06dd81b14d7d49cac5808aed130e
+EBUILD timidity++-2.14.0-r1.ebuild 5143 SHA256 4e3c4b8aa122d665d059a7100fb29d08c96c880da980dbbbb85503498a894ecd SHA512 7ea303555914d944b016044b3aacd05cd1ce047f6a1b83304910a794b8052fe33518d59c96b8c8e4566f024f4901cd0863587ab06af0ed510a6e5fc1e16eebb4 WHIRLPOOL 85f884870b44ef04a4fbde1ffba72c8d139d0ad61393a0d7a97bf8cf0db51a8019c6203acd9ff0e46692bed84db76ce7eb49e2e84b18fd785e319b0faafc2f7b
 EBUILD timidity++-2.14.0.ebuild 5095 SHA256 b07a294d06d9c1b8179da21bcbd51669ff2d05ecc0908516a012d579e23a2cbe SHA512 d63f4a2b084e1a89c990a2e5412f28358106474446d289fe4cf911922df2cf394dda6633bf634d79346e78316a8e28b61a82dd4375070b9fcb710f1c915f7151 WHIRLPOOL dc2c2223846c7464ff084f4c2c31bcdbcd4f58db0f18279f982b4aed6fea402069e434f27b5f313ff59ac2150b343306c5d5b16d2c2e4c737b68d63c6afa5a0e
-MISC ChangeLog 24442 SHA256 8557594903285a6cab7dcd0f692477864a6d467f277c9b75df7b0ba8d0f98581 SHA512 7676733496e75b1fe11856a0c51b99259c970b5283c547f622f6a968335761e9d405eb369ce91f68b114735db9041b38be079cc8a7b76b38f5b5f2454513bdea WHIRLPOOL 49f0e2315c5e690d17d42d17673fbce2f7446763678a2c845fef2df0f23dc68489e151cc2b3b215885f239d567cf291b5a6b4f845c3078a14b3881c940a66dcb
+MISC ChangeLog 24700 SHA256 81e12bdc420569a6e93d9d39acdb5ebc21297d70b372d1aa9d2d597840090c74 SHA512 e58b2bd682d3056e3555f11b6012cbfed963c94328d8f1fd86423ae1bfa8c795d3c82fbee79b7b58413ef7a2c9cf1787c9d8b2048cc2726edfc96581b8b17565 WHIRLPOOL 5b8f31161e538b9091aa71b4e74f52b7f0c06f212de56a101184b822916f521ac0d24f82640d203659964413a12e8f919a1aecc35bba35313ce53e1dabd315dc
 MISC metadata.xml 158 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b SHA512 90f74979d228a35f81de50665ead63d228bc4f0d11f3def4832c9607f4242cbc4562db0a123bdcf2c4b6e0be78fc5565a65f75cdb53ed4c8d45544ebf74255dc WHIRLPOOL a90483bd4fa01ed5fa21bfe9f59c11b97c793146e3031eae342a3355c6dc2e4ef2b356af0bf711b5e16e16551c91d63ecdbb48e708df606017264e8bff5e9fe9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQiD7mAAoJEDxpGckxwJCBTHUP/3akdSZ950n5Ya07qJmtP5DT
-M3ALJdyUv2bYfRW45EFd241yYCEgflIJkvDsaN7PGD66+APWVfMqzRgwvcw+mQrY
-BRG5o+0aW+6hF7Sj/SKl7N0nhqDTIJ+3OdmcKdhCcl8lUPs4c/krPNsqCGb999J8
-nariHRh9RN3G/j4HYNO8CaqtFQJtUv2rwMiHnoyoCBhQbGWwMjq4ThUFVTTGLShB
-DnP22+J5ol/AqacRuNQf7rKGPcXQrNkuamTmGDmQoIKmq/akoZ/DMX/UjN3lzI8t
-wjWdoUqoMrwBg2J4c5CJDWEh8MDMdZ4pkypmtsfd39+JtzIIDJmot6cmf7X/4Uy6
-E1eMUvi9sOqtomT+7rO8fPhBrSTR8/tC4C+Kc9sG4rrlfwXm+W0VXeWvWwleAu+Q
-hYHb6r5vpfMwVRP/OIbMVPN9GXcdY6sbg55PwjbFmnfOZtn1EpxlPLZb7Z3j+n7r
-izCJi8cBnwExBNwtQvYjlCxB0UtVGUIc2tuuplXdIjjbBGBLZ2g85uoJim5S+Uv7
-TStco2FN1SyUi0X/hZdKDsWkHWD/Z9woKXAub8htNyPr89y7VmWpRkiXMWSgdCXd
-qckMiKAynCEWMMvgorl7wYQD/h+HkTv0c+j3VXRvMgbQSDc8F7RlY3K3rXs+/BK+
-85DcW+GDPSxD+71vD1qT
-=PhaA
+iQEcBAEBCAAGBQJRF0P5AAoJEEdUh39IaPFNnjMH/13ohzpuLc+oT4YfgDjJ4TMn
+WcRnuhrbISrW5N6cXUt/1dKzrlOleVuOqlXS5ZTMjo5Ryd69PzMscB3F8zqEU3YH
+4CTvGIF8pabQPZyNTTA/HLtg+HSI5PYOYMCqHfZBtqyiRusr08Ysg3LcGFfPtOjF
+AeenWEPQIs+rxEjiGLQIR2PeVX3XBKFCIBmBymbMHC0GlEi+/LaEum6m7l942385
+DXq48MpPO8ZDO2voBAn4ze0K0O7YRl8cut0U/KPwyy3h9sL6xmaqzOZiWdHHKK8O
+gCTOnwUHiG871aNAJ/Cp967+wPC4d/XdXfgrZkQo8TN0Bc5n/e1wFEw+ZLu1WQQ=
+=tETt
 -----END PGP SIGNATURE-----
diff --git a/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch b/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch
new file mode 100644
index 000000000000..ea2c0eec6c7d
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.14.0-tcltk86.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/451296
+
+--- interface/tk_c.c
++++ 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-r1.ebuild b/media-sound/timidity++/timidity++-2.14.0-r1.ebuild
new file mode 100644
index 000000000000..de2d3e0da49e
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.14.0-r1.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2013 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-r1.ebuild,v 1.1 2013/02/10 06:54:44 ssuominen Exp $
+
+EAPI=5
+inherit autotools eutils elisp-common user systemd
+
+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-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 \
+		"${FILESDIR}"/${P}-tcltk86.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
+
+		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
+}