Respect LDFLAGS. Add missing includes. Bug #331813. Thanks to Cyprien Nicolas <c.nicolas+bugs@gmail.com> for the patch

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 87 insertions, 2 deletions

diff --git a/app-shells/scsh/ChangeLog b/app-shells/scsh/ChangeLog
index 6593c34a0a89..fa3606c4adf9 100644
--- a/app-shells/scsh/ChangeLog
+++ b/app-shells/scsh/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/scsh
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/ChangeLog,v 1.29 2009/03/28 22:24:00 vadimk Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/ChangeLog,v 1.30 2010/08/12 14:25:48 hwoarang Exp $
+
+*scsh-0.6.7-r1 (12 Aug 2010)
+
+  12 Aug 2010; Markos Chandras <hwoarang@gentoo.org>
+  +files/0.6.7-Makefile.in-LDFLAGS.patch, +scsh-0.6.7-r1.ebuild,
+  +files/0.6.7-Missing-includes.patch:
+  Respect LDFLAGS. Add missing includes. Bug #331813. Thanks to Cyprien
+  Nicolas <c.nicolas+bugs@gmail.com> for the patch
 
   28 Mar 2009; Vadim Kuznetsov vadimk@gentoo.org scsh-0.6.7.ebuild:
   Bug 234691. Using multilib_toolchain_setup to enable amd64
diff --git a/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch b/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch
new file mode 100644
index 000000000000..b1c6480885d8
--- /dev/null
+++ b/app-shells/scsh/files/0.6.7-Makefile.in-LDFLAGS.patch
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2010-08-11 16:55:09.246939884 +0200
++++ Makefile.in	2010-08-11 16:55:31.309819842 +0200
+@@ -853,7 +853,7 @@
+ cig/libcig.c:		cig/libcig.scm
+ 
+ scsh/scsh: scsh/scsh-tramp.c
+-	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) \
++	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
+ 	-DVM=\"$(LIB)/$(VM)\" \
+ 	-DIMAGE=\"$(LIB)/scsh.image\" \
+ 	$(srcdir)/scsh/scsh-tramp.c
diff --git a/app-shells/scsh/files/0.6.7-Missing-includes.patch b/app-shells/scsh/files/0.6.7-Missing-includes.patch
new file mode 100644
index 000000000000..33bb5529d251
--- /dev/null
+++ b/app-shells/scsh/files/0.6.7-Missing-includes.patch
@@ -0,0 +1,22 @@
+diff -r 3dd93fcbca44 c/unix/dynamo.c
+--- a/c/unix/dynamo.c	Wed Aug 11 17:02:46 2010 +0200
++++ b/c/unix/dynamo.c	Wed Aug 11 17:04:34 2010 +0200
+@@ -5,6 +5,7 @@
+ 
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <string.h>
+ #include "sysdep.h"
+ #include "scheme48.h"
+ 
+diff -r 3dd93fcbca44 c/unix/socket.c
+--- a/c/unix/socket.c	Wed Aug 11 17:02:46 2010 +0200
++++ b/c/unix/socket.c	Wed Aug 11 17:04:34 2010 +0200
+@@ -8,6 +8,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/param.h>
++#include <malloc.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <netdb.h>
diff --git a/app-shells/scsh/scsh-0.6.7-r1.ebuild b/app-shells/scsh/scsh-0.6.7-r1.ebuild
new file mode 100644
index 000000000000..9d219238ebf5
--- /dev/null
+++ b/app-shells/scsh/scsh-0.6.7-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/scsh/scsh-0.6.7-r1.ebuild,v 1.1 2010/08/12 14:25:48 hwoarang Exp $
+
+EAPI="2"
+
+inherit eutils multilib
+
+MY_PV="${PV%*.*}"
+
+DESCRIPTION="Unix shell embedded in Scheme"
+HOMEPAGE="http://www.scsh.net/"
+SRC_URI="ftp://ftp.scsh.net/pub/scsh/${MY_PV}/${P}.tar.gz"
+
+LICENSE="as-is BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="!dev-scheme/scheme48"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-Makefile.in-doc-dir-gentoo.patch"
+	epatch "${FILESDIR}/${PV}-Makefile.in-LDFLAGS.patch"
+	epatch "${FILESDIR}/${PV}-Missing-includes.patch"
+}
+
+src_configure() {
+	use amd64 && multilib_toolchain_setup x86
+	SCSH_LIB_DIRS="/usr/$(get_libdir)/${PN}"
+	econf \
+		--libdir=/usr/$(get_libdir) \
+		--includedir=/usr/include \
+		--with-lib-dirs-list=${SCSH_LIB_DIRS}
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "make install failed."
+
+	local ENVD="${T}/50scsh"
+	echo "SCSH_LIB_DIRS=\"${SCSH_LIB_DIRS}\"" > "${ENVD}"
+	doenvd "${ENVD}"
+}