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

(Portage version: 2.2.0_alpha54/cvs/Linux x86_64)

3 files changed, 78 insertions, 2 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/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