Clean up sed; Respect LDFLAGS; Deal with --as-needed. Patch-By: thomasq Bug #364921

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

4 files changed, 75 insertions, 4 deletions

diff --git a/sys-apps/ccs-tools/ChangeLog b/sys-apps/ccs-tools/ChangeLog
index 9e81069e9c05..b025036ec608 100644
--- a/sys-apps/ccs-tools/ChangeLog
+++ b/sys-apps/ccs-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/ccs-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ccs-tools/ChangeLog,v 1.9 2011/09/29 21:09:25 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ccs-tools/ChangeLog,v 1.10 2011/09/29 21:48:40 naota Exp $
+
+  29 Sep 2011; Naohiro Aota <naota@gentoo.org>
+  ccs-tools-1.8.0_p20110214.ebuild,
+  +files/ccs-tools-1.8.0_p20110214-as-needed.patch,
+  +files/ccs-tools-1.8.0_p20110214-ldflags.patch:
+  Clean up sed; Respect LDFLAGS; Deal with --as-needed. Patch-By: thomasq Bug
+  #364921
 
 *ccs-tools-1.8.3_p20110929 (29 Sep 2011)
 
diff --git a/sys-apps/ccs-tools/ccs-tools-1.8.0_p20110214.ebuild b/sys-apps/ccs-tools/ccs-tools-1.8.0_p20110214.ebuild
index 8ba28518f236..57c01851aca2 100644
--- a/sys-apps/ccs-tools/ccs-tools-1.8.0_p20110214.ebuild
+++ b/sys-apps/ccs-tools/ccs-tools-1.8.0_p20110214.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ccs-tools/ccs-tools-1.8.0_p20110214.ebuild,v 1.1 2011/03/02 00:36:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ccs-tools/ccs-tools-1.8.0_p20110214.ebuild,v 1.2 2011/09/29 21:48:40 naota Exp $
 
 EAPI=3
 inherit eutils multilib toolchain-funcs
@@ -26,10 +26,11 @@ S="${WORKDIR}/ccstools"
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-parallel.patch"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+	epatch "${FILESDIR}/${P}-ldflags.patch"
 	sed -i \
 		-e "s:gcc:$(tc-getCC):" \
-		-e "s:-O2:${CFLAGS}:" \
-		-e 's/\$(CFLAGS)/& $(LDFLAGS)/' \
+		-e "s/\(CFLAGS.*:=\).*/\1 ${CFLAGS}/" \
 		-e "s:/usr/lib:/usr/$(get_libdir):g" \
 		-e "s:= /:= ${EPREFIX}/:g" \
 		Include.make || die
diff --git a/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-as-needed.patch b/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-as-needed.patch
new file mode 100644
index 000000000000..8dcc9295beec
--- /dev/null
+++ b/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-as-needed.patch
@@ -0,0 +1,11 @@
+--- trunk/1.8.x/ccs-tools/ccstools/usr_sbin/Makefile	2011/08/20 04:19:39	5357
++++ trunk/1.8.x/ccs-tools/ccstools/usr_sbin/Makefile	2011/09/28 08:53:43	5494
+@@ -19,7 +19,7 @@
+ 	ln -sf libccstools.so.2.0.2 libccstools.so
+ 
+ .c:
+-	$(CC) $(CFLAGS) -o $@ -lccstools -L. $<
++	$(CC) $(CFLAGS) -o $@ $< -lccstools -L. 
+ 
+ ccs-editpolicy: ccstools.h editpolicy*.c readline.h /usr/include/curses.h libccstools.so
+ 	$(CC) $(CFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON
diff --git a/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-ldflags.patch b/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-ldflags.patch
new file mode 100644
index 000000000000..947cce65eb2d
--- /dev/null
+++ b/sys-apps/ccs-tools/files/ccs-tools-1.8.0_p20110214-ldflags.patch
@@ -0,0 +1,52 @@
+diff --git a/sbin/Makefile b/sbin/Makefile
+index cc61f13..3bdb292 100644
+--- a/sbin/Makefile
++++ b/sbin/Makefile
+@@ -9,7 +9,7 @@ install: all
+ 	$(INSTALL) -m 0700 $(BUILD_FILES) $(INSTALLDIR)$(SBINDIR)
+ 
+ .c:
+-	$(CC) $(CFLAGS) -o $@ $<
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+ 
+ clean:
+ 	rm -f -- $(BUILD_FILES)
+diff --git a/usr_lib_ccs/Makefile b/usr_lib_ccs/Makefile
+index 8181201..bee5eae 100644
+--- a/usr_lib_ccs/Makefile
++++ b/usr_lib_ccs/Makefile
+@@ -11,7 +11,7 @@ install: all
+ 	$(INSTALL) -m 0644 ../README.ccs ../COPYING.ccs $(INSTALLDIR)/$(USRLIBDIR)/ccs/
+ 
+ .c:
+-	$(CC) $(CFLAGS) -o $@ $<
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+ 
+ clean:
+ 	rm -f -- $(BUILD_FILES)
+diff --git a/usr_sbin/Makefile b/usr_sbin/Makefile
+index 6dff8c7..f324c79 100644
+--- a/usr_sbin/Makefile
++++ b/usr_sbin/Makefile
+@@ -15,17 +15,17 @@
+ 	sleep 10
+
+ libccstools.so: ccstools.c ccstools.h
+-	$(CC) $(CFLAGS) -fPIC ccstools.c -shared -Wl,-soname,libccstools.so.1 -o libccstools.so.1.0.2
++	$(CC) $(CFLAGS) $(LDFLAGS) -fPIC ccstools.c -shared -Wl,-soname,libccstools.so.1 -o libccstools.so.1.0.2
+ 	ln -sf libccstools.so.1.0.2 libccstools.so
+ 
+ .c:
+-	$(CC) $(CFLAGS) -o $@ $< -lccstools -L. 
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lccstools -L. 
+ 
+ ccs-editpolicy: ccstools.h editpolicy*.c readline.h /usr/include/curses.h libccstools.so
+-	$(CC) $(CFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ccs-editpolicy editpolicy*.c -lncurses -lccstools -L. -DCOLOR_ON
+ 
+ ccs-queryd: ccstools.h ccs-queryd.c readline.h /usr/include/curses.h libccstools.so
+-	$(CC) $(CFLAGS) -o ccs-queryd ccs-queryd.c -lncurses -lccstools -L.
++	$(CC) $(CFLAGS) $(LDFLAGS) -o ccs-queryd ccs-queryd.c -lncurses -lccstools -L.
+ 
+ install: all
+ 	mkdir -p -m 0755 $(INSTALLDIR)$(USRLIBDIR)