From 371e281cd832f5d0a7ace79de124935998015173 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Fri, 21 Oct 2011 10:50:23 +0000
Subject: [PATCH] - update to 0.5.5 (which is still behaving badly with
 telepathy-butterfly..)

---
 net/papyon/Makefile               |  5 ++---
 net/papyon/distinfo               | 10 ++++-----
 net/papyon/patches/patch-setup_py | 34 -------------------------------
 net/papyon/pkg/PLIST              |  6 +-----
 4 files changed, 8 insertions(+), 47 deletions(-)
 delete mode 100644 net/papyon/patches/patch-setup_py

diff --git a/net/papyon/Makefile b/net/papyon/Makefile
index b364e1355ae..52c0e9b68e0 100644
--- a/net/papyon/Makefile
+++ b/net/papyon/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2011/09/16 11:13:39 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2011/10/21 10:50:23 jasper Exp $
 
 COMMENT=		fork of pymsn to support telepathy-butterfly
 
-MODPY_EGG_VERSION=	0.5.4
+MODPY_EGG_VERSION=	0.5.5
 DISTNAME=		papyon-${MODPY_EGG_VERSION}
-REVISION=		2
 CATEGORIES=		net
 
 HOMEPAGE=		http://www.freedesktop.org/wiki/Software/papyon
diff --git a/net/papyon/distinfo b/net/papyon/distinfo
index dc09044af59..dc831b87a04 100644
--- a/net/papyon/distinfo
+++ b/net/papyon/distinfo
@@ -1,5 +1,5 @@
-MD5 (papyon-0.5.4.tar.gz) = QgBSBt/cASIdoUDjBoewuQ==
-RMD160 (papyon-0.5.4.tar.gz) = hqNW++LL1iwx3MWsrsgaX3ggfP0=
-SHA1 (papyon-0.5.4.tar.gz) = uV12A4N4Hu2lYWFF6aTpcO4oDY8=
-SHA256 (papyon-0.5.4.tar.gz) = YA7LJIDE/KDvp6pt+GZedf33t9OPo64jIUQ26wV+j/M=
-SIZE (papyon-0.5.4.tar.gz) = 194141
+MD5 (papyon-0.5.5.tar.gz) = X/INGBA9CRd61vPC6CdHwQ==
+RMD160 (papyon-0.5.5.tar.gz) = Am0ZPBmDx5ny7IWGeyoyF1KTdwU=
+SHA1 (papyon-0.5.5.tar.gz) = 0WTxxcNSLFByvVW0O8Can5OHg50=
+SHA256 (papyon-0.5.5.tar.gz) = NtPfAYPU//0WKgrNV2dq45Osd+b2hZfLYTZDxh+IYH8=
+SIZE (papyon-0.5.5.tar.gz) = 184635
diff --git a/net/papyon/patches/patch-setup_py b/net/papyon/patches/patch-setup_py
deleted file mode 100644
index 30e62158177..00000000000
--- a/net/papyon/patches/patch-setup_py
+++ /dev/null
@@ -1,34 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1 2011/01/20 18:55:17 jasper Exp $
-
-Don't bother installing regression tests.
-
---- setup.py.orig	Thu Jan 20 19:54:05 2011
-+++ setup.py	Thu Jan 20 19:54:07 2011
-@@ -50,17 +50,16 @@ if pieces[-1] == '':
- else:
-     len_root_dir = len(pieces)
- 
--for directory in ('papyon', 'tests'):
--    papyon_dir = os.path.join(root_dir, directory)
--    for dirpath, dirnames, filenames in os.walk(papyon_dir):
--        # Ignore dirnames that start with '.'
--        for i, dirname in enumerate(dirnames):
--            if dirname.startswith('.'):
--                del dirnames[i]
--        if '__init__.py' in filenames:
--            packages.append('.'.join(path_split(dirpath)[len_root_dir:]))
--        elif filenames:
--            data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
-+papyon_dir = os.path.join(root_dir, 'papyon')
-+for dirpath, dirnames, filenames in os.walk(papyon_dir):
-+    # Ignore dirnames that start with '.'
-+    for i, dirname in enumerate(dirnames):
-+	if dirname.startswith('.'):
-+	    del dirnames[i]
-+    if '__init__.py' in filenames:
-+	packages.append('.'.join(path_split(dirpath)[len_root_dir:]))
-+    elif filenames:
-+	data_files.append([dirpath, [os.path.join(dirpath, f) for f in filenames]])
- 
- # Setup
- setup(name=NAME,
diff --git a/net/papyon/pkg/PLIST b/net/papyon/pkg/PLIST
index 035aa9dee51..0d2c9fb3b9f 100644
--- a/net/papyon/pkg/PLIST
+++ b/net/papyon/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2011/01/20 18:55:17 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.6 2011/10/21 10:50:23 jasper Exp $
 @pkgpath net/pymsn
 lib/python${MODPY_VERSION}/site-packages/papyon/
 lib/python${MODPY_VERSION}/site-packages/papyon-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
@@ -166,10 +166,6 @@ lib/python${MODPY_VERSION}/site-packages/papyon/msnp2p/transport/__init__.py
 lib/python${MODPY_VERSION}/site-packages/papyon/msnp2p/transport/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/papyon/msnp2p/transport/base.py
 lib/python${MODPY_VERSION}/site-packages/papyon/msnp2p/transport/base.pyc
-lib/python${MODPY_VERSION}/site-packages/papyon/msnp2p/transport/default.py
-lib/python${MODPY_VERSION}/site-packages/papyon/msnp2p/transport/default.pyc
-lib/python${MODPY_VERSION}/site-packages/papyon/msnp2p/transport/nat_traversal.py
-lib/python${MODPY_VERSION}/site-packages/papyon/msnp2p/transport/nat_traversal.pyc
 lib/python${MODPY_VERSION}/site-packages/papyon/msnp2p/transport/notification.py
 lib/python${MODPY_VERSION}/site-packages/papyon/msnp2p/transport/notification.pyc
 lib/python${MODPY_VERSION}/site-packages/papyon/msnp2p/transport/switchboard.py