Fix compilation with LDFLAGS -Wl,--as-needed and implicit declarations because of missing string.h and stdlib.h wrt #246879.

Package-Manager: portage-2.1.6_rc3/cvs/Linux 2.6.27.7 i686

5 files changed, 70 insertions, 10 deletions

diff --git a/app-editors/cooledit/ChangeLog b/app-editors/cooledit/ChangeLog
index 8cdc327c833b..e191733bd30d 100644
--- a/app-editors/cooledit/ChangeLog
+++ b/app-editors/cooledit/ChangeLog
@@ -1,6 +1,13 @@
 # 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.25 2008/03/26 02:03:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/cooledit/ChangeLog,v 1.26 2008/12/07 13:04:19 ssuominen Exp $
+
+  07 Dec 2008; <ssuominen@gentoo.org>
+  +files/cooledit-3.17.17-asneeded.patch,
+  +files/cooledit-3.17.17-implicit_declarations.patch,
+  cooledit-3.17.17.ebuild:
+  Fix compilation with LDFLAGS -Wl,--as-needed and implicit declarations
+  because of missing string.h and stdlib.h wrt #246879.
 
   26 Mar 2008; Brent Baude <ranger@gentoo.org> cooledit-3.17.17.ebuild:
   stable ppc, bug 214573
diff --git a/app-editors/cooledit/Manifest b/app-editors/cooledit/Manifest
index 2c82734cf673..9eb513c64e7e 100644
--- a/app-editors/cooledit/Manifest
+++ b/app-editors/cooledit/Manifest
@@ -1,5 +1,7 @@
+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
 DIST cooledit-3.17.17.tar.gz 1674273 RMD160 96ddde14fada220c381142d68147735ac5c75163 SHA1 73f9bffcb5e3e92f0a71d3f34fef19eb0287ee07 SHA256 3c0d95d409796e3d92405e8ec317acb040713b432cc9ff9742f8657c092be489
-EBUILD cooledit-3.17.17.ebuild 902 RMD160 8497883daf3600122ea171360688a1ada5ea25bb SHA1 9ae4f18ee690a3f13f3e4d1c71b6e197b5f2216b SHA256 5191d551384da997230b6fa7c1184493122fa236350327e4cdc4c5181d9647ec
-MISC ChangeLog 3472 RMD160 438ea614e8fa04d569a432b252213efc8adfc7fc SHA1 4a1b8402d96262491af68f4d532aadc95778cc16 SHA256 075539269a38e3dfb093726ffb37afcb8f2f4c6d0c4ce8502c8709f90ea05757
+EBUILD cooledit-3.17.17.ebuild 1051 RMD160 c7d7e0c11f6afa2047b0ba333b745b9e5b78bdbf SHA1 2a7ce37f7ade64bf9a2dd8b5c94d75fe94e4c2a0 SHA256 4a9d0ff3c3090a6e43ba3f96ac728680d310e040239a7e1d284d2a21e3ee01df
+MISC ChangeLog 3767 RMD160 cd0314ded76c7a2d42e8988a069e57dcc3a3f7bc SHA1 4310ba6079e41dd98a51d5a07335c34961318e14 SHA256 84fcdb1ecc6c046345a15c58bd7f595b2e3dfd5efa1f8a54243274c531f09078
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
diff --git a/app-editors/cooledit/cooledit-3.17.17.ebuild b/app-editors/cooledit/cooledit-3.17.17.ebuild
index e09424d35eb4..f30cc6589728 100644
--- a/app-editors/cooledit/cooledit-3.17.17.ebuild
+++ b/app-editors/cooledit/cooledit-3.17.17.ebuild
@@ -1,35 +1,41 @@
 # Copyright 1999-2008 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.6 2008/03/26 02:03:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/cooledit/cooledit-3.17.17.ebuild,v 1.7 2008/12/07 13:04:19 ssuominen Exp $
 
-inherit eutils
+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"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE="nls spell"
+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}/cooledit-3.17.17-gcc4.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.patch \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-implicit_declarations.patch
+	eautoreconf
 }
 
 src_compile() {
 	# Fix for bug 40152 (04 Feb 2004 agriffis)
 	addwrite /dev/ptym/clone:/dev/ptmx
 	econf $(use_enable nls)
-	emake || die "emake failed"
+	emake || die "emake failed."
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "install failed"
+	emake DESTDIR="${D}" install || die "emake install failed."
 }
diff --git a/app-editors/cooledit/files/cooledit-3.17.17-asneeded.patch b/app-editors/cooledit/files/cooledit-3.17.17-asneeded.patch
new file mode 100644
index 000000000000..4cd6331fcd49
--- /dev/null
+++ b/app-editors/cooledit/files/cooledit-3.17.17-asneeded.patch
@@ -0,0 +1,11 @@
+diff -ur cooledit-3.17.17.orig/widget/Makefile.am cooledit-3.17.17/widget/Makefile.am
+--- cooledit-3.17.17.orig/widget/Makefile.am	2005-04-04 23:47:45.000000000 +0300
++++ cooledit-3.17.17/widget/Makefile.am	2008-12-07 14:47:18.000000000 +0200
+@@ -20,6 +20,7 @@
+ 	look-cool.c look-gtk.c look-next.c
+ 
+ libCw_la_LDFLAGS = -version-info 1:0:0
++libCw_la_LIBADD = @X_LIBS@ -lX11 @X_EXTRA_LIBS@ @LIBINTL@
+ 
+ DEFS = @X_CFLAGS@ -DLOCALEDIR=\"$(localedir)\" -DLIBDIR=\"${exec_prefix}/share/cooledit\" @DEFS@ 
+ 
diff --git a/app-editors/cooledit/files/cooledit-3.17.17-implicit_declarations.patch b/app-editors/cooledit/files/cooledit-3.17.17-implicit_declarations.patch
new file mode 100644
index 000000000000..322c36fde936
--- /dev/null
+++ b/app-editors/cooledit/files/cooledit-3.17.17-implicit_declarations.patch
@@ -0,0 +1,34 @@
+diff -ur cooledit-3.17.17.orig/editor/postscript.c cooledit-3.17.17/editor/postscript.c
+--- cooledit-3.17.17.orig/editor/postscript.c	2005-04-04 23:47:45.000000000 +0300
++++ cooledit-3.17.17/editor/postscript.c	2008-12-07 14:55:25.000000000 +0200
+@@ -1,5 +1,7 @@
+ #include <config.h>
++#include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+diff -ur cooledit-3.17.17.orig/widget/aafont.c cooledit-3.17.17/widget/aafont.c
+--- cooledit-3.17.17.orig/widget/aafont.c	2005-04-04 23:47:45.000000000 +0300
++++ cooledit-3.17.17/widget/aafont.c	2008-12-07 14:54:23.000000000 +0200
+@@ -20,6 +20,7 @@
+ #include <config.h>
+ #include <stdlib.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+ #include "aafont.h"
+diff -ur cooledit-3.17.17.orig/widget/mad.c cooledit-3.17.17/widget/mad.c
+--- cooledit-3.17.17.orig/widget/mad.c	2005-04-04 23:47:45.000000000 +0300
++++ cooledit-3.17.17/widget/mad.c	2008-12-07 14:54:30.000000000 +0200
+@@ -22,6 +22,8 @@
+ /* Generation MAD. It is based on the debauch package.              */
+ /********************************************************************/
+ 
++#include <stdlib.h>
++#include <string.h>
+ #include "mad.h"
+ 
+ #undef malloc