From 2432fabe3eab86203d8c279296425ab76cccc133 Mon Sep 17 00:00:00 2001 From: Michael Sterrett Date: Sat, 24 Sep 2005 06:34:50 +0000 Subject: [PATCH] only turn on oggvorbis support if both the ogg and vorbis use flags are set (bug #101875) Package-Manager: portage-2.0.51.22-r2 --- games-engines/stratagus/ChangeLog | 6 +++++- games-engines/stratagus/Manifest | 14 ++------------ games-engines/stratagus/stratagus-2.1.ebuild | 18 ++++++++++-------- 3 files changed, 17 insertions(+), 21 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 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 ChangeLog: Converted to UTF-8, fixed encoding screwups diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest index 908cc88b8d7d..67c34f63eb38 100644 --- a/games-engines/stratagus/Manifest +++ b/games-engines/stratagus/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 271966fa37e2f018721d0b0eaba21eb9 stratagus-2.1.ebuild 1419 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 -MD5 d38002d97079278d3aa096459552bde6 ChangeLog 657 +MD5 a5377e6daa9e39d30d0018f1ca19aba2 stratagus-2.1.ebuild 1392 +MD5 9eb70658387e2202f796e177e3ffb9a7 ChangeLog 831 MD5 4b13f331859d7e9dd8475a36fdb70725 files/digest-stratagus-2.1 69 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFDK0NTLLFUmVNQ7rkRAjC3AJ9Ed0JTQetCFGbA5kxrwSYBTYDJoACgtiYC -CftUss4S+n4Jj7xkF5y4bBQ= -=cZ8Q ------END PGP SIGNATURE----- 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) \ -- 2.26.2