Add patches for bug #267567 and bug #267536. Thanks to Frank Peters <frank.peters@comcast.net> and Helmuth Schmelzer <des-colo@hotmail.com>

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

4 files changed, 97 insertions, 8 deletions

diff --git a/app-editors/cooledit/ChangeLog b/app-editors/cooledit/ChangeLog
index 0e89e745c6f7..b47f669d5190 100644
--- a/app-editors/cooledit/ChangeLog
+++ b/app-editors/cooledit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/cooledit
-# 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 $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/cooledit/ChangeLog,v 1.28 2011/09/10 17:46:52 hwoarang Exp $
+
+*cooledit-3.17.17-r1 (10 Sep 2011)
+
+  10 Sep 2011; Markos Chandras <hwoarang@gentoo.org>
+  +cooledit-3.17.17-r1.ebuild, +files/cooledit-3.17.17-copy.patch:
+  Add patches for bug #267567 and bug #267536. Thanks to Frank Peters
+  <frank.peters@comcast.net> and Helmuth Schmelzer <des-colo@hotmail.com>
 
   05 Apr 2010; Jonathan Callen <abcd@gentoo.org> cooledit-3.17.17.ebuild,
   +files/cooledit-3.17.17-interix.patch,
diff --git a/app-editors/cooledit/Manifest b/app-editors/cooledit/Manifest
index 53e95f536e7e..93ac163c8b4d 100644
--- a/app-editors/cooledit/Manifest
+++ b/app-editors/cooledit/Manifest
@@ -1,19 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX cooledit-3.17.17-asneeded.patch 502 RMD160 274ecde221452fbee8b4d42aa02043f4a8129e86 SHA1 f818c1e8e1cd0e32358b96778317e54965689ff1 SHA256 fc0b88b6eb900bb46cb1a06012242c24dd31196da66efc47fac7deb8ab4b7836
+AUX cooledit-3.17.17-copy.patch 772 RMD160 203e6743b2d43c4a49abb3a61448cbd2a4149953 SHA1 6f526f748948ae2a37559d56b49889c7b84d2ec7 SHA256 e3fcba15c529a4f6374e171b046b3c578044a0722fc362e0041b053c3c7a5a22
 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-nopython.tar.gz 15835 RMD160 0727faadc4e1e357afd06206daba4eaf7ca8a779 SHA1 f49e6e37c1d49ce8f1db1de08998a17a1bc5175e SHA256 09e140b8b66893fb814db7200d072ee40d5c84989900d94607688c6ab1e78e0d
 DIST cooledit-3.17.17.tar.gz 1674273 RMD160 96ddde14fada220c381142d68147735ac5c75163 SHA1 73f9bffcb5e3e92f0a71d3f34fef19eb0287ee07 SHA256 3c0d95d409796e3d92405e8ec317acb040713b432cc9ff9742f8657c092be489
+EBUILD cooledit-3.17.17-r1.ebuild 1449 RMD160 7a31402d69e56faf51d3f0e0f4edba05e6231697 SHA1 fa08519374c89f3d049dadfa39e1961d6a7c510b SHA256 d74af640e4ad206ccfbc8654680be9ff19306373637f6c572de8d1e515d8c94a
 EBUILD cooledit-3.17.17.ebuild 1246 RMD160 555a602ef6f4ced654a77a7c026ca7e039f46de9 SHA1 7398394ddd44a6269966fd9db7235ba6172fbe3f SHA256 c9bcecd69beb440f65614febb2e56bf311b57a82046deada012b403f5d1d2c67
