add joystick into IUSE

Package-Manager: portage-2.0.51-r12

10 files changed, 7 insertions, 428 deletions

diff --git a/games-fps/quake2-icculus/Manifest b/games-fps/quake2-icculus/Manifest
index 23ae27daa2ca..e3ee5b7d3d85 100644
--- a/games-fps/quake2-icculus/Manifest
+++ b/games-fps/quake2-icculus/Manifest
@@ -3,24 +3,16 @@ Hash: SHA1
 
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 76f7823250576f7a3162d81e32eb8e9d ChangeLog 2258
-MD5 f288af0e2522875c78b0962df03705b4 quake2-icculus-0.15-r2.ebuild 5332
-MD5 2147045ec073c4bf6cf64309e8f2de1f quake2-icculus-0.16.ebuild 4300
+MD5 28701f3541a864086f3e4e9187c74d84 quake2-icculus-0.16.ebuild 4309
 MD5 c5a30b68d4f251a28b005d64f9d52482 files/0.16-gentoo-path.patch 3493
 MD5 74cb73011282b923820f35f8450ba583 files/README-postinstall 3083
 MD5 5b009d6ae138bf55ab1d37db69326724 files/digest-quake2-icculus-0.16 248
 MD5 183390437d587db8cb815bfc1ac2ecbb files/0.16-Makefile-gentoo-opts.patch 249
 MD5 a9abc17ddbcfc3e70d9b57276eaccfba files/0.16-rogue-nan.patch 242
-MD5 c95a6c91b14235134b9ac58fdee7c5eb files/digest-quake2-icculus-0.15-r2 248
-MD5 120a7c909d5da60c01928a64b62c56a3 files/0.15-Makefile-amd64.patch 2905
-MD5 2219e82edb75f4e2a9fa232afc365c5d files/0.15-Makefile-gcc3.patch 787
-MD5 d767ab81dded19a075fc660fdd3f83fd files/0.15-Makefile-noopts.patch 766
-MD5 ad5de2e8c5c06b69b3b5a2dd926a758f files/0.15-Makefile-optflags.patch 260
-MD5 8f9b425244542bcbc17b3b3864869b0c files/0.15-amd64.patch 358
-MD5 44cf8825897944b4bec1d7169ca0b441 files/0.15-gentoo-path.patch 1708
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.9.14 (GNU/Linux)
 
-iD8DBQFB2zsBroRuSHgZdywRAvZ4AJ9pN3zDkEC2xFbAC1NEPpklKPskkgCeObkg
-RykuQ04IiT9rH9ITGQAy1Uc=
-=LTf6
+iD8DBQFB6GmHroRuSHgZdywRAihdAJ40fcV92EA2AO4h40kBnT7sQth6tgCggSUP
+Q1uUrnaAwIHE1XDM0uq1A3o=
+=o35u
 -----END PGP SIGNATURE-----
