Fix underlinking and tempnam failure so pkgmask can be lifted again; bug 371451

(Portage version: 2.1.10.41/cvs/Linux x86_64)

4 files changed, 73 insertions, 7 deletions

diff --git a/games-mud/kmuddy/ChangeLog b/games-mud/kmuddy/ChangeLog
index a9438af8c9b1..2b5de70441c1 100644
--- a/games-mud/kmuddy/ChangeLog
+++ b/games-mud/kmuddy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-mud/kmuddy
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/ChangeLog,v 1.30 2011/01/31 02:12:07 tampakrap Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/ChangeLog,v 1.31 2012/01/01 12:22:57 dilfridge Exp $
+
+*kmuddy-1.0.1-r1 (01 Jan 2012)
+
+  01 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> -kmuddy-1.0.1.ebuild,
+  +kmuddy-1.0.1-r1.ebuild, +files/kmuddy-1.0.1-tempnam.patch,
+  +files/kmuddy-1.0.1-underlinking.patch:
+  Fix underlinking and tempnam failure so pkgmask can be lifted again; bug
+  371451
 
   31 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org> metadata.xml:
   add kde herd to metadata.xml
diff --git a/games-mud/kmuddy/files/kmuddy-1.0.1-tempnam.patch b/games-mud/kmuddy/files/kmuddy-1.0.1-tempnam.patch
new file mode 100644
index 000000000000..c4838aa4b89d
--- /dev/null
+++ b/games-mud/kmuddy/files/kmuddy-1.0.1-tempnam.patch
@@ -0,0 +1,29 @@
+--- plugins/scripting/cunixsocket.cpp
++++ plugins/scripting/cunixsocket.cpp
+@@ -40,12 +40,21 @@
+   varlist = 0;
+   connected = false;
+   
+-  //first of all, we need a file name
+-  char *fname = tempnam ("/tmp", "km");
+-  if (fname != 0)  //only if it didn't fail
++  //22 = strlen(form) + strlen(/sock) + 1
++  char form[]="/tmp/kmuddyXXXXXX", *dirname, sockname[22];
++  dirname = mkdtemp(form);
++
++  if (dirname != NULL)  //only if it didn't fail
+   {
+-    name = fname;
+-    free (fname);
++
++    strcpy(sockname, dirname);
++    strcat(dirname, "/sock");
++
++    name = dirname;
++    free (form);
++    free (dirname);
++    free (sockname);
++
+     //now that we have the name, we create a socket and set some parameters
+     id = socket (PF_UNIX, SOCK_STREAM, 0);
+     sa.sun_family = AF_UNIX;
diff --git a/games-mud/kmuddy/files/kmuddy-1.0.1-underlinking.patch b/games-mud/kmuddy/files/kmuddy-1.0.1-underlinking.patch
new file mode 100644
index 000000000000..18c68c4742df
--- /dev/null
+++ b/games-mud/kmuddy/files/kmuddy-1.0.1-underlinking.patch
@@ -0,0 +1,24 @@
+diff -ruN kmuddy-1.0.1.orig/kmuddy/CMakeLists.txt kmuddy-1.0.1/kmuddy/CMakeLists.txt
+--- kmuddy-1.0.1.orig/kmuddy/CMakeLists.txt	2009-03-14 13:24:55.000000000 +0100
++++ kmuddy-1.0.1/kmuddy/CMakeLists.txt	2012-01-01 11:40:31.000000000 +0100
+@@ -49,7 +49,7 @@
+ 
+ kde4_add_executable(kmuddy ${kmuddy_SRCS})
+ 
+-set (KMUDDY_LIBRARIES kmuddycore dialogs ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KDE3SUPPORT_LIBS})
++set (KMUDDY_LIBRARIES kmuddycore dialogs ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KUTILS_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_KDE3SUPPORT_LIBS} z)
+ 
+ if (MXP_FOUND)
+   set (KMUDDY_LIBRARIES ${KMUDDY_LIBRARIES} ${MXP_LIBRARIES})
+diff -ruN kmuddy-1.0.1.orig/plugins/mapper/plugins/speedwalk/CMakeLists.txt kmuddy-1.0.1/plugins/mapper/plugins/speedwalk/CMakeLists.txt
+--- kmuddy-1.0.1.orig/plugins/mapper/plugins/speedwalk/CMakeLists.txt	2009-01-10 12:40:59.000000000 +0100
++++ kmuddy-1.0.1/plugins/mapper/plugins/speedwalk/CMakeLists.txt	2012-01-01 13:15:35.000000000 +0100
+@@ -17,7 +17,7 @@
+ 
+ kde4_add_plugin(kmuddymapper_speedwalk WITH_PREFIX ${kmuddymapper_speedwalk_PART_SRCS})
+ 
+-target_link_libraries(kmuddymapper_speedwalk  ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} kmuddymapper )
++target_link_libraries(kmuddymapper_speedwalk kmuddymapper kmuddycore ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDE3SUPPORT_LIBS} )
+ 
+ install(TARGETS kmuddymapper_speedwalk DESTINATION ${PLUGIN_INSTALL_DIR} )
+ 
diff --git a/games-mud/kmuddy/kmuddy-1.0.1.ebuild b/games-mud/kmuddy/kmuddy-1.0.1-r1.ebuild
index 7decd9f09522..3224f9e33e79 100644
--- a/games-mud/kmuddy/kmuddy-1.0.1.ebuild
+++ b/games-mud/kmuddy/kmuddy-1.0.1-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.6 2011/01/31 02:05:42 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/kmuddy/kmuddy-1.0.1-r1.ebuild,v 1.1 2012/01/01 12:22:57 dilfridge Exp $
 
 EAPI=3
 
 KDE_LINGUAS="es"
 KDE_DOC_DIRS="doc/${PN}"
+KDE_HANDBOOK=optional
 inherit kde4-base
 
 DESCRIPTION="MUD client for KDE"
@@ -14,12 +15,16 @@ SRC_URI="http://www.kmuddy.com/releases/stable/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug handbook"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
 
 DOC="AUTHORS README CHANGELOG Scripting-HOWTO TODO DESIGN"
 
-PATCHES=( "${FILESDIR}"/${P}-{gcc,kde}45.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-{gcc,kde}45.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-tempnam.patch
+)
 
 src_configure() {
 	# not in portage yet