Fixed bug #77576 and bug #78933. Thanks to TGL <degrenier@easyconnect.fr> for providing a patch.

Package-Manager: portage-2.0.51-r15

6 files changed, 36 insertions, 27 deletions

diff --git a/x11-wm/kahakai/ChangeLog b/x11-wm/kahakai/ChangeLog
index f448340d393f..69e4c98ed7a7 100644
--- a/x11-wm/kahakai/ChangeLog
+++ b/x11-wm/kahakai/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/kahakai
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/ChangeLog,v 1.19 2004/10/09 19:20:19 usata Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/ChangeLog,v 1.20 2005/02/20 10:46:29 usata Exp $
+
+  20 Feb 2005; Mamoru KOMACHI <usata@gentoo.org>
+  kahakai-0.6.2_p20040306.ebuild:
+  Fixed bug #77576 and bug #78933. Thanks to TGL <degrenier@easyconnect.fr>
+  for providing a patch.
 
   10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> kahakai-0.6.1.ebuild,
   kahakai-0.6.2.ebuild, kahakai-0.6.2_p20040306.ebuild:
diff --git a/x11-wm/kahakai/Manifest b/x11-wm/kahakai/Manifest
index 4d9e565bf1cf..911d2db1f3c2 100644
--- a/x11-wm/kahakai/Manifest
+++ b/x11-wm/kahakai/Manifest
@@ -1,19 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0786b90ce46c184dcb3a0ce603e9d53d ChangeLog 2980
-MD5 20b4bdf2f203fbf1b97ca225f12d709c kahakai-0.6.2_p20040306.ebuild 1289
-MD5 0a1625749aec1e5654cc7e34cc72e8b9 kahakai-0.6.1.ebuild 911
-MD5 10d1af353c7cd1dee44e7bfdfcb63657 kahakai-0.6.2.ebuild 919
+MD5 a3dffb3afd29aa075073749cde4e53b0 kahakai-0.6.2_p20040306.ebuild 1392
+MD5 1a8fbc04763346893e744fdb68765066 ChangeLog 3165
 MD5 e4b5d6602d355a5e9e4ef0ce55b85d78 metadata.xml 313
+MD5 a4357ba45ea0f688878493e1fa1c9ef6 kahakai-0.6.2.ebuild 919
+MD5 699fabc1c2c244d84340f335922e775f kahakai-0.6.1.ebuild 911
 MD5 05643c680d338ffa309acf593c757288 files/digest-kahakai-0.6.2_p20040306 75
 MD5 1a798baa62c1a3dcacefef7bdcc1af79 files/kahakai-0.6.2_p20040306-rubyscript-gentoo.diff 229
-MD5 a6f928a370849148c784071b429d2322 files/digest-kahakai-0.6.1 66
+MD5 8ab0d5129e5a4405451162db4ec765c1 files/kahakai-0.6.2_p20040306-compilation_fix.patch 248
 MD5 389f67e9f9e4c3b7c0d97fa260bc7f0a files/digest-kahakai-0.6.2 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBaDiKVWNWqTUmv+0RAiDkAKCrjvQMneJSLjZiLrTOi1Tcbpf8WwCfTsT6
-Lpc/3Yco++mMjCEw6EFBpcY=
-=fmIr
------END PGP SIGNATURE-----
+MD5 a6f928a370849148c784071b429d2322 files/digest-kahakai-0.6.1 66
diff --git a/x11-wm/kahakai/files/kahakai-0.6.2_p20040306-compilation_fix.patch b/x11-wm/kahakai/files/kahakai-0.6.2_p20040306-compilation_fix.patch
new file mode 100644
index 000000000000..c89b3259c4bc
--- /dev/null
+++ b/x11-wm/kahakai/files/kahakai-0.6.2_p20040306-compilation_fix.patch
@@ -0,0 +1,10 @@
+--- src/Screen.cc.orig	2005-01-31 19:42:04.896674960 +0100
++++ src/Screen.cc	2005-01-31 19:42:39.719381104 +0100
+@@ -63,6 +63,7 @@
+ #include <sstream>
+ #include <iostream>
+ #include <iomanip>
++#include <cerrno>
+
+ using std::cout;
+ using std::cerr;
diff --git a/x11-wm/kahakai/kahakai-0.6.1.ebuild b/x11-wm/kahakai/kahakai-0.6.1.ebuild
index c0eda349b13e..8aa1e5aeeb62 100644
--- a/x11-wm/kahakai/kahakai-0.6.1.ebuild
+++ b/x11-wm/kahakai/kahakai-0.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.1.ebuild,v 1.6 2004/10/09 19:20:19 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.1.ebuild,v 1.7 2005/02/20 10:46:29 usata Exp $
 
 IUSE="truetype xinerama"
 
diff --git a/x11-wm/kahakai/kahakai-0.6.2.ebuild b/x11-wm/kahakai/kahakai-0.6.2.ebuild
index c02e7212f6fc..3854522d0433 100644
--- a/x11-wm/kahakai/kahakai-0.6.2.ebuild
+++ b/x11-wm/kahakai/kahakai-0.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.2.ebuild,v 1.5 2004/10/09 19:20:19 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.2.ebuild,v 1.6 2005/02/20 10:46:29 usata Exp $
 
 IUSE="truetype xinerama"
 
diff --git a/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild b/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild
index 40bf17994fd9..b0c4d4de8745 100644
--- a/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild
+++ b/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild,v 1.3 2004/10/09 19:20:19 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild,v 1.4 2005/02/20 10:46:29 usata Exp $
 
 inherit eutils
 
@@ -25,7 +25,8 @@ RDEPEND="virtual/x11
 	dev-libs/boost"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.57-r1
-	>=sys-devel/automake-1.7.2"
+	>=sys-devel/automake-1.7.2
+	sys-devel/libtool"
 
 S="${WORKDIR}/${PN}"
 
@@ -33,14 +34,16 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}/src
 	epatch ${FILESDIR}/${P}-rubyscript-gentoo.diff
+	epatch ${FILESDIR}/${P}-compilation_fix.patch
 }
 
 src_compile() {
+	libtoolize --copy --force || die
 	./autogen.sh || die
 	econf \
-		`use_enable ruby` \
-		`use_enable xinerama` \
-		`use_enable truetype xft` || die
+		$(use_enable ruby) \
+		$(use_enable xinerama) \
+		$(use_enable truetype xft) || die
 	emake || die
 }