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

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

5 files changed, 82 insertions, 9 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/Manifest b/sys-apps/ccs-tools/Manifest
index 1d044a68f997..a634f2a4d096 100644
--- a/sys-apps/ccs-tools/Manifest
+++ b/sys-apps/ccs-tools/Manifest
@@ -2,6 +2,8 @@
 Hash: SHA1
 
 AUX ccs-tools-1.6.8_p20090623-gentoo.patch 13446 RMD160 0c484fa4ebff532f8b18b3d590fe2a7ac7b18acb SHA1 ad9833b9e866073dc3596e78f4955fd512260113 SHA256 6813731520b05e84f95449db29cdaeab90324b565504677c257886f7434c21a1
+AUX ccs-tools-1.8.0_p20110214-as-needed.patch 489 RMD160 fd37d98c02fb2ce7de808654cf853e7d5c4bf625 SHA1 0cfc523686f4816b1d6e61a6edd872c973f0d1a3 SHA256 67158996140e825ac46d3c4aa6da1701ec98886d3d19b56d82bae8000113ba63
+AUX ccs-tools-1.8.0_p20110214-ldflags.patch 1798 RMD160 3c5cba576e6efc8122687950d2bb37cf037b15e7 SHA1 1adb30e327f986d200593f251859ba8d05ff65f6 SHA256 b05203a2475e409f5a44e6d08a40a7570a5c8e8d4bf99fa26911beadd0fea031
 AUX ccs-tools-1.8.0_p20110214-parallel.patch 405 RMD160 cb1484bae9e44047e869b5ded3ea2ae6641daf2d SHA1 48d67bf26e0fd1102191a0046b338a5ef4f208a0 SHA256 3e055f2c175a27d32ae1fab9a903d6583133db9a398b08b9216021d0cb00a67d
 AUX ccs-tools-1.8.3_p20110929-ldflags.patch 1798 RMD160 05f03db76c7e0804562de861268f6191ef4f7459 SHA1 99ac3551bb3c4ddc8d258177ca346827a91259bc SHA256 a76c28f45919424f157c18e2f81a22ee26750575282114b8440db4fbd6945c4a
 DIST ccs-tools-1.6.8-20090623.tar.gz 144995 RMD160 41eb0bfd26c42d1eb81319d26596cfbbcab1b96e SHA1 93db999a014a4daa36ace2d5e3f4a0733cb43980 SHA256 d2e8eec17b02e7682c814ec98dd1158a00e7b5440f25f19b4d7d5b8fb0b2e78f
@@ -15,14 +17,14 @@ EBUILD ccs-tools-1.6.8_p20090623.ebuild 1424 RMD160 bdb32f70e3642b8c5271b7e2b8e7
 EBUILD ccs-tools-1.6.8_p20100115.ebuild 1873 RMD160 b18b19904e6d217f89eefc6c3444d23c0474e459 SHA1 ed6d5f37526020f92df5ca8d992d2628d4bafb42 SHA256 ebc8d56197077945a08f6461f674a2bad6a5aa7be5f7b386b40d8582bb84c44c
 EBUILD ccs-tools-1.7.1_p20100110.ebuild 1436 RMD160 262c90377cfc7288931cb6f65609573869a16f05 SHA1 66f47df663f89bd319cbd7448413f78740a46333 SHA256 370081833e5a8bd1e7dd12b16f1fc2c1e2472276a2ccb6c37fd55c0815aa031c
 EBUILD ccs-tools-1.7.2_p20100401.ebuild 1436 RMD160 fed568e7b1a3f549deec1e1e8e4a72c2b598e754 SHA1 152fb1af6403ca5f88e091d8e94a5ab1ee0c47c6 SHA256 7430540e03afc8da833f27eb663a9f6c07aa2a69b0f2b83a3f592ddcd123b731
-EBUILD ccs-tools-1.8.0_p20110214.ebuild 1585 RMD160 5dc6f0bce959612a102cb14de09bc8e586521c6d SHA1 28caad2640caeb1cc100cada0d123b07706f6e6d SHA256 4ef72f97f0927ea41714d8cf3de7c125a6ea28ddf6efd76e921ddc8496c6e1d0
+EBUILD ccs-tools-1.8.0_p20110214.ebuild 1648 RMD160 26cf0b2b82b782fed3ef518e825dca54625b426e SHA1 2a0776749f542969f3957293b77ea72bf54edbf3 SHA256 d3884cf5925b5c8ff6a1ec3818398dfe8b1911561d3606cd9bcbca2714668536
 EBUILD ccs-tools-1.8.3_p20110929.ebuild 1563 RMD160 8323fbad581dca0afec6fb1913c32a2844e274a8 SHA1 2588444b2e4a8ccf6d06cde3ccf4912459716269 SHA256 02f47a0b7272435ec6f0140b9aa84b4d8016851274221697bd57e7b6a8bff602
-MISC ChangeLog 1934 RMD160 bc0aa714a98c1fbecde568790f230ce0b008c0d8 SHA1 bdde8bc727ba0fe92e8594307297b777e92aef5d SHA256 1d5423d1f5686d5d71779ec7e3bff53f7d98b9f32f743ba568e6d6fb1e6c73ac
+MISC ChangeLog 2209 RMD160 886ac9e2df52d790e32a227f8c516c2c3e6428cd SHA1 f0fcecab89b4b70ad2f335777d51235d63419917 SHA256 60604f93b65432cb0b8355473bf4b4056cc92c55f355bb1dd9a2299fc824ab03
 MISC metadata.xml 200 RMD160 397a9fbaf0e2d458f8d95d2415a47a671d5dda58 SHA1 714cb7b31fb311633bb0cc8ca2f24155891e342d SHA256 bb8d57cfa8edd3743459c30d264cc37cc5e20d71dca61651939a965274f23b20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6E3okACgkQGpDnPLSHuMAMWwCfWRRYpuvJ6+vbPA53udcrzRCf
-z0EAn1YgJRYhXkQUZ4Qb+bNtWYF7eM3H
-=v28S
+iEYEARECAAYFAk6E58IACgkQGpDnPLSHuMDE3QCgv08iufCRzVEqn31Tmt+BX71Y
+K4YAoNORF7xbzNRsjSIsdhLjT6TqxgUo
+=p8nr
 -----END PGP SIGNATURE-----
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)