Respect CC/CFLAGS/LDFLAGS, bugs #369813 and 369817

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 125 insertions, 11 deletions

diff --git a/dev-util/elfkickers/ChangeLog b/dev-util/elfkickers/ChangeLog
index 514f0e49d234..d3bd0685ac1a 100644
--- a/dev-util/elfkickers/ChangeLog
+++ b/dev-util/elfkickers/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/elfkickers
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/ChangeLog,v 1.35 2011/06/02 00:25:46 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/ChangeLog,v 1.36 2011/06/03 03:14:45 blueness Exp $
+
+*elfkickers-3.0-r1 (03 Jun 2011)
+
+  03 Jun 2011; Anthony G. Basile <blueness@gentoo.org> -elfkickers-3.0.ebuild,
+  +elfkickers-3.0-r1.ebuild, +files/respect-CFLAGS-LDFLAGS.patch:
+  Respect CC/CFLAGS/LDFLAGS, bugs #369813 and 369817
 
   02 Jun 2011; Anthony G. Basile <blueness@gentoo.org> Manifest:
   Fixed manifest
diff --git a/dev-util/elfkickers/Manifest b/dev-util/elfkickers/Manifest
index 80d14b4d03fa..4b5e097d248a 100644
--- a/dev-util/elfkickers/Manifest
+++ b/dev-util/elfkickers/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX create-destdir-path.patch 472 RMD160 189d960c64c114b545066ec224145e236c5fc661 SHA1 8ab530448b31a635b0a85b9ca67b8f98d6a40b28 SHA256 fab7f8335a545b62b2186bc900a69150a36432a7ff977a1bae6b8279c3ca9304
+AUX respect-CFLAGS-LDFLAGS.patch 3237 RMD160 f6e912b61c048f982dfe29df1f15f4c3dd74f7c4 SHA1 4ef6b27b0bbc821c130c47fe9c4b32e5a2ab0104 SHA256 738b1cd1d32d10816a422031902cd946d446751df4592fe29bb5f1d8c4ee6e0f
 DIST ELFkickers-2.0a.tar.gz 119659 RMD160 9a982fe963fc110966bc0b5b23a159302e4ca389 SHA1 2599fa8c2e733b422dbefbeb393f8d702a426c10 SHA256 c196988f55fc6633d9f9f6d9ddc2ae9b4dfa1f300edf4cbbad865c06a8656df7
 DIST ELFkickers-3.0.tar.gz 99527 RMD160 144fa6f5078d9abcf7191f2045e74b3e5cbe49bf SHA1 bf43a66830695a873846381c724a60dd9be765e6 SHA256 8597dc38ecb1a352f86c5075608547f2c4dcd50f4ba89de70c5494cf6611c6aa
 DIST elfkickers-2.0a-r2.patch.bz2 8561 RMD160 c6093fac3ff61203dcfe12b5f0d50b1a0a3445f7 SHA1 9f1d9d9a17e8b68e4beaed088214011a17d7277f SHA256 722b07176fcb7e002c0be6d552b0eee39f296f1bb312e0a3517a9af97cc05b0b
@@ -10,13 +11,13 @@ DIST elfkickers-2.0a-r6.patch.bz2 8687 RMD160 ca8a53c62dee9664ce890a7f86921bbc65
 EBUILD elfkickers-2.0a-r4.ebuild 1606 RMD160 dd87be8aa74e8187aefd137898368db9686bff1f SHA1 c2b7b1bb48e40894eaed6b7655ec3dec7d020773 SHA256 aec13de35b97ac4eac80820ea13c070fe0ae8352af91374f598a15ba4260558f
 EBUILD elfkickers-2.0a-r5.ebuild 1615 RMD160 ea02729a56ad2c5f9b2409bc26c3d3523dae19cb SHA1 6235be274ee600c8bbc45f4b3949efd146eacdaa SHA256 65a67872689536789a7c40b3e71cb2023d7fabac18f548a8ee7534a0bab54a51
 EBUILD elfkickers-2.0a-r6.ebuild 1615 RMD160 d23d4dc7f785bc85405fc4e351c3915e77a864e4 SHA1 70ab25153354c7838dc43227970edc8b0b92a71c SHA256 f0c8caeeacaa46408c653884171988d7fbcfe1d61a224e41f514f5df46f4275c
