1 |
commit: 34000ab9464b568e90a18894a7a752af73918bbf |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 29 09:22:42 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 29 10:43:59 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34000ab9 |
7 |
|
8 |
dev-python/pyparsing: Version Bump |
9 |
|
10 |
Package-Manager: portage-2.2.23 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
dev-python/pyparsing/Manifest | 1 + |
14 |
.../pyparsing/files/pyparsing-2.0.4-print.patch | 51 ++++++++++++++++++++++ |
15 |
dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild | 2 +- |
16 |
dev-python/pyparsing/pyparsing-2.0.3.ebuild | 2 +- |
17 |
...parsing-2.0.3.ebuild => pyparsing-2.0.4.ebuild} | 9 ++-- |
18 |
5 files changed, 60 insertions(+), 5 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest |
21 |
index 263c210..59fbf3f 100644 |
22 |
--- a/dev-python/pyparsing/Manifest |
23 |
+++ b/dev-python/pyparsing/Manifest |
24 |
@@ -1,2 +1,3 @@ |
25 |
DIST pyparsing-1.5.6.tar.gz 1418892 SHA256 5c84aa4500e82d5aa2c0842d5628c5da985e68ac1fb33554e0e5547eb3c85a75 SHA512 614c1a016d121b7c4ecf90a164bbe323affd6cf72319c8494e9a583078ffa233c351627fc3e793307e407e043570f8301f112c4d86645dcd130220ed976289c8 WHIRLPOOL 278d37581a950a570ac3cca2a5f8b674c909220fddc47072d9d52c38b8dfc30b335530dffd3c522cd18e58e9bddcc5e48d9184cdaf4b09203bbba308607e24a4 |
26 |
DIST pyparsing-2.0.3.tar.gz 1462653 SHA256 06e729e1cbf5274703b1f47b6135ed8335999d547f9d8cf048b210fb8ebf844f SHA512 9771851f4b0191c7d3f8d2a2a6d2a9198b173120d3f133d08284b71e792fc59a906d571edea8f44ba04ab00c1d906e1974d1e8a2d6155d492de1358ba99c575a WHIRLPOOL 42b9c7aa0b8d4d91436a01a60cbca64a9c8f7798b7aeb60bd2c4af085f9e13167a5ac5132d55bd890b4890c00428e908dfae32ed78ec153c868ee02ed3cdaa3f |
27 |
+DIST pyparsing-2.0.4.tar.gz 1140009 SHA256 c43c9f1395975bf2b032c20e6b149d6b698cdabf9291079bcaf0131709e95f59 SHA512 021d3610ead6b864b1e0227b6cad2393aae0c1f38a44c09dd7ac33d05be30cb4c75176a33ebd8c44e87ed9d54b58aaf27fab7ac8f3cdcb3ce4418b5b0d586b01 WHIRLPOOL 0fa3fe631c5c6fc79fb13f029fe8a32bd9651fd663e915c5be394225bcb1ea1f199d3edc2294e7a4b0732590e7a0cc3053effca9aa20155ca69d4c3908019e6d |
28 |
|
29 |
diff --git a/dev-python/pyparsing/files/pyparsing-2.0.4-print.patch b/dev-python/pyparsing/files/pyparsing-2.0.4-print.patch |
30 |
new file mode 100644 |
31 |
index 0000000..6262a18 |
32 |
--- /dev/null |
33 |
+++ b/dev-python/pyparsing/files/pyparsing-2.0.4-print.patch |
34 |
@@ -0,0 +1,51 @@ |
35 |
+ pyparsing.py | 20 +++++++++++--------- |
36 |
+ 1 file changed, 11 insertions(+), 9 deletions(-) |
37 |
+ |
38 |
+diff --git a/pyparsing.py b/pyparsing.py |
39 |
+index 81c82ce..55c72a3 100644 |
40 |
+--- a/pyparsing.py |
41 |
++++ b/pyparsing.py |
42 |
+@@ -22,6 +22,8 @@ |
43 |
+ # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
44 |
+ # |
45 |
+ |
46 |
++from __future__ import print_function |
47 |
++ |
48 |
+ __doc__ = \ |
49 |
+ """ |
50 |
+ pyparsing module - Classes and methods to define and execute parsing grammars |
51 |
+@@ -1554,19 +1556,19 @@ class ParserElement(object): |
52 |
+ run a parse expression against a list of sample strings. |
53 |
+ """ |
54 |
+ for t in tests: |
55 |
+- print t |
56 |
++ print(t) |
57 |
+ try: |
58 |
+- print self.parseString(t).dump() |
59 |
++ print(self.parseString(t).dump()) |
60 |
+ except ParseException as pe: |
61 |
+ if '\n' in t: |
62 |
+- print line(pe.loc, t) |
63 |
+- print ' '*(col(pe.loc,t)-1) + '^' |
64 |
++ print(line(pe.loc, t)) |
65 |
++ print(' '*(col(pe.loc,t)-1) + '^') |
66 |
+ else: |
67 |
+- print ' '*pe.loc + '^' |
68 |
+- print pe |
69 |
+- print |
70 |
++ print(' '*pe.loc + '^') |
71 |
++ print(pe) |
72 |
++ print() |
73 |
++ |
74 |
+ |
75 |
+- |
76 |
+ class Token(ParserElement): |
77 |
+ """Abstract C{ParserElement} subclass, for defining atomic matching patterns.""" |
78 |
+ def __init__( self ): |
79 |
+@@ -3803,4 +3805,4 @@ if __name__ == "__main__": |
80 |
+ """ |
81 |
+ CHANGES |
82 |
+ UnitTests.py |
83 |
+-""" |
84 |
+\ No newline at end of file |
85 |
++""" |
86 |
|
87 |
diff --git a/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild b/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild |
88 |
index e10ba49..be56c49 100644 |
89 |
--- a/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild |
90 |
+++ b/dev-python/pyparsing/pyparsing-1.5.6-r2.ebuild |
91 |
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_3} ) |
92 |
|
93 |
inherit distutils-r1 |
94 |
|
95 |
-DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing" |
96 |
+DESCRIPTION="Easy-to-use Python module for text parsing" |
97 |
HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing" |
98 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
99 |
|
100 |
|
101 |
diff --git a/dev-python/pyparsing/pyparsing-2.0.3.ebuild b/dev-python/pyparsing/pyparsing-2.0.3.ebuild |
102 |
index a2390d4..9603007 100644 |
103 |
--- a/dev-python/pyparsing/pyparsing-2.0.3.ebuild |
104 |
+++ b/dev-python/pyparsing/pyparsing-2.0.3.ebuild |
105 |
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) |
106 |
|
107 |
inherit distutils-r1 |
108 |
|
109 |
-DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing" |
110 |
+DESCRIPTION="Easy-to-use Python module for text parsing" |
111 |
HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing" |
112 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
113 |
|
114 |
|
115 |
diff --git a/dev-python/pyparsing/pyparsing-2.0.3.ebuild b/dev-python/pyparsing/pyparsing-2.0.4.ebuild |
116 |
similarity index 62% |
117 |
copy from dev-python/pyparsing/pyparsing-2.0.3.ebuild |
118 |
copy to dev-python/pyparsing/pyparsing-2.0.4.ebuild |
119 |
index a2390d4..c2a2abb 100644 |
120 |
--- a/dev-python/pyparsing/pyparsing-2.0.3.ebuild |
121 |
+++ b/dev-python/pyparsing/pyparsing-2.0.4.ebuild |
122 |
@@ -8,20 +8,23 @@ PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) |
123 |
|
124 |
inherit distutils-r1 |
125 |
|
126 |
-DESCRIPTION="pyparsing is an easy-to-use Python module for text parsing" |
127 |
+DESCRIPTION="Easy-to-use Python module for text parsing" |
128 |
HOMEPAGE="http://pyparsing.wikispaces.com/ https://pypi.python.org/pypi/pyparsing" |
129 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
130 |
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
131 |
|
132 |
LICENSE="MIT" |
133 |
SLOT="0" |
134 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
135 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
136 |
IUSE="doc examples" |
137 |
|
138 |
RDEPEND="!dev-python/pyparsing:py2 !dev-python/pyparsing:py3" |
139 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" |
140 |
|
141 |
# no contained in the tarball |
142 |
RESTRICT=test |
143 |
|
144 |
+PATCHES=( "${FILESDIR}"/${P}-print.patch ) |
145 |
+ |
146 |
python_install_all() { |
147 |
local HTML_DOCS=( HowToUsePyparsing.html ) |
148 |
if use doc; then |