From 0c178c1c35ccef501d51c01fdab379c194af9b72 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 17 Oct 2016 16:11:27 +0200 Subject: [PATCH] python-pycountry: rebuild for Python 3.5 Switch to python3-* pkgs. Convert python3.4-* pkg into dummy pkg. --- srcpkgs/python-pycountry/template | 21 +++++++++++++-------- srcpkgs/python3-pycountry | 1 + 2 files changed, 14 insertions(+), 8 deletions(-) create mode 120000 srcpkgs/python3-pycountry diff --git a/srcpkgs/python-pycountry/template b/srcpkgs/python-pycountry/template index ab846117a03..8a6ba30ab66 100644 --- a/srcpkgs/python-pycountry/template +++ b/srcpkgs/python-pycountry/template @@ -1,12 +1,11 @@ # Template file for 'python-pycountry' pkgname=python-pycountry version=1.20 -revision=1 +revision=2 wrksrc="pycountry-${version}" noarch=yes build_style=python-module -python_versions="2.7 3.4" -hostmakedepends="python-setuptools python3.4-setuptools" +hostmakedepends="python-setuptools python3-setuptools" depends="python-lxml" pycompile_module="pycountry" short_desc="ISO databases accessible from Python2" @@ -16,13 +15,19 @@ homepage="http://pypi.python.org/pypi/pycountry" distfiles="${PYPI_SITE}/p/pycountry/pycountry-${version}.tar.gz" checksum=0588efa3171e1d5e4cc96fce569ac865964285fdc8dbdc0860844f74598d1f98 -python3.4-pycountry_package() { +python3-pycountry_package() { noarch=yes - pycompile_version="3.4" - depends="python3.4-lxml" + depends="python3-lxml" pycompile_module="pycountry" - short_desc="${short_desc/Python2/Python3.4}" + replaces="python3.4-pycountry>=0" + short_desc="${short_desc/Python2/Python3}" pkg_install() { - vmove usr/lib/python3.4 + vmove usr/lib/python3* } } +python3.4-pycountry_package() { + noarch=yes + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="python3-pycountry>=${version}_${revision}" +} diff --git a/srcpkgs/python3-pycountry b/srcpkgs/python3-pycountry new file mode 120000 index 00000000000..ef105cd19c0 --- /dev/null +++ b/srcpkgs/python3-pycountry @@ -0,0 +1 @@ +python-pycountry \ No newline at end of file