Patches for latest swig and python, for m4, and for the default style. Trying to fix bug #132845.

Package-Manager: portage-2.1.2_pre3-r8

7 files changed, 161 insertions, 5 deletions

diff --git a/x11-wm/kahakai/ChangeLog b/x11-wm/kahakai/ChangeLog
index ea9d18dc6cc0..823bdd415082 100644
--- a/x11-wm/kahakai/ChangeLog
+++ b/x11-wm/kahakai/ChangeLog
@@ -1,6 +1,16 @@
 # 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.25 2006/09/11 11:22:57 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/ChangeLog,v 1.26 2006/11/02 02:43:40 nixphoeni Exp $
+
+*kahakai-0.6.2_p20040306-r1 (02 Nov 2006)
+
+  02 Nov 2006; Joe Sapp <nixphoeni@gentoo.org>
+  +files/kahakai-0.6.2_p20040306-events.py_fix.patch,
+  +files/kahakai-0.6.2_p20040306-kastyle_fix.patch,
+  +files/kahakai-m4_fixes.patch, +kahakai-0.6.2_p20040306-r1.ebuild:
+  Applied a patch to fix for the latest swig and python. Hopefully it'll
+  resolve bug #132845. Other patches include one to fix m4 complaints and one
+  to fix the default style.
 
   11 Sep 2006; Joe Sapp <nixphoeni@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 f808a7db297b..70c07f5e7ebe 100644
--- a/x11-wm/kahakai/Manifest
+++ b/x11-wm/kahakai/Manifest
@@ -2,10 +2,22 @@ AUX kahakai-0.6.2_p20040306-compilation_fix.patch 248 RMD160 f5a34bbb9700299c1be
 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-events.py_fix.patch 546 RMD160 713c1dbf7988e18e4803db078942999357d8186a SHA1 bad585e65dc014b88d9fe1271cb2d6678c06e599 SHA256 db4f57c9dffa35c508733f9580a01a4c98891ff8535ca45425ff2872d21f5e01
+MD5 e1601e4e725782a3e25ad60ca17ae3b0 files/kahakai-0.6.2_p20040306-events.py_fix.patch 546
+RMD160 713c1dbf7988e18e4803db078942999357d8186a files/kahakai-0.6.2_p20040306-events.py_fix.patch 546
+SHA256 db4f57c9dffa35c508733f9580a01a4c98891ff8535ca45425ff2872d21f5e01 files/kahakai-0.6.2_p20040306-events.py_fix.patch 546
+AUX kahakai-0.6.2_p20040306-kastyle_fix.patch 371 RMD160 64be8ec8d93c67fe2512f1d37a6b054d19920d37 SHA1 a4f2baf0855686692929abf6ca0e66e9d5402fb0 SHA256 729da0f4606cc282e572513ec5f25145bdaa56bc7a34f548b09a458e121f13d3
+MD5 2bf796a8033a9b4b5e70ad2ea8c6f97b files/kahakai-0.6.2_p20040306-kastyle_fix.patch 371
+RMD160 64be8ec8d93c67fe2512f1d37a6b054d19920d37 files/kahakai-0.6.2_p20040306-kastyle_fix.patch 371
+SHA256 729da0f4606cc282e572513ec5f25145bdaa56bc7a34f548b09a458e121f13d3 files/kahakai-0.6.2_p20040306-kastyle_fix.patch 371
 AUX kahakai-0.6.2_p20040306-rubyscript-gentoo.diff 229 RMD160 8833ec270ebe638735b8f26ad3ab74322ad61188 SHA1 1488a467b816e3cc4a8659fae4847b30f3a97d6f SHA256 1300732aa474945acc986ed3c21c2b568d18bb8ca50cd502d936d3c41409e33f
 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
