Added makeself 2.1.5 support and fixing games_ut_unpack for proper ut2004 support.

diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass
index 57936932b0a439644b856c892f26e50129343e59..6c1f06560218aa7df2139092dcea50390d109d29 100644 (file)
--- a/eclass/eutils.eclass
+++ b/eclass/eutils.eclass
@@ -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/eclass/eutils.eclass,v 1.210 2005/10/20 00:13:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.211 2005/10/21 18:24:23 wolf31o2 Exp $
 #
 # Author: Martin Schlemmer <azarah@gentoo.org>
 #
@@ -1118,7 +1118,7 @@ unpack_makeself() {
                                skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
                                let skip="skip + 1"
                                ;;
-                       2.1.4)
+                       2.1.4|2.1.5)
                                skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
                                skip=$(head -n ${skip} "${src}" | wc -c)
                                exe="dd"

diff --git a/eclass/games.eclass b/eclass/games.eclass
index a9da730a682491fda8195bd3c116854867b2fa73..557ac73b8a38081172f99f83c4c3152760eef9f6 100644 (file)
--- a/eclass/games.eclass
+++ b/eclass/games.eclass
@@ -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/eclass/games.eclass,v 1.105 2005/09/04 06:27:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.106 2005/10/21 18:24:23 wolf31o2 Exp $
 #
 # devlist: {vapier,wolf31o2,mr_bones_}@gentoo.org -> games@gentoo.org
 #
@@ -192,7 +192,7 @@ games_pkg_postinst() {
        echo
 }
 
-# Unpack .uz(2) files for UT/UT2003
+# Unpack .uz(2) files for UT/UT2003/UT2004
 # $1: directory or file to unpack
 games_ut_unpack() {
        local ut_unpack="$1"
@@ -224,6 +224,6 @@ games_umod_unpack() {
        cd "${UT_DATA_PATH}"
        ./ucc-bin umodunpack -x "${S}/${umod}" -nohomedir &> /dev/null \
                || die "uncompressing file ${umod}"
-       rm -f "${Ddir}"/System/{ucc-bin,{Manifest,Def{ault,User},User,UT2003}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int,ucc.log} &>/dev/null \
+       rm -f "${Ddir}"/System/{ucc-bin,{Manifest,Def{ault,User},User,UT200{3,4}}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int,ucc.log} &>/dev/null \
                || die "Removing temporary files"
 }