Add a proper fix to respect user CFLAGS, thanks to flameeyes.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 46 insertions, 11 deletions

diff --git a/net-irc/bip/ChangeLog b/net-irc/bip/ChangeLog
index e198df8ace66..4092eeaa32d5 100644
--- a/net-irc/bip/ChangeLog
+++ b/net-irc/bip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/bip
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bip/ChangeLog,v 1.14 2010/08/07 12:46:33 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bip/ChangeLog,v 1.15 2010/08/07 16:41:44 a3li Exp $
+
+  07 Aug 2010; Alex Legler <a3li@gentoo.org> bip-0.8.5.ebuild,
+  +files/bip-configure.patch:
+  Add a proper fix to respect user CFLAGS, thanks to flameeyes.
 
 *bip-0.8.5 (07 Aug 2010)
 
diff --git a/net-irc/bip/Manifest b/net-irc/bip/Manifest
index 45f4a1210dd3..355d0221e1d8 100644
--- a/net-irc/bip/Manifest
+++ b/net-irc/bip/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX bip-configure.patch 813 RMD160 d09c941021ab093f37bb4fc7bc9b2ab65361cf13 SHA1 5d2212cba40696d739ae3efdb0337f2d91eb54f6 SHA256 e713c197fedc1abf6424528b51ffb5afe6acb69dd8f1d93bb7b2770ab4306d99
 AUX bip-freenode.patch 671 RMD160 8a418013b4443e3ea916399346d216984bcb17b1 SHA1 bce7080721511c50f361b2cb4f4a2d39b32b5a23 SHA256 a67e582f89cc6a32d5bb48c7e8ceb647b889808c2c8798ae3eb27d88869b892f
 AUX bip.vim 157 RMD160 b6b18f156f31ea515e271e7cec714d994c056a41 SHA1 7d0b4e3ddaf6dc5dae04ba1c853075f3ad3232fc SHA256 7c97eaef6d3b51d0e2f9572c919e25a5fc2f480a95469194b012fc507da55fc5
 DIST bip-0.8.4.tar.gz 218014 RMD160 b82370595a092dd6a57586355084a777ef04b034 SHA1 f5677004a1ce4eb86fa01c1d1f3a29d764ac5df6 SHA256 7636663137372e6890cd935112b285be904b376b86a4c7c164daa9981ccd4e2c
 DIST bip-0.8.5.tar.gz 219985 RMD160 2e0d610f5b8883bd7f453524676ebe95a1a9ea4c SHA1 c8dc9cde94d0ff6b12d6ad2c5c316a58a70f98a5 SHA256 06adbfde12ee7c93b55793d340f6eec60f70dfddbf091ba6664f0b2af593be12
 EBUILD bip-0.8.4.ebuild 1652 RMD160 718528e19719233e4c0141b97bdcac9561d681dd SHA1 c89ce6f73b18d43a01b7fcde271b1652326797a7 SHA256 a882505106d518b1e1c35142b969ea87a3af40cb98f86ea8875ff13b419d645a
-EBUILD bip-0.8.5.ebuild 1756 RMD160 a505701727a2e9e84264314503dbfe9525f9e9e8 SHA1 5c884743c5bb0cc5cf3358b0c816d58248fc9df2 SHA256 9875c7f4b8d74b39f89c12d21e627be9946f9b4b55f1757b13f510b15f67fc4c
-MISC ChangeLog 2504 RMD160 dc5fb8910f3cc5091d703298af5638f9b6680db4 SHA1 63c95d7880433ad1a771dd545414d16d56f4d7c6 SHA256 3f1bda1c04021b531d81adcc21ce54c545b9ebb7fad070633b4d2786c7a99ae3
+EBUILD bip-0.8.5.ebuild 1716 RMD160 ca058e1ee38001b927ccc31953d6522c6208a16d SHA1 2cfa9fd5f12eea3a7cfdf380fdd42b731d840eb6 SHA256 e0ef326180df8965ed5c7fd41e4558bf0c24dc1265fa80dd7a17ef171a368c88
+MISC ChangeLog 2662 RMD160 ae3f08b33c15bab761aa03d5966d188012f5ffc4 SHA1 1fd8b88b56e7a813eb4d0dc96f102bffa65814c1 SHA256 9adbf246a808de743d0b797b830a0ab575f667e852c4c563bcb091224e8a2b68
 MISC metadata.xml 1102 RMD160 7cd449daed13af6f3f4165e99361542eb51b4820 SHA1 95d8b6681d216d97a3348b2799bbeb560a195325 SHA256 e5303154ae5787821fb38ca9be06d1e7cf033cc04a7098b07581c2e8ead8bbf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxdVbMACgkQ3Ca6Xy8+rvSbnQD/QHjvIhmHlghkyjA0tUMXSwWf
