From: Victor Ostorga <vostorga@gentoo.org>
Date: Sun, 30 May 2010 23:36:32 +0000 (+0000)
Subject: Respecting LDFLAGS, fixing pre-stripped files bug #314111
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9920389e6b4b27c8213860420a0a91ca84294ef4;p=gentoo.git

Respecting LDFLAGS, fixing pre-stripped files bug #314111
Package-Manager: portage-2.1.8.3/cvs/Linux i686
---

diff --git a/www-servers/gatling/ChangeLog b/www-servers/gatling/ChangeLog
index b9a33b6a5a64..7018776c3f60 100644
--- a/www-servers/gatling/ChangeLog
+++ b/www-servers/gatling/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/gatling
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v 1.5 2010/05/03 18:05:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/ChangeLog,v 1.6 2010/05/30 23:36:32 vostorga Exp $
+
+  30 May 2010; Víctor Ostorga <vostorga@gentoo.org> gatling-0.12.ebuild,
+  +files/gatling-0.12-FLAGS.patch:
+  Respecting LDFLAGS, fixing pre-stripped files bug #314111
 
 *gatling-0.12 (03 May 2010)
 
diff --git a/www-servers/gatling/Manifest b/www-servers/gatling/Manifest
index 4d79a47c2973..330af05063fb 100644
--- a/www-servers/gatling/Manifest
+++ b/www-servers/gatling/Manifest
@@ -1,3 +1,4 @@
+AUX gatling-0.12-FLAGS.patch 929 RMD160 18b3ad9c44433a28fb8995cf2e13abd866af7630 SHA1 b44ed6f5e46f10397b736aed27f9527fae532f69 SHA256 d5a2e6d2c0fb97dde0c00d9cc9df365a2481f75cef72da14f6e0eb5b6ca8d733
 AUX gatling.confd 659 RMD160 b90b117fba954b2743fa43d813e2bf673c9e27b9 SHA1 0d3b68d58908ab55f113e63c31b29fcef8ab694a SHA256 278ee92229263cf7cff919795e099ec22e6696cf9790fc805601ca38929f1d8e
 AUX gatling.initd 2029 RMD160 0e201c41590bc716563f45be2e959272f2ca498c SHA1 12d0aaaf5b7d15286cea13310a8da54172d3c1e4 SHA256 9a7184a37c2dae7019814b05dc03ff36ca0327479b712d8f2d72d0894aab5923
 AUX gentoo-vars.patch 471 RMD160 5ab9be9b889e7b41b887f3844587fabeb3f3f2b2 SHA1 b9bad9e5840962be7adcc44b02239972e55edae3 SHA256 6825dd24fd78309a43309fe22b53e20a0da8d1bcdf2ec99465d9972809c4f0fb
@@ -6,7 +7,7 @@ DIST gatling-0.12.tar.bz2 99540 RMD160 c4d0288fae752a4da86f5ad88f51c60a9086a3b1
 DIST gatling-0.9.tar.bz2 73831 RMD160 cfe0b8fe6c81132d67c92be522793033f9d4dacc SHA1 db2c347c6edc4b0de1a0208121b31df3b19cec5b SHA256 6fa7c1278fd7d05422e073e4062cd931e10d2593fe73728fdcf0e2541db01bbe
 EBUILD gatling-0.11-r1.ebuild 1315 RMD160 3a3645a63d4861d0a42e0e3481e987f3a4705746 SHA1 4202fafe1aff19eee3fb2b8a7ff37d3312a133c7 SHA256 2b76c7e314f7bb456016d487f002abf8312046058f89aa9c5ecb9c176394ccfa
 EBUILD gatling-0.11.ebuild 756 RMD160 b2088876c5207d726cd089cdc66af70e48917adf SHA1 9acc9124be976b12071885230a3bc06f07aefabb SHA256 1185660493092b7fe56789f3aed16e6c26b70bf3eae42da1ebee89db0793a341
