Remove timidity-update script, instead depend on eselect-timidity, and inform to...

Package-Manager: portage-2.1.2_rc2-r1

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index cfece67cbe8519c0755077cad3f0ffb42e5f5784..44d162f6ff411d339c0535b92178c9aa9104a840 100644 (file)
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.65 2006/11/22 23:32:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.66 2006/11/24 23:30:03 flameeyes Exp $
+
+*timidity++-2.13.2-r3 (24 Nov 2006)
+
+  24 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +timidity++-2.13.2-r3.ebuild:
+  Remove timidity-update script, instead depend on eselect-timidity, and
+  inform to use that to choose the patchset to use.
 
   22 Nov 2006; Diego Pettenò <flameeyes@gentoo.org>
   timidity++-2.13.2-r2.ebuild:

diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 74f1b41d4ee007d5f02d8f27c7278d515e48b730..de818e9ef67169a271d8e092dbdaeec707d4f3a8 100644 (file)
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -35,14 +35,18 @@ EBUILD timidity++-2.13.2-r2.ebuild 4310 RMD160 bd270e155b7ffe9699ce29c950705867c
 MD5 dd2860b0bfde170420a88eeee316f077 timidity++-2.13.2-r2.ebuild 4310
 RMD160 bd270e155b7ffe9699ce29c950705867c433cb4c timidity++-2.13.2-r2.ebuild 4310
 SHA256 bc76900ebd9ba966930c0db2902c42f162f95bc514b4fbb54ae2dc4805247ad5 timidity++-2.13.2-r2.ebuild 4310
+EBUILD timidity++-2.13.2-r3.ebuild 4082 RMD160 4589274b7dad95ab112a639cea887fe71c0f77b2 SHA1 7c1265dc840bd1c3cfa3cffdd1bf973529384ce5 SHA256 3c3194193978ced3deaeb2bd7ef6de53a9c48f4475a7d87781dfe13aff28662f
+MD5 e8df68ad9c34d151e0f62350d464915b timidity++-2.13.2-r3.ebuild 4082
+RMD160 4589274b7dad95ab112a639cea887fe71c0f77b2 timidity++-2.13.2-r3.ebuild 4082
+SHA256 3c3194193978ced3deaeb2bd7ef6de53a9c48f4475a7d87781dfe13aff28662f timidity++-2.13.2-r3.ebuild 4082
 EBUILD timidity++-2.13.2.ebuild 3805 RMD160 2a4297f8cd3b9e31129c0a0decf2d1efd98962a3 SHA1 5a341befa2d631911d3db961ec2f73dc57516455 SHA256 de180d93efcfc4f0882cc36897212ac82a6b379cb12bf073ea01c8405b92fd32
 MD5 2a57c4e491884a45b1faf9cb828d13f1 timidity++-2.13.2.ebuild 3805
 RMD160 2a4297f8cd3b9e31129c0a0decf2d1efd98962a3 timidity++-2.13.2.ebuild 3805
 SHA256 de180d93efcfc4f0882cc36897212ac82a6b379cb12bf073ea01c8405b92fd32 timidity++-2.13.2.ebuild 3805
-MISC ChangeLog 10726 RMD160 e3b5070f817b0d0bcb446073c8a399af1f83b01a SHA1 3560baf19ac437c5ae4dc541aa1cd56606cab3b5 SHA256 789857849f6a5fd39f848cefa93ee9bb5448dbf61dfd46015259a48ed425f98b
-MD5 2ed80322c79171d47a2199488364d59c ChangeLog 10726
-RMD160 e3b5070f817b0d0bcb446073c8a399af1f83b01a ChangeLog 10726
-SHA256 789857849f6a5fd39f848cefa93ee9bb5448dbf61dfd46015259a48ed425f98b ChangeLog 10726
+MISC ChangeLog 10974 RMD160 ab476c8a588614968b378423d42346032f6544ad SHA1 e898762616b7b984aefd8acc62e9d794aa9f0aa0 SHA256 adac6d59a8f3577f993a5d614dafbadd63d1da5d2908256e8db31a1b4d18aeeb
+MD5 bd02fab8cde935ee67e566ed9e0e44b3 ChangeLog 10974
+RMD160 ab476c8a588614968b378423d42346032f6544ad ChangeLog 10974
+SHA256 adac6d59a8f3577f993a5d614dafbadd63d1da5d2908256e8db31a1b4d18aeeb ChangeLog 10974
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -53,10 +57,13 @@ SHA256 706e64e0d9c3a5dc2c3407b65496cfac196de3a2787aeb234921deb177fcc1dc files/di
 MD5 f9f8b7aa60633b1d571491781e2c2f1d files/digest-timidity++-2.13.2-r2 536
 RMD160 c335b2484ab9ba2e1c2cff0a5bc14325614c31ad files/digest-timidity++-2.13.2-r2 536
 SHA256 98bad02a8730d1cd370c7b6f53cecc9bf9ddaa29625e93f228b7feefed147f82 files/digest-timidity++-2.13.2-r2 536
