diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2005-09-24 06:34:50 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2005-09-24 06:34:50 +0000 |
| commit | 67a21a96236020fe49fae31b7a0256c14c9042af (patch) | |
| tree | 1a9c0d09203b53da5682587abd0ba182333fe3d5 | |
| parent | Added sys-devel/gettext to DEPEND; bug #81395 (diff) | |
| download | gentoo-2-67a21a96236020fe49fae31b7a0256c14c9042af.tar.gz gentoo-2-67a21a96236020fe49fae31b7a0256c14c9042af.tar.bz2 gentoo-2-67a21a96236020fe49fae31b7a0256c14c9042af.zip | |
only turn on oggvorbis support if both the ogg and vorbis use flags are set (bug #101875)
(Portage version: 2.0.51.22-r2)
| -rw-r--r-- | games-engines/stratagus/ChangeLog | 6 | ||||
| -rw-r--r-- | games-engines/stratagus/stratagus-2.1.ebuild | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/games-engines/stratagus/ChangeLog b/games-engines/stratagus/ChangeLog index ab7bc3428cca..38e872815875 100644 --- a/games-engines/stratagus/ChangeLog +++ b/games-engines/stratagus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-engines/stratagus # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.4 2005/09/16 22:11:44 ciaranm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/ChangeLog,v 1.5 2005/09/24 06:34:50 mr_bones_ Exp $ + + 24 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> stratagus-2.1.ebuild: + only turn on oggvorbis support if both the ogg and vorbis use flags are set + (bug #101875) 16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog: Converted to UTF-8, fixed encoding screwups diff --git a/games-engines/stratagus/stratagus-2.1.ebuild b/games-engines/stratagus/stratagus-2.1.ebuild index 94c447c21f63..0f62d5493c0e 100644 --- a/games-engines/stratagus/stratagus-2.1.ebuild +++ b/games-engines/stratagus/stratagus-2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.1.ebuild,v 1.9 2005/07/25 09:00:05 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.1.ebuild,v 1.10 2005/09/24 06:34:50 mr_bones_ Exp $ inherit games @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/stratagus/${P}-src.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug doc flac mp3 mikmod ogg vorbis opengl" +IUSE="debug doc flac mp3 mikmod ogg opengl vorbis" RDEPEND="virtual/x11 app-arch/bzip2 @@ -23,18 +23,20 @@ RDEPEND="virtual/x11 flac? ( media-libs/flac ) mp3? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) - ogg? ( media-libs/libogg media-libs/libvorbis ) - vorbis? ( media-libs/libogg media-libs/libvorbis )" + ogg? ( vorbis? ( media-libs/libogg media-libs/libvorbis ) )" DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" S=${WORKDIR}/stratagus-${MY_PV} src_compile() { - local myconf="" - (use ogg || use vorbis) \ - && myconf="--enable-ogg" \ - || myconf="--disable-ogg" + local myconf + + if use ogg && use vorbis ; then + myconf="--enable-ogg" \ + else + myconf="--disable-ogg" + fi econf \ $(use_enable debug) \ $(use_with mikmod) \ |