+AUX kahakai-m4_fixes.patch 831 RMD160 1662eff899590ae4a32a09672c357fa7053a8d01 SHA1 5d0ce01a7a5b392b46fccd366fb7da7572328018 SHA256 2a41a6c78923300696c9a9f5e809b229bb67d5b395200a925102421ec05f09ca
+MD5 541b1753664c5f11470fcecec1110502 files/kahakai-m4_fixes.patch 831
+RMD160 1662eff899590ae4a32a09672c357fa7053a8d01 files/kahakai-m4_fixes.patch 831
+SHA256 2a41a6c78923300696c9a9f5e809b229bb67d5b395200a925102421ec05f09ca files/kahakai-m4_fixes.patch 831
 DIST kahakai-0.6.1.tar.bz2 630034 RMD160 53d4b587c72ed83959527d49030a67712cb787aa SHA1 cda0329a11c3e808c38a95eacf45f0c51311853e SHA256 c87c32b07f3054a95b854b119bf68934f9b685d709acf6b4aeb399ebb3827fe2
 DIST kahakai-0.6.2-20040306.tar.bz2 530283 RMD160 8ea54db04da3b167f9572e63908357b3226867f7 SHA1 3b968f9a5fa254e61687a4b6d93999a42229a305 SHA256 e79d021c30f6368e4bdeb1630043c50a642cd5189e2d38b1695b7d15f7a28001
 DIST kahakai-0.6.2.tar.bz2 697492 RMD160 f2a876f87b8fdf6454afacb790a8c8f57f8f52fa SHA1 794c2c5759a34fb83d6d3b24abb081ffb33debdd SHA256 c18fb9d1c7bc350bfa6dccbdd9f9fc702f795a4d3e60483f0a6b3ed956e58490
@@ -17,14 +29,18 @@ EBUILD kahakai-0.6.2.ebuild 1173 RMD160 896747205f25fb563a525e8f68180f8166b005fb
 MD5 4ca37b40160e231be39bbc9f8d155233 kahakai-0.6.2.ebuild 1173
 RMD160 896747205f25fb563a525e8f68180f8166b005fb kahakai-0.6.2.ebuild 1173
 SHA256 18a5ded24cba84f0649c928455f1b1d0482b954af3fca78211950a1b5f1943d6 kahakai-0.6.2.ebuild 1173
+EBUILD kahakai-0.6.2_p20040306-r1.ebuild 1939 RMD160 8b471fa9a1616a16fb455e64e8e21717436e725b SHA1 2565453adeedc55f547b755afb5578b0ad34e5c7 SHA256 ade75631d5a49c28068bad6a53d985aa0bc7165d0bc3b0541e62fb741062515b
+MD5 8529dc8572feef05e8e187e2ef3107a0 kahakai-0.6.2_p20040306-r1.ebuild 1939
+RMD160 8b471fa9a1616a16fb455e64e8e21717436e725b kahakai-0.6.2_p20040306-r1.ebuild 1939
+SHA256 ade75631d5a49c28068bad6a53d985aa0bc7165d0bc3b0541e62fb741062515b kahakai-0.6.2_p20040306-r1.ebuild 1939
 EBUILD kahakai-0.6.2_p20040306.ebuild 1762 RMD160 277f6d76a3cff2f883a9aeff5256ec325eb5d83a SHA1 7a4ade4508d68af93b8c9e93edfbd2cfb7621613 SHA256 b4a084bea6b71c36a5a57fc0f3dafe4382cd05480c0f171712829774d6f504c5
 MD5 ba2840e91f40e350534156d4e371e151 kahakai-0.6.2_p20040306.ebuild 1762
 RMD160 277f6d76a3cff2f883a9aeff5256ec325eb5d83a kahakai-0.6.2_p20040306.ebuild 1762
 SHA256 b4a084bea6b71c36a5a57fc0f3dafe4382cd05480c0f171712829774d6f504c5 kahakai-0.6.2_p20040306.ebuild 1762
