From 24017a44fca72b0d46eea214ccc5dc82e577abef Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 30 Nov 2019 12:35:03 +0100
Subject: [PATCH] python-distutils-extra: Drop Python 2 package

---
 mingw-w64-python-distutils-extra/PKGBUILD | 71 ++++++-----------------
 1 file changed, 17 insertions(+), 54 deletions(-)

diff --git a/mingw-w64-python-distutils-extra/PKGBUILD b/mingw-w64-python-distutils-extra/PKGBUILD
index 5ac6713a59..25e36cf908 100644
--- a/mingw-w64-python-distutils-extra/PKGBUILD
+++ b/mingw-w64-python-distutils-extra/PKGBUILD
@@ -2,76 +2,39 @@
 
 _realname=python-distutils-extra
 pkgbase=mingw-w64-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python3-distutils-extra" "${MINGW_PACKAGE_PREFIX}-python2-distutils-extra")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python3-distutils-extra")
 pkgver=2.39
-pkgrel=5
+pkgrel=6
 pkgdesc="Enhancements to the Python build system (mingw-w64)"
 arch=('any')
 license=('GPL')
 url="https://launchpad.net/python-distutils-extra"
-makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools" "${MINGW_PACKAGE_PREFIX}-python2-setuptools")
+depends=("${MINGW_PACKAGE_PREFIX}-python3>=3.3"
+         "intltool")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
 source=("https://launchpad.net/${_realname}/trunk/${pkgver}/+download/${_realname}-${pkgver}.tar.gz"
         "https://launchpad.net/${_realname}/trunk/${pkgver}/+download/${_realname}-${pkgver}.tar.gz.asc")
 validpgpkeys=("3DB46B55EFA59D40E6232148D14EF15DAFE11347") # Martin Pitt <martinpitt@gnome.org>
 sha256sums=('723f24f4d65fc8d99b33a002fbbb3771d4cc9d664c97085bf37f3997ae8063af'
             'SKIP')
 
-prepare() {
-  cd "$srcdir"/
-  for pver in {2,3}; do 
-    rm -rf python${pver}-build-${CARCH}| true
-    cp -r "${_realname}-${pkgver}" "python${pver}-build-${CARCH}"
-  done
+build() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python3 setup.py 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  
-}
-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  
+check() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python3 setup.py test
 }
 
-package_python3-distutils-extra() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python3>=3.3" "intltool")
+package() {
+  cd "${srcdir}/${_realname}-${pkgver}"
 
-  cd "${srcdir}/python3-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --prefix="${MINGW_PREFIX}" --root="${pkgdir}" --skip-build
 }
-
-package_python2-distutils-extra() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python2>=2.7" "intltool")
-
-  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}" --skip-build
-}
-
-
-# Wrappers
-package_mingw-w64-i686-python2-distutils-extra() {
-  package_python2-distutils-extra
-}
-
-package_mingw-w64-i686-python3-distutils-extra() {
-  package_python3-distutils-extra
-}
-
-package_mingw-w64-x86_64-python2-distutils-extra() {
-  package_python2-distutils-extra
-}
-
-package_mingw-w64-x86_64-python3-distutils-extra() {
-  package_python3-distutils-extra
-}
-