Add prefix keywords, patches for Interix

Package-Manager: portage--svn/cvs/Linux i686

5 files changed, 74 insertions, 8 deletions

diff --git a/app-editors/cooledit/ChangeLog b/app-editors/cooledit/ChangeLog
index e191733bd30d..0e89e745c6f7 100644
--- a/app-editors/cooledit/ChangeLog
+++ b/app-editors/cooledit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/cooledit
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/cooledit/ChangeLog,v 1.26 2008/12/07 13:04:19 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/cooledit/ChangeLog,v 1.27 2010/04/05 04:04:43 abcd Exp $
+
+  05 Apr 2010; Jonathan Callen <abcd@gentoo.org> cooledit-3.17.17.ebuild,
+  +files/cooledit-3.17.17-interix.patch,
+  +files/cooledit-3.17.17-interix5.patch:
+  Add prefix keywords, patches for Interix
 
   07 Dec 2008; <ssuominen@gentoo.org>
   +files/cooledit-3.17.17-asneeded.patch,
diff --git a/app-editors/cooledit/Manifest b/app-editors/cooledit/Manifest
index 9eb513c64e7e..53e95f536e7e 100644
--- a/app-editors/cooledit/Manifest
+++ b/app-editors/cooledit/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX cooledit-3.17.17-asneeded.patch 502 RMD160 274ecde221452fbee8b4d42aa02043f4a8129e86 SHA1 f818c1e8e1cd0e32358b96778317e54965689ff1 SHA256 fc0b88b6eb900bb46cb1a06012242c24dd31196da66efc47fac7deb8ab4b7836
 AUX cooledit-3.17.17-gcc4.patch 682 RMD160 24e5519666b45a2a23c91cc62f2cf57af8c09303 SHA1 b6707236395eb45ec154c6177c6f0893a172a39e SHA256 e8ef6bf8d3ef355b7f560b35595e149258c1d7a51c13c66b1f37e7ff1751c48a
 AUX cooledit-3.17.17-implicit_declarations.patch 1261 RMD160 d03ad68dd8e59081f1a38e5b63e8d098987b0412 SHA1 1d7e0f31092c79312cd831134157bf224806432e SHA256 0d4fb9bb935a0ca527e61de653e29ea3b0a9eb2365511c71f5c466c6bcce3789
+AUX cooledit-3.17.17-interix.patch 1120 RMD160 e4815e9e533f0d9de0f4fb9c8e67aa8ffda4c2b9 SHA1 df80e0bd0b8681a51bc42d5e9736427d27862033 SHA256 d4d22086f844ea7e71abb1bc72deaad4bb3335b8ce053b9df2f4fbc48fef5db1
+AUX cooledit-3.17.17-interix5.patch 464 RMD160 d3ea870de6f5b7bfb8d65616af4a2b8775e48382 SHA1 bb2fc1a7334ffb4e34219957150f264ed9cd1949 SHA256 8e0084fa27b5ce46d5e3ee30078924f4ac1b89481ae52ccbec2f126e28bd219d
 DIST cooledit-3.17.17.tar.gz 1674273 RMD160 96ddde14fada220c381142d68147735ac5c75163 SHA1 73f9bffcb5e3e92f0a71d3f34fef19eb0287ee07 SHA256 3c0d95d409796e3d92405e8ec317acb040713b432cc9ff9742f8657c092be489
-EBUILD cooledit-3.17.17.ebuild 1051 RMD160 c7d7e0c11f6afa2047b0ba333b745b9e5b78bdbf SHA1 2a7ce37f7ade64bf9a2dd8b5c94d75fe94e4c2a0 SHA256 4a9d0ff3c3090a6e43ba3f96ac728680d310e040239a7e1d284d2a21e3ee01df
-MISC ChangeLog 3767 RMD160 cd0314ded76c7a2d42e8988a069e57dcc3a3f7bc SHA1 4310ba6079e41dd98a51d5a07335c34961318e14 SHA256 84fcdb1ecc6c046345a15c58bd7f595b2e3dfd5efa1f8a54243274c531f09078
+EBUILD cooledit-3.17.17.ebuild 1246 RMD160 555a602ef6f4ced654a77a7c026ca7e039f46de9 SHA1 7398394ddd44a6269966fd9db7235ba6172fbe3f SHA256 c9bcecd69beb440f65614febb2e56bf311b57a82046deada012b403f5d1d2c67
+MISC ChangeLog 3963 RMD160 5e3d375dbfda7bb5cbfa00771d224da7454b8fbd SHA1 8ccb7cab1f5d0d7f51424f3f2c140a8fc551f78b SHA256 977cc02cd4039386fd3518185d6a9efdd91d005279c8f1b2d963aaace3bf6b25
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAku5YWEACgkQOypDUo0oQOqVDwCeNyjEkPN2oMQGKx1ObH2wfXrX
+gAwAn1Py5lm8GMwc1Z+wYHOmWYIYgFuH
+=1lwW
+-----END PGP SIGNATURE-----
diff --git a/app-editors/cooledit/cooledit-3.17.17.ebuild b/app-editors/cooledit/cooledit-3.17.17.ebuild
index f30cc6589728..5b804289c109 100644
--- a/app-editors/cooledit/cooledit-3.17.17.ebuild
+++ b/app-editors/cooledit/cooledit-3.17.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/cooledit/cooledit-3.17.17.ebuild,v 1.7 2008/12/07 13:04:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/cooledit/cooledit-3.17.17.ebuild,v 1.8 2010/04/05 04:04:43 abcd Exp $
 
 inherit autotools eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc x86"