-MISC ChangeLog 4131 RMD160 96a5995149e35dfb37a947ad3eeccb7116751075 SHA1 67e9552c3ce05e563574b7ef1488762a5493e45b SHA256 95a64d59cce6f7d0b09376bdd8980c42080186ccdc91179e2bc5340b19b81aeb
-MD5 929bd26a3609c3d9f2dbd66d520708bb ChangeLog 4131
-RMD160 96a5995149e35dfb37a947ad3eeccb7116751075 ChangeLog 4131
-SHA256 95a64d59cce6f7d0b09376bdd8980c42080186ccdc91179e2bc5340b19b81aeb ChangeLog 4131
+MISC ChangeLog 4576 RMD160 0b0d0abf0bf5fc07447a6d35d013bdbeda5ed6ab SHA1 6aaa8769184491998407f1ea9f20ee0bab38e624 SHA256 82244d621a9a876da81c764a7543ae01a9bfa6648b1d5527c136eaaac350a81a
+MD5 7b099ae3132dac4e50e1488ac344c191 ChangeLog 4576
+RMD160 0b0d0abf0bf5fc07447a6d35d013bdbeda5ed6ab ChangeLog 4576
+SHA256 82244d621a9a876da81c764a7543ae01a9bfa6648b1d5527c136eaaac350a81a ChangeLog 4576
 MISC metadata.xml 404 RMD160 b41874221734343ae538e6d6a0a2cd1f455ada09 SHA1 9d0873d85ca36720d5ffe52ee10fd02713eaf42f SHA256 d378d5f4b9a009f4fd022fdec4fd0b4a7b66ae72b81c9a200f8624839cdf515d
 MD5 e966c8a2b35830b228ec70444f8798f9 metadata.xml 404
 RMD160 b41874221734343ae538e6d6a0a2cd1f455ada09 metadata.xml 404
@@ -38,3 +54,6 @@ SHA256 070fd5374290b67d94348a79357578f08c9e84cdcd37cd870f01d3f5bfe3f25e files/di
 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
