From 4d273ea38d20c4cec622d521e909dd7ef46e55f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Wed, 17 Aug 2016 10:43:29 +0200 Subject: [PATCH 1/6] Use Python 3 for beets-git. --- .SRCINFO | 28 ++++++++++++++++------------ PKGBUILD | 26 +++++++++++++------------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a9bf252..62fc83b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,3 +1,5 @@ +# Generated by mksrcinfo v8 +# Sun Aug 28 21:35:17 UTC 2016 pkgbase = beets-git pkgdesc = Flexible music library manager and tagger - git version pkgver = 1.3.11.r31.ga0ff517 @@ -6,21 +8,23 @@ pkgbase = beets-git arch = any license = MIT makedepends = git - depends = python2-munkres + depends = python-munkres depends = mutagen - depends = python2-setuptools - depends = python2-unidecode - depends = python2-musicbrainzngs - depends = python2-yaml - depends = python2-enum34 - depends = python2-jellyfish - depends = python2-six - optdepends = python2-pyacoustid: acoustic fingerprinting - optdepends = python2-flask: web interface - optdepends = python2-gobject: BPD audio player plugin - optdepends = python2-pylast: lastgenre plugin + depends = python-setuptools + depends = python-unidecode + depends = python-musicbrainzngs + depends = python-yaml + depends = python-enum34 + depends = python-jellyfish + depends = python-six + optdepends = python-pyacoustid: acoustic fingerprinting + optdepends = python-flask: web interface + optdepends = python-gobject: BPD audio player plugin + optdepends = python-pylast: lastgenre plugin provides = beets + provides = beets-git conflicts = beets + conflicts = beets-git source = git://github.com/beetbox/beets.git md5sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index ebe036a..9159129 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,18 +8,18 @@ pkgdesc="Flexible music library manager and tagger - git version" arch=('any') url="http://beets.io/" license=('MIT') -depends=('python2-munkres' 'mutagen' - 'python2-setuptools' 'python2-unidecode' - 'python2-musicbrainzngs' 'python2-yaml' - 'python2-enum34' 'python2-jellyfish' - 'python2-six') +depends=('python-munkres' 'mutagen' + 'python-setuptools' 'python-unidecode' + 'python-musicbrainzngs' 'python-yaml' + 'python-enum34' 'python-jellyfish' + 'python-six') makedepends=('git') -optdepends=('python2-pyacoustid: acoustic fingerprinting' - 'python2-flask: web interface' - 'python2-gobject: BPD audio player plugin' - 'python2-pylast: lastgenre plugin') -provides=('beets') -conflicts=('beets') +optdepends=('python-pyacoustid: acoustic fingerprinting' + 'python-flask: web interface' + 'python-gobject: BPD audio player plugin' + 'python-pylast: lastgenre plugin') +provides=('beets' 'beets-git') +conflicts=('beets' 'beets-git') source=('git://github.com/beetbox/beets.git') md5sums=('SKIP') @@ -30,12 +30,12 @@ pkgver() { build() { cd ${srcdir}/beets - python2 setup.py build + python setup.py build } package() { cd ${srcdir}/beets - python2 setup.py install --root=${pkgdir} --optimize=1 + python setup.py install --root=${pkgdir} --optimize=1 install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } From f18768e6022359714d2d863963bd27803c38d9c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Sun, 28 Aug 2016 23:36:09 +0200 Subject: [PATCH 2/6] Rename package to beets-python3-git. Temporary rename until beets-git is ready to switch. --- .SRCINFO | 6 +++--- PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 62fc83b..db8dd33 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ # Generated by mksrcinfo v8 -# Sun Aug 28 21:35:17 UTC 2016 -pkgbase = beets-git +# Sun Aug 28 21:36:09 UTC 2016 +pkgbase = beets-python3-git pkgdesc = Flexible music library manager and tagger - git version pkgver = 1.3.11.r31.ga0ff517 pkgrel = 1 @@ -28,5 +28,5 @@ pkgbase = beets-git source = git://github.com/beetbox/beets.git md5sums = SKIP -pkgname = beets-git +pkgname = beets-python3-git diff --git a/PKGBUILD b/PKGBUILD index 9159129..d8639a3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Adrian Sampson # Contributor: Johannes Löthberg -pkgname=beets-git +pkgname=beets-python3-git pkgver=1.3.11.r31.ga0ff517 pkgrel=1 pkgdesc="Flexible music library manager and tagger - git version" From 9c9513e5a668b792c9b2485f2ea847ab5e87ded4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Tue, 10 Jan 2017 12:22:09 +0100 Subject: [PATCH 3/6] Remove python-enum34 dependency. Has been unneeded since Python 3.4, and Arch Linux has Python 3.6 as the default Python now. --- .SRCINFO | 3 +-- PKGBUILD | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index db8dd33..5b23660 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Sun Aug 28 21:36:09 UTC 2016 +# Tue Jan 10 11:22:09 UTC 2017 pkgbase = beets-python3-git pkgdesc = Flexible music library manager and tagger - git version pkgver = 1.3.11.r31.ga0ff517 @@ -14,7 +14,6 @@ pkgbase = beets-python3-git depends = python-unidecode depends = python-musicbrainzngs depends = python-yaml - depends = python-enum34 depends = python-jellyfish depends = python-six optdepends = python-pyacoustid: acoustic fingerprinting diff --git a/PKGBUILD b/PKGBUILD index d8639a3..62bb8d9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,8 +11,7 @@ license=('MIT') depends=('python-munkres' 'mutagen' 'python-setuptools' 'python-unidecode' 'python-musicbrainzngs' 'python-yaml' - 'python-enum34' 'python-jellyfish' - 'python-six') + 'python-jellyfish' 'python-six') makedepends=('git') optdepends=('python-pyacoustid: acoustic fingerprinting' 'python-flask: web interface' From 3b2be62ea8b691a3bab20259fa87124ef3db7cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Tue, 10 Jan 2017 12:36:02 +0100 Subject: [PATCH 4/6] Fetch git data over HTTPS. --- .SRCINFO | 4 +--- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5b23660..3bb4b90 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,3 @@ -# Generated by mksrcinfo v8 -# Tue Jan 10 11:22:09 UTC 2017 pkgbase = beets-python3-git pkgdesc = Flexible music library manager and tagger - git version pkgver = 1.3.11.r31.ga0ff517 @@ -24,7 +22,7 @@ pkgbase = beets-python3-git provides = beets-git conflicts = beets conflicts = beets-git - source = git://github.com/beetbox/beets.git + source = git+https://github.com/beetbox/beets.git md5sums = SKIP pkgname = beets-python3-git diff --git a/PKGBUILD b/PKGBUILD index 62bb8d9..5daf9d0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -19,7 +19,7 @@ optdepends=('python-pyacoustid: acoustic fingerprinting' 'python-pylast: lastgenre plugin') provides=('beets' 'beets-git') conflicts=('beets' 'beets-git') -source=('git://github.com/beetbox/beets.git') +source=('git+https://github.com/beetbox/beets.git') md5sums=('SKIP') pkgver() { From 47a3b6bf64fef96a7d8a9fabddeb720626aaa425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Tue, 10 Jan 2017 12:45:42 +0100 Subject: [PATCH 5/6] beets-python3-git 1.4.3.r3.ga2d37dd5-1 Version bump. --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3bb4b90..241705d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = beets-python3-git pkgdesc = Flexible music library manager and tagger - git version - pkgver = 1.3.11.r31.ga0ff517 + pkgver = 1.4.3.r3.ga2d37dd5 pkgrel = 1 url = http://beets.io/ arch = any diff --git a/PKGBUILD b/PKGBUILD index 5daf9d0..4100d03 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Johannes Löthberg pkgname=beets-python3-git -pkgver=1.3.11.r31.ga0ff517 +pkgver=1.4.3.r3.ga2d37dd5 pkgrel=1 pkgdesc="Flexible music library manager and tagger - git version" arch=('any') From fdf56d66aff9c895b2ca1fd401fb53efee97406b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20=E2=80=9CFreso=E2=80=9D=20S=2E=20Olesen?= Date: Wed, 11 Jan 2017 01:41:22 +0100 Subject: [PATCH 6/6] Fix "mutagen" dependency. For whatever reason base package name for "mutagen" refers to the Python 2 version, with a "python-mutagen" for Python 3. --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 241705d..fbf5a22 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -7,7 +7,7 @@ pkgbase = beets-python3-git license = MIT makedepends = git depends = python-munkres - depends = mutagen + depends = python-mutagen depends = python-setuptools depends = python-unidecode depends = python-musicbrainzngs diff --git a/PKGBUILD b/PKGBUILD index 4100d03..6d8c3f6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ pkgdesc="Flexible music library manager and tagger - git version" arch=('any') url="http://beets.io/" license=('MIT') -depends=('python-munkres' 'mutagen' +depends=('python-munkres' 'python-mutagen' 'python-setuptools' 'python-unidecode' 'python-musicbrainzngs' 'python-yaml' 'python-jellyfish' 'python-six')