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

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

5 files changed, 97 insertions, 9 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/Manifest b/games-mud/kmuddy/Manifest
index 7136f8318a0f..efe4cd9ae39b 100644
--- a/games-mud/kmuddy/Manifest
+++ b/games-mud/kmuddy/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX kmuddy-1.0.1-gcc45.patch 498 RMD160 2931de27da0751d541892c702c0892329214da56 SHA1 0ee406323d0f034ac0e4cc305e294e6b30cc0eb5 SHA256 e9350d6b15ca0155bcdf8733c73d5782424d80118b55475238dd0db99f0002c5
 AUX kmuddy-1.0.1-kde45.patch 438 RMD160 03a518dc4b6024ec28a16e2f01017117a647fec1 SHA1 950350778acd07dc00c606466ce1285be7c1139d SHA256 5e48975d6a510e60b38f52aeeef5ad8ba48da777f211c1c47b8d617f25addf63
+AUX kmuddy-1.0.1-tempnam.patch 791 RMD160 d288ad2373f0ab56a46246002e5651f7baf88747 SHA1 8c305d786d368f247a7bd49c1c2f3e74631a758f SHA256 8e5f77d50cee0f490b3c4933d7802739eda1301b05908466b0a74723a77c76f8
+AUX kmuddy-1.0.1-underlinking.patch 1526 RMD160 23485b69ed6a3d9125e1820fa698b37ce3c8b451 SHA1 6d1486b1ef60339bf2a80dc3294bfead082ce594 SHA256 635e6b2e2ed4a7b85fd8f1f63d098ff78e368052616541b273efab5ec267945c
 DIST kmuddy-1.0.1.tar.gz 1435657 RMD160 d95b257c1b3758ca1d6f6185aa2fa680982bab8a SHA1 104656bfc786e1c2e72cbbdc8fbd35410a4b8d7a SHA256 d3db34aaddaa142da5a138b3e1179dc9b9b203058f225de037616cc24aa3e4ac
-EBUILD kmuddy-1.0.1.ebuild 706 RMD160 03145ea103eafe4e4c48a3a4b597cbdd6a3e6157 SHA1 0267d4e0e0ffd6943d889620c20cfd9c8208228e SHA256 ddcaaba4fd97a5054eb39c9b8b82fb99b316c4e9385bd2cd5b811d9390c1d710
-MISC ChangeLog 4015 RMD160 8273807bba4c5b65ff893b14c77d779ae00422bb SHA1 6558b233d0baa0eb8227d2f7260a7b6ef9edd9ef SHA256 9da65ec24bf664fcb7f53994184c596688e7f7f0202fadbfbe8df2b035f3e456
+EBUILD kmuddy-1.0.1-r1.ebuild 798 RMD160 0f9cfb3a12d9fe3b998f146b6f4d82a99227c58a SHA1 02e9b5fee0f0e0b35f188836ae30d010c2c78c2f SHA256 fa7d8779fd6e3439c518e3c379c6609e1a733325936354287159fad53318f704
+MISC ChangeLog 4315 RMD160 24200155dcb504fd5e7ae11464e47f16f5230fc3 SHA1 6d672988fc83c08596ecc83e96b837237bd59003 SHA256 10c29316f717b1726e0c68af4b1ed2e31a62e956c9220882bd43b12dcbfb5d97
 MISC metadata.xml 175 RMD160 47cbdf377020fec269c2d89efa75b7004aff8ea5 SHA1 330abe577838f1badc34844147784e6ffce579cf SHA256 3df201d3c7e15a9e0508256ae8a249d998d1f837c6a89a83c074759ef973686c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPAFCiAAoJEEb+UGWnxTyHji8P/RVmmB7VJRixQnnVSB7Q/C0l
+U8oe6iw/eIIaFh+Edhy9sTz2FidP4Ao+GrELOL3qCm/DjQa4K0unCYzT45UeH6XA
+tBwgWmWl2kivDzQWBL0am9D0IhYEFhSnSkwtJ0TRuy+BlI+22xt8r4C3XX1E0iBs
+jpmk9nqZBmYuwsMhURqO1JBdP3/d0v/BRYMgr3TAZMqIUvZhjfLSDkg2HomBpaAI
+CCOKhbapMqbp0a3DNU0eQNokf4Bg5BlhGURQ45vDDwr/BfI3m/QS0Chr9pV56gBP
+l6SywOAoJagbFRq1Xr8AHi6YCeAsoft2cEJWYmBVpAxhUQ82e6+aZREXKFP66kz/
+/3L5/JJxoFKFCe2LdJTmRCoUcbotcwTAWcIv2v5KpjmYdHQ+ssHfseqsqiZTdiDj
+IrjB+5+HiipOaX3BL2K/69oNhINXSH8P7yHjfovuf7S84p5HoQHQjJOHwT3fzOoP
+2gVal5A17WquXMr8wsiR2hCUe3VG9fN9regKFUAW97BSTBHw6LhEB+hTUDCSO6R4
+Lg5N1VQCn1D7HBGgwxpc9VDMzbaXyg6+oWNsq5zx7PQYY/qx9aJPQwOq89AaPGpO
+ibVHD5zJkD2Fzerl5FoMce1KqdYTIyztA+EF+AIsNbn+DThGSblMk8D/Sndn/8n3
+qk4l2x8lMIzjHqBTSG8o
+=vUha
+-----END PGP SIGNATURE-----
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