respect system CFLAGS/LDFLAGS

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 43 insertions, 22 deletions

diff --git a/games-board/pioneers/ChangeLog b/games-board/pioneers/ChangeLog
index 88d8393cfc51..aac465442179 100644
--- a/games-board/pioneers/ChangeLog
+++ b/games-board/pioneers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/pioneers
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/ChangeLog,v 1.31 2013/12/19 22:05:19 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/ChangeLog,v 1.32 2013/12/19 23:24:03 hasufell Exp $
+
+  19 Dec 2013; Julian Ospald <hasufell@gentoo.org>
+  files/pioneers-15.1-build.patch, pioneers-15.1.ebuild:
+  respect system CFLAGS/LDFLAGS
 
 *pioneers-15.1 (19 Dec 2013)
 
diff --git a/games-board/pioneers/Manifest b/games-board/pioneers/Manifest
index 74cf19a9bf2f..4c36b969bb49 100644
--- a/games-board/pioneers/Manifest
+++ b/games-board/pioneers/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX pioneers-15.1-build.patch 1833 SHA256 a21674c5eb7a635b64cefc24c16b7af8e4954e331d500109d9f7c104c886b287 SHA512 90a038bc9ed693d7ae6a0903eb84a61a59826875d1d0b4c6f49c7d97a50bc70c3e7f1ba5c2de08254522d460c75927c1f83935203a0106dedaab3948354ca80f WHIRLPOOL 6d69ab4999539441f938f50f102149b6865fd3d7dbb742d6bc047b8f2b6798839ca1cf932016885d84f2d989c92ebd88f92e56c87a77877ad57fbcf0ffa3365d
+AUX pioneers-15.1-build.patch 2306 SHA256 06833ad5326545756eb53113c8cb82a1bd7d9b68379d1dab8bcf85cd715de5e4 SHA512 29fdf5cbfe5a5efc24534e2b0f6aa854d02eb9cc5d2263b2f8c88195cf3316554cd3dac8a4e881d68ebcc9612c53c7a9a8a1bff14eba9328c367446bf707f2d1 WHIRLPOOL 18c75e5831726f71d2f27f08e1b6c6c5ea0bbb1482a71b7e1671644e38e0b1e725c97faeeb6feab9e4a8541678d5ed1c0ed8cb1636221052cc7011b6f097376a
 DIST pioneers-14.1.tar.gz 3784239 SHA256 5196ad2f7d4ba128f2ae138e4af9d03d62c366f0342b88d871af04294385f781 SHA512 181b226ae6bc54b3717c6056e4686875a09164dba7936db078507c6abd42331f4b0e77393c63ed0de358a73fe69528c981e0ea3b5a4ea7fb82238bafe875035f WHIRLPOOL 2f009d95e1e1afdfe8e72cfb1fd489fd906c6e0434084b2e2e6c69b7508a6a9a6446e4cac9c1f4330968f6c78bb66cfd38102c8d1028903e7481fd05b922254f
 DIST pioneers-15.1.tar.gz 4104977 SHA256 e79933343929a36f6d3b45c2229297528a75532085ad9244eedfc03ee055b93f SHA512 f77f82c993e433991c572abade87d9dc6f8cee94a557b36b97b28dee87d6fbfb4bfc5ae523a3a96899102aa9528149350e825377af58d2e21780950ee681bba5 WHIRLPOOL 33c3b2856824df6e7ac43f911179a388931cf469f6ec7288d64fb8b4fa0ba1bf85cee80a7a0d3fb7600f2ff230919cd99404c1eea0b7e1681f148b055d3f3374
 EBUILD pioneers-14.1.ebuild 878 SHA256 6eb41b8390ce16d122b6f49a1dc523d15473ee1120af43159dc5a01882887570 SHA512 18d58d1cb14564aa1b486e07016a562e750a5be79c42fd4821c3b4dc0a26402f263a522b6e609e59d922ce1c44682341918f800a6b1e418f8314b5780d24b60d WHIRLPOOL f0a8d45617d83c474ac8de52c7771d4a187ab0d81b4223a9fb1072bcbedefb66b2f29ccbc9728e1f6180c841a3c24254d25a5b6f57a2bca257826772beaff93e
