pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc *: depend on py-cairo now it supports all python versions
details: https://anonhg.NetBSD.org/pkgsrc/rev/0261ae59780d
branches: trunk
changeset: 371962:0261ae59780d
user: wiz <wiz%pkgsrc.org@localhost>
date: Fri Nov 24 22:15:58 2017 +0000
description:
*: depend on py-cairo now it supports all python versions
diffstat:
audio/playitslowly/Makefile | 6 ++++--
devel/bzr-gtk/Makefile | 5 ++---
devel/py-gobject/Makefile | 7 +++----
devel/py-gobject3/Makefile | 4 ++--
games/gcompris/Makefile | 5 ++---
graphics/mypaint/Makefile | 5 ++---
graphics/py-goocanvas/Makefile | 6 +++---
graphics/py-matplotlib/Makefile | 6 ++----
graphics/py-pycha/Makefile | 5 ++---
misc/orca/Makefile | 5 ++---
multimedia/pitivi/Makefile | 6 +++---
print/py-poppler/Makefile | 6 +++---
textproc/py-relatorio/Makefile | 5 ++---
www/py-graphite-web/Makefile | 5 ++---
x11/avant-window-navigator/Makefile | 5 ++---
x11/py-gnome2-desktop/Makefile | 5 ++---
x11/py-gtk2/Makefile | 6 +++---
17 files changed, 41 insertions(+), 51 deletions(-)
diffs (truncated from 491 to 300 lines):
diff -r c0572a849dd6 -r 0261ae59780d audio/playitslowly/Makefile
--- a/audio/playitslowly/Makefile Fri Nov 24 20:39:01 2017 +0000
+++ b/audio/playitslowly/Makefile Fri Nov 24 22:15:58 2017 +0000
@@ -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 @@
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 @@
.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 -r c0572a849dd6 -r 0261ae59780d devel/bzr-gtk/Makefile
--- a/devel/bzr-gtk/Makefile Fri Nov 24 20:39:01 2017 +0000
+++ b/devel/bzr-gtk/Makefile Fri Nov 24 22:15:58 2017 +0000
@@ -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 @@
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 @@
.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 -r c0572a849dd6 -r 0261ae59780d devel/py-gobject/Makefile
--- a/devel/py-gobject/Makefile Fri Nov 24 20:39:01 2017 +0000
+++ b/devel/py-gobject/Makefile Fri Nov 24 22:15:58 2017 +0000
@@ -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 @@
# 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/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 @@
.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 -r c0572a849dd6 -r 0261ae59780d devel/py-gobject3/Makefile
--- a/devel/py-gobject3/Makefile Fri Nov 24 20:39:01 2017 +0000
+++ b/devel/py-gobject3/Makefile Fri Nov 24 22:15:58 2017 +0000
@@ -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 -r c0572a849dd6 -r 0261ae59780d games/gcompris/Makefile
--- a/games/gcompris/Makefile Fri Nov 24 20:39:01 2017 +0000
+++ b/games/gcompris/Makefile Fri Nov 24 22:15:58 2017 +0000
@@ -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 @@
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 @@
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 @@
.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 -r c0572a849dd6 -r 0261ae59780d graphics/mypaint/Makefile
--- a/graphics/mypaint/Makefile Fri Nov 24 20:39:01 2017 +0000
+++ b/graphics/mypaint/Makefile Fri Nov 24 22:15:58 2017 +0000
@@ -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 @@
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 @@
.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 -r c0572a849dd6 -r 0261ae59780d graphics/py-goocanvas/Makefile
--- a/graphics/py-goocanvas/Makefile Fri Nov 24 20:39:01 2017 +0000
+++ b/graphics/py-goocanvas/Makefile Fri Nov 24 22:15:58 2017 +0000
@@ -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 @@
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 @@
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 @@
.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 -r c0572a849dd6 -r 0261ae59780d graphics/py-matplotlib/Makefile
--- a/graphics/py-matplotlib/Makefile Fri Nov 24 20:39:01 2017 +0000
+++ b/graphics/py-matplotlib/Makefile Fri Nov 24 22:15:58 2017 +0000
@@ -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}-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 @@
.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 -r c0572a849dd6 -r 0261ae59780d graphics/py-pycha/Makefile
--- a/graphics/py-pycha/Makefile Fri Nov 24 20:39:01 2017 +0000
+++ b/graphics/py-pycha/Makefile Fri Nov 24 22:15:58 2017 +0000
@@ -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 @@
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 -r c0572a849dd6 -r 0261ae59780d misc/orca/Makefile
--- a/misc/orca/Makefile Fri Nov 24 20:39:01 2017 +0000
+++ b/misc/orca/Makefile Fri Nov 24 22:15:58 2017 +0000
@@ -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}-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 @@
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 @@
.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 -r c0572a849dd6 -r 0261ae59780d multimedia/pitivi/Makefile
--- a/multimedia/pitivi/Makefile Fri Nov 24 20:39:01 2017 +0000
+++ b/multimedia/pitivi/Makefile Fri Nov 24 22:15:58 2017 +0000
@@ -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 @@
HOMEPAGE= http://www.pitivi.org/
COMMENT= Video editor
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+
Home |
Main Index |
Thread Index |
Old Index