upstream patch for wheel handling (bug #307901)

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

4 files changed, 81 insertions, 2 deletions

diff --git a/games-board/holdingnuts/ChangeLog b/games-board/holdingnuts/ChangeLog
index b7db3aa17168..55afbcb0a6d9 100644
--- a/games-board/holdingnuts/ChangeLog
+++ b/games-board/holdingnuts/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-board/holdingnuts
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/holdingnuts/ChangeLog,v 1.5 2010/01/24 23:09:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/holdingnuts/ChangeLog,v 1.6 2010/03/05 21:30:29 mr_bones_ Exp $
+
+*holdingnuts-0.0.5-r1 (05 Mar 2010)
+
+  05 Mar 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +holdingnuts-0.0.5-r1.ebuild, +files/holdingnuts-0.0.5-wheel.patch:
+  upstream patch for wheel handling (bug #307901)
 
   24 Jan 2010; Brent Baude <ranger@gentoo.org> holdingnuts-0.0.5.ebuild:
   keyworded ~arch for ppc, bug 296282
diff --git a/games-board/holdingnuts/Manifest b/games-board/holdingnuts/Manifest
index 27818dd979dc..99838ffbb148 100644
--- a/games-board/holdingnuts/Manifest
+++ b/games-board/holdingnuts/Manifest
@@ -1,4 +1,6 @@
+AUX holdingnuts-0.0.5-wheel.patch 571 RMD160 aa9dcc2c8969b6c04fdab1c04f3f0f372642cb58 SHA1 be1ebc47309cf1a1beb655649571e5068ec41f9e SHA256 16bdc23b7f83b71430191cf7861bf1f0becb47bcb2121371d129b0d7ad2a5741
 DIST holdingnuts-0.0.5.tar.bz2 1456227 RMD160 8d2431c65c6ecd9a05f641984905ac582a9db4b2 SHA1 2109ddea8965aac8d582e7a92450e22aed02084d SHA256 0fa9a220b63d246294b526c47728b9f26d0aceffa419b3c9784c7f6cab2c8247
+EBUILD holdingnuts-0.0.5-r1.ebuild 1275 RMD160 96b8b169bffe1893deb092b36333f382f9de5782 SHA1 91ae099aff50418e8f587078c3cc6ebe923324ae SHA256 c5cd19ee60b25ab9424e14788ff95a57dbb3c59da077b2ecc49fdd09bb376a13
 EBUILD holdingnuts-0.0.5.ebuild 1192 RMD160 0164049434bf4acf77b9cb21f5c208cbea6393c5 SHA1 da522832bebd469d47d892b5cf5d82e7cea54a3b SHA256 925bf9997a1c156ae888c7e3809b567057343e7b9e540e661d5dffd0a9ae1384
-MISC ChangeLog 936 RMD160 cd809c99a2dd18109253fef594ed9e327615be70 SHA1 bf41af683f82bca85ac4f8a7715a841117390c44 SHA256 a8645f0238f10ecef33e66bb2b4b33d66a8d1902c62fa98c6fa75102c7b88e1d
+MISC ChangeLog 1152 RMD160 576fb7e30ec4b458c24e66119f349aeab6528f8f SHA1 416540d46a09e48dc5b1e005bfdf2e9f870c90a8 SHA256 9c0e1be78781054ea8efe58e1bf89249a957abf0f51dee2aa92e969beacd49e7
 MISC metadata.xml 160 RMD160 f839c00d9f25c1f873f95ab899fb64060c1d0bf5 SHA1 08c3d180cf8dbef87e40c42a18b457516a5d7ffe SHA256 5ac0a3647e8149d52ce55d391cf1680ac52d6f0330be21c3bca4790b971b5e5d
diff --git a/games-board/holdingnuts/files/holdingnuts-0.0.5-wheel.patch b/games-board/holdingnuts/files/holdingnuts-0.0.5-wheel.patch
new file mode 100644
index 000000000000..447d574ffea6
--- /dev/null
+++ b/games-board/holdingnuts/files/holdingnuts-0.0.5-wheel.patch
@@ -0,0 +1,17 @@
+Description: fixed gamelogic bug with wheel-straight: check suit of ace if testing for straight-flush
+Origin: http://sourceforge.net/apps/trac/holdingnuts/changeset/741
+--- a/src/libpoker/GameLogic.cpp
++++ b/src/libpoker/GameLogic.cpp
+@@ -179,7 +179,11 @@
+ 	
+ 	// is an A2345-straight ("wheel")
+ 	if (count == 4 && (last_face == Card::Two && allcards->front().getFace() == Card::Ace))
+-		is_straight = true;
++	{
++		// check suit when testing for StraightFlush
++		if (suit == -1 || allcards->front().getSuit() == suit)
++			is_straight = true;
++	}
+ 	
+ 	if (is_straight)
+ 	{
\ No newline at end of file
diff --git a/games-board/holdingnuts/holdingnuts-0.0.5-r1.ebuild b/games-board/holdingnuts/holdingnuts-0.0.5-r1.ebuild
new file mode 100644
index 000000000000..5a97848e63da
--- /dev/null
+++ b/games-board/holdingnuts/holdingnuts-0.0.5-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/holdingnuts/holdingnuts-0.0.5-r1.ebuild,v 1.1 2010/03/05 21:30:29 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils cmake-utils games
+
+DESCRIPTION="An open source poker client and server"
+HOMEPAGE="http://www.holdingnuts.net/"
+SRC_URI="http://downloads.sourceforge.net/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa debug dedicated"
+
+RDEPEND="
+	!dedicated? (
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
+		alsa? ( >=media-libs/libsdl-1.2.10[alsa] )
+	)"
+
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.6.3"
+
+PATCHES=( "${FILESDIR}"/${P}-wheel.patch ) # upstream patch (bug #307901)
+
+src_configure() {
+	local mycmakeargs="$(cmake-utils_use_enable alsa AUDIO)
+		$(cmake-utils_use_enable !dedicated CLIENT)
+		$(cmake-utils_use_enable debug DEBUG)"
+
+	mycmakeargs="${mycmakeargs}
+		-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}
+		-DCMAKE_DATA_PATH=${GAMES_DATADIR}"
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use dedicated ; then
+		domenu ${PN}.desktop
+		doicon ${PN}.png
+		doman docs/${PN}.6
+	fi
+
+	dodoc ChangeLog docs/protocol_spec.txt
+	doman docs/${PN}-server.6
+
+	prepgamesdirs
+}