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

(Portage version: 2.0.51-r15)

5 files changed, 30 insertions, 12 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/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
 }