py-xattr: updated to 0.9.6

Version 0.9.6:
* Fix release build by including *.[ch] in Manifest.in

Version 0.9.4:
* Extract inline C code for syntax highlighting and easier maintenance
* Fix Travis build
* Always include sys/types.h (musl compatibility)

Version 0.9.3:
* Do not attempt to use surrogateescape unless it is available

Version 0.9.2:
* Fix BSD issue w/ lsattr and long attrs
* Remove unreachable code

Version 0.9.1:
* Allow (Python 2) long for fd
* Fix Python 3 bytes handling in xattr.tool
* Use cffi 1.X features to build native module for faster import
  https://github.com/xattr/xattr/pull/47
* NOTE: Version 0.9.0 is the same, was momentarily uploaded with
  incomplete CHANGES.txt

Version 0.8.0:
* Use os.fsencode where available to better handle filesystem quirks related
  to surrogates
* Options bugfix and compatibility module for pyxattr API

Version 0.7.9:
* Added xattr/tests/*.py to MANIFEST.in

Version 0.7.8:
* Added MANIFEST.in to ensure that the .txt files are included

Version 0.7.7:
* Fixed FreeBSD build

4 files changed, 26 insertions, 44 deletions

diff --git a/sysutils/py-xattr/Makefile b/sysutils/py-xattr/Makefile
index b8ba18899eb..c0ad308e890 100644
--- a/sysutils/py-xattr/Makefile
+++ b/sysutils/py-xattr/Makefile
@@ -1,33 +1,21 @@
-# $NetBSD: Makefile,v 1.15 2019/04/26 13:14:15 maya Exp $
+# $NetBSD: Makefile,v 1.16 2019/08/04 11:24:52 adam Exp $
 
-DISTNAME=	v0.7.6
-PROPERNAME=	${DISTNAME:S/v/xattr-/}
-PKGNAME=	${PYPKGPREFIX}-${PROPERNAME}
-CATEGORIES=	sysutils
-MASTER_SITES=	https://github.com/xattr/xattr/archive/
+DISTNAME=	xattr-0.9.6
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+CATEGORIES=	sysutils python
+MASTER_SITES=	${MASTER_SITE_PYPI:=x/xattr/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	https://github.com/xattr/xattr/
+HOMEPAGE=	https://github.com/xattr/xattr
 COMMENT=	Python wrapper for extended filesystem attributes
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-cffi>=0.8.1:../../devel/py-cffi
+DEPENDS+=	${PYPKGPREFIX}-cffi>=1.0.0:../../devel/py-cffi
 DEPENDS+=	${PYPKGPREFIX}-cparser-[0-9]*:../../devel/py-cparser
 
-DIST_SUBDIR=	xattr
-
-WRKSRC=		${WRKDIR}/${PROPERNAME}
-EGG_NAME=	${PROPERNAME}
-USE_LANGUAGES=	c
-REPLACE_PYTHON=	xattr/tool.py
-
-# XXX: builds, installs, but cannot be executed
-PYTHON_VERSIONS_INCOMPATIBLE=	 36 37
-
 post-install:
-	${MV} ${DESTDIR}${PREFIX}/bin/xattr \
-		${DESTDIR}${PREFIX}/bin/xattr-${PYVERSSUFFIX} || ${TRUE}
+	cd ${DESTDIR}${PREFIX}/bin && \
+	${MV} xattr xattr-${PYVERSSUFFIX} || ${TRUE}
 
-.include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/py-xattr/PLIST b/sysutils/py-xattr/PLIST
index 6a60228ad11..7e63a42d1cd 100644
--- a/sysutils/py-xattr/PLIST
+++ b/sysutils/py-xattr/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/05/27 06:35:19 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/08/04 11:24:52 adam Exp $
 bin/xattr-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -10,10 +10,20 @@ ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/xattr/__init__.py
 ${PYSITELIB}/xattr/__init__.pyc
 ${PYSITELIB}/xattr/__init__.pyo
+${PLIST.py2x}${PYSITELIB}/xattr/_lib.so
+${PLIST.py3x}${PYSITELIB}/xattr/_lib.abi3.so
+${PYSITELIB}/xattr/compat.py
+${PYSITELIB}/xattr/compat.pyc
+${PYSITELIB}/xattr/compat.pyo
 ${PYSITELIB}/xattr/lib.py
 ${PYSITELIB}/xattr/lib.pyc
 ${PYSITELIB}/xattr/lib.pyo
+${PYSITELIB}/xattr/lib_build.py
+${PYSITELIB}/xattr/lib_build.pyc
+${PYSITELIB}/xattr/lib_build.pyo
+${PYSITELIB}/xattr/pyxattr_compat.py
+${PYSITELIB}/xattr/pyxattr_compat.pyc
+${PYSITELIB}/xattr/pyxattr_compat.pyo
 ${PYSITELIB}/xattr/tool.py
 ${PYSITELIB}/xattr/tool.pyc
 ${PYSITELIB}/xattr/tool.pyo
-${PYSITELIB}/xattr/xattr.so
diff --git a/sysutils/py-xattr/distinfo b/sysutils/py-xattr/distinfo
index a1b8b7d480a..5018cd3a34f 100644
--- a/sysutils/py-xattr/distinfo
+++ b/sysutils/py-xattr/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 01:32:28 agc Exp $
+$NetBSD: distinfo,v 1.5 2019/08/04 11:24:52 adam Exp $
 
-SHA1 (xattr/v0.7.6.tar.gz) = f250cf1b5711391bef112be538a54f207143ed38
-RMD160 (xattr/v0.7.6.tar.gz) = 340fa56fb6ad474eee328fdd68c4e158b1f01c76
-SHA512 (xattr/v0.7.6.tar.gz) = 1d96f6f9301f5d2825e59282b92d7ba2e25ee23a28d003bdc9ddf504e9ee4597da3f64bad8456ce8fe237e706f572171209633d3ab206be887423cb6cee3d21a
-Size (xattr/v0.7.6.tar.gz) = 10123 bytes
-SHA1 (patch-xattr_lib.py) = 1b83f0ab0e8820e8a76c5ad00ed1b71d95803cf6
+SHA1 (xattr-0.9.6.tar.gz) = 2b02755354879aafbf46dfd6860edb80f0948b90
+RMD160 (xattr-0.9.6.tar.gz) = 53b0bcd0dd7ec35f5495c5d9a57245e22c45de31
+SHA512 (xattr-0.9.6.tar.gz) = e62239341453ca69e7c05da1676b53d42c96a354f6ba8c58cfeb58a584dfe4c3a4e33a0d1ae0c1e9e398a03979fc0bc2099e1272956cb58ead784ac4e61ca2ea
+Size (xattr-0.9.6.tar.gz) = 13284 bytes
diff --git a/sysutils/py-xattr/patches/patch-xattr_lib.py b/sysutils/py-xattr/patches/patch-xattr_lib.py
deleted file mode 100644
index 1dcc3010a25..00000000000
--- a/sysutils/py-xattr/patches/patch-xattr_lib.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-xattr_lib.py,v 1.1 2014/03/21 14:06:01 wiz Exp $
-
-Set modulename so cffi doesn't have to invent them.
-
---- xattr/lib.py.orig	2013-07-22 20:10:15.000000000 +0000
-+++ xattr/lib.py
-@@ -589,7 +589,7 @@ static ssize_t xattr_flistxattr(int fd, 
- #ifndef XATTR_NOSECURITY
- #define XATTR_NOSECURITY 0x0008
- #endif
--""", ext_package='xattr')
-+""", ext_package='xattr', modulename='xattr')
- 
- XATTR_NOFOLLOW = lib.XATTR_NOFOLLOW
- XATTR_CREATE = lib.XATTR_CREATE