Respect CC,CFLAGS, fix install paths, don't strip binaries. Simplify ebuild. Fixes bug 374805 by Diego Elio Pettenò <flameeyes@gentoo.org>

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

4 files changed, 84 insertions, 24 deletions

diff --git a/sys-infiniband/rds-tools/ChangeLog b/sys-infiniband/rds-tools/ChangeLog
index d3bd890486ca..bc7ffc7a0b55 100644
--- a/sys-infiniband/rds-tools/ChangeLog
+++ b/sys-infiniband/rds-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-infiniband/rds-tools
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/rds-tools/ChangeLog,v 1.2 2011/07/02 20:30:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/rds-tools/ChangeLog,v 1.3 2011/08/27 19:46:47 xarthisius Exp $
+
+  27 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> rds-tools-2.0.4.ebuild,
+  +files/rds-tools-2.0.4-qa.patch:
+  Respect CC,CFLAGS, fix install paths, don't strip binaries. Simplify ebuild.
+  Fixes bug 374805 by Diego Elio Pettenò <flameeyes@gentoo.org>
 
   02 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> rds-tools-2.0.4.ebuild:
   Add ~amd64-linux keywrod
diff --git a/sys-infiniband/rds-tools/Manifest b/sys-infiniband/rds-tools/Manifest
index 502a53677391..9eb04fbded2d 100644
--- a/sys-infiniband/rds-tools/Manifest
+++ b/sys-infiniband/rds-tools/Manifest
@@ -1,24 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX rds-tools-2.0.4-qa.patch 1678 RMD160 e301f6f6574d921c82bba50699b0679cf7b3ffa5 SHA1 9363e3eb18a34624b7a431a33836a91b43dab170 SHA256 7b13ace9767ee025d50d24068a360f2d5c1370c93b58fd361de6725afbe33373
 DIST OFED-1.5.3.1.tgz 75331712 RMD160 03675604e228c30d630d95f514522a091326c213 SHA1 7d56d4904124cc3ea926f7a4c862069611c25334 SHA256 9cdf2e78ce1a3c0b367d75593cbd344390a1f3f02ac13d6ecfa37b0d05ac89e4
-EBUILD rds-tools-2.0.4.ebuild 562 RMD160 4e57adf50a86f13efa76119cadc162df5d8e0041 SHA1 69b4fbf97e5668f6709eba0a7f1f0ac341857a42 SHA256 1d95b6ec09e00b5953367bebbf31c2557accb5d3b40f0d788ac39ee85374c57b
-MISC ChangeLog 475 RMD160 4ff2ea65c547b647aa8afdb9f4fd7c937d3ab072 SHA1 bdc488afc7a25eece26e5b40ec33c1209ad96557 SHA256 d9f8d22f4e0b1c040c8733b054f815ad27d745a508d5c43fe028e19982fe7e0c
+EBUILD rds-tools-2.0.4.ebuild 587 RMD160 7035523d97632acb33483c3d90fd2b50ae120c55 SHA1 28f6b98385a79159e05d462c21d7317a60a56654 SHA256 ed6142236c4e6fe2bf3c9695e6ae3e34210c48de7188501dd79c74be0d8ea4a9
+MISC ChangeLog 737 RMD160 80a8457b1bd3c9ec4e9d2f9db6debddf07490d6b SHA1 f2b58095de2d3359db3dc060393d17cc3a11385a SHA256 aa7bb9181311888f650cddf5d86f502e784418f8cc5869d1fa121e415649d722
 MISC metadata.xml 437 RMD160 af210ab36054cf26b2cc10e4b7c75a5eacdff0e6 SHA1 480d8a34be7258907194a0799d9f9069eac79ae7 SHA256 8f77909a6e8ca1abb060f99465a01456bc1d74b14ac2aabcae98faf66adffc7b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOD3/fAAoJEOf+E+/4L5Lmvg4P/j0rjP7W/OvI5Wh7qLUS9bJG
-h8QCfHa8B+/7iXpl4uDS4f72qOyDaU/ZzVI2C/wr0yUhAltoYCGTFJcTkG+JcP3L
-fnXUCKia9iV7Ekt0QSSIO4LEsM3IA4Kr4uUjU7lIFwleksNsUcFaNOq8u+O//bk5
-Hn93B0aC73cT/fPC1iKtMKK46qcb7JmMzVxt78pK0fBzCdYMoz42EpTu055NqYrZ
-vHE3wB1qlHHtCtHw3/lPm4J6Z20y1NIui1bkH9KZP9D/hjJ3CHNqTvIAJlboGvI6
-7CIMmpZ+apJyGr5MuPpwNCrwRVFSec0FJIf6iaFcUb+b6yWqyNUsiXS3kLc+RXEQ
-707k531fU/Y55WgzpDMlLwZlTSfipHbUrPDrPf1VjFSjAO8vuDbpQx4r6ChdwURz
-rFiAWf3QdDVx4C4EIjZkIRSFOzcn6gu6C4IvZxID5nXy0RZveap2jGRyNbxDLjjQ
-9XJIe66rXqkhvdiPC5gnBrsOrdtG9lzwBqaAmvFMdqOnBHiwm0WWz9mGpGfSrdbP
-7dN9YPKdC3EEF4FAhSaKE28HvK+Phm4wyjpmEf9/V1eaiQ/tHc7tJhUH0xOTFZgv
-nkHUIpv0vwgisfer+od8Y93jE+sNBZycTWu+Di7fQNg4Jgv82wctpMWQgMRwYFiT
-7nvD3NrPfkxrUSN1TNDR
-=/bg7
+iJwEAQEIAAYFAk5ZSbEACgkQIiMqcbOVdxSjewQAgjo2JelQibmG4nmMQ0eVuV49
+eI1jvkhBaRKVlp8QBMnIcBb1Gx3JY33g3Ji75gFGp0PAwE7BTE7fXim4kvHKWHpR
+5AyU816DxPghS6NT1ybJYGFdVPorHdvimUjuFdAb40+AOxY3MXox7isTTfMNQJT8
+q0+WZKTSiEf17YdeZvw=
+=1nru
 -----END PGP SIGNATURE-----
