summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-05-28 09:27:29 +0000
committerMike Frysinger <vapier@gentoo.org>2005-05-28 09:27:29 +0000
commit571807a61d049f1ddc7c6a952b16c12ecfd7a6dd (patch)
treef36e95ac3b53075533593682ec268ce72af8f45e /games-engines
parentoggvorbis -> ogg/vorbis #94254 (diff)
downloadhistorical-571807a61d049f1ddc7c6a952b16c12ecfd7a6dd.tar.gz
historical-571807a61d049f1ddc7c6a952b16c12ecfd7a6dd.tar.bz2
historical-571807a61d049f1ddc7c6a952b16c12ecfd7a6dd.zip
oggvorbis -> ogg/vorbis #94254
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'games-engines')
-rw-r--r--games-engines/scummvm/scummvm-0.7.1.ebuild16
-rw-r--r--games-engines/stratagus/stratagus-2.1.ebuild18
2 files changed, 17 insertions, 17 deletions
diff --git a/games-engines/scummvm/scummvm-0.7.1.ebuild b/games-engines/scummvm/scummvm-0.7.1.ebuild
index 870a41b4a559..82d904fef9c5 100644
--- a/games-engines/scummvm/scummvm-0.7.1.ebuild
+++ b/games-engines/scummvm/scummvm-0.7.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/scummvm/scummvm-0.7.1.ebuild,v 1.2 2005/05/27 02:45:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-0.7.1.ebuild,v 1.3 2005/05/28 09:25:24 vapier Exp $
inherit eutils games
@@ -11,15 +11,13 @@ SRC_URI="mirror://sourceforge/scummvm/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc sparc x86"
-IUSE="alsa debug flac mp3 oggvorbis sdl zlib"
+IUSE="alsa debug flac mp3 ogg vorbis sdl zlib"
RESTRICT="maketest" # it only looks like there's a test there #77507
RDEPEND=">=media-libs/libsdl-1.2.2
>media-libs/libmpeg2-0.3.1
- oggvorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
+ ogg? ( media-libs/libogg media-libs/libvorbis )
+ vorbis? ( media-libs/libogg media-libs/libvorbis )
alsa? ( >=media-libs/alsa-lib-0.9 )
mp3? ( media-libs/libmad )
flac? ( media-libs/flac )
@@ -38,8 +36,9 @@ src_compile() {
use debug \
|| myconf="${myconf} --disable-debug"
- use oggvorbis \
- || myconf="${myconf} --disable-mpeg2"
+ (use vorbis || use ogg) \
+ && myconf="${myconf} --enable-vorbis" \
+ || myconf="${myconf} --disable-vorbis --disable-mpeg2"
# NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
# mpeg2 support needs vorbis (bug #79149) so turn it off if -oggvorbis
@@ -47,7 +46,6 @@ src_compile() {
$(use_enable alsa) \
$(use_enable mp3 mad) \
$(use_enable flac) \
- $(use_enable oggvorbis vorbis) \
$(use_enable zlib) \
$(use_enable x86 nasm) \
${myconf} \
diff --git a/games-engines/stratagus/stratagus-2.1.ebuild b/games-engines/stratagus/stratagus-2.1.ebuild
index f9fbaace0b74..287b5d29f411 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.7 2005/05/27 02:46:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/stratagus/stratagus-2.1.ebuild,v 1.8 2005/05/28 09:27:29 vapier Exp $
inherit games
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/stratagus/${P}-src.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug doc flac mp3 mikmod oggvorbis opengl"
+IUSE="debug doc flac mp3 mikmod ogg vorbis opengl"
RDEPEND="virtual/x11
app-arch/bzip2
@@ -23,23 +23,25 @@ RDEPEND="virtual/x11
flac? ( media-libs/flac )
mp3? ( media-libs/libmad )
mikmod? ( media-libs/libmikmod )
- oggvorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )"
+ ogg? ( media-libs/libogg media-libs/libvorbis )
+ vorbis? ( media-libs/libogg media-libs/libvorbis )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )"
-S="${WORKDIR}/stratagus-${MY_PV}"
+S=${WORKDIR}/stratagus-${MY_PV}
src_compile() {
+ local myconf=""
+ (use ogg || use vorbis) \
+ && myconf="--enable-ogg" \
+ || myconf="--disable-ogg"
econf \
$(use_enable debug) \
- $(use_with oggvorbis ogg) \
$(use_with mikmod) \
$(use_with flac) \
$(use_with mp3 mad) \
$(use_with opengl) \
+ ${myconf} \
|| die "econf failed"
emake -j1 || die "emake failed"