viq <[email protected]> writes:

> So, currently we have security/py-gnupg, which is
> http://py-gnupg.sourceforge.net/ and
> https://pypi.python.org/pypi/GnuPGInterface/

Yup.

> Now I'm looking into porting
> https://pypi.python.org/pypi/python-gnupg/ and I have no idea how it
> should be named... Unless current one was renamed to
> py-gnupgpinterface or similiar and the new one took it's place.

The current py-gnupg port could go away.  It isn't used by any port, not
even duplicity.  Rather than importing python-gnupg under a different
name, I propose a replacement.  Yes the API is different, but I don't
think this is a concern.

Here's a diff that:
- drops duplicity's dep on GnuPGInterface (it includes its own, improved
  copy).
- replaces GnuPGInterface-0.3.2 with python-gnupg-0.3.7.  DESCR stolen
  from viq, the test that fails is due to files missing in the tarball.

ok?

Index: security/py-gnupg/Makefile
===================================================================
RCS file: /cvs/ports/security/py-gnupg/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- security/py-gnupg/Makefile  11 Mar 2013 11:41:28 -0000      1.25
+++ security/py-gnupg/Makefile  23 Dec 2014 01:04:49 -0000
@@ -2,26 +2,26 @@
 
 COMMENT=       Python module for GnuPG interface
 
-VERSION=       0.3.2
-DISTNAME=      GnuPGInterface-${VERSION}
+VERSION=       0.3.7
+DISTNAME=      python-gnupg-${VERSION}
 PKGNAME=       py-gnupg-${VERSION}
 
-REVISION=      6
+CATEGORIES=    security devel
 
-CATEGORIES=            security devel
+HOMEPAGE=      https://bitbucket.org/vinay.sajip/python-gnupg
 
-HOMEPAGE=      http://py-gnupg.sourceforge.net/
-
-# LGPL
+# BSD 3-clause
 PERMIT_PACKAGE_CDROM=  Yes
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=py-gnupg/}
+MASTER_SITES=  ${MASTER_SITE_PYPI:=p/python-gnupg/}
 
 MODULES=       lang/python
 
 BUILD_DEPENDS= ${RUN_DEPENDS}
 RUN_DEPENDS=   security/gnupg
 
-NO_TEST=       Yes
+do-test:
+       cd ${WRKSRC} && \
+           ${SETENV} ${MAKE_ENV} LOGNAME=nobody ${MODPY_BIN} test_gnupg.py
 
 .include <bsd.port.mk>
Index: security/py-gnupg/distinfo
===================================================================
RCS file: /cvs/ports/security/py-gnupg/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- security/py-gnupg/distinfo  5 Apr 2007 17:26:09 -0000       1.3
+++ security/py-gnupg/distinfo  22 Dec 2014 23:50:05 -0000
@@ -1,5 +1,2 @@
-MD5 (GnuPGInterface-0.3.2.tar.gz) = 1GJ9g0Rvlr2MIvjRXbP3wg==
-RMD160 (GnuPGInterface-0.3.2.tar.gz) = e8Wudb8XIDRCz9qLvbQwsvAv3XU=
-SHA1 (GnuPGInterface-0.3.2.tar.gz) = TZFrD6G6LRiU79wbwMFOpOa0P6Y=
-SHA256 (GnuPGInterface-0.3.2.tar.gz) = 
DqZyJR4uP3G2L+8MAVOVGdUA9rM4+AOva1fmenPMqOY=
-SIZE (GnuPGInterface-0.3.2.tar.gz) = 19875
+SHA256 (python-gnupg-0.3.7.tar.gz) = 
eEOGHIl3CSeeIrSTLzrtCoTNpG5KViSnVvksMqF+6cE=
+SIZE (python-gnupg-0.3.7.tar.gz) = 24725
Index: security/py-gnupg/patches/patch-setup_py
===================================================================
RCS file: security/py-gnupg/patches/patch-setup_py
diff -N security/py-gnupg/patches/patch-setup_py
--- security/py-gnupg/patches/patch-setup_py    9 Feb 2004 19:15:39 -0000       
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1 2004/02/09 19:15:39 xsa Exp $
---- setup.py.orig      2002-01-11 21:20:51.000000000 +0100
-+++ setup.py   2004-01-02 16:31:32.000000000 +0100
-@@ -14,7 +14,7 @@ distutils.core.setup( name = 'GnuPGInter
-                     long_description = long_description,
-                       author = 'Frank J. Tobin',
-                       author_email = '[email protected]',
--                    licence = 'LGPL',
-+                    license = 'LGPL',
-                     platforms = 'POSIX',
-                     keywords = 'GnuPG gpg',
-                       url = 'http://py-gnupg.sourceforge.net/',
Index: security/py-gnupg/pkg/DESCR
===================================================================
RCS file: /cvs/ports/security/py-gnupg/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- security/py-gnupg/pkg/DESCR 31 Jul 2003 19:11:59 -0000      1.2
+++ security/py-gnupg/pkg/DESCR 23 Dec 2014 00:53:13 -0000
@@ -1,3 +1,6 @@
-GnuPGInterface is a Python module to interface with GnuPG.  It
-concentrates on interacting with GnuPG via filehandles, providing
-access to control GnuPG via versatile and extensible means.
+The gnupg module allows Python programs to make use of the
+functionality provided by the GNU Privacy Guard (abbreviated GPG or
+GnuPG). Using this module, Python programs can encrypt and decrypt
+data, digitally sign documents and verify digital signatures, manage
+(generate, list and delete) encryption keys, using proven Public Key
+Infrastructure (PKI) encryption technology based on OpenPGP.
Index: security/py-gnupg/pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/py-gnupg/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- security/py-gnupg/pkg/PLIST 9 Feb 2004 19:15:39 -0000       1.4
+++ security/py-gnupg/pkg/PLIST 22 Dec 2014 23:50:05 -0000
@@ -1,3 +1,4 @@
 @comment $OpenBSD: PLIST,v 1.4 2004/02/09 19:15:39 xsa Exp $
-lib/python${MODPY_VERSION}/site-packages/GnuPGInterface.py
-lib/python${MODPY_VERSION}/site-packages/GnuPGInterface.pyc
+lib/python${MODPY_VERSION}/site-packages/gnupg.py
+lib/python${MODPY_VERSION}/site-packages/gnupg.pyc
+lib/python${MODPY_VERSION}/site-packages/python_gnupg-0.3.7-py${MODPY_VERSION}.egg-info
Index: sysutils/duplicity/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/duplicity/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- sysutils/duplicity/Makefile 14 Nov 2014 07:49:33 -0000      1.31
+++ sysutils/duplicity/Makefile 22 Dec 2014 23:46:27 -0000
@@ -4,6 +4,7 @@ COMMENT =       encrypted backup using rsync a
 
 MODPY_EGG_VERSION = 0.6.25
 DISTNAME =     duplicity-${MODPY_EGG_VERSION}
+REVISION =     0
 
 CATEGORIES =   sysutils
 
@@ -25,7 +26,6 @@ LIB_DEPENDS +=        net/librsync \
 
 RUN_DEPENDS += net/py-boto \
                net/ncftp \
-               security/py-gnupg \
                sysutils/py-lockfile
 
 MAKE_ENV +=    LIBRSYNC_DIR=${LOCALBASE}


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to