On Tue, Aug 11, 2020 at 05:24:24PM -0400, Pamela Mosiejczuk wrote:
> On Tue, Aug 11, 2020 at 04:48:49PM -0400, Pamela Mosiejczuk wrote:

> > Update for multiple minor fixes and removal of consumerless python 2 flavor.
> > This version adds a "variant" selector, allowing specification of text or 
> > emoji
> > variant form (VS15 or VS16).

> > The removed patches have since been upstreamed. Passes all tests.

> > OK?
> > Pamela

> Oops, now with plist tweaking for flavor removal. (Hopefully).

ok kmos

--Kurt

> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/ports/textproc/py-emoji/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile  3 Jul 2020 21:13:14 -0000       1.7
> +++ Makefile  9 Aug 2020 00:47:29 -0000
> @@ -2,10 +2,9 @@
>  
>  COMMENT =            emoji for Python
>  
> -MODPY_EGG_VERSION =  0.5.4
> +MODPY_EGG_VERSION =  0.6.0
>  DISTNAME =           emoji-${MODPY_EGG_VERSION}
>  PKGNAME =            py-${DISTNAME}
> -REVISION =           0
>  
>  CATEGORIES =         textproc
>  
> @@ -22,6 +21,6 @@ MODPY_PI =          Yes
>  MODPY_PYTEST =               Yes
>  
>  FLAVORS =            python3
> -FLAVOR ?=
> +FLAVOR =             python3
>  
>  .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /home/cvs/ports/textproc/py-emoji/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  7 Nov 2019 09:23:53 -0000       1.3
> +++ distinfo  9 Aug 2020 00:16:04 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (emoji-0.5.4.tar.gz) = YGUtOi3O5bivissJfDF3b7bYCAJ663Ihgw9yza/vwXQ=
> -SIZE (emoji-0.5.4.tar.gz) = 43402
> +SHA256 (emoji-0.6.0.tar.gz) = 5C2k+NZI+O8QaRvCRvaCoexrGDc6v9m+EOwLOYgjvRE=
> +SIZE (emoji-0.6.0.tar.gz) = 51003
> Index: patches/patch-setup_cfg
> ===================================================================
> RCS file: patches/patch-setup_cfg
> diff -N patches/patch-setup_cfg
> --- patches/patch-setup_cfg   11 Nov 2019 00:40:45 -0000      1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-setup_cfg,v 1.1 2019/11/11 00:40:45 kmos Exp $
> -
> -Remove unneeded py-nose
> -
> -Index: setup.cfg
> ---- setup.cfg.orig
> -+++ setup.cfg
> -@@ -1,8 +1,3 @@
> --[nosetests]
> --verbosity = 3
> --cover-package = emoji
> --cover-erase = 1
> --
> - [egg_info]
> - tag_build = 
> - tag_date = 0
> Index: patches/patch-setup_py
> ===================================================================
> RCS file: patches/patch-setup_py
> diff -N patches/patch-setup_py
> --- patches/patch-setup_py    11 Nov 2019 00:40:45 -0000      1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-setup_py,v 1.1 2019/11/11 00:40:45 kmos Exp $
> -
> -Remove unneeded py-nose
> -
> -Index: setup.py
> ---- setup.py.orig
> -+++ setup.py
> -@@ -59,7 +59,6 @@ setup(
> -     keywords=['emoji'],
> -     extras_require={
> -         'dev': [
> --            'nose',
> -             'coverage',
> -             'coveralls'
> -         ]
> Index: patches/patch-tests_test_core_py
> ===================================================================
> RCS file: patches/patch-tests_test_core_py
> diff -N patches/patch-tests_test_core_py
> --- patches/patch-tests_test_core_py  11 Nov 2019 00:40:45 -0000      1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-tests_test_core_py,v 1.1 2019/11/11 00:40:45 kmos Exp $
> -
> -Remove unneeded py-nose
> -
> -Index: tests/test_core.py
> ---- tests/test_core.py.orig
> -+++ tests/test_core.py
> -@@ -9,7 +9,6 @@ Unittests for emoji.core
> - from __future__ import unicode_literals
> - 
> - import emoji
> --from nose.tools import assert_raises
> - 
> - 
> - def test_emojize_name_only():
> Index: pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/textproc/py-emoji/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 26 Apr 2019 18:25:54 -0000      1.1.1.1
> +++ pkg/PLIST 11 Aug 2020 21:15:52 -0000
> @@ -1,4 +1,6 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2019/04/26 18:25:54 kmos Exp $
> +@pkgpath textproc/py-emoji
> +@conflict py-emoji-*
>  lib/python${MODPY_VERSION}/site-packages/emoji/
>  
> lib/python${MODPY_VERSION}/site-packages/emoji-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>  
> lib/python${MODPY_VERSION}/site-packages/emoji-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> 

Reply via email to