From a93766fa759ea4506bd2c13d3aaa7501bd4e5c52 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 17 Oct 2016 10:05:40 +0200 Subject: [PATCH] python-snakeoil: rebuild for Python 3.5 Switch to python3-* pkgs. Convert python3.4-* pkgs into dummy pkgs. --- srcpkgs/python-snakeoil/template | 36 +++++++++++++++++++------------- srcpkgs/python3-snakeoil | 1 + srcpkgs/python3-snakeoil-devel | 1 + 3 files changed, 24 insertions(+), 14 deletions(-) create mode 120000 srcpkgs/python3-snakeoil create mode 120000 srcpkgs/python3-snakeoil-devel diff --git a/srcpkgs/python-snakeoil/template b/srcpkgs/python-snakeoil/template index fd73e35dcb7..90d62ee9251 100644 --- a/srcpkgs/python-snakeoil/template +++ b/srcpkgs/python-snakeoil/template @@ -1,13 +1,12 @@ # Template file for 'python-snakeoil' pkgname=python-snakeoil version=0.7.0 -revision=2 +revision=3 wrksrc="snakeoil-${version}" build_style=python-module pycompile_module="snakeoil" -python_versions="2.7 3.4" -hostmakedepends="python-setuptools python3.4-setuptools" -makedepends="python-devel python3.4-devel" +hostmakedepends="python-setuptools python3-setuptools" +makedepends="python-devel python3-devel" short_desc="Python2 optimized versions of common python functionality" maintainer="Toyam Cox " license="BSD, GPL-2" @@ -26,21 +25,30 @@ python-snakeoil-devel_package() { vmove usr/include/python2.7 } } - -python3.4-snakeoil_package() { - pycompile_version="3.4" - short_desc="${short_desc/Python2/Python3.4}" +python3-snakeoil_package() { + replaces="python3.4-snakeoil>=0" pycompile_module="snakeoil" + short_desc="${short_desc/Python2/Python3}" pkg_install() { - vmove usr/lib/python3.4 + vmove usr/lib/python3* vlicense BSD } } - -python3.4-snakeoil-devel_package() { - depends="python3.4-snakeoil>=${version}_${revision}" - short_desc="${short_desc/Python2/Python3.4} - development files" +python3-snakeoil-devel_package() { + replaces="python3.4-snakeoil-devel>=0" + depends="python3-snakeoil>=${version}_${revision}" + short_desc="${short_desc/Python2/Python3} - development files" pkg_install() { - vmove usr/include/python3.4m + vmove usr/include/python3* } } +python3.4-snakeoil_package() { + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="python3-snakeoil>=${version}_${revision}" +} +python3.4-snakeoil-devel_package() { + build_style=meta + short_desc="${short_desc/Python2/Python3.4} - development files (transitional dummy package)" + depends="python3-snakeoil-devel>=${version}_${revision}" +} diff --git a/srcpkgs/python3-snakeoil b/srcpkgs/python3-snakeoil new file mode 120000 index 00000000000..d67a8048bda --- /dev/null +++ b/srcpkgs/python3-snakeoil @@ -0,0 +1 @@ +python-snakeoil \ No newline at end of file diff --git a/srcpkgs/python3-snakeoil-devel b/srcpkgs/python3-snakeoil-devel new file mode 120000 index 00000000000..d67a8048bda --- /dev/null +++ b/srcpkgs/python3-snakeoil-devel @@ -0,0 +1 @@ +python-snakeoil \ No newline at end of file