-EBUILD pioneers-15.1.ebuild 1131 SHA256 9f6ecc83942f94b912724b48ab43976ce425625a4c7800904079dd092964a0d9 SHA512 26883a306a54584952fc7c3a18fd1829fa7665ab8104b76debb04a7c1b877b2a9bb73c7cf6ab73c067d506e0d84e6efad1a665e2365e636a67e109e2a96bdcba WHIRLPOOL e51f314f00bd273584548518e2eb3d19cfdaaf67a81ec7a2a5315ddb0909567ef4f1d88b94e128db6734835dcb6fa8254242e8b5a7a569fbe06a318a0e261b0a
-MISC ChangeLog 5166 SHA256 191258159937c5fd9e26dced3eb66345a125c7c491d7304d740caa324c86afb0 SHA512 58bc47fb7f79f2df55255e2207c2f506aef2298fa67e468db3e6b96ac9b76f10406962960ad721c4af530ddb6da7204377616cc69ea0f364779b72a8a7700d22 WHIRLPOOL 9728d903d9156657d9943264ef9dee45e228cb48000595c4b25100ec0c1446ebc6a9e2c89981f84f0eb53afc1194e683c9070814ff1e1c402ad1c6364bc0322a
+EBUILD pioneers-15.1.ebuild 1158 SHA256 63c8e50543a661640758d0deba6c561e08293cc2b7c54dff602636ba11094578 SHA512 b26216968b401c06885de585089a638fd1c6e1d41b45f6f7109617d5158743db7f84e597cd728bad5763eedbd453a0924f96e6d7d85c39c1067da087314f2a85 WHIRLPOOL 1c558f7732c2662e7286a03102ecd99cc803ac8e19e655432f50d537376b9d7e4e4b20dae092e1ff487f7f96825d450093af6e2b68ecaa6720a5a140da52114c
+MISC ChangeLog 5307 SHA256 7dbddecd6a533f5895d4f2e6e8ef8836bc7a8408305da4ab4b136465480a5729 SHA512 9c8335f354379cf15a0fdeeff7b53f4e55c6448594f784d2381560adb5d19427fc5786e32544bf3705cc2cd9ff1e8fdfdf0b74a580a15c7eae8c271e5cf6b9a4 WHIRLPOOL b19c26f8f3dc4c6cf2914a47aee446b9878e7e6c72e119a76e7a15db83d462aa57f266a15dbc52a30f92edc42ad8b9542557e9f0223376f7471376d10cb7ae36
 MISC metadata.xml 344 SHA256 b3dfcb9a09fa0711e136a20cdbc89b5335afbf23ee356e7a94f713e110568a69 SHA512 4e02eae0b5432e85fdb6b017eca4ac619a49e974fa6673eac74c68adb3a13dab1e43d58df4c88aa4f88d2a98e323566faeb10a8c46648e6ce9092367daf644b0 WHIRLPOOL cd4af9ea02a4f0e56857a19c2451a3794398678234706b2b083cb9077f8c444ffd17d6479e9207ae39e96b5b3349bae433188b618089f337fa6700e8faa6fbab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEbBAEBCAAGBQJSs22kAAoJEFpvPKfnPDWz6RQH+NIFcMwk/w/Wa55qdFRYuHkB
-VpaysSm3NRJyjAzDzNYJbotD4Sk7btbLGjhmoxZlfrZcPlFBaOCJJ8TR7DhRCQnM
-qgUo1PaFl9qXY9NiXepZMk82XInKdvGxPWtU3WIsjm9GRdcGQS5bXwU43yTmcXQF
-hlybme2J5F07d97kbzpS5ZKdvbOmUrbVO03IF8J2SL5bA7vN8dlQlOZfg7OmrhNz
-N3yyRSYleXayGM220ii2SvBJek4ZQ/zIO51Lt/9QTPr8lITG9FIqXGNTRR9gooa2
-P7O+i4m3NTs1aimgwfkv5+l850QymxvXk4BEYgOo4ypIz55kzTfFAmwyRDZmMw==
-=d4NQ
+iQEcBAEBCAAGBQJSs4AZAAoJEFpvPKfnPDWzM4EIAKGAB6UI7LNjPcwSvZiJtuUg
+eWjvosIevmXLik4Xk8vXU4cLA+yhu8DlfsXy9xLeWtWSTuh+rUMAeol9hLfvbCcZ
+j+lbOqNYndJ33Py08i2EYvLaUULFLzgpf7p4v4PlK7YTW7cb6Tt7sLPZXmZk+rQs
+ut0iu0kCGR9BzXxihqTVZQ6uCMZelY8Y/2dQrW5V9K5YWXPxl734UGNiBN1zqpXR
+G0ODsj+P2eT0f3+S1eFjgBRm7DF4DD7UIixu614DYc9Gi1PyG2Ze68lfzf/YUPi7
+GugCJ37u1HbmQtVDr8WPUTzAuou4dG7fXtRSxwfrlDnJ6H+WbASgcHSZvvV0RZs=
+=yG/E
 -----END PGP SIGNATURE-----
