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.

Package-Manager: portage-2.1_rc1-r2

6 files changed, 60 insertions, 35 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/Manifest b/x11-wm/kahakai/Manifest
index a041b7996d23..b3806871800d 100644
--- a/x11-wm/kahakai/Manifest
+++ b/x11-wm/kahakai/Manifest
@@ -1,30 +1,40 @@
-MD5 b3cb5d0e35a9b64c631b3055ec8b8023 ChangeLog 3561
-RMD160 201b19e11b05698d87d34a592923ae038e0ec177 ChangeLog 3561
-SHA256 2cae5531878610c3c24ed69f7fbe922b3177efee890d8aefb1b9a58fb00d640d ChangeLog 3561
-MD5 a6f928a370849148c784071b429d2322 files/digest-kahakai-0.6.1 66
-RMD160 2b5f085480ec76e840f726ddb6797a523c94ed0d files/digest-kahakai-0.6.1 66
-SHA256 02deaf8886c3e2129333c8de43578fae8d90571019c6c85ff33bf16e4823c9b0 files/digest-kahakai-0.6.1 66
-MD5 389f67e9f9e4c3b7c0d97fa260bc7f0a files/digest-kahakai-0.6.2 66
-RMD160 4221a999f21bc1a9536a5e32e5e534734d6f1305 files/digest-kahakai-0.6.2 66
-SHA256 fed8beb8ea4a4a0eb793b866eac6d02b047025cab3322d6714dc42a3a8dc0b52 files/digest-kahakai-0.6.2 66
-MD5 05643c680d338ffa309acf593c757288 files/digest-kahakai-0.6.2_p20040306 75
-RMD160 dd4df6fce81fe76edfba83fd7514d90af43aceed files/digest-kahakai-0.6.2_p20040306 75
-SHA256 cc237b97950c5d629f468122f0ebd3185ad9d2074f995fd14b39b11d9c9e7f50 files/digest-kahakai-0.6.2_p20040306 75
+AUX kahakai-0.6.2_p20040306-compilation_fix.patch 248 RMD160 f5a34bbb9700299c1be19fe47bd43b168f39b7f7 SHA1 2bfe7ed685fb0714a64ffd9a684e9a6054e61305 SHA256 c1852f52d9d17b9bc5be6713b7e1fccda8dc4a5bd44f71c7f5836c42532fb4d2 size 248
 MD5 8ab0d5129e5a4405451162db4ec765c1 files/kahakai-0.6.2_p20040306-compilation_fix.patch 248
 RMD160 f5a34bbb9700299c1be19fe47bd43b168f39b7f7 files/kahakai-0.6.2_p20040306-compilation_fix.patch 248
 SHA256 c1852f52d9d17b9bc5be6713b7e1fccda8dc4a5bd44f71c7f5836c42532fb4d2 files/kahakai-0.6.2_p20040306-compilation_fix.patch 248
+AUX kahakai-0.6.2_p20040306-rubyscript-gentoo.diff 229 RMD160 8833ec270ebe638735b8f26ad3ab74322ad61188 SHA1 1488a467b816e3cc4a8659fae4847b30f3a97d6f SHA256 1300732aa474945acc986ed3c21c2b568d18bb8ca50cd502d936d3c41409e33f size 229
 MD5 1a798baa62c1a3dcacefef7bdcc1af79 files/kahakai-0.6.2_p20040306-rubyscript-gentoo.diff 229
 RMD160 8833ec270ebe638735b8f26ad3ab74322ad61188 files/kahakai-0.6.2_p20040306-rubyscript-gentoo.diff 229
 SHA256 1300732aa474945acc986ed3c21c2b568d18bb8ca50cd502d936d3c41409e33f files/kahakai-0.6.2_p20040306-rubyscript-gentoo.diff 229