+KEYWORDS="~amd64 ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="nls"
 
 RDEPEND="x11-libs/libX11
@@ -25,11 +25,16 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-gcc4.patch \
 		"${FILESDIR}"/${P}-asneeded.patch \
-		"${FILESDIR}"/${P}-implicit_declarations.patch
+		"${FILESDIR}"/${P}-implicit_declarations.patch \
+		"${FILESDIR}"/${P}-interix.patch \
+		"${FILESDIR}"/${P}-interix5.patch
+
 	eautoreconf
 }
 
 src_compile() {
+	[[ ${CHOST} == *-interix* ]] && export ac_cv_header_wchar_h=no
+
 	# Fix for bug 40152 (04 Feb 2004 agriffis)
 	addwrite /dev/ptym/clone:/dev/ptmx
 	econf $(use_enable nls)
diff --git a/app-editors/cooledit/files/cooledit-3.17.17-interix.patch b/app-editors/cooledit/files/cooledit-3.17.17-interix.patch
new file mode 100644
index 000000000000..f6599ae8557c
--- /dev/null
+++ b/app-editors/cooledit/files/cooledit-3.17.17-interix.patch
@@ -0,0 +1,31 @@
+diff -ru -x '*.Po' -x '*.Plo' cooledit-3.17.17.orig/editor/_coolpython.c cooledit-3.17.17/editor/_coolpython.c
+--- cooledit-3.17.17.orig/editor/_coolpython.c	2008-04-03 10:59:33 +0200
++++ cooledit-3.17.17/editor/_coolpython.c	2008-04-03 11:02:45 +0200
+@@ -1,4 +1,15 @@
+ 
++// on interix, need this before config.h to avoid clashes
++// with wchar.h, which cooledit believes is not there, and therefore
++// defines mbstate_t. Python.h includes it, and thus wchar.h messes up.
++#ifdef __cplusplus
++extern "C" {
++#endif
++#include "Python.h"
++#ifdef __cplusplus
++}
++#endif
++
+ #include <config.h>
+ 
+ #ifdef HAVE_PYTHON
+diff -ru -x '*.Po' -x '*.Plo' cooledit-3.17.17.orig/rxvt/_rxvtlib.h cooledit-3.17.17/rxvt/_rxvtlib.h
+--- cooledit-3.17.17.orig/rxvt/_rxvtlib.h	2008-04-03 11:10:02 +0200
++++ cooledit-3.17.17/rxvt/_rxvtlib.h	2008-04-03 09:00:13 +0200
+@@ -170,7 +170,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <net/if.h>
+-#if !defined(__NetBSD__) && !defined(__OpenBSD__)
++#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX)
+ #include <net/if_arp.h>
+ #endif
+ #include "X11/keysymdef.h"
diff --git a/app-editors/cooledit/files/cooledit-3.17.17-interix5.patch b/app-editors/cooledit/files/cooledit-3.17.17-interix5.patch
new file mode 100644
index 000000000000..46048c334c98
--- /dev/null
+++ b/app-editors/cooledit/files/cooledit-3.17.17-interix5.patch
@@ -0,0 +1,13 @@
+diff -ru -x '*.Po' -x '*.Plo' cooledit-3.17.17.orig/rxvt/_rxvtlib.h cooledit-3.17.17/rxvt/_rxvtlib.h
+--- cooledit-3.17.17.orig/rxvt/_rxvtlib.h	2008-04-17 12:09:05 +0200
++++ cooledit-3.17.17/rxvt/_rxvtlib.h	2008-04-17 12:09:31 +0200
+@@ -169,7 +169,9 @@
+ #endif
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
++#ifndef __INTERIX
+ #include <net/if.h>
++#endif
+ #if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__INTERIX)
+ #include <net/if_arp.h>
+ #endif