+MD5 0fb01f34fcbb7a120107d16a6ab930ee files/digest-kahakai-0.6.2_p20040306-r1 271
+RMD160 c4ea1fff84b8fba7e8f5ca1bc3dee1b1386054c3 files/digest-kahakai-0.6.2_p20040306-r1 271
+SHA256 d68a4cc6af0f1cc3900de5fae5a2c2bfd2402cef700925cebc2370780b3978b1 files/digest-kahakai-0.6.2_p20040306-r1 271
diff --git a/x11-wm/kahakai/files/digest-kahakai-0.6.2_p20040306-r1 b/x11-wm/kahakai/files/digest-kahakai-0.6.2_p20040306-r1
new file mode 100644
index 000000000000..d459e8f9f65b
--- /dev/null
+++ b/x11-wm/kahakai/files/digest-kahakai-0.6.2_p20040306-r1
@@ -0,0 +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/files/kahakai-0.6.2_p20040306-events.py_fix.patch b/x11-wm/kahakai/files/kahakai-0.6.2_p20040306-events.py_fix.patch
new file mode 100644
index 000000000000..8236276740a2
--- /dev/null
+++ b/x11-wm/kahakai/files/kahakai-0.6.2_p20040306-events.py_fix.patch
@@ -0,0 +1,11 @@
+--- data/scripts/python/events.py.in.orig	2006-10-31 23:46:13.000000000 -0500
++++ data/scripts/python/events.py.in	2006-10-31 23:46:58.000000000 -0500
+@@ -104,7 +104,7 @@
+     def set(self, action):
+         # Decompose delay into second and micro second
+         action.delay.tv_sec  = int(self.delay)
+-        action.delay.tv_usec = (self.delay - int(self.delay)) * 1e6
++        action.delay.tv_usec = (self.delay - int(self.delay)) * long(1e6)
+ 
+         action.delay_breaks = kahakai.Vector_int()
+         for delayBreak in self.delayBreaks:
diff --git a/x11-wm/kahakai/files/kahakai-0.6.2_p20040306-kastyle_fix.patch b/x11-wm/kahakai/files/kahakai-0.6.2_p20040306-kastyle_fix.patch
new file mode 100644
index 000000000000..1dead66ed8a9
--- /dev/null
+++ b/x11-wm/kahakai/files/kahakai-0.6.2_p20040306-kastyle_fix.patch
@@ -0,0 +1,11 @@
+--- data/styles/Default.kastyle.in.orig	2006-11-01 21:18:34.000000000 -0500
++++ data/styles/Default.kastyle.in	2006-11-01 21:18:39.000000000 -0500
+@@ -43,7 +43,7 @@
+ ## base stuff
+ 
+ borderColor = black
+-rootCommand = hsetroot -fill /tmp/ktest/share/kahakai/styles/Default.png
++rootCommand = hsetroot -fill /usr/share/kahakai/styles/Default.png
+ 
+ ## and here we go ..
+ 
diff --git a/x11-wm/kahakai/files/kahakai-m4_fixes.patch b/x11-wm/kahakai/files/kahakai-m4_fixes.patch
new file mode 100644
index 000000000000..40e0234f2ce4
--- /dev/null
+++ b/x11-wm/kahakai/files/kahakai-m4_fixes.patch
@@ -0,0 +1,22 @@
+--- config/m4/imlib2.m4.orig	2003-09-07 19:06:53.000000000 -0400
++++ config/m4/imlib2.m4	2006-10-30 21:36:33.000000000 -0500
+@@ -7,7 +7,7 @@
+ dnl AM_PATH_IMLIB2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for IMLIB2@, and define IMLIB2_CFLAGS and IMLIB2_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_IMLIB2,
++AC_DEFUN([AM_PATH_IMLIB2],
+ [dnl 
+ dnl Get the cflags and libraries from the imlib2-config script
+ dnl
+--- config/m4/ruby.m4.orig	2003-09-18 19:08:40.000000000 -0400
++++ config/m4/ruby.m4	2006-10-30 21:35:56.000000000 -0500
+@@ -6,7 +6,7 @@
+ dnl Test for Ruby, and define RUBY_CFLAGS, RUBY_LIBS, RUBY_LDSHARED, RUBY_DLEXT,
+ dnl ruby_libdir, ruby_archdir, ruby_sitelibdir and ruby_sitearchdir
+ dnl
+-AC_DEFUN(AM_PATH_RUBY,
++AC_DEFUN([AM_PATH_RUBY],
+ [dnl
+ dnl Get the cflags and libraries from the rbconfig.rb
+ dnl
diff --git a/x11-wm/kahakai/kahakai-0.6.2_p20040306-r1.ebuild b/x11-wm/kahakai/kahakai-0.6.2_p20040306-r1.ebuild
new file mode 100644
index 000000000000..d351e513996b
--- /dev/null
+++ b/x11-wm/kahakai/kahakai-0.6.2_p20040306-r1.ebuild
@@ -0,0 +1,80 @@
+# 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-r1.ebuild,v 1.1 2006/11/02 02:43:40 nixphoeni Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit eutils autotools
+
+IUSE="xinerama ruby"
+
+DESCRIPTION="A language agnostic scriptable window manager based on Waimea."
+HOMEPAGE="http://kahakai.sf.net/"
+#SRC_URI="mirror://sourceforge/kahakai/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P/_p/-}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="-alpha ppc ~sparc x86"
+
+RDEPEND="( x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-proto/xextproto
+		xinerama? ( x11-libs/libXinerama )
+		)
+	|| ( x11-libs/libXft virtual/xft x11-base/xorg-x11 )
+	ruby? ( || ( >=dev-lang/ruby-1.8 dev-lang/ruby-cvs ) )
+	dev-lang/swig
+	>=media-libs/imlib2-1.1.0
+	dev-util/pkgconfig
+	media-fonts/artwiz-fonts
+	dev-libs/boost"
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+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
+	epatch ${FILESDIR}/${P}-rubyscript-gentoo.diff
+	epatch ${FILESDIR}/${P}-compilation_fix.patch
+	cd ${S}
+	# fixes bug #132845 (I think)
+	epatch ${FILESDIR}/${P}-events.py_fix.patch
+	epatch ${FILESDIR}/${P}-kastyle_fix.patch
+	# fixes old m4 file problems
+	epatch ${FILESDIR}/${PN}-m4_fixes.patch
+}
+
+src_compile() {
+	libtoolize --copy --force || die
+	./autogen.sh || die
+	econf \
+		$(use_enable ruby) \
+		$(use_enable xinerama) \
+		--enable-hsetroot \
+		--enable-kaconf || 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 NEWS COPYING README ChangeLog TODO
+
+	exeinto /etc/X11/Sessions
+	echo "/usr/bin/kahakai" > ${T}/kahakai
+	doexe ${T}/kahakai
+}