-MD5 d4feca13236f3401f52fee0e845456cd kahakai-0.6.1.ebuild 1188
-RMD160 89cad545d46ef65e3f36fba68ee8f48ce0daeacc kahakai-0.6.1.ebuild 1188
-SHA256 bf6731d0a70a4f52b5ac04f4fd1e9d59715b3a9c94361053c578731725e492ba kahakai-0.6.1.ebuild 1188
-MD5 236959ea50cb6be61aa6382ddb80902e kahakai-0.6.2.ebuild 1196
-RMD160 97f892678504c07bb02e1e4f0db6b1ad1138f2fd kahakai-0.6.2.ebuild 1196
-SHA256 c1561442799e92418281933e55f22b18d3a44f9017acdb985f43ffe716d681cb kahakai-0.6.2.ebuild 1196
-MD5 16b1ccb787e8ce2767d55b0942279494 kahakai-0.6.2_p20040306.ebuild 1570
-RMD160 6f4fcbb4c73b3670a9af87ed3749ba39862238c2 kahakai-0.6.2_p20040306.ebuild 1570
-SHA256 9d2b6a406f160a2bf8c59c32978938d249182aa2681246323c844ee29f930ff9 kahakai-0.6.2_p20040306.ebuild 1570
+DIST kahakai-0.6.1.tar.bz2 630034 size 630034
+DIST kahakai-0.6.2-20040306.tar.bz2 530283 RMD160 8ea54db04da3b167f9572e63908357b3226867f7 SHA256 e79d021c30f6368e4bdeb1630043c50a642cd5189e2d38b1695b7d15f7a28001 size 530283
+DIST kahakai-0.6.2.tar.bz2 697492 size 697492
+EBUILD kahakai-0.6.1.ebuild 1187 RMD160 b807d1975c82163c9d166e2f0f46d918b2b52eb7 SHA1 9128819410676f306d203b297bba2755ec6da2d0 SHA256 eb25cf30dffa11f8f4817adec3d81e8bacca2df4005588332f618a76a7fcf3f9 size 1187
+MD5 47bd05f0c3d2c5cd595ec80060b812fa kahakai-0.6.1.ebuild 1187
+RMD160 b807d1975c82163c9d166e2f0f46d918b2b52eb7 kahakai-0.6.1.ebuild 1187
+SHA256 eb25cf30dffa11f8f4817adec3d81e8bacca2df4005588332f618a76a7fcf3f9 kahakai-0.6.1.ebuild 1187
+EBUILD kahakai-0.6.2.ebuild 1195 RMD160 57471fae1ec5b4c17b1375bbc89a175661fab66a SHA1 850d07189d29990e0d65ebbc2fd0d42532dc4f03 SHA256 fbbd35d75d60789cf74af97118d59466a6b888391369e6e30a5f8acb0dc4f3be size 1195
+MD5 f27e98eed94014b00cd684f02ed7193f kahakai-0.6.2.ebuild 1195
+RMD160 57471fae1ec5b4c17b1375bbc89a175661fab66a kahakai-0.6.2.ebuild 1195
+SHA256 fbbd35d75d60789cf74af97118d59466a6b888391369e6e30a5f8acb0dc4f3be kahakai-0.6.2.ebuild 1195
+EBUILD kahakai-0.6.2_p20040306.ebuild 1784 RMD160 0f5d15d51e30066cbc03d2131117292c22dfbe49 SHA1 97520ac7538694ab0a6ab1b7e9ba8ab5d0e391b4 SHA256 8eda50a7fb25fd358e608d984d8f8ccb1271c4a16b7d6ce28ebc9f5d16620728 size 1784
+MD5 d118887f5397729d312925cf0806d0db kahakai-0.6.2_p20040306.ebuild 1784
+RMD160 0f5d15d51e30066cbc03d2131117292c22dfbe49 kahakai-0.6.2_p20040306.ebuild 1784
+SHA256 8eda50a7fb25fd358e608d984d8f8ccb1271c4a16b7d6ce28ebc9f5d16620728 kahakai-0.6.2_p20040306.ebuild 1784
+MISC ChangeLog 3974 RMD160 eb87dbd9c8479b504ef839a0829aeb9cf3e4d9b6 SHA1 ad5cf6beb5c5e31722c1b06b036c9a37fc639308 SHA256 338c15f00cf3820240ceacc0b8e71c72e19d66c3d7c4cced15f084a6008188f3 size 3974
+MD5 243f906ca3cf310ea022bdd512d963d5 ChangeLog 3974
+RMD160 eb87dbd9c8479b504ef839a0829aeb9cf3e4d9b6 ChangeLog 3974
+SHA256 338c15f00cf3820240ceacc0b8e71c72e19d66c3d7c4cced15f084a6008188f3 ChangeLog 3974
+MISC metadata.xml 404 RMD160 b41874221734343ae538e6d6a0a2cd1f455ada09 SHA1 9d0873d85ca36720d5ffe52ee10fd02713eaf42f SHA256 d378d5f4b9a009f4fd022fdec4fd0b4a7b66ae72b81c9a200f8624839cdf515d size 404
 MD5 e966c8a2b35830b228ec70444f8798f9 metadata.xml 404
 RMD160 b41874221734343ae538e6d6a0a2cd1f455ada09 metadata.xml 404
 SHA256 d378d5f4b9a009f4fd022fdec4fd0b4a7b66ae72b81c9a200f8624839cdf515d metadata.xml 404
+MD5 a6f928a370849148c784071b429d2322 files/digest-kahakai-0.6.1 66
+RMD160 2b5f085480ec76e840f726ddb6797a523c94ed0d files/digest-kahakai-0.6.1 66
+SHA256 02deaf8886c3e2129333c8de43578fae8d90571019c6c85ff33bf16e4823c9b0 files/digest-kahakai-0.6.1 66
+MD5 389f67e9f9e4c3b7c0d97fa260bc7f0a files/digest-kahakai-0.6.2 66
+RMD160 4221a999f21bc1a9536a5e32e5e534734d6f1305 files/digest-kahakai-0.6.2 66
+SHA256 fed8beb8ea4a4a0eb793b866eac6d02b047025cab3322d6714dc42a3a8dc0b52 files/digest-kahakai-0.6.2 66
+MD5 0fb01f34fcbb7a120107d16a6ab930ee files/digest-kahakai-0.6.2_p20040306 271
+RMD160 c4ea1fff84b8fba7e8f5ca1bc3dee1b1386054c3 files/digest-kahakai-0.6.2_p20040306 271
+SHA256 d68a4cc6af0f1cc3900de5fae5a2c2bfd2402cef700925cebc2370780b3978b1 files/digest-kahakai-0.6.2_p20040306 271
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