From 83a191c771c1ce8a9ccd98172d17567344af7bfc Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 21 Mar 2024 15:40:54 +0100
Subject: [PATCH 1/2] New package: cl-alexandria-1.4

---
 srcpkgs/cl-alexandria/patches/run-tests.patch | 13 +++++++
 srcpkgs/cl-alexandria/template                | 35 +++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 srcpkgs/cl-alexandria/patches/run-tests.patch
 create mode 100644 srcpkgs/cl-alexandria/template

diff --git a/srcpkgs/cl-alexandria/patches/run-tests.patch b/srcpkgs/cl-alexandria/patches/run-tests.patch
new file mode 100644
index 00000000000000..65299e3fc44b49
--- /dev/null
+++ b/srcpkgs/cl-alexandria/patches/run-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/alexandria-tests.asd b/alexandria-tests.asd
+index 6b785d3..fa0bb88 100644
+--- a/alexandria-tests.asd
++++ b/alexandria-tests.asd
+@@ -8,5 +8,6 @@
+   :perform (test-op (o c)
+              (flet ((run-tests (&rest args)
+                       (apply (intern (string '#:run-tests) '#:alexandria-tests) args)))
+-               (run-tests :compiled nil)
+-               (run-tests :compiled t))))
++               (unless (and (run-tests :compiled nil)
++                            (run-tests :compiled t))
++                 (error "Some tests failed.")))))
diff --git a/srcpkgs/cl-alexandria/template b/srcpkgs/cl-alexandria/template
new file mode 100644
index 00000000000000..6cf89e11fa7476
--- /dev/null
+++ b/srcpkgs/cl-alexandria/template
@@ -0,0 +1,35 @@
+# Template file for 'cl-alexandria'
+pkgname=cl-alexandria
+version=1.4
+revision=1
+makedepends="texlive texinfo sbcl tar"
+short_desc="Common Lisp utility library"
+maintainer="Mihail Ivanchev <contact@ivanchev.net>"
+license="Public Domain"
+homepage="https://alexandria.common-lisp.dev/"
+distfiles="https://gitlab.common-lisp.net/alexandria/alexandria/-/archive/v${version}/alexandria-v${version}.tar.gz"
+checksum=0512aec38d054a20daa66e9983cf8a98151582d7e2307e49e8c1b4a61bbb779a
+
+_LIBRARY_DIR=usr/share/common-lisp/source/alexandria
+
+do_check() {
+	sbcl --non-interactive \
+		--eval '(require "asdf")' \
+		--eval "(push #p\"${wrksrc}/\" asdf:*central-registry*)" \
+		--eval '(asdf:test-system "alexandria-tests")'
+}
+
+do_build() {
+	make -C doc html info pdf
+}
+
+do_install() {
+	vmkdir $_LIBRARY_DIR
+	vcopy alexandria-1 $_LIBRARY_DIR
+	vcopy alexandria-2 $_LIBRARY_DIR
+	vcopy alexandria.asd $_LIBRARY_DIR
+	vinstall doc/alexandria.info 644 /usr/share/info
+	vdoc doc/alexandria.pdf
+	vdoc doc/alexandria.html
+	vlicense LICENCE
+}

From 288bea3e13d78edf6c78fdfbb77ac254e771b0a5 Mon Sep 17 00:00:00 2001
From: Mihail Ivanchev <contact@ivanchev.net>
Date: Thu, 21 Mar 2024 18:18:58 +0100
Subject: [PATCH 2/2] New package:
 cl-trivial-gray-streams-20240217.a7ead683666849762ea657dac9137d693c5a492a9

---
 srcpkgs/cl-trivial-gray-streams/template | 52 ++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 srcpkgs/cl-trivial-gray-streams/template

diff --git a/srcpkgs/cl-trivial-gray-streams/template b/srcpkgs/cl-trivial-gray-streams/template
new file mode 100644
index 00000000000000..cf8a64ad4e34f9
--- /dev/null
+++ b/srcpkgs/cl-trivial-gray-streams/template
@@ -0,0 +1,52 @@
+# Template file for 'cl-trivial-gray-streams'
+pkgname=cl-trivial-gray-streams
+#
+# NOTE: trivial-gray-streams doesn't tag versions so we use a date and the commit hash.
+# According to this discsion:
+# https://github.com/trivial-gray-streams/trivial-gray-streams/issues/15
+# every push to master is a release.
+_src_date=20240217
+_src_hash=a7ead683666849762ea657dac9137d693c5a4929
+#
+# The version of value should be dynamically computed but this is rejected by
+# the linter so instead we set it manually and later check for equality.
+#
+#version=${_src_date}.r${_src_hash}
+version=20240217.a7ead683666849762ea657dac9137d693c5a4929
+revision=1
+checkdepends="sbcl"
+short_desc="Portability library for CL gray streams"
+maintainer="Mihail Ivanchev <contact@ivanchev.net>"
+license="MIT"
+homepage="https://github.com/trivial-gray-streams/trivial-gray-streams.git"
+distfiles="https://github.com/trivial-gray-streams/trivial-gray-streams/archive/${_src_hash}.tar.gz"
+checksum=0b3734561620a27f42e7960312282d732ff6313278db18aa376450a15a8ce8e6
+
+if [ "$version" != "${_src_date}.${_src_hash}" ]; then
+	echo "Version not equal to ${_src_date}.${_src_hash}, must be " 2>&1
+	echo "updated manually." 2>&1
+	exit 1
+fi
+
+_LIBRARY_DIR=usr/share/common-lisp/source/trivial-gray-streams
+
+do_check() {
+	# According to the author, the failure in stream-advance-to-column
+	# currently happens across all LISP implementations and is expected.
+	# See: https://github.com/trivial-gray-streams/trivial-gray-streams/issues/16
+	sbcl --non-interactive \
+	     --eval '(require "asdf")' \
+	     --eval "(push #p\"${wrksrc}/\" asdf:*central-registry*)" \
+	     --eval '(asdf:load-system "trivial-gray-streams-test")' \
+	     --eval '(in-package :trivial-gray-streams-test)' \
+	     --eval '(when (not (equal (list "stream-advance-to-column")
+	                               (failed-test-names (run-tests))))
+	               (uiop:quit 1))'
+}
+
+do_install() {
+	vmkdir $_LIBRARY_DIR
+	vcopy *.lisp $_LIBRARY_DIR
+	vcopy trivial-gray-streams.asd $_LIBRARY_DIR
+	vlicense COPYING
+}