Fix 'r' key in mastermind, bug #179519

Package-Manager: portage-2.1.3_rc8

5 files changed, 47 insertions, 19 deletions

diff --git a/games-board/ace/ChangeLog b/games-board/ace/ChangeLog
index ee0c2078a9e7..70911aede7a4 100644
--- a/games-board/ace/ChangeLog
+++ b/games-board/ace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-board/ace
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.15 2007/06/10 14:58:56 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.16 2007/07/22 12:23:59 nyhm Exp $
+
+*ace-1.2-r2 (22 Jul 2007)
+
+  22 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/ace-1.2-mastermind-keys.patch, +ace-1.2-r2.ebuild:
+  Fix 'r' key in mastermind, bug #179519
 
   10 Jun 2007; Tristan Heaven <nyhm@gentoo.org> ace-1.2-r1.ebuild:
   Block games-misc/bsd-games because they collide on /usr/games/bin/canfield
diff --git a/games-board/ace/Manifest b/games-board/ace/Manifest
index 822825854ffe..23c9602e4f91 100644
--- a/games-board/ace/Manifest
+++ b/games-board/ace/Manifest
@@ -9,26 +9,30 @@ AUX ace-1.2-gcc41.patch 2020 RMD160 c4b54b0a725508ab25c22ec633beb23b1a7035a5 SHA
 MD5 1c026702258fd964e05176934ce40faa files/ace-1.2-gcc41.patch 2020
 RMD160 c4b54b0a725508ab25c22ec633beb23b1a7035a5 files/ace-1.2-gcc41.patch 2020
 SHA256 45362fb9c87496fe6c0b84502d8e4a37ba37a8d4c389b749a1ef9920a2e85d60 files/ace-1.2-gcc41.patch 2020
+AUX ace-1.2-mastermind-keys.patch 527 RMD160 d3614d10b9fc0fb848479e14642fb6cc4de4e96b SHA1 dcfdc936a5c857a5643e50d6a62851ea510525a9 SHA256 c61a4b889fc0f2efa78a7c6bcbebe1f40d558d15ad330ba0010cebb9d3ff0aa5
+MD5 b9641127b6918b3cb70562c2a0f271e2 files/ace-1.2-mastermind-keys.patch 527
+RMD160 d3614d10b9fc0fb848479e14642fb6cc4de4e96b files/ace-1.2-mastermind-keys.patch 527
+SHA256 c61a4b889fc0f2efa78a7c6bcbebe1f40d558d15ad330ba0010cebb9d3ff0aa5 files/ace-1.2-mastermind-keys.patch 527
 DIST ace-1.2.tar.gz 309289 RMD160 ee3b4c4707dba1eb92d06306157c1188bfba616d SHA1 c0bf8e4eaee3128b0f41e7832723a0660146278a SHA256 fcda8bca508490bea642c83fcf718565bf4ed4c50f2d7b34761da61fe2e6bc9d
