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

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 55 insertions, 17 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/Manifest b/sys-apps/mount-gtk/Manifest
index 5e70a8ebc76f..e71d14000d90 100644
--- a/sys-apps/mount-gtk/Manifest
+++ b/sys-apps/mount-gtk/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX mount-gtk-1.4.2-c++11.patch 1117 SHA256 4497cf667f0459e4e3479b1666ec61fad16b725c00983e7af056cd4886412d71 SHA512 369aea5b8b7b1df836e1970d7eec28708d6c3c833c960c38002a58f4536889fcbbe9f61d7a92907493f3aa04d164526c0fd7ead7a03cb916a2cf318ae027cf2e WHIRLPOOL 831de080f5857a4e5b2bc8fb1d12a948813fb9010c736f1992a30ca968073db7103dcdbe666b092481cefabfe3022a0253313777fde2813efa54aa2b6217cece
 DIST mount-gtk-1.4.2.tar.gz 232132 SHA256 755a4aae98c8c14c909dfc8da2e46f32ce720137edecdb3d8fcdc99fa02dbd03 SHA512 90fa174238d19bf009f5863e5571030091681038ddbfdc06c7a39f8859b78d9864b398899d66463d0f8a189e484201c7a32753b38898e0f5d55970feb85420ba WHIRLPOOL 17ea7baab7df013116e0c302c9fe9810c8a6d941e9de79cf05e3e9826a69fbc0ff49efb8d44d64658c472439019119b47adf7bab51a198616b5abda9708c47ea
-EBUILD mount-gtk-1.4.2.ebuild 895 SHA256 1b1a1a5eac3a19bea67798b2822b75a1f4b3915f6421b76384db6ae34558d30c SHA512 6cec4217cd259d3fbf5bee71471bda69ff3a7d8d4450d5a7946160173f0e1693d10b29cb077f62051dad4bd7ba104d86f03a6d684c2a180d0431e808324f22e5 WHIRLPOOL 9aca9f8e980116f6e92e54048ea130bf8fad93b986df7446ab9139c8dc3a890d9fb2ad63a066e6d8fa045bf9c45af930a3224ad4fcb2a076fcb91821f77c200b
-MISC ChangeLog 610 SHA256 f6a1b7635449c4012e0d800cff62fee8a625a6c2d746e1367af7c0563d7ed73a SHA512 e0c3c7d1a7d4d47e376fe0a235e21f09144f757d6ed42d219c03363da00e620c7bc8fb4c778e90707fac57d098997e74459d217fe42915de1a8b11f165bfae7d WHIRLPOOL 0330ed350028c3eedb75fc1f67aab6c597de11f2bd959ffb3fe2befebf211eae1cc18cb5eb123087817ce396d077cf690382fedf9b81fefb5faa1fefcbbd1a77
+EBUILD mount-gtk-1.4.2.ebuild 977 SHA256 f12a5b0fc988fd8737fd8cd2a84c9c07e641d7c10429767101726cc1d176a956 SHA512 a598a8c746ef0a25e97818f4b78e0d41f7fb2fc69e7d4535caaa25bb758088596a595d27c5162d89f5e9de39fde02c37793ad9e4b3ea970dad82e2eafaa18b71 WHIRLPOOL 44cafb32d630ec804bed8d9835c8d8302f3c56c4d79194b792ccf116e767ab856950394da944243170fc10c178e80e8754bcbd4154ad3c3d015ab2f09020b422
+MISC ChangeLog 839 SHA256 e99b0cf9c3256dbf424252e67629955d3cf27e086c60cde1a4b71f6e82ad5edd SHA512 e9642a5082943baa47dbaa669f6f50c1a0403b89f486c3fe5ba4af46b5c99f37c700733c6f17205c524ae22ac6ef884910728de77c6aed62bc7874ebd275389c WHIRLPOOL e979dd5cfda22dfb4b69af6e288f548e576f26c75ab6662c5d1f3d349f7d63d1fedf9cf8b91fa86b9be54b8bbeb86ea486075028ea489f37b08cbbe50cb79e18
 MISC metadata.xml 264 SHA256 d824a65accf5dbc00189475b321dd057acbe102afd40c1614b7a38cbcf1eb468 SHA512 68bf6f59f63dd9b629fcbf79387d97f0abdf855dfb4fa35eccbfb23afcea373d0c41a4d9f3fd1e3248ba54f6787f767459b58157a71a4cc915aab2e02972263f WHIRLPOOL 2908edbf9cfaba7cc4f1f3254318245c2fa59bdb719adb351c2b8713372efe6e52238faf348798d9a25a4e6f93f1e10588ddac74422d56c4146653a63b944ef7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRrj49AAoJEEdUh39IaPFN2M0H/15enCColXuXQPKfBeaDgRIo
-jbDfc007+wnz6m661DD9bAuFJU3g2IyoKzQzSOSJLueUuROWZYrWtOGbVlcv/CWw
-LAmXeP6NIrb7yv/Ql6MCZ4TJfGV/sBl236rV1jNuiOGmRvddZRTwqrypzCFt2p1l
-xH9zhkZjoidW33E28q2L4srhc1dmRDbnZSUjuaHYxBHyqWAo8R3gf7bORB1KqDz3
-8NJYp8h4ml8hR0hPK5+wPwjnzFVSdMcm+nF2+6lykABPla3mxKf0r3BkWS040dq/
-NnUArxGjBWpE6WEfZx/4JyWjUqbtp9WOjuN2zGgQyiyP8nJ0u/dYLBH9/A+IsZo=
-=/Vrr
+iQEcBAEBCAAGBQJTpqtmAAoJEEdUh39IaPFNRUAIAJUhaVtWzgwxhSenkJzU/TEx
+B0WkdMgTG0Hf6ePYR9CZJu+sCzzygf1T8wz9MSaPtAsujUgZE7mHH25MehCcDtON
+WxmGV0OMtQ7PJoYvMQnPCWjfBLoyLWe/SLfgNPNg9QmeXttFKIhfJ8W9S2EZ1w0o
+5G43CaeewrSELe4J9YdJ5Vb33UTfvlkZRPSHyBbsV2mz3vF10L3Y49lnMg+oRayV
+sA5nOStH5p8dlShqU9yCwFt0X2R72mJMMpMZtY3a+vqloRt3RefTCCfkbJlPt/l4
+kk53bRf076Gwcq7bMuRFrhf/5WRX4qloQc5LC9GbvGP9ANVMq+7j2XjwYgi80Hw=
+=DZhQ
 -----END PGP SIGNATURE-----
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}
 }