needs unzip #69831

8 files changed, 16 insertions, 187 deletions

diff --git a/games-fps/aaquake2/aaquake2-0.1.ebuild b/games-fps/aaquake2/aaquake2-0.1.ebuild
index ea784a0fb99a..a4299cd84da5 100644
--- a/games-fps/aaquake2/aaquake2-0.1.ebuild
+++ b/games-fps/aaquake2/aaquake2-0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/aaquake2/aaquake2-0.1.ebuild,v 1.4 2004/06/24 22:39:58 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/aaquake2/aaquake2-0.1.ebuild,v 1.5 2004/11/03 00:18:59 vapier Exp $
 
 inherit games eutils
 
@@ -16,7 +16,9 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND="media-libs/aalib"
+RDEPEND="media-libs/aalib"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
 
 S="${WORKDIR}/quake2-3.21/linux"
 
diff --git a/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild b/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild
index f3a9377f8d9d..1b6f534f4244 100644
--- a/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild
+++ b/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild,v 1.7 2004/08/28 09:43:03 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/anaglyph-stereo-quake/anaglyph-stereo-quake-130100-r1.ebuild,v 1.8 2004/11/03 00:19:16 vapier Exp $
 
 inherit games gcc eutils
 
@@ -11,12 +11,14 @@ SRC_URI="http://home.iprimus.com.au/crbean/zip/3dGLQuake_SRC_${PV}.zip
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~amd64"
+KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="virtual/x11
 	virtual/opengl
 	media-libs/libsdl"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
 
 S="${WORKDIR}/WinQuake"
 
diff --git a/games-fps/cube/cube-20031223.ebuild b/games-fps/cube/cube-20031223.ebuild
deleted file mode 100644
index bbc3068c3fda..000000000000
--- a/games-fps/cube/cube-20031223.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/cube/cube-20031223.ebuild,v 1.8 2004/08/15 09:18:26 vapier Exp $
-
-inherit eutils games
-
-MY_P="cube_2003_12_23"
-
-DESCRIPTION="open source multiplayer and singleplayer first person shooter game"
-HOMEPAGE="http://www.cubeengine.com/"
-SRC_URI="mirror://sourceforge/cube/${MY_P}.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="x86 ppc hppa"
-IUSE=""
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-image
-	sys-libs/zlib
-	media-libs/libpng"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-S="${WORKDIR}/cube"
-CUBE_DATADIR="${GAMES_DATADIR}/${PN}/"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}/source
-	unzip -qn ${MY_P}_src.zip || die
-
-	cd ${MY_P}_src/src
-	epatch ${FILESDIR}/${PV}-gentoo-paths.patch
-	echo "#define GAMES_DATADIR \"${CUBE_DATADIR}\"" >> tools.h
-	echo "#define GAMES_DATADIR_LEN ${#CUBE_DATADIR}" >> tools.h
-	sed -i \
-		-e "s:packages/:${CUBE_DATADIR}packages/:" \
-		renderextras.cpp rendermd2.cpp sound.cpp worldio.cpp \
-		|| die "fixing data path failed"
-	# enable parallel make
-	sed -i \
-		-e 's/make -C/$(MAKE) -C/' Makefile \
-		|| die "sed Makefile failed"
-	edos2unix *.cpp
-}
-
-src_compile() {
-	cd source/${MY_P}_src/src
-	emake CXXOPTFLAGS="${CXXFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dogamesbin source/${MY_P}_src/src/cube_{client,server} \
-		|| die "dogamesbin failed"
-	exeinto "${GAMES_LIBDIR}/${PN}"
-	if [ "${ARCH}" == "x86" ] ; then
-		newexe bin_unix/linux_client cube_client
-		newexe bin_unix/linux_server cube_server
-	elif [ "${ARCH}" == "ppc" ] ; then
-		newexe bin_unix/ppc_linux_client cube_client
-		newexe bin_unix/ppc_linux_server cube_server
-	fi
-	dogamesbin ${FILESDIR}/cube_{client,server}-bin \
-		|| die "dogamesbin failed (bin)"
-	sed -i \
-		-e "s:GENTOO_DATADIR:${CUBE_DATADIR}:" \
-		-e "s:GENTOO_LIBDIR:${GAMES_LIBDIR}/${PN}:" \
-		${D}/${GAMES_BINDIR}/cube_{client,server}-bin
-
-	dodir ${CUBE_DATADIR}
-	cp -r *.cfg data packages ${D}/${CUBE_DATADIR} \
-		|| die "cp failed"
-
-	dodoc source/${MY_P}_src/src/CUBE_TODO.txt
-	dohtml -r docs/
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	einfo "You now have 2 clients and 2 servers:"
-	einfo "cube_client-bin      prebuilt version (needed to play on public multiplayer servers)"
-	einfo "cube_client          custom client built from source"
-	einfo "Parallel versions of the server have been installed"
-}
diff --git a/games-fps/cube/cube-20040522.ebuild b/games-fps/cube/cube-20040522.ebuild
index 581e6989d6ee..23ac4f22776c 100644
--- a/games-fps/cube/cube-20040522.ebuild
+++ b/games-fps/cube/cube-20040522.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/cube/cube-20040522.ebuild,v 1.4 2004/08/17 06:20:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/cube/cube-20040522.ebuild,v 1.5 2004/11/03 00:20:41 vapier Exp $
 
 inherit eutils games
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cube/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="x86 ppc hppa"
+KEYWORDS="hppa ppc x86"
 IUSE=""
 
 RDEPEND="virtual/opengl
