From 71c58b46999d4ba061dbd7c680ace118470e9eb5 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Sun, 27 Sep 2020 08:13:42 +0300
Subject: [PATCH 1/3] New package: guile3.0

---
 common/shlibs             |  2 ++
 srcpkgs/guile3.0-devel    |  1 +
 srcpkgs/guile3.0/template | 44 +++++++++++++++++++++++++++++++++++++++
 srcpkgs/libguile3.0       |  1 +
 4 files changed, 48 insertions(+)
 create mode 120000 srcpkgs/guile3.0-devel
 create mode 100644 srcpkgs/guile3.0/template
 create mode 120000 srcpkgs/libguile3.0

diff --git a/common/shlibs b/common/shlibs
index 079e0ebe5d0..6f725a56892 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4049,3 +4049,5 @@ libtdb-wrap-samba4.so samba-libs-4.13.2_1
 libutil-cmdline-samba4.so samba-libs-4.13.2_1
 libwbclient.so.0 samba-libs-4.13.2_1
 libwinbind-client-samba4.so samba-libs-4.13.2_1
+libguile-3.0.so.1 libguile3.0-3.0.4_1
+guile-readline.so.0 guile3.0-3.0.4_1
diff --git a/srcpkgs/guile3.0-devel b/srcpkgs/guile3.0-devel
new file mode 120000
index 00000000000..38f02d43a80
--- /dev/null
+++ b/srcpkgs/guile3.0-devel
@@ -0,0 +1 @@
+./guile3.0
\ No newline at end of file
diff --git a/srcpkgs/guile3.0/template b/srcpkgs/guile3.0/template
new file mode 100644
index 00000000000..2b47377b6f6
--- /dev/null
+++ b/srcpkgs/guile3.0/template
@@ -0,0 +1,44 @@
+# Template file for 'guile3.0'
+pkgname=guile3.0
+version=3.0.4
+revision=1
+wrksrc="${pkgname/3.0/}-${version}"
+build_style=gnu-configure
+configure_args="--program-suffix=3.0"
+hostmakedepends="emacs pkg-config texinfo"
+makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
+ libunistring-devel $(vopt_if readline readline-devel)"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="https://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=13f2f61a665469d330e651c8e9f7faecbb87fe474767f9532f2e821701730957
+
+build_options="readline"
+build_options_default="readline"
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" GUILE_FOR_BUILD=guile3.0"
+	hostmakedepends+=" guile3.0"
+fi
+
+libguile3.0_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+	}
+}
+
+guile3.0-devel_package() {
+	depends="gc-devel gmp-devel ${sourcepkg}-${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/share/aclocal
+		vmove usr/share/guile
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/libguile3.0 b/srcpkgs/libguile3.0
new file mode 120000
index 00000000000..38f02d43a80
--- /dev/null
+++ b/srcpkgs/libguile3.0
@@ -0,0 +1 @@
+./guile3.0
\ No newline at end of file

From 0016b2a2ad1df012bc5ce2db598022991ee7e690 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Mon, 21 Dec 2020 11:32:35 +0300
Subject: [PATCH 2/3] WIP: fix cross-compilation?

---
 srcpkgs/guile3.0/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/guile3.0/template b/srcpkgs/guile3.0/template
index 2b47377b6f6..1bbd832893b 100644
--- a/srcpkgs/guile3.0/template
+++ b/srcpkgs/guile3.0/template
@@ -20,7 +20,7 @@ build_options_default="readline"
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" GUILE_FOR_BUILD=guile3.0"
-	hostmakedepends+=" guile3.0"
+	hostmakedepends+=" guile3.0 guile3.0-devel"
 fi
 
 libguile3.0_package() {
@@ -31,7 +31,7 @@ libguile3.0_package() {
 }
 
 guile3.0-devel_package() {
-	depends="gc-devel gmp-devel ${sourcepkg}-${version}_${revision}"
+	depends="${sourcepkg}-${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/share/aclocal

From e6083d4b8b10adbb4a1cdfd3e587b5f517a072ec Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Mon, 21 Dec 2020 15:53:04 +0300
Subject: [PATCH 3/3] WIP: i18m tests on musl

---
 srcpkgs/guile3.0/template | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/srcpkgs/guile3.0/template b/srcpkgs/guile3.0/template
index 1bbd832893b..afa32e5fec3 100644
--- a/srcpkgs/guile3.0/template
+++ b/srcpkgs/guile3.0/template
@@ -23,6 +23,12 @@ if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" guile3.0 guile3.0-devel"
 fi
 
+pre_configure() {
+	if [ "$XBPS_TARGET_LIBC" = musl ]; then
+		vsed -i test-suite/Makefile.am -e '/i18n.test/d'
+	fi
+}
+
 libguile3.0_package() {
 	short_desc+=" - runtime library"
 	pkg_install() {