From 8f6ccc4e672a10beb1d41a67b5b70e9a30b0abf8 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 17 Oct 2016 03:25:50 +0200 Subject: [PATCH] python-keyring: rebuild for Python 3.5 Switch to python3-* pkgs. Convert python3.4-* pkg into dummy pkg. --- srcpkgs/python-keyring/template | 27 ++++++++++++++++----------- srcpkgs/python3-keyring | 1 + 2 files changed, 17 insertions(+), 11 deletions(-) create mode 120000 srcpkgs/python3-keyring diff --git a/srcpkgs/python-keyring/template b/srcpkgs/python-keyring/template index a10b9289e3b..8346e709f8b 100644 --- a/srcpkgs/python-keyring/template +++ b/srcpkgs/python-keyring/template @@ -1,12 +1,11 @@ # Template file for 'python-keyring' pkgname=python-keyring version=9.3.1 -revision=1 +revision=2 noarch=yes wrksrc="keyring-${version}" build_style=python-module -python_versions="2.7 3.4" -hostmakedepends="python-setuptools python3.4-setuptools" +hostmakedepends="python-setuptools python3-setuptools" depends="python-setuptools" pycompile_module="keyring" short_desc="Python2 interface to the system keyring service" @@ -15,7 +14,7 @@ license="MIT" homepage="https://github.com/jaraco/keyring" distfiles="${PYPI_SITE}/k/keyring/keyring-${version}.tar.gz" checksum=3be74f6568fcac1350b837d7e46bd3525e2e9fe2b78b3a3a87dc3b29f24a0c00 -alternatives="keyring:keyring:/usr/bin/keyring2.7" +alternatives="keyring:keyring:/usr/bin/keyring2" pre_build() { sed -e '/setuptools_scm/d' \ @@ -23,15 +22,21 @@ pre_build() { -i setup.py } -python3.4-keyring_package() { +python3-keyring_package() { noarch=yes - pycompile_version="3.4" pycompile_module="keyring" - depends="python3.4-setuptools" - short_desc="${short_desc/Python2/Python3.4}" - alternatives="keyring:keyring:/usr/bin/keyring3.4" + depends="python3-setuptools" + replaces="python3.4-keyring>=0" + short_desc="${short_desc/Python2/Python3}" + alternatives="keyring:keyring:/usr/bin/keyring3" pkg_install() { - vmove usr/bin/keyring3.4 - vmove usr/lib/python3.4 + vmove usr/bin/keyring3 + vmove usr/lib/python3* } } +python3.4-keyring_package() { + noarch=yes + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="python3-keyring>=${version}_${revision}" +} diff --git a/srcpkgs/python3-keyring b/srcpkgs/python3-keyring new file mode 120000 index 00000000000..b9655263f39 --- /dev/null +++ b/srcpkgs/python3-keyring @@ -0,0 +1 @@ +python-keyring \ No newline at end of file