diff --git a/games-board/pioneers/files/pioneers-15.1-build.patch b/games-board/pioneers/files/pioneers-15.1-build.patch
index eab138595a50..fa3590ff413f 100644
--- a/games-board/pioneers/files/pioneers-15.1-build.patch
+++ b/games-board/pioneers/files/pioneers-15.1-build.patch
@@ -2,14 +2,24 @@ From: Julian Ospald <hasufell@gentoo.org>
 Date: Thu Dec 19 21:30:53 UTC 2013
 
 * add --with-help switch
+* add --enable-minimal-flags switch
 * don't use AM_CFLAGS in configure.ac, it is bad form
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -129,12 +129,21 @@
+@@ -129,21 +129,40 @@
    *)    pioneers_deprecationChecks=no  ;;
  esac])
  
++AC_ARG_ENABLE([minimal-flags],
++	AS_HELP_STRING([--enable-minimal-flags],
++		["Don't add unneeded flags."]),
++[case "${enableval}" in
++  yes)  minimal_flags=yes ;;
++  "")   minimal_flags=no ;;
++  *)    minimal_flags=no  ;;
++esac])
++
 +AC_ARG_WITH([help],
 +	AS_HELP_STRING([--with-help],
 +		[Enable gnome help via scrollkeeper.]),
@@ -19,33 +29,39 @@ Date: Thu Dec 19 21:30:53 UTC 2013
 +  *)    with_help=no  ;;
 +esac])
 +
++
  ## The warnings are in the same order as in 'man gcc'
- if test "x$GCC" = xyes; then
+-if test "x$GCC" = xyes; then
++if test "x$GCC" = xyes && test "x$minimal_flags" != xyes; then
  	# Flags from Debian hardening (dpkg-buildflags --get CFLAGS)
 -	AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security"])
 -	AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -D_FORTIFY_SOURCE=2"])
 -	AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -pie -fPIE"])
-+	AC_SUBST(CFLAGS, ["$CFLAGS -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security"])
-+	AC_SUBST(CFLAGS, ["$CFLAGS -D_FORTIFY_SOURCE=2"])
-+	AC_SUBST(CFLAGS, ["$CFLAGS -pie -fPIE"])
++	CFLAGS="$CFLAGS -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security"
++	CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
++	CFLAGS="$CFLAGS -pie -fPIE"
  
  	if test "$pioneers_is_windows_port" = "no"; then
  	 	# Flags from Debian hardening (dpkg-buildflags --get LDFLAGS)
-@@ -143,7 +152,7 @@
+-		AC_SUBST(AM_LDFLAGS, ["$AM_LDFLAGS -Wl,-z,relro"])
+-		AC_SUBST(AM_LDFLAGS, ["$AM_LDFLAGS -Wl,-z,now"])
++		LDFLAGS="$LDFLAGS -Wl,-z,relro"
++		LDFLAGS="$LDFLAGS -Wl,-z,now"
  	fi
  
- 	# Only link the directly needed libraries	
+-	# Only link the directly needed libraries	
 -	AC_SUBST(AM_CFLAGS, ["$AM_CFLAGS -Wl,--as-needed"])
-+	AC_SUBST(CFLAGS, ["$CFLAGS -Wl,--as-needed"])
++	# Only link the directly needed libraries
++	LDFLAGS="$LDFLAGS -Wl,--as-needed"
  
  	if test "$pioneers_warnings" = yes -o "$pioneers_warnings" = full; then
  		AC_SUBST(WARNINGS, "-Wall")
-@@ -385,7 +394,7 @@
+@@ -385,7 +404,7 @@
  AM_GLIB_GNU_GETTEXT
  
  if test $pioneers_is_mingw_port = yes; then
 -	AC_SUBST(AM_CFLAGS, "-mms-bitfields $AM_CFLAGS")
-+	AC_SUBST(CFLAGS, "-mms-bitfields $CFLAGS")
++	CFLAGS="-mms-bitfields $CFLAGS"
  	# No console window for the graphical applications
  	AC_SUBST(GTK2_LIBS, "$GTK2_LIBS -mwindows")
  	# Don't use bin, lib and share subdirectories
diff --git a/games-board/pioneers/pioneers-15.1.ebuild b/games-board/pioneers/pioneers-15.1.ebuild
index 7162d9d9ccd7..0eea195cd842 100644
--- a/games-board/pioneers/pioneers-15.1.ebuild
+++ b/games-board/pioneers/pioneers-15.1.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/games-board/pioneers/pioneers-15.1.ebuild,v 1.1 2013/12/19 22:05:19 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pioneers/pioneers-15.1.ebuild,v 1.2 2013/12/19 23:24:03 hasufell Exp $
 
 EAPI=5
 inherit autotools eutils gnome-games
@@ -37,6 +37,7 @@ src_prepare() {
 src_configure() {
 	gnome-games_src_configure \
 		$(use_enable nls) \
+		--enable-minimal-flags \
 		$(use_with help)
 }