Respect CFLAGS, wrt bug #459660, thanks to Agostino Sarubbo

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x1F357D42

4 files changed, 84 insertions, 11 deletions

diff --git a/www-client/netrik/ChangeLog b/www-client/netrik/ChangeLog
index 07f41baf0c3c..cc4f20d3a271 100644
--- a/www-client/netrik/ChangeLog
+++ b/www-client/netrik/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/netrik
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/netrik/ChangeLog,v 1.15 2013/04/10 09:46:06 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/netrik/ChangeLog,v 1.16 2013/04/12 05:01:00 pinkbyte Exp $
+
+  12 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> netrik-1.16.1-r1.ebuild,
+  +files/netrik-1.16.1-configure.patch:
+  Respect CFLAGS, wrt bug #459660, thanks to Agostino Sarubbo
 
 *netrik-1.16.1-r1 (10 Apr 2013)
 
diff --git a/www-client/netrik/Manifest b/www-client/netrik/Manifest
index 95e69d4816a1..e7b0e00001bf 100644
--- a/www-client/netrik/Manifest
+++ b/www-client/netrik/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX netrik-1.16.1-configure.patch 1671 SHA256 43529d501fdbf5f561a5490b6045f099158af4e5f994ac759e2b40283b33f6a2 SHA512 1954428316b8ad5bdd0707bac62d7e298f2282eda1df31cbd9d8b88fc8cc5b38a85cd87ec85f10fb24bfb18840e4c678eb03a4daae438e753095bb8552b1ab21 WHIRLPOOL 9c786547f87aa45328590ec661d2e6c9143acfc546ba39f39ed2980f73fee5ee2092d5a57f7c1ba979c2394cf1351d12f93899bcd5b77dc4b459b4f46ddd731c
 AUX netrik-1.16.1-ncurses-tinfo.patch 334 SHA256 abc8babfc560aa41c6e192eff2d1d9b439c601b070a84b2c36512a9467594102 SHA512 6aa6c276e7052ccf887893b285254aa27947f3554cc8a2f31a4e1b22ebdee950fcef6dd586c953638f8a6864ad402d3fd2ada563f2d1b8521ef8a4c5d22987e4 WHIRLPOOL 140707b85e73655e7c2e151c479790548a121794a3e6088704a2c5b7bf21a152d9440b238e65b7baad05b853f02f94034a5c7e3d3dcd358ccf10cc091853b970
 DIST netrik-1.16.1.tar.gz 476669 SHA256 3e742d9ef866c12075e7771148e39a6892d0dcdf70f43aecafa09e0ed925b78a SHA512 73e754f8ce34226446b47c9438fb45dcc094c19ca8a2933a6cc68ed32e9cf40c9ace3189c8e63bd4537d286b608c515efd8433f795d4238ad30bd6612dd850e7 WHIRLPOOL 3492775e3f48b3cda7b7ff660d67a37397e007c074fdd647d72b1f41f93a3e5dd6cd8842d6ca84fb8ddfb9386e8d1e10cbb7054119736f3f53acf40e918b3e45
-EBUILD netrik-1.16.1-r1.ebuild 833 SHA256 9a2baeec612509a0a1061804b97e872f1b49d420c3b101027842e658c87090bf SHA512 6202556c41dcdfc56f78d5225535049e2a58dcbcab602a1aa5c6322c85dbea8b4f1a7a77ed7e4500f05bc3a9e40ca6946100391141576d5c8a691c5fe1274650 WHIRLPOOL bf3eaf0a0cb101ffab463fbc60aef939d5c71da7a683610b8ddf04ec20fb65be6142b866d46577224e8d2c1db02be2f907d10addc5e9aeb6d7f223e9ba665e51
+EBUILD netrik-1.16.1-r1.ebuild 876 SHA256 d994bc3decd1bc988f0e02c3074f84b66095227272e9a3ca988759f52f506fed SHA512 813d46edf47e2df0f3c7d08210a036f5b6d7b912cfb462334175e470ca525794b0df95695a44f02c2371a63b793b3364e0c73943ec8520bea97a74f57bed7962 WHIRLPOOL 54b9a57f042b611f72531dc5b22175dca3d5da3ecfc46e6aafafc70c91ebe3dfec96da678d2bee5a356847ea9ff82bafa0abd9a4ea360332190af34cffe70964
 EBUILD netrik-1.16.1.ebuild 691 SHA256 5c929428209345cd7cb6b071a550430a8672f5b9e15fd8166cdceb4b3c3ce3df SHA512 b5a263ff716c3400ba3567faed4f1b1e490b6ff4bbe781fbf65ddb4e03fec0c454938c757d4f1262c8a1bb870f00072a23c471829daef2ba1ea5f81c4d9f569b WHIRLPOOL ffd2f0863807421ebff98f860058802f87004daa7f825731ffd28156cd82fda3433e1dea7418acfbc99e39e02fd496d91d2ff739feaa2a7f50661666b1959b75
