summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2007-01-10 19:50:54 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2007-01-10 19:50:54 +0000
commitaf7b80f7e0c8d31960838c856ec8175bff2336a8 (patch)
tree4be883171523cbc9c20ea85184d7ad107ea41e35 /media-sound
parentDependency update: dev-util/guile -> dev-scheme/guile. (diff)
downloadhistorical-af7b80f7e0c8d31960838c856ec8175bff2336a8.tar.gz
historical-af7b80f7e0c8d31960838c856ec8175bff2336a8.tar.bz2
historical-af7b80f7e0c8d31960838c856ec8175bff2336a8.zip
Fix also motif requiring X to be enabled, bug #105404 not limited to Mac OS X.
Package-Manager: portage-2.1.2_rc4-r7
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/timidity++/ChangeLog6
-rw-r--r--media-sound/timidity++/timidity++-2.13.2-r3.ebuild10
2 files changed, 13 insertions, 3 deletions
diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index d57a3452fcd1..3a1ddfc873bb 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/timidity++
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.73 2007/01/10 19:46:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.74 2007/01/10 19:50:54 flameeyes Exp $
+
+ 10 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+ timidity++-2.13.2-r3.ebuild:
+ Fix also motif requiring X to be enabled, bug #105404 not limited to Mac OS X.
10 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
+files/timidity++-2.13.2-flac.patch, timidity++-2.13.2-r3.ebuild:
diff --git a/media-sound/timidity++/timidity++-2.13.2-r3.ebuild b/media-sound/timidity++/timidity++-2.13.2-r3.ebuild
index c21ba7736cce..88284129b331 100644
--- a/media-sound/timidity++/timidity++-2.13.2-r3.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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.7 2007/01/10 19:46:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r3.ebuild,v 1.8 2007/01/10 19:50:54 flameeyes Exp $
inherit eutils
@@ -77,6 +77,12 @@ src_compile() {
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="--enable-motif --with-x"
+ use X || ewarn "Basic X11 support will be enabled because required by motif."
+ fi
+
econf \
--localstatedir=/var/state/timidity++ \
--with-elf \
@@ -95,8 +101,8 @@ src_compile() {
$(use_enable X xskin) \
$(use_enable X xaw) \
$(use_enable gtk) \
- $(use_enable motif) \
$(use_enable tcltk) \
+ --disable-motif \
${myconf} || die
emake || die