From 04fefd6ac3c25784b1dccdeb7393aa798612b78e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 14 Mar 2024 17:56:21 -0400
Subject: [PATCH 1/2] gnupg: add alternatives for gpg and gpgv

---
 srcpkgs/gnupg/template | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/gnupg/template b/srcpkgs/gnupg/template
index 4e4c110d4cea9b..2c5ac47a9c597f 100644
--- a/srcpkgs/gnupg/template
+++ b/srcpkgs/gnupg/template
@@ -2,7 +2,7 @@
 # minor version updates (2.3-> 2.4) often need a fix in reverse dependencies
 pkgname=gnupg
 version=2.4.5
-revision=1
+revision=2
 # We're building outside of the source tree, because upstream told us to:
 # https://dev.gnupg.org/T6313#166339
 build_wrksrc=build
@@ -12,7 +12,7 @@ configure_args="$(vopt_enable ldap)
  --with-libassuan-prefix=${XBPS_CROSS_BASE}/usr
  --with-ksba-prefix=${XBPS_CROSS_BASE}/usr
  --with-npth-prefix=${XBPS_CROSS_BASE}/usr
- --enable-all-tests"
+ --enable-all-tests --enable-gpg-is-gpg2"
 configure_script="../configure"
 hostmakedepends="pkg-config gettext"
 makedepends="bzip2-devel gnutls-devel libassuan-devel libcurl-devel
@@ -25,6 +25,10 @@ license="GPL-3.0-or-later"
 homepage="https://www.gnupg.org/"
 distfiles="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2"
 checksum=f68f7d75d06cb1635c336d34d844af97436c3f64ea14bcb7c869782f96f44277
+alternatives="gpg:gpg:/usr/bin/gpg2
+ gpg:gpgv:/usr/bin/gpgv2
+ gpg:gpg.1:/usr/share/man/man1/gpg2.1
+ gpg:gpgv.1:/usr/share/man/man1/gpgv2.1"
 make_check_pre='env TESTFLAGS="--parallel=${XBPS_MAKEJOBS}"'
 build_options="ldap"
 build_options_default="ldap"
@@ -33,24 +37,23 @@ post_extract() {
 	mkdir build
 }
 
+pre_check() {
+	# when --enable-gpg-is-gpg2 is set, tests look for gpg2, which is created at install time
+	ln -s gpg bin/gpg2
+}
+
 post_install() {
 	vmkdir usr/share/examples
-	mv ${DESTDIR}/usr/share/doc/gnupg/examples \
-		${DESTDIR}/usr/share/examples/gnupg
+	mv "${DESTDIR}/usr/share/doc/gnupg/examples" \
+		"${DESTDIR}/usr/share/examples/gnupg"
+	ln -s gnupg "${DESTDIR}/usr/share/examples/gnupg2"
+	ln -s gnupg "${DESTDIR}/usr/share/doc/gnupg2"
 }
 
 gnupg2_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
-	short_desc+=" - compat package"
-	pkg_install() {
-		vmkdir usr/bin
-		ln -s gpg $PKGDESTDIR/usr/bin/gpg2
-		ln -s gpgv $PKGDESTDIR/usr/bin/gpgv2
-		vmkdir usr/share/examples
-		ln -s gnupg $PKGDESTDIR/usr/share/examples/gnupg2
-		vmkdir usr/share/doc
-		ln -s gnupg $PKGDESTDIR/usr/share/doc/gnupg2
-	}
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
 }
 
 gnupg2-scdaemon_package() {

From f6a3d414a0f6b3992953b804296b8608898f6c34 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 14 Mar 2024 17:59:09 -0400
Subject: [PATCH 2/2] New package: sequoia-chameleon-gnupg-0.7.0

---
 srcpkgs/sequoia-chameleon-gnupg/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/sequoia-chameleon-gnupg/template

diff --git a/srcpkgs/sequoia-chameleon-gnupg/template b/srcpkgs/sequoia-chameleon-gnupg/template
new file mode 100644
index 00000000000000..aac45830fe2241
--- /dev/null
+++ b/srcpkgs/sequoia-chameleon-gnupg/template
@@ -0,0 +1,17 @@
+# Template file for 'sequoia-chameleon-gnupg'
+pkgname=sequoia-chameleon-gnupg
+version=0.7.0
+revision=1
+build_style=cargo
+_deps="nettle-devel openssl-devel sqlite-devel"
+hostmakedepends="pkg-config llvm clang"
+makedepends="${_deps}"
+checkdepends="gnupg faketime sequoia-sq"
+short_desc="Re-implmentation of gpg and gpgv from Sequoia OpenPGP"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg"
+distfiles="https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/archive/v${version}/sequoia-chameleon-gnupg-v${version}.tar.gz"
+checksum=90cc3b8648711ae8f550dfb61fb9912a67a99755596fff40c09c8097b9491b41
+alternatives="gpg:gpg:/usr/bin/gpg-sq
+ gpg:gpgv:/usr/bin/gpgv-sq"