Fix also motif requiring X to be enabled, bug #105404 not limited to Mac OS X.

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index d57a3452fcd14e306b94a8f107f72d3bd7b99f77..3a1ddfc873bb4afc4279c7c5b73267ea2ceee300 100644 (file)
--- 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 c21ba7736cce7b0fb0e6b4de075a389efae3fbe9..88284129b331b762b61b3c75540054fdc3bb8f0d 100644 (file)
--- 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