Attachment 110875 Details for Bug 152086 – py-keyring.patch

[patch] py-keyring.patch

py-keyring.patch (text/plain), 3.57 KB, created by Douglas Thrift on 2010-11-10 00:20:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Thrift

Created: 2010-11-10 00:20:07 UTC

Size: 3.57 KB

patch

obsolete

>diff -Nrux .svn -x work /usr/ports/security/py-keyring/Makefile py-keyring/Makefile
>--- /usr/ports/security/py-keyring/Makefile	2010-09-14 00:58:31.000000000 -0700
>+++ py-keyring/Makefile	2010-11-09 16:03:10.259699908 -0800
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	keyring
>-PORTVERSION=	0.4
>+PORTVERSION=	0.5
> CATEGORIES=	security python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>@@ -21,6 +21,7 @@
> USE_KDE4=	#
> USE_PYTHON=	2.4+
> USE_PYDISTUTILS=	yes
>+WANT_GNOME=	yes
> 
> OPTIONS=	GNOME_KEYRING "GNOME Keyring backend" Off \
> 		KDE_KWALLET "KDE KWallet backend" Off
>@@ -28,30 +29,11 @@
> .include <bsd.port.pre.mk>
> 
> .if defined(WITH_GNOME_KEYRING)
>-LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
>-PLIST_SUB+=	GNOME_KEYRING=""
>-.else
>-PLIST_SUB+=	GNOME_KEYRING="@comment "
>+USE_GNOME+=	pygnomedesktop
> .endif
> 
> .if defined(WITH_KDE_KWALLET)
>-PLIST_SUB+=	KDE_KWALLET=""
>-USE_KDE4+=	kdelibs
>-.else
>-PLIST_SUB+=	KDE_KWALLET="@comment "
>-.endif
>-
>-post-patch:
>-.if !defined(WITH_GNOME_KEYRING)
>-	@${REINPLACE_CMD} -e 's|exts\.append(gnome_keychain_module)|#&|' \
>-		${WRKSRC}/extensions.py
>-.endif
>-.if defined(WITH_KDE_KWALLET)
>-	@${REINPLACE_CMD} -e 's|kde-config|${KDE4_PREFIX}/bin/kde4-config|' \
>-		${WRKSRC}/extensions.py
>-.else
>-	@${REINPLACE_CMD} -e 's|exts\.append(kde_kwallet_module)|#&|' \
>-		${WRKSRC}/extensions.py
>+USE_KDE4+=	pykde4
> .endif
> 
> .include <bsd.port.post.mk>
>diff -Nrux .svn -x work /usr/ports/security/py-keyring/distinfo py-keyring/distinfo
>--- /usr/ports/security/py-keyring/distinfo	2010-09-14 00:58:31.000000000 -0700
>+++ py-keyring/distinfo	2010-11-06 17:52:26.770158782 -0700
>@@ -1,3 +1,2 @@
>-MD5 (keyring-0.4.tar.gz) = f4c8fe1a3aa7236e437679d03f5f52c2
>-SHA256 (keyring-0.4.tar.gz) = 01caeb7a388e13b9a93f9f8b912274e14a70c2882b0730ef6ead6303ec8f60be
>-SIZE (keyring-0.4.tar.gz) = 19060
>+SHA256 (keyring-0.5.tar.gz) = dd943b344f3f4748a12936337e1b974ce713cda177c7cdaeed2a1c912fe660c8
>+SIZE (keyring-0.5.tar.gz) = 17491
>diff -Nrux .svn -x work /usr/ports/security/py-keyring/pkg-plist py-keyring/pkg-plist
>--- /usr/ports/security/py-keyring/pkg-plist	2010-09-14 00:58:31.000000000 -0700
>+++ py-keyring/pkg-plist	2010-11-09 02:40:40.763097115 -0800
>@@ -1,17 +1,21 @@
>-%%GNOME_KEYRING%%%%PYTHON_SITELIBDIR%%/gnome_keyring.so
>-%%KDE_KWALLET%%%%PYTHON_SITELIBDIR%%/kde_kwallet.so
> %%PYTHON_SITELIBDIR%%/keyring/__init__.py
> %%PYTHON_SITELIBDIR%%/keyring/__init__.pyc
> %%PYTHON_SITELIBDIR%%/keyring/__init__.pyo
> %%PYTHON_SITELIBDIR%%/keyring/backend.py
> %%PYTHON_SITELIBDIR%%/keyring/backend.pyc
> %%PYTHON_SITELIBDIR%%/keyring/backend.pyo
>+%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.py
>+%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/keyring/backends/__init__.pyo
> %%PYTHON_SITELIBDIR%%/keyring/core.py
> %%PYTHON_SITELIBDIR%%/keyring/core.pyc
> %%PYTHON_SITELIBDIR%%/keyring/core.pyo
> %%PYTHON_SITELIBDIR%%/keyring/getpassbackend.py
> %%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyc
> %%PYTHON_SITELIBDIR%%/keyring/getpassbackend.pyo
>+%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.py
>+%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/keyring/tests/__init__.pyo
> %%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.py
> %%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.pyc
> %%PYTHON_SITELIBDIR%%/keyring/tests/test_backend.pyo
>@@ -27,6 +31,7 @@
> %%PYTHON_SITELIBDIR%%/keyring/util/escape.py
> %%PYTHON_SITELIBDIR%%/keyring/util/escape.pyc
> %%PYTHON_SITELIBDIR%%/keyring/util/escape.pyo
>+@dirrm %%PYTHON_SITELIBDIR%%/keyring/backends
> @dirrm %%PYTHON_SITELIBDIR%%/keyring/tests
> @dirrm %%PYTHON_SITELIBDIR%%/keyring/util
> @dirrm %%PYTHON_SITELIBDIR%%/keyring

Actions: View | Diff

Attachments on bug 152086: 110875