Update to 1.31:

1.31 - 2015.09.10
-----------------

* New padding control API for flac/id3/mp4/asf/ogg/aiff and everything
  based on it, except oggflac :bug:`229`
* Mutagen will now reduce padding on save if there is lots of it.
* delete() will remove padding in addition to tags.

* ASF:

  * Padding support :bug:`201`
  * Don't report negative lengths for some broken files
  * New :class:`asf.ASFInfo`.codec_type/codec_name/codec_description
  * Implement ASF.delete()

* OGG: Padding support for Opus/Vorbis/Theora/Speex
* M4A: Implementation removed. Every operation will raise. Use mp4 instead.
* Tools: Support Unicode output under Windows :bug:`232`


1.30 - 2015.08.22
-----------------

* FLAC:

  * Fix :meth:`flac.FLAC.save` in case the source contained a too large
    (invalid but recovered) image block :bug:`226`

* MP3:

  * Improved length and bitrate accuracy:

    * Read lame "Info" tags for improved bitrate/length accuracy
    * Use bytes info of VBRI headers for improved bitrate accuracy
    * Subtract encoder delay/padding from length for improved length accuracy
      (especially for short tracks)
    * Fix rare false identification of Xing headers :bug:`182`

  * New :class:`mp3.MPEGInfo`.encoder_info attribute containing the encoder
    name and version :bug:`66`
  * New :class:`mp3.MPEGInfo`.bitrate_mode attribute exposing if the file is
    VBR, ABR or CBR :bug:`24` :bug:`66`
  * New :class:`mp3.MPEGInfo`.channels attribute providing the channel count
  * New :class:`mp3.MPEGInfo`.track_gain/track_peak/album_gain values exposing
    the replaygain info provided by the lame header :bug:`36`

* ID3:

  * New :class:`id3.PictureType` enum for the picture type used in APIC frames :bug:`222`

* MP4:

  * Fix MP4FreeForm.__eq__ and MP4Cover.__eq__ when comparing with bytes
    :bug:`218`

* Don't raise on :meth:`FileType.save` if there are no tags. :bug:`227`
* Minor fixes: :bug:`228`


1.29 - 2015.05.09
-----------------

* mid3v2: Fix an error under Python 3 with files without tags :bug:`219`
* mid3v2: Various Windows+Python2+Unicode fixes :bug:`214`
* Don't emit warnings during loading (ID3Warning) :bug:`223`
* py.test support


1.28 - 2015.03.06
-----------------

* Various minor fixes to make mutagen behave the same under Python3 as under
  Python2.
* Update gpl text :bug:`205`
* Documentation: Add example for how to create a new flac.Picture :bug:`209`

* ID3:

  * Various error handling fixes (:bug:`110`, :bug:`211`, ...)
  * Don't hide ID3 loading errors with ID3FileType.
  * In case a synch safe marked frame isn't sync safe, only warn :bug:`210`
  * Removed PEDANTIC mode

* Tools:

  * Add signal handling :bug:`170`
  * mid3cp: Make it work under Windows.
  * mutagen-inspect: Make it work under Windows+Python3 :bug:`216`
  * Support unicode file paths under Windows+Python2 :bug:`214`
  * Support file paths with invalid encoding under Unix+Python3.

4 files changed, 31 insertions, 14 deletions

diff --git a/audio/py-mutagen/Makefile b/audio/py-mutagen/Makefile
index a587021789e..2226263cb1c 100644
--- a/audio/py-mutagen/Makefile
+++ b/audio/py-mutagen/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2015/01/06 19:52:40 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2015/11/04 09:53:40 wiz Exp $
 
-DISTNAME=	mutagen-1.27
+DISTNAME=	mutagen-1.31
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	audio
 MASTER_SITES=	https://bitbucket.org/lazka/mutagen/downloads/
diff --git a/audio/py-mutagen/PLIST b/audio/py-mutagen/PLIST
index e85044697f9..26e0f1e434d 100644
--- a/audio/py-mutagen/PLIST
+++ b/audio/py-mutagen/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2015/01/06 19:52:40 drochner Exp $
+@comment $NetBSD: PLIST,v 1.11 2015/11/04 09:53:40 wiz Exp $
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/mutagen/__init__.py
 ${PYSITELIB}/mutagen/__init__.pyc
@@ -12,9 +12,15 @@ ${PYSITELIB}/mutagen/_constants.pyo
 ${PYSITELIB}/mutagen/_file.py
 ${PYSITELIB}/mutagen/_file.pyc
 ${PYSITELIB}/mutagen/_file.pyo
+${PYSITELIB}/mutagen/_mp3util.py
+${PYSITELIB}/mutagen/_mp3util.pyc
+${PYSITELIB}/mutagen/_mp3util.pyo
 ${PYSITELIB}/mutagen/_tags.py
 ${PYSITELIB}/mutagen/_tags.pyc
 ${PYSITELIB}/mutagen/_tags.pyo
