diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2012-04-17 21:15:44 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2012-04-17 21:15:44 +0000 |
| commit | c56f0ca6b12e7eefc985a6bd2ca5d0c05f1c2305 (patch) | |
| tree | 3382a0ee15c020c3ea33faea86e94ae374c25e78 /media-libs/sdl-mixer | |
| parent | Remove unused inherit's (diff) | |
| download | gentoo-2-c56f0ca6b12e7eefc985a6bd2ca5d0c05f1c2305.tar.gz gentoo-2-c56f0ca6b12e7eefc985a6bd2ca5d0c05f1c2305.tar.bz2 gentoo-2-c56f0ca6b12e7eefc985a6bd2ca5d0c05f1c2305.zip | |
link the midi-related use flags more (bug #412407)
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/sdl-mixer')
| -rw-r--r-- | media-libs/sdl-mixer/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/media-libs/sdl-mixer/ChangeLog b/media-libs/sdl-mixer/ChangeLog index 101e0b683562..181dd18e9e3b 100644 --- a/media-libs/sdl-mixer/ChangeLog +++ b/media-libs/sdl-mixer/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/sdl-mixer # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.95 2012/04/17 14:46:13 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/ChangeLog,v 1.96 2012/04/17 21:15:44 mr_bones_ Exp $ + + 17 Apr 2012; Michael Sterrett <mr_bones_@gentoo.org> sdl-mixer-1.2.12.ebuild: + link the midi-related use flags more (bug #412407) 17 Apr 2012; Michael Sterrett <mr_bones_@gentoo.org> sdl-mixer-1.2.12.ebuild: more midi-related dep cleanup from James Le Cuirot diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild index b5bfd296c5e0..fdf5ae153fa2 100644 --- a/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild +++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild,v 1.11 2012/04/17 14:46:13 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild,v 1.12 2012/04/17 21:15:44 mr_bones_ Exp $ EAPI=4 inherit eutils @@ -14,7 +14,11 @@ LICENSE="ZLIB" SLOT="0" KEYWORDS="~alpha amd64 arm hppa ~mips ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="flac fluidsynth mad midi mikmod modplug mp3 playtools static-libs timidity vorbis +wav" -REQUIRED_USE="midi? ( || ( timidity fluidsynth ) )" +REQUIRED_USE=" + midi? ( || ( timidity fluidsynth ) ) + timidity? ( midi ) + fluidsynth? ( midi ) + " DEPEND=">=media-libs/libsdl-1.2.10 flac? ( media-libs/flac ) @@ -38,12 +42,8 @@ src_prepare() { } src_configure() { - local myconf - - if use midi; then - myconf=$(use_enable timidity music-timidity-midi) \ + local myconf=$(use_enable timidity music-timidity-midi) \ $(use_enable fluidsynth music-fluidsynth-midi) - fi econf \ --disable-dependency-tracking \ |