pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
*: depend on py-cairo now it supports all python versions
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Fri Nov 24 23:15:20 2017 +0100
Changeset: 9bccc5a690bd07209ead016cd2cf441d21e1af94
Modified Files:
arista/Makefile
gnome-activity-journal/Makefile
gtg/Makefile
gwsmhg/Makefile
labyrinth/Makefile
microtetris/Makefile
monajat/Makefile
py-gaphas/Makefile
py-igraph/Makefile
py-oasa/Makefile
py-openastro/Makefile
py-xpra/Makefile
reinteract/Makefile
songwrite2/Makefile
Log Message:
*: depend on py-cairo now it supports all python versions
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=9bccc5a690bd07209ead016cd2cf441d21e1af94
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
arista/Makefile | 3 +--
gnome-activity-journal/Makefile | 3 +--
gtg/Makefile | 3 +--
gwsmhg/Makefile | 3 +--
labyrinth/Makefile | 4 ++--
microtetris/Makefile | 4 ++--
monajat/Makefile | 3 +--
py-gaphas/Makefile | 3 +--
py-igraph/Makefile | 5 +----
py-oasa/Makefile | 4 ++--
py-openastro/Makefile | 3 +--
py-xpra/Makefile | 2 +-
reinteract/Makefile | 4 ++--
songwrite2/Makefile | 4 ++--
14 files changed, 19 insertions(+), 29 deletions(-)
diffs:
diff --git a/arista/Makefile b/arista/Makefile
index 8919ae50ad..82da93b6d5 100644
--- a/arista/Makefile
+++ b/arista/Makefile
@@ -11,13 +11,13 @@ LICENSE= gnu-lgpl-v2
DEPENDS+= gst-ffmpeg-[0-9]*:../../multimedia/gst-plugins0.10-ffmpeg
DEPENDS+= gst-plugins0.10-x264-[0-9]*:../../multimedia/gst-plugins0.10-x264
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
USE_PKGLOCALEDIR= yes
USE_TOOLS+= intltool msgfmt
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
-PYTHON_VERSIONED_DEPENDENCIES= cairo
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2, py-gtk2, py-gstreamer0.10, py-gobject, py-elementtree
.include "../../devel/py-gobject/buildlink3.mk"
@@ -34,5 +34,4 @@ BUILDLINK_API_DEPENDS.gst-python+= ${PYPKGPREFIX}-gstreamer0.10>=0.10.5
BUILDLINK_ABI_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.8.5nb1
.include "../../x11/py-gtk2/buildlink3.mk"
.include "../../lang/python/extension.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/gnome-activity-journal/Makefile b/gnome-activity-journal/Makefile
index ceaf48e8ab..47af9d32b8 100644
--- a/gnome-activity-journal/Makefile
+++ b/gnome-activity-journal/Makefile
@@ -14,12 +14,12 @@ DEPENDS+= ${PYPKGPREFIX}-xdg>=0.17:../../devel/py-xdg
DEPENDS+= ${PYPKGPREFIX}-pygments>=1.0:../../textproc/py-pygments
DEPENDS+= ${PYPKGPREFIX}-distutils-extra>=2.15:../../wip/py-distutils-extra
DEPENDS+= ${PYPKGPREFIX}-zeitgeist>=0.3.0:../../wip/py-zeitgeist
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
USE_TOOLS+= intltool
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
-PYTHON_VERSIONED_DEPENDENCIES= cairo
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2, py-gtk2, py-gobject
GCONF_SCHEMAS+= extra/gnome-activity-journal.schemas
@@ -37,7 +37,6 @@ SUBST_MESSAGE.paths= Fixing header search paths.
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/py-gobject/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/gtg/Makefile b/gtg/Makefile
index b4bbebb948..b352c12a16 100644
--- a/gtg/Makefile
+++ b/gtg/Makefile
@@ -12,13 +12,13 @@ LICENSE= gnu-gpl-v3
DEPENDS+= ${PYPKGPREFIX}-xdg>=0.17:../../devel/py-xdg
DEPENDS+= ${PYPKGPREFIX}-configobj>=4.6.0:../../devel/py-configobj
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
USE_PKGLOCALEDIR= yes
USE_TOOLS+= intltool msgfmt
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
-PYTHON_VERSIONED_DEPENDENCIES= cairo
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2, py-gtk2, py-gobject
INSTALLATION_DIRS+= ${PKGMANDIR}/man1
@@ -28,7 +28,6 @@ INSTALLATION_DIRS+= ${PKGMANDIR}/man1
.include "../../devel/py-gobject/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../lang/python/extension.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/py-gnome2/buildlink3.mk"
diff --git a/gwsmhg/Makefile b/gwsmhg/Makefile
index 727ad90e52..16a8ffb668 100644
--- a/gwsmhg/Makefile
+++ b/gwsmhg/Makefile
@@ -14,16 +14,15 @@ DEPENDS+= mercurial>=1.3.1:../../devel/mercurial
DEPENDS+= ${PYPKGPREFIX}-gobject>=2.18.0:../../devel/py-gobject
DEPENDS+= ${PYPKGPREFIX}-gtksourceview>=2.6.0:../../x11/gtksourceview
DEPENDS+= ${PYPKGPREFIX}-gtk2>=1.99.12:../../x11/py-gtk2
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
-PYTHON_VERSIONED_DEPENDENCIES= cairo
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2, py-gobject
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../lang/python/extension.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/labyrinth/Makefile b/labyrinth/Makefile
index 1279f3f2c3..e3ddf769f3 100644
--- a/labyrinth/Makefile
+++ b/labyrinth/Makefile
@@ -10,6 +10,8 @@ MAINTAINER= pkgsrc.gnome%gmail.com@localhost
HOMEPAGE= https://www.gnome.org/~dscorgie/labyrinth.html
COMMENT= Labyrinth is a lightweight mind-mapping tool for GNOME
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+
WRKSRC= ${WRKDIR}/labyrinth-0.4.0
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
@@ -18,7 +20,6 @@ USE_TOOLS+= pkg-config intltool gmake
USE_LANGUAGES= c c++
PY_PATCHPLIST= yes
-PYTHON_VERSIONED_DEPENDENCIES= cairo
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2, py-gobject
.include "../../devel/libglade/buildlink3.mk"
@@ -26,7 +27,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2, py-gobject
.include "../../devel/py-gobject/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/librsvg/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../x11/gnome-desktop/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/microtetris/Makefile b/microtetris/Makefile
index 993b2b62c8..c05b372922 100644
--- a/microtetris/Makefile
+++ b/microtetris/Makefile
@@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users%netbsd.org@localhost
HOMEPAGE= http://microtetris.sourceforge.net/
COMMENT= MicroTetris is a simple and compact popular game Tetris
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+
WRKSRC= ${WRKDIR}
USE_LANGUAGES= # none
NO_BUILD= yes
@@ -18,7 +20,6 @@ NO_BUILD= yes
INSTALLATION_DIRS= bin
REPLACE_PYTHON+= ${DISTNAME}.py
-PYTHON_VERSIONED_DEPENDENCIES= cairo
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2, py-gobject
do-install:
@@ -30,5 +31,4 @@ do-install:
.include "../../devel/py-gobject/buildlink3.mk"
.include "../../x11/py-gtk2/buildlink3.mk"
.include "../../lang/python/application.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/monajat/Makefile b/monajat/Makefile
index cd9e47debf..6fd840ba17 100644
--- a/monajat/Makefile
+++ b/monajat/Makefile
@@ -12,6 +12,7 @@ LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-notify-[0-9]*:../../sysutils/py-notify
DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_TOOLS+= intltool msgfmt
@@ -19,7 +20,6 @@ USE_PKGLOCALEDIR= yes
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
-PYTHON_VERSIONED_DEPENDENCIES= cairo
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-notify, py-gtk2, py-gobject
INSTALLATION_DIRS+= bin
@@ -28,7 +28,6 @@ REPLACE_PYTHON+= ${WRKSRC}/monajat-applet
.include "../../devel/pango/buildlink3.mk"
.include "../../devel/py-gobject/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../graphics/librsvg/buildlink3.mk"
.include "../../sysutils/py-dbus/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/py-gaphas/Makefile b/py-gaphas/Makefile
index 8c73969a84..1b3552ca9d 100644
--- a/py-gaphas/Makefile
+++ b/py-gaphas/Makefile
@@ -14,13 +14,12 @@ LICENSE= gnu-lgpl-v2
DEPENDS+= ${PYPKGPREFIX}-nose>=1.3.0:../../devel/py-nose
DEPENDS+= ${PYPKGPREFIX}-decorator>=3.2.0:../../devel/py-decorator
DEPENDS+= ${PYPKGPREFIX}-simplegeneric>=0.8.1:../../wip/py-simplegeneric
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
-PYTHON_VERSIONED_DEPENDENCIES= cairo
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2
USE_LANGUAGES= # none
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../lang/python/egg.mk"
.include "../../x11/py-gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-igraph/Makefile b/py-igraph/Makefile
index bdc81bd7d2..403d096439 100644
--- a/py-igraph/Makefile
+++ b/py-igraph/Makefile
@@ -10,13 +10,10 @@ HOMEPAGE= http://igraph.org/
COMMENT= Manipulating Undirected and Directed Graphs for Python
LICENSE= gnu-gpl-v2
-WRKSRC= ${WRKDIR}/igraph-0.1.11
-
-PYTHON_VERSIONED_DEPENDENCIES= cairo
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
USE_TOOLS+= pkg-config
-#.include "../../lang/python/versioned_dependencies.mk"
.include "../../lang/python/egg.mk"
.include "../../wip/igraph/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-oasa/Makefile b/py-oasa/Makefile
index 49da79c517..0209a424fb 100644
--- a/py-oasa/Makefile
+++ b/py-oasa/Makefile
@@ -10,14 +10,14 @@ HOMEPAGE= http://bkchem.zirael.org/download/
COMMENT= Python library for manipulation of chemical formats
LICENSE= gnu-gpl-v2
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
-PYTHON_VERSIONED_DEPENDENCIES= cairo
do-test:
cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} test.py
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/py-openastro/Makefile b/py-openastro/Makefile
index af2e483bdd..4792b77706 100644
--- a/py-openastro/Makefile
+++ b/py-openastro/Makefile
@@ -12,8 +12,8 @@ COMMENT= Open source astrology program, openastro.org
LICENSE= gnu-gpl-v3
DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
-PYTHON_VERSIONED_DEPENDENCIES= cairo
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-ORBit via py-gnome2, py-gtk2
WRKSRC= ${WRKDIR}/openastro.org-1.1.38
@@ -46,7 +46,6 @@ post-install:
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../wip/py-pyswisseph/buildlink3.mk"
.include "../../wip/swisseph/buildlink3.mk"
diff --git a/py-xpra/Makefile b/py-xpra/Makefile
index 497db39654..964ae2c8c5 100644
--- a/py-xpra/Makefile
+++ b/py-xpra/Makefile
@@ -12,11 +12,11 @@ COMMENT= screen(1) for X
LICENSE= gnu-gpl-v2
DEPENDS+= ${PYPKGPREFIX}-cython>=0.14:../../devel/py-cython
+#DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
-#PYTHON_VERSIONED_DEPENDENCIES= cairo
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2
REPLACE_PYTHON+= cups/xpraforwarder
diff --git a/reinteract/Makefile b/reinteract/Makefile
index dadc99b021..81bca74eb3 100644
--- a/reinteract/Makefile
+++ b/reinteract/Makefile
@@ -11,16 +11,16 @@ HOMEPAGE= http://www.reinteract.org/
COMMENT= Reinteract is a system for interactive experimentation with Python
LICENSE= 2-clause-bsd
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+
GNU_CONFIGURE= yes
REPLACE_PYTHON+= bin/reinteract.in
PY_PATCHPLIST= yes
-PYTHON_VERSIONED_DEPENDENCIES= cairo
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gobject
.include "../../devel/py-gobject/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../graphics/py-matplotlib/buildlink3.mk"
.include "../../math/py-numpy/buildlink3.mk"
.include "../../lang/python/application.mk"
diff --git a/songwrite2/Makefile b/songwrite2/Makefile
index 0b7cd4d72a..d8f349bbd0 100644
--- a/songwrite2/Makefile
+++ b/songwrite2/Makefile
@@ -10,10 +10,11 @@ HOMEPAGE= http://home.gna.org/oomadness/en/songwrite/
COMMENT= Music score and songbook editor
LICENSE= gnu-gpl-v3
+DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= # none
BUILD_OPTIONS= # blank
-PYTHON_VERSIONED_DEPENDENCIES= cairo
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-gtk2, py-EditObj2
#INSTALLATION_DIRS+= share/doc/${PKGBASE} share/locale/en/LC_MESSAGES/
@@ -38,7 +39,6 @@ do-install:
.include "../../print/evince/buildlink3.mk"
DEPENDS+= timidity-[0-9]*:../../audio/timidity
DEPENDS+= tex-latex-[0-9]*:../../print/tex-latex
-.include "../../lang/python/versioned_dependencies.mk"
.include "../../graphics/cairo/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../x11/py-gtk2/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index