Cleaned older ebuilds and fixed up dependencies with a patch from Sascha Geschwandtne...

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/games-fps/quake3/ChangeLog b/games-fps/quake3/ChangeLog
index b4331c15fe236f779354f9275bc0fdfeb9a84227..05e21a52738d7c28a14b48076fcf219d0a58133e 100644 (file)
--- a/games-fps/quake3/ChangeLog
+++ b/games-fps/quake3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/quake3
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.45 2006/11/29 23:39:26 wolf31o2 Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/ChangeLog,v 1.46 2007/01/30 22:20:29 wolf31o2 Exp $
+
+  30 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  -quake3-1.34_rc2.ebuild, quake3-1.34_rc3.ebuild, quake3-9999.ebuild:
+  Cleaned older ebuilds and fixed up dependencies with a patch from Sascha
+  Geschwandtner <s.geschwandtner@gmx.de> and closing bug #162425.
 
 *quake3-1.34_rc3 (29 Nov 2006)
 

diff --git a/games-fps/quake3/quake3-1.34_rc3.ebuild b/games-fps/quake3/quake3-1.34_rc3.ebuild
index f122ac2cb6870fa8f3eb458f7833a23f029cf590..562ea1c7c3e908b5e73157ff6b959d394482de25 100644 (file)
--- a/games-fps/quake3/quake3-1.34_rc3.ebuild
+++ b/games-fps/quake3/quake3-1.34_rc3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.2 2007/01/30 03:50:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-1.34_rc3.ebuild,v 1.3 2007/01/30 22:20:29 wolf31o2 Exp $
 
 # quake3-9999          -> latest svn
 # quake3-9999.REV      -> use svn REV
@@ -39,18 +39,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="dedicated opengl teamarena"
 
-UIRDEPEND="virtual/opengl
+UIDEPEND="virtual/opengl
        media-libs/openal
-       x11-libs/libXext
-       x11-libs/libX11
-       x11-libs/libXau
-       x11-libs/libXdmcp
        media-libs/libsdl"
 
-RDEPEND="opengl? (
-       ${UIRDEPEND} )
-       !dedicated? (
-               ${UIRDEPEND} )
+DEPEND="opengl? ( ${UIRDEPEND} )
+       !dedicated? ( ${UIRDEPEND} )"
+
+RDEPEND="${DEPEND}
        games-fps/quake3-data
        teamarena? ( games-fps/quake3-teamarena )"
 

diff --git a/games-fps/quake3/quake3-9999.ebuild b/games-fps/quake3/quake3-9999.ebuild
index d24e79546f495d46929d870c1cfb1d106bf35b10..15e87145c84d7fad69b446f1e82fb15577c74a94 100644 (file)
--- a/games-fps/quake3/quake3-9999.ebuild
+++ b/games-fps/quake3/quake3-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 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.8 2007/01/30 03:50:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3/quake3-9999.ebuild,v 1.9 2007/01/30 22:20:30 wolf31o2 Exp $
 
 # quake3-9999          -> latest svn
 # quake3-9999.REV      -> use svn REV
@@ -26,30 +26,27 @@ else
        inherit flag-o-matic toolchain-funcs eutils games
        MY_PV=${PV/_/-}
        MY_P=io${PN}_${MY_PV}
-       SRC_URI="http://icculus.org/quake3/files/${MY_P}.tar.bz2"
+       SRC_URI="http://icculus.org/quake3/files/${MY_P}.tar.bz2
+               http://ioquake3.org/files/${MY_P}.tar.bz2"
        S=${WORKDIR}/${MY_P}
 fi
 
 DESCRIPTION="Quake III Arena - 3rd installment of the classic id 3D first-person shooter"
-HOMEPAGE="http://icculus.org/quake3/"
+HOMEPAGE="http://ioquake3.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-*"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE="dedicated opengl teamarena"
 
-UIRDEPEND="virtual/opengl
+UIDEPEND="virtual/opengl
        media-libs/openal
-       x11-libs/libXext
-       x11-libs/libX11
-       x11-libs/libXau
-       x11-libs/libXdmcp
        media-libs/libsdl"
 
-RDEPEND="opengl? (
-       ${UIRDEPEND} )
-       !dedicated? (
-               ${UIRDEPEND} )
+DEPEND="opengl? ( ${UIRDEPEND} )
+       !dedicated? ( ${UIRDEPEND} )"
+
+RDEPEND="${DEPEND}
        games-fps/quake3-data
        teamarena? ( games-fps/quake3-teamarena )"