Patch for broken key configuration, bug #103324

Package-Manager: portage-2.1.3.5

5 files changed, 97 insertions, 5 deletions

diff --git a/games-fps/lsdldoom/ChangeLog b/games-fps/lsdldoom/ChangeLog
index fa5889cedb86..31571c8d2810 100644
--- a/games-fps/lsdldoom/ChangeLog
+++ b/games-fps/lsdldoom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/lsdldoom
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/ChangeLog,v 1.11 2007/02/21 23:41:07 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/ChangeLog,v 1.12 2007/08/14 19:50:14 nyhm Exp $
+
+*lsdldoom-1.4.4.4-r1 (14 Aug 2007)
+
+  14 Aug 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/lsdldoom-1.4.4.4-keys.patch, +lsdldoom-1.4.4.4-r1.ebuild:
+  Patch for broken key configuration, bug #103324
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/games-fps/lsdldoom/Manifest b/games-fps/lsdldoom/Manifest
index 6ddfb8484bdd..65fbb4074e8f 100644
--- a/games-fps/lsdldoom/Manifest
+++ b/games-fps/lsdldoom/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.4.4.4-gcc34.patch 1612 RMD160 c9829e58f4292a4fa966e81ab31067eccaa62c02 SHA1 15c7ccf52a32db0227ee3032e863959e3ad6505f SHA256 4bfa669686cb6930f7c40e84c8460cbea40f92a24833b23a21868d1b86e231ec
 MD5 e5f5262d89a6f79ba25f29a277609c16 files/1.4.4.4-gcc34.patch 1612
 RMD160 c9829e58f4292a4fa966e81ab31067eccaa62c02 files/1.4.4.4-gcc34.patch 1612
@@ -10,15 +13,23 @@ AUX lsdldoom-1.4.4.4-gcc41.patch 477 RMD160 74ee799c5664112cd6ce7dec3fbec2b329b3
 MD5 49fce149f4b3d42fe3a00bcb3fb202bf files/lsdldoom-1.4.4.4-gcc41.patch 477
 RMD160 74ee799c5664112cd6ce7dec3fbec2b329b3fd3f files/lsdldoom-1.4.4.4-gcc41.patch 477
 SHA256 18f5c1d5fe98bcf97a81a4c02171beeccae34b29f0eca3b2f352677468e710b8 files/lsdldoom-1.4.4.4-gcc41.patch 477
+AUX lsdldoom-1.4.4.4-keys.patch 316 RMD160 fd532c971654b390e901d4f0bc2489d97edc6c5d SHA1 b33f13d70564fdc0a2d8efc1f0ba007451d0626c SHA256 b7ef13e74e5bfea1b31c32c19f9eaafa6f39147a0179620e7d652e849a5bd049
+MD5 9090e0a6523331aa8c7ec4bc0f57ff9b files/lsdldoom-1.4.4.4-keys.patch 316
+RMD160 fd532c971654b390e901d4f0bc2489d97edc6c5d files/lsdldoom-1.4.4.4-keys.patch 316
+SHA256 b7ef13e74e5bfea1b31c32c19f9eaafa6f39147a0179620e7d652e849a5bd049 files/lsdldoom-1.4.4.4-keys.patch 316
 DIST lsdldoom-1.4.4.4.tar.gz 916884 RMD160 92438a234b4642f320364308737e20f232d7da82 SHA1 a97919a0a3bac2c4f7e097752a793088879f6280 SHA256 6c29560a3a87b351f81717bd79c2cff124df0e68b807a7a365af15317a47d83c
+EBUILD lsdldoom-1.4.4.4-r1.ebuild 1230 RMD160 eb5074163b39287cce8d2611e080bc693a745964 SHA1 287cf2c9d036e0ae0b342f964c9d958d30e40342 SHA256 bb6b37d8fd325cc2340a26121caea5f03efc12ccfbd92897d3b5b558e67af0f9
+MD5 1cf4cfac5322b5c24beff5d539e7f36c lsdldoom-1.4.4.4-r1.ebuild 1230
+RMD160 eb5074163b39287cce8d2611e080bc693a745964 lsdldoom-1.4.4.4-r1.ebuild 1230
+SHA256 bb6b37d8fd325cc2340a26121caea5f03efc12ccfbd92897d3b5b558e67af0f9 lsdldoom-1.4.4.4-r1.ebuild 1230
 EBUILD lsdldoom-1.4.4.4.ebuild 1194 RMD160 2407662040dddb0ef054b75ae3072ac2fd4fc8d6 SHA1 4d27b912e359fe266690822540d35a579b83f01c SHA256 5505fde572f7f69758c22da7ad6276915405a197e741f15358ece1c38e4c1dd6
 MD5 8a5329c80290729645f8d2b23a323435 lsdldoom-1.4.4.4.ebuild 1194
 RMD160 2407662040dddb0ef054b75ae3072ac2fd4fc8d6 lsdldoom-1.4.4.4.ebuild 1194
 SHA256 5505fde572f7f69758c22da7ad6276915405a197e741f15358ece1c38e4c1dd6 lsdldoom-1.4.4.4.ebuild 1194
