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

Package-Manager: portage-2.2_rc99/cvs/Linux x86_64

4 files changed, 96 insertions, 2 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/Manifest b/games-board/capitalism/Manifest
index bde39aea2053..a67416a2604e 100644
--- a/games-board/capitalism/Manifest
+++ b/games-board/capitalism/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX capitalism-0.2-qt47.patch 696 RMD160 de01c4121f664305bdfa72b1e24cb1bd9bd1f491 SHA1 e7672e102a69be03865fd842e4ccff7b800aba36 SHA256 22f4ef8bd9f278cbb5de74b4958d28e7e19755950aaf24773ae784693dadc487
 DIST 113173-capitalism-0.2.tbz 293382 RMD160 5aa6326a3840d75ded4e19c093a9a222729d16bd SHA1 0cb08b31118a6b8c4075a76c4102552327d16624 SHA256 c84a0a7db8659233d332eac459cb8dd32391868f8de0b0d3608451c27f04131d
+EBUILD capitalism-0.2-r1.ebuild 1167 RMD160 3339f6d800adf10b5e433b88d0accf9b6b8c66e5 SHA1 cea2c770898b2f6e4d7c318b2bb08b343e4c274c SHA256 7dc6cc7d36dde15a6ca2dc8844e5bbe10e0a1e8f041dfcc9405b6294b19336ee
 EBUILD capitalism-0.2.ebuild 1162 RMD160 3fd645789d46861e7004668fe4093fafd67994fa SHA1 65e0c3a5645023e75f669f9f91364dff94abb1be SHA256 a11c51405fe69fa465dcc7ff3bfc9b35abeb6b569bae021aa5bbfd99ad89d921
-MISC ChangeLog 783 RMD160 cb957d05684bfd53cb839dd240a2f6f6c41eb119 SHA1 1daa62ca0ee8bfd7f0c7f683436249ac40010d72 SHA256 cab3e8d1d85f80ebe4bec01b41cae5db45c8508bee6e90ed5fa365087339eb7b
+MISC ChangeLog 1002 RMD160 29b8b3d2b977a5ec8c2afd0365804436fcb96575 SHA1 2b1a022a2e4f62e4f3a36ec82e748916688f2965 SHA256 03b4e1279b2b06204e6ffeed9dc19f9912b6406fb0826149eeaa8731db6b5d2f
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzCulcACgkQ9/cejkQaxBCkhACaA6KIMAa3PN+cE0drMvIBeM1l
+zJcAn3YN5/hVZdfi1Utpe8BF47p1SQS8
+=CEXD
+-----END PGP SIGNATURE-----
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();