QA: Fixed typo in freebsd-lib blocker, respect CC (bug 243916)

(Portage version: 2.2_rc20/cvs/Linux 2.6.28-dirty x86_64)

5 files changed, 28 insertions, 12 deletions

diff --git a/dev-libs/libedit/ChangeLog b/dev-libs/libedit/ChangeLog
index b31d52664ac5..5145271086fc 100644
--- a/dev-libs/libedit/ChangeLog
+++ b/dev-libs/libedit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libedit
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.24 2007/07/21 01:48:26 uberlord Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/ChangeLog,v 1.25 2009/01/04 22:15:44 angelos Exp $
+
+  04 Jan 2009; Christoph Mende <angelos@gentoo.org>
+  +files/libedit-20061103-ldflags.patch, libedit-20061103.ebuild,
+  libedit-20061103-r1.ebuild, libedit-20061103-r2.ebuild:
+  QA: Fixed typo in freebsd-lib blocker, respect CC (bug 243916), respect
+  LDFLAGS
 
 *libedit-20061103-r2 (21 Jul 2007)
 
diff --git a/dev-libs/libedit/files/libedit-20061103-ldflags.patch b/dev-libs/libedit/files/libedit-20061103-ldflags.patch
new file mode 100644
index 000000000000..7e9d4085f4da
--- /dev/null
+++ b/dev-libs/libedit/files/libedit-20061103-ldflags.patch
@@ -0,0 +1,8 @@
+--- netbsd-cvs/Makefile.orig	2009-01-04 23:09:48.705130795 +0100
++++ netbsd-cvs/Makefile	2009-01-04 23:09:55.836326665 +0100
+@@ -118,4 +118,4 @@
+ libedit.a: $(OOBJS)
+ 	$(AR) -r $@ .a/*
+ libedit.so: $(OOBJS)
+-	$(CC) --shared -o $@ .so/* $(LIBS) -Wl,-soname,libedit.so
++	$(CC) $(LDFLAGS) --shared -o $@ .so/* $(LIBS) -Wl,-soname,libedit.so
diff --git a/dev-libs/libedit/libedit-20061103-r1.ebuild b/dev-libs/libedit/libedit-20061103-r1.ebuild
index e77fc8b918c2..d3337936ce98 100644
--- a/dev-libs/libedit/libedit-20061103-r1.ebuild
+++ b/dev-libs/libedit/libedit-20061103-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20061103-r1.ebuild,v 1.2 2007/06/14 11:29:22 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20061103-r1.ebuild,v 1.3 2009/01/04 22:15:44 angelos Exp $
 
 inherit eutils toolchain-funcs
 
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="elibc_glibc"
 
 DEPEND="sys-libs/ncurses
-	!<=sys-freebs/freebsd-lib-6.2_rc1"
+	!<=sys-freebsd/freebsd-lib-6.2_rc1"
 
 S=${WORKDIR}/netbsd-cvs
 
diff --git a/dev-libs/libedit/libedit-20061103-r2.ebuild b/dev-libs/libedit/libedit-20061103-r2.ebuild
index ddbe744901aa..649a2cd67b04 100644
--- a/dev-libs/libedit/libedit-20061103-r2.ebuild
+++ b/dev-libs/libedit/libedit-20061103-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20061103-r2.ebuild,v 1.1 2007/07/21 01:48:26 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20061103-r2.ebuild,v 1.2 2009/01/04 22:15:44 angelos Exp $
 
 inherit eutils toolchain-funcs
 
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="elibc_glibc"
 
 DEPEND="sys-libs/ncurses
-	!<=sys-freebs/freebsd-lib-6.2_rc1"
+	!<=sys-freebsd/freebsd-lib-6.2_rc1"
 
 S=${WORKDIR}/netbsd-cvs
 
@@ -30,10 +30,12 @@ src_unpack() {
 	fi
 
 	# FreeBSD's __weak_reference macro differs from NetBSD's
-	epatch "${FILESDIR}/${P}-freebsd.patch"
+	epatch "${FILESDIR}/${P}-freebsd.patch" \
+		"${FILESDIR}"/${P}-ldflags.patch
 }
 
 src_compile() {
+	tc-export CC
 	emake -j1 .depend || die "depend"
 	emake || die "make"
 }
diff --git a/dev-libs/libedit/libedit-20061103.ebuild b/dev-libs/libedit/libedit-20061103.ebuild
index be5afd582f36..d88ea9804f90 100644
--- a/dev-libs/libedit/libedit-20061103.ebuild
+++ b/dev-libs/libedit/libedit-20061103.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-libs/libedit/libedit-20061103.ebuild,v 1.3 2006/12/29 15:16:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libedit/libedit-20061103.ebuild,v 1.4 2009/01/04 22:15:44 angelos Exp $
 
 inherit eutils toolchain-funcs
 
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~spar
 IUSE="elibc_glibc"
 
 DEPEND="sys-libs/ncurses
-	!<=sys-freebs/freebsd-lib-6.2_rc1"
+	!<=sys-freebsd/freebsd-lib-6.2_rc1"
 
 S=${WORKDIR}/netbsd-cvs