Import of pkgsrc-2016Q3

print/py-poppler/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2015/07/15 15:09:39 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2016/08/03 10:23:20 adam Exp $
 
 DISTNAME=	pypoppler-0.12.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-PKGREVISION=	9
+PKGREVISION=	16
 CATEGORIES=	print
 MASTER_SITES=	https://launchpad.net/poppler-python/trunk/development/+download/
 
@@ -16,7 +16,7 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 PY_PATCHPLIST=	yes
 PYTHON_VERSIONED_DEPENDENCIES=	cairo:link
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-gtk2
+PYTHON_VERSIONS_INCOMPATIBLE=	34 35 # py-gtk2
 
 .include "../../lang/python/extension.mk"
 .include "../../devel/atk/buildlink3.mk"

print/py-poppler/distinfo

@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2013/10/09 09:48:22 wiz Exp $
+$NetBSD: distinfo,v 1.4 2016/03/29 21:19:56 khorben Exp $
 
 SHA1 (pypoppler-0.12.1.tar.gz) = a8a92039911a7c4bbd995a46f88a1877bf88ab5c
 RMD160 (pypoppler-0.12.1.tar.gz) = d6c196d6bbbaa9ef96c2ea3a38eb6a89308bab15
+SHA512 (pypoppler-0.12.1.tar.gz) = 04055411adc19f6af499a7cba0d6c5abb51e0802dd28962f833da3da1caf6ff274ff67d082f9c47548dac7a4ceb1bccf9860cda71fe48b8b7df74c0132498d20
 Size (pypoppler-0.12.1.tar.gz) = 318142 bytes
-SHA1 (patch-poppler.defs) = a52e250392dfd5dda66d532a7fafb1f4577e66c3
+SHA1 (patch-poppler.defs) = efe0c9f5e182f0ae81ef3a82d8afb0fe12f9c267

print/py-poppler/patches/patch-poppler.defs

@@ -1,13 +1,35 @@
-$NetBSD: patch-poppler.defs,v 1.2 2013/10/09 09:48:22 wiz Exp $
+$NetBSD: patch-poppler.defs,v 1.3 2016/03/29 21:19:56 khorben Exp $
 
 Removed functions in poppler-0.16.
 
 API change in poppler-0.15, see
 http://cgit.freedesktop.org/poppler/poppler/commit/?id=b257428150e2c13dcc24fd8f75e4ee2c679ab414
 
+Add fixes for poppler-0.39.0, see
+https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fbcb03b918df48f33d24326640209de3d031074
+
 --- poppler.defs.orig	2009-09-27 09:07:59.000000000 +0000
 +++ poppler.defs
-@@ -1646,58 +1646,6 @@
+@@ -578,18 +578,6 @@
+   )
+ )
+ 
+-(define-enum Orientation
+-  (in-module "Poppler")
+-  (c-name "PopplerOrientation")
+-  (gtype-id "POPPLER_TYPE_ORIENTATION")
+-  (values
+-    '("portrait" "POPPLER_ORIENTATION_PORTRAIT")
+-    '("landscape" "POPPLER_ORIENTATION_LANDSCAPE")
+-    '("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN")
+-    '("seascape" "POPPLER_ORIENTATION_SEASCAPE")
+-  )
+-)
+-
+ (define-enum PageTransitionType
+   (in-module "Poppler")
+   (c-name "PopplerPageTransitionType")
+@@ -1646,58 +1634,6 @@
    (return-type "GType")
  )
  
@@ -66,7 +88,7 @@ http://cgit.freedesktop.org/poppler/poppler/commit/?id=b257428150e2c13dcc24fd8f7
  (define-method render
    (of-object "PopplerPage")
    (c-name "poppler_page_render")
-@@ -1796,6 +1744,12 @@
+@@ -1796,6 +1732,12 @@
    (of-object "PopplerPage")
    (c-name "poppler_page_get_text")
    (return-type "char*")