+${PYSITELIB}/mutagen/_toolsutil.py
+${PYSITELIB}/mutagen/_toolsutil.pyc
+${PYSITELIB}/mutagen/_toolsutil.pyo
 ${PYSITELIB}/mutagen/_util.py
 ${PYSITELIB}/mutagen/_util.pyc
 ${PYSITELIB}/mutagen/_util.pyo
@@ -30,9 +36,18 @@ ${PYSITELIB}/mutagen/aiff.pyo
 ${PYSITELIB}/mutagen/apev2.py
 ${PYSITELIB}/mutagen/apev2.pyc
 ${PYSITELIB}/mutagen/apev2.pyo
-${PYSITELIB}/mutagen/asf.py
-${PYSITELIB}/mutagen/asf.pyc
-${PYSITELIB}/mutagen/asf.pyo
+${PYSITELIB}/mutagen/asf/__init__.py
+${PYSITELIB}/mutagen/asf/__init__.pyc
+${PYSITELIB}/mutagen/asf/__init__.pyo
+${PYSITELIB}/mutagen/asf/_attrs.py
+${PYSITELIB}/mutagen/asf/_attrs.pyc
+${PYSITELIB}/mutagen/asf/_attrs.pyo
+${PYSITELIB}/mutagen/asf/_objects.py
+${PYSITELIB}/mutagen/asf/_objects.pyc
+${PYSITELIB}/mutagen/asf/_objects.pyo
+${PYSITELIB}/mutagen/asf/_util.py
+${PYSITELIB}/mutagen/asf/_util.pyc
+${PYSITELIB}/mutagen/asf/_util.pyo
 ${PYSITELIB}/mutagen/easyid3.py
 ${PYSITELIB}/mutagen/easyid3.pyc
 ${PYSITELIB}/mutagen/easyid3.pyo
diff --git a/audio/py-mutagen/distinfo b/audio/py-mutagen/distinfo
index 7e0d1790da3..253b6ab1d59 100644
--- a/audio/py-mutagen/distinfo
+++ b/audio/py-mutagen/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2015/11/03 01:12:48 agc Exp $
+$NetBSD: distinfo,v 1.11 2015/11/04 09:53:40 wiz Exp $
 
-SHA1 (mutagen-1.27.tar.gz) = 4c9b874feb6f1e9dbf6f2c37341dad3a47135640
-RMD160 (mutagen-1.27.tar.gz) = b6d4c5c880b9eba4b0377e04421c840392c20eff
-SHA512 (mutagen-1.27.tar.gz) = ae15fb3f5d77025a60e25a2ed25e23f7d21160d4e63c49fe7d01508440ff1f6b673cf34d8f4facc834824825ad6f4d3ed9830133db5aba339ac1eae46f7f50d5
-Size (mutagen-1.27.tar.gz) = 875720 bytes
-SHA1 (patch-aa) = 23644c996940b95bb430ae303d3aef2e0a9287d4
+SHA1 (mutagen-1.31.tar.gz) = 09721ea47b9ebdf0c76a7b2e07cdd50c23993e10
+RMD160 (mutagen-1.31.tar.gz) = 3573207b601a31e0dcdb9440c59fbec21e2b5417
+SHA512 (mutagen-1.31.tar.gz) = d603afa049e2223dc1050ee26101add4150f8ca57fcee1bbbfd1233276b15fda5972d58e8472135396e54f2778219462619fbec8dddb97c35a7fb7638fec0c23
+Size (mutagen-1.31.tar.gz) = 897785 bytes
+SHA1 (patch-aa) = 05453c544b1d242000b1c897c9a42450d86ca4cb
diff --git a/audio/py-mutagen/patches/patch-aa b/audio/py-mutagen/patches/patch-aa
index 860f727ed4a..cc082366da9 100644
--- a/audio/py-mutagen/patches/patch-aa
+++ b/audio/py-mutagen/patches/patch-aa
@@ -1,11 +1,13 @@
-$NetBSD: patch-aa,v 1.6 2015/01/06 19:52:40 drochner Exp $
+$NetBSD: patch-aa,v 1.7 2015/11/04 09:53:40 wiz Exp $
+
+Do not install the command line tools. -- drochner, 2009
 
 --- setup.py.orig	2014-11-26 13:18:57.000000000 +0000
 +++ setup.py
 @@ -256,15 +256,15 @@ if __name__ == "__main__":
              'Topic :: Multimedia :: Sound/Audio',
            ],
-           packages=["mutagen", "mutagen.id3", "mutagen.mp4"],
+           packages=["mutagen", "mutagen.id3", "mutagen.mp4", "mutagen.asf"],
 -          data_files=data_files,
 -          scripts=[os.path.join("tools", name) for name in [
 -            "mid3cp",