diff --git a/games-fps/quake2-icculus/files/0.15-Makefile-amd64.patch b/games-fps/quake2-icculus/files/0.15-Makefile-amd64.patch
deleted file mode 100644
index 633f7856ff4d..000000000000
--- a/games-fps/quake2-icculus/files/0.15-Makefile-amd64.patch
+++ /dev/null
@@ -1,111 +0,0 @@
---- Makefile.orig	2004-02-03 22:17:10.302818528 -0500
-+++ Makefile	2004-02-03 22:18:14.369078976 -0500
-@@ -58,11 +58,13 @@
- ifneq ($(ARCH),axp)
- ifneq ($(ARCH),ppc)
- ifneq ($(ARCH),sparc)
-+ifneq ($(ARCH),x86_64)
- $(error arch $(ARCH) is currently not supported)
- endif
- endif
- endif
- endif
-+endif
- 
- CC=gcc
- 
-@@ -82,12 +84,16 @@
- endif
- 
- ifeq ($(ARCH),i386)
--RELEASE_CFLAGS=-ffast-math -funroll-loops $(BASE_CFLAGS)
--#	-falign-jumps=2 -falign-functions=2 -g
-+RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops -malign-loops=2 \
-+	-malign-jumps=2 -malign-functions=2 -g
- # compiler bugs with gcc 2.96 and 3.0.1 can cause bad builds with heavy opts.
- #RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -m486 -ffast-math -funroll-loops \
--#	-fomit-frame-pointer -fexpensive-optimizations -falign-loops=2 \
--#	-falign-jumps=2 -falign-functions=2
-+#	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
-+#	-malign-jumps=2 -malign-functions=2
-+endif
-+
-+ifeq ($(ARCH),x86_64)
-+RELEASE_CFLAGS=$(BASE_CFLAGS) -fomit-frame-pointer -fexpensive-optimizations
- endif
- 
- VERSION=3.21+rCVS
-@@ -338,11 +344,40 @@
-  endif
- endif # ARCH i386
- 
-+ifeq ($(ARCH),x86_64)
-+ ifeq ($(strip $(BUILD_SDLQUAKE2)),YES)
-+  TARGETS += $(BUILDDIR)/sdlquake2
-+ endif
-+
-+ ifeq ($(strip $(BUILD_SVGA)),YES)
-+  TARGETS += $(BUILDDIR)/ref_soft.$(SHLIBEXT)
-+ endif
-+
-+ ifeq ($(strip $(BUILD_X11)),YES)
-+  TARGETS += $(BUILDDIR)/ref_softx.$(SHLIBEXT)
-+ endif
-+
-+ ifeq ($(strip $(BUILD_GLX)),YES)
-+  TARGETS += $(BUILDDIR)/ref_glx.$(SHLIBEXT)
-+ endif
-+
-+ ifeq ($(strip $(BUILD_FXGL)),YES)
-+  TARGETS += $(BUILDDIR)/ref_gl.$(SHLIBEXT)
-+ endif
-+
-+ ifeq ($(strip $(BUILD_SDL)),YES)
-+  TARGETS += $(BUILDDIR)/ref_softsdl.$(SHLIBEXT)
-+ endif
-+
-+ ifeq ($(strip $(BUILD_SDLGL)),YES)
-+  TARGETS += $(BUILDDIR)/ref_sdlgl.$(SHLIBEXT)
-+ endif
-+endif # ARCH x86_64
-+
- ifeq ($(strip $(BUILD_AA)),YES)
- 	TARGETS += $(BUILDDIR)/ref_softaa.$(SHLIBEXT)
- endif
- 
--RELEASE_CFLAGS += $(OPTCFLAGS)
- all: build_debug build_release
- 
- build_debug:
-@@ -441,7 +476,8 @@
- QUAKE2_AS_OBJS = \
- 	$(BUILDDIR)/client/snd_mixa.o
- else
--QUAKE2_AS_OBJS =  #blank
-+QUAKE2_AS_OBJS =  \
-+	$(BUILDDIR)/client/snd_mixa.o #forcing for all to include x86_64, probably dangerous
- endif
- 
- $(BUILDDIR)/quake2 : $(QUAKE2_OBJS) $(QUAKE2_LNX_OBJS) $(QUAKE2_AS_OBJS)
-@@ -1540,6 +1576,21 @@
- 	$(BUILDDIR)/ref_soft/sys_dosa.o
- endif
- 
-+ifeq ($(ARCH),x86_64) #do the same as i386
-+REF_SOFT_OBJS += \
-+	$(BUILDDIR)/ref_soft/r_aclipa.o \
-+	$(BUILDDIR)/ref_soft/r_draw16.o \
-+	$(BUILDDIR)/ref_soft/r_drawa.o \
-+	$(BUILDDIR)/ref_soft/r_edgea.o \
-+	$(BUILDDIR)/ref_soft/r_scana.o \
-+	$(BUILDDIR)/ref_soft/r_spr8.o \
-+	$(BUILDDIR)/ref_soft/r_surf8.o \
-+	$(BUILDDIR)/ref_soft/math.o \
-+	$(BUILDDIR)/ref_soft/d_polysa.o \
-+	$(BUILDDIR)/ref_soft/r_varsa.o \
-+	$(BUILDDIR)/ref_soft/sys_dosa.o
-+endif
-+
- REF_SOFT_SVGA_OBJS = \
- 	$(BUILDDIR)/ref_soft/rw_svgalib.o \
- 	$(BUILDDIR)/ref_soft/d_copy.o \
diff --git a/games-fps/quake2-icculus/files/0.15-Makefile-gcc3.patch b/games-fps/quake2-icculus/files/0.15-Makefile-gcc3.patch
deleted file mode 100644
index 938baba52061..000000000000
--- a/games-fps/quake2-icculus/files/0.15-Makefile-gcc3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig	2003-01-23 17:26:45.000000000 -0500
-+++ Makefile	2003-01-23 17:26:54.000000000 -0500
-@@ -82,12 +82,12 @@
- endif
- 
- ifeq ($(ARCH),i386)
--RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops -malign-loops=2 \
--	-malign-jumps=2 -malign-functions=2 -g
-+RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops -falign-loops=2 \
-+	-falign-jumps=2 -falign-functions=2 -g
- # compiler bugs with gcc 2.96 and 3.0.1 can cause bad builds with heavy opts.
- #RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -m486 -ffast-math -funroll-loops \
--#	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
--#	-malign-jumps=2 -malign-functions=2
-+#	-fomit-frame-pointer -fexpensive-optimizations -falign-loops=2 \
-+#	-falign-jumps=2 -falign-functions=2
- endif
- 
- VERSION=3.21+rCVS
diff --git a/games-fps/quake2-icculus/files/0.15-Makefile-noopts.patch b/games-fps/quake2-icculus/files/0.15-Makefile-noopts.patch
deleted file mode 100644
index 0f4c4f3dea24..000000000000
--- a/games-fps/quake2-icculus/files/0.15-Makefile-noopts.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.orig	2003-01-23 17:26:45.000000000 -0500
-+++ Makefile	2003-01-23 17:26:54.000000000 -0500
-@@ -82,12 +82,12 @@
- endif
- 
- ifeq ($(ARCH),i386)
--RELEASE_CFLAGS=$(BASE_CFLAGS) -O2 -ffast-math -funroll-loops -malign-loops=2 \
--	-malign-jumps=2 -malign-functions=2 -g
-+RELEASE_CFLAGS=-ffast-math -funroll-loops $(BASE_CFLAGS)
-+#	-falign-jumps=2 -falign-functions=2 -g
- # compiler bugs with gcc 2.96 and 3.0.1 can cause bad builds with heavy opts.
- #RELEASE_CFLAGS=$(BASE_CFLAGS) -O6 -m486 -ffast-math -funroll-loops \
--#	-fomit-frame-pointer -fexpensive-optimizations -malign-loops=2 \
--#	-malign-jumps=2 -malign-functions=2
-+#	-fomit-frame-pointer -fexpensive-optimizations -falign-loops=2 \
-+#	-falign-jumps=2 -falign-functions=2
- endif
- 
- VERSION=3.21+rCVS
diff --git a/games-fps/quake2-icculus/files/0.15-Makefile-optflags.patch b/games-fps/quake2-icculus/files/0.15-Makefile-optflags.patch
deleted file mode 100644
index 71a674a2e63f..000000000000
--- a/games-fps/quake2-icculus/files/0.15-Makefile-optflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig	2003-06-28 22:04:22.000000000 -0400
-+++ Makefile	2003-06-28 22:04:54.000000000 -0400
-@@ -342,6 +342,7 @@
- 	TARGETS += $(BUILDDIR)/ref_softaa.$(SHLIBEXT)
- endif
- 
-+RELEASE_CFLAGS += $(OPTCFLAGS)
- all: build_debug build_release
- 
- build_debug:
diff --git a/games-fps/quake2-icculus/files/0.15-amd64.patch b/games-fps/quake2-icculus/files/0.15-amd64.patch
deleted file mode 100644
index 5e078fece423..000000000000
--- a/games-fps/quake2-icculus/files/0.15-amd64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/linux/sys_linux.c.orig	2004-02-03 22:25:43.310829456 -0500
-+++ src/linux/sys_linux.c	2004-02-03 22:27:03.922574608 -0500
-@@ -223,6 +223,8 @@
- 	const char *gamename = "gameppc.so";
- #elif defined __sparc__
- 	const char *gamename = "gamesparc.so";
-+#elif defined __x86_64__
-+	const char *gamename = "gamex86_64.so";
- #else
- #error Unknown arch
- #endif
diff --git a/games-fps/quake2-icculus/files/0.15-gentoo-path.patch b/games-fps/quake2-icculus/files/0.15-gentoo-path.patch
deleted file mode 100644
index 593ce0e962dc..000000000000
--- a/games-fps/quake2-icculus/files/0.15-gentoo-path.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- src/qcommon/files.c.orig	2004-01-02 01:55:47.219787792 -0500
-+++ src/qcommon/files.c	2004-01-02 01:55:55.622510384 -0500
-@@ -0,0 +1 @@
-+#include "../linux/gentoo-libdir.h"
-@@ -60,6 +60,7 @@
- 
- char	fs_gamedir[MAX_OSPATH];
- cvar_t	*fs_basedir;
-+cvar_t	*fs_libdir;
- cvar_t	*fs_cddir;
- cvar_t	*fs_gamedirvar;
- 
-@@ -898,7 +899,8 @@
- 	// basedir <path>
- 	// allows the game to run from outside the data tree
- 	//
--	fs_basedir = Cvar_Get ("basedir", ".", CVAR_NOSET);
-+	fs_basedir = Cvar_Get ("basedir", "GENTOO_DATADIR", CVAR_NOSET);
-+	fs_libdir = Cvar_Get ("libdir", "GENTOO_LIBDIR", CVAR_NOSET);
- 
- 	//
- 	// cddir <path>
-@@ -913,6 +915,7 @@
- 	// add baseq2 to search path
- 	//
- 	FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_basedir->string) );
-+	FS_AddGameDirectory (va("%s/"BASEDIRNAME, fs_libdir->string) );
- 
- 	//
- 	// then add a '.quake2/baseq2' directory in home directory by default
---- src/linux/vid_so.c.orig	2004-01-02 10:37:46.527355832 -0500
-+++ src/linux/vid_so.c	2004-01-02 10:39:23.890554376 -0500
-@@ -0,0 +1 @@
-+#include "../linux/gentoo-libdir.h"
-@@ -231,13 +232,17 @@
- 	//regain root
- 	seteuid(saved_euid);
- 
--	path = Cvar_Get ("basedir", ".", CVAR_NOSET)->string;
-+	path = Cvar_Get ("libdir", "GENTOO_LIBDIR", CVAR_NOSET)->string;
- 
- 	snprintf (fn, MAX_OSPATH, "%s/%s", path, name );
- 	
- 	if (stat(fn, &st) == -1) {
--		Com_Printf( "LoadLibrary(\"%s\") failed: %s\n", name, strerror(errno));
--		return false;
-+		path = Cvar_Get ("libdir", "GENTOO_LIBDIR", CVAR_NOSET)->string;
-+		snprintf (fn, MAX_OSPATH, "%s/%s", path, name );
-+		if (stat(fn, &st) == -1) {
-+			Com_Printf( "LoadLibrary(\"%s\") failed: %s\n", name, strerror(errno));
-+			return false;
-+		}
- 	}
- 	
- 	// permission checking
diff --git a/games-fps/quake2-icculus/files/digest-quake2-icculus-0.15-r2 b/games-fps/quake2-icculus/files/digest-quake2-icculus-0.15-r2
deleted file mode 100644
index 3f8d9c69a534..000000000000
--- a/games-fps/quake2-icculus/files/digest-quake2-icculus-0.15-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 9e16f29db33715f2f9420b5bb31e6263 quake2-r0.15.tar.gz 2660511
-MD5 04d3f1fb7fb4dada7175a41f4595c7eb maxpak.pak 3282742
-MD5 7d5e052839c9e629bad0a6570aa70554 roguesrc320.shar.Z 626769
-MD5 41fc4ecc4f25c068e7d1f488bd4a1e1a xatrixsrc320.shar.Z 455917
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.15-r2.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.15-r2.ebuild
deleted file mode 100644
index 10192d8acb2c..000000000000
--- a/games-fps/quake2-icculus/quake2-icculus-0.15-r2.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.15-r2.ebuild,v 1.2 2005/01/03 23:52:32 vapier Exp $
-
-inherit eutils gcc games
-
-MY_P="quake2-r${PV}"
-DESCRIPTION="The icculus.org linux port of iD's quake2 engine"
-HOMEPAGE="http://icculus.org/quake2/"
-SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
-	!noqmax? ( http://icculus.org/quake2/files/maxpak.pak )
-	rogue? ( ftp://ftp.idsoftware.com/idstuff/quake2/source/roguesrc320.shar.Z )
-	xatrix? ( ftp://ftp.idsoftware.com/idstuff/quake2/source/xatrixsrc320.shar.Z )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha amd64"
-IUSE="arts svga sdl aalib dedicated opengl noqmax rogue xatrix"
-
-# default to X11 if svga/opengl/sdl/aalib/dedicated are not in USE
-RDEPEND="virtual/libc
-	opengl? ( virtual/opengl )
-	svga? ( media-libs/svgalib )
-	sdl? ( media-libs/libsdl )
-	aalib? ( media-libs/aalib )
-	!svga? ( !opengl? ( !sdl? ( !aalib? ( !dedicated? ( virtual/x11 ) ) ) ) )
-	arts? ( kde-base/arts )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	app-arch/sharutils"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if [ -e /etc/env.d/09opengl ]
-	then
-		# Set up X11 implementation
-		X11_IMPLEM_P="$(portageq best_version "${ROOT}" virtual/x11)"
-		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
-		X11_IMPLEM="${X11_IMPLEM##*\/}"
-		einfo "X11 implementation is ${X11_IMPLEM}."
-
-		VOID=$(cat /etc/env.d/09opengl | grep ${X11_IMPLEM})
-
-		USING_X11=$?
-		if [ "${USING_X11}" -eq "1" ]
-		then
-			GL_IMPLEM=$(cat /etc/env.d/09opengl | cut -f5 -d/)
-			opengl-update ${X11_IMPLEM}
-		fi
-	else
-		die "Could not find /etc/env.d/09opengl. Please run opengl-update."
-	fi
-}
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd ${S}
-	epatch "${FILESDIR}/${PV}-Makefile-noopts.patch"
-	epatch "${FILESDIR}/${PV}-Makefile-optflags.patch"
-	epatch "${FILESDIR}/${PV}-Makefile-amd64.patch"
-	epatch "${FILESDIR}/${PV}-gentoo-path.patch"
-	epatch "${FILESDIR}/${PV}-amd64.patch"
-	sed -i \
-		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/quake2-data:" \
-		-e "s:GENTOO_LIBDIR:${GAMES_LIBDIR}/quake2-icculus:" \
-		src/qcommon/files.c \
-		|| die "sed src/qcommon/files.c failed"
-	sed -i \
-		-e "s:GENTOO_LIBDIR:${GAMES_LIBDIR}/quake2-icculus:" \
-		src/linux/vid_so.c \
-		|| die "sed src/linux/vid_so.c failed"
-
-	ln -s $(which echo) ${T}/more
-	for g in $(useq rogue && echo rogue) $(useq xatrix && echo xatrix); do
-		mkdir -p ${S}/src/${g}
-		cd ${S}/src/${g}
-		unpack ${g}src320.shar.Z
-		sed -i \
-			-e 's:^read ans:ans=yes :' ${g}src320.shar \
-			|| die "sed ${g}src320.shar failed"
-		env PATH="${T}:${PATH}" unshar ${g}src320.shar
-		rm ${g}src320.shar
-	done
-	if use rogue ; then
-		sed -i \
-			-e 's:<nan\.h>:<bits/nan.h>:' ${S}/src/rogue/g_local.h \
-				|| die "sed g_local.h failed"
-	fi
-}
-
-yesno() {
-	for f in $@ ; do
-		if ! useq $f ; then
-			echo NO
-			return 1
-		fi
-	done
-	echo YES
-	return 0
-}
-
-src_compile() {
-	BUILD_X11=$(yesno X)
-	use sdl || use opengl || use svga || use aalib || BUILD_X11=YES
-
-	# xatrix fails to build
-	# rogue fails to build
-	for BUILD_QMAX in YES NO ; do
-		use noqmax && [ "${BUILD_QMAX}" == "YES" ] && continue
-		[ "${BUILD_QMAX}" == "YES" ] \
-			&& echo "#define GENTOO_LIBDIR \"${GAMES_LIBDIR}/${PN}-qmax\"" > src/linux/gentoo-libdir.h \
-			|| echo "#define GENTOO_LIBDIR \"${GAMES_LIBDIR}/${PN}\"" > src/linux/gentoo-libdir.h
-		make clean || die "cleaning failed"
-		make build_release \
-			BUILD_SDLQUAKE2=$(yesno sdl) \
-			BUILD_SVGA=$(yesno svga) \
-			BUILD_X11=${BUILD_X11} \
-			BUILD_GLX=$(yesno opengl) \
-			BUILD_SDL=$(yesno sdl) \
-			BUILD_SDLGL=$(yesno sdl opengl) \
-			BUILD_CTFDLL=YES \
-			BUILD_XATRIX=$(yesno xatrix) \
-			BUILD_ROGUE=$(yesno rogue) \
-			BUILD_JOYSTICK=$(yesno joystick) \
-			BUILD_DEDICATED=YES \
-			BUILD_AA=$(yesno aalib) \
-			BUILD_QMAX=${BUILD_QMAX} \
-			HAVE_IPV6=NO \
-			BUILD_ARTS=NO \
-			SDLDIR=/usr/lib \
-			BUILD_ARTS=$(yesno arts) \
-			OPTCFLAGS="${CFLAGS}" \
-			|| die "make failed"
-			#HAVE_IPV6=$(yesno ipv6) \
-		# now we save the build dir ... except for the object files ...
-		rm release*/*/*.o
-		mv release* my-rel-${BUILD_QMAX}
-		cd my-rel-${BUILD_QMAX}
-		rm -rf ref_{gl,soft} ded game client ctf/*.o
-		mkdir baseq2
-		mv game*.so baseq2/
-		cd ..
-	done
-}
-
-src_install() {
-	local q2dir=${GAMES_LIBDIR}/${PN}
-	local q2maxdir=${GAMES_LIBDIR}/${PN}-qmax
-
-	dodoc readme.txt README TODO ${FILESDIR}/README-postinstall
-
-	# regular q2 files
-	dodir ${q2dir}
-	cp -rf my-rel-NO/* ${D}/${q2dir}/
-	dogamesbin ${D}/${q2dir}/{quake2,q2ded}
-	rm ${D}/${q2dir}/{quake2,q2ded}
-	use sdl && dogamesbin ${D}/${q2dir}/sdlquake2 && rm ${D}/${q2dir}/sdlquake2
-
-	# q2max files
-	if ! use noqmax ; then
-		dodir ${q2maxdir}
-		cp -rf my-rel-YES/* ${D}/${q2maxdir}/
-		newgamesbin ${D}/${q2maxdir}/quake2 quake2-qmax
-		newgamesbin ${D}/${q2maxdir}/q2ded q2ded-qmax
-		rm ${D}/${q2maxdir}/{quake2,q2ded}
-		use sdl && newgamesbin ${D}/${q2maxdir}/sdlquake2 sdlquake2-qmax && rm ${D}/${q2maxdir}/sdlquake2
-
-		insinto ${q2maxdir}/baseq2
-		doins ${DISTDIR}/maxpak.pak
-	fi
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	if [ "${USING_X11}" -eq "1" ]
-	then
-		opengl-update ${GL_IMPLEM}
-	fi
-	games_pkg_postinst
-	einfo "Go read /usr/share/doc/${PF}/README-postinstall.gz right now!"
-	einfo "It's important- This install is just the engine, you still need"
-	einfo "the data paks. Go read."
-}
diff --git a/games-fps/quake2-icculus/quake2-icculus-0.16.ebuild b/games-fps/quake2-icculus/quake2-icculus-0.16.ebuild
index e4c8908924cf..f7ad266d92e2 100644
--- a/games-fps/quake2-icculus/quake2-icculus-0.16.ebuild
+++ b/games-fps/quake2-icculus/quake2-icculus-0.16.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/quake2-icculus/quake2-icculus-0.16.ebuild,v 1.2 2005/01/05 00:53:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake2-icculus/quake2-icculus-0.16.ebuild,v 1.3 2005/01/15 00:52:51 vapier Exp $
 
 inherit eutils games
 
@@ -15,7 +15,7 @@ SRC_URI="http://icculus.org/quake2/files/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86"
-IUSE="arts svga sdl aalib dedicated opengl noqmax rogue xatrix ipv6"
+IUSE="arts svga sdl aalib dedicated opengl noqmax rogue xatrix ipv6 joystick"
 
 # default to X11 if svga/opengl/sdl/aalib/dedicated are not in USE
 RDEPEND="virtual/libc