package cleanup

3 files changed, 71 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ea0dfaf7160..0608405673c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,18 @@
 pkgbase = python2-mutagen
 	pkgdesc = An audio metadata tag reader and writer (python2 library)
 	pkgver = 1.43.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/quodlibet/mutagen
 	arch = any
 	license = GPL2
-	depends = python2-setuptools
-	source = https://github.com/quodlibet/mutagen/releases/download/release-1.43.1/mutagen-1.43.1.tar.gz
-	source = https://github.com/quodlibet/mutagen/releases/download/release-1.43.1/mutagen-1.43.1.tar.gz.sig
+	makedepends = python2-setuptools
+	depends = python2
+	source = python2-mutagen-1.43.1.tar.gz::https://github.com/quodlibet/mutagen/releases/download/release-1.43.1/mutagen-1.43.1.tar.gz
+	source = python2-mutagen-1.43.1.tar.gz.sig::https://github.com/quodlibet/mutagen/releases/download/release-1.43.1/mutagen-1.43.1.tar.gz.sig
+	source = python2.patch
 	validpgpkeys = 0EBF782C5D53F7E5FB02A66746BD761F7A49B0EC
 	sha256sums = d873baeb7815311d3420aab0a1d83f050f628228cbc2d6045a14a16460411bc9
 	sha256sums = SKIP
+	sha256sums = f529b4f9aaeb5a6f8a12ab90361be671bc65c2abdb6ac78e70a776dd59c97abc
 
 pkgname = python2-mutagen
-
diff --git a/PKGBUILD b/PKGBUILD
index 598cc92bab0d..81eb56724fcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,38 @@
-# Maintainer:
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
 # Contributor: Bastien Traverse <neitsab at esrevart dot net>
 # Contributor: David Runge <dvzrv@archlinux.org>
 
+## GPG key: https://github.com/lazka.gpg
+
 _name=mutagen
 pkgname=python2-mutagen
 pkgver=1.43.1
-pkgrel=1
+pkgrel=2
 arch=('any')
 pkgdesc="An audio metadata tag reader and writer (python2 library)"
 url="https://github.com/quodlibet/mutagen"
 license=('GPL2')
-depends=('python2-setuptools')
-source=("https://github.com/quodlibet/${_name}/releases/download/release-$pkgver/${_name}-$pkgver.tar.gz"{,.sig})
+depends=('python2')
+makedepends=('python2-setuptools')
+source=("$pkgname-$pkgver.tar.gz::$url/releases/download/release-$pkgver/$_name-$pkgver.tar.gz"
+        "$pkgname-$pkgver.tar.gz.sig::$url/releases/download/release-$pkgver/$_name-$pkgver.tar.gz.sig"
+				'python2.patch')
 sha256sums=('d873baeb7815311d3420aab0a1d83f050f628228cbc2d6045a14a16460411bc9'
-            'SKIP')
+            'SKIP'
+            'f529b4f9aaeb5a6f8a12ab90361be671bc65c2abdb6ac78e70a776dd59c97abc')
 validpgpkeys=('0EBF782C5D53F7E5FB02A66746BD761F7A49B0EC') # Christoph Reiter <reiter.christoph@gmail.com>
 
 prepare() {
-  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
-  cd "${pkgname}-$pkgver"
-  for script in {mid3{cp,iconv,v2},moggsplit,mutagen-{inspect,pony}}; do
-    sed -e "s/${script}/${script}2/g" -i setup.py
-    mv -v "man/${script}"{,2}.1
-  done
+	patch -p1 -d "$_name-$pkgver" < python2.patch
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
-  python2 setup.py build
+	cd "$_name-$pkgver"
+	python2 setup.py build
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
-  python2 setup.py install --skip-build \
-                           --optimize=1 \
-                           --prefix=/usr \
-                           --root="${pkgdir}"
-  install -vDm 644 {NEWS,README.rst} \
-    -t "${pkgdir}/usr/share/doc/${pkgname}"
+	cd "$_name-$pkgver"
+	PYTHONHASHSEED=0 python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build
+	install -Dm644 README.rst -t "$pkgdir/usr/share/doc/$pkgname"
 }
diff --git a/python2.patch b/python2.patch
new file mode 100644
index 000000000000..70dd34e92ba5
--- /dev/null
+++ b/python2.patch
@@ -0,0 +1,47 @@
+diff --git a/man/mid3cp.1 b/man/mid3cp2.1
+similarity index 100%
+rename from man/mid3cp.1
+rename to man/mid3cp2.1
+diff --git a/man/mid3iconv.1 b/man/mid3iconv2.1
+similarity index 100%
+rename from man/mid3iconv.1
+rename to man/mid3iconv2.1
+diff --git a/man/mid3v2.1 b/man/mid3v2_2.1
+similarity index 100%
+rename from man/mid3v2.1
+rename to man/mid3v2_2.1
+diff --git a/man/moggsplit.1 b/man/moggsplit2.1
+similarity index 100%
+rename from man/moggsplit.1
+rename to man/moggsplit2.1
+diff --git a/man/mutagen-inspect.1 b/man/mutagen-inspect2.1
+similarity index 100%
+rename from man/mutagen-inspect.1
+rename to man/mutagen-inspect2.1
+diff --git a/man/mutagen-pony.1 b/man/mutagen-pony2.1
+similarity index 100%
+rename from man/mutagen-pony.1
+rename to man/mutagen-pony2.1
+diff --git a/setup.py b/setup.py
+index fedfa5f..21c3ba4 100755
+--- a/setup.py
++++ b/setup.py
+@@ -286,12 +286,12 @@ if __name__ == "__main__":
+             '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4'),
+           entry_points={
+             'console_scripts': [
+-              'mid3cp=mutagen._tools.mid3cp:entry_point',
+-              'mid3iconv=mutagen._tools.mid3iconv:entry_point',
+-              'mid3v2=mutagen._tools.mid3v2:entry_point',
+-              'moggsplit=mutagen._tools.moggsplit:entry_point',
+-              'mutagen-inspect=mutagen._tools.mutagen_inspect:entry_point',
+-              'mutagen-pony=mutagen._tools.mutagen_pony:entry_point',
++              'mid3cp2=mutagen._tools.mid3cp:entry_point',
++              'mid3iconv2=mutagen._tools.mid3iconv:entry_point',
++              'mid3v2_2=mutagen._tools.mid3v2:entry_point',
++              'moggsplit2=mutagen._tools.moggsplit:entry_point',
++              'mutagen-inspect2=mutagen._tools.mutagen_inspect:entry_point',
++              'mutagen-pony2=mutagen._tools.mutagen_pony:entry_point',
+             ],
+           },
+           long_description=long_description,