amd64 stable wrt #295909

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

8 files changed, 8 insertions, 220 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/Manifest b/games-mud/kmuddy/Manifest
index a6e21e364a9f..ed82a9cccf8a 100644
--- a/games-mud/kmuddy/Manifest
+++ b/games-mud/kmuddy/Manifest
@@ -1,20 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX kmuddy-0.8-gcc43.patch 377 RMD160 aea890c823d0fbe8dc3d7557ee70ccddecfdac0b SHA1 e7f49981009a36734010eeb7febf1c78b2d558de SHA256 3a984ef87207c628e74cc172f59489f031bd33f6be744968cc5be7865932f718
-AUX kmuddy-0.8-idle-crash.patch 3265 RMD160 d18de581108230ee07a5561644af4ee3bbb3a66a SHA1 93f7be5a481a04c225fc7c44d2bfcc9037eca8e7 SHA256 ce50456b1cd323dd82536726ce284c30572a77e14c9313d7a1f0b1f785f40776
-AUX kmuddy-0.8-libtool.patch 667 RMD160 72c49b8ac4a9480b2ccc5f2c0c7ac3a37ce66e38 SHA1 ad8534564c035749b6879da3d80f7786c313323d SHA256 71fee17dc128e84e58caeedf8b8e0fa2f5c6f0a7df070932339c641deee395d5
-AUX kmuddy-0.8-nocrash.patch 635 RMD160 af716aed42c584513c57135ded6b3e9cda88df73 SHA1 3e6e9be9ae2ab257204b5128004210403af77b91 SHA256 c76a7cae08710fd163875011111140dc3a6ead94ab18c4d62fe27917aa86410d
-DIST kmuddy-0.8.tar.gz 1058011 RMD160 1e8d408a6ccbc5cfe9a205f9dbe5f2e5aee9489f SHA1 372f25aa1699adc24b962d61d0d5ca45f747327e SHA256 7f65a3932696f84e11058b673fa3ec0f47d3f060191982438075a01c4d261265
 DIST kmuddy-1.0.1.tar.gz 1435657 RMD160 d95b257c1b3758ca1d6f6185aa2fa680982bab8a SHA1 104656bfc786e1c2e72cbbdc8fbd35410a4b8d7a SHA256 d3db34aaddaa142da5a138b3e1179dc9b9b203058f225de037616cc24aa3e4ac
-EBUILD kmuddy-0.8.ebuild 1235 RMD160 26d2ac229ccdb1ee14b2250d219554f092a9d243 SHA1 e0419483aaebcfdb541b7a3c9532d4aa0f4c2726 SHA256 718aca15becf47eb821d03a31644e9d4cae6d39900dd10e808473fe39b9b52b4
-EBUILD kmuddy-1.0.1.ebuild 654 RMD160 715fafa54b3f707bb9d73d17d11579a3656abdfd SHA1 8031dbe94aebe3b7ab0887aaa8f8309ba99fd4a6 SHA256 a72a8d113828f4b174d9957e71bd139498b8e1c01fffb88e0a094301632d6681
-MISC ChangeLog 3369 RMD160 4378494284500fa3e94f1e64af16b14506b2953b SHA1 d62dad2beb69fd0ffe94d63d0b28695b46d65887 SHA256 b02a1b8bb527bd9ea97538fe0be428847fad4971a26a2f8e847fc1778fc8373d
+EBUILD kmuddy-1.0.1.ebuild 657 RMD160 fb11130f45da003f45a14e4e63180e08a9ac24ad SHA1 20c66fa46b0051959edaeb54f54c90c265fbd2bc SHA256 2300be8c4d8a51e198f7719375f5f1aab93628b2de9b7da73f8871352258bb6a
+MISC ChangeLog 3476 RMD160 12635225cb1740aab7b8e8980d8e1577389688d1 SHA1 3ab01db06b631eef2affd990b7f11a81f0f8ad1e SHA256 60afe5d823c0b2addc486192d56b09d218ec88c2689ffc09644f9e5a88a5d7c3
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAksgKGIACgkQNQqtfCuFneMPNQCcCL9xj+2tfBw/IJX4FNZ9RuJh
-FFUAnjt9suJSDcMEKO4fbllXViXq4++o
-=pzVQ
------END PGP SIGNATURE-----
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"