From 742dee1ea588cc89f8d61546aea7a3839b2f699f Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Mon, 20 Sep 2021 15:28:42 +0500
Subject: [PATCH] net-misc/gmid: add 1.7.3, update live

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 net-misc/gmid/Manifest          |   1 +
 net-misc/gmid/gmid-1.7.3.ebuild | 106 ++++++++++++++++++++++++++++++++
 net-misc/gmid/gmid-9999.ebuild  |  13 ++--
 net-misc/gmid/metadata.xml      |   4 +-
 4 files changed, 116 insertions(+), 8 deletions(-)
 create mode 100644 net-misc/gmid/gmid-1.7.3.ebuild

diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest
index 35d4d75c6d..887ccad79d 100644
--- a/net-misc/gmid/Manifest
+++ b/net-misc/gmid/Manifest
@@ -1 +1,2 @@
 DIST gmid-1.7.2.tar.gz 78352 BLAKE2B 8efba7dcdb301f4cc2cf470408e55b7a939bd3cad850e32fa14ba1e752404da7a85a4758ad722ba81f8dd2e45a8a9aad14ec162bdc5947591e9411896bf3c522 SHA512 27cae5699f39afb55b087cbbe7fd134221e786c07664140ace656c483c79213c74abdf82f05de9f1cf09d20a560571f094cf5ad1b1ae2879e3429f3571cec9a5
+DIST gmid-1.7.3.tar.gz 81873 BLAKE2B 66c2b850c4e1a22c50503d9445f257ac045eb69fcc7ca59d72be2c79bab95ea6b3af638b6f8f5518cd92421e10e60d9a7c6a2b3d2c3954c0a3cd911b0d31b1d2 SHA512 9a3acc501c1c0cc6419a18b152345b0ca84418625d8328942f8bba82974655633cbf79d7cdd48ba235915842dd8f8433e84245085bb0b00a4b57e4bda4aa1bd3
diff --git a/net-misc/gmid/gmid-1.7.3.ebuild b/net-misc/gmid/gmid-1.7.3.ebuild
new file mode 100644
index 0000000000..10cb49b3a1
--- /dev/null
+++ b/net-misc/gmid/gmid-1.7.3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+SSL_DAYS=36500
+SSL_CERT_MANDATORY=1
+inherit ssl-cert systemd toolchain-funcs
+
+DESCRIPTION="Simple and secure Gemini server"
+HOMEPAGE="https://gmid.omarpolo.com"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="BSD ISC MIT"
+SLOT="0"
+IUSE="seccomp test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	!elibc_Darwin? ( dev-libs/libbsd )
+	acct-user/gemini
+	dev-libs/imsg-compat
+	dev-libs/libevent:=
+	dev-libs/libretls
+	dev-libs/openssl:=
+"
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md ChangeLog contrib/README )
+
+src_prepare() {
+	default
+
+	sed \
+		-e "s:/usr/local/bin/gmid:/usr/bin/gmid:" \
+		-e "s:/etc/gmid.conf:/etc/gmid/gmid.conf:" \
+		-i contrib/gmid.service || die
+}
+
+src_configure() {
+	local conf_args
+	tc-export CC
+
+	# note: not an autoconf configure script
+	conf_args=(
+		PREFIX="${EPREFIX}"/usr/share
+		BINDIR="${EPREFIX}"/usr/bin
+		$(use_enable seccomp sandbox)
+	)
+
+	./configure "${conf_args[@]}" || die
+
+	if use seccomp && has usersandbox ${FEATURES} ; then
+		export SKIP_RUNTIME_TESTS=1
+	fi
+}
+
+src_compile() {
+	emake gmid
+	if use test ; then
+		emake -C regress gg data puny-test fcgi-test
+	fi
+}
+
+src_test() {
+	emake regress
+}
+
+src_install() {
+	default
+
+	insinto /etc/gmid
+	doins "${FILESDIR}"/gmid.conf
+
+	insinto /usr/share/vim/vimfiles
+	doins -r contrib/vim/*
+
+	systemd_dounit contrib/gmid.service
+	newinitd "${FILESDIR}"/gmid.initd gmid
+	newconfd "${FILESDIR}"/gmid.confd gmid
+
+	keepdir /var/gemini/localhost
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
+		install_cert /etc/ssl/${PN}/${PN}
+		chown gemini:gemini "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+	fi
+
+	einfo "This gemini server can be run as a user with zero configuration.\n"
+	einfo "In order to use it with the init service you will need to generate a"
+	einfo "self-signed TLS certificate and a key and set up the configuration"
+	einfo "file (see man 1 gmid for details)."
+}
diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild
index 089b1669a0..10cb49b3a1 100644
--- a/net-misc/gmid/gmid-9999.ebuild
+++ b/net-misc/gmid/gmid-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 SSL_DAYS=36500
 SSL_CERT_MANDATORY=1
@@ -11,24 +11,25 @@ DESCRIPTION="Simple and secure Gemini server"
 HOMEPAGE="https://gmid.omarpolo.com"
 
 if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/omar-polo/${PN}.git https://git.omarpolo.com/${PN}"
+	EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git"
 	inherit git-r3
 else
 	SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="BSD ISC MIT"
 SLOT="0"
-IUSE="+seccomp test"
+IUSE="seccomp test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
+	!elibc_Darwin? ( dev-libs/libbsd )
 	acct-user/gemini
 	dev-libs/imsg-compat
-	dev-libs/libbsd
-	dev-libs/libevent
+	dev-libs/libevent:=
 	dev-libs/libretls
+	dev-libs/openssl:=
 "
 BDEPEND="
 	virtual/pkgconfig
diff --git a/net-misc/gmid/metadata.xml b/net-misc/gmid/metadata.xml
index db6c28fd0c..393ca8ca52 100644
--- a/net-misc/gmid/metadata.xml
+++ b/net-misc/gmid/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<upstream>
 		<maintainer>
@@ -8,7 +8,7 @@
 		</maintainer>
 	</upstream>
 	<maintainer type="person">
-		<email>cyber@sysrq.in</email>
+		<email>cyber+gentoo@sysrq.in</email>
 		<name>Anna</name>
 	</maintainer>
 </pkgmetadata>