@@ -23,6 +23,7 @@ RDEPEND="virtual/opengl
 	sys-libs/zlib
 	media-libs/libpng"
 DEPEND="${RDEPEND}
+	app-arch/unzip
 	>=sys-apps/sed-4"
 
 S="${WORKDIR}/cube"
diff --git a/games-fps/cube/files/20031223-gentoo-paths.patch b/games-fps/cube/files/20031223-gentoo-paths.patch
deleted file mode 100644
index 594a0714e5fb..000000000000
--- a/games-fps/cube/files/20031223-gentoo-paths.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- tools.cpp.orig	2002-12-17 09:35:55.000000000 -0500
-+++ tools.cpp	2002-12-17 09:39:28.000000000 -0500
-@@ -100,8 +100,19 @@
- 

- ///////////////////////// misc tools ///////////////////////

- 

-+char *addfullpath(char *s) {

-+    static char ret[256];	// choose a reasonable max buffer size

-+    if (s[0] == '/') { return s; }

-+    int slen = strlen(s);

-+    memset(ret, 0x00, 256);

-+    memcpy(ret, GAMES_DATADIR, GAMES_DATADIR_LEN);

-+    memcpy(ret+GAMES_DATADIR_LEN, s, slen);

-+    return ret;

-+}

-+

- char *path(char *s)

- {

-+    s = addfullpath(s);

-     for(char *t = s; t = strpbrk(t, "/\\"); *t++ = PATHDIV);

-     return s;

- };

---- rendergl.cpp.orig	2002-12-17 09:48:00.000000000 -0500
-+++ rendergl.cpp	2002-12-17 09:50:19.000000000 -0500
-@@ -59,6 +59,7 @@
- 

- bool installtex(int tnum, char *texname, int &xs, int &ys, bool clamp)