-MISC ChangeLog 1997 RMD160 2ce5d931e30d52876cf0ebc5df253473b0b0b6a2 SHA1 e26b737929a36803e894ff24843fdf0fa2548326 SHA256 7fcf2f1e6748fd6d6222e54c0352da54fac30c90c38ddefeb79a34a005ab3795
-MD5 f0fd32c6df1148ce3c16456c886d9417 ChangeLog 1997
-RMD160 2ce5d931e30d52876cf0ebc5df253473b0b0b6a2 ChangeLog 1997
-SHA256 7fcf2f1e6748fd6d6222e54c0352da54fac30c90c38ddefeb79a34a005ab3795 ChangeLog 1997
+MISC ChangeLog 2198 RMD160 dc14ab64bddd21d4f189473ebe15fd4033bea0f2 SHA1 fa8d44029eb428735bedd8426e94a2a3939865e0 SHA256 feffc3d26dc2992c3d19b169cdc6ac40297f80483c6bee58b605cb488e326c6a
+MD5 fa4af9720b2167a968b1003dbd2a57ec ChangeLog 2198
+RMD160 dc14ab64bddd21d4f189473ebe15fd4033bea0f2 ChangeLog 2198
+SHA256 feffc3d26dc2992c3d19b169cdc6ac40297f80483c6bee58b605cb488e326c6a ChangeLog 2198
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -26,3 +37,13 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 c262ca7c190d40605781dc7c1ee8bfdc files/digest-lsdldoom-1.4.4.4 250
 RMD160 ff4006c069ae5219ac2918c88b6fda3331986cb2 files/digest-lsdldoom-1.4.4.4 250
 SHA256 9ee8839beda5db35dfe8ca6bf7af378148b53f8aa7adf630992aae531c8f07b4 files/digest-lsdldoom-1.4.4.4 250
+MD5 c262ca7c190d40605781dc7c1ee8bfdc files/digest-lsdldoom-1.4.4.4-r1 250
+RMD160 ff4006c069ae5219ac2918c88b6fda3331986cb2 files/digest-lsdldoom-1.4.4.4-r1 250
+SHA256 9ee8839beda5db35dfe8ca6bf7af378148b53f8aa7adf630992aae531c8f07b4 files/digest-lsdldoom-1.4.4.4-r1 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGwgd8dz7hIScOURERAqaKAKCbDMR4cThle33rw1n8H6PfZHwjDQCg1JmR
+xYtVvZDIstzR3qMmV/TB/qU=
+=5yuR
+-----END PGP SIGNATURE-----
diff --git a/games-fps/lsdldoom/files/digest-lsdldoom-1.4.4.4-r1 b/games-fps/lsdldoom/files/digest-lsdldoom-1.4.4.4-r1
new file mode 100644
index 000000000000..47fa8003b043
--- /dev/null
+++ b/games-fps/lsdldoom/files/digest-lsdldoom-1.4.4.4-r1
@@ -0,0 +1,3 @@
+MD5 e1ecfd5a0bd640be48cfd83b28bb1443 lsdldoom-1.4.4.4.tar.gz 916884
+RMD160 92438a234b4642f320364308737e20f232d7da82 lsdldoom-1.4.4.4.tar.gz 916884
+SHA256 6c29560a3a87b351f81717bd79c2cff124df0e68b807a7a365af15317a47d83c lsdldoom-1.4.4.4.tar.gz 916884
diff --git a/games-fps/lsdldoom/files/lsdldoom-1.4.4.4-keys.patch b/games-fps/lsdldoom/files/lsdldoom-1.4.4.4-keys.patch
new file mode 100644
index 000000000000..0c356a9fadcf
--- /dev/null
+++ b/games-fps/lsdldoom/files/lsdldoom-1.4.4.4-keys.patch
@@ -0,0 +1,11 @@
+--- src/g_game.c
++++ src/g_game.c
+@@ -200,7 +200,7 @@
+ #define TURBOTHRESHOLD  0x32
+ #define SLOWTURNTICS  6
+ #define QUICKREVERSE 32768 // 180 degree reverse                    // phares
+-#define NUMKEYS   256
++#define NUMKEYS   512
+ 
+ fixed_t forwardmove[2] = {0x19, 0x32};
+ fixed_t sidemove[2]    = {0x18, 0x28};
diff --git a/games-fps/lsdldoom/lsdldoom-1.4.4.4-r1.ebuild b/games-fps/lsdldoom/lsdldoom-1.4.4.4-r1.ebuild
new file mode 100644
index 000000000000..647d50c08ffd
--- /dev/null
+++ b/games-fps/lsdldoom/lsdldoom-1.4.4.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/lsdldoom/lsdldoom-1.4.4.4-r1.ebuild,v 1.1 2007/08/14 19:50:14 nyhm Exp $
+
+inherit eutils games
+
+DESCRIPTION="Port of ID's doom to SDL"
+HOMEPAGE="http://firehead.org/~jessh/lsdldoom/"
+SRC_URI="http://www.lbjhs.net/~jessh/lsdldoom/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc sparc x86"
+IUSE=""
+
+DEPEND="media-libs/libsdl
+	media-libs/sdl-net
+	!games-fps/prboom
+	games-fps/doom-data"
+
+src_unpack() {
+	unpack ${A}
+	cp -r "${S}"{,.orig}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${PV}-gentoo-paths.patch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-keys.patch \
+		"${FILESDIR}"/${PV}-gcc34.patch #77846
+}
+
+src_compile() {
+	# The SDL_mixer implementation is VERY broken ...
+	# it relies on internal function calls rather than
+	# the exported API ... bad programmer !
+	# i386-asm -> build failure
+	# cpu-opt -> just adds -mcpu crap to CFLAGS
+	ac_cv_lib_SDL_mixer_Mix_LoadMUS=no \
+	egamesconf \
+		--disable-i386-asm \
+		--disable-cpu-opt \
+		|| die
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	prepalldocs
+	dodoc ChangeLog
+	prepgamesdirs
+}