Include patch from upstream forums that checks if -std=c++11 is supported or not wrt #484264 by Marc Joliet

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)

3 files changed, 44 insertions, 7 deletions

diff --git a/sys-apps/mount-gtk/ChangeLog b/sys-apps/mount-gtk/ChangeLog
index 9d9241dbd2d6..316f523c108e 100644
--- a/sys-apps/mount-gtk/ChangeLog
+++ b/sys-apps/mount-gtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/mount-gtk
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mount-gtk/ChangeLog,v 1.3 2013/06/04 19:23:35 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mount-gtk/ChangeLog,v 1.4 2014/06/22 10:13:14 ssuominen Exp $
+
+  22 Jun 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/mount-gtk-1.4.2-c++11.patch, mount-gtk-1.4.2.ebuild:
+  Include patch from upstream forums that checks if -std=c++11 is supported or
+  not wrt #484264 by Marc Joliet
 
   04 Jun 2013; Samuli Suominen <ssuominen@gentoo.org> -mount-gtk-1.4.1.ebuild:
   old
diff --git a/sys-apps/mount-gtk/files/mount-gtk-1.4.2-c++11.patch b/sys-apps/mount-gtk/files/mount-gtk-1.4.2-c++11.patch
new file mode 100644
index 000000000000..f2898a0d2ca8
--- /dev/null
+++ b/sys-apps/mount-gtk/files/mount-gtk-1.4.2-c++11.patch
@@ -0,0 +1,31 @@
+http://bugs.gentoo.org/484264
+
+--- configure.ac
++++ configure.ac
+@@ -27,6 +27,7 @@
+ AC_LANG_CPLUSPLUS dnl switch to C++
+ AC_TYPE_SIZE_T
+ AC_CHECK_TYPES(ssize_t)
++AX_CHECK_COMPILE_FLAG([-std=c++11], [CXXFLAGS="$CXXFLAGS -std=c++11"])
+ AC_CHECK_RANGE_FOR_SUPPORT
+ AC_CHECK_LAMBDA_SUPPORT
+ 
+--- m4/ax_check_compile_flag.m4
++++ m4/ax_check_compile_flag.m4
+@@ -0,0 +1,16 @@
++# This macro is part of autoconf-archive with license GPL-3 or any later version
++AC_DEFUN([AX_CHECK_COMPILE_FLAG],
++[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
++AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
++AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
++  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
++  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
++  AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])],
++    [AS_VAR_SET(CACHEVAR,[yes])],
++    [AS_VAR_SET(CACHEVAR,[no])])
++  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
++AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
++  [m4_default([$2], :)],
++  [m4_default([$3], :)])
++AS_VAR_POPDEF([CACHEVAR])dnl
++])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild b/sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild
index 9b7f781aa961..780b971d343d 100644
--- a/sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild
+++ b/sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild,v 1.1 2013/06/04 19:22:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/mount-gtk/mount-gtk-1.4.2.ebuild,v 1.2 2014/06/22 10:13:14 ssuominen Exp $
 
 EAPI=5
-inherit autotools flag-o-matic
+inherit autotools eutils flag-o-matic
 
 DESCRIPTION="GTK+ based UDisks2 frontend"
 HOMEPAGE="http://mount-gtk.sourceforge.net/"
@@ -25,12 +25,13 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS BUGS ChangeLog )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-c++11.patch
 	sed -i -e 's:AC_CONFIG_HEADER:&S:' configure.ac || die
 	eautoreconf
 }
 
 src_configure() {
-	append-cxxflags -fexceptions -frtti -fsigned-char -fno-check-new -pthread -std=c++11
-#	unset CXXFLAGS
+	# acinclude.m4 is broken and environment flags override these:
+	append-cxxflags -fexceptions -frtti -fsigned-char -fno-check-new -pthread
 	econf --docdir=/usr/share/doc/${PF}
 }