old

7 files changed, 12 insertions, 247 deletions

diff --git a/games-board/gnocatan/files/digest-gnocatan-0.8.0.0 b/games-board/gnocatan/files/digest-gnocatan-0.8.0.0
deleted file mode 100644
index 47cb0e8ba991..000000000000
--- a/games-board/gnocatan/files/digest-gnocatan-0.8.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 32b4be833ad5afc9da88229aed3a7aa8 gnocatan-0.8.0.0.tar.gz 1667559
diff --git a/games-board/gnocatan/files/digest-gnocatan-0.8.1.16 b/games-board/gnocatan/files/digest-gnocatan-0.8.1.16
deleted file mode 100644
index fe963935f0ef..000000000000
--- a/games-board/gnocatan/files/digest-gnocatan-0.8.1.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9dd31aad77a44ed2e3e8ba6c39e5aa7e gnocatan-0.8.1.16.tar.gz 2116705
diff --git a/games-board/gnocatan/files/gnocatan-wijnen-patch.diff b/games-board/gnocatan/files/gnocatan-wijnen-patch.diff
deleted file mode 100644
index 5f8934bde1a7..000000000000
--- a/games-board/gnocatan/files/gnocatan-wijnen-patch.diff
+++ /dev/null
@@ -1,187 +0,0 @@
-diff --unified --recursive --new-file gnocatan-0.7.1/ai/client.c gnocatan-0.7.1-patched/ai/client.c
---- gnocatan-0.7.1/ai/client.c	2002-06-09 14:59:33.000000000 +0200
-+++ gnocatan-0.7.1-patched/ai/client.c	2003-06-19 23:47:02.000000000 +0200
-@@ -155,12 +155,12 @@
- 		client_exit();
- 		return TRUE;
- 	case SM_RECV:
--		if (sm_recv(sm, "ERR %S", str)) {
-+		if (sm_recv(sm, "ERR %S", str, sizeof (str))) {
- 			log_message( MSG_ERROR, "Error (%s): %s\n", sm_current_name(sm), str);
- 			exit(0);
- 			return TRUE;
- 		}
--		if (sm_recv(sm, "%S", str)) {
-+		if (sm_recv(sm, "%S", str, sizeof (str))) {
- 			log_message( MSG_ERROR, "Error (%s): %s\n", sm_current_name(sm), str);
- 			return TRUE;
- 		}
-@@ -228,7 +228,7 @@
- 	gint player_num;
- 	char str[512];
- 
--	if (sm_recv(sm, "player %d chat %S", &player_num, str)) {
-+	if (sm_recv(sm, "player %d chat %S", &player_num, str, sizeof (str))) {
- 		/*
- 		log_message( MSG_INFO, _("%s said: "), player_name(player_num, TRUE));
- 		log_message( MSG_CHAT, "%s\n", str);
-@@ -239,7 +239,7 @@
- 		player_change_name(player_num, NULL);
- 		return TRUE;
- 	}
--	if (sm_recv(sm, "player %d is %S", &player_num, str)) {
-+	if (sm_recv(sm, "player %d is %S", &player_num, str, sizeof (str))) {
- 		player_change_name(player_num, str);
- 		return TRUE;
- 	}
-@@ -490,7 +490,7 @@
- 		return TRUE; 
- 	} 
- 	if (sm_recv(sm, "player %d of %d, welcome to gnocatan server %S",
--		    &player_num, &total_num, version)) {
-+		    &player_num, &total_num, version, sizeof (version))) {
- 		player_set_my_num(player_num);
- 		player_set_total_num(total_num);
- 		if (saved_name != NULL)
-@@ -576,7 +576,7 @@
- 	}
- 	if (check_other_players(sm))
- 		return TRUE;
--	if (sm_recv(sm, "%S", str)) {
-+	if (sm_recv(sm, "%S", str, sizeof (str))) {
- 		params_load_line(game_params, str);
- 		return TRUE;
- 	}
-diff --unified --recursive --new-file gnocatan-0.7.1/client/client.c gnocatan-0.7.1-patched/client/client.c
---- gnocatan-0.7.1/client/client.c	2002-06-08 23:57:33.000000000 +0200
-+++ gnocatan-0.7.1-patched/client/client.c	2003-06-20 01:21:07.000000000 +0200
-@@ -185,15 +185,15 @@
- 		sm_goto(sm, mode_offline);
- 		return TRUE;
- 	case SM_RECV:
--		if (sm_recv(sm, "ERR %S", str)) {
-+		if (sm_recv(sm, "ERR %S", str , sizeof (str))) {
- 			log_message( MSG_ERROR, "Error (%s): %s\n", sm_current_name(sm), str);
- 			return TRUE;
- 		}
--		if (sm_recv(sm, "NOTE %S", str)) {
-+		if (sm_recv(sm, "NOTE %S", str, sizeof (str))) {
- 			log_message( MSG_ERROR, "Notice: %s\n", str);
- 			return TRUE;
- 		}
--		if (sm_recv(sm, "%S", str)) {
-+		if (sm_recv(sm, "%S", str, sizeof (str))) {
- 			log_message( MSG_ERROR, "Unknown message in %s: %s\n", sm_current_name(sm), str);
- 			return TRUE;
- 		}
-@@ -246,7 +246,7 @@
- 	gint player_num;
- 	char str[512];
- 
--	if (sm_recv(sm, "player %d chat %S", &player_num, str)) {
-+	if (sm_recv(sm, "player %d chat %S", &player_num, str, sizeof (str))) {
- 		chat_parser( player_num, str );
- 		/*
- 		log_message( MSG_INFO, _("%s said: "), player_name(player_num, TRUE));
-@@ -258,7 +258,7 @@
- 		player_change_name(player_num, NULL);
- 		return TRUE;
- 	}
--	if (sm_recv(sm, "player %d is %S", &player_num, str)) {
-+	if (sm_recv(sm, "player %d is %S", &player_num, str, sizeof (str))) {
- 		player_change_name(player_num, str);
- 		return TRUE;
- 	}
-@@ -606,7 +606,7 @@
- 		}
- 	}
- 	if (sm_recv(sm, "player %d of %d, welcome to gnocatan server %S",
--		    &player_num, &total_num, version)) {
-+		    &player_num, &total_num, version, sizeof (version))) {
- 		player_set_my_num(player_num);
- 		player_set_total_num(total_num);
- 		if (saved_name != NULL)
-@@ -694,7 +694,7 @@
- 	}
- 	if (check_other_players(sm))
- 		return TRUE;
--	if (sm_recv(sm, "%S", str)) {
-+	if (sm_recv(sm, "%S", str, sizeof (str))) {
- 		params_load_line(game_params, str);
- 		return TRUE;
- 	}
-@@ -782,7 +782,7 @@
- 		strcpy(rinfo.prevstate, "PLENTY");
- 		return TRUE;
- 	}
--	if (sm_recv(sm, "state %S", str)) {
-+	if (sm_recv(sm, "state %S", str, sizeof (str))) {
- 		strcpy(rinfo.prevstate, str);
- 		return TRUE;
- 	}
-diff --unified --recursive --new-file gnocatan-0.7.1/common/state.c gnocatan-0.7.1-patched/common/state.c
---- gnocatan-0.7.1/common/state.c	2002-06-08 23:32:05.000000000 +0200
-+++ gnocatan-0.7.1-patched/common/state.c	2003-06-20 00:12:10.000000000 +0200
-@@ -150,7 +150,15 @@
- 		break;
- 	case NET_READ:
- 		sm->line = line;
--		route_event(sm, SM_RECV);
-+		/* Only handle data if there is a context.  Fixes bug that
-+		 * clients starting to send data immediately crash the
-+		 * server */
-+		if (sm->stack_ptr != -1)
-+			route_event(sm, SM_RECV);
-+		else {
-+			dec_use_count (sm);
-+			return;
-+		}
- 		break;
- 	}
- 	route_event(sm, SM_INIT);
-@@ -235,7 +243,9 @@
- 		switch (*fmt++) {
- 		case 'S': /* string from current position to end of line */
- 			str = va_arg(ap, gchar*);
--			strcpy(str, line + offset);
-+			len = va_arg(ap, gint);
-+			strncpy(str, line + offset, len - 1);
-+			str[len - 1] = '\0';
- 			offset += strlen(str);
- 			break;
- 		case 'd': /* integer */
-diff --unified --recursive --new-file gnocatan-0.7.1/server/player.c gnocatan-0.7.1-patched/server/player.c
---- gnocatan-0.7.1/server/player.c	2002-05-19 20:23:17.000000000 +0200
-+++ gnocatan-0.7.1-patched/server/player.c	2003-06-19 23:55:54.000000000 +0200
-@@ -85,11 +85,11 @@
- 		}
- 		return TRUE;
- 	case SM_RECV:
--		if (sm_recv(sm, "chat %S", text)) {
-+		if (sm_recv(sm, "chat %S", text, sizeof (text))) {
- 			player_broadcast(player, PB_ALL, "chat %s\n", text);
- 			return TRUE;
- 		}
--		if (sm_recv(sm, "name %S", text)) {
-+		if (sm_recv(sm, "name %S", text, sizeof (text))) {
- 			player_set_name(player, text);
- 			return TRUE;
- 		}
-@@ -446,7 +446,7 @@
- 		break;
- 	
- 	case SM_RECV:
--		if( sm_recv(sm, "version %S", version ) )
-+		if( sm_recv(sm, "version %S", version, sizeof (version) ) )
- 		{
- 			player->client_version = g_strdup(version);
- 			if( check_versions( version ) )
-@@ -482,7 +482,7 @@
- 			player_setup(player, -1);
- 			return TRUE;
- 		}
--		else if( sm_recv(sm, "status reconnect %S", playername ) )
-+		else if( sm_recv(sm, "status reconnect %S", playername, sizeof (playername) ) )
- 		{
- 			/* if possible, try to revive the player */
- 			player_revive(player, playername);
diff --git a/games-board/gnocatan/gnocatan-0.8.0.0.ebuild b/games-board/gnocatan/gnocatan-0.8.0.0.ebuild
deleted file mode 100644
index 0cc6a59d77fb..000000000000
--- a/games-board/gnocatan/gnocatan-0.8.0.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnocatan/gnocatan-0.8.0.0.ebuild,v 1.3 2003/10/18 07:36:04 mr_bones_ Exp $
-
-inherit games gnome2
-
-DESCRIPTION="A clone of the popular board game The Settlers of Catan"
-HOMEPAGE="http://gnocatan.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnocatan/${P}.tar.gz"
-
-KEYWORDS="x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls"
-
-DEPEND=">=gnome-base/libgnomeui-2.2*
-	=dev-libs/glib-1.2*
-	>=app-text/scrollkeeper-0.3*"
-
-G2CONF="${G2CONF} `use_enable nls`"
-DOCS="AUTHORS ChangeLog README"
-
-src_install() {
-	gnome2_src_install
-	dogamesbin ${D}/usr/bin/* || die "dogamesbin failed"
-	rm -rf ${D}/usr/bin/
-	prepgamesdirs
-}
diff --git a/games-board/gnocatan/gnocatan-0.8.1.16-r1.ebuild b/games-board/gnocatan/gnocatan-0.8.1.16-r1.ebuild
index 1d0d9925d9ec..47f8fe1ba808 100644
--- a/games-board/gnocatan/gnocatan-0.8.1.16-r1.ebuild
+++ b/games-board/gnocatan/gnocatan-0.8.1.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnocatan/gnocatan-0.8.1.16-r1.ebuild,v 1.1 2004/02/24 16:38:41 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnocatan/gnocatan-0.8.1.16-r1.ebuild,v 1.2 2004/02/29 10:20:20 vapier Exp $
 
 inherit gnome2
 
@@ -8,18 +8,15 @@ DESCRIPTION="A clone of the popular board game The Settlers of Catan"
 HOMEPAGE="http://gnocatan.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gnocatan/${P}.tar.gz"
 
-KEYWORDS="~x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86"
 IUSE="nls"
 
 DEPEND=">=gnome-base/libgnomeui-2.2*
 	=dev-libs/glib-1.2*
 	>=app-text/scrollkeeper-0.3*"
 
-G2CONF="${G2CONF} `use_enable nls`"
-DOCS="AUTHORS ChangeLog README"
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -31,3 +28,13 @@ src_unpack() {
 	cd ${S}/server
 	epatch ${FILESDIR}/servertrade.diff
 }
+
+src_compile() {
+	export G2CONF="${G2CONF} `use_enable nls`"
+	gnome2_src_compile
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog README"
+	gnome2_src_install
+}
diff --git a/games-board/gnocatan/gnocatan-0.8.1.16.ebuild b/games-board/gnocatan/gnocatan-0.8.1.16.ebuild
deleted file mode 100644
index f8b0a6fdec9e..000000000000
--- a/games-board/gnocatan/gnocatan-0.8.1.16.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnocatan/gnocatan-0.8.1.16.ebuild,v 1.1 2004/01/30 03:37:06 mr_bones_ Exp $
-
-inherit gnome2
-
-DESCRIPTION="A clone of the popular board game The Settlers of Catan"
-HOMEPAGE="http://gnocatan.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnocatan/${P}.tar.gz"
-
-KEYWORDS="x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls"
-
-DEPEND=">=gnome-base/libgnomeui-2.2*
-	=dev-libs/glib-1.2*
-	>=app-text/scrollkeeper-0.3*"
-
-G2CONF="${G2CONF} `use_enable nls`"
-DOCS="AUTHORS ChangeLog README"
diff --git a/games-board/gnocatan/metadata.xml b/games-board/gnocatan/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/gnocatan/metadata.xml
+++ b/games-board/gnocatan/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>