diff options
| -rw-r--r-- | dev-python/ply/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/ply/files/3.6-lextab-None.patch | 49 | ||||
| -rw-r--r-- | dev-python/ply/files/3.6-picklefile-IOError.patch | 24 | ||||
| -rw-r--r-- | dev-python/ply/ply-3.6-r1.ebuild (renamed from dev-python/ply/ply-3.6.ebuild) | 6 |
4 files changed, 85 insertions, 2 deletions
diff --git a/dev-python/ply/ChangeLog b/dev-python/ply/ChangeLog index c716796b4732..0a020a3109ec 100644 --- a/dev-python/ply/ChangeLog +++ b/dev-python/ply/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-python/ply # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ChangeLog,v 1.46 2015/05/11 04:32:05 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ChangeLog,v 1.47 2015/05/17 16:28:47 floppym Exp $ + +*ply-3.6-r1 (17 May 2015) + + 17 May 2015; Mike Gilbert <floppym@gentoo.org> +files/3.6-lextab-None.patch, + +files/3.6-picklefile-IOError.patch, +ply-3.6-r1.ebuild, -ply-3.6.ebuild: + Resolve chromium build issues, bug 549328. *ply-3.6 (11 May 2015) diff --git a/dev-python/ply/files/3.6-lextab-None.patch b/dev-python/ply/files/3.6-lextab-None.patch new file mode 100644 index 000000000000..cab0a466d66f --- /dev/null +++ b/dev-python/ply/files/3.6-lextab-None.patch @@ -0,0 +1,49 @@ +From dbf122652d38ba03ff9f9fe4aa9bee3693e6775f Mon Sep 17 00:00:00 2001 +From: David Beazley <dave@dabeaz.com> +Date: Fri, 8 May 2015 10:10:55 -0500 +Subject: [PATCH] Minor fix to account for bad None arguments for + tabmodule/lextab + +--- + ply/lex.py | 4 ++++ + ply/yacc.py | 5 ++++- + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/ply/lex.py b/ply/lex.py +index ed1e2ed..772325c 100644 +--- a/ply/lex.py ++++ b/ply/lex.py +@@ -859,6 +859,10 @@ def validate_module(self, module): + # ----------------------------------------------------------------------------- + def lex(module=None, object=None, debug=False, optimize=False, lextab='lextab', + reflags=0, nowarn=False, outputdir=None, debuglog=None, errorlog=None): ++ ++ if lextab is None: ++ lextab = 'lextab' ++ + global lexer + + ldict = None +diff --git a/ply/yacc.py b/ply/yacc.py +index e0b4faf..eb02cc2 100644 +--- a/ply/yacc.py ++++ b/ply/yacc.py +@@ -2709,7 +2709,7 @@ def write_table(self, tabmodule, outputdir='', signature=''): + _lr_method = %r + + _lr_signature = %r +- ''' % (filename, __tabversion__, self.lr_method, signature)) ++ ''' % (os.path.basename(filename), __tabversion__, self.lr_method, signature)) + + # Change smaller to 0 to go back to original tables + smaller = 1 +@@ -3183,6 +3183,9 @@ def yacc(method='LALR', debug=yaccdebug, module=None, tabmodule=tab_module, star + check_recursion=True, optimize=False, write_tables=True, debugfile=debug_file, + outputdir=None, debuglog=None, errorlog=None, picklefile=None): + ++ if tabmodule is None: ++ tabmodule = tab_module ++ + # Reference to the parsing method of the last built parser + global parse + diff --git a/dev-python/ply/files/3.6-picklefile-IOError.patch b/dev-python/ply/files/3.6-picklefile-IOError.patch new file mode 100644 index 000000000000..85b39494a6fd --- /dev/null +++ b/dev-python/ply/files/3.6-picklefile-IOError.patch @@ -0,0 +1,24 @@ +From f50768b0b2176998675e728d84ac05f0eef19614 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sun, 17 May 2015 12:14:16 -0400 +Subject: [PATCH] Catch/ignore IOError when opening picklefile for reading in + yacc.yacc() + +Should resolve #66. +--- + ply/yacc.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/ply/yacc.py b/ply/yacc.py +index eb02cc2..2835c90 100644 +--- a/ply/yacc.py ++++ b/ply/yacc.py +@@ -3265,6 +3265,8 @@ def yacc(method='LALR', debug=yaccdebug, module=None, tabmodule=tab_module, star + errorlog.warning(str(e)) + except ImportError: + pass ++ except IOError: ++ pass + + if debuglog is None: + if debug: diff --git a/dev-python/ply/ply-3.6.ebuild b/dev-python/ply/ply-3.6-r1.ebuild index afcd07a2bb10..cbd5ca9adb37 100644 --- a/dev-python/ply/ply-3.6.ebuild +++ b/dev-python/ply/ply-3.6-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ply-3.6.ebuild,v 1.1 2015/05/11 04:32:05 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ply-3.6-r1.ebuild,v 1.1 2015/05/17 16:28:47 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy ) @@ -23,6 +23,10 @@ RDEPEND="" RESTRICT="test" DOCS=( ANNOUNCE CHANGES TODO ) +PATCHES=( + "${FILESDIR}/3.6-lextab-None.patch" + "${FILESDIR}/3.6-picklefile-IOError.patch" +) python_test() { cp -r -l test "${BUILD_DIR}"/ || die |