From be6cb323fbaedd9cc4afb3aa36230e7561ba29d7 Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Wed, 18 Dec 2019 12:14:54 +0300
Subject: [PATCH] python-wheel: Drop python2 package

---
 mingw-w64-python-wheel/PKGBUILD              | 114 +++++--------------
 mingw-w64-python-wheel/wheel2-i686.install   |  14 ---
 mingw-w64-python-wheel/wheel2-x86_64.install |  14 ---
 3 files changed, 27 insertions(+), 115 deletions(-)
 delete mode 100644 mingw-w64-python-wheel/wheel2-i686.install
 delete mode 100644 mingw-w64-python-wheel/wheel2-x86_64.install

diff --git a/mingw-w64-python-wheel/PKGBUILD b/mingw-w64-python-wheel/PKGBUILD
index e9b497047e..151c429574 100644
--- a/mingw-w64-python-wheel/PKGBUILD
+++ b/mingw-w64-python-wheel/PKGBUILD
@@ -6,63 +6,48 @@
 _pyname=wheel
 _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=0.33.6
-pkgrel=1
+pkgrel=2
 pkgdesc="A built-package format for Python (mingw-w64)"
 arch=('any')
 url="https://pypi.python.org/pypi/wheel"
 license=('MIT')
-makedepends=("${MINGW_PACKAGE_PREFIX}-python2"
-             "${MINGW_PACKAGE_PREFIX}-python3"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python2-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python3")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python3-keyring: for wheel.signatures"
+            "${MINGW_PACKAGE_PREFIX}-python3-xdg: for wheel.signatures")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+install=${_realname}3-${CARCH}.install
 options=('staticlibs' 'strip' '!debug')
 source=("https://pypi.io/packages/source/w/wheel/${_pyname}-${pkgver}.tar.gz")
 sha256sums=('10c9da68765315ed98850f8e048347c3eb06dd81822dc2ab1d4fde9dc9702646')
 
 prepare() {
-  for builddir in python{2,3}-build-${CARCH}; do
-    rm -rf $builddir | true
-    cp -r "${_pyname}-${pkgver}" "${builddir}"
-  done  
-}  
-  
-# Note that build() is sometimes skipped because it's done in 
-# the packages setup.py install for simplicity if you can do so.
-# but sometimes, you want to do a check before install which would
-# also trigger the build.  
-build() {  
-  for pver in {2,3}; do  
-    msg "Python ${pver} build for ${CARCH}"
-    cd "${srcdir}/python${pver}-build-${CARCH}"
-    MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-      ${MINGW_PREFIX}/bin/python${pver} setup.py build
-  done  
+  rm -rf python-build-${CARCH} | true
+  cp -r "${_pyname}-${pkgver}" "python-build-${CARCH}"
 }
 
-check() {  
-  for pver in {2,3}; do  
-    msg "Python ${pver} test for ${CARCH}"  
-    cd "${srcdir}/python${pver}-build-${CARCH}"
-    MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-      ${MINGW_PREFIX}/bin/python${pver} setup.py test
-  done  
-}
-
-package_python3-wheel() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python3")
-  optdepends=("${MINGW_PACKAGE_PREFIX}-python3-keyring: for wheel.signatures")
-  optdepends=("${MINGW_PACKAGE_PREFIX}-python3-xdg: for wheel.signatures")
-
-  install=${_realname}3-${CARCH}.install
-
-  cd ${srcdir}/python3-build-${CARCH}
+build() {
+  msg "Python build for ${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 build
+}
+
+check() {
+  msg "Python test for ${CARCH}"  
+  cd "${srcdir}/python-build-${CARCH}"
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+      ${MINGW_PREFIX}/bin/python setup.py test
+}
+
+package() {
+  cd ${srcdir}/python-build-${CARCH}
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} \
     --root="${pkgdir}" --optimize=1 --skip-build
 
-  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/COPYING"
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/COPYING"
 
   local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
   # fix python command in files
@@ -70,48 +55,3 @@ package_python3-wheel() {
     sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_ff}
   done
 }
-
-package_python2-wheel() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python2")
-  optdepends=("${MINGW_PACKAGE_PREFIX}-python2-keyring: for wheel.signatures")
-  optdepends=("${MINGW_PACKAGE_PREFIX}-python2-xdg: for wheel.signatures")
-  install=${_realname}2-${CARCH}.install
-
-  cd ${srcdir}/python2-build-${CARCH}
-  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-    ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \
-    --root="${pkgdir}" --optimize=1 --skip-build
-
-  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/COPYING"
-
-  local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
-  # fix python command in files
-  for _ff in ${pkgdir}${MINGW_PREFIX}/bin/*.py; do
-    sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_ff}
-  done
-  for f in wheel; do
-    mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}.exe
-    if [ -f "${pkgdir}${MINGW_PREFIX}"/bin/${f}.exe.manifest ]; then
-      mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}.exe.manifest
-      sed -e "s|${f}|${f}2|g" -i "${pkgdir}${MINGW_PREFIX}"/bin/${f}2.exe.manifest
-    fi
-    mv "${pkgdir}${MINGW_PREFIX}"/bin/${f}{,2}-script.py
-  done
-
-}
-
-package_mingw-w64-i686-python2-wheel() {
-  package_python2-wheel
-}
-
-package_mingw-w64-i686-python3-wheel() {
-  package_python3-wheel
-}
-
-package_mingw-w64-x86_64-python2-wheel() {
-  package_python2-wheel
-}
-
-package_mingw-w64-x86_64-python3-wheel() {
-  package_python3-wheel
-}
diff --git a/mingw-w64-python-wheel/wheel2-i686.install b/mingw-w64-python-wheel/wheel2-i686.install
deleted file mode 100644
index 7316797dc0..0000000000
--- a/mingw-w64-python-wheel/wheel2-i686.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  cd mingw32
-  local _prefix=$(pwd -W)
-  cd -
-  local _it
-  for _it in wheel2; do
-    sed -e "s|/mingw32|${_prefix}|g" \
-        -i ${_prefix}/bin/${_it}-script.py
-  done
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/mingw-w64-python-wheel/wheel2-x86_64.install b/mingw-w64-python-wheel/wheel2-x86_64.install
deleted file mode 100644
index 55ccab5e6b..0000000000
--- a/mingw-w64-python-wheel/wheel2-x86_64.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  cd mingw64
-  local _prefix=$(pwd -W)
-  cd -
-  local _it
-  for _it in wheel2; do
-    sed -e "s|/mingw64|${_prefix}|g" \
-        -i ${_prefix}/bin/${_it}-script.py
-  done
-}
-
-post_upgrade() {
-  post_install
-}