-4TUH+Xsce3og64ObYmMBAIHWUih5PAq0HMtjoSEXdqllGk/n915UHNL+zHoUsCQ2
-=sEV+
+iF4EAREIAAYFAkxdjNIACgkQ3Ca6Xy8+rvQRnQD/T1I6mPk8t14JBSsLAmEB3QPa
+tlAd9TOEz0Fz7NciynsA/jlctOhea4PZTFJkV9UCRIDoKcS7Mw7gZIO6eputhKo2
+=vfiI
 -----END PGP SIGNATURE-----
diff --git a/net-irc/bip/bip-0.8.5.ebuild b/net-irc/bip/bip-0.8.5.ebuild
index 2d0daf51623b..feaf776a79d8 100644
--- a/net-irc/bip/bip-0.8.5.ebuild
+++ b/net-irc/bip/bip-0.8.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/bip/bip-0.8.5.ebuild,v 1.1 2010/08/07 12:46:33 a3li Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/bip/bip-0.8.5.ebuild,v 1.2 2010/08/07 16:41:44 a3li Exp $
 
 EAPI="2"
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Multiuser IRC proxy with ssl support"
 HOMEPAGE="http://bip.t1r.net/"
@@ -21,6 +21,10 @@ RDEPEND="${DEPEND}
 	oidentd? ( >=net-misc/oidentd-2.0 )"
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-configure.patch" || die
+
+	eautoreconf
+
 	if use noctcp; then
 		sed -i -e '/irc_privmsg_check_ctcp(server, line);/s:^://:' src/irc.c || die
 	fi
@@ -39,9 +43,7 @@ src_configure() {
 
 src_compile() {
 	# Parallel make fails.
-	# {C,CXX,LD}FLAGS aren't respected, bug 241030.
-	emake CFLAGS="${CFLAGS}" CPPFLAGS="${CXXFLAGS}" \
-		LDFLAGS="${LDFLAGS}" -j1 || die "emake failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
diff --git a/net-irc/bip/files/bip-configure.patch b/net-irc/bip/files/bip-configure.patch
new file mode 100644
index 000000000000..028c7f0610b4
--- /dev/null
+++ b/net-irc/bip/files/bip-configure.patch
@@ -0,0 +1,28 @@
+Respecting user CFLAGS, removing unneded LDFLAGS.
+The -O0 stuff shouldn't be there as it disables fortifying.
+
+Upstream: to be submitted (2010-08-07)
+
+diff --git a/configure.ac b/configure.ac
+index f61a9ed..6720150 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -44,16 +44,14 @@ AC_ARG_ENABLE([pie], AS_HELP_STRING([--disable-pie], [Do not build a position in
+ 
+ AM_CONDITIONAL(DEBUG, test x$enable_debug = xyes)
+ AS_IF([test "x$enable_debug" = "xyes"], [
+-	CFLAGS="-O0 -g -W -Wall"
+-	LDFLAGS="-g"
++	CFLAGS="${CFLAGS} -g -W -Wall"
+ 	AC_CHECK_FUNC(backtrace_symbols_fd, [
+ 		AC_DEFINE(HAVE_BACKTRACE, [], [Use glibc backtrace on fatal()])
+ 		LDFLAGS="-rdynamic $LDFLAGS"
+ 		backtrace="(with backtrace)"
+ 	])
+ ], [
+-	CFLAGS="-O2 -g -W -Wall"
+-	LDFLAGS="-g"
++	CFLAGS="${CFLAGS} -g -W -Wall"
+ 	enable_debug=no
+ ])
+