mutagen#1.20-1, maj port

3 files changed, 56 insertions, 53 deletions

diff --git a/extra/mutagen/.footprint b/extra/mutagen/.footprint
index 719728bc8..a2e6a50bf 100644
--- a/extra/mutagen/.footprint
+++ b/extra/mutagen/.footprint
@@ -6,56 +6,56 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/mutagen-inspect
 -rwxr-xr-x	root/root	usr/bin/mutagen-pony
 drwxr-xr-x	root/root	usr/lib/
-drwxr-xr-x	root/root	usr/lib/python2.6/
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen-1.19-py2.6.egg-info
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/mutagen/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/__init__.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/__init__.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/_constants.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/_constants.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/_util.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/_util.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/_vorbis.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/_vorbis.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/apev2.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/apev2.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/asf.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/asf.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/easyid3.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/easyid3.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/easymp4.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/easymp4.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/flac.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/flac.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/id3.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/id3.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/m4a.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/m4a.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/monkeysaudio.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/monkeysaudio.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/mp3.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/mp3.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/mp4.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/mp4.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/musepack.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/musepack.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/ogg.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/ogg.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/oggflac.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/oggflac.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/oggspeex.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/oggspeex.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/oggtheora.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/oggtheora.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/oggvorbis.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/oggvorbis.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/optimfrog.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/optimfrog.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/trueaudio.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/trueaudio.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/wavpack.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/mutagen/wavpack.pyc
+drwxr-xr-x	root/root	usr/lib/python2.7/
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen-1.20-py2.7.egg-info
+drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/mutagen/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/__init__.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/__init__.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/_constants.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/_constants.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/_util.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/_util.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/_vorbis.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/_vorbis.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/apev2.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/apev2.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/asf.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/asf.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/easyid3.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/easyid3.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/easymp4.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/easymp4.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/flac.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/flac.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/id3.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/id3.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/m4a.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/m4a.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/monkeysaudio.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/monkeysaudio.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/mp3.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/mp3.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/mp4.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/mp4.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/musepack.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/musepack.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/ogg.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/ogg.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/oggflac.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/oggflac.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/oggspeex.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/oggspeex.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/oggtheora.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/oggtheora.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/oggvorbis.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/oggvorbis.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/optimfrog.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/optimfrog.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/trueaudio.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/trueaudio.pyc
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/wavpack.py
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/mutagen/wavpack.pyc
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
diff --git a/extra/mutagen/.md5sum b/extra/mutagen/.md5sum
index 97eaf84af..943cb22fb 100644
--- a/extra/mutagen/.md5sum
+++ b/extra/mutagen/.md5sum
@@ -1 +1 @@
-68132949f3cd68491b87ff880ded4680  mutagen-1.19.tar.gz
+adb16d9f6056bc864a5c86c6f885af79  mutagen-1.20.tar.gz
diff --git a/extra/mutagen/Pkgfile b/extra/mutagen/Pkgfile
index f17a5ba84..597bfbbb4 100644
--- a/extra/mutagen/Pkgfile
+++ b/extra/mutagen/Pkgfile
@@ -5,14 +5,17 @@
 # Depends on: python
 
 name=mutagen
-version=1.19
+version=1.20
 release=1
 source=(http://mutagen.googlecode.com/files/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
-	python setup.py install --root=$PKG
+	python2 setup.py install --root=$PKG
 	mkdir -p $PKG/usr/bin
 	install -m755 tools/* $PKG/usr/bin
+
+	sed -i 's|^#!.*/usr/bin/env.*python|#!/usr/bin/env python2|' $PKG/usr/bin/* \
+    		$PKG/usr/lib/python2.7/site-packages/mutagen/__init__.py
 }