Respecting LDFLAGS, fixing pre-stripped files bug #252009, fixing RDEPEND, fixing parallel build bug #239776

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 64 insertions, 4 deletions

diff --git a/net-misc/cgterm/ChangeLog b/net-misc/cgterm/ChangeLog
index bd24b1f2d6c2..407bfbdc68ae 100644
--- a/net-misc/cgterm/ChangeLog
+++ b/net-misc/cgterm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/cgterm
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cgterm/ChangeLog,v 1.4 2008/04/21 17:56:13 phreak Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgterm/ChangeLog,v 1.5 2009/09/07 15:11:55 vostorga Exp $
+
+  07 Sep 2009; Víctor Ostorga <vostorga@gentoo.org> cgterm-1.6.ebuild,
+  +files/cgterm-1.6-QA.patch:
+  Respecting LDFLAGS, fixing pre-stripped files bug #252009, fixing RDEPEND,
+  fixing parallel build bug #239776
 
   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/net-misc/cgterm/cgterm-1.6.ebuild b/net-misc/cgterm/cgterm-1.6.ebuild
index c52ac12f5c63..cd7a4f9ee5a2 100644
--- a/net-misc/cgterm/cgterm-1.6.ebuild
+++ b/net-misc/cgterm/cgterm-1.6.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cgterm/cgterm-1.6.ebuild,v 1.2 2005/05/10 11:30:00 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cgterm/cgterm-1.6.ebuild,v 1.3 2009/09/07 15:11:55 vostorga Exp $
+
+inherit eutils
 
 DESCRIPTION="Connect to C64 telnet BBS's with the correct colours and font"
 HOMEPAGE="http://www.paradroid.net/cgterm/"
@@ -12,6 +14,13 @@ IUSE=""
 KEYWORDS="x86 ~ppc"
 
 DEPEND=">=media-libs/libsdl-1.2.5"
+RDEPEND="${DEPEND}"
+
+src_unpack(){
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-QA.patch"
+}
 
 src_compile() {
 	emake CFLAGS="${CFLAGS} `sdl-config --cflags` -DPREFIX=\\\"/usr\\\"" || die
diff --git a/net-misc/cgterm/files/cgterm-1.6-QA.patch b/net-misc/cgterm/files/cgterm-1.6-QA.patch
new file mode 100644
index 000000000000..76d253bd8b27
--- /dev/null
+++ b/net-misc/cgterm/files/cgterm-1.6-QA.patch
@@ -0,0 +1,46 @@
+diff -NrU5 cgterm-1.6.original/Makefile cgterm-1.6/Makefile
+--- cgterm-1.6.original/Makefile	2009-09-07 08:43:52.000000000 -0600
++++ cgterm-1.6/Makefile	2009-09-07 09:06:07.000000000 -0600
+@@ -8,11 +8,11 @@
+ # for solaris:
+ #SOCKETLIBS = -lsocket -lnsl
+ 
+ CC=gcc
+ CFLAGS=-O3 -Wall `sdl-config --cflags` -DPREFIX=\"$(PREFIX)\"
+-LDFLAGS=`sdl-config --libs` $(SOCKETLIBS)
++LDFLAGS+=`sdl-config --libs` $(SOCKETLIBS)
+ 
+ 
+ OBJS= \
+ 	kernal.o \
+ 	gfx.o \
+@@ -62,25 +62,22 @@
+ 
+ testimage: testimage.c diskimage.c dir.c
+ 	$(CC) -g -O3 -Wall -o testimage $^
+ 
+ install: all installdirs
+-	strip cgterm$(EXESUFFIX)
+ 	cp cgterm$(EXESUFFIX) $(PREFIX)/bin/
+ 	cp cgchat$(EXESUFFIX) $(PREFIX)/bin/
+ 	cp *.bmp *.kbd *.wav $(PREFIX)/share/cgterm/
+ #	cp cgterm.cfg $(PREFIX)/etc/
+ #	cp cgchat.cfg $(PREFIX)/etc/
+ 
+-installdirs: $(PREFIX)/bin $(PREFIX)/share $(PREFIX)/share/cgterm $(PREFIX)/etc
++installdirs: $(PREFIX)/bin $(PREFIX)/share/cgterm $(PREFIX)/etc
+ 
+ $(PREFIX)/bin:
+-	mkdir $(PREFIX)/bin > /dev/null 2>&1
+-$(PREFIX)/share:
+-	mkdir $(PREFIX)/share > /dev/null 2>&1
++	mkdir -p $(PREFIX)/bin > /dev/null 2>&1
+ $(PREFIX)/share/cgterm:
+-	mkdir $(PREFIX)/share/cgterm > /dev/null 2>&1
++	mkdir -p $(PREFIX)/share/cgterm > /dev/null 2>&1
+ $(PREFIX)/etc:
+-	mkdir $(PREFIX)/etc > /dev/null 2>&1
++	mkdir -p $(PREFIX)/etc > /dev/null 2>&1
+ 
+ clean:
+ 	rm -f cgterm$(EXESUFFIX) cgchat$(EXESUFFIX) testkbd$(EXESUFFIX) *.o *~