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

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 83 insertions, 27 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/Manifest b/media-gfx/pydot/Manifest
index d4019244ec61..6543af9fba72 100644
--- a/media-gfx/pydot/Manifest
+++ b/media-gfx/pydot/Manifest
@@ -2,29 +2,33 @@
 Hash: SHA512
 
 AUX pydot-1.0.23-setup.patch 623 SHA256 47704452635aeae4db252ae2f71eaa386efb0a863b0ad173597d081031c7e29d SHA512 74202787584f9ed4f9aac5038d200fe7c64d0da906226f11e29897a30f371a200787a585d1d151a8ac2191f160d3cd3029ea6f4f4e388e04e7e80d443227dd61 WHIRLPOOL 5334f3b9e40a6e7fb818b4ac63a076a7b1e575dd34ae0b5c9faf4d1043b303ba7eb4c16c414fb4ef256df7f606c69a35e8176c9fbc205c758014e2ea27d16ecd
+AUX pydot-1.0.28-pyparsing2fix.patch 836 SHA256 dc6a43bf9e34b27d92aa0f565f9ea7d96e77463c090ee8b9105d6d1fed53e0d9 SHA512 c50f6a21609acd177cdc954d5adc967d4cb99177467df4c76cad379050968f86375f61d1a17d0377c9dfe4f23ec1b1647cf85d9c3fd1d6c409387d15de81eeb0 WHIRLPOOL 4e5fd3b3b46f7a22a7d0e1461fd13c3703b9f1f003ffe26260283987b4011f01a789f4526b1769bceefc186a95797333bed91eb3195781cd00472a33da4b38e5
 DIST pydot-1.0.23.tar.gz 19033 SHA256 7366bf9f8fc8854b3a1f63ceba36b06553b9606c30eb76edb67a2ba56f85c497 SHA512 38c3b44236eb9e855c94149efd27849251e74ccd75e56c2695d31221351770a77c528a5f9e96c6eb44dbf8342d10eaae46be90969a9fec9a355ef3a05d776c7c WHIRLPOOL 84f24a1991fb0ec958ed90cbee77e1bf3606bffb4c8a465fe1bc6078939076cb8297bd6043b8a7e934288a1ae68c6c21cd5620451f55527d94de4aca4069b5e1
 DIST pydot-1.0.25.tar.gz 19438 SHA256 7e2f279a5aea24368dcddb88aa3a1d17a263f049a9af75fc2e7ebd6254aa72bf SHA512 50246e5edc132cf49734634ce6381acc492a12124b08b4bae5654b5823b89ad9c5170d6d79ac51b311986e133a3687336c539fddec2493ad54b07e906b1cf1c9 WHIRLPOOL b4fadf7d0d3f2ceeaa135ed4ccf809540a7799fb1cb42c2f89e1a93180ec9895b74e5ec76fcd9a94c740c606a33a37bed102439fc63816b48282eb09ba339b0e
 DIST pydot-1.0.28.tar.gz 19711 SHA256 1eeaff7b104fb8f305a98318dafde0b2d15f1efcdf8b16206465551cd46ed9df SHA512 54b4d7bfb01bbcae9a4832d1c3321d4f453a93f062ee55b35e3d59bee3f8989f4a544afb56c3d16b22bca8e6ef24b6286ac2688c9045b16906ef625999b35055 WHIRLPOOL eb06c22418638351def215e8127af1b3afbd193484dec9a3114e4377f8afcccb25cb7f40e9f29121d086723ddb94dd2fd9ac473f3583a9b782940cce9e208318
 EBUILD pydot-1.0.23.ebuild 868 SHA256 7e277fcfae26f636d1c8aaf99c38ae63263c21ae9378f692ad2fdd9bfc267275 SHA512 99bd2166ce5c4e1094a00a6e01077343f30d779cdb71f0cded86d435fda7f96c79fa4d9539c4428051de3d9e2d06b7a44939abbf53ba2db07cb8d373871d0f87 WHIRLPOOL 9449e0981ca02c6a05082978b9ef44c3ee9f3976cf5ec8a756cbcf8104652c7da6b9993898665f2951d3eae8833b11aa987ca0f659a7d1640a36696cffcf2bd8
 EBUILD pydot-1.0.25.ebuild 901 SHA256 e27f9d5b3a77e4493f66780d325f625894d58eacd4d37a0f5f802d63bd7418b3 SHA512 b05bbacb0a147d5ae92eb8bb44f8eefdee478a0a56fc34ab22118db324a7a4b30eea40af56e789a27b2655f181caf8139b054e8fcd412575a0e800804ba3b3b1 WHIRLPOOL aa56e4bc26475f89574e4cb404ddd4a15bd1ef24a29bb9b73c279f829f85dcfd05f98a906ad7df80706e4b508497c931bbb13b2c364a9d4ccba98088fe35ea9d
