update to 1.25.1

changes:
-added Python3 support
-bugfixes
-mp4 improvements

4 files changed, 54 insertions, 29 deletions

diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile
index bf267ce3c4d..d844a430084 100644
--- a/audio/py-mutagen/Makefile
+++ b/audio/py-mutagen/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.14 2014/05/09 07:36:54 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2014/10/17 15:58:57 drochner Exp $
 
-DISTNAME=	mutagen-1.22
+DISTNAME=	mutagen-1.25.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	audio
-MASTER_SITES=	http://mutagen.googlecode.com/files/
+MASTER_SITES=	https://bitbucket.org/lazka/mutagen/downloads/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://code.google.com/p/mutagen/
+HOMEPAGE=	https://bitbucket.org/lazka/mutagen
 COMMENT=	Audio metadata handling for Python
 LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	# none
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 1.22
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/py-mutagen/PLIST b/audio/py-mutagen/PLIST
index f5cb46afd8c..d8e1d18bc36 100644
--- a/audio/py-mutagen/PLIST
+++ b/audio/py-mutagen/PLIST
@@ -1,26 +1,29 @@
-@comment $NetBSD: PLIST,v 1.8 2013/12/04 16:47:32 drochner Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/10/17 15:58:57 drochner Exp $
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/mutagen/__init__.py
 ${PYSITELIB}/mutagen/__init__.pyc
 ${PYSITELIB}/mutagen/__init__.pyo
+${PYSITELIB}/mutagen/_compat.py
+${PYSITELIB}/mutagen/_compat.pyc
+${PYSITELIB}/mutagen/_compat.pyo
 ${PYSITELIB}/mutagen/_constants.py
 ${PYSITELIB}/mutagen/_constants.pyc
 ${PYSITELIB}/mutagen/_constants.pyo
-${PYSITELIB}/mutagen/_id3frames.py
-${PYSITELIB}/mutagen/_id3frames.pyc
-${PYSITELIB}/mutagen/_id3frames.pyo
-${PYSITELIB}/mutagen/_id3specs.py
-${PYSITELIB}/mutagen/_id3specs.pyc
-${PYSITELIB}/mutagen/_id3specs.pyo
-${PYSITELIB}/mutagen/_id3util.py
-${PYSITELIB}/mutagen/_id3util.pyc
-${PYSITELIB}/mutagen/_id3util.pyo
+${PYSITELIB}/mutagen/_file.py
+${PYSITELIB}/mutagen/_file.pyc
+${PYSITELIB}/mutagen/_file.pyo
+${PYSITELIB}/mutagen/_tags.py
+${PYSITELIB}/mutagen/_tags.pyc
+${PYSITELIB}/mutagen/_tags.pyo
 ${PYSITELIB}/mutagen/_util.py
 ${PYSITELIB}/mutagen/_util.pyc
 ${PYSITELIB}/mutagen/_util.pyo
 ${PYSITELIB}/mutagen/_vorbis.py
 ${PYSITELIB}/mutagen/_vorbis.pyc
 ${PYSITELIB}/mutagen/_vorbis.pyo
+${PYSITELIB}/mutagen/aiff.py
+${PYSITELIB}/mutagen/aiff.pyc
+${PYSITELIB}/mutagen/aiff.pyo
 ${PYSITELIB}/mutagen/apev2.py
 ${PYSITELIB}/mutagen/apev2.pyc
 ${PYSITELIB}/mutagen/apev2.pyo
@@ -36,9 +39,18 @@ ${PYSITELIB}/mutagen/easymp4.pyo
 ${PYSITELIB}/mutagen/flac.py
 ${PYSITELIB}/mutagen/flac.pyc
 ${PYSITELIB}/mutagen/flac.pyo