- {

-+    texname = addfullpath(texname);

-     SDL_Surface *s = IMG_Load(texname);

-     if(!s) { conoutf("couldn't load texture %s", (int)texname); return false; };

-     if(s->format->BitsPerPixel!=24) { conoutf("texture must be 24bpp: %s", (int)texname); return false; };

---- tools.h.orig	2002-12-17 09:51:06.000000000 -0500
-+++ tools.h	2002-12-17 09:50:59.000000000 -0500
-@@ -96,7 +96,7 @@
- #endif

- 

- 

--

-+extern char *addfullpath(char *s);

- extern char *path(char *s);

- extern char *loadfile(char *fn, int *size);

- extern void endianswap(void *, int, int);

diff --git a/games-fps/cube/files/cube-20021020-add-custom-paths.patch b/games-fps/cube/files/cube-20021020-add-custom-paths.patch
deleted file mode 100644
index 594a0714e5fb..000000000000
--- a/games-fps/cube/files/cube-20021020-add-custom-paths.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- tools.cpp.orig	2002-12-17 09:35:55.000000000 -0500
-+++ tools.cpp	2002-12-17 09:39:28.000000000 -0500
-@@ -100,8 +100,19 @@
- 

- ///////////////////////// misc tools ///////////////////////

- 

-+char *addfullpath(char *s) {

-+    static char ret[256];	// choose a reasonable max buffer size

-+    if (s[0] == '/') { return s; }

-+    int slen = strlen(s);

-+    memset(ret, 0x00, 256);

-+    memcpy(ret, GAMES_DATADIR, GAMES_DATADIR_LEN);

-+    memcpy(ret+GAMES_DATADIR_LEN, s, slen);

-+    return ret;

-+}

-+

- char *path(char *s)

- {

-+    s = addfullpath(s);

-     for(char *t = s; t = strpbrk(t, "/\\"); *t++ = PATHDIV);

-     return s;

- };

---- rendergl.cpp.orig	2002-12-17 09:48:00.000000000 -0500
-+++ rendergl.cpp	2002-12-17 09:50:19.000000000 -0500
-@@ -59,6 +59,7 @@
- 

- bool installtex(int tnum, char *texname, int &xs, int &ys, bool clamp)

- {

-+    texname = addfullpath(texname);

-     SDL_Surface *s = IMG_Load(texname);

-     if(!s) { conoutf("couldn't load texture %s", (int)texname); return false; };

-     if(s->format->BitsPerPixel!=24) { conoutf("texture must be 24bpp: %s", (int)texname); return false; };

---- tools.h.orig	2002-12-17 09:51:06.000000000 -0500
-+++ tools.h	2002-12-17 09:50:59.000000000 -0500
-@@ -96,7 +96,7 @@
- #endif

- 

- 

--

-+extern char *addfullpath(char *s);

- extern char *path(char *s);

- extern char *loadfile(char *fn, int *size);

- extern void endianswap(void *, int, int);

diff --git a/games-fps/cube/files/digest-cube-20031223 b/games-fps/cube/files/digest-cube-20031223
deleted file mode 100644
index fd37e49321a0..000000000000
--- a/games-fps/cube/files/digest-cube-20031223
+++ /dev/null
@@ -1 +0,0 @@
-MD5 22555b87ef16c403198a6f378c048c6f cube_2003_12_23.zip 18587017
diff --git a/games-fps/freedoom/freedoom-0.2.ebuild b/games-fps/freedoom/freedoom-0.2.ebuild
index ae6b1a8f9733..1619863e3c05 100644
--- a/games-fps/freedoom/freedoom-0.2.ebuild
+++ b/games-fps/freedoom/freedoom-0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/freedoom/freedoom-0.2.ebuild,v 1.2 2004/07/21 18:45:10 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/freedoom/freedoom-0.2.ebuild,v 1.3 2004/11/03 00:20:22 vapier Exp $
 
 inherit games
 
@@ -17,10 +17,11 @@ SRC_URI="mirror://sourceforge/freedoom/doom1.zip
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="ppc x86"
 IUSE=""
 
-DEPEND="!games-fps/doom-data"
+RDEPEND="!games-fps/doom-data"
+DEPEND="app-arch/unzip"
 
 src_install() {
 	insinto ${GAMES_DATADIR}/doom-data