media-gfx/pydot: Get patch from Fedora to fix compatibility with dev-python/pyparsing-2.0.1, #490426

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 62 insertions, 10 deletions

diff --git a/media-gfx/pydot/ChangeLog b/media-gfx/pydot/ChangeLog
index 0c34b001e314..41d08e2d7feb 100644
--- a/media-gfx/pydot/ChangeLog
+++ b/media-gfx/pydot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/pydot
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pydot/ChangeLog,v 1.72 2013/09/26 17:31:50 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pydot/ChangeLog,v 1.73 2014/03/07 14:22:31 jlec Exp $
+
+*pydot-1.0.28-r2 (07 Mar 2014)
+
+  07 Mar 2014; Justin Lecher <jlec@gentoo.org> pydot-1.0.28-r1.ebuild,
+  +pydot-1.0.28-r2.ebuild, +files/pydot-1.0.28-pyparsing2fix.patch,
+  metadata.xml:
+  Get patch from Fedora to fix compatibility with dev-python/pyparsing-2.0.1,
+  #490426
 
   26 Sep 2013; Agostino Sarubbo <ago@gentoo.org> pydot-1.0.28-r1.ebuild:
   Stable for arm, wrt bug #484724
diff --git a/media-gfx/pydot/files/pydot-1.0.28-pyparsing2fix.patch b/media-gfx/pydot/files/pydot-1.0.28-pyparsing2fix.patch
new file mode 100644
index 000000000000..12a01091223c
--- /dev/null
+++ b/media-gfx/pydot/files/pydot-1.0.28-pyparsing2fix.patch
@@ -0,0 +1,14 @@
+diff -up pydot-1.0.28/dot_parser.py.pyparsing2fix pydot-1.0.28/dot_parser.py
+--- pydot-1.0.28/dot_parser.py.pyparsing2fix	2013-12-09 08:59:24.660145534 -0500
++++ pydot-1.0.28/dot_parser.py	2013-12-09 09:00:10.021222397 -0500
+@@ -25,8 +25,9 @@ from pyparsing import __version__ as pyp
+ from pyparsing import ( nestedExpr, Literal, CaselessLiteral, Word, Upcase, OneOrMore, ZeroOrMore,
+     Forward, NotAny, delimitedList, oneOf, Group, Optional, Combine, alphas, nums,
+     restOfLine, cStyleComment, nums, alphanums, printables, empty, quotedString,
+-    ParseException, ParseResults, CharsNotIn, _noncomma, dblQuotedString, QuotedString, ParserElement )
++    ParseException, ParseResults, CharsNotIn, dblQuotedString, QuotedString, ParserElement )
+ 
++_noncomma = "".join( [ c for c in printables if c != "," ] )
+ 
+ class P_AttrList:
+ 
diff --git a/media-gfx/pydot/metadata.xml b/media-gfx/pydot/metadata.xml
index 6882e4b48d85..b11b15cd9f32 100644
--- a/media-gfx/pydot/metadata.xml
+++ b/media-gfx/pydot/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
-	<longdescription>Python bindings for Graphviz</longdescription>
-	<upstream>
-		<remote-id type="google-code">pydot</remote-id>
-	</upstream>
+  <herd>python</herd>
+  <longdescription>Python bindings for Graphviz</longdescription>
+  <upstream>
+    <remote-id type="google-code">pydot</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-gfx/pydot/pydot-1.0.28-r1.ebuild b/media-gfx/pydot/pydot-1.0.28-r1.ebuild
index b1f977f77213..dd0ce94e8cb8 100644
--- a/media-gfx/pydot/pydot-1.0.28-r1.ebuild
+++ b/media-gfx/pydot/pydot-1.0.28-r1.ebuild
@@ -1,6 +1,6 @@
-# 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/media-gfx/pydot/pydot-1.0.28-r1.ebuild,v 1.25 2013/09/26 17:31:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pydot/pydot-1.0.28-r1.ebuild,v 1.26 2014/03/07 14:22:31 jlec Exp $
 
 EAPI=5
 
@@ -17,7 +17,8 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
-RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
 	media-gfx/graphviz"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/media-gfx/pydot/pydot-1.0.28-r2.ebuild b/media-gfx/pydot/pydot-1.0.28-r2.ebuild
new file mode 100644
index 000000000000..f0691fc058e0
--- /dev/null
+++ b/media-gfx/pydot/pydot-1.0.28-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pydot/pydot-1.0.28-r2.ebuild,v 1.1 2014/03/07 14:22:31 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to Graphviz's Dot language"
+HOMEPAGE="http://code.google.com/p/pydot/ http://pypi.python.org/pypi/pydot"
+SRC_URI="http://pydot.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	media-gfx/graphviz"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.23-setup.patch
+	"${FILESDIR}"/${P}-pyparsing2fix.patch
+)