From f68f232527ccd793291dbf64b4a51ed923dc5ae7 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Tue, 6 Jan 2015 19:15:15 +0100 Subject: [PATCH] python-PyQt4: fix short_desc for python3 pkgs Remove obsolete replaces. --- srcpkgs/python-PyQt4/template | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/srcpkgs/python-PyQt4/template b/srcpkgs/python-PyQt4/template index 43905dbdc58..ea8dd38855d 100644 --- a/srcpkgs/python-PyQt4/template +++ b/srcpkgs/python-PyQt4/template @@ -1,14 +1,14 @@ # Template file for 'python-PyQt4' pkgname=python-PyQt4 version=4.11.3 -revision=2 +revision=3 wrksrc="PyQt-x11-gpl-${version}" hostmakedepends="pkg-config" makedepends="python-devel python3.4-devel python-sip-devel python3.4-sip-devel qt-devel dbus-devel python-dbus-devel MesaLib-devel phonon-devel" depends="python-sip" -replaces="python-PyQt4<4.11.1_2" short_desc="Python2 bindings for the Qt4 toolkit" +_short_desc="${short_desc/Python2/Python3.4}" maintainer="Alessio Sergi " homepage="http://www.riverbankcomputing.co.uk/software/pyqt/intro" update_pkgname="PyQt-x11-gpl" @@ -45,26 +45,20 @@ do_build() { _do_pyqt4_build 3.4 } do_install() { - # install python-pyqt4 + # install python{,3.4}-pyqt4 make -C pyqt4 DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install - - # install python3.4-pyqt4 make -C pyqt4-3.4 DESTDIR=${DESTDIR} INSTALL_ROOT=${DESTDIR} install - # install doc cd ${wrksrc}/pyqt4 + # install python3-pyuic4 wrapper + sed -i 's,python2.7,python3.4,g' pyuic4 + vbin pyuic4 python3-pyuic4 + # install doc vmkdir usr/share/doc/${pkgname} vcopy "doc/html examples" usr/share/doc/${pkgname} } -post_install() { - # install python3-pyuic4 wrapper - cd ${wrksrc}/pyqt4 - sed -i 's,python2.7,python3.4,g' pyuic4 - vbin pyuic4 python3-pyuic4 -} python-PyQt4-devel-tools_package() { - replaces="python-PyQt4<4.11.1_2" short_desc+=" - development tools" pkg_install() { vmove usr/bin/pylupdate4 @@ -72,7 +66,6 @@ python-PyQt4-devel-tools_package() { } } python-PyQt4-devel_package() { - replaces="python-PyQt4<4.11.1_2" depends="python-sip-devel python3.4-sip-devel python-PyQt4>=${version}_${revision} python3.4-PyQt4>=${version}_${revision}" short_desc+=" - development files" @@ -81,48 +74,44 @@ python-PyQt4-devel_package() { } } python-PyQt4-dbus_package() { - replaces="python-PyQt4<4.11.3_1" depends="${sourcepkg}>=${version}_${revision} python-dbus" - short_desc+=" - D-Bus support for PyQt4" + short_desc+=" - D-Bus support" pkg_install() { vmove usr/lib/python2.7/site-packages/dbus/mainloop/qt.so } } python-PyQt4-phonon_package() { depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - Python2 bindings for Phonon" + short_desc+=" - Phonon bindings" pkg_install() { vmove usr/lib/python2.7/site-packages/PyQt4/phonon.so } } python-PyQt4-doc_package() { noarch=yes - replaces="python-PyQt4<4.11.1_2" short_desc+=" - documentation files" pkg_install() { vmove usr/share/doc } } python3.4-PyQt4_package() { - replaces="python3.4-PyQt4<4.11.1_2" depends="python3.4-sip" - short_desc="${short_desc/Python2/Python3.4}" + short_desc="${_short_desc}" pkg_install() { vmove usr/bin/python3-pyuic4 vmove usr/lib/python3.4 } } python3.4-PyQt4-dbus_package() { - replaces="python3.4-PyQt4<4.11.3_1" depends="python3.4-PyQt4>=${version}_${revision} python3.4-dbus" - short_desc+=" - D-Bus support for PyQt4 with Python3.4" + short_desc="${_short_desc} - D-Bus support" pkg_install() { vmove usr/lib/python3.4/site-packages/dbus/mainloop/qt.so } } python3.4-PyQt4-phonon_package() { depends="python3.4-PyQt4>=${version}_${revision}" - short_desc+=" - Python3.4 bindings for Phonon" + short_desc="${_short_desc} - Phonon bindings" pkg_install() { vmove usr/lib/python3.4/site-packages/PyQt4/phonon.so }