From 32fa35244824341e467c69134bcaecd738ed70f3 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sun, 6 Feb 2022 11:21:06 +0100
Subject: [PATCH] Move setuptools to makedepends where possible

---
 cython/PKGBUILD        | 6 +++---
 gyp-git/PKGBUILD       | 6 +++---
 meson/PKGBUILD         | 5 +++--
 python-beaker/PKGBUILD | 5 +++--
 python-jinja/PKGBUILD  | 5 +++--
 python-nose/PKGBUILD   | 5 +++--
 python-pytest/PKGBUILD | 6 +++---
 7 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/cython/PKGBUILD b/cython/PKGBUILD
index 8868ee3f..fd218545 100644
--- a/cython/PKGBUILD
+++ b/cython/PKGBUILD
@@ -4,13 +4,13 @@ _realname=cython
 pkgbase=${_realname}
 pkgname=('cython')
 pkgver=0.29.26
-pkgrel=1
+pkgrel=2
 pkgdesc='C-Extensions for Python'
 arch=('i686' 'x86_64')
 url='https://cython.org/'
 license=('APACHE')
-depends=('python-setuptools')
-makedepends=('gcc' 'python-devel')
+depends=('python')
+makedepends=('gcc' 'python-devel' 'python-setuptools')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/cython/cython/archive/${pkgver}.tar.gz")
 sha256sums=('bb72b2f0ef029472759c711f0a4bded6e15e3f9bda3797550cef3c1d87d02283')
 
diff --git a/gyp-git/PKGBUILD b/gyp-git/PKGBUILD
index 61a81f09..ead55791 100644
--- a/gyp-git/PKGBUILD
+++ b/gyp-git/PKGBUILD
@@ -4,15 +4,15 @@
 _realname=gyp
 pkgname=${_realname}-git
 pkgver=r2163.caa60026
-pkgrel=3
+pkgrel=4
 pkgdesc="GYP can Generate Your Projects"
 url="https://code.google.com/p/gyp/"
 arch=('i686' 'x86_64')
 provides=("gyp")
 conflicts=("gyp")
 replaces=("gyp-svn")
-makedepends=('git' 'gcc')
-depends=('python' 'python-setuptools')
+makedepends=('git' 'gcc' 'python-setuptools')
+depends=('python')
 license=('custom')
 _commit="caa60026e223fc501e8b337fd5086ece4028b1c6"
 source=("git+https://chromium.googlesource.com/external/gyp#commit=${_commit}"
diff --git a/meson/PKGBUILD b/meson/PKGBUILD
index 16fc8c58..b4f7f9e6 100644
--- a/meson/PKGBUILD
+++ b/meson/PKGBUILD
@@ -2,12 +2,13 @@
 
 pkgname=meson
 pkgver=0.60.2
-pkgrel=3
+pkgrel=4
 pkgdesc='High-productivity build system'
 arch=('any')
 url="https://mesonbuild.com/"
 license=('Apache 2')
-depends=('python' 'python-setuptools' 'ninja')
+depends=('python' 'ninja')
+makedepends=('python-setuptools')
 source=("https://github.com/mesonbuild/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.asc}
         "0001-cygwin-disguise.patch"
         "9722.patch")
diff --git a/python-beaker/PKGBUILD b/python-beaker/PKGBUILD
index 2f890a4a..2aae8b29 100644
--- a/python-beaker/PKGBUILD
+++ b/python-beaker/PKGBUILD
@@ -4,12 +4,13 @@ _realname=beaker
 pkgbase="python-${_realname}"
 pkgname=("python-${_realname}")
 pkgver=1.11.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Caching and sessions WSGI middleware for use with web applications and stand-alone Python scripts and applications"
 arch=('any')
 license=('PSF')
 url="http://beaker.groovie.org/"
-depends=("python" "python-setuptools")
+depends=("python")
+makedepends=("python-setuptools")
 provides=("python3-${_realname}")
 conflicts=("python3-${_realname}")
 replaces=("python3-${_realname}")
diff --git a/python-jinja/PKGBUILD b/python-jinja/PKGBUILD
index 72addb91..0d0f3b08 100644
--- a/python-jinja/PKGBUILD
+++ b/python-jinja/PKGBUILD
@@ -4,12 +4,13 @@ _realname=jinja
 pkgbase=python-${_realname}
 pkgname=("python-${_realname}")
 pkgver=2.11.2
-pkgrel=2
+pkgrel=3
 pkgdesc='A simple pythonic template language written in Python'
 arch=('i686' 'x86_64')
 license=('BSD')
 url='http://jinja.pocoo.org/'
-depends=('python-setuptools' 'python-markupsafe')
+depends=('python-markupsafe')
+makedepends=('python-setuptools')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/pallets/jinja/archive/${pkgver}.tar.gz")
 sha256sums=('c5720a681bf1c5b11e184af32e6a8ce28670911787702b20cd0367e3877bbcae')
 
diff --git a/python-nose/PKGBUILD b/python-nose/PKGBUILD
index 48a4c444..5670c35a 100644
--- a/python-nose/PKGBUILD
+++ b/python-nose/PKGBUILD
@@ -4,12 +4,13 @@ _realname=nose
 pkgbase="python-${_realname}"
 pkgname=("python-${_realname}")
 pkgver=1.3.7
-pkgrel=8
+pkgrel=9
 pkgdesc="A discovery-based unittest extension"
 arch=('any')
 license=('LGPL2.1')
 url="https://nose.readthedocs.io/"
-depends=("python-setuptools")
+depends=("python")
+makedepends=("python-setuptools")
 provides=("python3-${_realname}")
 conflicts=("python3-${_realname}" "python2-${_realname}")
 replaces=("python3-${_realname}")
diff --git a/python-pytest/PKGBUILD b/python-pytest/PKGBUILD
index 820676d8..44b28249 100644
--- a/python-pytest/PKGBUILD
+++ b/python-pytest/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbase=python-pytest
 pkgname=('python-pytest')
 pkgver=6.2.1
-pkgrel=2
+pkgrel=3
 provides=("python3-pytest")
 replaces=("python3-pytest")
 conflicts=("python3-pytest")
@@ -17,12 +17,12 @@ depends=('python'
          'python-more-itertools'
          'python-pluggy'
          'python-py'
-         'python-setuptools'
          'python-packaging'
          'python-iniconfig'
          'python-toml'
          'python-six')
-makedepends=('python-setuptools-scm')
+makedepends=('python-setuptools-scm'
+             'python-setuptools')
 source=("pytest-${pkgver}.tar.gz::https://github.com/pytest-dev/pytest/archive/${pkgver}.tar.gz")
 sha256sums=('efc60ff9d50f63a6cc1571f5f121155cd1775905a29dbc58b55612ac5a81f530')