From dbc1de51e5e161bd358acbcb330cfc86723bc87c Mon Sep 17 00:00:00 2001
From: Alexey Pavlov <alexpux@gmail.com>
Date: Mon, 16 Dec 2019 14:53:58 +0300
Subject: [PATCH] python-flake8: Drop python2 package

---
 mingw-w64-python-flake8/PKGBUILD              | 118 ++++--------------
 mingw-w64-python-flake8/flake82-i686.install  |  14 ---
 .../flake82-x86_64.install                    |  14 ---
 3 files changed, 24 insertions(+), 122 deletions(-)
 delete mode 100644 mingw-w64-python-flake8/flake82-i686.install
 delete mode 100644 mingw-w64-python-flake8/flake82-x86_64.install

diff --git a/mingw-w64-python-flake8/PKGBUILD b/mingw-w64-python-flake8/PKGBUILD
index 40d7043ab4..b023906011 100644
--- a/mingw-w64-python-flake8/PKGBUILD
+++ b/mingw-w64-python-flake8/PKGBUILD
@@ -3,62 +3,47 @@
 
 _realname=flake8
 pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 pkgver=3.7.9
-pkgrel=1
+pkgrel=2
 pkgdesc="The modular source code checker: pep8, pyflakes and co"
 arch=('any')
 url="http://flake8.pycqa.org"
 license=('MIT')
+depends=("${MINGW_PACKAGE_PREFIX}-python3-pyflakes"
+         "${MINGW_PACKAGE_PREFIX}-python3-mccabe"
+         "${MINGW_PACKAGE_PREFIX}-python3-pycodestyle")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-pyflakes"
-             "${MINGW_PACKAGE_PREFIX}-python2-pyflakes"
-             "${MINGW_PACKAGE_PREFIX}-python3-pycodestyle"
-             "${MINGW_PACKAGE_PREFIX}-python2-pycodestyle"
-             "${MINGW_PACKAGE_PREFIX}-python3-mccabe"
-             "${MINGW_PACKAGE_PREFIX}-python2-mccabe"
-             "${MINGW_PACKAGE_PREFIX}-python2-enum34"
-             "${MINGW_PACKAGE_PREFIX}-python2-configparser"
-             "${MINGW_PACKAGE_PREFIX}-python3-pytest-runner"
-             "${MINGW_PACKAGE_PREFIX}-python2-pytest-runner")
-checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock" "${MINGW_PACKAGE_PREFIX}-python2-mock")
+             "${MINGW_PACKAGE_PREFIX}-python3-pytest-runner")
+checkdepends=("${MINGW_PACKAGE_PREFIX}-python3-mock")
+install=${_realname}3-${CARCH}.install
 source=("${_realname}-$pkgver.tar.gz"::"https://github.com/PyCQA/flake8/archive/${pkgver}.tar.gz")
 sha512sums=('cd91759f8f22a98d70ff04238e399de23981cbab9656958b36390b792f75b49645f0ce5df849f3675dab04355f4daef4e89deae5c56193fd2c78029833b1acf6')
 
 prepare() {
   # disable overly restrictive dependency pinning
-  sed -i -e 's/, *< *[0-9=.]*//' flake8-$pkgver/setup.py
-  for builddir in python{2,3}-build-${CARCH}; do
-    rm -rf ${builddir} | true
-    cp -r "${_realname}-${pkgver}" "${builddir}"
-  done
+  sed -i -e 's/, *< *[0-9=.]*//' flake8-${pkgver}/setup.py
+
+  rm -rf python3-build-${CARCH}| true
+  cp -r "${_realname}-${pkgver}" "python3-build-${CARCH}"
+
   # Set version for setuptools_scm
   export SETUPTOOLS_SCM_PRETEND_VERSION=$pkgver
 }
 
 build() {
-  for pver in {2,3}; do  
-    msg "Python ${pver} build for ${CARCH}"  
-    cd "${srcdir}/python${pver}-build-${CARCH}"
-    ${MINGW_PREFIX}/bin/python${pver} setup.py build
-  done  
+  msg "Python 3 build for ${CARCH}"
+  cd "${srcdir}/python3-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python3 setup.py build
 }
 
 check() {
-  for pver in {2,3}; do
-    msg "Python ${pver} test for ${CARCH}"
-    cd "${srcdir}/python${pver}-build-${CARCH}"
-    ${MINGW_PREFIX}/bin/python${pver} setup.py pytest
-  done
+  msg "Python 3 test for ${CARCH}"
+  cd "${srcdir}/python3-build-${CARCH}"
+  ${MINGW_PREFIX}/bin/python3 setup.py pytest
 }
 