-EBUILD ace-1.2-r1.ebuild 892 RMD160 921f4a4478c15a49e8805911ea44d267f73f0e25 SHA1 de7e9aaf70c1f61de6d65fe25a1e459b6c1f81cc SHA256 78f3ab6101ed7ccf256b575e3af27adee846811290afa7bf4cfede482662c895
-MD5 41e03f2b74262d0761a62e798da6ba90 ace-1.2-r1.ebuild 892
-RMD160 921f4a4478c15a49e8805911ea44d267f73f0e25 ace-1.2-r1.ebuild 892
-SHA256 78f3ab6101ed7ccf256b575e3af27adee846811290afa7bf4cfede482662c895 ace-1.2-r1.ebuild 892
-MISC ChangeLog 1925 RMD160 a1ae6d2a619d8d32840f594e718c1aa3eca82d6a SHA1 7d0f4d35e3eb69f03b17b9f4366218e57e9b7704 SHA256 ebcbeada77d165973434c0e99b2957d8bc0e0e9c77de592db7547fd5c19eabfb
-MD5 ba7518664dcf91646e298e8e18e7c3b8 ChangeLog 1925
-RMD160 a1ae6d2a619d8d32840f594e718c1aa3eca82d6a ChangeLog 1925
-SHA256 ebcbeada77d165973434c0e99b2957d8bc0e0e9c77de592db7547fd5c19eabfb ChangeLog 1925
+EBUILD ace-1.2-r2.ebuild 940 RMD160 7d297c88544c5db18e30ef069163cbb0398beea7 SHA1 973cdbefb0c30e668459b58c7bc6927cce75f72d SHA256 3d099a9c33f46af419a52fa31ccdd04da808eae1b845b691ab8e190f648244b2
+MD5 ad012f2ee7fbf6ccd38c9a85f99b1025 ace-1.2-r2.ebuild 940
+RMD160 7d297c88544c5db18e30ef069163cbb0398beea7 ace-1.2-r2.ebuild 940
+SHA256 3d099a9c33f46af419a52fa31ccdd04da808eae1b845b691ab8e190f648244b2 ace-1.2-r2.ebuild 940
+MISC ChangeLog 2102 RMD160 7b4216c8b490b27ffeb2e736dda8adf5f150ea9a SHA1 39c0f1adbc207d422a752ae70708b2016479408e SHA256 1b60532309bf42d0b0702f1aa24bfe8371dbc3423f3950f53d2dd18ba4c29d66
+MD5 09156544acdf0a20744684bf117562ef ChangeLog 2102
+RMD160 7b4216c8b490b27ffeb2e736dda8adf5f150ea9a ChangeLog 2102
+SHA256 1b60532309bf42d0b0702f1aa24bfe8371dbc3423f3950f53d2dd18ba4c29d66 ChangeLog 2102
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 0a155fa22b0e899cfa547a0a4f9bb1dd files/digest-ace-1.2-r1 223
-RMD160 46d8a92e87e3315634b204dcefa6048fe97c3ab6 files/digest-ace-1.2-r1 223
-SHA256 23a6708f7879df16da14cdf8a5f8e19808558e584edc276bf596af714445f2bd files/digest-ace-1.2-r1 223
+MD5 0a155fa22b0e899cfa547a0a4f9bb1dd files/digest-ace-1.2-r2 223
+RMD160 46d8a92e87e3315634b204dcefa6048fe97c3ab6 files/digest-ace-1.2-r2 223
+SHA256 23a6708f7879df16da14cdf8a5f8e19808558e584edc276bf596af714445f2bd files/digest-ace-1.2-r2 223
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGbBG3dz7hIScOURERAtmPAJ9v5LIvOj+XnvDI9EwwEpTIsi81oQCgonSY
-wkHJFeR74TnPf1xo8udXpD8=
-=SpbA
+iD8DBQFGo0xcdz7hIScOURERAgFhAJ9T75nRfdI6rLFzbCLV8zLUu+h4ggCgsRKo
+5cYfcRQcg5t5Bfk8uMqPDNI=
+=s83N
 -----END PGP SIGNATURE-----
diff --git a/games-board/ace/ace-1.2-r1.ebuild b/games-board/ace/ace-1.2-r2.ebuild
index e928bce0dea3..8adacadddec3 100644
--- a/games-board/ace/ace-1.2-r1.ebuild
+++ b/games-board/ace/ace-1.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.2-r1.ebuild,v 1.18 2007/06/10 14:58:56 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.2-r2.ebuild,v 1.1 2007/07/22 12:23:59 nyhm Exp $
 
 inherit eutils games
 
@@ -20,8 +20,10 @@ DEPEND="x11-libs/libXpm
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${P}"-check_for_end_of_game.patch \
-		"${FILESDIR}/${P}"-gcc41.patch
+	epatch \
+		"${FILESDIR}"/${P}-check_for_end_of_game.patch \
+		"${FILESDIR}"/${P}-gcc41.patch \
+		"${FILESDIR}"/${P}-mastermind-keys.patch
 
 	# Fix timestamps so we dont run autotools #76473
 	touch -r aclocal.m4 configure.in
diff --git a/games-board/ace/files/ace-1.2-mastermind-keys.patch b/games-board/ace/files/ace-1.2-mastermind-keys.patch
new file mode 100644
index 000000000000..2678e14fcb1f
--- /dev/null
+++ b/games-board/ace/files/ace-1.2-mastermind-keys.patch
@@ -0,0 +1,16 @@
+===================================================================
+RCS file: /cvs/ace/ace/games/mastermind.c,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -p -u -r1.5 -r1.6
+--- ace/games/mastermind.c	2001/09/21 19:22:51	1.5
++++ /cvs/ace/ace/games/mastermind.c	2003/02/11 18:35:59	1.6
+@@ -210,7 +210,7 @@ key(int k, int x, int y)
+   }
+   if (k == 3 || k == 27 || k == 'q')
+     exit(0);
+-  if (k == KEY_F(2) || k == 'r')
++  if (k == KEY_F(2))
+   {
+     start_again();
+     invalidate(0, 0, table_width, table_height);
diff --git a/games-board/ace/files/digest-ace-1.2-r1 b/games-board/ace/files/digest-ace-1.2-r2
index dd0d57470b27..dd0d57470b27 100644
--- a/games-board/ace/files/digest-ace-1.2-r1
+++ b/games-board/ace/files/digest-ace-1.2-r2