gentoo resync : 05.04.2018

6 files changed, 142 insertions, 1 deletions

diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index b7487f6b1fa3..56f370c9a868 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/grass/Manifest b/sci-geosciences/grass/Manifest
index 943c0287b8c3..03beb457a92f 100644
--- a/sci-geosciences/grass/Manifest
+++ b/sci-geosciences/grass/Manifest
@@ -1,4 +1,7 @@
 AUX grass-7.0.1-declare-inespg.patch 647 BLAKE2B ec303cc88965ff24d9521a3d2fdec3cd62f14bb9830a37942aa3373acc5351b07022f782c8f22f560bbf1f794fd46fa524b7ddab07a360c3e6f34cf3c1258972 SHA512 9206619090c0f138c734f7fe48467cd343cd01120ac4d7eaec3d822b7cac1cbc6e4630bfedd68e7bdd6966716116a1d6714faf373a1eceb08726acd16ca34bb4
+AUX grass-7.2.0-gcc7.patch 8766 BLAKE2B f380b60ae11f11193920f87bd5f3dd83b39e5341ca3eff18d5cf822b132093e79565cb10b2d78aedbacdda97746a52ccd9f270781d77fcb953cdd6496f2f0033 SHA512 5ad83335e4d37529f874fc447ab4f4afef37dff603a4102958fdf8bf4c9294579fd8cf9a0028a7cd429c5c335109e54c888f2a3fdb1a83ad965e1a02d773b75b
+AUX grass-7.2.0-glibc-2.26-1.patch 329 BLAKE2B 4168b4ea26f3cbf608b8eb106f77b762ad7d28a8a9f69e5a24dbd6247014a70a2c027445b2e6e4c23d22ca412078012440648c80977058190f5f4ac3413db743 SHA512 90a44add13556e3780ec394db2f7fcbdae88904be4a72248bcc177545a6b6400683a91ab3088b87cd45c6a1507a41e701b99f8a224e8872f3dc2b685421daa93
+AUX grass-7.2.0-glibc-2.26-2.patch 1238 BLAKE2B 93dca4f61321f7d721171a0eb079d805c31d28a8e83942380f826f8f04a9ad23a4c22e00198a62df971091521008a994ef8a9f7fd0dd3cd1a25317882cc7364d SHA512 a199c029b1dcc4362dae1fd2bfbc82e6fb7245e001095ad149fa76d8a0bf20f72e5869ff8ef48f14cd6a2ba2546e7b73d030aeb096bb565562b249e511eaa5fd
 DIST grass-7.2.0.tar.gz 48315008 BLAKE2B 927da2119e199cee7cbf55a172141abfe9ce86499e307b355fec2cdf79ec3424acddc4410e3049e7cade5dd3da39e618af7e1003093f87de5735a981984b46c6 SHA512 b1aa17ec554c2f0473df3726993b0891df4589c60ca9362405932a4c479b5883245b0a0ba9e787ce2e9de210b6307f34883e4e63ddfbf04eb5d75e8583bc2c5b
-EBUILD grass-7.2.0-r1.ebuild 6815 BLAKE2B f5912f8199957ec7a354165dcdd9e1ec341d70fe9b5e2e2cbf9cf3e43d4922822e8f026072af7ced84b7f19439fb351a45831e35d440e0e55cf304685d3d6c36 SHA512 6bca59ac73cd06e90a0f3b97e37426ba6f0c15f72df3e3fd321dd86e3d8e60a7ac5129dc0ed3da1c9f707df8e6b1fba97b8ca2c36cf389153248c114a2ecb0f3
+EBUILD grass-7.2.0-r1.ebuild 6889 BLAKE2B e2faac30ea4bfa21d7b8650146c9c5f339b21e4592e977f529e37216ae3599c41f13d4f48ef4a1ed9e5c079148cb93a781a369c12426668ea22becf025c90628 SHA512 39e2f2f170b402b96aea4537d9b2a46196aff5089a0f00e3e65dc8e8b2c7fb9856b0f31b2bb777b9446ed83fd56f9975e9415b34cf0a0b228fa60ed398cf5fe9
 MISC metadata.xml 916 BLAKE2B 1b87536bd014b5572a4cf678336d0de43daa0a2d56f2bdb4db5c777c09c8efa644d974fe649f0fe758f088a1ea10a4d4308dad670172e5f7366aeaf9653146d1 SHA512 fdaae85dd85171b0e5b316a7edd7d09e78eb5fe267e760dfe9722dd469f6594b909fba85b082722463abf5a564a34aaeec9eefd5a53859814089cd02af742e2a