-EBUILD pydot-1.0.28-r1.ebuild 855 SHA256 dbd7e36f55ff81afdfb05b1c2bd133f10d231d961e2aecf8a002bb4d22d52a08 SHA512 1275aa26c9429358a0f594c3e50796e2e90eddeeb396e5040fd761ba57a2c996703bbe8af36aa702fd487d7aa740c724a45715507c3e6689e02b983aedf1fff2 WHIRLPOOL 1eb3741d00d3b9ae4a5a3c880b117c93aeb4c067fab0b5e877b3c518d05e667c7f7719634841a458fca66584af21a5eb4926ebf7636db453a19713675e7f3412
+EBUILD pydot-1.0.28-r1.ebuild 858 SHA256 b6a28e82175b6471d2291ab367bf45c526ae62406c90d8fcb749410cc1e0a2e9 SHA512 064cf8667a22342f436f398b01ead87169d5319baedc02fd6f1fe48deb5440fce6ea7af8517adb9c2aa2feb70f31dbfa6688db8f98cfd95b727b63ab98bf66d7 WHIRLPOOL f9bb26d4c8c5bf830d21dbcb6423d31592dd28dd58ad199bcb4b531c8766643061740cbc43a7cc57d9b8df1d561931492e48fdc69b613bdcefec5ae686af927e
+EBUILD pydot-1.0.28-r2.ebuild 906 SHA256 dd329e6a6ac0ded9cabc4e30402362fba6ed6d1a2cecfaa561f7a7497aa803a5 SHA512 fe182c8bfa5741b6ac8a5c6f2d62015e92b0a3afd49006e205b1cbd3ca24eb07e30bab2f71d23b987024ee618e2d6740617c3b481f72bc3a4639df8dd52fb86c WHIRLPOOL ebc6eb9b19c68246d834de5630d491b10450b99018deda8d53d111023c4ae3682ab33f27f2f0266f13828ebbdab21ee7550f62795368076d0a872889757ec0c3
 EBUILD pydot-1.0.28.ebuild 936 SHA256 ff29bc7c3ae8db87399718d7d027deb58b42f9a0f2460609fb16c3f90bba3d88 SHA512 1c7f050855b796c018af8954a4859654ae08020866609f0a7ba41444ad9d4eba9d86554b655d8b3d1ca229b6749b139dac29b277e99cb9bc9324e07149e523f3 WHIRLPOOL a59ddd8a6de7de956df41c9259b13cccf6500305df0f3dfb7521eed604302feb8c3123fc841b731e192cc0c2ef2c89f944da27a43ca3de471a16a5c3ea10ce84