-EBUILD elfkickers-3.0.ebuild 761 RMD160 20f11d01d7d3b876eb6a7f35d36293ae6687d8cf SHA1 8b600a1f0bb7bed70d3caac59b911cb07ac1ccf8 SHA256 b321a60b8a0815bc18078183497850abc605cb4a1918fae858ee550f75105957
-MISC ChangeLog 4800 RMD160 32f19ae51462fce20a854c865df71d4b550265c9 SHA1 4094790e20f080d5b0fdedecc2f58417977d25cd SHA256 27797e229f6ebefb0fef1f1da5c947e6fa117d2cdb0b1aa6163e3a5f293d6905
+EBUILD elfkickers-3.0-r1.ebuild 882 RMD160 533e7b65dbd7701d1090776348524d5db1bbfcd6 SHA1 d16308497336dc6e727e29a5a4a6b63be8841f47 SHA256 8afd7764ac294087d0c59ed47a8d8e23f5cf61c8a63e1c604f8b7020f07ffb53
+MISC ChangeLog 5033 RMD160 5683285ae0fd9b64fe6eda508243b599801f808d SHA1 506a4492af25b989823e199755f4c20947b200a0 SHA256 aea9ef95e8e3e27ab3ca110fc4a1d75822000d47faa38b8f3884095460c560df
 MISC metadata.xml 665 RMD160 053a037de55405a9ef52d0804a5e4da65de9fd5d SHA1 9f9747b3d2e2225a7109b70aa5f40197e86f7ea0 SHA256 50c8944da2455788505b60ac101d7e2b8d3278118b011ca2665d61b2547ffccc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREIAAYFAk3m2JQACgkQl5yvQNBFVTVn0QCcDrWEwpzE1VEyQ1iYi4hRFtQm
-aAgAoKSzFH5RXXCcyNZhqBlcL7pzzjYf
-=lImd
+iEYEAREIAAYFAk3oUbEACgkQl5yvQNBFVTU60QCeN0zFGw+g73nfR4b1Wa1SFBKx
+D9cAnR0Te68AizkLwW++lug6xiTda7a1
+=XyGR
 -----END PGP SIGNATURE-----
diff --git a/dev-util/elfkickers/elfkickers-3.0.ebuild b/dev-util/elfkickers/elfkickers-3.0-r1.ebuild
index c92d51c294c9..f8761462c7b7 100644
--- a/dev-util/elfkickers/elfkickers-3.0.ebuild
+++ b/dev-util/elfkickers/elfkickers-3.0-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/elfkickers-3.0.ebuild,v 1.1 2011/05/31 22:12:51 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/elfkickers/elfkickers-3.0-r1.ebuild,v 1.1 2011/06/03 03:14:45 blueness Exp $
 
 EAPI="4"
 
-inherit eutils
+inherit eutils toolchain-funcs
 
-MY_PF=${PF/elf/ELF}
-S=${WORKDIR}/${MY_PF}
+MY_PN=${PN/elf/ELF}-${PV}
+S=${WORKDIR}/${MY_PN}
 
 DESCRIPTION="collection of programs to manipulate ELF files: sstrip, rebind, elfls, elftoc"
 HOMEPAGE="http://www.muppetlabs.com/~breadbox/software/elfkickers.html"
-SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PF}.tar.gz"
+SRC_URI="http://www.muppetlabs.com/~breadbox/pub/software/${MY_PN}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,6 +22,11 @@ DEPEND="app-misc/pax-utils"
 RDEPEND=""
 
 src_prepare() {
+	epatch "${FILESDIR}"/respect-CFLAGS-LDFLAGS.patch
 	epatch "${FILESDIR}"/create-destdir-path.patch
 	sed -i -e "s:^prefix = /usr/local:prefix = ${D}:" Makefile
 }