-MISC ChangeLog 2995 SHA256 a0d9527e22af8e85b767a8ea64a951a2df927058073ff764bc8551ac837c3cab SHA512 49094dc322459091e48e7c19e7f18aed33d47c306de2d55ef2226bbccb6ee43105c62d3d3fdadfa9144255def0be448330b7ed8a09a3b6611d333c5b845da9da WHIRLPOOL b4e5a7e6293e968a665566e9e1ca2e5f0406ab1f5d59eeea559912c341289e7170b1af44bd02c693e4bccc7c6da706d624cb9daf4d39b6e989210e93c95bd7f5
+MISC ChangeLog 3173 SHA256 180a54e213c6f365d7a738f8457e4e49ecad0c16120c0267fdbb34eebad7e746 SHA512 6c4db5a192c76ff65e9629cfb0863454c72f9de61876dc98434165286d8ec1e6940a45cc989c60f49ac0a325c51ae650706bff68a7ae60f4d2c4582cf3ebe295 WHIRLPOOL 889a5209dc4005be967d0f3b76a456324dec14b3d3dfc419212c9f9eccb62cb772433cc9091cc0967e87cb4a9639c58545a7ccbad2231853d294c0ddbe612af5
 MISC metadata.xml 412 SHA256 66db26e6f4cf3b0af851c59f1725bfb279a72a8c30436a232e5973b10887454a SHA512 01145212cc5b96850af04e9a3d9b7c25e35703fece47865da9f79a7b122ee814e1e23b4cf6330914512aceb489b2ca273c5a0db15910d02f57918db4921619ad WHIRLPOOL 84b62f9009e5a4f3babbbd9c3ffffb2b0f9a8daff34ea49dde2392b2cd1521d331202b583f911228106886361d2224187e16beb6084a47a5a175044a3ded792a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRZTTTAAoJECo/aRed9267jMcIAJkI6HTaVznqRwxFKOUqFwkl
-ozaLq6taLc2vVelo/z7sO+R1V82Au1Y9VtEwAcczpPGZQmLv/ke1V6AJD2LCxLqh
-m016ewkW42pmz/ka7f7Ztj7XhA6M6MpfzhnFmTTtsXq09B5TcoYke2mJ4yX0IuJm
-WCTZLQD7JoC7xrqo/tGZVWqsdtTFpwgDkcogX+Dpd5hdtyb9T9P4/4Axjj/SQiAW
-YlY3Qru9BBop6JS9jILi3dk4mO3ZWHmLx+bJ2omRLOQnLJamenPQiaWkqoOpMDnm
-mDUw+EGN8NF+55zmpLYtWQdrF5HJO7JtHeruu56zADdJj7iyR1FD46r3lub67s0=
-=v3yN
+iQEcBAEBCAAGBQJRZ5UTAAoJECo/aRed9267oA0IAIy1fHWAMu5G0pN7RTAGfIL3
+7UzdLLj9jBcBeJ5GGHmNkYt2OFidmg+uAge9KIpjimJoDN3SCqAivU1RvJZudaDw
+DdqB4FM6Vnd1smq/Vgco2KcyhkElvm1aFaYG8TKPs26LyVvWq3lCBmnwNPoVXJac
+4QE9W0FF5fo1mnDAngTQZC4jpN7IKpIjdItMwMIBJ20QmyCV09O844H3Cg4TzaFg
+/PPPQAfA+Gu38ViXXNoQHl6MrtwuAGeF4RPbamsnNP2j0NQlu9GVTZTdqmaiEBZW
+Tfvy385khCng4tvN2MSlRAwzu8B/tna9ay7VO64hxsWsxceOKDYt4YxgvEEkODA=
+=VLC4
 -----END PGP SIGNATURE-----