-package_python3-flake8() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python3-pyflakes"
-   "${MINGW_PACKAGE_PREFIX}-python3-mccabe" 
-   "${MINGW_PACKAGE_PREFIX}-python3-pycodestyle")
-  install=${_realname}3-${CARCH}.install
-
+package() {
   cd "${srcdir}/python3-build-${CARCH}"
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \
@@ -68,68 +53,13 @@ package_python3-flake8() {
     ${MINGW_PREFIX}/bin/python3 setup.py install --root="$pkgdir" --prefix=${MINGW_PREFIX} --optimize=1
   install -D -m644 LICENSE "$pkgdir${MINGW_PREFIX}"/share/licenses/$pkgname/LICENSE
 
-# This entire section should be removed if the package does NOT install
-# anything in the /mingw*/bin directory.
-### begin section ###
+  # 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|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
   done
-#### end section ####
+  #### end section ####
 }
-
-package_python2-flake8() {
-  depends=("${MINGW_PACKAGE_PREFIX}-python2-pyflakes"
-           "${MINGW_PACKAGE_PREFIX}-python2-mccabe"
-           "${MINGW_PACKAGE_PREFIX}-python2-pycodestyle"
-           "${MINGW_PACKAGE_PREFIX}-python2-enum34"
-           "${MINGW_PACKAGE_PREFIX}-python2-configparser")
-  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 -D -m644 LICENSE "$pkgdir${MINGW_PREFIX}"/share/licenses/$pkgname/LICENSE
-
-# 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|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${_f}
-  done
-
-# for Python2 packages, you want to rename some stuff from the bin directory 
-# with the 2 suffix like in the mingw-w64-python-pygments package to avoid
-# conflicts when installing both the Python2 and Python3 packages
-  for f in flake8; 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
-#### end section ####
-}
-
-package_mingw-w64-i686-python2-flake8() {
-  package_python2-flake8
-}
-
-package_mingw-w64-i686-python3-flake8() {
-  package_python3-flake8
-}
-
-package_mingw-w64-x86_64-python2-flake8() {
-  package_python2-flake8
-}
-
-package_mingw-w64-x86_64-python3-flake8() {
-  package_python3-flake8
-}
-
diff --git a/mingw-w64-python-flake8/flake82-i686.install b/mingw-w64-python-flake8/flake82-i686.install
deleted file mode 100644
index 8fa8725463..0000000000
--- a/mingw-w64-python-flake8/flake82-i686.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  cd mingw32
-  local _prefix=$(pwd -W)
-  cd -
-  local _it
-  for _it in flake82; do
-    sed -e "s|/mingw32|${_prefix}|g" \
-        -i ${_prefix}/bin/${_it}-script.py
-  done
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/mingw-w64-python-flake8/flake82-x86_64.install b/mingw-w64-python-flake8/flake82-x86_64.install
deleted file mode 100644
index 84a08c75da..0000000000
--- a/mingw-w64-python-flake8/flake82-x86_64.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  cd mingw64
-  local _prefix=$(pwd -W)
-  cd -
-  local _it
-  for _it in flake82; do
-    sed -e "s|/mingw64|${_prefix}|g" \
-        -i ${_prefix}/bin/${_it}-script.py
-  done
-}
-
-post_upgrade() {
-  post_install
-}