diff --git a/breezy/PKGBUILD b/breezy/PKGBUILD
index c83a26dc..127f5d0b 100644
--- a/breezy/PKGBUILD
+++ b/breezy/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=breezy
 _verbase=3.1.0
 _verminor=-4
 pkgver=${_verbase}${_verminor//-/.}
-pkgrel=1
+pkgrel=2
 pkgdesc='A decentralized revision control system with support for Bazaar and Git file formats'
 arch=('i686' 'x86_64')
 url='https://www.breezy-vcs.org/'
@@ -15,7 +15,7 @@ depends=('python-configobj'
          'python-dulwich'
          'python-patiencediff'
          'python-six')
-makedepends=('python-setuptools' 'libcrypt-devel')
+makedepends=('python-setuptools' 'python-devel')
 provides=(bzr)
 conflicts=(bzr)
 replaces=(bzr)
diff --git a/brotli/PKGBUILD b/brotli/PKGBUILD
index 810bc295..7d59f21f 100644
--- a/brotli/PKGBUILD
+++ b/brotli/PKGBUILD
@@ -3,13 +3,13 @@
 pkgbase=brotli
 pkgname=('brotli' 'brotli-devel' 'python-brotli' 'brotli-testdata')
 pkgver=1.0.7
-pkgrel=3
+pkgrel=4
 pkgdesc='Brotli compression library'
 arch=('i686' 'x86_64')
 license=('MIT')
 url='https://github.com/google/brotli'
 depends=('gcc-libs')
-makedepends=('cmake' 'python' 'libcrypt-devel')
+makedepends=('cmake' 'python-devel')
 source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/google/$pkgbase/archive/v${pkgver}.tar.gz"
         brotli-rename-static-libs.patch)
 sha256sums=('4c61bfb0faca87219ea587326c467b95acb25555b53d1a421ffa3c8a9296ee2c'
diff --git a/cython/PKGBUILD b/cython/PKGBUILD
index 361534a0..40f313dc 100644
--- a/cython/PKGBUILD
+++ b/cython/PKGBUILD
@@ -4,13 +4,13 @@ _realname=cython
 pkgbase=${_realname}
 pkgname=('cython')
 pkgver=0.29.21
-pkgrel=1
+pkgrel=2
 pkgdesc='C-Extensions for Python'
 arch=('i686' 'x86_64')
 url='https://cython.org/'
 license=('APACHE')
 depends=('python-setuptools')
-makedepends=('gcc' 'libcrypt-devel')
+makedepends=('gcc' 'python-devel')
 source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/cython/cython/archive/${pkgver}.tar.gz")
 sha256sums=('e2e38e1f0572ca54d6085df3dec8b607d20e81515fb80215aed19c81e8fe2079')
 
diff --git a/dtc/PKGBUILD b/dtc/PKGBUILD
index aea4f546..0a3240ff 100644
--- a/dtc/PKGBUILD
+++ b/dtc/PKGBUILD
@@ -2,13 +2,13 @@
 
 pkgname=dtc
 pkgver=1.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Device Tree Compiler"
 arch=('i686' 'x86_64')
 url="https://git.kernel.org/pub/scm/utils/dtc/dtc/git"
 license=('GPL2')
 depends=('libyaml')
-makedepends=('python' 'swig' 'libcrypt-devel' 'libyaml-devel')
+makedepends=('python-devel' 'swig' 'libyaml-devel')
 source=("https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/${pkgname}-${pkgver}.tar.gz"
         01-correct-shared-library-extension.patch
         02-pyext-install.patch)
diff --git a/gdb/PKGBUILD b/gdb/PKGBUILD
index 794c9ca3..ada3ec0f 100644
--- a/gdb/PKGBUILD
+++ b/gdb/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=gdb
 pkgver=9.2
-pkgrel=2
+pkgrel=3
 _gcc_ver=9.3.0
 pkgdesc="GNU Debugger (MSYS2 version)"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="https://www.gnu.org/software/gdb/"
 groups=('base-devel')
 depends=("libiconv" "zlib" "expat" "python" "libexpat" "libreadline" "mpfr")
 #checkdepends=('dejagnu' 'bc')
-makedepends=("libiconv-devel" "zlib-devel" "ncurses-devel" "liblzma-devel" "mpfr-devel" "libexpat-devel" "libreadline-devel" "libcrypt-devel")
+makedepends=("libiconv-devel" "zlib-devel" "ncurses-devel" "liblzma-devel" "mpfr-devel" "libexpat-devel" "libreadline-devel" "python-devel")
 options=('staticlibs' '!distcc' '!ccache')
 source=("https://ftp.gnu.org/gnu/gdb/gdb-${pkgver}.tar.xz"{,.sig}
         'gdbinit'
diff --git a/gpgme/PKGBUILD b/gpgme/PKGBUILD
index ac871d7b..83309414 100644
--- a/gpgme/PKGBUILD
+++ b/gpgme/PKGBUILD
@@ -3,13 +3,13 @@
 pkgbase=gpgme
 pkgname=('libgpgme' 'libgpgme-devel' 'libgpgme-python')
 pkgver=1.14.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A C wrapper library for GnuPG"
 arch=('i686' 'x86_64')
 url="https://gnupg.org/related_software/gpgme/"
 license=('LGPL')
 depends=('libassuan' 'libgpg-error' 'gnupg')
-makedepends=('libassuan-devel' 'libgpg-error-devel' 'python' 'swig' 'libcrypt-devel')
+makedepends=('libassuan-devel' 'libgpg-error-devel' 'python-devel' 'swig')
 options=('!libtool' '!emptydirs')
 source=(https://gnupg.org/ftp/gcrypt/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2{,.sig}
         gpgme-1.4.2-msys2.patch)
diff --git a/libxml2/PKGBUILD b/libxml2/PKGBUILD
index 0b3e4b6e..59c62106 100644
--- a/libxml2/PKGBUILD
+++ b/libxml2/PKGBUILD
@@ -2,11 +2,11 @@
 
 pkgname=('libxml2' 'libxml2-devel' 'libxml2-python')
 pkgver=2.9.10
-pkgrel=5
+pkgrel=6
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('MIT')
-makedepends=('python' 'icu-devel>=67.1' 'libreadline-devel' 'ncurses-devel' 'liblzma-devel' 'zlib-devel' 'libcrypt-devel')
+makedepends=('python-devel' 'icu-devel>=67.1' 'libreadline-devel' 'ncurses-devel' 'liblzma-devel' 'zlib-devel')
 url="http://www.xmlsoft.org/"
 source=(http://xmlsoft.org/sources/${pkgname}-${pkgver}.tar.gz
         https://www.w3.org/XML/Test/xmlts20130923.tar.gz
diff --git a/mercurial/PKGBUILD b/mercurial/PKGBUILD
index 282c76e3..04e531e2 100644
--- a/mercurial/PKGBUILD
+++ b/mercurial/PKGBUILD
@@ -2,14 +2,14 @@
 
 pkgname=mercurial
 pkgver=5.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
 url="https://www.mercurial-scm.org/"
 license=('GPL')
 groups=('VCS')
 depends=('python3')
-makedepends=('libcrypt-devel')
+makedepends=('python-devel')
 #optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("https://mercurial-scm.org/release/${pkgname}-${pkgver}.tar.gz"{,.asc}
diff --git a/python-dulwich/PKGBUILD b/python-dulwich/PKGBUILD
index 32f26d79..4378ac19 100644
--- a/python-dulwich/PKGBUILD
+++ b/python-dulwich/PKGBUILD
@@ -3,13 +3,13 @@
 _realname=dulwich
 pkgname="python-${_realname}"
 pkgver=0.20.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Pure-Python implementation of the Git file formats and protocols'
 arch=('i686' 'x86_64')
 url='https://www.dulwich.io'
 license=('GPL')
 depends=('python')
-makedepends=('python-setuptools' 'libcrypt-devel')
+makedepends=('python-setuptools' 'python-devel')
 source=("https://pypi.org/packages/source/${_realname::1}/${_realname}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('98484ede022da663c96b54bc8dcdb4407072cb50efd5d20d58ca4e7779931305')
 
diff --git a/python-patiencediff/PKGBUILD b/python-patiencediff/PKGBUILD
index d56eab3e..02c05514 100644
--- a/python-patiencediff/PKGBUILD
+++ b/python-patiencediff/PKGBUILD
@@ -3,13 +3,13 @@
 _realname=patiencediff
 pkgname="python-${_realname}"
 pkgver=0.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Patiencediff Python and C implementations'
 arch=('i686' 'x86_64')
 url='https://www.breezy-vcs.org/'
 license=('GPL2')
 depends=('python')
-makedepends=('python-setuptools' 'libcrypt-devel')
+makedepends=('python-setuptools' 'python-devel')
 source=("${_realname}-${pkgver}.tar.gz"::https://github.com/breezy-team/patiencediff/archive/v${pkgver}.tar.gz)
 sha256sums=('e32f1104dfa4764563b91fe4787220dabd6251676f2ee8bb89057c863f3020c1')
 
diff --git a/python-yaml/PKGBUILD b/python-yaml/PKGBUILD
index 2ed06d32..4e1d55a2 100644
--- a/python-yaml/PKGBUILD
+++ b/python-yaml/PKGBUILD
@@ -5,13 +5,13 @@ _realname=yaml
 pkgbase=python-${_realname}
 pkgname=("python-${_realname}")
 pkgver=5.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Python bindings for YAML, using fast libYAML library'
 arch=('i686' 'x86_64')
 url='https://pyyaml.org/'
 license=('MIT')
 depends=('python' 'libyaml')
-makedepends=('cython' 'python-setuptools' 'libyaml-devel' 'libcrypt-devel')
+makedepends=('cython' 'python-setuptools' 'libyaml-devel' 'python-devel')
 options=('staticlibs' 'strip' '!debug')
 source=("https://pyyaml.org/download/pyyaml/${_pyname}-${pkgver}.tar.gz")
 install=python-yaml.install