EAPI=2; add joystick use dep for bug #264741

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 27 insertions, 13 deletions

diff --git a/games-fps/quake3/ChangeLog b/games-fps/quake3/ChangeLog
index 1337dabb9001..0658b898022a 100644
--- a/games-fps/quake3/ChangeLog
+++ b/games-fps/quake3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/quake3
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.49 2007/12/31 21:27:47 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.50 2009/08/10 02:43:18 mr_bones_ Exp $
+
+  10 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  quake3-1.34_rc3.ebuild, quake3-9999.ebuild:
+  EAPI=2; add joystick use dep for bug #264741
 
   31 Dec 2007; Mike Frysinger <vapier@gentoo.org> quake3-9999.ebuild:
   Fixes from David Watzke for building with newer svn checkouts #203733.
diff --git a/games-fps/quake3/Manifest b/games-fps/quake3/Manifest
index 84e55175aa13..31e4cfe726d0 100644
--- a/games-fps/quake3/Manifest
+++ b/games-fps/quake3/Manifest
@@ -1,6 +1,6 @@
 AUX quake3-1.34_rc3-gcc42.patch 766 RMD160 a584f52898bb9d8099dce89bcb88cd8fa099211d SHA1 72e524009f0f4bee75eadcc29ffc56bbbcf3d434 SHA256 3ded8cb46b60ee74fbfae97633f6dab371916b18a2c69b042e7eb1cf5ca78919
 DIST ioquake3_1.34-rc3.tar.bz2 3147694 RMD160 b270cd43a4f9f2700715cbd1487a8d0efab0296b SHA1 327d95a128aacc3bdd4e9497896651005cce8f92 SHA256 fb43f63178c6700f20b83634b816f77e390e375e7d9c717180c9820f0c541b01
-EBUILD quake3-1.34_rc3.ebuild 2934 RMD160 e418f9a6bab640fefcec80d172e576ac5366ebde SHA1 f3f1c66757941247b5ffb9f570317509ba55be73 SHA256 4fcb1bae6d01edaf50dd301d86442ddb91ac90c2862a5ab53b8e4d5d2f98f242
-EBUILD quake3-9999.ebuild 2834 RMD160 289ecfb9369f2775f7f7b338e0e5ceb1a7343505 SHA1 1cb30bd24333fca18573efd794894ca1e079dc5d SHA256 2b256c422bbf590e7c9bc9a0abe8c114c3acde0316f3e773fb8c47a0a82976ac
-MISC ChangeLog 4362 RMD160 bd5c9066f2f217e5b52390e52eb44d4cc38dddf9 SHA1 28421b8092b3695ee2e73123a406e92a058752a4 SHA256 89eaab2a37041dd628c2caaa12dd630773001d9f88046c3c47850278d13098da
+EBUILD quake3-1.34_rc3.ebuild 3004 RMD160 4d84b1c72d12e59a1f9350a135a2cd8b6db011b7 SHA1 034967e543bdbf9ccb1cd5c0fc78a689c90beb7a SHA256 96d66a2d969706f83d83f119e2eee1ee8cf70ac468b53e883df442cd86f051ab
+EBUILD quake3-9999.ebuild 2858 RMD160 09e2a318b90017561088e3b1deee3312df879993 SHA1 262e00116a81fc040b7612ed2be286152e96331d SHA256 e415063d2a994607c590bee373aaf477ac3209906de518dd304e8360cc244c98
+MISC ChangeLog 4514 RMD160 e4c6a3508941b1ec02bb50781aad698642a88825 SHA1 4e2c13d9ad8970b96d9437f8a3fa8ddfbb34f41a SHA256 ab5fac1a1dcda0b259fb6350c0e31fe02ae390e87918f7c14dfbba9c9559f0a1
 MISC metadata.xml 1052 RMD160 47127dc28337531fc3907c9d95f9d7d35d8e2d15 SHA1 08386bbbd1d751866a0201708cabfc8cbdfee975 SHA256 9552624bd6c0d0ac113dc2d283a41c556bd86948c5a14c98fb06e85948feb2aa
diff --git a/games-fps/quake3/quake3-1.34_rc3.ebuild b/games-fps/quake3/quake3-1.34_rc3.ebuild
index 4ca74fcf3d2d..ecc9078d33e8 100644
--- a/games-fps/quake3/quake3-1.34_rc3.ebuild
+++ b/games-fps/quake3/quake3-1.34_rc3.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.34_rc3.ebuild,v 1.8 2008/01/12 02:53:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.34_rc3.ebuild,v 1.9 2009/08/10 02:43:18 mr_bones_ Exp $
 
 # quake3-9999          -> latest svn
 # quake3-9999.REV      -> use svn REV
 # quake3-VER_alphaREV  -> svn snapshot REV for version VER
 # quake3-VER           -> normal quake release
 
+EAPI=2
 if [[ ${PV} == 9999* ]] ; then
 	[[ ${PV} == 9999.* ]] && ESVN_UPDATE_CMD="svn up -r ${PV/9999./}"
 	ESVN_REPO_URI="svn://svn.icculus.org/quake3/trunk"
@@ -41,7 +42,7 @@ IUSE="dedicated opengl teamarena"
 
 UIDEPEND="virtual/opengl
 	media-libs/openal
-	media-libs/libsdl"
+	media-libs/libsdl[joystick]"
 DEPEND="opengl? ( ${UIDEPEND} )
 	!dedicated? ( ${UIDEPEND} )"
 RDEPEND="${DEPEND}
@@ -53,7 +54,13 @@ src_unpack() {
 		subversion_src_unpack
 	else
 		unpack ${A}
-		cd "${S}"
+	fi
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999* ]] ; then
+		:
+	else
 		epatch "${FILESDIR}"/${P}-gcc42.patch
 	fi
 	sed -i \
diff --git a/games-fps/quake3/quake3-9999.ebuild b/games-fps/quake3/quake3-9999.ebuild
index cd5432954afb..5243e356c6f9 100644
--- a/games-fps/quake3/quake3-9999.ebuild
+++ b/games-fps/quake3/quake3-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-9999.ebuild,v 1.15 2008/01/12 02:54:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-9999.ebuild,v 1.16 2009/08/10 02:43:18 mr_bones_ Exp $
 
 # quake3-9999          -> latest svn
 # quake3-9999.REV      -> use svn REV
 # quake3-VER_alphaREV  -> svn snapshot REV for version VER
 # quake3-VER           -> normal quake release
 
+EAPI=2
 if [[ ${PV} == 9999* ]] ; then
 	[[ ${PV} == 9999.* ]] && ESVN_UPDATE_CMD="svn up -r ${PV/9999./}"
 	ESVN_REPO_URI="svn://svn.icculus.org/quake3/trunk"
@@ -41,7 +42,7 @@ IUSE="dedicated opengl teamarena"
 
 UIDEPEND="virtual/opengl
 	media-libs/openal
-	media-libs/libsdl"
+	media-libs/libsdl[joystick]"
 DEPEND="opengl? ( ${UIDEPEND} )
 	!dedicated? ( ${UIDEPEND} )"
 RDEPEND="${DEPEND}
@@ -53,8 +54,10 @@ src_unpack() {
 		subversion_src_unpack
 	else
 		unpack ${A}
-		cd "${S}"
 	fi
+}
+
+src_prepare() {
 	sed -i \
 		-e '/INSTALL/s: -s : :' \
 		Makefile code/tools/lcc/Makefile code/tools/asm/Makefile