mutt: enable gpg again (#1479)

mail-client/mutt/mutt-1.8.3.recipe

@@ -12,7 +12,7 @@ COPYRIGHT="1996-2016 Michael R. Elkins
 	2006-2009 Rocco Rutte
 	2014-2017 Kevin J. McCarthy"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://bitbucket.org/mutt/mutt/downloads/mutt-$portVersion.tar.gz"
 CHECKSUM_SHA256="9b81746d67ffeca5ea44f60893b70dc93c86d4bc10187d4dd360185e4d42ed42"
 PATCHES="mutt-$portVersion.patchset"
@@ -31,14 +31,14 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-#	cmd:gpg2$secondaryArchSuffix #gnupg is broken
+	cmd:gpg$secondaryArchSuffix
 	lib:libaspell$secondaryArchSuffix
 	lib:libassuan$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libgettextpo$secondaryArchSuffix
 	lib:libgnutls$secondaryArchSuffix
-#	lib:libgpgme$secondaryArchSuffix
-#	lib:libgpg_error$secondaryArchSuffix
+	lib:libgpgme$secondaryArchSuffix
+	lib:libgpg_error$secondaryArchSuffix
 	lib:libgsasl$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libidn$secondaryArchSuffix
@@ -53,8 +53,8 @@ BUILD_REQUIRES="
 	devel:libcrypto$secondaryArchSuffix
 	devel:libgettextlib$secondaryArchSuffix
 	devel:libgnutls$secondaryArchSuffix
-#	devel:libgpgme$secondaryArchSuffix
-#	devel:libgpg_error$secondaryArchSuffix
+	devel:libgpgme$secondaryArchSuffix
+	devel:libgpg_error$secondaryArchSuffix
 	devel:libgsasl$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libidn$secondaryArchSuffix
@@ -69,7 +69,7 @@ BUILD_PREREQUIRES="
 	cmd:bison
 	cmd:gawk
 	cmd:gcc$secondaryArchSuffix
-#	cmd:gpg2$secondaryArchSuffix
+	cmd:gpg$secondaryArchSuffix
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:m4
@@ -92,6 +92,7 @@ BUILD()
 
 	runConfigure configure \
 		--enable-compressed \
+		--enable-gpgme \
 		--enable-imap \
 		--enable-pop \
 		--enable-smtp \
@@ -102,7 +103,6 @@ BUILD()
 		--with-regex \
 		--with-ssl \
 		--with-mailpath=`finddir B_USER_DIRECTORY`/mail/mutt
-#		--enable-gpgme \
 
 	make $jobArgs
 }