+MD5 f9f8b7aa60633b1d571491781e2c2f1d files/digest-timidity++-2.13.2-r3 536
+RMD160 c335b2484ab9ba2e1c2cff0a5bc14325614c31ad files/digest-timidity++-2.13.2-r3 536
+SHA256 98bad02a8730d1cd370c7b6f53cecc9bf9ddaa29625e93f228b7feefed147f82 files/digest-timidity++-2.13.2-r3 536
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFZN4YAiZjviIA2XgRAiIrAJ9+Nqq4ukWNkuTJ2Rz7/E9Ryfl/owCfXcfF
-wBwniin+8kTRQBtGjU9XX1Q=
-=frwZ
+iD8DBQFFZ4CDAiZjviIA2XgRAjNlAKC1sg1z/1nmk7DphGfsHUcNP5zfQwCdGIQi
+f9PhMPDmOnczTTxUZbFEm5A=
+=EEzF
 -----END PGP SIGNATURE-----

diff --git a/media-sound/timidity++/files/digest-timidity++-2.13.2-r3 b/media-sound/timidity++/files/digest-timidity++-2.13.2-r3
new file mode 100644 (file)
index 0000000..7a95c8b
--- /dev/null
+++ b/media-sound/timidity++/files/digest-timidity++-2.13.2-r3
@@ -0,0 +1,6 @@
+MD5 a82ceeb2245e22f4de2b41da21eaee32 TiMidity++-2.13.2.tar.bz2 1581230
+RMD160 0156221846a88abef9312700a050972d85084fd8 TiMidity++-2.13.2.tar.bz2 1581230
+SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260 TiMidity++-2.13.2.tar.bz2 1581230
+MD5 31bdaea612f18e2c3d45a8a73ab44c81 timidity++-2.13.2-exiterror.patch 21406
+RMD160 6b73552e18580422ca4471f12142440a4f3760a9 timidity++-2.13.2-exiterror.patch 21406
+SHA256 ccf1a3678beff5cd143bec07b64ca35620b8eac98b093898c072459051752b77 timidity++-2.13.2-exiterror.patch 21406

diff --git a/media-sound/timidity++/timidity++-2.13.2-r3.ebuild b/media-sound/timidity++/timidity++-2.13.2-r3.ebuild
new file mode 100644 (file)
index 0000000..66cecbc
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.13.2-r3.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r3.ebuild,v 1.1 2006/11/24 23:30:03 flameeyes Exp $
+
+inherit eutils
+
+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.bz2 mirror://gentoo/${P}-exiterror.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86-fbsd"
+IUSE="oss nas esd motif X gtk gtk vorbis tcltk slang alsa arts jack portaudio emacs ao speex flac ncurses"
+
+DEPEND="ncurses? ( >=sys-libs/ncurses-5.0 )
+       gtk? ( >=x11-libs/gtk+-2.0 )
+       tcltk? ( >=dev-lang/tk-8.1 )
+       motif? ( virtual/motif )
+       esd? ( >=media-sound/esound-0.2.22 )
+       nas? ( >=media-libs/nas-1.4 )
+       alsa? ( media-libs/alsa-lib )
+       slang? ( =sys-libs/slang-1.4* )
+       arts? ( kde-base/arts )
+       jack? ( media-sound/jack-audio-connection-kit )
+       portaudio? ( media-libs/portaudio )
+       vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
+       flac? ( ~media-libs/flac-1.1.2 )
+       speex? ( >=media-libs/speex-1.1.5 )
+       ao? ( >=media-libs/libao-0.8.5 )"
+
+RDEPEND="${RDEPEND}
+       app-admin/eselect-timidity
+       emacs? ( virtual/emacs )"
+
+PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches )"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${DISTDIR}/${P}-exiterror.patch"
+       epatch "${FILESDIR}/${P}-gtk26.patch"
+       epatch "${FILESDIR}/${P}-gcc4.patch"
+
+       # fix header location of speex
+       sed -i -e "s:#include <speex:#include <speex/speex:g" configure* timidity/speex_a.c
+}
+
+src_compile() {
+       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 esd && audios="${audios},esd"
+       use arts && audios="${audios},arts"
+       use jack && audios="${audios},jack"
+       use portaudio && use !ppc && audios="${audios},portaudio"
+       use ao && audios="${audios},ao"
+
+       if use nas; then
+               audios="${audios},nas"
+               myconf="${myconf} --with-nas-library=/usr/$(get_libdir)/libaudio.so"
+       fi
+
+       if use alsa; then
+               audios="${audios},alsa"
+               myconf="${myconf} --with-default-output=alsa --enable-alsaseq"
+       fi
+
+       econf \
+               --localstatedir=/var/state/timidity++ \
+               --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 motif) \
+               $(use_enable tcltk) \
+               ${myconf} || die
+
+       emake || die
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die
+
+       dodoc AUTHORS ChangeLog*
+       dodoc NEWS README* "${FILESDIR}/timidity.cfg"
+
+       # these are only for the ALSA sequencer mode
+       if use alsa; then
+               newconfd "${FILESDIR}/conf.d.timidity" timidity
+               newinitd "${FILESDIR}/init.d.timidity" 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
+               dosed 's:/usr/local/bin/timidity:/usr/bin/timidity:g' /usr/share/emacs/site-lisp/timidity.el
+       else
+               rm "${D}/timidity.el"
+       fi
+}
+
+pkg_postinst() {
+       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
+               ewarn "sparc support is experimental. oss, alsa, esd, and portaudio do not work."
+               ewarn "-Ow (save to wave file) does..."
+       fi
+}