*: depend on py-cairo now it supports all python versions

17 files changed, 41 insertions, 51 deletions

diff --git a/audio/playitslowly/Makefile b/audio/playitslowly/Makefile
index d7047a9f252..ed15f255e88 100644
--- a/audio/playitslowly/Makefile
+++ b/audio/playitslowly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/09/03 08:53:04 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2017/11/24 22:15:58 wiz Exp $
 
 DISTNAME=	playitslowly-1.5.1
 CATEGORIES=	audio
@@ -11,8 +11,9 @@ LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-gstreamer1-[0-9]*:../../multimedia/py-gstreamer1
 DEPENDS+=	gst-plugins1-soundtouch-[0-9]*:../../audio/gst-plugins1-soundtouch
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
-PYTHON_VERSIONED_DEPENDENCIES=	cairo gobject
+PYTHON_VERSIONED_DEPENDENCIES=	gobject
 REPLACE_PYTHON+=	playitslowly/app.py
 
 SUBST_CLASSES+=		exec
@@ -26,5 +27,6 @@ USE_LANGUAGES=	# none
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile
index 29a46d20517..1df5a70a4bd 100644
--- a/devel/bzr-gtk/Makefile
+++ b/devel/bzr-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/01/01 14:43:29 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2017/11/24 22:15:58 wiz Exp $
 
 DISTNAME=	bzr-gtk-${VER}
 PKGREVISION=	1
@@ -12,9 +12,9 @@ COMMENT=	Various GTK+ frontends to Bazaar commands
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${PYPKGPREFIX}-gtk2>=2.8:../../x11/py-gtk2
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cair
 
 PYDISTUTILSPKG=	yes
-PYTHON_VERSIONED_DEPENDENCIES=	cairo
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2
 REPLACE_PYTHON=	create-credits.py info.py
 
@@ -26,7 +26,6 @@ BZR_PLUGIN_TEST=no
 .include "../../devel/bzr/plugin.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/extension.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index eab5023e066..d3b4e964506 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2017/01/01 14:43:33 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2017/11/24 22:15:58 wiz Exp $
 
 PKGNAME=		${PYPKGPREFIX}-gobject-2.28.6
 PKGREVISION=		12
@@ -6,6 +6,8 @@ PKGREVISION=		12
 # only noticeable by running codegen.py
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 2.28.6
 
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+
 .include "Makefile.common"
 
 SUBST_CLASSES+=		codegen
@@ -28,8 +30,6 @@ 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}
@@ -38,7 +38,6 @@ CONFIGURE_ARGS+=	--disable-introspection
 
 .include "../../lang/python/extension.mk"
 .include "../../lang/python/application.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-gobject3/Makefile b/devel/py-gobject3/Makefile
index bb080a7553f..c02b2338721 100644
--- a/devel/py-gobject3/Makefile
+++ b/devel/py-gobject3/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2016/04/08 07:41:26 prlw1 Exp $
+# $NetBSD: Makefile,v 1.31 2017/11/24 22:15:58 wiz Exp $
 
 # https://bugzilla.gnome.org/show_bug.cgi?id=685094
 # https://bugzilla.gnome.org/show_bug.cgi?id=707196
-PYTHON_VERSIONED_DEPENDENCIES=	cairo:link
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../graphics/cairo-gobject/buildlink3.mk"
 TEST_TARGET=	check
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index cc97c161e45..9751c10800a 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2017/11/23 17:19:54 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2017/11/24 22:15:58 wiz Exp $
 
 DISTNAME=	gcompris-12.11
 PKGREVISION=	28
@@ -12,6 +12,7 @@ COMMENT=	Educational games for children
 LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	gnuchess-[0-9]*:../../games/gnuchess
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
 USE_TOOLS+=		gmake intltool gtar pkg-config msgfmt texi2html
 GNU_CONFIGURE=		YES
@@ -24,7 +25,6 @@ INFO_FILES=	yes
 PTHREAD_AUTO_VARS=	yes
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-sqlite2, py-gtk2
-PYTHON_VERSIONED_DEPENDENCIES=	cairo:link
 
 PKG_SUPPORTED_OPTIONS=	gnet
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gcompris
@@ -53,7 +53,6 @@ post-install:
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/application.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index 4eb9dd953a7..8b4ba672189 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/02/12 06:25:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.29 2017/11/24 22:15:58 wiz Exp $
 
 DISTNAME=	mypaint-1.1.0
 PKGREVISION=	4
