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 | c6ad564082eb7cb4f467533efa9e30502da5db0a (patch) | |
| tree | e1f0666f93e1da0e69914b4faf61ea575f2cf2bc /media-libs/sdl-mixer | |
| parent | Remove unused inherit's (diff) | |
| download | historical-c6ad564082eb7cb4f467533efa9e30502da5db0a.tar.gz historical-c6ad564082eb7cb4f467533efa9e30502da5db0a.tar.bz2 historical-c6ad564082eb7cb4f467533efa9e30502da5db0a.zip | |
link the midi-related use flags more (bug #412407)
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild | 14 |
3 files changed, 13 insertions, 10 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/Manifest b/media-libs/sdl-mixer/Manifest index 289707849807..b748b551ab1c 100644 --- a/media-libs/sdl-mixer/Manifest +++ b/media-libs/sdl-mixer/Manifest @@ -5,6 +5,6 @@ DIST SDL_mixer-1.2.11.tar.gz 2690654 RMD160 559355116a1c380edf71879da0dbcf5359f0 DIST SDL_mixer-1.2.12.tar.gz 3707781 RMD160 99089725824095398bfb34fd9ccb7c16674192d8 SHA1 a20fa96470ad9e1052f1957b77ffa68fb090b384 SHA256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a EBUILD sdl-mixer-1.2.11-r1.ebuild 1951 RMD160 ed55ecb18b9953302b1a13088539a7a4c5e342a3 SHA1 e2fd96ad1f66c58af006ebbef62850ac8de324c8 SHA256 7b43f2fb558ed816b37da24eb4d62346518ceb791a3eb67dee1c479631f68431 EBUILD sdl-mixer-1.2.11-r2.ebuild 2001 RMD160 00f8791f2c6db5d1f3758a60028bef62f832762d SHA1 e1ed9b39f3da70fb2be3c757cb5a031414dba5b6 SHA256 abee677cae29900fd4f72b379299367629ba25b4e0f68454c5891f4fb62c2ca8 -EBUILD sdl-mixer-1.2.12.ebuild 2781 RMD160 4f451bbaf262f23f4ffaf9918a14f597c584351c SHA1 70764eef920a8ff9b96ed12ab153d4abf71a6f0b SHA256 9aff0d1f5543d92cac94f99abd1e4791048d65885c48dc356742ee0567ec5c90 -MISC ChangeLog 12836 RMD160 15380892722058142ea9bc918929c3ffdd4c52e8 SHA1 aff3557aea59970d5c0cd3c2fc646cf9247bbae7 SHA256 f96de50f0c21607c2da06e66cc87d6898609a595de48e817cf959615644e8bf0 +EBUILD sdl-mixer-1.2.12.ebuild 2794 RMD160 f64e74dc3d1f4ed1d1786cac1834461abbb2b839 SHA1 7ff40f34fd1b1ad603a13ac5a66d8ca94154ddc7 SHA256 6f983e808c6975faa138a9c9e0964a3a7da511e7ff436d79ef9afa7e0b784023 +MISC ChangeLog 12970 RMD160 8d5afe506864312beb7049a3b9c8cf1d5cad5139 SHA1 58bcd12ffd148a35b03acf825cd01be7c5493d0c SHA256 0c17f3d999f6eb4f4e2661271579b8273b3dacd666f7176a92b0f7fa992dbb88 MISC metadata.xml 444 RMD160 18310115d9bb10e27fd06a98140761690c0d5d0b SHA1 c664c68d70101827efe3dfbf3b4ba1b455ce1829 SHA256 8d05f3c14ea95b51318a3cc7fb0727d2e69b9eaee8d7e75e3abaf75a47e2ef0a 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 \ |