+
+src_compile() {
+	emake CC=$(tc-getCC) all
+}
diff --git a/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch b/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch
new file mode 100644
index 000000000000..6663ef8e79af
--- /dev/null
+++ b/dev-util/elfkickers/files/respect-CFLAGS-LDFLAGS.patch
@@ -0,0 +1,102 @@
+diff -Naur ELFkickers-3.0.orig//ebfc/Makefile ELFkickers-3.0/ebfc/Makefile
+--- ELFkickers-3.0.orig//ebfc/Makefile	2011-05-24 00:51:07.000000000 -0400
++++ ELFkickers-3.0/ebfc/Makefile	2011-06-02 23:05:30.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for ebfc
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -Wno-missing-field-initializers
++CC ?= gcc
++CFLAGS += -Wno-missing-field-initializers
+ 
+ ebfc: ebfc.o brainfuck.o libelfparts.a
+ 
+diff -Naur ELFkickers-3.0.orig//elfls/Makefile ELFkickers-3.0/elfls/Makefile
+--- ELFkickers-3.0.orig//elfls/Makefile	2011-05-31 02:53:05.000000000 -0400
++++ ELFkickers-3.0/elfls/Makefile	2011-06-02 23:04:15.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for elfls
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ elfls: elfls.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.0.orig//elfrw/Makefile ELFkickers-3.0/elfrw/Makefile
+--- ELFkickers-3.0.orig//elfrw/Makefile	2011-05-22 14:02:12.000000000 -0400
++++ ELFkickers-3.0/elfrw/Makefile	2011-06-02 23:04:37.000000000 -0400
+@@ -1,7 +1,6 @@
+ #  Makefile for libelfrw.a
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -O3
++CC ?= gcc
+ 
+ LIBOBJS = elfrw.o elfrw_dyn.o elfrw_ehdr.o elfrw_phdr.o elfrw_rel.o \
+           elfrw_shdr.o elfrw_sym.o elfrw_ver.o
+diff -Naur ELFkickers-3.0.orig//elftoc/Makefile ELFkickers-3.0/elftoc/Makefile
+--- ELFkickers-3.0.orig//elftoc/Makefile	2011-05-23 23:30:22.000000000 -0400
++++ ELFkickers-3.0/elftoc/Makefile	2011-06-02 23:04:27.000000000 -0400
+@@ -1,8 +1,6 @@
+ #  Makefile for elftoc
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra
+-LDFLAGS = -Wall -Wextra
++CC ?= gcc
+ 
+ OBJS = gen.o names.o address.o readelf.o shdrtab.o phdrtab.o dynamic.o \
+        pieces.o outbase.o outitems.o outelf64.o outelf32.o out.o elftoc.o
+diff -Naur ELFkickers-3.0.orig//infect/Makefile ELFkickers-3.0/infect/Makefile
+--- ELFkickers-3.0.orig//infect/Makefile	2011-05-31 02:52:27.000000000 -0400
++++ ELFkickers-3.0/infect/Makefile	2011-06-02 23:04:01.000000000 -0400
+@@ -1,7 +1,6 @@
+ #  Makefile for infect
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra
++CC ?= gcc
+ 
+ infect: infect.c
+ 
+diff -Naur ELFkickers-3.0.orig//objres/Makefile ELFkickers-3.0/objres/Makefile
+--- ELFkickers-3.0.orig//objres/Makefile	2011-05-23 23:29:39.000000000 -0400
++++ ELFkickers-3.0/objres/Makefile	2011-06-02 23:05:08.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for objres
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ objres: objres.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.0.orig//rebind/Makefile ELFkickers-3.0/rebind/Makefile
+--- ELFkickers-3.0.orig//rebind/Makefile	2011-05-23 23:29:16.000000000 -0400
++++ ELFkickers-3.0/rebind/Makefile	2011-06-02 23:04:57.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for rebind
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ rebind: rebind.c ../elfrw/libelfrw.a
+ 
+diff -Naur ELFkickers-3.0.orig//sstrip/Makefile ELFkickers-3.0/sstrip/Makefile
+--- ELFkickers-3.0.orig//sstrip/Makefile	2011-05-23 23:29:58.000000000 -0400
++++ ELFkickers-3.0/sstrip/Makefile	2011-06-02 23:05:41.000000000 -0400
+@@ -1,7 +1,7 @@
+ #  Makefile for sstrip
+ 
+-CC = gcc
+-CFLAGS = -Wall -Wextra -I../elfrw
++CC ?= gcc
++CFLAGS += -I../elfrw
+ 
+ sstrip: sstrip.c ../elfrw/libelfrw.a
+