From 8b91e02d66561ebf78011a988fb683aaea569926 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sun, 26 Jun 2011 06:34:01 +0000
Subject: [PATCH] Update to py-tagpy-0.94.8.

---
 audio/py-tagpy/Makefile                        | 10 +++++-----
 audio/py-tagpy/distinfo                        | 10 +++++-----
 audio/py-tagpy/patches/patch-aksetup_helper_py | 18 ++++++++++++++++++
 3 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 audio/py-tagpy/patches/patch-aksetup_helper_py

diff --git a/audio/py-tagpy/Makefile b/audio/py-tagpy/Makefile
index 636def2014d..578744985ec 100644
--- a/audio/py-tagpy/Makefile
+++ b/audio/py-tagpy/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2011/06/08 17:31:33 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2011/06/26 06:34:01 ajacoutot Exp $
 
 COMMENT=		Python bindings to TagLib audio file tag library
 
-MODPY_EGG_VERSION =	0.94.7
+MODPY_EGG_VERSION =	0.94.8
 DISTNAME =		tagpy-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		2
 
 CATEGORIES =		audio devel
 
@@ -17,7 +16,7 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB += boost_python-mt m stdc++ tag
+WANTLIB += boost_python-mt m stdc++ tag ${MODPY_WANTLIB}
 
 MASTER_SITES =		${MASTER_SITE_PYPI:=t/tagpy/}
 
@@ -26,7 +25,8 @@ VMEM_WARNING=		Yes
 MODULES =		lang/python
 MODPY_SETUPTOOLS =	Yes
 
-LIB_DEPENDS =		audio/taglib \
+LIB_DEPENDS =		${MODPY_LIB_DEPENDS} \
+			audio/taglib \
 			devel/boost
 
 CONFIGURE_ARGS +=	--boost-python-libname=boost_python-mt \
diff --git a/audio/py-tagpy/distinfo b/audio/py-tagpy/distinfo
index 59f833b9174..2c8f2d85527 100644
--- a/audio/py-tagpy/distinfo
+++ b/audio/py-tagpy/distinfo
@@ -1,5 +1,5 @@
-MD5 (tagpy-0.94.7.tar.gz) = 8jBKLhVRHM4FfDROpeFWlA==
-RMD160 (tagpy-0.94.7.tar.gz) = l2opvkdMWL2SR2I07cuneEmqV3c=
-SHA1 (tagpy-0.94.7.tar.gz) = S4a6PFZWLoWenlqD7sf2uQqkQAU=
-SHA256 (tagpy-0.94.7.tar.gz) = D9B3toWAkZlclclEuGIc1IpCRr3LC/TkRCDsPFIh6bE=
-SIZE (tagpy-0.94.7.tar.gz) = 150416
+MD5 (tagpy-0.94.8.tar.gz) = a6/2MxjPkLm8WiSXoFl4Ag==
+RMD160 (tagpy-0.94.8.tar.gz) = lAJppKVKImY5AqPGdYgPnvctrr4=
+SHA1 (tagpy-0.94.8.tar.gz) = BSEmpTPkj2CAewpnixXllO9X2Gc=
+SHA256 (tagpy-0.94.8.tar.gz) = Vuq43YFRD4rxjhk3Wg/9XNJcjlVRBL5GqSw9wIY0oNw=
+SIZE (tagpy-0.94.8.tar.gz) = 151986
diff --git a/audio/py-tagpy/patches/patch-aksetup_helper_py b/audio/py-tagpy/patches/patch-aksetup_helper_py
new file mode 100644
index 00000000000..997985f5b87
--- /dev/null
+++ b/audio/py-tagpy/patches/patch-aksetup_helper_py
@@ -0,0 +1,18 @@
+$OpenBSD: patch-aksetup_helper_py,v 1.1 2011/06/26 06:34:01 ajacoutot Exp $
+--- aksetup_helper.py.orig	Tue Jul 20 04:38:24 2010
++++ aksetup_helper.py	Sun Jun 26 08:26:33 2011
+@@ -1,11 +1,11 @@
+ # dealings with ez_setup ------------------------------------------------------
+-import distribute_setup
+-distribute_setup.use_setuptools()
++#import distribute_setup
++#distribute_setup.use_setuptools()
+ 
+ import setuptools
+ from setuptools import Extension
+ 
+-if 'distribute' not in setuptools.__file__:
++if False and 'distribute' not in setuptools.__file__:
+     print "-------------------------------------------------------------------------"
+     print "Setuptools conflict detected."
+     print "-------------------------------------------------------------------------"