Patch to build against Qt-4.7. Bug #338497. Migrated to qt4-r2

(Portage version: 2.2_rc99/cvs/Linux x86_64)

3 files changed, 83 insertions, 1 deletions

diff --git a/games-board/capitalism/ChangeLog b/games-board/capitalism/ChangeLog
index abac684a622c..f30fad74a458 100644
--- a/games-board/capitalism/ChangeLog
+++ b/games-board/capitalism/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-board/capitalism
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/capitalism/ChangeLog,v 1.5 2010/02/08 14:07:13 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/capitalism/ChangeLog,v 1.6 2010/10/23 10:34:55 hwoarang Exp $
+
+*capitalism-0.2-r1 (23 Oct 2010)
+
+  23 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
+  +capitalism-0.2-r1.ebuild, +files/capitalism-0.2-qt47.patch:
+  Patch to build against Qt-4.7. Bug #338497. Migrated to qt4-r2
 
   08 Feb 2010; Christian Faulhammer <fauli@gentoo.org>
   capitalism-0.2.ebuild:
diff --git a/games-board/capitalism/capitalism-0.2-r1.ebuild b/games-board/capitalism/capitalism-0.2-r1.ebuild
new file mode 100644
index 000000000000..655c2c06e9d8
--- /dev/null
+++ b/games-board/capitalism/capitalism-0.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/capitalism/capitalism-0.2-r1.ebuild,v 1.1 2010/10/23 10:34:55 hwoarang Exp $
+
+EAPI=2
+inherit eutils gnome2-utils qt4-r2 games
+
+MY_PN=${PN/c/C}
+
+DESCRIPTION="A monopd compatible boardgame to play Monopoly-like games"
+HOMEPAGE="http://www.qt-apps.org/content/show.php/Capitalism?content=113173"
+SRC_URI="http://www.qt-apps.org/CONTENT/content-files/113173-${P}.tbz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-libs/qt-gui:4"
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-qt47.patch
+)
+
+src_configure() {
+	eqmake4 ${MY_PN}.pro
+}
+
+src_install() {
+	dogamesbin ${MY_PN} || die
+	dodoc changelog readme.txt
+
+	local res
+	for res in 16 22 24 32 48 64; do
+		insinto /usr/share/icons/hicolor/${res}x${res}/apps
+		newins icons/${res}x${res}.png ${PN}.png
+	done
+
+	make_desktop_entry ${MY_PN} ${MY_PN}
+	prepgamesdirs
+}
+
+pkg_preinst() {
+	games_pkg_preinst
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/games-board/capitalism/files/capitalism-0.2-qt47.patch b/games-board/capitalism/files/capitalism-0.2-qt47.patch
new file mode 100644
index 000000000000..5fb01ea7915f
--- /dev/null
+++ b/games-board/capitalism/files/capitalism-0.2-qt47.patch
@@ -0,0 +1,19 @@
+Index: Capitalism-0.2/src/Capic/Gui/capiclientplayer.cpp
+===================================================================
+--- Capitalism-0.2.orig/src/Capic/Gui/capiclientplayer.cpp
++++ Capitalism-0.2/src/Capic/Gui/capiclientplayer.cpp
+@@ -36,12 +36,12 @@ CapiClientPlayer::CapiClientPlayer(int i
+ 
+ 	playerWidget = new PlayerInfo(0, 32);
+ 	playerWidget->setName(getName());
+-	playerWidget->setMoney(QString(0));
++	playerWidget->setMoney(QString());
+ 	playerWidget->setAvatar(getAvatar());
+ 
+ 	auction = new PlayerAuction();
+ 	auction->setName(getName());
+-	auction->setMoney(QString(0));
++	auction->setMoney(QString());
+ 	auction->setAvatar(getAvatar());
+ 
+ 	playerWidget->playerId = getId();