[gentoo-commits] gentoo-x86 commit in games-fps/ut2004: ChangeLog ut2004-3369-r4.ebuild

[gentoo-commits] gentoo-x86 commit in games-fps/ut2004: ChangeLog ut2004-3369-r4.ebuild

[Michael Sterrett (mr_bones_)]

mr_bones_    09/02/05 16:56:21

  Modified:             ChangeLog ut2004-3369-r4.ebuild
  Log:
  Always use the system libraries since the included ones don't seem to work with xcb (bug #239977)
  (Portage version: 2.1.6.4/cvs/Linux 2.6.28.1 i686)

Revision  Changes    Path
1.64                 games-fps/ut2004/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/ut2004/ChangeLog?rev=1.64&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/ut2004/ChangeLog?rev=1.64&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/ut2004/ChangeLog?r1=1.63&r2=1.64

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- ChangeLog	28 Jul 2008 16:41:54 -0000	1.63
+++ ChangeLog	5 Feb 2009 16:56:21 -0000	1.64
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/ut2004
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.63 2008/07/28 16:41:54 wolf31o2 Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.64 2009/02/05 16:56:21 mr_bones_ Exp $
+
+  05 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  ut2004-3369-r4.ebuild:
+  Always use the system libraries since the included ones don't seem to work
+  with xcb (bug #239977)
 
   28 Jul 2008; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml:
   Removing myself from metadata.xml since I am retiring from the project.



1.19                 games-fps/ut2004/ut2004-3369-r4.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/ut2004/ut2004-3369-r4.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/ut2004/ut2004-3369-r4.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/ut2004/ut2004-3369-r4.ebuild?r1=1.18&r2=1.19

Index: ut2004-3369-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369-r4.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ut2004-3369-r4.ebuild	29 Feb 2008 19:23:40 -0000	1.18
+++ ut2004-3369-r4.ebuild	5 Feb 2009 16:56:21 -0000	1.19
@@ -1,11 +1,10 @@
-# Copyright 1999-2008 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/ut2004/ut2004-3369-r4.ebuild,v 1.18 2008/02/29 19:23:40 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369-r4.ebuild,v 1.19 2009/02/05 16:56:21 mr_bones_ Exp $
 
 # To use system libraries, uncomment the following line and comment the one
 # below it.
-#inherit eutils multilib games
-inherit eutils games
+inherit eutils multilib games
 
 MY_P="${PN}-lnxpatch${PV}-2.tar.bz2"
 DESCRIPTION="Editor's Choice Edition plus Mega Pack for the critically-acclaimed first-person shooter"
@@ -35,12 +34,9 @@
 	x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXau
-	x11-libs/libXdmcp"
-	# If you wish to use your system libSDL/openal, then you will need to remove
-	# the comments from the following two lines, along with the quotes above and
-	# this comment text.
-#	>=media-libs/libsdl-1.2
-#	media-libs/openal"
+	x11-libs/libXdmcp
+	>=media-libs/libsdl-1.2
+	media-libs/openal"
 
 S=${WORKDIR}/UT2004-Patch
 
@@ -60,12 +56,9 @@
 			|| die "copying ${p} from patch"
 	done
 
-	# To use system libraries, rather than binaries from ut2004-data, you will
-	# need to uncomment these three lines, as well as ensure that you have both
-	# libsdl and openal installed.
-#	dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so || die
-#	dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0 \
-#		|| die
+	dosym /usr/$(get_libdir)/libopenal.so "${dir}"/System/openal.so || die
+	dosym /usr/$(get_libdir)/libSDL-1.2.so.0 "${dir}"/System/libSDL-1.2.so.0 \
+		|| die
 
 	use amd64 && rm "${Ddir}"/System/u{cc,t2004}-bin \
 		&& mv "${Ddir}"/System/ucc-bin-linux-amd64 "${Ddir}"/System/ucc-bin \