Merge sed patches into gentoo.patch (#240882).

(Portage version: 2.1.4.4)

3 files changed, 42 insertions, 21 deletions

diff --git a/net-dialup/xc/ChangeLog b/net-dialup/xc/ChangeLog
index 82e6b2bab737..2f92864bc826 100644
--- a/net-dialup/xc/ChangeLog
+++ b/net-dialup/xc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/xc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xc/ChangeLog,v 1.20 2008/04/24 16:21:38 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xc/ChangeLog,v 1.21 2008/10/18 09:15:32 mrness Exp $
+
+  18 Oct 2008; Alin Năstac <mrness@gentoo.org> -files/xc-4.3.2-gentoo.diff,
+  +files/xc-4.3.2-gentoo.patch, xc-4.3.2-r1.ebuild:
+  Merge sed patches into gentoo.patch (#240882).
 
   24 Apr 2008; <solar@gentoo.org> xc-4.3.2-r1.ebuild:
   - make ebuild cross-compile aware
diff --git a/net-dialup/xc/files/xc-4.3.2-gentoo.diff b/net-dialup/xc/files/xc-4.3.2-gentoo.patch
index de88d5381bd4..7503c5b33382 100644
--- a/net-dialup/xc/files/xc-4.3.2-gentoo.diff
+++ b/net-dialup/xc/files/xc-4.3.2-gentoo.patch
@@ -1,7 +1,7 @@
-diff -Nru xc-4.3.2.orig/Makefile xc-4.3.2/Makefile
---- xc-4.3.2.orig/Makefile	2006-09-23 19:41:03.000000000 +0300
-+++ xc-4.3.2/Makefile	2006-09-23 19:41:29.560470750 +0300
-@@ -5,6 +5,8 @@
+diff -ur xc-4.3.2.orig/Makefile xc-4.3.2/Makefile
+--- xc-4.3.2.orig/Makefile	1996-11-24 06:56:14.000000000 +0000
++++ xc-4.3.2/Makefile	2008-10-18 09:06:12.000000000 +0000
+@@ -5,21 +5,23 @@
  
  SHELL	= /bin/sh
  
@@ -10,9 +10,14 @@ diff -Nru xc-4.3.2.orig/Makefile xc-4.3.2/Makefile
  #WARN 	= -Wall -ansi -pedantic -Wshadow -Wmissing-prototypes
  
  #machine = -m486
-@@ -14,12 +16,12 @@
+-CC	= gcc 
+-GCCOPT	= -pipe -O2 -fno-strength-reduce -fomit-frame-pointer $(machine) 
++#CC	= gcc 
++GCCOPT	= -fno-strength-reduce 
+ #GCCOPT	= -O -g
  CDEFS	= -D_POSIX_SOURCE=1
- CFLAGS	= $(WARN) $(CDEFS) $(GCCOPT)
+-CFLAGS	= $(WARN) $(CDEFS) $(GCCOPT)
++CFLAGS	+= $(WARN) $(CDEFS) $(GCCOPT)
  
 -prefix	= /usr/local
 +prefix	= /usr
@@ -26,6 +31,24 @@ diff -Nru xc-4.3.2.orig/Makefile xc-4.3.2/Makefile
  binown	= -o root -g root 
  
  export CC CFLAGS manown binown
+@@ -37,7 +39,7 @@
+ # 	gs -sDEVICE=ljet4 -dNOPAUSE -sOutputFile=$@ $<
+ 
+ INSTALL	= install
+-LDFLAGS	= -ltermcap editline/libedit.a
++LIBS	= -lncurses editline/libedit.a
+ NROFF 	= groff -mandoc
+ 
+ # defines for use with cextract under Linux
+@@ -56,7 +58,7 @@
+ 	@echo "Now you may execute 'make install'"
+ 
+ xc:	$(OBJS) eline
+-	$(CC) $(CFLAGS) $(OBJS) -o xc $(LDFLAGS) 
++	$(CC) $(LDFLAGS) $(OBJS) -o xc $(LIBS) 
+ 
+ uninstall:
+ 	rm -f $(bindir)/xc $(mandir)/xc.1 $(catdir)/xc.1.*
 @@ -64,10 +66,10 @@
  
  install: ./bin/xc ./bin/crc xc.1 crc.1
@@ -49,9 +72,9 @@ diff -Nru xc-4.3.2.orig/Makefile xc-4.3.2/Makefile
  
  #########################################
  ##  mostly unused stuff below here ... ##
-diff -Nru xc-4.3.2.orig/xcsubs.c xc-4.3.2/xcsubs.c
---- xc-4.3.2.orig/xcsubs.c	2006-09-23 19:41:03.000000000 +0300
-+++ xc-4.3.2/xcsubs.c	2006-09-23 19:41:19.711855250 +0300
+diff -ur xc-4.3.2.orig/xcsubs.c xc-4.3.2/xcsubs.c
+--- xc-4.3.2.orig/xcsubs.c	1996-09-21 08:22:17.000000000 +0000
++++ xc-4.3.2/xcsubs.c	2008-10-18 09:04:32.000000000 +0000
 @@ -23,7 +23,7 @@
  	 *tgetstr(), *tgoto();
  int	LI,	/* One less than screen length in termcap entry */
diff --git a/net-dialup/xc/xc-4.3.2-r1.ebuild b/net-dialup/xc/xc-4.3.2-r1.ebuild
index 78cc33dda000..a277da1a1d40 100644
--- a/net-dialup/xc/xc-4.3.2-r1.ebuild
+++ b/net-dialup/xc/xc-4.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/xc/xc-4.3.2-r1.ebuild,v 1.17 2008/04/24 16:21:38 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/xc/xc-4.3.2-r1.ebuild,v 1.18 2008/10/18 09:15:32 mrness Exp $
 
 inherit eutils toolchain-funcs
 
@@ -17,24 +17,18 @@ DEPEND="sys-libs/ncurses"
 
 src_unpack() {
 	unpack ${A}
-	tc-export CC
+
 	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.diff"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 	epatch "${FILESDIR}/${P}-implicit-decl.patch"
 
 	# Adds 115200 bps support
 	epatch "${FILESDIR}/${P}-add-115200.patch"
-
-	# Fixes the Makefile to use gentoo CFLAGS
-	sed -i \
-		-e "s:GCCOPT\t= -pipe -O2 -fno-strength-reduce -fomit-frame-pointer:GCCOPT\t= ${CFLAGS} -fno-strength-reduce:g" \
-		-e "s:-ltermcap:-lncurses ${LDFLAGS}:" \
-		-e 's:CC\t= gcc:CC='${CC}':' \
-		Makefile || die
 }
 
 src_compile() {
-	make WARN="" all prefix=/usr mandir=/usr/share/man || die "make failed"
+	tc-export CC
+	emake WARN="" all prefix=/usr mandir=/usr/share/man || die "make failed"
 }
 
 src_install () {