work around opengl issue (bug #369135)

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

diff --git a/games-strategy/savage-bin/ChangeLog b/games-strategy/savage-bin/ChangeLog
index 918e2dc671da583b3f7973ff4a4e3a4995f92ea4..9170ae54e72fcc977e699dcd801362026af8e471 100644 (file)
--- a/games-strategy/savage-bin/ChangeLog
+++ b/games-strategy/savage-bin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-strategy/savage-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage-bin/ChangeLog,v 1.14 2011/10/14 06:12:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage-bin/ChangeLog,v 1.15 2011/10/15 01:04:17 mr_bones_ Exp $
+
+  15 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org> savage-bin-2.00e.ebuild:
+  work around opengl issue (bug #369135)
 
   14 Oct 2011; Mike Frysinger <vapier@gentoo.org> savage-bin-2.00e.ebuild:
   Use a SLOT dep instead of "<" for jpeg.

diff --git a/games-strategy/savage-bin/Manifest b/games-strategy/savage-bin/Manifest
index b99349cebc8a6e9c54acd552dc33d9921d1a8c89..6f2f5acf7e2ec56df5c217371729705ee9e9574e 100644 (file)
--- a/games-strategy/savage-bin/Manifest
+++ b/games-strategy/savage-bin/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX savage 1060 RMD160 fd312a54e006dcd82604afcb8368a916e6ceca55 SHA1 ec3dae47b10358b731d7bd1317d0c6f2ee9c8398 SHA256 4c3972e4e9f74711ad90644066a663894012257291f462f4dfcd30ab50fd89e9
 DIST SFE-Standalone.tar.gz 158803234 RMD160 a4663cd62b038ebade79e7587e57baea421f9480 SHA1 e38660ea22ce64bde4d9eee452f3ceba7a856d42 SHA256 a6b12837b6d0c643aaa1aa58dcb1b2711b17547e355ba187308472f6e1f52c13
 DIST lin-client-auth-patch.zip 1114641 RMD160 fdf491c6814db7d70361684963d4bb38eb3dd434 SHA1 c925f6edba54521f6271e45915e0cbc48edee79b SHA256 f5e714b012270e75fa4e8a188e3b072741889590c8740a74748e0c19acbe42e2
-EBUILD savage-bin-2.00e.ebuild 2745 RMD160 af1a06ff86045c02725b3f2d8514c978b63d550b SHA1 acf3276b172ea27c83c293e899cc7a0f4a2acf78 SHA256 f41f21f46f81724536307ee919af248b91875039e920d2564d9725a9fb898e58
-MISC ChangeLog 2125 RMD160 f649f65492885139aa216ef63721daa4202f8f99 SHA1 4fd019f97b75269390ad77b73c9bd363d320d841 SHA256 99ae5cabaff98c96481cf959d1f1fbde4392845f422b77acdbd17b2790dc1aea
+EBUILD savage-bin-2.00e.ebuild 2897 RMD160 d0c8bc78048d2535682a15662c3ce505a0101275 SHA1 25d98f0ca8cb7b74bfdcb39b44b5e20d762359eb SHA256 03376177a297d038c405456c7ca07b398bef622acf81756828f53f661b467bc4
+MISC ChangeLog 2250 RMD160 c978ad9c78a16260d82423980af524cfc53377d8 SHA1 96d1777ffc3cd3b7f0939b1634e93983f52ed919 SHA256 fc7646f7315a03a541d35752c409f1181bf4cc61efcaf94b9351d37107025e00
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk6X0t0ACgkQaC/OocHi7Ja/5QEAiiXBL8my2q9aB4xo0/wPaQn8
-cZG4ApB6Eicbb3knbM0A/1cRCi8oe4DDL/MNjaDFC+zJpFSr207lYsAn8jFujYZj
-=1I4P
------END PGP SIGNATURE-----

diff --git a/games-strategy/savage-bin/savage-bin-2.00e.ebuild b/games-strategy/savage-bin/savage-bin-2.00e.ebuild
index ed21d3260324f091651e5f34b100b662b58f0ba2..a9017bf7df31aeebcc1886dda030a801d27d2035 100644 (file)
--- a/games-strategy/savage-bin/savage-bin-2.00e.ebuild
+++ b/games-strategy/savage-bin/savage-bin-2.00e.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage-bin/savage-bin-2.00e.ebuild,v 1.13 2011/10/14 06:12:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/savage-bin/savage-bin-2.00e.ebuild,v 1.14 2011/10/15 01:04:17 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -45,14 +45,13 @@ src_prepare() {
        cp -f lin-client-auth-patch/libs/libpng12.so.0 libs/.
        rm -rf lin-client-auth-patch/
        rm -f graveyard/game.dll *.sh
-       sed \
-               -e "s:%GAMES_PREFIX_OPT%:${GAMES_PREFIX_OPT}:" \
-               "${FILESDIR}"/savage > "${T}"/savage \
-               || die "sed failed"
+       sed -e "s:%GAMES_PREFIX_OPT%:${GAMES_PREFIX_OPT}:" \
+               -e 's/^exec /__GL_ExtensionStringVersion=17700 exec /' \
+               "${FILESDIR}"/savage > "${T}"/savage || die
        # Here, we default to the best resolution
-       sed -i -e  \
-               's/setsave vid_mode -1/setsave vid_mode 1/' \
-               game/settings/default.cfg || die "sed failed"
+       sed -i \
+               -e 's/setsave vid_mode -1/setsave vid_mode 1/' \
+               game/settings/default.cfg || die
 }
 
 src_install() {
@@ -61,11 +60,14 @@ src_install() {
        fperms g+x "${dir}"/silverback.bin || die "fperms failed"
        dosym /dev/null "${dir}"/scripts.log || die "dosym failed"
 
-       dogamesbin "${T}"/savage
+       dogamesbin "${T}"/savage || die
        make_desktop_entry savage "Savage: The Battle For Newerth"
 
        games_make_wrapper savage-graveyard "./silverback.bin set mod graveyard" \
                "${dir}" "${dir}"/libs
+       sed -i \
+               -e 's/^exec /__GL_ExtensionStringVersion=17700 exec /' \
+               "${D}/${GAMES_BINDIR}/savage-graveyard" || die
        make_desktop_entry savage-graveyard "Savage: Graveyard"
 
        prepgamesdirs