diff --git a/www-client/netrik/files/netrik-1.16.1-configure.patch b/www-client/netrik/files/netrik-1.16.1-configure.patch
new file mode 100644
index 000000000000..45a0368d69d7
--- /dev/null
+++ b/www-client/netrik/files/netrik-1.16.1-configure.patch
@@ -0,0 +1,67 @@
+--- configure.ac.orig	2013-04-12 08:56:35.279744148 +0400
++++ configure.ac	2013-04-12 08:57:09.576747084 +0400
+@@ -1,6 +1,3 @@
+-dnl preserve initial CFLAGS
+-CFLAGS_OLD="$CFLAGS"
+-
+ dnl initialize
+ AC_INIT(main.c)
+ VER=`head -1 $srcdir/README |sed 's/ *netrik \([[^ ]]*\).*/\1/'`
+@@ -56,10 +53,6 @@
+ 	      [AC_HELP_STRING([--disable-debug],
+ 			      [do not include debug options and sanity checks])])
+ 
+-AC_ARG_ENABLE(optimization,
+-	      [AC_HELP_STRING([[--enable-optimization[[[=LEVEL]]]]],
+-			      [use compiler optimization with -OLEVEL (default: -O2 if CFLAGS not set)])])
+-
+ dnl process results
+ dnl define
+ if test x"$enable_debug" != "xno"; then
+@@ -67,46 +60,5 @@
+ 	    [Define if debug options and sanity checks are desired.])
+ fi
+ 
+-dnl restore CFLAGS
+-CFLAGS="$CFLAGS_OLD"
+-
+-dnl set default CFLAGS
+-if test -z "$CFLAGS_OLD" ; then
+-  CFLAGS="$CFLAGS -g"
+-
+-  dnl set warning options for GCC
+-  if test x"$GCC" = "xyes"; then
+-    CFLAGS="$CFLAGS -W -Wall -Wstrict-prototypes -Wmissing-prototypes"
+-  fi
+-fi
+-
+-dnl adjust optimization options
+-case x"$enable_optimization" in
+-  dnl option given but no argument specified
+-  xyes)
+-    CFLAGS="$CFLAGS -O2"
+-    ;;
+-
+-  dnl chosen not to optimize
+-  xno)
+-    dnl use -O0 to make sure no optimization is performed
+-    CFLAGS="$CFLAGS -O0"
+-    ;;
+-
+-  dnl option not given
+-  x)
+-    dnl optimize if CFLAGS not specified
+-    if test -z "$CFLAGS_OLD"; then
+-      CFLAGS="$CFLAGS -O2"
+-    fi
+-    ;;
+-
+-  dnl argument given
+-  *)
+-    dnl use argument to optimize
+-    CFLAGS="$CFLAGS -O${enable_optimization}"
+-    ;;
+-esac
+-
+ dnl generate Makefiles
+ AC_OUTPUT(Makefile doc/Makefile debian/Makefile)
diff --git a/www-client/netrik/netrik-1.16.1-r1.ebuild b/www-client/netrik/netrik-1.16.1-r1.ebuild
index 47ecf6201d3b..8f9aec974456 100644
--- a/www-client/netrik/netrik-1.16.1-r1.ebuild
+++ b/www-client/netrik/netrik-1.16.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/netrik/netrik-1.16.1-r1.ebuild,v 1.1 2013/04/10 09:46:06 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/netrik/netrik-1.16.1-r1.ebuild,v 1.2 2013/04/12 05:01:00 pinkbyte Exp $
 
 EAPI=5
 
@@ -24,6 +24,7 @@ src_prepare() {
 
 	# bug #459660
 	epatch "${FILESDIR}/${P}-ncurses-tinfo.patch"
+	epatch "${FILESDIR}/${P}-configure.patch"
 	epatch_user
 
 	eautoreconf