diff --git a/srcpkgs/python-astroid/template b/srcpkgs/python-astroid/template index 3729aa10e3..de67625b21 100644 --- a/srcpkgs/python-astroid/template +++ b/srcpkgs/python-astroid/template @@ -1,20 +1,21 @@ # Template file for 'python-astroid' pkgname=python-astroid -version=1.3.8 +version=1.4.1 revision=1 noarch=yes +replaces="python-logilab-common>=0" wrksrc="astroid-${version}" build_style=python-module python_versions="2.7 3.4" hostmakedepends="python-setuptools python3.4-setuptools" -depends="python-logilab-common python-six" +depends="python-six python-lazy-object-proxy python-wrapt" pycompile_module="astroid" short_desc="Abstract syntax tree for Python2" maintainer="Alessio Sergi <al3hex@gmail.com>" homepage="https://bitbucket.org/logilab/astroid" license="GPL-2, LGPL-2.1" distfiles="${PYPI_SITE}/a/astroid/astroid-${version}.tar.gz" -checksum=3971c35c675dc7acfceb636eb1758b7df9fc3ad75b5f81ca89f57ccf51719442 +checksum=2417a2c62f07bb77485efb6dd94567ac165808a4248ecb09754116662ffa9fc2 post_install() { # no tests @@ -23,7 +24,8 @@ post_install() { python3.4-astroid_package() { noarch=yes - depends="python3.4-logilab-common python3.4-six" + replaces="python3.4-logilab-common>=0" + depends="python3.4-six python3.4-lazy-object-proxy python3.4-wrapt" pycompile_version="3.4" pycompile_module="astroid" short_desc="${short_desc/Python2/Python3.4}" diff --git a/srcpkgs/python-logilab-common/template b/srcpkgs/python-logilab-common/template deleted file mode 100644 index 6251188cb7..0000000000 --- a/srcpkgs/python-logilab-common/template +++ /dev/null @@ -1,35 +0,0 @@ -# Template file for 'python-logilab-common' -pkgname=python-logilab-common -version=1.1.0 -revision=1 -noarch=yes -wrksrc="logilab-common-${version}" -build_style=python-module -python_versions="2.7 3.4" -hostmakedepends="python-setuptools python3.4-setuptools" -depends="python-setuptools python-six" -pycompile_module="logilab/common" -short_desc="Collection of low-level Python2 modules used by Logilab projects" -maintainer="Alessio Sergi <al3hex@gmail.com>" -homepage="http://www.logilab.org/project/logilab-common" -license="GPL-2, LGPL-2.1" -distfiles="${PYPI_SITE}/l/logilab-common/logilab-common-${version}.tar.gz" -checksum=9614fdddab90b1170d210c55f67f42584344b2a5fd6091fe4ac142069b08a4ad - -post_install() { - rm -f ${DESTDIR}/usr/bin/pytest - vbin build-2.7/scripts-2.7/pytest - vbin build-3.4/scripts-3.4/pytest pytest3 -} - -python3.4-logilab-common_package() { - noarch=yes - depends="python-setuptools python3.4-six" - pycompile_version="3.4" - pycompile_module="logilab/common" - short_desc="${short_desc/Python2/Python3.4}" - pkg_install() { - vmove usr/bin/pytest3 - vmove usr/lib/python3.4 - } -} diff --git a/srcpkgs/python3.4-logilab-common b/srcpkgs/python3.4-logilab-common deleted file mode 120000 index 3e37830380..0000000000 --- a/srcpkgs/python3.4-logilab-common +++ /dev/null @@ -1 +0,0 @@ -python-logilab-common \ No newline at end of file