update to 1.2.0

changes:
-allow additional data sources to augment the matches from MusicBrainz
-New Duplicates Plugin, Missing Plugin
-more feature additions and fixes

4 files changed, 38 insertions, 8 deletions

diff --git a/audio/py-beets/Makefile b/audio/py-beets/Makefile
index dc0b866f814..8cf091f44a2 100644
--- a/audio/py-beets/Makefile
+++ b/audio/py-beets/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2013/05/04 13:27:22 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2013/06/12 20:29:21 drochner Exp $
 #
 
-DISTNAME=	v1.1.0
+DISTNAME=	v1.2.0
 PKGNAME=	beets-${DISTNAME:S/v//}
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/sampsyo/beets/archive/
@@ -14,7 +14,7 @@ LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-last-[0-9]*:../../audio/py-last
 DEPENDS+=	${PYPKGPREFIX}-munkres-[0-9]*:../../math/py-munkres
-DEPENDS+=	${PYPKGPREFIX}-musicbrainz-ngs-[0-9]*:../../audio/py-musicbrainz-ngs
+DEPENDS+=	${PYPKGPREFIX}-musicbrainz-ngs>=0.4:../../audio/py-musicbrainz-ngs
 DEPENDS+=	${PYPKGPREFIX}-mutagen-[0-9]*:../../audio/py-mutagen
 DEPENDS+=	${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 DEPENDS+=	${PYPKGPREFIX}-Unidecode-[0-9]*:../../textproc/py-Unidecode
diff --git a/audio/py-beets/PLIST b/audio/py-beets/PLIST
index 9fa5dee3a65..efa98e887e2 100644
--- a/audio/py-beets/PLIST
+++ b/audio/py-beets/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/05/04 13:27:22 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/06/12 20:29:21 drochner Exp $
 bin/beet
 ${PYSITELIB}/${EGG_NAME}-nspkg.pth
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
@@ -69,6 +69,9 @@ ${PYSITELIB}/beets/util/pipeline.pyo
 ${PYSITELIB}/beets/vfs.py
 ${PYSITELIB}/beets/vfs.pyc
 ${PYSITELIB}/beets/vfs.pyo
+${PYSITELIB}/beetsplug/beatport.py
+${PYSITELIB}/beetsplug/beatport.pyc
+${PYSITELIB}/beetsplug/beatport.pyo
 ${PYSITELIB}/beetsplug/bench.py
 ${PYSITELIB}/beetsplug/bench.pyc
 ${PYSITELIB}/beetsplug/bench.pyo
@@ -84,6 +87,12 @@ ${PYSITELIB}/beetsplug/chroma.pyo
 ${PYSITELIB}/beetsplug/convert.py
 ${PYSITELIB}/beetsplug/convert.pyc
 ${PYSITELIB}/beetsplug/convert.pyo
+${PYSITELIB}/beetsplug/discogs.py
+${PYSITELIB}/beetsplug/discogs.pyc
+${PYSITELIB}/beetsplug/discogs.pyo
+${PYSITELIB}/beetsplug/duplicates.py
+${PYSITELIB}/beetsplug/duplicates.pyc
+${PYSITELIB}/beetsplug/duplicates.pyo
 ${PYSITELIB}/beetsplug/echonest_tempo.py
 ${PYSITELIB}/beetsplug/echonest_tempo.pyc
 ${PYSITELIB}/beetsplug/echonest_tempo.pyo
@@ -122,6 +131,9 @@ ${PYSITELIB}/beetsplug/mbcollection.pyo
 ${PYSITELIB}/beetsplug/mbsync.py
 ${PYSITELIB}/beetsplug/mbsync.pyc
 ${PYSITELIB}/beetsplug/mbsync.pyo
+${PYSITELIB}/beetsplug/missing.py
+${PYSITELIB}/beetsplug/missing.pyc
+${PYSITELIB}/beetsplug/missing.pyo
 ${PYSITELIB}/beetsplug/mpdupdate.py
 ${PYSITELIB}/beetsplug/mpdupdate.pyc
 ${PYSITELIB}/beetsplug/mpdupdate.pyo
diff --git a/audio/py-beets/distinfo b/audio/py-beets/distinfo
index 20128598825..73a0f5a9ebc 100644
--- a/audio/py-beets/distinfo
+++ b/audio/py-beets/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2013/05/04 13:27:22 drochner Exp $
+$NetBSD: distinfo,v 1.3 2013/06/12 20:29:21 drochner Exp $
 
-SHA1 (py-beets/v1.1.0.tar.gz) = 0540fde24092bd21b109858ba3e6712bef6459b4
-RMD160 (py-beets/v1.1.0.tar.gz) = b97946f1d61c2537e81aee651cffac52d51987a0
-Size (py-beets/v1.1.0.tar.gz) = 592370 bytes
+SHA1 (py-beets/v1.2.0.tar.gz) = dc1b26bb6a44ed51aaa182fa9bcb2e92d7b27687
+RMD160 (py-beets/v1.2.0.tar.gz) = 1562aae49d41c724f542ef0d57c1be596e41fe71
+Size (py-beets/v1.2.0.tar.gz) = 615975 bytes
+SHA1 (patch-aa) = b155411bd603f9fc0cd46799d96d69bd08615e90
diff --git a/audio/py-beets/patches/patch-aa b/audio/py-beets/patches/patch-aa
new file mode 100644
index 00000000000..4f6e250f86d
--- /dev/null
+++ b/audio/py-beets/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2013/06/12 20:29:21 drochner Exp $
+
+Python-2.6 compatibility
+
+--- beetsplug/random.py.orig	2013-06-06 04:58:04.000000000 +0000
++++ beetsplug/random.py
+@@ -40,7 +40,9 @@ def random_item(lib, opts, args):
+         # Group the objects by artist so we can sample from them.
+         key = attrgetter('albumartist')
+         objs.sort(key=key)
+-        objs_by_artists = {artist: list(v) for artist, v in groupby(objs, key)}
++        objs_by_artists = {}
++        for artist, v in groupby(objs, key):
++            objs_by_artists[artist] = list(v)
+ 
+         objs = []
+         for _ in range(opts.number):