Pass user CFLAGS/LDFLAGS through environment instead of setting in stone (#241094).

Package-Manager: portage-2.1.4.4

4 files changed, 42 insertions, 13 deletions

diff --git a/net-proxy/3proxy/3proxy-0.5.3k.ebuild b/net-proxy/3proxy/3proxy-0.5.3k.ebuild
index 4598cae92502..fe9babff8cb5 100644
--- a/net-proxy/3proxy/3proxy-0.5.3k.ebuild
+++ b/net-proxy/3proxy/3proxy-0.5.3k.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/3proxy/3proxy-0.5.3k.ebuild,v 1.1 2008/07/12 22:59:02 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/3proxy/3proxy-0.5.3k.ebuild,v 1.2 2008/10/12 17:27:12 mrness Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="really tiny cross-platform proxy servers set"
 HOMEPAGE="http://www.security.nnov.ru/soft/3proxy/"
@@ -19,12 +19,9 @@ S="${WORKDIR}"
 
 src_unpack() {
 	unpack ${A}
+
 	cd "${S}"
-	sed -i \
-		-e "/^CFLAGS/s:-g -O2:${CFLAGS}:" \
-		-e "/^LDFLAGS/s:-O2:${LDFLAGS}:" \
-		Makefile.unix || die "sed Makefile"
-	sed -i 's:/usr/local::' src/stringtable.c || die "sed stringtable"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_compile() {
diff --git a/net-proxy/3proxy/ChangeLog b/net-proxy/3proxy/ChangeLog
index 66f90c3deac0..aaceb5be6b4c 100644
--- a/net-proxy/3proxy/ChangeLog
+++ b/net-proxy/3proxy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-proxy/3proxy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/3proxy/ChangeLog,v 1.25 2008/07/12 22:59:02 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/3proxy/ChangeLog,v 1.26 2008/10/12 17:27:12 mrness Exp $
+
+  12 Oct 2008; Alin Năstac <mrness@gentoo.org>
+  +files/3proxy-0.5.3k-gentoo.patch, 3proxy-0.5.3k.ebuild:
+  Pass user CFLAGS/LDFLAGS through environment instead of setting in stone
+  (#241094).
 
 *3proxy-0.5.3k (12 Jul 2008)
 
diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest
index 52ae6aebb82a..e8c8dbd0afb5 100644
--- a/net-proxy/3proxy/Manifest
+++ b/net-proxy/3proxy/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 3proxy-0.5.3k-gentoo.patch 956 RMD160 c571bc300df59de74aea5de4ef6423d2e833e611 SHA1 1439948e37e0d1a493a27c6ea64a92134018bd89 SHA256 af4b7ff7dd0830b8d4aeb1ff3127621a40935a8d821da74e6e29ebae43ff8aa1
 DIST 3proxy-0.5.3j.tgz 190749 RMD160 8328e3a87b571dddfa2c8150f336856dd6fb703f SHA1 074d7ca2d90d5329e552c1e73d4c4ecdd96a49cf SHA256 533a38b1864ea45b46f04c9bc64d1bfdf597561dd88c4e1ed4f982de5a145d91
 DIST 3proxy-0.5.3k.tgz 190797 RMD160 416d3c0d870a6aa450472f4ab060ce90e3362dea SHA1 71befdaa94867e4b54a5b24e2a3b3b33debd5e67 SHA256 7bbe159a0157480c653ef3976495a9b1993435a44ea0e7c03784320e3ac28ea3
 EBUILD 3proxy-0.5.3j.ebuild 1333 RMD160 3b5f9a5ac636aab2161f298c75e61129dc004a40 SHA1 2a3c6bc731dcba41acdcb9ce2364d64f4baca0f0 SHA256 0956e3e68be9948da01e5a33e6e17a908508cc8dba4bfd902c90414e788a3309
-EBUILD 3proxy-0.5.3k.ebuild 1335 RMD160 cfcf233adf788cc48664ba8ab7254dc45dcdb224 SHA1 a59eadeff0f596fa0d0debfe04ab3183d603060e SHA256 d2b8c879863b9abec5d49563786183fa3ac6ad3aa6e0b4e261eafd04d15c648b
-MISC ChangeLog 3719 RMD160 5984af19f4090eaf6b0f0322286df84c1097cebe SHA1 f95fd4d010dcf682017ca6a488eb719356df0b11 SHA256 e556b117ba4c18f44f4591dc3d2bf1e216b61326e4279752624a9e90547a8851
+EBUILD 3proxy-0.5.3k.ebuild 1192 RMD160 1208f6154335d18beccf8335a810f9d8014a677c SHA1 6bbf6a7fc5371c80b6e49da7125a7f9fa148d237 SHA256 88c94aa6a838203311ed85650a0724d2c6b9bc02284ea47e3fa9e1ec5d62f46a
+MISC ChangeLog 3915 RMD160 711b7824859ec9a6849df5c45a7a9ffa51554228 SHA1 dd4e5915f222e3cfb9462b30dc9c585b3fc1c9b7 SHA256 c6541f6873a8fe084af0cd9663da9f6e7d1f0c28d16f79338a10494c120624e6
 MISC metadata.xml 800 RMD160 fdd14181d4b5139fc673ca5ca1e1cb27ae7e1389 SHA1 d001b860a04ec4ef4e3feddaa1291b0bbbca745d SHA256 b3dda2bf7c2e96ec1f2683202c33bd844d9ca480ba580a42732ba889d79be13b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkh5N0IACgkQPrHvTlXvhts1CACff9w47MY7h488NSyRH12U+zRV
-kj8AoJY9J6m9YazVwe7xn/S/IYKTbM/B
-=dSYV
+iEYEARECAAYFAkjyM5MACgkQPrHvTlXvhtsZlwCfVhrSZUOwi5neFpU6ohVACp0E
+17sAn1uwn/4zanoX9ZEJGzjFvmRAFwaM
+=3W9d
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch
new file mode 100644
index 000000000000..a88a28780432
--- /dev/null
+++ b/net-proxy/3proxy/files/3proxy-0.5.3k-gentoo.patch
@@ -0,0 +1,26 @@
+--- Makefile.unix.orig	2005-04-30 18:29:00.000000000 +0000
++++ Makefile.unix	2008-10-12 17:18:21.000000000 +0000
+@@ -9,10 +9,10 @@
+ CC = gcc
+ 
+ # you may need -L/usr/pkg/lib for older NetBSD versions
+-CFLAGS = -Wall -g -O2 -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
++CFLAGS += -Wall -g -c -pthread -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
+ COUT = -o 
+ LN = gcc
+-LDFLAGS = -Wall -O2 -pthread
++LDFLAGS += -Wall -pthread
+ # -lpthreads may be reuqired on some platforms instead of -pthreads
+ LIBS =
+ LNOUT = -o 
+--- src/stringtable.c.orig	2008-01-09 21:14:46.000000000 +0000
++++ src/stringtable.c	2008-10-12 17:19:19.000000000 +0000
+@@ -23,7 +23,7 @@
+ /* 19 */	NULL,
+ #ifndef TPROXY_CONF
+ #ifndef _WIN32
+-/* 20 */	(unsigned char *)"/usr/local/etc/3proxy.cfg",
++/* 20 */	(unsigned char *)"/etc/3proxy.cfg",
+ #else
+ /* 20 */	(unsigned char *)"3proxy.cfg",
+ #endif