Attachment #208818 for bug #241688

View | Details | Raw Unified | Return to bug 241688
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	khard
DISTVERSION=	0.15.0
CATEGORIES=	deskutils python
MASTER_SITES=	CHEESESHOP
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	andreas@bilke.org

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/LICENSE

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}
		${PYTHON_PKGNAMEPREFIX}vobject>=0.9.5:deskutils/py-vobject@${PY_FLAVOR}

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

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 \
		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 \

		${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>

Lines 1-3 Link Here

(-)deskutils/py-khard/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1545833923	1	TIMESTAMP = 1572717043
2	SHA256 (khard-0.13.0.tar.gz) = fc93d0b91f7e688a8f60896b4ff7b1968d6b4cb58d80fca9977232c3a68ed2d3	2	SHA256 (scheibler-khard-0.15.0-v0.15.0_GH0.tar.gz) = 73fe4ce33dddfefa93a2dfdeb961aaccd5256cc409998e403a221d3f9ffdc58d
3	SIZE (khard-0.13.0.tar.gz) = 5083020	3	SIZE (scheibler-khard-0.15.0-v0.15.0_GH0.tar.gz) = 5111306




# 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",

Line 0 Link Here

(-)deskutils/py-khard/files/patch-001-version.py (+4 lines)
	1	--- /dev/null 2019-11-02 19:07:11.557310000 +0100
	2	+++ khard/version.py 2019-11-02 19:03:43.129159000 +0100
	3	@@ -0,0 +1 @@
	4	+version='0.15.0'

Return to bug 241688

Lines 1-9 Link Here

(-)deskutils/py-khard/Makefile (-12 / +31 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= khard	3	PORTNAME= khard
4	DISTVERSION= 0.13.0	4	DISTVERSION= 0.15.0
5	CATEGORIES= deskutils python	5	CATEGORIES= deskutils python
6	MASTER_SITES= CHEESESHOP
7	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	6	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
8		7
9	MAINTAINER= andreas@bilke.org	8	MAINTAINER= andreas@bilke.org
Lines 12-36 Link Here
12	LICENSE= GPLv3	11	LICENSE= GPLv3
13	LICENSE_FILE= ${WRKSRC}/LICENSE	12	LICENSE_FILE= ${WRKSRC}/LICENSE
14		13
15	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>1.12.0:devel/py-setuptools_scm@${PY_FLAVOR}	14	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>0:devel/py-atomicwrites@${PY_FLAVOR} \
16	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${PY_FLAVOR} \	15	${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
17	${PYTHON_PKGNAMEPREFIX}configobj>=5.0.6:devel/py-configobj@${PY_FLAVOR} \	16	${PYTHON_PKGNAMEPREFIX}ruamel.yaml>0:devel/py-ruamel.yaml@${PY_FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.15:devel/py-ruamel.yaml@${PY_FLAVOR} \	17	${PYTHON_PKGNAMEPREFIX}unidecode>0:converters/py-unidecode@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}unidecode>=0.04.21:converters/py-unidecode@${PY_FLAVOR} \	18	${PYTHON_PKGNAMEPREFIX}vdirsyncer>0:deskutils/py-vdirsyncer@${PY_FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0:deskutils/py-vdirsyncer@${PY_FLAVOR} \	19	${PYTHON_PKGNAMEPREFIX}vobject>0:deskutils/py-vobject@${PY_FLAVOR}
21	${PYTHON_PKGNAMEPREFIX}vobject>=0.9.5:deskutils/py-vobject@${PY_FLAVOR}
22		20
23	USES= python:3.4+	21	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
		22	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
		23	${RUN_DEPENDS}
		24
		25	USES= python:3.5+ gmake
24	USE_PYTHON= autoplist distutils	26	USE_PYTHON= autoplist distutils
25	NO_ARCH= yes	27	NO_ARCH= yes
26		28
27	PLIST_FILES= share/zsh/site-functions/_khard \	29	USE_GITHUB= yes
		30	GH_ACCOUNT= scheibler
		31	GH_PROJECT= khard
		32	GH_TAGNAME= v0.15.0
		33
		34	PLIST_FILES=\
		35	share/zsh/site-functions/_khard \
28	share/zsh/site-functions/_email-khard \	36	share/zsh/site-functions/_email-khard \
29	${EXAMPLESDIR}/khard.conf.example \	37	${EXAMPLESDIR}/khard.conf.example \
30	${EXAMPLESDIR}/template_for_contact_creation.yaml	38	${EXAMPLESDIR}/template_for_contact_creation.yaml \
		39	man/man1/khard.1.gz \
		40	man/man5/khard.conf.5.gz \
		41	${PYTHONPREFIX_SITELIBDIR}/khard/data/config.spec
31		42
32	SUB_FILES= pkg-message	43	SUB_FILES= pkg-message
33		44
		45	do-build:
		46	(cd ${WRKSRC}/doc && ${MAKE_CMD} man)
		47
34	post-install:	48	post-install:
35	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions	49	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
36	${INSTALL_DATA} ${WRKSRC}/misc/zsh/_khard \	50	${INSTALL_DATA} ${WRKSRC}/misc/zsh/_khard \
Lines 39-43 Link Here
39	${STAGEDIR}${PREFIX}/share/zsh/site-functions	53	${STAGEDIR}${PREFIX}/share/zsh/site-functions
40	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	54	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
41	(cd ${WRKSRC}/misc/khard/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})	55	(cd ${WRKSRC}/misc/khard/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
		56	${INSTALL_MAN} ${WRKSRC}/doc/build/man/khard.1 ${STAGEDIR}${MANPREFIX}/man/man1
		57	${INSTALL_MAN} ${WRKSRC}/doc/build/man/khard.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
		58	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/khard/data
		59	${INSTALL_DATA} ${WRKSRC}/khard/data/config.spec \
		60	${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/khard/data/config.spec
42		61
43	.include <bsd.port.mk>	62	.include <bsd.port.mk>

Line 0 Link Here

(-)deskutils/py-khard/files/patch-001-setup.py (+23 lines)
	1	# Description: LookupError with Github tarball installation
	2	# Issue-ID: https://github.com/scheibler/khard/issues/230
	3	# TODO: Either use the pypi tarball again or wait for a fixed tarball at github
	4
	5	--- setup.py.orig 2019-11-02 18:58:02.715813000 +0100
	6	+++ setup.py 2019-11-02 20:33:17.111403000 +0100
	7	@@ -12,6 +12,7 @@
	8
	9	setup(
	10	name='khard',
	11	+ version='0.15.0',
	12	author='Eric Scheibler',
	13	author_email='email@eric-scheibler.de',
	14	url='https://github.com/scheibler/khard/',
	15	@@ -36,8 +37,6 @@
	16	'unidecode',
	17	'vobject'
	18	],
	19	- use_scm_version={'write_to': 'khard/version.py'},
	20	- setup_requires=['setuptools_scm'],
	21	packages=['khard'],
	22	entry_points={'console_scripts': ['khard = khard.khard:main']},
	23	test_suite="test",