-EBUILD gatling-0.12.ebuild 1312 RMD160 3c092ea5e1ea1f6c172cd6914ed5e44d76e8aba4 SHA1 166c4d8bb92dff0ee0de6fdbdb5e5b25053089c9 SHA256 9144c8981b7d4340d0ae8ac3d3588748505ddd37b977179960532a1c6be34a06
+EBUILD gatling-0.12.ebuild 1312 RMD160 890c9e691742dc584102a80766f04276308315a5 SHA1 35d2c67e63b91f984d9d3107cd6eaa9165366389 SHA256 e72b6b45ccdd697feec4bb178e2f238eff1ef9e979260dc778bf58a645e04bce
 EBUILD gatling-0.9.ebuild 747 RMD160 a84378c1da08f350f0d3f8bb37d867c5e7e006c9 SHA1 9fe2082843c576438a7e689729924d100775ffb3 SHA256 48e8d7355bf559ad7e2ddb429fd365e8921d57b7fa315235073b043803906762
-MISC ChangeLog 1106 RMD160 5b13e4c667f65852083937fba760485e6dfbfaaa SHA1 f3a1d64ede29d39297b33b548a1171dfa2f92977 SHA256 52142285e8a37e6318639286b62ecbd363e566c0c21bcac45977d71ffea80bdd
+MISC ChangeLog 1277 RMD160 32f0bb1cd566b4de798f2d80a5425640c36a91ec SHA1 913f1a19ef4cd46f327a122f2215d2bc597f639e SHA256 58bc021bf1441e7a84308132270bd5dfe201cc7b6a6d8a84ab99677a2b5598ec
 MISC metadata.xml 352 RMD160 8131c2441f0ab212b7dd64aae57afc2fd76f6bcb SHA1 baef684494d30e9d5b168c395d02ee7a62efd36c SHA256 bd30c4c9500aedee2e87f7587cc14ae018d97eff6d2d19f411b82b73c114b116
diff --git a/www-servers/gatling/files/gatling-0.12-FLAGS.patch b/www-servers/gatling/files/gatling-0.12-FLAGS.patch
new file mode 100644
index 000000000000..c7bd1fe4ceaf
--- /dev/null
+++ b/www-servers/gatling/files/gatling-0.12-FLAGS.patch
@@ -0,0 +1,40 @@
+diff -NrU5 gatling-0.12.original/GNUmakefile gatling-0.12/GNUmakefile
+--- gatling-0.12.original/GNUmakefile	2010-05-30 16:58:29.000000000 -0600
++++ gatling-0.12/GNUmakefile	2010-05-30 17:03:21.000000000 -0600
+@@ -1,8 +1,8 @@
+ #DEBUG=1
+ ZLIB=1
+-prefix=/opt/diet
++prefix=/usr
+ BINDIR=${prefix}/bin
+ MANDIR=${prefix}/man
+ man1dir=$(MANDIR)/man1
+ 
+ TARGETS=gatling httpbench bindbench dl ioerr bench tlsgatling \
+@@ -14,12 +14,12 @@
+ all: $(ALLTARGETS)
+ 
+ CROSS=
+ #CROSS=i686-mingw32-
+ CC=$(CROSS)gcc
+-CFLAGS=-pipe -Wall
+-LDFLAGS=
++CFLAGS+=-pipe -Wall -I/usr/include/libowfat
++LDFLAGS+=
+ 
+ path = $(subst :, ,$(PATH))
+ diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet))
+ ifeq ($(strip $(diet_path)),)
+ ifneq ($(wildcard /opt/diet/bin/diet),)
+@@ -37,11 +37,10 @@
+ ifneq ($(DEBUG),)
+ CFLAGS+=-g
+ LDFLAGS+=-g
+ else
+ CFLAGS+=-O2 -fomit-frame-pointer -I/usr/local/include
+-LDFLAGS+=-s
+ ifneq ($(DIET),)
+ DIET+=-Os
+ endif
+ endif
+ 
diff --git a/www-servers/gatling/gatling-0.12.ebuild b/www-servers/gatling/gatling-0.12.ebuild
index 8f54891ea3a5..36ae4e88a61b 100644
--- a/www-servers/gatling/gatling-0.12.ebuild
+++ b/www-servers/gatling/gatling-0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/gatling-0.12.ebuild,v 1.1 2010/05/03 18:05:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/gatling-0.12.ebuild,v 1.2 2010/05/30 23:36:32 vostorga Exp $
 
 inherit eutils
 
@@ -26,7 +26,7 @@ src_unpack() {
 	unpack $A
 	cd "${S}"
 
-	epatch "${FILESDIR}/gentoo-vars.patch"
+	epatch "${FILESDIR}/${P}-FLAGS.patch"
 }
 
 src_compile() {