Fix ups after dropping _x86 suffix for gnupg. (#13538)

Missed these while doing #13537.

app-crypt/gcr/gcr-3.41.1.recipe

@@ -7,7 +7,7 @@ COPYRIGHT="2010-2022 Stefan Walter
 	2010-2021 Collabora Ltd
 	2020 Marco Trevisan"
 LICENSE="GNU LGPL v2.1"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://gitlab.gnome.org/GNOME/gcr/-/archive/$portVersion/gcr-$portVersion.tar.gz"
 CHECKSUM_SHA256="f25de5063ffe6359c79f86d70a53c2d398db4e256e2de58c2a3bd2e8111b8f11"
 PATCHES="gcr-$portVersion.patchset"
@@ -44,7 +44,7 @@ REQUIRES="
 	lib:libintl$secondaryArchSuffix
 	lib:libp11_kit$secondaryArchSuffix
 	lib:libpango_1.0$secondaryArchSuffix
-	cmd:gpg$secondaryArchSuffix
+	cmd:gpg
 	cmd:ssh_add
 	"
 
@@ -84,7 +84,7 @@ BUILD_PREREQUIRES="
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:gtkdocize
-	cmd:gpg$secondaryArchSuffix
+	cmd:gpg
 	cmd:ld$secondaryArchSuffix
 	cmd:meson
 	cmd:pkg_config$secondaryArchSuffix

app-crypt/gpgme/gpgme-1.24.1.recipe

@@ -81,8 +81,8 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
-	cmd:gpg$secondaryArchSuffix
-	cmd:gpgconf$secondaryArchSuffix
+	cmd:gpg
+	cmd:gpgconf
 	cmd:gpg_error$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make

app-crypt/libsecret/libsecret-0.21.7.recipe

@@ -49,7 +49,7 @@ BUILD_PREREQUIRES="
 	docbook_xml_dtd
 	docbook_xsl_stylesheets
 	cmd:gcc$secondaryArchSuffix
-	cmd:gpg$secondaryArchSuffix
+	cmd:gpg
 	cmd:meson
 	cmd:msgfmt$secondaryArchSuffix
 	cmd:pkg_config$secondaryArchSuffix

dev-util/librnp/librnp-0.17.0.recipe

@@ -61,7 +61,7 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
-	cmd:gpg$secondaryArchSuffix # used for testing but must be available during configure
+	cmd:gpg	# used for testing but must be available during configure
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix

mail-client/mutt/mutt-2.2.13.recipe

@@ -15,7 +15,7 @@ COPYRIGHT="1996-2016 Michael R. Elkins
 	2006-2009 Rocco Rutte
 	2014-2023 Kevin J. McCarthy"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="https://bitbucket.org/mutt/mutt/downloads/mutt-$portVersion.tar.gz"
 CHECKSUM_SHA256="eb23faddc1cc97d867693f3a4a9f30949ad93765ad5b6fdae2797a4001c58efb"
 
@@ -40,7 +40,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	cmd:gpg$secondaryArchSuffix
+	cmd:gpg
 	lib:libaspell$secondaryArchSuffix
 	lib:libassuan$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
@@ -78,7 +78,7 @@ BUILD_PREREQUIRES="
 	cmd:bison
 	cmd:gawk
 	cmd:gcc$secondaryArchSuffix
-	cmd:gpg$secondaryArchSuffix
+	cmd:gpg
 	cmd:make
 	cmd:perl
 	"

mail-client/trojita/trojita-0.7.0.recipe

@@ -34,7 +34,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}
-#	cmd:gpgconf$secondaryArchSuffix
+#	cmd:gpgconf
 	lib:libcrypto$secondaryArchSuffix
 #	lib:libgpg_error$secondaryArchSuffix
 #	lib:libgpgmepp$secondaryArchSuffix
@@ -75,7 +75,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
-#	cmd:gpgconf$secondaryArchSuffix
+#	cmd:gpgconf
 	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix

media-libs/roaraudio/roaraudio-1.0beta12.recipe

@@ -117,7 +117,7 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:gcc$secondaryArchSuffix
 	cmd:gnuplot
-	cmd:gpg$secondaryArchSuffix
+	cmd:gpg
 	cmd:ld$secondaryArchSuffix
 	cmd:make
 	cmd:ogg123