Adapt PLIST for python-3.x.

Mark as not ready for python-3.x though.
Set PY_PEP3147=no since the infrastructure doesn't support it.
Use versioned_dependencies.mk for cairo.

2 files changed, 42 insertions, 36 deletions

diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 95372f89699..30ef206fa74 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.48 2013/09/02 19:50:59 adam Exp $
-#
+# $NetBSD: Makefile,v 1.49 2014/01/25 08:51:49 wiz Exp $
 
 PKGNAME=		${PYPKGPREFIX}-gobject-2.28.6
 PKGREVISION=		11
 
+# only noticeable by running codegen.py
+PYTHON_VERSIONS_INCOMPATIBLE=	33 # not yet ported as of 2.28.6
+
 .include "Makefile.common"
 
 SUBST_CLASSES+=		codegen
@@ -26,13 +28,17 @@ REPLACE_PYTHON+=	codegen/scanvirtuals.py
 REPLACE_PYTHON+=	codegen/scmexpr.py
 REPLACE_PYTHON+=	docs/xsl/fixxref.py.in
 
+PYTHON_VERSIONED_DEPENDENCIES=	cairo
+
+PY_PEP3147=	no
+
 BUILDLINK_API_DEPENDS.py-gobject-shared+= py-gobject-shared>=${PKGVERSION_NOREV}
 
 CONFIGURE_ARGS+=	--disable-introspection
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.mk"
-.include "../../graphics/py-cairo/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../devel/py-gobject-shared/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-gobject/PLIST b/devel/py-gobject/PLIST
index 1ea4796b1df..343215b8ba0 100644
--- a/devel/py-gobject/PLIST
+++ b/devel/py-gobject/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2012/07/04 18:31:10 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.16 2014/01/25 08:51:49 wiz Exp $
 bin/pygobject-codegen-2.0
 include/pygtk-2.0/pyglib.h
 lib/libpyglib-2.0-python${PYVERSSUFFIX}.la
@@ -25,8 +25,8 @@ ${PYSITELIB}/gtk-2.0/dsextras.pyo
 ${PYSITELIB}/gtk-2.0/gio/__init__.py
 ${PYSITELIB}/gtk-2.0/gio/__init__.pyc
 ${PYSITELIB}/gtk-2.0/gio/__init__.pyo
-${PYSITELIB}/gtk-2.0/gio/_gio.la
-${PYSITELIB}/gtk-2.0/gio/unix.la
+${PLIST.py2x}${PYSITELIB}/gtk-2.0/gio/_gio.la
+${PLIST.py2x}${PYSITELIB}/gtk-2.0/gio/unix.la
 ${PYSITELIB}/pygtk.pth
 ${PYSITELIB}/pygtk.py
 ${PYSITELIB}/pygtk.pyc
@@ -122,36 +122,36 @@ share/pygobject/2.0/codegen/reversewrapper.pyc
 share/pygobject/2.0/codegen/reversewrapper.pyo
 share/pygobject/2.0/codegen/scanvirtuals.py
 share/pygobject/2.0/codegen/scmexpr.py
-share/pygobject/2.0/defs/gappinfo.override
-share/pygobject/2.0/defs/gapplaunchcontext.override
-share/pygobject/2.0/defs/gbufferedinputstream.override
-share/pygobject/2.0/defs/gcancellable.override
-share/pygobject/2.0/defs/gdatainputstream.override
-share/pygobject/2.0/defs/gdrive.override
-share/pygobject/2.0/defs/gfile.override
-share/pygobject/2.0/defs/gfileattribute.override
-share/pygobject/2.0/defs/gfileenumerator.override
-share/pygobject/2.0/defs/gfileinfo.override
-share/pygobject/2.0/defs/gfileinputstream.override
-share/pygobject/2.0/defs/gfileiostream.override
-share/pygobject/2.0/defs/gfileoutputstream.override
-share/pygobject/2.0/defs/gicon.override
-share/pygobject/2.0/defs/ginputstream.override
-share/pygobject/2.0/defs/gio-types.defs
-share/pygobject/2.0/defs/gio.defs
-share/pygobject/2.0/defs/gio.override
-share/pygobject/2.0/defs/giostream.override
-share/pygobject/2.0/defs/gmemoryinputstream.override
-share/pygobject/2.0/defs/gmemoryoutputstream.override
-share/pygobject/2.0/defs/gmount.override
-share/pygobject/2.0/defs/goutputstream.override
-share/pygobject/2.0/defs/gresolver.override
-share/pygobject/2.0/defs/gsocket.override
-share/pygobject/2.0/defs/gvolume.override
-share/pygobject/2.0/defs/gvolumemonitor.override
-share/pygobject/2.0/defs/unix-types.defs
-share/pygobject/2.0/defs/unix.defs
-share/pygobject/2.0/defs/unix.override
+${PLIST.py2x}share/pygobject/2.0/defs/gappinfo.override
+${PLIST.py2x}share/pygobject/2.0/defs/gapplaunchcontext.override
+${PLIST.py2x}share/pygobject/2.0/defs/gbufferedinputstream.override
+${PLIST.py2x}share/pygobject/2.0/defs/gcancellable.override
+${PLIST.py2x}share/pygobject/2.0/defs/gdatainputstream.override
+${PLIST.py2x}share/pygobject/2.0/defs/gdrive.override
+${PLIST.py2x}share/pygobject/2.0/defs/gfile.override
+${PLIST.py2x}share/pygobject/2.0/defs/gfileattribute.override
+${PLIST.py2x}share/pygobject/2.0/defs/gfileenumerator.override
+${PLIST.py2x}share/pygobject/2.0/defs/gfileinfo.override
+${PLIST.py2x}share/pygobject/2.0/defs/gfileinputstream.override
+${PLIST.py2x}share/pygobject/2.0/defs/gfileiostream.override
+${PLIST.py2x}share/pygobject/2.0/defs/gfileoutputstream.override
+${PLIST.py2x}share/pygobject/2.0/defs/gicon.override
+${PLIST.py2x}share/pygobject/2.0/defs/ginputstream.override
+${PLIST.py2x}share/pygobject/2.0/defs/gio-types.defs
+${PLIST.py2x}share/pygobject/2.0/defs/gio.defs
+${PLIST.py2x}share/pygobject/2.0/defs/gio.override
+${PLIST.py2x}share/pygobject/2.0/defs/giostream.override
+${PLIST.py2x}share/pygobject/2.0/defs/gmemoryinputstream.override
+${PLIST.py2x}share/pygobject/2.0/defs/gmemoryoutputstream.override
+${PLIST.py2x}share/pygobject/2.0/defs/gmount.override
+${PLIST.py2x}share/pygobject/2.0/defs/goutputstream.override
+${PLIST.py2x}share/pygobject/2.0/defs/gresolver.override
+${PLIST.py2x}share/pygobject/2.0/defs/gsocket.override
+${PLIST.py2x}share/pygobject/2.0/defs/gvolume.override
+${PLIST.py2x}share/pygobject/2.0/defs/gvolumemonitor.override
+${PLIST.py2x}share/pygobject/2.0/defs/unix-types.defs
+${PLIST.py2x}share/pygobject/2.0/defs/unix.defs
+${PLIST.py2x}share/pygobject/2.0/defs/unix.override
 share/pygobject/xsl/common.xsl
 share/pygobject/xsl/devhelp.xsl
 share/pygobject/xsl/fixxref.py