Rename python3 packages to python and update to latest. Round 1

mingw-w64-python-cachecontrol/PKGBUILD

@@ -2,26 +2,29 @@
 
 _realname=cachecontrol
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.12.5
-pkgrel=4
+pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
+provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=0.12.6
+pkgrel=1
 pkgdesc="httplib2 caching for requests (mingw-w64)"
 arch=('any')
 url="https://github.com/ionrock/${_realname}"
 license=('Apache')
-depends=("${MINGW_PACKAGE_PREFIX}-python3"
-         "${MINGW_PACKAGE_PREFIX}-python3-msgpack"
-         "${MINGW_PACKAGE_PREFIX}-python3-requests")
-optdepends=("${MINGW_PACKAGE_PREFIX}-python3-lockfile: for the FileCache")
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-#checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock"
-#              "${MINGW_PACKAGE_PREFIX}-python3-pytest"
-#              "${MINGW_PACKAGE_PREFIX}-python3-lockfile"
-#              "${MINGW_PACKAGE_PREFIX}-python3-cherrypy")
+depends=("${MINGW_PACKAGE_PREFIX}-python"
+         "${MINGW_PACKAGE_PREFIX}-python-msgpack"
+         "${MINGW_PACKAGE_PREFIX}-python-requests")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python-lockfile: for the FileCache")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
+#checkdepends=("${MINGW_PACKAGE_PREFIX}-python-mock"
+#              "${MINGW_PACKAGE_PREFIX}-python-pytest"
+#              "${MINGW_PACKAGE_PREFIX}-python-lockfile"
+#              "${MINGW_PACKAGE_PREFIX}-python-cherrypy")
 install=${_realname}3-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
 source=("${_realname}-${pkgver}.tar.gz"::"${url}/archive/v${pkgver}.tar.gz")
-sha256sums=('d3876bbd614968e0d82c95734b380fca648661416fb14dc1a50514256e521089')
+sha256sums=('2ec120838f445bff473cd8b8206ddae3650679142976927179743fabb876f3e3')
 
 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -49,39 +52,35 @@ prepare() {
 #      0002-A-less-important-fix.patch
   popd
 
-  rm -rf python3-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
 
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
 }
 
 build() {
-  msg "Python 3 build for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  ${MINGW_PREFIX}/bin/python3 setup.py build
+  msg "Python build for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 check() {
-  msg "Python 3 test for ${CARCH}"
-  cd "${srcdir}/python3-build-${CARCH}"
-  # ${MINGW_PREFIX}/bin/python3 -m pytest
+  msg "Python test for ${CARCH}"
+  cd "${srcdir}/python-build-${CARCH}"
+  # ${MINGW_PREFIX}/bin/python -m pytest
 }
 
 package() {
-  cd "${srcdir}/python3-build-${CARCH}"
+  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 --skip-build
 
-  # This entire section should be removed if the package does NOT install
-  # anything in the /mingw*/bin directory.
-  ### begin section ###
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
   for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do
     sed -e "s|/usr/bin/env |${MINGW_PREFIX}|g" \
         -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-  #### end section ####
 }