From 288a6384eb3c833275f8a23c6c676f2cbd21da0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 9 Nov 2022 09:54:59 +0700 Subject: [PATCH] checkdepends: replace gnupg2 by gnupg --- srcpkgs/gmime/template | 2 +- srcpkgs/libostree/template | 2 +- srcpkgs/mercurial/template | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gmime/template b/srcpkgs/gmime/template index c3a95a95a35..045e8307691 100644 --- a/srcpkgs/gmime/template +++ b/srcpkgs/gmime/template @@ -9,7 +9,7 @@ configure_args="--disable-static --enable-crypto $(vopt_enable vala) hostmakedepends="pkg-config $(vopt_if vala vala)" makedepends="glib-devel gpgme-devel libidn2-devel $(vopt_if vala vala)" -checkdepends="gnupg2" +checkdepends="gnupg" short_desc="GNOME Core mime parsing library" maintainer="Enno Boland " license="LGPL-2.1-or-later" diff --git a/srcpkgs/libostree/template b/srcpkgs/libostree/template index cbe1ba9dc51..643e6fae25d 100644 --- a/srcpkgs/libostree/template +++ b/srcpkgs/libostree/template @@ -12,7 +12,7 @@ configure_args=" hostmakedepends="bison docbook-xsl glib-devel libxslt pkg-config" makedepends="e2fsprogs-devel fuse-devel glib-devel gpgme-devel libarchive-devel libsoup-devel libsodium-devel $(vopt_if gir 'gobject-introspection')" -checkdepends="attr-progs cpio elfutils gnupg2 python3-yaml tar which xz" +checkdepends="attr-progs cpio elfutils gnupg python3-yaml tar which xz" short_desc="Operating system and container binary deployment and upgrades" maintainer="Duncaen " license="LGPL-2.0-or-later" diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template index 364d142497d..b7ebe4a690b 100644 --- a/srcpkgs/mercurial/template +++ b/srcpkgs/mercurial/template @@ -7,7 +7,7 @@ hostmakedepends="python3 python3-setuptools python3-devel gettext" makedepends="python3-devel" depends="python3 ca-certificates" # cvs tests fail -checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg2 +checkdepends="iana-etc tar unzip which xz subversion-python python3-docutils gnupg python3-Pygments" short_desc="Fast, lightweight source control management system" maintainer="dataCobra " @@ -24,6 +24,12 @@ pre_check() { } do_check() { + mkdir -p /tmp/bin + cat <<-'EOF' >/tmp/bin/egrep + #!/bin/sh + exec grep -E "$@" + EOF + chmod +x /tmp/bin/egrep if [ "$XBPS_CHECK_PKGS" = full ]; then _additional_test=--allow-slow-tests else @@ -32,7 +38,7 @@ do_check() { cd tests rm test-hghave.t test-merge-tools.t test-status.t - python3 run-tests.py ${makejobs} ${_additional_test} + PATH=/tmp/bin:$PATH python3 run-tests.py ${makejobs} ${_additional_test} } post_install() {