-MISC ChangeLog 8552 SHA256 adbdceeaab3964143c4ddaba7ac7e2b574af2c39f9048482122f05bd258499a2 SHA512 bf02a25a2f1aba6df16540c6a9546d008a7e43cf0f45ad9b8e9ffe706052beb8b40474e3d11f13d0a82b18ac1d9e056b808a7306e6d18e1fa82bd12a480d828f WHIRLPOOL ff45e252af4b3c1262d12f4eea2631b069d5045243ce2d0428682eaed1bf9d5da8047b3f8a697688bac06506f33590373deae7f279d79f2c6a3240d8e807140e
-MISC metadata.xml 300 SHA256 e4acb0226db599070dccf61852f8add0beeca98fab32b47726dd0a40810fcd9d SHA512 41460209108faa2b676b620c8f36da86bda860ca890f385ed0858bc42e602c8c13a0996644308cd845bd0d8c4fa681f4e36c2232f3779f5203fe19fc3b54aef8 WHIRLPOOL 11b6e5aff3b1ac997d3fd00283afb486d12a1091ea65c09b0dd89e30783f14e1aaae7d6cade79ff7a19840929dd64a436bbba284322a590e66ba68d9d1c727f2
+MISC ChangeLog 8829 SHA256 d9d69eade39ffc87ad824ddf82da58348242d090d5d5192e51a745a6df5d980f SHA512 b5e09eea1fa9c8a2c115a09e579167eb9dc44ce58354c41b181fd8b6035b10f39914c5fec585c88e816f0dedcf2c538cd91133b7c5491b6d391e2dc358e9b6e9 WHIRLPOOL 8a0a77b958e696229cb5c19fed4424ef1faa93c1583e04cd5ee4d1fb84cc29fb1fe5509501424d32977ea8c28dab2c54008a9d3e9d15df0263b1862994379a1c
+MISC metadata.xml 306 SHA256 e3c577b01f0db5a894b0f8f2e9d9912eb83132a77102e418640f5bd5df143714 SHA512 d0f3356fcb50c3edaa43ad0e7baf91790a0bec2975eb41f27479db2ae5db67459821a7bae9f2da817781828904669cf5198e747f96095e00ffbdc723844051a1 WHIRLPOOL 425e31b85f092a2a4723752b2ed9224937c6ed04c167f706793e278c1e472402d32e4da0181f18dd1366ddfd243607d06917019bd5d72d8604a2bbeeed7791be
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSRG60AAoJELp701BxlEWfdqIP/3905qZkmsAu9VAm6xOKqTLb
-k0BJTrXQaGaL2DKOBo69+lqPOYF0YmjVW5ZPIPav/i655HSYiznGYY9ZStUydpLb
-VNXpTofZpcRjDA+umBy9HeSt32PtlSxqfO+crXmFVdznsEXeqVOaJNo71whFzAuO
-8oE2ZBVC1ou/9KBQja5c/Xmxo93WMcnDfneRvmrXNx2+d5ci/qe08Gf2bASj+EiA
-BLcdb7cfk9+hMfjqo7ro5dgJZ1qaWPGlJMJ/2OayaNp1ZqcJtiJ75rBLr2GfWTMy
-ncfolDXJkXIUj15G9255SVrdGeYj0rIcaVseZ+GBt49ev/PpjA7zpg+8A3CjdB+x
-bDfnevRf3mzMkGeSH1+ApNqRxYr3Gea7N2uwkG7sA2BG8Xs7erhDMUH5C2H0fVQv
-UDIGhDSMExSU2dNpI/IDihGJV3xZ9gVzJOwDf64cv/dzRaZ4tiA6X/82Km9G+VDa
-S7++rcPm4gsRBTU3N9JEB6BQTDh9qPxpw2DRxm+HzI6RRyBO7laEGk2Cpfizw+gw
-CkVMwJAgV1vVaOlAVjKhkzcU2kfQyv1IgQ+DY4WVXRIq/+bKMB85jImO8q7UUwD9
-DcLi5TS74QariJgS9G7yfRB+bmPoz3opmXiAdsQ+DGgcFya74hb/4mKD2Pe1DiTe
-7hScSK23AWkSTaKieZjM
-=by05
+iQJ8BAEBCgBmBQJTGdYoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViro3gQAJBl0CR/dH9Hrby0HkU3RYmj
+6tUGCwHLwz/QnMkSmz25FU+ZnfdDlUEnElxvw9r8I0UaGvoC8MYg0Lun0CveS0Ki
+xGnUsJGdKEBu1yQjE0XnV3DrE+JH/exvcoFkzpZHw4CZHjlmEPufaeBnYQ8h3+wF
+mjskvb/f4gl1L/lXaF8WkfOkHzREmxkffKanFPz3TDPcVTswsDxpIyYTI8dfOcz0
+HHvXBqtCNF/7koBVK3XN0FBTqs0zVc+0aTU2jzScHnZuu1aKtZL1oVDJreLj0ojD
+WmU95Wp3iW+nVHc1BRvgiSBi2ytoYdHGBA1oqLd4zr++QyUtA2TCCnVXJDdJsAco
+ugQlTNqXdNknOwyYUy+9RtIIgoG4dnzxtJ2/3TV4uXPPDL5QiNfZ/w7R2QXogffb
+DPBpYDbvDxfwU700832/Kc5v7A42Rs/dCg8g1+MlgDJFsJfG+NdJN7ZJN6WH2PCa
+Xo0jeYus3cxDlDbmnaN0WR0z4AF8ac51E1B0EuUqO8GQBMIyYJZp19QaOFMQeaXW
+j6xtrfZdWfM/MOeHSR/OJbhIsM6tQcog0u2vs7rEoNM8OpCNUiT1lrT8/d9Etm3n
+46bIbeDjAAQ/430+xYx0A907+DbvIcjJL25MvwjA7N8226E6F/vTC5gzvyuYmohZ
+ANrm//tGJmBe1z/2NYGy
+=enMc
 -----END PGP SIGNATURE-----
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
+)