diff --git a/sys-infiniband/rds-tools/files/rds-tools-2.0.4-qa.patch b/sys-infiniband/rds-tools/files/rds-tools-2.0.4-qa.patch
new file mode 100644
index 000000000000..0a8e1a575c4a
--- /dev/null
+++ b/sys-infiniband/rds-tools/files/rds-tools-2.0.4-qa.patch
@@ -0,0 +1,59 @@
+Respect CC,CFLAGS, fix install paths, don't strip binaries
+
+https://bugs.gentoo.org/show_bug.cgi?id=374805
+--- Makefile.in
++++ Makefile.in
+@@ -1,12 +1,15 @@
+-prefix		= $(DESTDIR)@prefix@
+-exec_prefix	= $(DESTDIR)@exec_prefix@
+-bindir		= $(DESTDIR)@bindir@
+-mandir		= $(DESTDIR)@mandir@
+-incdir		= $(DESTDIR)@includedir@
++bindir = @bindir@
++exec_prefix = @exec_prefix@
++includedir = @includedir@
++libdir = @libdir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++prefix = @prefix@
++INSTALL = /usr/bin/install
+ 
+ all: all-programs
+ 
+-CFLAGS = -O2 -Wall -Iinclude
++CFLAGS += -Wall -Iinclude
+ CPPFLAGS = -DDEBUG_EXE -DRDS_VERSION=\"@VERSION@\" -MD -MP -MF $(@D)/.$(basename $(@F)).d
+ 
+ HEADERS = kernel-list.h pfhack.h include/rds.h
+@@ -29,14 +32,14 @@
+ all-programs: $(PROGRAMS)
+ 
+ install: $(PROGRAMS)
+-	install -d $(bindir)
+-	install -m 555 -s $(PROGRAMS) $(bindir)
+-	install -d $(mandir)/man1
+-	install -d $(mandir)/man7
+-	install -m 644 *.1 $(mandir)/man1
+-	install -m 644 *.7 $(mandir)/man7
+-	install -d $(incdir)/net
+-	install -m 444 include/rds.h $(incdir)/net
++	$(INSTALL) -d $(DESTDIR)$(bindir)
++	$(INSTALL) -m 555 $(PROGRAMS) $(DESTDIR)$(bindir)
++	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
++	$(INSTALL) -d $(DESTDIR)$(mandir)/man7
++	$(INSTALL) -m 644 *.1 $(DESTDIR)$(mandir)/man1
++	$(INSTALL) -m 644 *.7 $(DESTDIR)$(mandir)/man7
++	$(INSTALL) -d $(DESTDIR)$(includedir)/net
++	$(INSTALL) -m 444 include/rds.h $(DESTDIR)$(includedir)/net
+ 
+ clean:
+ 	rm -f $(PROGRAMS) $(CLEAN_OBJECTS)
+@@ -47,7 +50,7 @@
+ 
+ 
+ $(PROGRAMS) : % : %.o $(COMMON_OBJECTS)
+-	gcc $(CFLAGS) $(LDFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ 
+ LOCAL_DFILES := $(wildcard .*.d)
+ ifneq ($(LOCAL_DFILES),)
diff --git a/sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild b/sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild
index a5076ab2fcee..035e3d07f1fe 100644
--- a/sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild
+++ b/sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild
@@ -1,23 +1,26 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild,v 1.2 2011/07/02 20:30:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/rds-tools/rds-tools-2.0.4.ebuild,v 1.3 2011/08/27 19:46:47 xarthisius Exp $
 
-EAPI="4"
+EAPI=4
 
 OFED_VER="1.5.3.1"
 OFED_SUFFIX="1"
 
-inherit openib
+inherit base openib toolchain-funcs
 
 DESCRIPTION="OpenIB userspace rds-tools"
+
 KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE=""
 
 DEPEND=">=sys-infiniband/libibverbs-1.1.4"
 RDEPEND="${DEPEND}
-		!sys-infiniband/openib-userspace"
+	!sys-infiniband/openib-userspace"
+
+DOCS=( README )
+PATCHES=( "${FILESDIR}"/${P}-qa.patch )
 
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	dodoc README
+pkg_setup() {
+	tc-export CC
 }