Forced dev-lang/swig dependency to 1.3.21 since 1.3.25 was causing a problem. This should just be a temporary fix until the swig module for kahakai can be rewritten to work with 1.3.25. Also added a check to see that swig was built with ruby support if the ruby use flag is set.

(Portage version: 2.1_rc1-r2)

5 files changed, 29 insertions, 14 deletions

diff --git a/x11-wm/kahakai/ChangeLog b/x11-wm/kahakai/ChangeLog
index 45ab98dbc664..cc0bf2eae477 100644
--- a/x11-wm/kahakai/ChangeLog
+++ b/x11-wm/kahakai/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/kahakai
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/ChangeLog,v 1.23 2006/03/04 14:32:33 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/ChangeLog,v 1.24 2006/05/22 02:42:53 nixphoeni Exp $
+
+  19 May 2006; Joe Sapp <nixphoeni@gentoo.org> kahakai-0.6.1.ebuild,
+  kahakai-0.6.2.ebuild, kahakai-0.6.2_p20040306.ebuild:
+  Forced dev-lang/swig dependency to 1.3.21 since 1.3.25 was causing a
+  problem. This should just be a temporary fix until the swig module for
+  kahakai can be rewritten to work with 1.3.25. Also added a check to see that
+  swig was built with ruby support if the ruby use flag is set.
 
   04 Mar 2006; Joe Sapp <nixphoeni@gentoo.org> metadata.xml,
   kahakai-0.6.2_p20040306.ebuild:
diff --git a/x11-wm/kahakai/files/digest-kahakai-0.6.2_p20040306 b/x11-wm/kahakai/files/digest-kahakai-0.6.2_p20040306
index dfc26866db60..d459e8f9f65b 100644
--- a/x11-wm/kahakai/files/digest-kahakai-0.6.2_p20040306
+++ b/x11-wm/kahakai/files/digest-kahakai-0.6.2_p20040306
@@ -1 +1,3 @@
 MD5 ca83ad27d60b94aa82c041c7dd74426f kahakai-0.6.2-20040306.tar.bz2 530283
+RMD160 8ea54db04da3b167f9572e63908357b3226867f7 kahakai-0.6.2-20040306.tar.bz2 530283
+SHA256 e79d021c30f6368e4bdeb1630043c50a642cd5189e2d38b1695b7d15f7a28001 kahakai-0.6.2-20040306.tar.bz2 530283
diff --git a/x11-wm/kahakai/kahakai-0.6.1.ebuild b/x11-wm/kahakai/kahakai-0.6.1.ebuild
index 4648dc225f90..bf1b1d9825ea 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-2006 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.8 2006/03/04 14:32:33 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.1.ebuild,v 1.9 2006/05/22 02:42:53 nixphoeni Exp $
 
 IUSE="truetype xinerama"
 
@@ -14,15 +14,14 @@ KEYWORDS="x86 ~ppc -alpha ~sparc"
 
 RDEPEND="|| ( ( x11-libs/libX11
 		x11-libs/libXrandr
-		x11-libs/libXft
 		x11-libs/libXrender
 		x11-proto/xextproto
 		xinerama? ( x11-libs/libXinerama )
 		)
 		virtual/x11
 	)
-	truetype? ( || ( x11-libs/libXft virtual/xft ) )
-	>=dev-lang/swig-1.3.20
+	truetype? ( || ( x11-libs/libXft virtual/xft x11-base/xorg-x11 ) )
+	=dev-lang/swig-1.3.21
 	media-libs/imlib2
 	dev-util/pkgconfig
 	media-fonts/artwiz-fonts
diff --git a/x11-wm/kahakai/kahakai-0.6.2.ebuild b/x11-wm/kahakai/kahakai-0.6.2.ebuild
index 4c6d92f9a4ff..ef9b518e7d33 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-2006 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.8 2006/03/04 14:32:33 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.2.ebuild,v 1.9 2006/05/22 02:42:53 nixphoeni Exp $
 
 IUSE="truetype xinerama"
 
@@ -14,15 +14,14 @@ KEYWORDS="x86 ~ppc -alpha ~sparc"
 
 RDEPEND="|| ( ( x11-libs/libX11
 		x11-libs/libXrandr
-		x11-libs/libXft
 		x11-libs/libXrender
 		x11-proto/xextproto
 		xinerama? ( x11-libs/libXinerama )
 		)
 		virtual/x11
 	)
-	truetype? ( || ( x11-libs/libXft virtual/xft ) )
-	>=dev-lang/swig-1.3.20
+	truetype? ( || ( x11-libs/libXft virtual/xft x11-base/xorg-x11 ) )
+	=dev-lang/swig-1.3.21
 	>=media-libs/imlib2-1.1.0
 	dev-util/pkgconfig
 	media-fonts/artwiz-fonts
diff --git a/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild b/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild
index 4e77062a9b74..5b53f2345075 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-2006 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.7 2006/03/04 14:32:33 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild,v 1.8 2006/05/22 02:42:53 nixphoeni Exp $
 
 inherit eutils
 
@@ -17,16 +17,15 @@ KEYWORDS="-alpha ppc ~sparc x86"
 
 RDEPEND="|| ( ( x11-libs/libX11
 		x11-libs/libXrandr
-		x11-libs/libXft
 		x11-libs/libXrender
 		x11-proto/xextproto
 		xinerama? ( x11-libs/libXinerama )
 		)
 		virtual/x11
 	)
-	truetype? ( || ( x11-libs/libXft virtual/xft ) )
+	truetype? ( || ( x11-libs/libXft virtual/xft x11-base/xorg-x11 ) )
 	ruby? ( || ( >=dev-lang/ruby-1.8 dev-lang/ruby-cvs ) )
-	>=dev-lang/swig-1.3.20
+	=dev-lang/swig-1.3.21
 	>=media-libs/imlib2-1.1.0
 	dev-util/pkgconfig
 	media-fonts/artwiz-fonts
@@ -38,6 +37,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}"
 
+pkg_setup() {
+	if use ruby && ! built_with_use dev-lang/swig ruby; then
+		die "dev-lang/swig must be built with ruby support"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}/src
@@ -53,12 +58,15 @@ src_compile() {
 		$(use_enable xinerama) \
 		$(use_enable truetype xft) || die
 	emake || die
+
+	# fix the error about redefining "None"
+	sed -i -e 's:\bNone =.*::' ${S}/src/kahakai.py
 }
 
 src_install() {
 	einstall || die
 	cd doc
-	dodoc AUTHORS INSTALL NEWS COPYING README ChangeLog TODO
+	dodoc AUTHORS NEWS COPYING README ChangeLog TODO
 
 	exeinto /etc/X11/Sessions
 	echo "/usr/bin/kahakai" > ${T}/kahakai