add support for USE=cdinstall

Package-Manager: portage-2.0.53_rc6

diff --git a/games-fps/quake1/quake1-2.40-r1.ebuild b/games-fps/quake1/quake1-2.40-r1.ebuild
index 99c1c2ee6fc697608618525e7ab7783631e71f79..1da39fe109afbc588988f8a1775caee635a1e746 100644 (file)
--- a/games-fps/quake1/quake1-2.40-r1.ebuild
+++ b/games-fps/quake1/quake1-2.40-r1.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-fps/quake1/quake1-2.40-r1.ebuild,v 1.3 2005/10/22 20:51:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake1/quake1-2.40-r1.ebuild,v 1.4 2005/10/30 05:58:54 vapier Exp $
 
 inherit eutils games
 
@@ -11,13 +11,14 @@ SRC_URI="ftp://ftp.idsoftware.com/idstuff/source/q1source.zip"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-*"
-IUSE="X opengl svga 3dfx"
+IUSE="cdinstall X opengl svga 3dfx"
 
 RDEPEND="X? ( virtual/x11 )
        opengl? ( virtual/opengl )
        svga? ( media-libs/svgalib )
        3dfx? ( media-libs/glide-v3 )"
 DEPEND="${RDEPEND}
+       cdinstall? ( games-fps/quake1-data )
        app-arch/unzip"
 
 S=${WORKDIR}
@@ -41,7 +42,7 @@ src_unpack() {
 
        epatch "${FILESDIR}"/makefile-path-fixes.patch
        epatch "${FILESDIR}"/gentoo-paths.patch
-       sed -i -e "s:GENTOO_DATADIR:${GAMES_DATADIR}/quake-data:" \
+       sed -i -e "s:GENTOO_DATADIR:${GAMES_DATADIR}/quake1:" \
                {QW/client,WinQuake}/common.c || die "setting data paths"
 
        epatch "${FILESDIR}"/makefile-cflags.patch

diff --git a/games-fps/quakeforge/quakeforge-0.5.5.ebuild b/games-fps/quakeforge/quakeforge-0.5.5.ebuild
index a427d3d33b0a9ac76c69dc6b452b81b74956ec1f..724d4a30d8bbc3255d06e202d1f8b9c5baa2624a 100644 (file)
--- a/games-fps/quakeforge/quakeforge-0.5.5.ebuild
+++ b/games-fps/quakeforge/quakeforge-0.5.5.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-fps/quakeforge/quakeforge-0.5.5.ebuild,v 1.7 2005/09/06 12:57:29 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quakeforge/quakeforge-0.5.5.ebuild,v 1.8 2005/10/30 06:00:00 vapier Exp $
 
 inherit eutils games
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/quake/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc x86"
-IUSE="debug 3dfx fbcon opengl sdl svga X ncurses vorbis zlib ipv6 xv dga xmms alsa oss"
+IUSE="cdinstall debug 3dfx fbcon opengl sdl svga X ncurses vorbis zlib ipv6 xv dga xmms alsa oss"
 RESTRICT="nouserpriv"
 
 RDEPEND="3dfx? ( media-libs/glide-v3 )
@@ -27,6 +27,7 @@ RDEPEND="3dfx? ( media-libs/glide-v3 )
        xmms? ( media-sound/xmms )
        alsa? ( media-libs/alsa-lib )"
 DEPEND="${RDEPEND}
+       cdinstall? ( games-fps/quake1-data )
        sys-devel/bison
        sys-devel/flex"
 
@@ -72,24 +73,24 @@ src_compile() {
 
        addpredict ${GAMES_LIBDIR}
        egamesconf \
-               `use_enable ncurses curses` \
-               `use_enable vorbis` \
-               `use_enable zlib` \
-               `use_with ipv6` \
-               `use_with fbcon fbdev` \
+               $(use_enable ncurses curses) \
+               $(use_enable vorbis) \
+               $(use_enable zlib) \
+               $(use_with ipv6) \
+               $(use_with fbcon fbdev) \
                ${svgaconf} \
-               `use_with X x` \
-               `use_enable xv vidmode` \
-               `use_enable dga` \
-               `use_enable sdl` \
-               `use_enable xmms` \
-               `use_enable alsa` \
-               `use_enable oss` \
+               $(use_with X x) \
+               $(use_enable xv vidmode) \
+               $(use_enable dga) \
+               $(use_enable sdl) \
+               $(use_enable xmms) \
+               $(use_enable alsa) \
+               $(use_enable oss) \
                --enable-sound \
                --disable-optimize \
                ${debugopts} \
                --with-global-cfg=${GAMES_SYSCONFDIR}/quakeforge.conf \
-               --with-sharepath=${GAMES_DATADIR}/quake-data \
+               --with-sharepath=${GAMES_DATADIR}/quake1 \
                --with-clients=${clients} \
                --with-servers=${servers} \
                --with-tools=${tools} \
@@ -111,12 +112,12 @@ pkg_postinst() {
        einfo "QuakeForge can find your Quake .pak files"
        echo
        einfo "You have 2 choices to do this"
-       einfo "1 Copy pak*.pak files to ${GAMES_DATADIR}/quake-data/id1"
-       einfo "2 Symlink pak*.pak files in ${GAMES_DATADIR}/quake-data/id1"
+       einfo "1 Copy pak*.pak files to ${GAMES_DATADIR}/quake1/id1"
+       einfo "2 Symlink pak*.pak files in ${GAMES_DATADIR}/quake1/id1"
        echo
        einfo "Example:"
        einfo "my pak*.pak files are in /mnt/secondary/Games/Quake/Id1/"
-       einfo "ln -s /mnt/secondary/Games/Quake/Id1/pak0.pak ${GAMES_DATADIR}/quake-data/id1/pak0.pak"
+       einfo "ln -s /mnt/secondary/Games/Quake/Id1/pak0.pak ${GAMES_DATADIR}/quake1/id1/pak0.pak"
        echo
        einfo "You only need pak0.pak to play the demo version,"
        einfo "the others are needed for registered version"