From 537bd95b3db4126fe69b05f4055756d99d40fdba Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Mon, 17 Oct 2016 10:40:07 +0200 Subject: [PATCH] python-psycopg2: rebuild for Python 3.5 Switch to python3-* pkgs. Convert python3.4-* pkg into dummy pkg. Clean up while I'm here. --- srcpkgs/python-psycopg2/template | 28 +++++++++++++++------------- srcpkgs/python3-psycopg2 | 1 + 2 files changed, 16 insertions(+), 13 deletions(-) create mode 120000 srcpkgs/python3-psycopg2 diff --git a/srcpkgs/python-psycopg2/template b/srcpkgs/python-psycopg2/template index ac18c32188..b019ab14c2 100644 --- a/srcpkgs/python-psycopg2/template +++ b/srcpkgs/python-psycopg2/template @@ -1,18 +1,15 @@ # Template file for 'python-psycopg2' pkgname=python-psycopg2 version=2.6.2 -revision=1 +revision=2 _series="${version%.*}" -_module="${pkgname#python-}" -wrksrc="${_module}-${version}" +wrksrc="psycopg2-${version}" build_style=python-module -python_versions='2.7 3.4' -pycompile_version="2.7" -pycompile_module="${_module}" +pycompile_module="psycopg2" # Require postgresql-libs-devel to find executable: pg_config -hostmakedepends="python-devel python3.4-devel postgresql-libs-devel" +hostmakedepends="python-devel python3-devel postgresql-libs-devel" # Require postgresql-libs-devel for libpq-fe.h -makedepends="python-devel python3.4-devel postgresql-libs-devel" +makedepends="python-devel python3-devel postgresql-libs-devel" short_desc="PostgreSQL adapter for Python designed to be thread safe" maintainer="Toyam Cox " license="LGPL-3" @@ -20,11 +17,16 @@ homepage="http://initd.org/psycopg" distfiles="${homepage}/tarballs/PSYCOPG-${_series/./-}/psycopg2-${version}.tar.gz" checksum=70490e12ed9c5c818ecd85d185d363335cc8a8cbf7212e3c185431c79ff8c05c -python3.4-psycopg2_package() { - pycompile_version="3.4" - pycompile_module="${_module}" - short_desc="${short_desc/Python/Python3.4}" +python3-psycopg2_package() { + pycompile_module="psycopg2" + replaces="pythom3.4-psycopg2>=0" + short_desc="${short_desc/Python/Python3}" pkg_install() { - vmove usr/lib/python3.4 + vmove usr/lib/python3* } } +python3.4-psycopg2_package() { + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="python3-psycopg2>=${version}_${revision}" +} diff --git a/srcpkgs/python3-psycopg2 b/srcpkgs/python3-psycopg2 new file mode 120000 index 0000000000..229ccfbf90 --- /dev/null +++ b/srcpkgs/python3-psycopg2 @@ -0,0 +1 @@ +python-psycopg2 \ No newline at end of file