Update devel/py-pyparsing to 2.0.6.

pkgsrc changes:
- convert to egg.mk (no functional changes intended)
- use MASTER_SITE_PYPI
- update HOMEPAGE (sf.net project page seems not available ATM while the
  distfiles are fetchable from sf.net)
- minor cosmetic fixes

Changes:
Version 2.0.6 -
---------------------------
- Fixed a bug in Each when multiple Optional elements are present.
  Thanks for reporting this, whereswalden on SO.
- Fixed another bug in Each, when Optional elements have results names
  or parse actions, reported by Max Rothman - thank you, Max!
- Added optional parseAll argument to runTests, whether tests should
  require the entire input string to be parsed or not (similar to
  parseAll argument to parseString). Plus a little neaten-up of the
  output on Python 2 (no stray ()'s).
- Modified exception messages from MatchFirst and Or expressions. These
  were formerly misleading as they would only give the first or longest
  exception mismatch error message. Now the error message includes all
  the alternatives that were possible matches. Originally proposed by
  a pyparsing user, but I've lost the email thread - finally figured out
  a fairly clean way to do this.
- Fixed a bug in Or, when a parse action on an alternative raises an
  exception, other potentially matching alternatives were not always tried.
  Reported by TheVeryOmni on the pyparsing wiki, thanks!
- Fixed a bug to dump() introduced in 2.0.4, where list values were shown
  in duplicate.

Version 2.0.5 -
---------------------------
- (&$(@#&$(@!!!!  Some "print" statements snuck into pyparsing v2.0.4,
  breaking Python 3 compatibility! Fixed. Reported by jenshn, thanks!

Version 2.0.4 -
---------------------------
- Added ParserElement.addCondition, to simplify adding parse actions
  that act primarily as filters. If the given condition evaluates False,
  pyparsing will raise a ParseException. The condition should be a method
  with the same method signature as a parse action, but should return a
  boolean. Suggested by Victor Porton, nice idea Victor, thanks!
- Slight mod to srange to accept unicode literals for the input string,
  such as "[а-яА-Я]" instead of "[\u0430-\u044f\u0410-\u042f]". Thanks
  to Alexandr Suchkov for the patch!
- Enhanced implementation of replaceWith.
- Fixed enhanced ParseResults.dump() method when the results consists
  only of an unnamed array of sub-structure results. Reported by Robin
  Siebler, thanks for your patience and persistence, Robin!
- Fixed bug in fourFn.py example code, where pi and e were defined using
  CaselessLiteral instead of CaselessKeyword. This was not a problem until
  adding a new function 'exp', and the leading 'e' of 'exp' was accidentally
  parsed as the mathematical constant 'e'. Nice catch, Tom Grydeland - thanks!
- Adopt new-fangled Python features, like decorators and ternary expressions,
  per suggestions from Williamzjc - thanks William! (Oh yeah, I'm not
  supporting Python 2.3 with this code any more...) Plus, some additional
  code fixes/cleanup - thanks again!
- Added ParserElement.runTests, a little test bench for quickly running
  an expression against a list of sample input strings. Basically, I got
  tired of writing the same test code over and over, and finally added it
  as a test point method on ParserElement.
- Added withClass helper method, a simplified version of withAttribute for
  the common but annoying case when defining a filter on a div's class -
  made difficult because 'class' is a Python reserved word.

Version 2.0.3 -
---------------------------
- Fixed escaping behavior in QuotedString. Formerly, only quotation
  marks (or characters designated as quotation marks in the QuotedString
  constructor) would be escaped. Now all escaped characters will be
  escaped, and the escaping backslashes will be removed.
- Fixed regression in ParseResults.pop() - pop() was pretty much
  broken after I added *improvements* in 2.0.2. Reported by Iain
  Shelvington, thanks Iain!
- Fixed bug in And class when initializing using a generator.
- Enhanced ParseResults.dump() method to list out nested ParseResults that
  are unnamed arrays of sub-structures.
- Fixed UnboundLocalError under Python 3.4 in oneOf method, reported
  on Sourceforge by aldanor, thanks!
- Fixed bug in ParseResults __init__ method, when returning non-ParseResults
  types from parse actions that implement __eq__. Raised during discussion
  on the pyparsing wiki with cyrfer.

3 files changed, 20 insertions, 17 deletions

diff --git a/devel/py-pyparsing/Makefile b/devel/py-pyparsing/Makefile
index 2486dd086b3..89be37dfbf8 100644
--- a/devel/py-pyparsing/Makefile
+++ b/devel/py-pyparsing/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.3 2014/06/02 00:07:40 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2015/12/30 14:57:02 leot Exp $
 
-DISTNAME=		pyparsing-2.0.2
-PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=		devel python
+DISTNAME=	pyparsing-2.0.6
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pyparsing/pyparsing/${DISTNAME}/}
-MASTER_SITES+=	https://pypi.python.org/packages/source/p/pyparsing/
+MASTER_SITES+=	${MASTER_SITE_PYPI}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://sourceforge.net/projects/pyparsing
-COMMENT=		Pyparsing module for Python
-LICENSE=      	mit
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://pyparsing.wikispaces.com/
+COMMENT=	Pyparsing module for Python
+LICENSE=	mit
 
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-pyparsing/PLIST b/devel/py-pyparsing/PLIST
index 14a48d8f2af..9ef1442a879 100644
--- a/devel/py-pyparsing/PLIST
+++ b/devel/py-pyparsing/PLIST
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2014/02/06 01:58:20 obache Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.3 2015/12/30 14:57:02 leot Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/pyparsing.py
 ${PYSITELIB}/pyparsing.pyc
 ${PYSITELIB}/pyparsing.pyo
diff --git a/devel/py-pyparsing/distinfo b/devel/py-pyparsing/distinfo
index 92f450e62ca..2c189066adb 100644
--- a/devel/py-pyparsing/distinfo
+++ b/devel/py-pyparsing/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 03:29:15 agc Exp $
+$NetBSD: distinfo,v 1.4 2015/12/30 14:57:02 leot Exp $
 
-SHA1 (pyparsing-2.0.2.tar.gz) = 882b9ad439c600b0412ec0f1c806a5f3b9d4f4c7
-RMD160 (pyparsing-2.0.2.tar.gz) = e9e90763bba4f85c6f967b2495165cf0a83d76a1
-SHA512 (pyparsing-2.0.2.tar.gz) = 453348c82aaee0565896194711b960de591a0e6651434c596e6cc18fbc85e9a96965d341455d25097c8f1b8cf87781f3374fc4f066496adbdc9dd94450ceffcc
-Size (pyparsing-2.0.2.tar.gz) = 1136568 bytes
+SHA1 (pyparsing-2.0.6.tar.gz) = c76dbe8a1ee9cd944af4f3fb918626f7fd7d0170
+RMD160 (pyparsing-2.0.6.tar.gz) = 8539fcf7bd821e94218df381cd7a21b28a03e4e9
+SHA512 (pyparsing-2.0.6.tar.gz) = 3722198efc98f6ffc124fa012f6ef23ec840ccc2280922dcb35b05c1e78cdc40f1057be0f364732d20fb0dd25897776a15625ceadee14f6800d67b6d180b42f1
+Size (pyparsing-2.0.6.tar.gz) = 1140849 bytes