public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in games-fps/ut2004-data: ut2004-data-3186-r3.ebuild ChangeLog
@ 2009-06-19 12:42 Tristan Heaven (nyhm)
  0 siblings, 0 replies; 2+ messages in thread
From: Tristan Heaven (nyhm) @ 2009-06-19 12:42 UTC (permalink / raw
  To: gentoo-commits

nyhm        09/06/19 12:42:39

  Modified:             ut2004-data-3186-r3.ebuild ChangeLog
  Log:
  Don't install libsdl and openal, bug #264989
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.13                 games-fps/ut2004-data/ut2004-data-3186-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild?r1=1.12&r2=1.13

Index: ut2004-data-3186-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ut2004-data-3186-r3.ebuild	12 Mar 2007 15:44:29 -0000	1.12
+++ ut2004-data-3186-r3.ebuild	19 Jun 2009 12:42:39 -0000	1.13
@@ -1,6 +1,6 @@
-# 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/ut2004-data/ut2004-data-3186-r3.ebuild,v 1.12 2007/03/12 15:44:29 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild,v 1.13 2009/06/19 12:42:39 nyhm Exp $
 
 inherit eutils games games-ut2k4mod
 
@@ -144,16 +144,6 @@
 	exeinto "${dir}"
 	doexe bin/ut2004 || die "copying ut2004"
 
-	exeinto "${dir}"/System
-	# We install the provided libraries because upstream wants it that way.
-	# If you want to use your own system binaries, then feel free to uncomment
-	# the following.  You will also want to comment the doexe line below that
-	# installs the libraries.
-#	newexe System/openal.so openal.so-binary
-#	newexe System/libSDL-1.2.so.0 libSDL-1.2.so.0-binary
-	doexe System/{libSDL-1.2.so.0,openal.so} \
-		|| die "copying libraries"
-
 	# Uncompressing files
 	einfo "Uncompressing files... this *will* take a while..."
 	for j in {Animations,Maps,Sounds,StaticMeshes,Textures}



1.23                 games-fps/ut2004-data/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ChangeLog	28 Jul 2008 16:55:16 -0000	1.22
+++ ChangeLog	19 Jun 2009 12:42:39 -0000	1.23
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/ut2004-data
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v 1.22 2008/07/28 16:55:16 wolf31o2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v 1.23 2009/06/19 12:42:39 nyhm Exp $
+
+  19 Jun 2009; Tristan Heaven <nyhm@gentoo.org> ut2004-data-3186-r3.ebuild:
+  Don't install libsdl and openal, bug #264989
 
   28 Jul 2008; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml:
   Removing myself from metadata.xml since I am retiring from the project.






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in games-fps/ut2004-data: ut2004-data-3186-r3.ebuild ChangeLog
@ 2009-09-30  0:58 Tristan Heaven (nyhm)
  0 siblings, 0 replies; 2+ messages in thread
From: Tristan Heaven (nyhm) @ 2009-09-30  0:58 UTC (permalink / raw
  To: gentoo-commits

nyhm        09/09/30 00:58:32

  Modified:             ut2004-data-3186-r3.ebuild ChangeLog
  Log:
  Move check_dvd function from games-ut2k4mod.eclass to here
  (Portage version: 2.2_rc42/cvs/Linux x86_64)

Revision  Changes    Path
1.14                 games-fps/ut2004-data/ut2004-data-3186-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild?r1=1.13&r2=1.14

Index: ut2004-data-3186-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ut2004-data-3186-r3.ebuild	19 Jun 2009 12:42:39 -0000	1.13
+++ ut2004-data-3186-r3.ebuild	30 Sep 2009 00:58:31 -0000	1.14
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild,v 1.13 2009/06/19 12:42:39 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild,v 1.14 2009/09/30 00:58:31 nyhm Exp $
 
-inherit eutils games games-ut2k4mod
+inherit eutils games
 
 DESCRIPTION="Unreal Tournament 2004 - This is the data portion of UT2004"
 HOMEPAGE="http://www.unrealtournament2004.com/"
@@ -13,7 +13,6 @@
 KEYWORDS="amd64 x86"
 RESTRICT="strip"
 IUSE=""
-QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/ut2004/System/libSDL-1.2.so.0"
 
 DEPEND="games-util/uz2unpack"
 PDEPEND="games-fps/ut2004"
@@ -24,6 +23,38 @@
 dir=${GAMES_PREFIX_OPT}/ut2004
 Ddir=${D}/${dir}
 
+check_dvd() {
+	# The following is a nasty mess to determine if we are installing from
+	# a DVD or from multiple CDs.  Anyone feel free to submit patches to this
+	# to bugs.gentoo.org as I know it is a very ugly hack.
+
+	USE_DVD=
+	USE_ECE_DVD=
+	USE_MIDWAY_DVD=
+	USE_GERMAN_MIDWAY_DVD=
+
+	local r
+	for r in "${CD_ROOT}" "${CD_ROOT_1}" \
+		`mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do
+		if [[ -n "${r}" ]] ; then
+			einfo "Searching ${r}"
+			if [[ -e "${r}/AutoRunData/Unreal.ico" ]] \
+				&& [[ -e "${r}/Disk5/data6.cab" ]] ; then
+				USE_MIDWAY_DVD=1
+				USE_DVD=1
+			elif [[ -e "${r}/autorund/unreal.ico" ]] \
+				&& [[ -e "${r}/disk7/data8.cab" ]] ; then
+				USE_MIDWAY_DVD=1
+				USE_GERMAN_MIDWAY_DVD=1
+				USE_DVD=1
+			else
+				[[ -d "${r}/CD1" ]] && USE_DVD=1
+				[[ -d "${r}/CD7" ]] && USE_ECE_DVD=1
+			fi
+		fi
+	done
+}
+
 grabdirs() {
 	local d srcdir
 



1.24                 games-fps/ut2004-data/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog	19 Jun 2009 12:42:39 -0000	1.23
+++ ChangeLog	30 Sep 2009 00:58:31 -0000	1.24
@@ -1,6 +1,9 @@
 # ChangeLog for games-fps/ut2004-data
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v 1.23 2009/06/19 12:42:39 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v 1.24 2009/09/30 00:58:31 nyhm Exp $
+
+  30 Sep 2009; Tristan Heaven <nyhm@gentoo.org> ut2004-data-3186-r3.ebuild:
+  Move check_dvd function from games-ut2k4mod.eclass to here
 
   19 Jun 2009; Tristan Heaven <nyhm@gentoo.org> ut2004-data-3186-r3.ebuild:
   Don't install libsdl and openal, bug #264989






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2009-09-30  0:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-19 12:42 [gentoo-commits] gentoo-x86 commit in games-fps/ut2004-data: ut2004-data-3186-r3.ebuild ChangeLog Tristan Heaven (nyhm)
  -- strict thread matches above, loose matches on Subject: below --
2009-09-30  0:58 Tristan Heaven (nyhm)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox