Add patch which fixes USE="-profile" by fixing ./configure's --disable-profile, should actually fix bug #371119 finally.

Package-Manager: portage-2.2.0_alpha37-r1/cvs/Linux x86_64

4 files changed, 143 insertions, 18 deletions

diff --git a/net-irc/atheme-services/ChangeLog b/net-irc/atheme-services/ChangeLog
index ac2cb6a95147..b4400666301f 100644
--- a/net-irc/atheme-services/ChangeLog
+++ b/net-irc/atheme-services/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-irc/atheme-services
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.5 2011/06/12 03:21:12 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/ChangeLog,v 1.6 2011/06/14 03:07:58 binki Exp $
+
+  14 Jun 2011; Nathan Phillip Brink <binki@gentoo.org>
+  atheme-services-6.0.8.ebuild,
+  +files/atheme-services-6.0.8-configure-disable.patch:
+  Add patch which fixes USE="-profile" by fixing ./configure's
+  --disable-profile, should actually fix bug #371119 finally.
 
   12 Jun 2011; Nathan Phillip Brink <binki@gentoo.org>
   atheme-services-6.0.8.ebuild:
diff --git a/net-irc/atheme-services/Manifest b/net-irc/atheme-services/Manifest
index 0e3118cd436e..04a639579656 100644
--- a/net-irc/atheme-services/Manifest
+++ b/net-irc/atheme-services/Manifest
@@ -1,25 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX atheme-services-6.0.8-configure-disable.patch 4067 RMD160 83b845addd7af78d10a4b8447e9ec3c88f7efa17 SHA1 a893c2fab189495b31525332a8c4c9ffdcbd3aaf SHA256 861b9b458e6e2122aca923425dec407a5d2a13fecde613544c5aafb2cb161595
 AUX atheme-services.initd.in 1226 RMD160 5f8c08d9852ebbfb45728746231e6e403d315863 SHA1 860fc6cc6d130eeffcdafb6ae6fff51bb6c14ccb SHA256 4199d305397133d34ad15eeaa19b94f6f6b971b33d23cbeeaa0dc5bdb57ca1a6
 DIST atheme-services-6.0.8.tar.bz2 860407 RMD160 31c1ba46ee5ede98108b51970bde134b259f1b3b SHA1 d201a41592fe0137e00625d7d6ed99fd79a752a7 SHA256 7dffcf8e768ca442d1fcc2b0e3031c41e34f6b3d8ee47164f84f20cb30515c24
-EBUILD atheme-services-6.0.8.ebuild 2698 RMD160 05168108dc60daada739779ebf2b428f92d90357 SHA1 639d9de2a2206fa6013d7e05542f2ffb3c0bbdf1 SHA256 57ba64877424c055256808a2b723fd58a91bfeca8a3beb3bfda00d39387832d0
-MISC ChangeLog 1588 RMD160 425201e3f7a0838b92f1c6aadb85308f00c26bdb SHA1 46087100bac44a6b1fab97f8094b46bfebb676fa SHA256 c5fd3723e7e6af8996ccca5985726e8616280bc7227c5d81b902fa530d0cb49c
+EBUILD atheme-services-6.0.8.ebuild 2748 RMD160 c51bb5398f391a1f94cfc20246c0d3a6edefe113 SHA1 a9fc403eb3c79b787de2e8f108bb6295c53958d3 SHA256 42048749f7f29b301cbcf6af20c0e1b38881da33969d935429b98e4c644531ba
+MISC ChangeLog 1857 RMD160 f9ccad898e40429a94df7ef5d0e71a9e11a1ed22 SHA1 ac0c5c29e16d7c05857ec9df386e147a1aa0c152 SHA256 a186512dc6d8b601dad038767a235919d4eec6b5ff5192998cdb16cc43d26f2d
 MISC metadata.xml 522 RMD160 62256e4afba65ef587fb4314adeeb178b57246c0 SHA1 6765fd4304513a1aca8ba55294f417e11f1a4c8d SHA256 0eb4b26200c6ae7b351c45b9744c0bedd49e2de925f09161af89e5aefb8a5dcf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJN9DC9AAoJEHQ6UuhrqBBQJ/YQAKWiHffICYnOWORSR3JmAlCD
-TfBJOHZJ1w1V5iJXtJnYlnNdWQTP6dYBSxQF4HR+TAZuAJrbJms1AS3B9pTxW9UO
-RaMnx4HsRg1r+lPRTsgwVJAthmHI3+meLMd+ru2OOiM5hkpeWrslyGGC/FWDsdb4
-j3QRlkn1/L42GO4dsQhWP3y5r4yQ3OnMhT3Z5qG96TeEE1Td8bqx87TwFygml5tS
-Mn4InsL+gxbeh2HvBzBlb/nIlFgW+fH/kwCSyWfj4yTkFrXD63eigONWXVxjELyK
-1D2TEHaMbEaze3yWmdbZWcyjvFR8aGhFxGXnGeOT8yZk6i3TNDT51xGH7OuUgHP/
-5NzNAPRPJkM6VzEg1QQKAqYkz+ouv7sQiZ8eQYYRc2Ry/ONiFq5gaUbwKkLHJ6fL
-OyrxxBeueG34V+ZcRQuoSYfPvttgNEuUulbmdFIiUVK9iB5PtuOJhXeToAa6SpMM
-2+KxRC/FxFQ1EupP6lCNNX+HdOfmXeSdJ2KlAHt1Kv1qYtNlrt26ohrusTGudnsL
-aqv+vz6rXnp0+rLzaRJYauy7s/EoSBGf8eXPS937GeU3ce6wWZ1vOQA7QBB9q66l
-LXLgs+xo77YiSzDgmypMljuh+JBgkstb2MO8lSt2727FXq5Pam+oaaeeq2HVdiBh
-a2lhbFsXcfjFNPoc+W1D
-=Q8Zh
+iQIcBAEBCAAGBQJN9tCqAAoJEHQ6UuhrqBBQg88P/R74ogwWfBJdIRNyBCQOu0j5
+TXGDuus2XmC6jO/ozORPOCZHCXP2fmOIq+xDhM/9A5VJlHGCzKXGRIL3btZHUdoT
+NSlLdEZHaXIYoSB9W5kEeiy/ci6APqeHDh1WEMuO3AYqVaHQhxdZfk1iuVWqkp0v
+oB8LDMFLn9Etwj28qXRGHH0Sw4nhYW6ccUCidsGeZwXYg9cmZlArEcy0PEX8kWON
+5TbC+N7uSWc8FnNUhdJC4VqTVlvsXtorc1vNcPugNNFGlVyLDumSteFbo0rtQXs1
+4dIDEeaxFY/KNUx8xv30cgvDpe2Zhdo8YvvpI1BCd6X0CbLjoI68KlBu9uwH3yBf
+DMb8Brqu2zlQN1LWsTU5dDqa0Po0Su6DHfb0KGkykCgOHgPL6X8WsT/MGUDn6Aan
+p43g6Raaostzkq0VXFBMmxjjxKyRrCMK+DOcmcxQeAQc53933j4e245TpEQG64/A
+qkZx2iTBrt0+D1b0uOpyt/AFdStPVbaiAsru5AKms9n4lD5m1qLTsBlYQBFlzVVQ
+M0dHhwkE3rGjIGhWObrKQ30jNNRJ7LWTc4LAahasuK0NRgQPCLdgJpuxZmTKHCMb
+WdQGgZeVKZbb0QLWw+qBSvLzvA/HOqk9F+89dlG++r2k7GAY235JYlAiu8C1nHwl
+ELshKgeZt0aJREYHs1yh
+=GDt5
 -----END PGP SIGNATURE-----
diff --git a/net-irc/atheme-services/atheme-services-6.0.8.ebuild b/net-irc/atheme-services/atheme-services-6.0.8.ebuild
index 12e6c43c8077..b4e0956373e4 100644
--- a/net-irc/atheme-services/atheme-services-6.0.8.ebuild
+++ b/net-irc/atheme-services/atheme-services-6.0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-6.0.8.ebuild,v 1.2 2011/06/12 03:21:12 binki Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/atheme-services/atheme-services-6.0.8.ebuild,v 1.3 2011/06/14 03:07:58 binki Exp $
 
 EAPI=4
 
@@ -32,7 +32,7 @@ pkg_setup() {
 		# bug #371119
 		ewarn "USE=\"profile\" is incompatible with the hardened profile's -pie flag."
 		ewarn "Disabling PIE. Please ignore any warning messages about -nopie being invalid."
-		append-ldflags -nopie
+		append-flags -nopie
 	fi
 
 	enewgroup ${PN}
@@ -40,6 +40,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-configure-disable.patch
+
 	# fix docdir
 	sed -i -e 's/\(^DOCDIR.*=.\)@DOCDIR@/\1@docdir@/' extra.mk.in || die
 
diff --git a/net-irc/atheme-services/files/atheme-services-6.0.8-configure-disable.patch b/net-irc/atheme-services/files/atheme-services-6.0.8-configure-disable.patch
new file mode 100644
index 000000000000..ac671956ee48
--- /dev/null
+++ b/net-irc/atheme-services/files/atheme-services-6.0.8-configure-disable.patch
@@ -0,0 +1,116 @@
+From be144253c54b41d9b2f3929f12025457f66ce288 Mon Sep 17 00:00:00 2001
+From: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+Date: Mon, 13 Jun 2011 22:25:47 -0400
+Subject: [PATCH] Fix remaining AC_ARG_ENABLEs so that --disable-<feature> does not produce the same effect as --enable-<feature>.
+
+Fixes --disable-warnings, --disable-propolice, and --disable-profile. (Problems with --disable-profile resulted in https://bugs.gentoo.org/371119).
+---
+ configure    |   21 +++++++++++++++++----
+ configure.ac |   18 ++++++++++++------
+ 2 files changed, 29 insertions(+), 10 deletions(-)
+
+diff --git a/configure b/configure
+index a3337e0..9bd0428 100755
+--- a/configure
++++ b/configure
+@@ -8360,7 +8360,11 @@ $as_echo "no" >&6; }
+ 
+ # Check whether --enable-warnings was given.
+ if test "${enable_warnings+set}" = set; then :
+-  enableval=$enable_warnings;
++  enableval=$enable_warnings; enable_warnings=no
++fi
++
++if test "x$enable_warnings" = "xyes"; then :
++
+ 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCC flag(s) -Wall" >&5
+ $as_echo_n "checking GCC flag(s) -Wall... " >&6; }
+@@ -9335,10 +9339,15 @@ $as_echo "no" >&6; }
+ 
+ fi
+ 
+-
+ # Check whether --enable-propolice was given.
+ if test "${enable_propolice+set}" = set; then :
+   enableval=$enable_propolice;
++else
++  enable_propolice=no
++fi
++
++if test "x$enable_propolice" = "xyes"; then :
++
+ 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCC flag(s) -fno-stack-protector-all" >&5
+ $as_echo_n "checking GCC flag(s) -fno-stack-protector-all... " >&6; }
+@@ -9546,10 +9555,15 @@ $as_echo "no" >&6; }
+ 
+ fi
+ 
+-
+ # Check whether --enable-profile was given.
+ if test "${enable_profile+set}" = set; then :
+   enableval=$enable_profile;
++else
++  enable_profile=no
++fi
++
++if test "x$enable_profile" = "xyes"; then :
++
+ 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCC flag(s) -pg" >&5
+ $as_echo_n "checking GCC flag(s) -pg... " >&6; }
+@@ -9606,7 +9620,6 @@ LDFLAGS=${ac_save_LDFLAGS}
+ 
+ fi
+ 
+-
+ ac_save_CPPFLAGS="${CFLAGS} ${orig_CFLAGS} ${CWARNS} -DPREFIX=\\\"\${prefix}\\\" -DLOCALEDIR=\\\"\${LOCALEDIR}\\\" -DMODDIR=\\\"\${MODDIR}\\\" -DSHAREDIR=\\\"${SHAREDIR}\\\" -DSYSCONFDIR=\\\"${sysconfdir}\\\" -DLOGDIR=\\\"${LOGDIR}\\\" -DRUNDIR=\\\"${RUNDIR}\\\" -DDATADIR=\\\"${DATADIR}\\\""
+ CPPFLAGS=${ac_save_CPPFLAGS}
+ 
+diff --git a/configure.ac b/configure.ac
+index a8baa2e..36195ce 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -484,8 +484,10 @@ AC_SUBST(PICFLAGS)
+ ATHEME_C_GCC_TRY_FLAGS([-std=gnu99], atheme_cv_c_gcc_std_gnu99)
+ ATHEME_C_GCC_TRY_FLAGS([-Werror-implicit-function-declaration], atheme_cv_c_gcc_w_error_implicit_function_declaration)
+ 
+-AC_ARG_ENABLE(warnings,
+-AC_HELP_STRING([--enable-warnings],[ Enable compiler warnings]),
++AC_ARG_ENABLE([warnings],
++	[AS_HELP_STRING([--enable-warnings],[ Enable compiler warnings])],
++	[enable_warnings=no])
++AS_IF([test "x$enable_warnings" = "xyes"],
+ [
+ dnl See what warnings we can get away with
+ ATHEME_C_GCC_TRY_FLAGS([-Wall], atheme_cv_c_gcc_w_all)
+@@ -519,8 +521,10 @@ dnl ATHEME_C_GCC_TRY_FLAGS([-Wwrite-strings], atheme_cv_c_gcc_w_strings)
+ dnl ATHEME_C_GCC_TRY_FLAGS([-Werror], atheme_cv_c_gcc_w_error)
+ ])
+ 
+-AC_ARG_ENABLE(propolice,
+-AC_HELP_STRING([--disable-propolice],[ Disable propolice protections (for debugging.)]),
++AC_ARG_ENABLE([propolice],
++	[AS_HELP_STRING([--disable-propolice],[ Disable propolice protections (for debugging.)])],
++	[], [enable_propolice=no])
++AS_IF([test "x$enable_propolice" = "xyes"],
+ [
+ ATHEME_C_GCC_TRY_FLAGS([-fno-stack-protector-all], atheme_cv_nspa)
+ ATHEME_C_GCC_TRY_FLAGS([-fno-pie], atheme_cv_npie)
+@@ -528,8 +532,10 @@ ATHEME_C_GCC_TRY_FLAGS([-nonow], atheme_cv_nonow)
+ ATHEME_C_GCC_TRY_FLAGS([-norelro], atheme_cv_no_relro)
+ ])
+ 
+-AC_ARG_ENABLE(profile,
+-AC_HELP_STRING([--enable-profile],[ Enable profiling extensions]),
++AC_ARG_ENABLE([profile],
++	[AS_HELP_STRING([--enable-profile],[ Enable profiling extensions])],
++	[], [enable_profile=no])
++AS_IF([test "x$enable_profile" = "xyes"],
+ [
+ ATHEME_C_GCC_TRY_FLAGS([-pg], atheme_cv_pg)
+ ac_save_LDFLAGS="${LDFLAGS} -pg"
+-- 
+1.7.3.4
+