@@ -13,12 +13,12 @@ LICENSE=	gnu-gpl-v2
 
 BUILD_DEPENDS+=	scons-[0-9]*:../../devel/scons
 DEPENDS+=	${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
 USE_LANGUAGES=	c c++
 
 USE_TOOLS+=	bash:run msgfmt pkg-config
 
-PYTHON_VERSIONED_DEPENDENCIES=	cairo
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2
 
 USE_PKGLOCALEDIR=	yes
@@ -51,6 +51,5 @@ do-install:
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../devel/py-gobject/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile
index 65709be5a7b..c82eb0da530 100644
--- a/graphics/py-goocanvas/Makefile
+++ b/graphics/py-goocanvas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2017/09/04 18:00:55 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2017/11/24 22:15:59 wiz Exp $
 
 DISTNAME=	pygoocanvas-0.14.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -11,6 +11,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Python bindings for GooCanvas
 LICENSE=	gnu-lgpl-v2
 
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
@@ -20,7 +22,6 @@ PKGCONFIG_OVERRIDE+=	pygoocanvas.pc.in
 CONFIGURE_ARGS+=	--disable-docs
 
 PY_PATCHPLIST=	yes
-PYTHON_VERSIONED_DEPENDENCIES=	cairo:link
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2
 
 .include "../../lang/python/pyversion.mk"
@@ -30,6 +31,5 @@ BUILDLINK_API_DEPENDS.pygtk2+=	${PYPKGPREFIX}-gtk2>=2.10.0
 .include "../../devel/py-gobject/buildlink3.mk"
 BUILDLINK_API_DEPENDS.goocanvas+=	goocanvas>=0.14.0
 .include "../../graphics/goocanvas/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile
index aeff2fa8922..9737b74136c 100644
--- a/graphics/py-matplotlib/Makefile
+++ b/graphics/py-matplotlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2017/11/15 14:19:43 adam Exp $
+# $NetBSD: Makefile,v 1.51 2017/11/24 22:15:59 wiz Exp $
 
 .include "Makefile.common"
 
@@ -9,11 +9,10 @@ DEPENDS+=	${PYPKGPREFIX}-cycler-[0-9]*:../../graphics/py-cycler
 DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-pytz>=2008b:../../time/py-pytz
 DEPENDS+=	${PYPKGPREFIX}-pyparsing>=1.5.6:../../devel/py-pyparsing
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 BUILD_DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 BUILD_DEPENDS+=	${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
 
-PYTHON_VERSIONED_DEPENDENCIES=	cairo
-
 .include "../../lang/python/pyversion.mk"
 .if "${PYPKGPREFIX}" == "py27"
 DEPENDS+=	${PYPKGPREFIX}-backports.functools_lru_cache-[0-9]*:../../devel/py-backports.functools_lru_cache
@@ -46,7 +45,6 @@ do-test:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/py-pycha/Makefile b/graphics/py-pycha/Makefile
index c1369314020..2b1a528b0a1 100644
--- a/graphics/py-pycha/Makefile
+++ b/graphics/py-pycha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/09/04 18:08:24 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2017/11/24 22:15:59 wiz Exp $
 
 DISTNAME=	pycha-0.7.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,13 +11,12 @@ COMMENT=	Library for making charts with Python
 LICENSE=      	gnu-lgpl-v3
 
 DEPENDS+=	${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
 USE_LANGUAGES=	#none
 
 PYTHON_SELF_CONFLICT=	yes
-PYTHON_VERSIONED_DEPENDENCIES=	cairo
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2
 
 .include "../../lang/python/egg.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/orca/Makefile b/misc/orca/Makefile
index d45efdf9ac4..9ab0ed26801 100644
--- a/misc/orca/Makefile
+++ b/misc/orca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2017/01/01 14:43:48 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2017/11/24 22:15:59 wiz Exp $
 
 DISTNAME=	orca-2.32.1
 PKGREVISION=	1
@@ -19,6 +19,7 @@ DEPENDS+=	${PYPKGPREFIX}-ORBit>=2.24:../../net/py-ORBit
 DEPENDS+=	${PYPKGPREFIX}-dbus-[0-9]*:../../sysutils/py-dbus
 DEPENDS+=	${PYPKGPREFIX}-gnome2>=2.28:../../x11/py-gnome2
 DEPENDS+=	${PYPKGPREFIX}-gtk2>=2.22:../../x11/py-gtk2
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 DEPENDS+=	gnome-speech>=0.4.25:../../audio/gnome-speech
 DEPENDS+=	gnome-mag>=0.16.2:../../x11/gnome-mag
 
@@ -31,7 +32,6 @@ CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 PY_PATCHPLIST=	yes
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-ORBit, py-gnome2, py-gtk2
-PYTHON_VERSIONED_DEPENDENCIES=	cairo
 
 .include "../../mk/bsd.prefs.mk"
 .if ${X11_TYPE} == "modular" || !exists(${X11BASE}/bin/xmodmap)
@@ -42,5 +42,4 @@ DEPENDS+=	xmodmap-[0-9]*:../../x11/xmodmap
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile
index 1f94586cf1a..051b721b85b 100644
--- a/multimedia/pitivi/Makefile
+++ b/multimedia/pitivi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2017/02/12 06:25:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.40 2017/11/24 22:15:59 wiz Exp $
 
 DISTNAME=	pitivi-0.15.2
 PKGREVISION=	10
@@ -11,18 +11,18 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pitivi.org/
 COMMENT=	Video editor
 
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config intltool gmake msgfmt
 
 CONFIGURE_ENV+=	ac_cv_path_PYTHON=${PYTHONBIN}
 REPLACE_PYTHON=	bin/pitivi.in
-PYTHON_VERSIONED_DEPENDENCIES=	cairo
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2, py-gstreamer0.10
 
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../multimedia/py-gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-gnonlin/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/print/py-poppler/Makefile b/print/py-poppler/Makefile
index 91012a98e5b..01dafb8f961 100644
--- a/print/py-poppler/Makefile
+++ b/print/py-poppler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2017/09/04 20:20:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.31 2017/11/24 22:15:59 wiz Exp $
 
 DISTNAME=	pypoppler-0.12.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,16 +11,16 @@ HOMEPAGE=	https://launchpad.net/poppler-python
 COMMENT=	Python bindings for the Poppler PDF rendering library
 LICENSE=	gnu-gpl-v2
 
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 PY_PATCHPLIST=	yes
-PYTHON_VERSIONED_DEPENDENCIES=	cairo:link
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2
 
 .include "../../lang/python/extension.mk"
 .include "../../devel/atk/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.12.1
 .include "../../print/poppler-glib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pygtk2+=		${PYPKGPREFIX}-gtk2>=2.8.4
diff --git a/textproc/py-relatorio/Makefile b/textproc/py-relatorio/Makefile
index 88027d60896..96525301c7a 100644
--- a/textproc/py-relatorio/Makefile
+++ b/textproc/py-relatorio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2017/01/01 14:44:01 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2017/11/24 22:15:59 wiz Exp $
 
 DISTNAME=	relatorio-0.6.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,11 +14,10 @@ DEPENDS+=	${PYPKGPREFIX}-genshi>=0.5:../../www/py-genshi
 DEPENDS+=	${PYPKGPREFIX}-lxml>=2.0:../../textproc/py-lxml
 DEPENDS+=	${PYPKGPREFIX}-pycha-[0-9]*:../../graphics/py-pycha
 DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
 USE_LANGUAGES=		#none
-PYTHON_VERSIONED_DEPENDENCIES=	cairo
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2 via py-pycha
 
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-graphite-web/Makefile b/www/py-graphite-web/Makefile
index 753a2542d3b..6c0a56a0e47 100644
--- a/www/py-graphite-web/Makefile
+++ b/www/py-graphite-web/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/01/01 14:44:04 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2017/11/24 22:15:59 wiz Exp $
 
 DISTNAME=	graphite-web-0.9.15
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -16,11 +16,11 @@ DEPENDS+=	${PYPKGPREFIX}-django>=1.3.1:../../www/py-django
 DEPENDS+=	${PYPKGPREFIX}-django-tagging>=0.3.1:../../www/py-django-tagging
 DEPENDS+=	${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
 EGG_NAME=	${DISTNAME:S/graphite-/graphite_/}
 
 USE_LANGUAGES=	# none
-PYTHON_VERSIONED_DEPENDENCIES=	cairo
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -74,6 +74,5 @@ post-install:
 	${LN} -s ${PKG_SYSCONFDIR}/local_settings.py ${DESTDIR}${PREFIX}/${PYSITELIB}/graphite/
 
 .include "../../databases/py-carbon/Makefile.common"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/avant-window-navigator/Makefile b/x11/avant-window-navigator/Makefile
index a3a9f9ada51..02d348215dd 100644
--- a/x11/avant-window-navigator/Makefile
+++ b/x11/avant-window-navigator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2017/10/03 12:36:54 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2017/11/24 22:15:59 wiz Exp $
 
 DISTNAME=	avant-window-navigator-0.4.0
 PKGREVISION=	26
@@ -12,6 +12,7 @@ LICENSE=	gnu-lgpl-v2
 
 DEPENDS+=	${PYPKGPREFIX}-xdg-[0-9]*:../../devel/py-xdg
 DEPENDS+=	bzr>=2.4.2:../../devel/bzr
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
@@ -44,7 +45,6 @@ SUBST_SED.pathfix=	-e "s,/usr/share,${PREFIX}/share,"
 PY_PATCHPLIST=		yes
 REPLACE_PYTHON+=	awn-settings/awnSettings.py.in
 REPLACE_PYTHON+=	awn-settings/awnSettingsHelper.py
-PYTHON_VERSIONED_DEPENDENCIES=	cairo:link
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2
 
 .include "../../devel/GConf/schemas.mk"
@@ -53,7 +53,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/py-dbus/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../x11/libdesktop-agnostic/buildlink3.mk"
 .include "../../sysutils/libgtop/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile
index 9cdccdd02a7..2c4043724b1 100644
--- a/x11/py-gnome2-desktop/Makefile
+++ b/x11/py-gnome2-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2017/11/23 17:19:46 wiz Exp $
+# $NetBSD: Makefile,v 1.111 2017/11/24 22:15:59 wiz Exp $
 
 DISTNAME=	gnome-python-desktop-2.32.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
@@ -17,11 +17,11 @@ USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config gmake
 
 #DEPENDS+=	bug-buddy>=2.16:../../net/bug-buddy
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
 PKGCONFIG_OVERRIDE+=	gnome-python-desktop-2.0.pc.in
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-ORBit via py-gnome2, py-gtk2
-PYTHON_VERSIONED_DEPENDENCIES=	cairo:link
 
 .include "../../lang/python/pyversion.mk"
 
@@ -36,7 +36,6 @@ PYTHON_VERSIONS_ACCEPTED=	${PYTHON_VERSION_DEFAULT:M27}
 .include "../../lang/python/extension.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 .include "../../multimedia/gnome-media/buildlink3.mk"
 .include "../../multimedia/totem-pl-parser/buildlink3.mk"
 # works, but should better be in its own pkg to limit dependencies
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 977dfde9936..082d40cb766 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2017/02/12 06:24:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.109 2017/11/24 22:15:59 wiz Exp $
 
 DISTNAME=	pygtk-2.24.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/pygtk/gtk2/}
@@ -12,6 +12,8 @@ HOMEPAGE=	http://www.pygtk.org/
 COMMENT=	Python bindings for GTK+2
 LICENSE=	gnu-lgpl-v2.1
 
+DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+
 CONFLICTS=	${PYPKGPREFIX}-gtk<0.6.10
 
 # IOError: [Errno 2] No such file or directory: 'gtk-types.defs'
@@ -24,7 +26,6 @@ CONFIGURE_ENV+=	PYTHON=${PYTHONBIN:Q}
 USE_TOOLS+=	gmake pkg-config
 
 PY_PATCHPLIST=	YES
-PYTHON_VERSIONED_DEPENDENCIES=	cairo:link
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 2.24.0
 
 REPLACE_PYTHON+=	examples/atk/atk-demo.py
@@ -78,7 +79,6 @@ REPLACE_PYTHON+=	tests/runtests.py
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
-.include "../../lang/python/versioned_dependencies.mk"
 
 .include "../../devel/libglade/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pygobject+=	${PYPKGPREFIX}-gobject>=2.15.3