On 2020-02-29 13:19, Johan Huldtgren wrote:
> hello,
>
> minor update to py-discogs-client from 2.2.1 to 2.2.2
>
> Drop python2 FLAVOR, only consumer audio/beets is already
> python3 only. Built, packaged and tested (with beets) on
> amd64 with no issues.
Now with 100% more @onflict markers.
.jh
> Index: audio/Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/Makefile,v
> retrieving revision 1.424
> diff -u -p -u -p -r1.424 Makefile
> --- audio/Makefile 22 Jan 2020 07:49:02 -0000 1.424
> +++ audio/Makefile 29 Feb 2020 17:19:59 -0000
> @@ -194,7 +194,6 @@
> SUBDIR += py-cddb
> SUBDIR += py-discid
> SUBDIR += py-discid,python3
> - SUBDIR += py-discogs-client
> SUBDIR += py-discogs-client,python3
> SUBDIR += py-eyed3
> SUBDIR += py-last
> Index: audio/py-discogs-client/Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/py-discogs-client/Makefile,v
> retrieving revision 1.12
> diff -u -p -u -p -r1.12 Makefile
> --- audio/py-discogs-client/Makefile 23 Nov 2019 23:36:47 -0000 1.12
> +++ audio/py-discogs-client/Makefile 29 Feb 2020 17:20:00 -0000
> @@ -2,12 +2,11 @@
>
> COMMENT = Python interface to Discogs website
>
> -MODPY_EGG_VERSION = 2.2.1
> +MODPY_EGG_VERSION = 2.2.2
> DISTNAME = discogs-client-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> CATEGORIES = audio
> MAINTAINER = Johan Huldtgren <jhuldtg...@gmail.com>
> -REVISION = 1
>
> HOMEPAGE = https://github.com/discogs/discogs_client
>
> @@ -22,7 +21,7 @@ MODPY_PYTEST = Yes
> MODPY_PYTEST_ARGS = discogs_client
>
> FLAVORS = python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \
> security/py-oauthlib${MODPY_FLAVOR} \
> Index: audio/py-discogs-client/distinfo
> ===================================================================
> RCS file: /cvs/ports/audio/py-discogs-client/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 distinfo
> --- audio/py-discogs-client/distinfo 14 Dec 2015 18:09:09 -0000 1.4
> +++ audio/py-discogs-client/distinfo 29 Feb 2020 17:20:00 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (discogs-client-2.2.1.tar.gz) =
> njK15Fz/Qa+AJYkccaowJbPhiV3lmzfBH9IDqK9odBQ=
> -SIZE (discogs-client-2.2.1.tar.gz) = 24645
> +SHA256 (discogs-client-2.2.2.tar.gz) =
> rq5D+5KB4nxYDRvNSE5sMJ9POgWvOQgBbuM2N4bvQ9g=
> +SIZE (discogs-client-2.2.2.tar.gz) = 25005
> Index: audio/py-discogs-client/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/audio/py-discogs-client/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST
> --- audio/py-discogs-client/pkg/PLIST 11 Jun 2017 21:14:22 -0000 1.3
> +++ audio/py-discogs-client/pkg/PLIST 29 Feb 2020 17:20:01 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.3 2017/06/11 21:14:22 sthen Exp $
> +@pkgpath audio/py-discogs-client
> lib/python${MODPY_VERSION}/site-packages/discogs_client/
>
> lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: audio/Makefile
===================================================================
RCS file: /cvs/ports/audio/Makefile,v
retrieving revision 1.424
diff -u -p -u -p -r1.424 Makefile
--- audio/Makefile 22 Jan 2020 07:49:02 -0000 1.424
+++ audio/Makefile 29 Feb 2020 18:46:53 -0000
@@ -194,7 +194,6 @@
SUBDIR += py-cddb
SUBDIR += py-discid
SUBDIR += py-discid,python3
- SUBDIR += py-discogs-client
SUBDIR += py-discogs-client,python3
SUBDIR += py-eyed3
SUBDIR += py-last
Index: audio/py-discogs-client/Makefile
===================================================================
RCS file: /cvs/ports/audio/py-discogs-client/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- audio/py-discogs-client/Makefile 23 Nov 2019 23:36:47 -0000 1.12
+++ audio/py-discogs-client/Makefile 29 Feb 2020 18:46:55 -0000
@@ -2,12 +2,11 @@
COMMENT = Python interface to Discogs website
-MODPY_EGG_VERSION = 2.2.1
+MODPY_EGG_VERSION = 2.2.2
DISTNAME = discogs-client-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = audio
MAINTAINER = Johan Huldtgren <jhuldtg...@gmail.com>
-REVISION = 1
HOMEPAGE = https://github.com/discogs/discogs_client
@@ -22,7 +21,7 @@ MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS = discogs_client
FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3
RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \
security/py-oauthlib${MODPY_FLAVOR} \
Index: audio/py-discogs-client/distinfo
===================================================================
RCS file: /cvs/ports/audio/py-discogs-client/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- audio/py-discogs-client/distinfo 14 Dec 2015 18:09:09 -0000 1.4
+++ audio/py-discogs-client/distinfo 29 Feb 2020 18:46:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (discogs-client-2.2.1.tar.gz) =
njK15Fz/Qa+AJYkccaowJbPhiV3lmzfBH9IDqK9odBQ=
-SIZE (discogs-client-2.2.1.tar.gz) = 24645
+SHA256 (discogs-client-2.2.2.tar.gz) =
rq5D+5KB4nxYDRvNSE5sMJ9POgWvOQgBbuM2N4bvQ9g=
+SIZE (discogs-client-2.2.2.tar.gz) = 25005
Index: audio/py-discogs-client/pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/py-discogs-client/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- audio/py-discogs-client/pkg/PLIST 11 Jun 2017 21:14:22 -0000 1.3
+++ audio/py-discogs-client/pkg/PLIST 29 Feb 2020 18:46:56 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2017/06/11 21:14:22 sthen Exp $
+@conflict py-discogs-client-*
+@pkgpath audio/py-discogs-client
lib/python${MODPY_VERSION}/site-packages/discogs_client/
lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