-${PYSITELIB}/mutagen/id3.py
-${PYSITELIB}/mutagen/id3.pyc
-${PYSITELIB}/mutagen/id3.pyo
+${PYSITELIB}/mutagen/id3/__init__.py
+${PYSITELIB}/mutagen/id3/__init__.pyc
+${PYSITELIB}/mutagen/id3/__init__.pyo
+${PYSITELIB}/mutagen/id3/_frames.py
+${PYSITELIB}/mutagen/id3/_frames.pyc
+${PYSITELIB}/mutagen/id3/_frames.pyo
+${PYSITELIB}/mutagen/id3/_specs.py
+${PYSITELIB}/mutagen/id3/_specs.pyc
+${PYSITELIB}/mutagen/id3/_specs.pyo
+${PYSITELIB}/mutagen/id3/_util.py
+${PYSITELIB}/mutagen/id3/_util.pyc
+${PYSITELIB}/mutagen/id3/_util.pyo
 ${PYSITELIB}/mutagen/m4a.py
 ${PYSITELIB}/mutagen/m4a.pyc
 ${PYSITELIB}/mutagen/m4a.pyo
diff --git a/audio/py-mutagen/distinfo b/audio/py-mutagen/distinfo
index 2c9b2bcd22e..d5e4c2e4022 100644
--- a/audio/py-mutagen/distinfo
+++ b/audio/py-mutagen/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2013/12/04 16:47:32 drochner Exp $
+$NetBSD: distinfo,v 1.8 2014/10/17 15:58:57 drochner Exp $
 
-SHA1 (mutagen-1.22.tar.gz) = 4338be32a7fcdbc9063ce58277c144a143a856be
-RMD160 (mutagen-1.22.tar.gz) = 7b537e21c4c0681374106cbde2f21e99cfb55253
-Size (mutagen-1.22.tar.gz) = 813763 bytes
-SHA1 (patch-aa) = 7467c79a7542b13478893282293f81bb9c66df4b
+SHA1 (mutagen-1.25.1.tar.gz) = ac5c193f783ed69d0d3173110e602ea3c29e8169
+RMD160 (mutagen-1.25.1.tar.gz) = 4b21a39e2bbe72005e07069105394eecbfb31e10
+Size (mutagen-1.25.1.tar.gz) = 850800 bytes
+SHA1 (patch-aa) = 3a19a9abdfa15d2e321238a8820ae7ab7011ce62
diff --git a/audio/py-mutagen/patches/patch-aa b/audio/py-mutagen/patches/patch-aa
index a213520ba57..8ef963ec5cd 100644
--- a/audio/py-mutagen/patches/patch-aa
+++ b/audio/py-mutagen/patches/patch-aa
@@ -1,15 +1,29 @@
-$NetBSD: patch-aa,v 1.4 2013/12/04 16:47:32 drochner Exp $
+$NetBSD: patch-aa,v 1.5 2014/10/17 15:58:57 drochner Exp $
 
---- setup.py.orig	2013-09-06 09:11:46.000000000 +0000
+--- setup.py.orig	2014-10-04 21:18:16.000000000 +0000
 +++ setup.py
-@@ -203,8 +203,8 @@ if __name__ == "__main__":
+@@ -253,15 +253,15 @@ if __name__ == "__main__":
              'Topic :: Multimedia :: Sound/Audio',
            ],
-           packages=["mutagen"],
+           packages=["mutagen", "mutagen.id3"],
 -          data_files=data_files,
--          scripts=glob.glob("tools/m*[!~]"),
+-          scripts=[os.path.join("tools", name) for name in [
+-            "mid3cp",
+-            "mid3iconv",
+-            "mid3v2",
+-            "moggsplit",
+-            "mutagen-inspect",
+-            "mutagen-pony",
+-          ]],
 +#          data_files=data_files,
-+#          scripts=glob.glob("tools/m*[!~]"),
++#          scripts=[os.path.join("tools", name) for name in [
++#            "mid3cp",
++#            "mid3iconv",
++#            "mid3v2",
++#            "moggsplit",
++#            "mutagen-inspect",
++#            "mutagen-pony",
++#          ]],
            long_description="""\
  Mutagen is a Python module to handle audio metadata. It supports ASF,
  FLAC, M4A, Monkey's Audio, MP3, Musepack, Ogg FLAC, Ogg Speex, Ogg