diff --git a/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch b/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch
new file mode 100644
index 000000000000..97be4d7d8606
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-7.2.0-gcc7.patch
@@ -0,0 +1,94 @@
+Index: releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/lextab.py
+===================================================================
+--- a/lib/python/ctypes/ctypesgencore/parser/lextab.py	(revision 71218)
++++ b/lib/python/ctypes/ctypesgencore/parser/lextab.py	(revision 71219)
+@@ -1,59 +1,8 @@
+ # lextab.py. This file automatically created by PLY (version 2.2). Don't edit!
+-_lextokens = {
+-    'RIGHT_OP': None,
+-    'RIGHT_ASSIGN': None,
+-    'DEC_OP': None,
+-    'PP_MACRO_PARAM': None,
+-    'DIV_ASSIGN': None,
+-    'PP_DEFINE': None,
+-    'PP_END_DEFINE': None,
+-    'PP_DEFINE_MACRO_NAME': None,
+-    'HEADER_NAME': None,
+-    'NEWLINE': None,
+-    'CHARACTER_CONSTANT': None,
+-    'PP_STRINGIFY': None,
+-    'AND_ASSIGN': None,
+-    'PTR_OP': None,
+-    'ELLIPSIS': None,
+-    'IDENTIFIER': None,
+-    'ADD_ASSIGN': None,
+-    'PERIOD': None,
+-    'AND_OP': None,
+-    'OTHER': None,
+-    'LPAREN': None,
+-    'LEFT_OP': None,
+-    'LE_OP': None,
+-    'OR_OP': None,
+-    'SUB_ASSIGN': None,
+-    'MOD_ASSIGN': None,
+-    'STRING_LITERAL': None,
+-    'PP_IDENTIFIER_PASTE': None,
+-    'PP_NUMBER': None,
+-    'PP_DEFINE_NAME': None,
+-    'XOR_ASSIGN': None,
+-    'OR_ASSIGN': None,
+-    'GE_OP': None,
+-    'MUL_ASSIGN': None,
+-    'LEFT_ASSIGN': None,
+-    'INC_OP': None,
+-    'NE_OP': None,
+-    'EQ_OP': None}
+-_lexreflags = 0
+-_lexliterals = ''
++_lextokens    = {'RIGHT_OP': None, 'RIGHT_ASSIGN': None, 'DEC_OP': None, 'PP_MACRO_PARAM': None, 'DIV_ASSIGN': None, 'PP_DEFINE': None, 'PP_END_DEFINE': None, 'PP_DEFINE_MACRO_NAME': None, 'HEADER_NAME': None, 'NEWLINE': None, 'CHARACTER_CONSTANT': None, 'PP_STRINGIFY': None, 'AND_ASSIGN': None, 'PTR_OP': None, 'ELLIPSIS': None, 'IDENTIFIER': None, 'ADD_ASSIGN': None, 'PERIOD': None, 'AND_OP': None, 'OTHER': None, 'LPAREN': None, 'LEFT_OP': None, 'LE_OP': None, 'OR_OP': None, 'SUB_ASSIGN': None, 'MOD_ASSIGN': None, 'STRING_LITERAL': None, 'PP_IDENTIFIER_PASTE': None, 'PP_NUMBER': None, 'PP_DEFINE_NAME': None, 'XOR_ASSIGN': None, 'OR_ASSIGN': None, 'GE_OP': None, 'MUL_ASSIGN': None, 'LEFT_ASSIGN': None, 'INC_OP': None, 'NE_OP': None, 'EQ_OP': None}
++_lexreflags   = 0
++_lexliterals  = ''
+ _lexstateinfo = {'INITIAL': 'inclusive', 'DEFINE': 'exclusive'}
+-_lexstatere = {
+-    'INITIAL': [
+-        ('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [
+-            None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_INITIAL_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [
+-                None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>[FflL]?)(?!\\w))', [
+-                    None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [
+-                        None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_INITIAL_newline>\\n)|(?P<t_INITIAL_pp_define>\\#define)', [
+-                            None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [
+-                                ('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|\\*=|\\^=|<<=|>>=|\\|=|\\+=|>=|>>|<<|<=|<:|%=|:>|<%|!=|\\)|\\+|\\*|\\.|\\?|==|&=|&&|\\[|\\^|--|/=|%>|-=|->|\\||!|%|&|-|,|/|;|:|=|>|]|<|{|}|~))', [
+-                                    None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_DEFINE_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [
+-                                        None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>[FflL]?)(?!\\w))', [
+-                                            None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [
+-                                                None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_DEFINE_newline>\\n)|(?P<t_DEFINE_pp_param_op>(\\#\\#)|(\\#))', [
+-                                                    None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]}
++_lexstatere   = {'INITIAL': [('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_INITIAL_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_INITIAL_identifier', 'INITIAL_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_INITIAL_newline>\\n)|(?P<t_INITIAL_pp_define>\\#define)', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_INITIAL_newline', 'INITIAL_newline'), ('t_INITIAL_pp_define', 'INITIAL_pp_define')])], 'DEFINE': [('(?P<t_ANY_directive>\\#\\s+(\\d+)\\s+"([^"]+)"[ \\d]*\\n)|(?P<t_ANY_punctuator>(\\.\\.\\.|\\|\\||\\+\\+|>>=|\\|=|\\^=|<<=|\\*=|\\+=|>=|>>|%=|:>|%>|!=|\\*|\\.|==|\\^|--|-=|->|\\||<<|<=|<:|<%|\\)|\\+|\\?|&=|&&|\\[|/=|&|,|:|<|>|~|!|%|-|/|;|=|]|{|}))', [None, ('t_ANY_directive', 'ANY_directive'), None, None, ('t_ANY_punctuator', 'ANY_punctuator')]), ('(?P<t_DEFINE_identifier>[a-zA-Z_]([a-zA-Z_]|[0-9])*)', [None, ('t_DEFINE_identifier', 'DEFINE_identifier')]), ('(?P<t_ANY_float>(?P<p1>[0-9]+)?(?P<dp>[.]?)(?P<p2>(?(p1)[0-9]*|[0-9]+))(?P<exp>(?:[Ee][+-]?[0-9]+)?)(?P<suf>([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)?)(?!\\w))', [None, ('t_ANY_float', 'ANY_float'), None, None, None, None, None]), ('(?P<t_ANY_int>(?P<p1>(?:0x[a-fA-F0-9]+)|(?:[0-9]+))(?P<suf>[uUlL]*))', [None, ('t_ANY_int', 'ANY_int'), None, None]), ('(?P<t_ANY_character_constant>L?\'(\\\\.|[^\\\\\'])+\')|(?P<t_ANY_string_literal>L?"(\\\\.|[^\\\\"])*")|(?P<t_ANY_lparen>\\()|(?P<t_DEFINE_newline>\\n)|(?P<t_DEFINE_pp_param_op>(\\#\\#)|(\\#))', [None, ('t_ANY_character_constant', 'ANY_character_constant'), None, ('t_ANY_string_literal', 'ANY_string_literal'), None, ('t_ANY_lparen', 'ANY_lparen'), ('t_DEFINE_newline', 'DEFINE_newline'), ('t_DEFINE_pp_param_op', 'DEFINE_pp_param_op')])]}
+ _lexstateignore = {'INITIAL': ' \t\x0b\x0c\r', 'DEFINE': ' \t\x0b\x0c\r'}
+ _lexstateerrorf = {'INITIAL': 't_INITIAL_error', 'DEFINE': 't_DEFINE_error'}
+Index: releasebranch_7_2/lib/python/ctypes/ctypesgencore/parser/pplexer.py
+===================================================================
+--- a/lib/python/ctypes/ctypesgencore/parser/pplexer.py	(revision 71218)
++++ b/lib/python/ctypes/ctypesgencore/parser/pplexer.py	(revision 71219)
+@@ -52,7 +52,7 @@
+     'L': '[a-zA-Z_]',
+     'H': '[a-fA-F0-9]',
+     'E': '[Ee][+-]?\s*{D}+',
+-    'FS': '[FflL]',
++    'FS': '([FfLl]|d[dfl]|D[DFL]|[fFdD][0-9]+x?)',
+     'IS': '[uUlL]*',
+ }
+ # Helper: substitute {foo} with subs[foo] in string (makes regexes more lexy)
+@@ -226,10 +226,10 @@
+     exp = m.group("exp")
+     suf = m.group("suf")
+ 
+-    if dp or exp or (suf and suf in ("Ff")):
++    if dp or exp or (suf and suf not in ("Ll")):
+         s = m.group(0)
+         if suf:
+-            s = s[:-1]
++            s = s[:-len(suf)]
+         # Attach a prefix so the parser can figure out if should become an
+         # integer, float, or long
+         t.value = "f" + s
diff --git a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch
new file mode 100644
index 000000000000..115ff06febc3
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-1.patch
@@ -0,0 +1,10 @@
+Index: /grass/trunk/lib/raster/R.h
+===================================================================
+--- /grass/trunk/lib/raster/R.h	(revision 71264)
++++ /grass/trunk/lib/raster/R.h	(revision 71265)
+@@ -1,5 +1,4 @@
+ #include <grass/config.h>
+ #include <grass/gis.h>
+-#include <rpc/types.h>
+ #ifdef HAVE_GDAL
+ #include <gdal.h>
diff --git a/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch
new file mode 100644
index 000000000000..c1361f6af088
--- /dev/null
+++ b/sci-geosciences/grass/files/grass-7.2.0-glibc-2.26-2.patch
@@ -0,0 +1,32 @@
+Index: /grass/branches/releasebranch_7_2/lib/raster/get_row.c

+===================================================================

+--- /grass/branches/releasebranch_7_2/lib/raster/get_row.c	(revision 71943)

++++ /grass/branches/releasebranch_7_2/lib/raster/get_row.c	(revision 71944)

+@@ -15,6 +15,4 @@

+ #include <unistd.h>

+ #include <sys/types.h>

+-

+-#include <rpc/types.h>		/* need this for sgi */

+ 

+ #include <grass/config.h>

+Index: /grass/branches/releasebranch_7_2/lib/raster/open.c

+===================================================================

+--- /grass/branches/releasebranch_7_2/lib/raster/open.c	(revision 71943)

++++ /grass/branches/releasebranch_7_2/lib/raster/open.c	(revision 71944)

+@@ -13,6 +13,4 @@

+  */

+ 

+-#include <rpc/types.h>

+-#include <rpc/xdr.h>

+ #include <unistd.h>

+ #include <string.h>

+Index: /grass/branches/releasebranch_7_2/lib/raster/range.c

+===================================================================

+--- /grass/branches/releasebranch_7_2/lib/raster/range.c	(revision 71943)

++++ /grass/branches/releasebranch_7_2/lib/raster/range.c	(revision 71944)

+@@ -13,5 +13,4 @@

+ 

+ #include <unistd.h>

+-#include <rpc/types.h>		/* need this for sgi */

+ 

+ #include <grass/raster.h>

diff --git a/sci-geosciences/grass/grass-7.2.0-r1.ebuild b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
index be625fa853d0..233823e1fa49 100644
--- a/sci-geosciences/grass/grass-7.2.0-r1.ebuild
+++ b/sci-geosciences/grass/grass-7.2.0-r1.ebuild
@@ -78,6 +78,8 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}/${PN}"-7.0.1-declare-inespg.patch
+	"${FILESDIR}/${P}"-gcc7.patch
+	"${FILESDIR}/${P}"-glibc-2.26-{1,2}.patch
 )
 
 pkg_setup() {