diff --git a/mingw-w64-python-psutil/PKGBUILD b/mingw-w64-python-psutil/PKGBUILD index 02c99da5fe..c71c072e77 100644 --- a/mingw-w64-python-psutil/PKGBUILD +++ b/mingw-w64-python-psutil/PKGBUILD @@ -3,18 +3,15 @@ _pyname=psutil _realname=${_pyname} pkgbase=mingw-w64-python-${_realname} -pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" - "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") +pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=5.6.5 -pkgrel=1 +pkgrel=2 pkgdesc="A cross-platform process and system utilities module for Python (mingw-w64)" arch=('any') url="https://github.com/giampaolo/psutil" license=('BSD') -makedepends=("${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-python3" - "${MINGW_PACKAGE_PREFIX}-python3-setuptools" - "${MINGW_PACKAGE_PREFIX}-python2-setuptools") +depends=("${MINGW_PACKAGE_PREFIX}-python3") +makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools") options=('staticlibs' 'strip' '!debug') source=(${_realname}-${pkgver}.tar.gz::"https://github.com/giampaolo/psutil/archive/release-${pkgver}.tar.gz" '0001-MSYS-Allow-detecting-when-running-on-MSYS.patch' @@ -27,66 +24,29 @@ prepare() { cd "${srcdir}"/${_realname}-release-${pkgver} patch -p1 -i "${srcdir}/0001-MSYS-Allow-detecting-when-running-on-MSYS.patch" patch -p1 -i "${srcdir}/0002-msys-fixes-for-msys2.patch" - cd ${srcdir} - for builddir in python{2,3}-build; do - rm -rf ${builddir} | true - cp -r "${_realname}-release-${pkgver}" "${builddir}" - done + cd ${srcdir} + rm -rf python-build-${CARCH} | true + cp -r "${_realname}-release-${pkgver}" "python-build-${CARCH}" } build() { - for pver in {2,3}; do - msg "Python ${pver} test for ${CARCH}" - cd "${srcdir}/python${pver}-build" - ${MINGW_PREFIX}/bin/python${pver} setup.py build - done + msg "Python test for ${CARCH}" + cd "${srcdir}/python-build-${CARCH}" + ${MINGW_PREFIX}/bin/python setup.py build } check() { - for pver in {2,3}; do - msg "Python ${pver} test for ${CARCH}" - cd "${srcdir}/python${pver}-build" - ${MINGW_PREFIX}/bin/python${pver} setup.py check - done + msg "Python test for ${CARCH}" + cd "${srcdir}/python-build-${CARCH}" + ${MINGW_PREFIX}/bin/python setup.py check } -# Note that build() is sometimes skipped because it's done in -# the packages setup.py install for simplicity if you can do so. -package_python3-psutil() { - depends=("${MINGW_PACKAGE_PREFIX}-python3") - - cd "${srcdir}/python3-build" +package() { + cd "${srcdir}/python-build-${CARCH}" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \ + ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \ --root="${pkgdir}" --optimize=1 - install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING" -} - -package_python2-psutil() { - depends=("${MINGW_PACKAGE_PREFIX}-python2") - - cd "${srcdir}/python2-build" - MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ - ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \ - --root="${pkgdir}" --optimize=1 - - install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/COPYING" -} - -package_mingw-w64-i686-python2-psutil() { - package_python2-psutil -} - -package_mingw-w64-i686-python3-psutil() { - package_python3-psutil -} - -package_mingw-w64-x86_64-python2-psutil() { - package_python2-psutil -} - -package_mingw-w64-x86_64-python3-psutil() { - package_python3-psutil + install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING" }