Fix Makefile to respect environment.

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

3 files changed, 54 insertions, 9 deletions

diff --git a/app-misc/logserial/ChangeLog b/app-misc/logserial/ChangeLog
index bba6d9dc9436..30303920b680 100644
--- a/app-misc/logserial/ChangeLog
+++ b/app-misc/logserial/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/logserial
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/logserial/ChangeLog,v 1.6 2008/04/21 16:52:14 phreak Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/logserial/ChangeLog,v 1.7 2009/07/21 16:41:09 ssuominen Exp $
+
+  21 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  logserial-0.4.2.ebuild, +files/logserial-0.4.2-gentoo.patch:
+  Fix Makefile to respect environment.
 
   21 Apr 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
   Fix up metadata.xml. If there's no maintainer for the package, the metadata
diff --git a/app-misc/logserial/files/logserial-0.4.2-gentoo.patch b/app-misc/logserial/files/logserial-0.4.2-gentoo.patch
new file mode 100644
index 000000000000..dd594e34f76a
--- /dev/null
+++ b/app-misc/logserial/files/logserial-0.4.2-gentoo.patch
@@ -0,0 +1,30 @@
+diff -ur logserial-0.4.2.orig/Makefile logserial-0.4.2/Makefile
+--- logserial-0.4.2.orig/Makefile	2003-04-12 19:41:07.000000000 +0300
++++ logserial-0.4.2/Makefile	2009-07-21 19:39:18.000000000 +0300
+@@ -5,22 +5,20 @@
+ # FUNCTION:
+ # Makefile for logserial
+ 
+-CC=gcc
++CC ?= gcc
+ 
+ NAME=logserial
+ VERSION=0.4.2
+ 
+ OBJS= logserial.o sysdep1.o
+ 
+-OPTIMIZE= -O3 -m486 -Wall -D_POSIX -D_SYSV -D_SELECT -D_HAVE_MACROS
+-DEBUG_FLAGS= #-g 
+-
+-CFLAGS= $(DEBUG_FLAGS) $(OPTIMIZE)
++CFLAGS += -Wall
++CPPFLAGS += -D_POSIX -D_SYSV -D_SELECT -D_HAVE_MACROS
+ 
+ all: $(NAME)
+ 
+ $(NAME): $(OBJS)
+-	$(CC) $(CFLAGS) -o $(NAME) $(OBJS)
++	$(CC) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -o $(NAME) $(OBJS)
+ 
+ $(NAME).o: $(NAME).c
+     
diff --git a/app-misc/logserial/logserial-0.4.2.ebuild b/app-misc/logserial/logserial-0.4.2.ebuild
index 3b9dcf615737..fa3cb617aac4 100644
--- a/app-misc/logserial/logserial-0.4.2.ebuild
+++ b/app-misc/logserial/logserial-0.4.2.ebuild
@@ -1,21 +1,32 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/logserial/logserial-0.4.2.ebuild,v 1.4 2006/02/20 18:21:32 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/logserial/logserial-0.4.2.ebuild,v 1.5 2009/07/21 16:41:09 ssuominen Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A tool for logging raw data from a serial device."
 HOMEPAGE="http://www.gtlib.cc.gatech.edu/pub/Linux/system/serial/logserial-0.4.2.lsm"
 SRC_URI="http://www.gtlib.cc.gatech.edu/pub/Linux/system/serial/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~amd64"
+SLOT="0"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
+RDEPEND=""
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
 src_compile() {
-	make
+	tc-export CC
+	emake || die "emake failed"
 }
 
 src_install() {
-	dodir /usr/bin
-	cp logserial ${D}/usr/bin
+	dobin logserial || die "dobin failed"
+	dodoc CHANGELOG README
 }