From 67478b3a641c6174fffce4edac557b5a7c89030f Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sun, 16 Oct 2016 22:33:02 +0200 Subject: [PATCH] python-atspi: rebuild for Python 3.5 Switch to python3-* pkgs. Convert python3.4-* pkg into dummy pkg. --- srcpkgs/python-atspi/template | 57 ++++++++++++++++++----------------- srcpkgs/python3-atspi | 1 + 2 files changed, 30 insertions(+), 28 deletions(-) create mode 120000 srcpkgs/python3-atspi diff --git a/srcpkgs/python-atspi/template b/srcpkgs/python-atspi/template index 4eca1dfcd36..f21952b2c33 100644 --- a/srcpkgs/python-atspi/template +++ b/srcpkgs/python-atspi/template @@ -1,16 +1,13 @@ # Template file for 'python-atspi' pkgname=python-atspi version=2.18.0 -revision=1 +revision=2 noarch=yes -nocross=yes wrksrc="pyatspi-${version}" build_style=gnu-configure -python_versions="2.7 3.4" hostmakedepends="pkg-config" makedepends="at-spi2-core-devel python-gobject-devel" depends="${makedepends//-devel/}" -replaces="pyatspi>=0" pycompile_module="pyatspi" short_desc="Python2 bindings for AT-SPI" maintainer="Juan RP " @@ -19,39 +16,43 @@ license="GPL-2" distfiles="${GNOME_SITE}/pyatspi/${version%.*}/pyatspi-${version}.tar.xz" checksum=f86f03ad05d0502cd60fe8b98f746f74ce3bc208e9f3798f6a2130b3c5f4ab46 +pre_configure() { + mkdir -p atspi-${py2_ver} + mv * atspi-${py2_ver} || true + cp -a atspi-${py2_ver} atspi-${py3_ver} +} do_configure() { - mkdir ${wrksrc}/python2-build - cd ${wrksrc}/python2-build - ../configure ${configure_args} --with-python=/usr/bin/python - - mkdir ${wrksrc}/python3.4-build - cd ${wrksrc}/python3.4-build - ../configure ${configure_args} --with-python=/usr/bin/python3.4 + for pyver in $py2_ver $py3_ver; do + cd ${wrksrc}/atspi-${pyver} + ./configure ${configure_args} --with-python=/usr/bin/python${pyver} + done } - do_build() { - cd ${wrksrc}/python2-build - make ${makejobs} - - cd ${wrksrc}/python3.4-build - make ${makejobs} + for pyver in $py2_ver $py3_ver; do + cd ${wrksrc}/atspi-${pyver} + make ${makejobs} + done } - do_install() { - cd ${wrksrc}/python2-build - make DESTDIR=${DESTDIR} install - - cd ${wrksrc}/python3.4-build - make DESTDIR=${DESTDIR} install + for pyver in $py2_ver $py3_ver; do + cd ${wrksrc}/atspi-${pyver} + make DESTDIR=${DESTDIR} install + done } -python3.4-atspi_package() { +python3-atspi_package() { noarch=yes - depends="at-spi2-core>=2.10 python3.4-gobject>=3.10" - pycompile_version="3.4" + replaces="python3.4-atspi>=0" pycompile_module="pyatspi" - short_desc="${short_desc//Python2/Python3.4}" + depends="at-spi2-core python3-gobject" + short_desc="${short_desc/Python2/Python3}" pkg_install() { - vmove /usr/lib/python3.4 + vmove ${py3_sitelib} } } +python3.4-atspi_package() { + noarch=yes + build_style=meta + short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)" + depends="python3-atspi>=${version}_${revision}" +} diff --git a/srcpkgs/python3-atspi b/srcpkgs/python3-atspi new file mode 120000 index 00000000000..2b034c1fa05 --- /dev/null +++ b/srcpkgs/python3-atspi @@ -0,0 +1 @@ +python-atspi \ No newline at end of file