version bump

(Portage version: 2.1.4.4)

4 files changed, 196 insertions, 1 deletions

diff --git a/games-board/qgo/ChangeLog b/games-board/qgo/ChangeLog
index dc7f0c02c4d8..dd8783852b6a 100644
--- a/games-board/qgo/ChangeLog
+++ b/games-board/qgo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-board/qgo
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/ChangeLog,v 1.30 2008/03/21 16:49:57 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/ChangeLog,v 1.31 2008/06/24 03:17:12 mr_bones_ Exp $
+
+*qgo-1.5.4_p3 (24 Jun 2008)
+
+  24 Jun 2008; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/qgo-1.5.4_p3-gcc43.patch, +files/qgo-1.5.4_p3-parallel.patch,
+  +qgo-1.5.4_p3.ebuild:
+  version bump
 
   21 Mar 2008; Tristan Heaven <nyhm@gentoo.org> qgo-1.5.4.ebuild:
   Stable on amd64
diff --git a/games-board/qgo/files/qgo-1.5.4_p3-gcc43.patch b/games-board/qgo/files/qgo-1.5.4_p3-gcc43.patch
new file mode 100644
index 000000000000..d93f241d5d74
--- /dev/null
+++ b/games-board/qgo/files/qgo-1.5.4_p3-gcc43.patch
@@ -0,0 +1,115 @@
+--- src/matrix.cpp
++++ src/matrix.cpp
+@@ -5,7 +5,7 @@
+ #include "matrix.h"
+ #include <stdlib.h>
+ #ifndef NO_DEBUG
+-#include <iostream.h>
++#include <iostream>
+ #endif
+ 
+ Matrix::Matrix(int s)
+@@ -78,60 +78,60 @@
+ 	
+ 	int i, j;
+ 	
+-	cout << "\n  ";
++	std::cout << "\n  ";
+ 	for (i=0; i<size; i++)
+-		cout << (i+1)%10 << " ";
+-	cout << endl;
++		std::cout << (i+1)%10 << " ";
++	std::cout << endl;
+ 	
+ 	for (i=0; i<size; i++)
+ 	{
+-		cout << (i+1)%10 << " ";
++		std::cout << (i+1)%10 << " ";
+ 		for (j=0; j<size; j++)
+ 		{
+ #if 1
+ 			switch (abs(matrix[j][i]))
+ 			{
+ 			case stoneNone:
+-			case stoneErase: cout << ". "; break;
+-			case stoneBlack: cout << "B "; break;
+-			case stoneWhite: cout << "W "; break;
+-			case markSquare*10: cout << "[ "; break;
+-			case markCircle*10: cout << "O "; break;
+-			case markTriangle*10: cout << "T "; break;
+-			case markCross*10: cout << "X "; break;
+-			case markText*10: cout << "A "; break;
+-			case markNumber*10: cout << "1 "; break;
+-			case markSquare*10+stoneBlack: cout << "S "; break;
+-			case markCircle*10+stoneBlack: cout << "C "; break;
+-			case markTriangle*10+stoneBlack: cout << "D "; break;
+-			case markCross*10+stoneBlack: cout << "R "; break;
+-			case markText*10+stoneBlack: cout << "A "; break;
+-			case markNumber*10+stoneBlack: cout << "N "; break;
+-			case markSquare*10+stoneWhite: cout << "s "; break;
+-			case markCircle*10+stoneWhite: cout << "c "; break;
+-			case markTriangle*10+stoneWhite: cout << "d "; break;
+-			case markCross*10+stoneWhite: cout << "r "; break;
+-			case markText*10+stoneWhite: cout << "a "; break;
+-			case markNumber*10+stoneWhite: cout << "n "; break;
+-			default: cout << "? ";
++			case stoneErase: std::cout << ". "; break;
++			case stoneBlack: std::cout << "B "; break;
++			case stoneWhite: std::cout << "W "; break;
++			case markSquare*10: std::cout << "[ "; break;
++			case markCircle*10: std::cout << "O "; break;
++			case markTriangle*10: std::cout << "T "; break;
++			case markCross*10: std::cout << "X "; break;
++			case markText*10: std::cout << "A "; break;
++			case markNumber*10: std::cout << "1 "; break;
++			case markSquare*10+stoneBlack: std::cout << "S "; break;
++			case markCircle*10+stoneBlack: std::cout << "C "; break;
++			case markTriangle*10+stoneBlack: std::cout << "D "; break;
++			case markCross*10+stoneBlack: std::cout << "R "; break;
++			case markText*10+stoneBlack: std::cout << "A "; break;
++			case markNumber*10+stoneBlack: std::cout << "N "; break;
++			case markSquare*10+stoneWhite: std::cout << "s "; break;
++			case markCircle*10+stoneWhite: std::cout << "c "; break;
++			case markTriangle*10+stoneWhite: std::cout << "d "; break;
++			case markCross*10+stoneWhite: std::cout << "r "; break;
++			case markText*10+stoneWhite: std::cout << "a "; break;
++			case markNumber*10+stoneWhite: std::cout << "n "; break;
++			default: std::cout << "? ";
+ 			}
+ #else
+-			cout << matrix[j][i] << " ";
++			std::cout << matrix[j][i] << " ";
+ #endif
+ 		}
+-		cout << (i+1)%10 << endl;
++		std::cout << (i+1)%10 << endl;
+ 	}
+ 	
+-	cout << "  ";
++	std::cout << "  ";
+ 	for (i=0; i<size; i++)
+-		cout << (i+1)%10 << " ";
+-	cout << endl;
++		std::cout << (i+1)%10 << " ";
++	std::cout << endl;
+ 	
+ 	if (markTexts != NULL && !markTexts->isEmpty())
+ 	{
+-		cout << markTexts->count() << " mark texts in the storage.\n";
++		std::cout << markTexts->count() << " mark texts in the storage.\n";
+ 		for (QStringList::Iterator it=markTexts->begin(); it != markTexts->end(); ++it)
+-			cout << (QString)(*it) << endl;
++			std::cout << (QString)(*it) << endl;
+ 	}
+ }
+ #endif
+--- src/tree.cpp
++++ src/tree.cpp
+@@ -5,7 +5,6 @@
+ #include "tree.h"
+ #include "move.h"
+ #include "qgo.h"
+-#include <iostream.h>
+ #include <qptrstack.h>
+ 
+ Tree::Tree(int board_size)
diff --git a/games-board/qgo/files/qgo-1.5.4_p3-parallel.patch b/games-board/qgo/files/qgo-1.5.4_p3-parallel.patch
new file mode 100644
index 000000000000..4351104b7071
--- /dev/null
+++ b/games-board/qgo/files/qgo-1.5.4_p3-parallel.patch
@@ -0,0 +1,34 @@
+--- src/sounds/Makefile.in.bad	2007-06-02 11:24:44.000000000 +0200
++++ src/sounds/Makefile.in	2007-06-02 11:25:08.000000000 +0200
+@@ -373,7 +353,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-SoundsDATA install-data-local
++install-data-am: install-SoundsDATA
+ 
+ install-exec-am:
+ 
+--- src/translations/Makefile.in.bad	2007-06-02 11:24:48.000000000 +0200
++++ src/translations/Makefile.in	2007-06-02 11:25:08.000000000 +0200
+@@ -374,7 +353,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-TranslationsDATA install-data-local
++install-data-am: install-TranslationsDATA
+ 
+ install-exec-am:
+ 
+--- templates/Makefile.in.bad	2007-09-20 15:39:52.000000000 -0400
++++ templates/Makefile.in	2007-09-20 15:40:01.000000000 -0400
+@@ -386,8 +386,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-ApplinkDATA install-MimelinkDATA \
+-	install-data-local
++install-data-am: install-ApplinkDATA install-MimelinkDATA
+ 
+ install-exec-am:
+ 
diff --git a/games-board/qgo/qgo-1.5.4_p3.ebuild b/games-board/qgo/qgo-1.5.4_p3.ebuild
new file mode 100644
index 000000000000..46c1031c9f23
--- /dev/null
+++ b/games-board/qgo/qgo-1.5.4_p3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/qgo-1.5.4_p3.ebuild,v 1.1 2008/06/24 03:17:12 mr_bones_ Exp $
+
+EAPI=1
+inherit eutils autotools qt3 games
+
+DESCRIPTION="A Qt Go client and SGF editor"
+HOMEPAGE="http://qgo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qgo/${P/_p/-r}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=x11-libs/qt-3.3:3"
+
+S=${WORKDIR}/${P/_p*/}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${P}-parallel.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
+	sed -i 's:$(datadir):/usr/share:' \
+		templates/Makefile.in \
+		|| die "sed Makefile.in failed"
+	sed -i "s:/usr/share:${GAMES_DATADIR}:" \
+		templates/*.desktop \
+		|| die "sed .desktop failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	prepgamesdirs
+}