Attachment 208818 Details for Bug 241688 – Update to 0.15.0

[patch] Update to 0.15.0

py36-khard-0.15.0.patch (text/plain), 5.68 KB, created by Andreas Bilke on 2019-11-03 13:06:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Bilke

Created: 2019-11-03 13:06:05 UTC

Size: 5.68 KB

patch

obsolete

>Index: deskutils/py-khard/Makefile
>===================================================================
>--- deskutils/py-khard/Makefile	(revision 516360)
>+++ deskutils/py-khard/Makefile	(working copy)
>@@ -1,9 +1,8 @@
> # $FreeBSD$
> 
> PORTNAME=	khard
>-DISTVERSION=	0.13.0
>+DISTVERSION=	0.15.0
> CATEGORIES=	deskutils python
>-MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
> MAINTAINER=	andreas@bilke.org
>@@ -12,25 +11,40 @@
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>1.12.0:devel/py-setuptools_scm@${PY_FLAVOR}
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15:devel/py-ruamel.yaml@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.21:converters/py-unidecode@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0:deskutils/py-vdirsyncer@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}vobject>=0.9.5:deskutils/py-vobject@${PY_FLAVOR}
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>0:devel/py-atomicwrites@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}unidecode>0:converters/py-unidecode@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}vdirsyncer>0:deskutils/py-vdirsyncer@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}vobject>0:deskutils/py-vobject@${PY_FLAVOR}
> 
>-USES=		python:3.4+
>+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
>+		${RUN_DEPENDS}
>+
>+USES=		python:3.5+ gmake
> USE_PYTHON=	autoplist distutils
> NO_ARCH=	yes
> 
>-PLIST_FILES=	share/zsh/site-functions/_khard \
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	scheibler
>+GH_PROJECT=	khard
>+GH_TAGNAME=	v0.15.0
>+
>+PLIST_FILES=\
>+		share/zsh/site-functions/_khard \
> 		share/zsh/site-functions/_email-khard \
> 		${EXAMPLESDIR}/khard.conf.example \
>-		${EXAMPLESDIR}/template_for_contact_creation.yaml
>+		${EXAMPLESDIR}/template_for_contact_creation.yaml \
>+		man/man1/khard.1.gz \
>+		man/man5/khard.conf.5.gz \
>+		${PYTHONPREFIX_SITELIBDIR}/khard/data/config.spec
> 
> SUB_FILES=	pkg-message
> 
>+do-build:
>+	(cd ${WRKSRC}/doc && ${MAKE_CMD} man)
>+
> post-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
> 	${INSTALL_DATA} ${WRKSRC}/misc/zsh/_khard \
>@@ -39,5 +53,10 @@
> 		${STAGEDIR}${PREFIX}/share/zsh/site-functions
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	(cd ${WRKSRC}/misc/khard/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
>+	${INSTALL_MAN} ${WRKSRC}/doc/build/man/khard.1 ${STAGEDIR}${MANPREFIX}/man/man1
>+	${INSTALL_MAN} ${WRKSRC}/doc/build/man/khard.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
>+	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/khard/data
>+	${INSTALL_DATA} ${WRKSRC}/khard/data/config.spec \
>+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/khard/data/config.spec
> 
> .include <bsd.port.mk>
>Index: deskutils/py-khard/distinfo
>===================================================================
>--- deskutils/py-khard/distinfo	(revision 516360)
>+++ deskutils/py-khard/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1545833923
>-SHA256 (khard-0.13.0.tar.gz) = fc93d0b91f7e688a8f60896b4ff7b1968d6b4cb58d80fca9977232c3a68ed2d3
>-SIZE (khard-0.13.0.tar.gz) = 5083020
>+TIMESTAMP = 1572717043
>+SHA256 (scheibler-khard-0.15.0-v0.15.0_GH0.tar.gz) = 73fe4ce33dddfefa93a2dfdeb961aaccd5256cc409998e403a221d3f9ffdc58d
>+SIZE (scheibler-khard-0.15.0-v0.15.0_GH0.tar.gz) = 5111306
>Index: deskutils/py-khard/files/patch-001-setup.py
>===================================================================
>--- deskutils/py-khard/files/patch-001-setup.py	(nonexistent)
>+++ deskutils/py-khard/files/patch-001-setup.py	(working copy)
>@@ -0,0 +1,23 @@
>+# Description: LookupError with Github tarball installation
>+# Issue-ID: https://github.com/scheibler/khard/issues/230
>+# TODO: Either use the pypi tarball again or wait for a fixed tarball at github
>+
>+--- setup.py.orig	2019-11-02 18:58:02.715813000 +0100
>++++ setup.py	2019-11-02 20:33:17.111403000 +0100
>+@@ -12,6 +12,7 @@
>+ 
>+ setup(
>+     name='khard',
>++    version='0.15.0',
>+     author='Eric Scheibler',
>+     author_email='email@eric-scheibler.de',
>+     url='https://github.com/scheibler/khard/',
>+@@ -36,8 +37,6 @@
>+         'unidecode',
>+         'vobject'
>+     ],
>+-    use_scm_version={'write_to': 'khard/version.py'},
>+-    setup_requires=['setuptools_scm'],
>+     packages=['khard'],
>+     entry_points={'console_scripts': ['khard = khard.khard:main']},
>+     test_suite="test",
>
>Property changes on: deskutils/py-khard/files/patch-001-setup.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: deskutils/py-khard/files/patch-001-version.py
>===================================================================
>--- deskutils/py-khard/files/patch-001-version.py	(nonexistent)
>+++ deskutils/py-khard/files/patch-001-version.py	(working copy)
>@@ -0,0 +1,4 @@
>+--- /dev/null	2019-11-02 19:07:11.557310000 +0100
>++++ khard/version.py	2019-11-02 19:03:43.129159000 +0100
>+@@ -0,0 +1 @@
>++version='0.15.0'
>
>Property changes on: deskutils/py-khard/files/patch-001-version.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 241688: 208818