amd64 stable wrt #295909

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

7 files changed, 6 insertions, 202 deletions

diff --git a/games-mud/kmuddy/ChangeLog b/games-mud/kmuddy/ChangeLog
index b6677007df62..584912a2521e 100644
--- a/games-mud/kmuddy/ChangeLog
+++ b/games-mud/kmuddy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-mud/kmuddy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/ChangeLog,v 1.25 2009/12/09 22:44:45 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/ChangeLog,v 1.26 2009/12/23 21:04:49 ssuominen Exp $
+
+  23 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> kmuddy-1.0.1.ebuild:
+  amd64 stable wrt #295909
 
   09 Dec 2009; Christian Faulhammer <fauli@gentoo.org> kmuddy-1.0.1.ebuild:
   stable x86, bug 295909
diff --git a/games-mud/kmuddy/files/kmuddy-0.8-gcc43.patch b/games-mud/kmuddy/files/kmuddy-0.8-gcc43.patch
deleted file mode 100644
index fb798da1d9f1..000000000000
--- a/games-mud/kmuddy/files/kmuddy-0.8-gcc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nurpa kmuddy-0.8.orig/lib/ctextchunk.cpp kmuddy-0.8/lib/ctextchunk.cpp
---- kmuddy-0.8.orig/lib/ctextchunk.cpp	2008-12-05 07:04:05.000000000 +0300
-+++ kmuddy-0.8/lib/ctextchunk.cpp	2008-12-05 07:42:28.000000000 +0300
-@@ -22,6 +22,8 @@
- 
- #include <klocale.h>
- 
-+#include <cstdlib>
-+
- QColor chunkLink::linkColor = Qt::blue;
- 
- /** state variables needed to paint a row */
diff --git a/games-mud/kmuddy/files/kmuddy-0.8-idle-crash.patch b/games-mud/kmuddy/files/kmuddy-0.8-idle-crash.patch
deleted file mode 100644
index 948676b253c0..000000000000
--- a/games-mud/kmuddy/files/kmuddy-0.8-idle-crash.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -ru kmuddy-0.8/lib/cstatus.cpp kmuddy-0.8.patch/lib/cstatus.cpp
---- kmuddy-0.8/lib/cstatus.cpp	2005-10-19 02:01:52.000000000 -0600
-+++ kmuddy-0.8.patch/lib/cstatus.cpp	2008-01-16 20:06:09.000000000 -0700
-@@ -16,6 +16,9 @@
-  *                                                                         *
-  ***************************************************************************/
- 
-+//Sets the size of the status buffer which controls time displayer
-+#define status_size 30
-+
- #include "cstatus.h"
- 
- #include <qdatetime.h>
-@@ -37,8 +40,8 @@
- 
-   sb->insertItem (" " + i18n ("Off-line") + " ", ID_CONNECTED, 0, true);
-   sb->insertItem (" ??x?? ", ID_DIMENSION, 0, true);
--  sb->insertItem (" 0:00:00 ", ID_TIMER, 0, true);
--  sb->insertItem (" " + i18n ("idle") + " 0:00 ", ID_IDLE, 0, true);
-+  sb->insertItem (" 00D:00H:00M:00S ", ID_TIMER, 0, true);
-+  sb->insertItem (" " + i18n ("idle") + " 00D:00H:00M:00S ", ID_IDLE, 0, true);
-   sb->insertItem ("", ID_VARIABLES);
-   sb->insertItem ("", ID_PARTIAL);
-   timerShown = true;
-@@ -116,7 +119,7 @@
-   if (!timerShown)
-   {
-     timerReset ();
--    sb->changeItem (" 0:00:00 ", ID_TIMER);
-+    sb->changeItem (" 00D:00H:00M:00S ", ID_TIMER);
-   }
-   timerShown = true;
- }
-@@ -138,7 +141,7 @@
- 
- void cStatus::dimensionsChanged (int x, int y)
- {
--  char s1[10];
-+  char s1[status_size];
-   QString s2;
-   sprintf (s1, " %dx%d ", x, y);
-   s2 = s1;
-@@ -166,8 +169,8 @@
-   conntime = 0;
-   idletime1 = 0;
-   if (timerShown)
--    sb->changeItem (" 0:00:00 ", ID_TIMER);
--  sb->changeItem (" " + i18n ("idle") + " 0:00", ID_IDLE);
-+     sb->changeItem (" 00D:00H:00M:00S ", ID_TIMER);
-+  sb->changeItem (" " + i18n ("idle") + " 00D:00H:00M:00S", ID_IDLE);
-   timer1->start (1000);
- }
- 
-@@ -175,7 +178,7 @@
- {
-   sb->changeItem (" " + i18n ("Connected") + " ", ID_CONNECTED);
-   sb->changeItem ("", ID_PARTIAL);
--  sb->changeItem (" " + i18n ("idle") + " 0:00 ", ID_IDLE);
-+  sb->changeItem (" " + i18n ("idle") + " 00D:00H:00M:00S ", ID_IDLE);
-   showMessage (i18n ("Connected."));
- }
- 
-@@ -209,18 +212,19 @@
-     idletime1 = 0;
-     timer1->stop ();
-     timer1->start (1000);
--    sb->changeItem (" " + i18n ("idle") + " 0:00 ", ID_IDLE);
-+    sb->changeItem (" " + i18n ("idle") + " 00D:00H:00M:00S ", ID_IDLE);
-   }
- }
- 
- const QString cStatus::connTimeString ()
- {
--  char s1[10];
--  int h = conntime / 3600;
-+  char s1[status_size];
-+  int d = conntime / (3600*24);
-+  int h = (conntime / 3600) % 24;
-   int s = conntime % 3600;
-   int m = s / 60;
-   s = s % 60;
--  sprintf (s1, " %d:%02d:%02d ", h, m, s);
-+  sprintf (s1, " %02dD:%02dH:%02dM:%02dS ", d, h, m, s);
-   QString s2 = s1;
-   return s2;
- }
-@@ -246,16 +250,14 @@
- {
-   ++idletime1;
-   
--  int h, m, s;
-+  int d, h, m, s;
-   s = idletime1 % 60;
-   m = ((idletime1 - s) / 60) % 60;
--  h = (idletime1 - s) / 3600;
-+  h = (idletime1 - s) / 3600 % 24;
-+  d = (idletime1 - s) / (3600 * 24);
-   
--  char ss[15];
--  if (h > 0)
--    sprintf (ss, " %d:%02d:%02d ", h, m, s);
--  else
--    sprintf (ss, " %d:%02d ", m, s);
-+  char ss[status_size];
-+  sprintf (ss, " %02dD:%02dH:%02dM:%02dS ", d, h, m, s);
- 
-   sb->changeItem (" " + i18n ("idle") + ss, ID_IDLE);
- }
-Only in kmuddy-0.8.patch/lib: cstatus.cpp.orig
-Only in kmuddy-0.8.patch/lib: cstatus.cpp.rej
diff --git a/games-mud/kmuddy/files/kmuddy-0.8-libtool.patch b/games-mud/kmuddy/files/kmuddy-0.8-libtool.patch
deleted file mode 100644
index d4d6ec501444..000000000000
--- a/games-mud/kmuddy/files/kmuddy-0.8-libtool.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- kmuddy-0.8.orig/Makefile.am	2008-12-18 21:21:19.000000000 +0100
-+++ kmuddy-0.8/Makefile.am	2008-12-18 22:02:41.000000000 +0100
-@@ -15,13 +15,10 @@
- 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
- 
- $(top_srcdir)/subdirs:
- 	cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
- 
--$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
--	@cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
--
- MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files 
- 
- package-messages:
- 	$(MAKE) -f admin/Makefile.common package-messages
- 	$(MAKE) -C po merge
diff --git a/games-mud/kmuddy/files/kmuddy-0.8-nocrash.patch b/games-mud/kmuddy/files/kmuddy-0.8-nocrash.patch
deleted file mode 100644
index c67956ac8d93..000000000000
--- a/games-mud/kmuddy/files/kmuddy-0.8-nocrash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru kmuddy-0.8/kmuddy/cmxpmanager.cpp kmuddy-0.8.patch/kmuddy/cmxpmanager.cpp
---- kmuddy-0.8/kmuddy/cmxpmanager.cpp	2006-10-12 02:47:23.000000000 -0600
-+++ kmuddy-0.8.patch/kmuddy/cmxpmanager.cpp	2007-08-26 22:05:44.000000000 -0600
-@@ -134,7 +134,7 @@
-       if (s && (strcmp (s, "\r\n") == 0))  //newlines are always sent separately
-         emit gotNewLine ();
-       else
--      if ((s[0] == 0x1f) && (s[1] == '\0'))
-+      if (s && (s[0] == 0x1f) && (s[1] == '\0'))
-         //<SBR> tag - ignored - converted into a space
-         emit gotNewText (QString (" "));
-       else
-Only in kmuddy-0.8.patch/kmuddy: cmxpmanager.cpp~
diff --git a/games-mud/kmuddy/kmuddy-0.8.ebuild b/games-mud/kmuddy/kmuddy-0.8.ebuild
deleted file mode 100644
index 5a34d5136870..000000000000
--- a/games-mud/kmuddy/kmuddy-0.8.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/kmuddy-0.8.ebuild,v 1.10 2009/09/15 19:20:07 mr_bones_ Exp $
-
-EAPI=2
-inherit base eutils kde-functions autotools
-
-DESCRIPTION="MUD client for KDE"
-HOMEPAGE="http://www.kmuddy.com/"
-SRC_URI="http://www.kmuddy.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="sdl"
-
-DEPEND="sdl? ( media-libs/sdl-mixer )"
-
-need-kde 3
-
-PATCHES=(	"${FILESDIR}/${P}-nocrash.patch"
-		"${FILESDIR}/${P}-gcc43.patch"
-		"${FILESDIR}/${P}-idle-crash.patch"
-		"${FILESDIR}/${P}-libtool.patch"
-	)
-
-src_prepare() {
-	base_src_prepare
-	sed -i \
-		-e '/kmuddyscriptingplugin_la_LDFLAGS/ s/$(LIB_QT)/$(LIB_QT) $(LIB_KIO)/' \
-		plugins/scripting/Makefile.am \
-		|| die "sed failed"
-	mv admin/acinclude.m4.in acinclude.m4
-	eautoreconf
-	find . -name Makefile.in -exec perl admin/am_edit ';'
-}
-
-src_configure() {
-	econf \
-		--without-arts \
-		--with-extra-includes=$(kde-config --expandvars --install include) \
-		$(use_with sdl)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS CHANGELOG DESIGN README README.MIDI Scripting-HOWTO TODO
-}
diff --git a/games-mud/kmuddy/kmuddy-1.0.1.ebuild b/games-mud/kmuddy/kmuddy-1.0.1.ebuild
index f3cbd5111c51..bba4cd597dc5 100644
--- a/games-mud/kmuddy/kmuddy-1.0.1.ebuild
+++ b/games-mud/kmuddy/kmuddy-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/kmuddy-1.0.1.ebuild,v 1.2 2009/12/09 22:44:45 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/kmuddy-1.0.1.ebuild,v 1.3 2009/12/23 21:04:49 ssuominen Exp $
 
 EAPI=2
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.kmuddy.com/releases/stable/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="debug handbook"
 
 DOC="AUTHORS README CHANGELOG Scripting-HOWTO TODO DESIGN"