diff --git a/srcpkgs/gmime/template b/srcpkgs/gmime/template
index 88e2ff4bf24..36def7ee93b 100644
--- a/srcpkgs/gmime/template
+++ b/srcpkgs/gmime/template
@@ -3,34 +3,34 @@ pkgname=gmime
 version=2.6.23
 revision=2
 build_style=gnu-configure
-configure_args="--disable-static --disable-mono --enable-smime --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
-hostmakedepends="pkg-config intltool $(vopt_if gir gobject-introspection)"
+build_helper="gir"
+configure_args="--disable-static --disable-mono --enable-smime
+ --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr"
+hostmakedepends="automake pkg-config intltool libtool
+ $(vopt_if gir gobject-introspection)"
 makedepends="glib-devel gpgme-devel"
 short_desc="GNOME Core mime parsing library"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://www.gnome.org/"
 distfiles="${GNOME_SITE}/gmime/${version%.*}/gmime-${version}.tar.xz"
 checksum=7149686a71ca42a1390869b6074815106b061aaeaaa8f2ef8c12c191d9a79f6a
 
 # Package build options
 build_options="gir"
+build_options_default="gir"
 
-# Disable gir for cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" am_cv_func_iconv=yes am_cv_func_iconv_works=yes"
+	configure_args+=" am_cv_lib_iconv=no ac_cv_have_iconv_detect_h=yes"
+	configure_args+=" am_cv_proto_iconv_arg1="
 fi
 
-case "$XBPS_TARGET_MACHINE" in
-	i686|x86_64|armv?l*|aarch64*)
-		configure_args+=" am_cv_func_iconv=yes am_cv_func_iconv_works=yes"
-		configure_args+=" am_cv_lib_iconv=no ac_cv_have_iconv_detect_h=yes"
-		configure_args+=" am_cv_proto_iconv_arg1="
-		pre_build() {
-			cp ${FILESDIR}/*.h ${wrksrc}
-		}
-		;;
-esac
+pre_build() {
+	if [ "$CROSS_BUILD" ]; then
+		cp ${FILESDIR}/*.h ${wrksrc}
+	fi
+}
 
 gmime-devel_package() {
 	depends="libglib-devel zlib-devel gmime>=${version}_${revision}"