From 37cbfcda0c28811dd54a2e68d3c529ada7a20d78 Mon Sep 17 00:00:00 2001 From: sthen Date: Sat, 21 Dec 2024 11:38:27 +0000 Subject: [PATCH] handle py3.12 switchover in multimedia --- multimedia/Makefile | 12 +++--- multimedia/devede/Makefile | 12 +++--- multimedia/gaupol/Makefile | 12 +++--- multimedia/gstreamer1/Makefile | 2 +- multimedia/gstreamer1/py-gstreamer/Makefile | 8 ++-- multimedia/gstreamer1/py-gstreamer/pkg/PLIST | 2 +- multimedia/kid3/Makefile | 2 +- multimedia/mat2/Makefile | 9 +++-- multimedia/mpv/Makefile | 2 +- multimedia/pipewire/pipewire/Makefile | 2 +- multimedia/pipewire/wireplumber/Makefile | 2 +- multimedia/py-caption/Makefile | 16 ++++---- multimedia/py-caption/pkg/PLIST | 14 +++---- multimedia/py-casttube/Makefile | 15 +++---- multimedia/py-casttube/pkg/PLIST | 14 +++---- multimedia/py-chromecast/Makefile | 22 +++++----- multimedia/py-chromecast/pkg/PLIST | 14 +++---- multimedia/py-ffmpeg-progress-yield/Makefile | 8 ++-- multimedia/py-ffmpeg-progress-yield/pkg/PLIST | 15 +++---- multimedia/py-guessit/Makefile | 22 +++++----- multimedia/py-guessit/pkg/PLIST | 19 ++++----- multimedia/py-pafy/Makefile | 11 ++--- multimedia/py-pafy/pkg/PLIST | 12 +++--- multimedia/streamlink/Makefile | 40 +++++++++---------- multimedia/yle-dl/Makefile | 14 +++---- 25 files changed, 144 insertions(+), 157 deletions(-) diff --git a/multimedia/Makefile b/multimedia/Makefile index 23f4803d64d..29704a30c55 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -63,12 +63,12 @@ SUBDIR += phonon SUBDIR += phonon-backend SUBDIR += pipewire - SUBDIR += py-caption,python3 - SUBDIR += py-casttube,python3 - SUBDIR += py-chromecast,python3 - SUBDIR += py-ffmpeg-progress-yield,python3 - SUBDIR += py-guessit,python3 - SUBDIR += py-pafy,python3 + SUBDIR += py-caption + SUBDIR += py-casttube + SUBDIR += py-chromecast + SUBDIR += py-ffmpeg-progress-yield + SUBDIR += py-guessit + SUBDIR += py-pafy SUBDIR += regionset SUBDIR += sfml SUBDIR += shotcut diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile index 2d4ceeae7c0..5744b4edb96 100644 --- a/multimedia/devede/Makefile +++ b/multimedia/devede/Makefile @@ -1,9 +1,9 @@ COMMENT= video DVDs and CDs creation tool -MODPY_EGG_VERSION= 4.17.0 -DISTNAME= devedeng-${MODPY_EGG_VERSION} -PKGNAME= devede-${MODPY_EGG_VERSION} -REVISION= 4 +MODPY_DISTV= 4.17.0 +DISTNAME= devedeng-${MODPY_DISTV} +PKGNAME= devede-${MODPY_DISTV} +REVISION= 5 CATEGORIES= multimedia x11 @@ -12,7 +12,7 @@ HOMEPAGE= https://www.rastersoft.com/programas/devede.html # GPLv3 PERMIT_PACKAGE= Yes -SITES= https://gitlab.com/rastersoft/devedeng/-/archive/${MODPY_EGG_VERSION}/ +SITES= https://gitlab.com/rastersoft/devedeng/-/archive/${MODPY_DISTV}/ MODULES= lang/python MODPY_PYBUILD= setuptools @@ -20,7 +20,7 @@ MODPY_PYBUILD= setuptools BUILD_DEPENDS= devel/gettext,-tools RUN_DEPENDS= devel/desktop-file-utils \ - devel/py-gobject3${MODPY_FLAVOR} \ + devel/py-gobject3 \ x11/gtk+4,-guic # pygobject GTK3 introspection (not provided by indirect dependencies) diff --git a/multimedia/gaupol/Makefile b/multimedia/gaupol/Makefile index e9307aa7271..825f0487310 100644 --- a/multimedia/gaupol/Makefile +++ b/multimedia/gaupol/Makefile @@ -1,10 +1,10 @@ COMMENT = editor for text-based subtitle files -MODPY_EGG_VERSION = 1.10.1 +MODPY_DISTV = 1.10.1 GH_ACCOUNT = otsaloma GH_PROJECT = gaupol -GH_TAGNAME = ${MODPY_EGG_VERSION} -REVISION = 4 +GH_TAGNAME = ${MODPY_DISTV} +REVISION = 5 CATEGORIES = multimedia @@ -21,8 +21,8 @@ MODPY_PYBUILD = setuptools BUILD_DEPENDS = devel/gettext,-tools RUN_DEPENDS = devel/iso-codes \ devel/desktop-file-utils \ - devel/py-gobject3${MODPY_FLAVOR} \ - graphics/py-cairo${MODPY_FLAVOR} \ + devel/py-gobject3 \ + graphics/py-cairo \ multimedia/gstreamer1/plugins-bad \ multimedia/gstreamer1/plugins-base \ multimedia/gstreamer1/plugins-good \ @@ -30,7 +30,7 @@ RUN_DEPENDS = devel/iso-codes \ multimedia/gstreamer1/plugins-ugly \ multimedia/mpv \ textproc/gspell \ - textproc/py-chardet${MODPY_FLAVOR} \ + textproc/py-chardet \ x11/gtk+4,-guic \ x11/hicolor-icon-theme diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile index 49b878babf9..6dacb3a2104 100644 --- a/multimedia/gstreamer1/Makefile +++ b/multimedia/gstreamer1/Makefile @@ -6,6 +6,6 @@ SUBDIR += plugins-libav SUBDIR += plugins-ugly SUBDIR += plugins-bad - SUBDIR += py-gstreamer,python3 + SUBDIR += py-gstreamer .include diff --git a/multimedia/gstreamer1/py-gstreamer/Makefile b/multimedia/gstreamer1/py-gstreamer/Makefile index 9c7376be6fe..434a92fe7fc 100644 --- a/multimedia/gstreamer1/py-gstreamer/Makefile +++ b/multimedia/gstreamer1/py-gstreamer/Makefile @@ -2,6 +2,7 @@ COMMENT= overrides for the gobject-introspection-based pygst bindings DISTNAME= gst-python-${V} PKGNAME= py-gstreamer1-${V} +REVISION= 0 HOMEPAGE= http://gstreamer.freedesktop.org/modules/gst-python.html @@ -13,13 +14,10 @@ SITES= ${SITE_GST:=gst-python/} # XXX we need the meson MODULE to come first, but Makefile.inc is parsed after MODULES= devel/meson lang/python -FLAVORS= python3 -FLAVOR= python3 - # MODPY_LIBDIR/gi/overrides/ -BUILD_DEPENDS= devel/py-gobject3${MODPY_FLAVOR} \ +BUILD_DEPENDS= devel/py-gobject3 \ ${P}/plugins-base>=${V} -RUN_DEPENDS= devel/py-gobject3${MODPY_FLAVOR} \ +RUN_DEPENDS= devel/py-gobject3 \ ${P}/plugins-base>=${V} LIB_DEPENDS= ${P}/core>=${V} \ diff --git a/multimedia/gstreamer1/py-gstreamer/pkg/PLIST b/multimedia/gstreamer1/py-gstreamer/pkg/PLIST index ac5f03c2b77..6b4717a9593 100644 --- a/multimedia/gstreamer1/py-gstreamer/pkg/PLIST +++ b/multimedia/gstreamer1/py-gstreamer/pkg/PLIST @@ -1,4 +1,4 @@ -@pkgpath multimedia/gstreamer1/py-gstreamer +@pkgpath multimedia/gstreamer1/py-gstreamer,python3 @so lib/gstreamer-${API}/libgstpython.so lib/python${MODPY_VERSION}/site-packages/gi/overrides/Gst.py lib/python${MODPY_VERSION}/site-packages/gi/overrides/GstAudio.py diff --git a/multimedia/kid3/Makefile b/multimedia/kid3/Makefile index 7b6022fd511..64083af341c 100644 --- a/multimedia/kid3/Makefile +++ b/multimedia/kid3/Makefile @@ -2,7 +2,7 @@ COMMENT = multimedia files tag editor DISTNAME = kid3-3.8.5 CATEGORIES = multimedia x11 HOMEPAGE = https://kid3.kde.org/ -REVISION = 3 +REVISION = 4 MAINTAINER = Vadim Zhukov diff --git a/multimedia/mat2/Makefile b/multimedia/mat2/Makefile index f03105389a9..f3efbe6d337 100644 --- a/multimedia/mat2/Makefile +++ b/multimedia/mat2/Makefile @@ -1,7 +1,8 @@ COMMENT = remove metadata from media files -MODPY_EGG_VERSION = 0.13.4 -DISTNAME = mat2-${MODPY_EGG_VERSION} +MODPY_DISTV = 0.13.4 +DISTNAME = mat2-${MODPY_DISTV} +REVISION = 0 CATEGORIES = multimedia @@ -16,8 +17,8 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -RUN_DEPENDS = audio/py-mutagen${MODPY_FLAVOR} \ - devel/py-gobject3${MODPY_FLAVOR} \ +RUN_DEPENDS = audio/py-mutagen \ + devel/py-gobject3 \ graphics/ffmpeg \ graphics/gdk-pixbuf2 \ graphics/libimagequant \ diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index d906a664e4b..2e449bbdd43 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -31,7 +31,7 @@ COMPILER_LANGS = c DEBUG_PACKAGES = ${BUILD_PACKAGES} BUILD_DEPENDS = audio/ladspa \ - textproc/py-docutils${MODPY_FLAVOR} + textproc/py-docutils LIB_DEPENDS = archivers/libarchive \ audio/libcdio \ diff --git a/multimedia/pipewire/pipewire/Makefile b/multimedia/pipewire/pipewire/Makefile index 7f9a67a6807..a0461d4c0fd 100644 --- a/multimedia/pipewire/pipewire/Makefile +++ b/multimedia/pipewire/pipewire/Makefile @@ -25,7 +25,7 @@ MODPY_RUNDEP= No BUILD_DEPENDS= devel/doxygen \ devel/gettext,-tools \ - textproc/py-docutils${MODPY_FLAVOR} + textproc/py-docutils LIB_DEPENDS-main= ${BASE_PKGPATH},-libs \ audio/libcanberra \ diff --git a/multimedia/pipewire/wireplumber/Makefile b/multimedia/pipewire/wireplumber/Makefile index 9f21e4e1319..571d3390216 100644 --- a/multimedia/pipewire/wireplumber/Makefile +++ b/multimedia/pipewire/wireplumber/Makefile @@ -18,7 +18,7 @@ MODPY_RUNDEP= No BUILD_DEPENDS= devel/doxygen \ devel/gettext,-tools \ devel/gobject-introspection \ - textproc/py-lxml${MODPY_FLAVOR} + textproc/py-lxml LIB_DEPENDS= devel/glib2 \ multimedia/pipewire/pipewire,-libs diff --git a/multimedia/py-caption/Makefile b/multimedia/py-caption/Makefile index 4f693881ce8..05c6f7fecbd 100644 --- a/multimedia/py-caption/Makefile +++ b/multimedia/py-caption/Makefile @@ -1,8 +1,9 @@ COMMENT= closed caption converter -MODPY_EGG_VERSION= 2.2.15 -DISTNAME= pycaption-${MODPY_EGG_VERSION} -PKGNAME= py-caption-${MODPY_EGG_VERSION} +MODPY_DISTV= 2.2.15 +DISTNAME= pycaption-${MODPY_DISTV} +PKGNAME= py-caption-${MODPY_DISTV} +REVISION= 0 CATEGORIES= multimedia @@ -11,15 +12,12 @@ PERMIT_PACKAGE= Yes MODULES= lang/python -FLAVORS= python3 -FLAVOR= python3 - MODPY_PI= Yes MODPY_PYBUILD= setuptools -RUN_DEPENDS= textproc/py-cssutils${MODPY_FLAVOR} \ - textproc/py-lxml${MODPY_FLAVOR} \ - www/py-beautifulsoup4${MODPY_FLAVOR} +RUN_DEPENDS= textproc/py-cssutils \ + textproc/py-lxml \ + www/py-beautifulsoup4 post-install: rm -r ${WRKINST}${MODPY_SITEPKG}/tests diff --git a/multimedia/py-caption/pkg/PLIST b/multimedia/py-caption/pkg/PLIST index fecf7fa62eb..8fdd9ba2084 100644 --- a/multimedia/py-caption/pkg/PLIST +++ b/multimedia/py-caption/pkg/PLIST @@ -1,11 +1,11 @@ -@pkgpath multimedia/py-caption +@pkgpath multimedia/py-caption,python3 lib/python${MODPY_VERSION}/site-packages/pycaption/ -lib/python${MODPY_VERSION}/site-packages/pycaption-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pycaption-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/pycaption-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pycaption-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pycaption-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pycaption-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pycaption-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pycaption-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/pycaption-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pycaption-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pycaption-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pycaption-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pycaption/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pycaption/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/pycaption/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/multimedia/py-casttube/Makefile b/multimedia/py-casttube/Makefile index c8b5e1e1719..272214e8f0a 100644 --- a/multimedia/py-casttube/Makefile +++ b/multimedia/py-casttube/Makefile @@ -1,9 +1,9 @@ COMMENT= interact with Youtube Chromecast api -MODPY_EGG_VERSION= 0.2.1 -DISTNAME= casttube-${MODPY_EGG_VERSION} +MODPY_DISTV= 0.2.1 +DISTNAME= casttube-${MODPY_DISTV} PKGNAME= py-${DISTNAME} -REVISION= 4 +REVISION= 5 CATEGORIES= multimedia net @@ -17,12 +17,9 @@ MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD = setuptools -FLAVORS= python3 -FLAVOR = python3 - -TEST_DEPENDS= net/py-idna${MODPY_FLAVOR} \ - textproc/py-chardet${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} +TEST_DEPENDS= net/py-idna \ + textproc/py-chardet \ + www/py-requests # needs screen_id: https://github.com/ur1katz/CastTube-Scripts TEST_IS_INTERACTIVE= Yes diff --git a/multimedia/py-casttube/pkg/PLIST b/multimedia/py-casttube/pkg/PLIST index e1080c24227..06854687297 100644 --- a/multimedia/py-casttube/pkg/PLIST +++ b/multimedia/py-casttube/pkg/PLIST @@ -1,12 +1,12 @@ +@pkgpath multimedia/py-casttube,python3 @conflict ${MODPY_PY_PREFIX}casttube-* -@pkgpath multimedia/py-casttube lib/python${MODPY_VERSION}/site-packages/casttube/ -lib/python${MODPY_VERSION}/site-packages/casttube-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/casttube-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/casttube-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/casttube-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/casttube-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/casttube-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/casttube-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/casttube-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/casttube-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/casttube-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/casttube-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/casttube-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/casttube/YouTubeSession.py lib/python${MODPY_VERSION}/site-packages/casttube/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/casttube/${MODPY_PYCACHE}/ diff --git a/multimedia/py-chromecast/Makefile b/multimedia/py-chromecast/Makefile index 7a86edd8a40..337a85fac9e 100644 --- a/multimedia/py-chromecast/Makefile +++ b/multimedia/py-chromecast/Makefile @@ -1,8 +1,9 @@ COMMENT= Python module to talk to Google Chromecast -MODPY_EGG_VERSION= 14.0.5 -DISTNAME= PyChromecast-${MODPY_EGG_VERSION} -PKGNAME= py-chromecast-${MODPY_EGG_VERSION} +MODPY_DISTV= 14.0.5 +DISTNAME= PyChromecast-${MODPY_DISTV} +PKGNAME= py-chromecast-${MODPY_DISTV} +REVISION= 0 CATEGORIES= multimedia @@ -16,15 +17,12 @@ MODULES= lang/python MODPY_PI= Yes MODPY_PYBUILD= setuptools -FLAVORS= python3 -FLAVOR= python3 +RUN_DEPENDS= devel/py-protobuf \ + multimedia/py-casttube \ + net/py-zeroconf \ + www/py-requests -RUN_DEPENDS= devel/py-protobuf${MODPY_FLAVOR} \ - multimedia/py-casttube${MODPY_FLAVOR} \ - net/py-zeroconf${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR} - -TEST_DEPENDS= textproc/py-iniconfig${MODPY_FLAVOR} \ - textproc/py-toml${MODPY_FLAVOR} +TEST_DEPENDS= textproc/py-iniconfig \ + textproc/py-toml .include diff --git a/multimedia/py-chromecast/pkg/PLIST b/multimedia/py-chromecast/pkg/PLIST index 62f2aa5ff17..3db916e4e6f 100644 --- a/multimedia/py-chromecast/pkg/PLIST +++ b/multimedia/py-chromecast/pkg/PLIST @@ -1,10 +1,10 @@ -@pkgpath multimedia/py-chromecast -lib/python${MODPY_VERSION}/site-packages/PyChromecast-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/PyChromecast-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/PyChromecast-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/PyChromecast-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/PyChromecast-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/PyChromecast-${MODPY_EGG_VERSION}.dist-info/top_level.txt +@pkgpath multimedia/py-chromecast,python3 +lib/python${MODPY_VERSION}/site-packages/PyChromecast-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/PyChromecast-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/PyChromecast-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/PyChromecast-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/PyChromecast-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/PyChromecast-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pychromecast/ lib/python${MODPY_VERSION}/site-packages/pychromecast/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pychromecast/${MODPY_PYCACHE}/ diff --git a/multimedia/py-ffmpeg-progress-yield/Makefile b/multimedia/py-ffmpeg-progress-yield/Makefile index 9fcbe92520c..3fd4889ad69 100644 --- a/multimedia/py-ffmpeg-progress-yield/Makefile +++ b/multimedia/py-ffmpeg-progress-yield/Makefile @@ -1,8 +1,9 @@ COMMENT= Python FFmpeg progress wrapper -MODPY_EGG_VERSION= 0.9.1 -DISTNAME= ffmpeg-progress-yield-${MODPY_EGG_VERSION} +MODPY_DISTV= 0.9.1 +DISTNAME= ffmpeg-progress-yield-${MODPY_DISTV} PKGNAME= py-${DISTNAME} +REVISION= 0 CATEGORIES= multimedia @@ -19,7 +20,4 @@ MODPY_PI= Yes MODPY_PYBUILD= setuptools MODPY_PYTEST_ARGS= test/test.py -FLAVORS= python3 -FLAVOR= python3 - .include diff --git a/multimedia/py-ffmpeg-progress-yield/pkg/PLIST b/multimedia/py-ffmpeg-progress-yield/pkg/PLIST index 10e94f3526a..74f12609016 100644 --- a/multimedia/py-ffmpeg-progress-yield/pkg/PLIST +++ b/multimedia/py-ffmpeg-progress-yield/pkg/PLIST @@ -1,12 +1,13 @@ +@pkgpath multimedia/py-ffmpeg-progress-yield,python3 bin/ffmpeg-progress-yield lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield/ -lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield/__init__.py lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield/__main__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ffmpeg_progress_yield/${MODPY_PYCACHE}/ diff --git a/multimedia/py-guessit/Makefile b/multimedia/py-guessit/Makefile index f166522f8fd..87ae5b8b3bb 100644 --- a/multimedia/py-guessit/Makefile +++ b/multimedia/py-guessit/Makefile @@ -1,8 +1,9 @@ COMMENT = guess information from video filenames -MODPY_EGG_VERSION = 3.8.0 -DISTNAME = guessit-${MODPY_EGG_VERSION} +MODPY_DISTV = 3.8.0 +DISTNAME = guessit-${MODPY_DISTV} PKGNAME = py-${DISTNAME} +REVISION = 0 CATEGORIES = multimedia @@ -17,15 +18,12 @@ MODPY_PI = Yes MODPY_PYBUILD = setuptools MODPY_PYTEST_ARGS = guessit -BUILD_DEPENDS = devel/py-test-runner${MODPY_FLAVOR} -RUN_DEPENDS = devel/py-dateutil${MODPY_FLAVOR} \ - misc/py-babelfish${MODPY_FLAVOR} \ - textproc/py-rebulk${MODPY_FLAVOR}>=3 -TEST_DEPENDS = textproc/py-yaml${MODPY_FLAVOR} \ - devel/py-test-benchmark${MODPY_FLAVOR} \ - devel/py-test-mock${MODPY_FLAVOR} - -FLAVORS = python3 -FLAVOR = python3 +BUILD_DEPENDS = devel/py-test-runner +RUN_DEPENDS = devel/py-dateutil \ + misc/py-babelfish \ + textproc/py-rebulk>=3 +TEST_DEPENDS = textproc/py-yaml \ + devel/py-test-benchmark \ + devel/py-test-mock .include diff --git a/multimedia/py-guessit/pkg/PLIST b/multimedia/py-guessit/pkg/PLIST index 74d0d49f53d..6902659bc96 100644 --- a/multimedia/py-guessit/pkg/PLIST +++ b/multimedia/py-guessit/pkg/PLIST @@ -1,14 +1,15 @@ +@pkgpath multimedia/py-guessit,python3 bin/guessit lib/python${MODPY_VERSION}/site-packages/guessit/ -lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_EGG_VERSION}.dist-info/AUTHORS.md -lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_EGG_VERSION}.dist-info/LICENSE -lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_EGG_VERSION}.dist-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_EGG_VERSION}.dist-info/top_level.txt -lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_EGG_VERSION}.dist-info/zip-safe +lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_DISTV}.dist-info/AUTHORS.md +lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_DISTV}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_DISTV}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_DISTV}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/guessit-${MODPY_DISTV}.dist-info/zip-safe lib/python${MODPY_VERSION}/site-packages/guessit/__init__.py lib/python${MODPY_VERSION}/site-packages/guessit/__main__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/guessit/${MODPY_PYCACHE}/ diff --git a/multimedia/py-pafy/Makefile b/multimedia/py-pafy/Makefile index 31722b923cd..3d4a1a1da80 100644 --- a/multimedia/py-pafy/Makefile +++ b/multimedia/py-pafy/Makefile @@ -1,9 +1,9 @@ -MODPY_EGG_VERSION = 0.5.5 +MODPY_DISTV = 0.5.5 COMMENT = download YouTube content and retrieve metadata -DISTNAME = pafy-${MODPY_EGG_VERSION} -PKGNAME = py-pafy-${MODPY_EGG_VERSION} +DISTNAME = pafy-${MODPY_DISTV} +PKGNAME = py-pafy-${MODPY_DISTV} CATEGORIES = multimedia -REVISION = 4 +REVISION = 5 # LGPLv3+ PERMIT_PACKAGE = Yes @@ -15,7 +15,4 @@ MODPY_PI = Yes BUILD_DEPENDS = www/youtube-dl RUN_DEPENDS = www/youtube-dl -FLAVORS = python3 -FLAVOR = python3 - .include diff --git a/multimedia/py-pafy/pkg/PLIST b/multimedia/py-pafy/pkg/PLIST index 188d8f31b54..72a3a8ca6dc 100644 --- a/multimedia/py-pafy/pkg/PLIST +++ b/multimedia/py-pafy/pkg/PLIST @@ -1,11 +1,11 @@ -@pkgpath multimedia/py-pafy +@pkgpath multimedia/py-pafy,python3 bin/ytdl lib/python${MODPY_VERSION}/site-packages/pafy/ -lib/python${MODPY_VERSION}/site-packages/pafy-${MODPY_EGG_VERSION}.dist-info/ -lib/python${MODPY_VERSION}/site-packages/pafy-${MODPY_EGG_VERSION}.dist-info/METADATA -lib/python${MODPY_VERSION}/site-packages/pafy-${MODPY_EGG_VERSION}.dist-info/RECORD -lib/python${MODPY_VERSION}/site-packages/pafy-${MODPY_EGG_VERSION}.dist-info/WHEEL -lib/python${MODPY_VERSION}/site-packages/pafy-${MODPY_EGG_VERSION}.dist-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/pafy-${MODPY_DISTV}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/pafy-${MODPY_DISTV}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/pafy-${MODPY_DISTV}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/pafy-${MODPY_DISTV}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/pafy-${MODPY_DISTV}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/pafy/__init__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pafy/${MODPY_PYCACHE}/ lib/python${MODPY_VERSION}/site-packages/pafy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} diff --git a/multimedia/streamlink/Makefile b/multimedia/streamlink/Makefile index 53347c16702..07f740d2b9c 100644 --- a/multimedia/streamlink/Makefile +++ b/multimedia/streamlink/Makefile @@ -1,8 +1,8 @@ -MODPY_EGG_VERSION = 6.5.1 +MODPY_DISTV = 6.5.1 COMMENT = pipe video streams into a video player -DISTNAME = streamlink-${MODPY_EGG_VERSION} +DISTNAME = streamlink-${MODPY_DISTV} CATEGORIES = multimedia net -REVISION = 0 +REVISION = 1 HOMEPAGE = https://streamlink.github.io/ MAINTAINER = Brian Callahan @@ -14,24 +14,24 @@ MODULES = lang/python MODPY_PI = Yes MODPY_PYBUILD = setuptools -RUN_DEPENDS = devel/py-certifi${MODPY_FLAVOR} \ - devel/py-isodate${MODPY_FLAVOR} \ - textproc/py-lxml${MODPY_FLAVOR}<6 \ - devel/py-country${MODPY_FLAVOR} \ - security/py-cryptodome${MODPY_FLAVOR}<4 \ - net/py-socks${MODPY_FLAVOR} \ - www/py-requests${MODPY_FLAVOR}<3 \ - devel/py-trio${MODPY_FLAVOR}<1 \ - net/py-trio-websocket${MODPY_FLAVOR}<1 \ - devel/py-typing-extensions${MODPY_FLAVOR} \ - www/py-urllib3${MODPY_FLAVOR}<3 \ - net/py-websocket-client${MODPY_FLAVOR}<2 +RUN_DEPENDS = devel/py-certifi \ + devel/py-isodate \ + textproc/py-lxml<6 \ + devel/py-country \ + security/py-cryptodome<4 \ + net/py-socks \ + www/py-requests<3 \ + devel/py-trio<1 \ + net/py-trio-websocket<1 \ + devel/py-typing-extensions \ + www/py-urllib3<3 \ + net/py-websocket-client<2 RUN_DEPENDS += graphics/ffmpeg -TEST_DEPENDS = devel/py-freezegun${MODPY_FLAVOR} \ - devel/py-mock${MODPY_FLAVOR} \ - devel/py-test-asyncio${MODPY_FLAVOR} \ - devel/py-test-cov${MODPY_FLAVOR} \ - www/py-requests-mock${MODPY_FLAVOR} +TEST_DEPENDS = devel/py-freezegun \ + devel/py-mock \ + devel/py-test-asyncio \ + devel/py-test-cov \ + www/py-requests-mock .include diff --git a/multimedia/yle-dl/Makefile b/multimedia/yle-dl/Makefile index 1ffe51550be..3c61adcaf24 100644 --- a/multimedia/yle-dl/Makefile +++ b/multimedia/yle-dl/Makefile @@ -1,8 +1,8 @@ GH_ACCOUNT = aajanki GH_PROJECT = yle-dl GH_TAGNAME = 20220704 -MODPY_EGG_VERSION = ${GH_TAGNAME} -REVISION = 2 +MODPY_DISTV = ${GH_TAGNAME} +REVISION = 3 COMMENT = download videos from YLE Areena @@ -18,14 +18,14 @@ MODULES = lang/python MODPY_PYBUILD = setuptools -RUN_DEPENDS = devel/py-attrs${MODPY_FLAVOR} \ - devel/py-configargparse${MODPY_FLAVOR} \ +RUN_DEPENDS = devel/py-attrs \ + devel/py-configargparse \ graphics/ffmpeg \ - www/py-requests${MODPY_FLAVOR} \ + www/py-requests \ net/wget \ - textproc/py-lxml${MODPY_FLAVOR} + textproc/py-lxml -TEST_DEPENDS = devel/py-test-runner${MODPY_FLAVOR} +TEST_DEPENDS = devel/py-test-runner TEST_IS_INTERACTIVE = needs network access to download streams TEST_ENV = HOME=/tmp