-MISC ChangeLog 3963 RMD160 5e3d375dbfda7bb5cbfa00771d224da7454b8fbd SHA1 8ccb7cab1f5d0d7f51424f3f2c140a8fc551f78b SHA256 977cc02cd4039386fd3518185d6a9efdd91d005279c8f1b2d963aaace3bf6b25
+MISC ChangeLog 4268 RMD160 36e2223cb94fa7f98101c993328a132e09b33667 SHA1 25680fd5d7d407268f8b2798b2c049bb0b9087fd SHA256 6d6ba38094f2564378d5802d041022bc34f456b223b4dcd31d1ab1a16c351c52
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAku5YWEACgkQOypDUo0oQOqVDwCeNyjEkPN2oMQGKx1ObH2wfXrX
-gAwAn1Py5lm8GMwc1Z+wYHOmWYIYgFuH
-=1lwW
+iQIcBAEBCgAGBQJOa6KPAAoJEPqDWhW0r/LCL9gP/1Z24e0Y8EJ0h65AlM0JCGZ8
+3QxbidU3gdhOuwXxV44r+caQqhl74iDNusXAi48xDtn+iWJevtKwjr3uEbtgZif0
+x9Q75fDcr3Di59EWrnvN4HiOeLIqyYS1lj5fEY/xFpgdSAQMCfd2PyC0dPnYJNwh
+QVAnoFd5PL6YUAhfL7Kels2DNHUdBHxFEvVPPLstiKafvHrlgunlGNkK5TxB8b7i
+w0tNWXwIb6he/C/Qox/t2J2+HenTwZM9lbjNZbdUbwkiL3ZSq7qNGERO9FIf+0na
+aRSaZ3anzqfkCg3XrMYBLDy/HUO2Z96W9KkhHQALvPhffdya8e6IapYiTarmDNkN
+SudOks3dbCWzywXDwoPEFtFZAOX1Qi9ZuDRInpeJ5zS5RQzc0DbPGQXRJEi2j3et
+c7pDzxewSBbjTMpJjiuu7oMeKI5Y6QBZmNAqN6gPEadEHXhqD2XzFsQoqlTbcOn+
+N5zotKsoR4mIFgWIbkUqOlZAJ5hKqAhVkXRkJq2cXh9rXTlsXTHitkPddGxNbgAa
+ax3E8mqcwh+PglMJ2sQBRQF/IhNPg7mKm5jnJDMwR7c2u82NARGx6BGyi7WZC0ET
+wuH/ek+rVNOsA4DT8bfg0OqT6iV3UHz6ky6Jf/YeeDxHKAI823+8d+HqrU/lhKyB
+3+49s0xWkT8XyB+MnUE2
+=LcV4
 -----END PGP SIGNATURE-----
diff --git a/app-editors/cooledit/cooledit-3.17.17-r1.ebuild b/app-editors/cooledit/cooledit-3.17.17-r1.ebuild
new file mode 100644
index 000000000000..856d6806df58
--- /dev/null
+++ b/app-editors/cooledit/cooledit-3.17.17-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 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-r1.ebuild,v 1.1 2011/09/10 17:46:52 hwoarang Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="Cooledit is a full featured multiple window text editor"
+HOMEPAGE="http://freshmeat.net/projects/cooledit/"
+SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/editors/X/cooledit/${P}.tar.gz
+	http://dev.gentoo.org/~hwoarang/distfiles/${P}-nopython.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="nls"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXdmcp
+	x11-libs/libXau
+	app-text/ispell"
+DEPEND="${RDEPEND}
+	x11-libs/libXpm"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.patch \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-implicit_declarations.patch \
+		"${FILESDIR}"/${P}-interix.patch \
+		"${FILESDIR}"/${P}-interix5.patch \
+		"${FILESDIR}"/${P}-copy.patch \
+		"${WORKDIR}"/${P}-nopython.patch
+	sed -i -e "/Python.h/d" "${S}"/editor/_coolpython.c || die
+	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)
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+}
diff --git a/app-editors/cooledit/files/cooledit-3.17.17-copy.patch b/app-editors/cooledit/files/cooledit-3.17.17-copy.patch
new file mode 100644
index 000000000000..862b4ec8374c
--- /dev/null
+++ b/app-editors/cooledit/files/cooledit-3.17.17-copy.patch
@@ -0,0 +1,20 @@
+diff -crB cooledit-3.17.17/widget/editcmd.c cooledit-new/widget/editcmd.c
+*** cooledit-3.17.17/widget/editcmd.c	2005-04-04 16:47:45.000000000 -0400
+--- cooledit-new/widget/editcmd.c	2009-04-25 21:56:14.000000000 -0400
+***************
+*** 214,220 ****
+      if (file < 0 && (flags & O_CREAT))	/* must it be created ? */
+  	return creat ((char *) pathname, mode);
+      close (file);
+!     return open ((char *) pathname, flags);
+  }
+  
+  /* "Oleg Yu. Repin" <repin@ssd.sscc.ru> added backup filenames
+--- 214,220 ----
+      if (file < 0 && (flags & O_CREAT))	/* must it be created ? */
+  	return creat ((char *) pathname, mode);
+      close (file);
+!     return open ((char *) pathname, flags, mode);
+  }
+  
+  /* "Oleg Yu. Repin" <repin@ssd.sscc.ru> added backup filenames