(maint) Re-add gpg to extra packages

Once upon a time there was a conflict with the packages that the gpg module brought in. This conflict appears to have been resolved, based on reading of git logs, so this PR brings back the gpg module and the gnupg-agent package to the extra.pp.