[WIP] New packages: guile3, guix

common/shlibs

@@ -3977,3 +3977,5 @@ libselinux.so.1 libselinux-3.0_1
 libsepol.so.1 libsepol-3.0_1
 libfrrcares.so.0 libfrr-7.3.1_1
 libhugetlbfs.so.0 libhugetlbfs-2.22_1
+libguile-3.0.so.1 libguile3-3.0.2_1
+guile-readline.so.0 libguile3-3.0.2_1

srcpkgs/aisleriot/template

@@ -1,29 +1,19 @@
 # Template file for 'aisleriot'
 pkgname=aisleriot
-version=3.22.9
+version=3.22.11
 revision=1
-_pysol_cardsets=PySolFC-Cardsets
-_pysol_ver=2.0
-build_style=gnu-configure
-configure_args="--with-platform=gtk-only
- --with-pysol-card-theme-path=${XBPS_BUILDDIR}/${_pysol_cardsets}-${_pysol_ver}"
-hostmakedepends="desktop-file-utils glib-devel guile intltool itstool pkg-config"
-makedepends="gc-devel guile-devel libcanberra-devel librsvg-devel
- libatomic_ops-devel"
-depends="aisleriot-data guile"
+wrksrc="${pkgname}-${version}-08104246822df8286d3f0d7b30b697d644ddc656"
+build_style=meson
+# build requires assertions to be turned on -> n_debug=false
+configure_args="-Dtheme_pysol_path=/usr/share/PySolFC/cardsets -Dtheme_pysol=true
+ -Dtheme_kde=false -Db_ndebug=false"
+hostmakedepends="desktop-file-utils glib-devel guile3 intltool itstool pkg-config
+ pysolfc-cardsets"
+makedepends="guile3-devel libcanberra-devel librsvg-devel libatomic_ops-devel"
+depends="guile3 yelp"
 short_desc="GNOME solitaire card game"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="GPL-3.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Aisleriot"
-distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz
- http://distfiles.voidlinux.de/${_pysol_cardsets}-${_pysol_ver}/${_pysol_cardsets}-${_pysol_ver}.tar.bz2"
-checksum="51f2ffe4dd4f23349b033fd87aab7bf433641285719503dd7e52b2c25982ed7b
- c388d6360191b3b7e463d84e5a64260c4e3ed36e791a85227d7e8923f3f47ca7"
-
-aisleriot-data_package() {
-	short_desc+=" - data"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share
-	}
-}
+distfiles="https://gitlab.gnome.org/GNOME/${pkgname}/-/archive/${version}/${pgkname}-${version}.tar.gz"
+checksum=eed8edb267a9fa61651b1d3a22a83f51415a4e55d76d5ae737e18a9e9477016b

srcpkgs/gnutls/patches/gnutls-guile3.patch

@@ -0,0 +1,19 @@
+*** configure.ac	2020-05-27 04:58:09.858735786 -0300
+--- configure.ac	2020-05-27 04:53:37.731383580 -0300
+***************
+*** 964,970 ****
+  *** Detecting GNU Guile...
+  ])
+
+!    AC_PATH_PROG([guile_snarf], [guile-snarf])
+     if test "x$guile_snarf" = "x"; then
+        AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+        opt_guile_bindings=no
+--- 964,970 ----
+  *** Detecting GNU Guile...
+  ])
+
+!    AC_PATH_PROG([guile_snarf], [guile-snarf3])
+     if test "x$guile_snarf" = "x"; then
+        AC_MSG_WARN([`guile-snarf' from Guile not found.  Guile bindings not built.])
+        opt_guile_bindings=no

srcpkgs/gnutls/template

@@ -1,16 +1,17 @@
 # Template file for 'gnutls'
 pkgname=gnutls
 version=3.6.14
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-zlib --disable-guile --disable-static
+configure_args="--with-zlib --disable-static $(vopt_if guile --enable-guile)
  --disable-valgrind-tests --disable-rpath
  --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
  --with-trousers-lib=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake gettext-devel libtool pkg-config which"
+hostmakedepends="automake gettext-devel libtool pkg-config which
+ $(vopt_if guile guile3)"
 makedepends="zlib-devel lzo-devel readline-devel libgpg-error-devel
  libtasn1-devel libgcrypt-devel p11-kit-devel nettle-devel libidn2-devel
- libunistring-devel unbound-devel trousers-devel"
+ libunistring-devel unbound-devel trousers-devel $(vopt_if guile guile3-devel)"
 checkdepends="iproute2"
 short_desc="GNU Transport Layer Security library"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,6 +20,9 @@ homepage="https://gnutls.org"
 distfiles="https://www.gnupg.org/ftp/gcrypt/gnutls/v${version%.*}/gnutls-${version}.tar.xz"
 checksum=5630751adec7025b8ef955af4d141d00d252a985769f51b4059e5affa3d39d63
 
+build_options="guile"
+build_options_default="guile"
+
 pre_configure() {
 	autoreconf -vfi
 }

srcpkgs/guile-gcrypt/template

@@ -0,0 +1,23 @@
+# Template file for 'guile-gcrypt'
+pkgname=guile-gcrypt
+version=0.3.0
+revision=1
+wrksrc="${pkgname}"
+build_style=gnu-configure
+hostmakedepends="automake guile3 pkg-config texinfo"
+makedepends="libgcrypt-devel guile3-devel"
+depends="libgcrypt-devel"
+short_desc="Guile 3 bindings for libgcrypt"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://notabug.org/cwebber/guile-gcrypt"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=07394c3de4f31a36ca2b670e1998c526de891d9436f12e94d8862ab081274d6a
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" guile3-devel"
+fi
+
+pre_configure() {
+	autoreconf -vfi
+}

srcpkgs/guile-git/template

@@ -0,0 +1,19 @@
+# Template file for 'guile-git'
+pkgname=guile-git
+version=0.3.0
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3 scheme-bytestructures texinfo"
+makedepends="libgit2-devel guile3-devel scheme-bytestructures"
+depends="scheme-bytestructures libgit2-devel"
+short_desc="Guile 3 bindings of libgit2"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.com/guile-git/guile-git"
+distfiles="${homepage}/-/archive/v${version}/${pkgname}-v${version}.tar.gz"
+checksum=e12fc747cc817e60be07fea44126b077b292dbd1e96a5bee766754d5cc7e4a05
+
+pre_configure() {
+	autoreconf -vfi
+}

srcpkgs/guile-json/template

@@ -0,0 +1,13 @@
+# Template file for 'guile-json'
+pkgname=guile-json
+version=3.3.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config guile3"
+makedepends="guile3-devel"
+short_desc="JSON module for Guile"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://savannah.nongnu.org/projects/guile-json/"
+distfiles="${NONGNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=ceb7357308d75a9c49dabbddaecf60c9731eda3512b9275a79bb508f628c783d

srcpkgs/guile-sqlite3/patches/allow-build-with-guile-3.0.patch

@@ -0,0 +1,19 @@
+*** configure.old	2020-05-27 06:34:42.422898841 -0300
+--- configure.ac	2020-05-27 06:34:25.983868381 -0300
+***************
+*** 14,20 ****
+  m4_pattern_forbid([PKG_CHECK_MODULES])
+  m4_pattern_forbid([GUILE_PKG])
+
+! GUILE_PKG([2.2 2.0])
+  GUILE_PROGS
+
+  PKG_CHECK_MODULES([SQLITE], [sqlite3])
+--- 14,20 ----
+  m4_pattern_forbid([PKG_CHECK_MODULES])
+  m4_pattern_forbid([GUILE_PKG])
+
+! GUILE_PKG([3.0 2.2 2.0])
+  GUILE_PROGS
+
+  PKG_CHECK_MODULES([SQLITE], [sqlite3])

srcpkgs/guile-sqlite3/template

@@ -0,0 +1,23 @@
+# Template file for 'guile-sqlite3'
+pkgname=guile-sqlite3
+version=0.1.0
+revision=1
+wrksrc="${pkgname}"
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3 sqlite-devel"
+makedepends="sqlite-devel guile3-devel"
+depends="sqlite-devel"
+short_desc="Guile bindings to SQLite"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="LGPL-3.0-or-later"
+homepage="https://notabug.org/guile-sqlite3/guile-sqlite3"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=7501cd60bc693e581dc3e153f418279e1e1637c0760bc4524af6eb2d8eac2fe9
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" guile3-devel"
+fi
+
+pre_configure() {
+	autoreconf -vfi
+}

srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-guild.patch

@@ -0,0 +1,19 @@
+*** configure.ac	2020-05-27 12:02:15.450830987 -0300
+--- configure.ac	2020-05-27 12:02:03.329824812 -0300
+***************
+*** 92,98 ****
+  GUILE_SITE_DIR
+
+  if test "x$GUILD" = "x"; then
+!    GUILD=`which guild`
+     AC_SUBST(GUILD)
+  fi
+
+--- 92,98 ----
+  GUILE_SITE_DIR
+
+  if test "x$GUILD" = "x"; then
+!    GUILD=`which guild3`
+     AC_SUBST(GUILD)
+  fi
+

srcpkgs/guile-ssh/patches/allow-build-with-guile-3.0-snarf.patch

@@ -0,0 +1,17 @@
+*** am/snarf	2020-01-05 13:19:18.000000000 -0300
+--- am/snarf	2020-05-27 12:02:42.774844905 -0300
+***************
+*** 1,6 ****
+  # -*- makefile -*-
+
+! GUILE_SNARF = `which guile-snarf`
+
+  AM_V_SNARF = $(AM_V_SNARF_$(V))
+  AM_V_SNARF_ = $(AM_V_SNARF_$(AM_DEFAULT_VERBOSITY))
+--- 1,6 ----
+  # -*- makefile -*-
+
+! GUILE_SNARF = `which guile-snarf3`
+
+  AM_V_SNARF = $(AM_V_SNARF_$(V))
+  AM_V_SNARF_ = $(AM_V_SNARF_$(AM_DEFAULT_VERBOSITY))

srcpkgs/guile-ssh/template

@@ -0,0 +1,22 @@
+# Template file for 'guile-ssh'
+pkgname=guile-ssh
+version=0.12.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3 libtool which texinfo"
+makedepends="guile3-devel libssh-devel"
+depends="libssh-devel"
+short_desc="SSH module for Guile based on libssh"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/artyom-poptsov/guile-ssh"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=d5b610fa0259187a824dfd26b11a415c1ca7b107912feea8b1a9e7c0fcfbe59c
+
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" libatomic_ops-devel"
+fi
+
+pre_configure() {
+	autoreconf -vfi
+}

srcpkgs/guile3-devel

@@ -0,0 +1 @@
+guile3

srcpkgs/guile3/template

@@ -0,0 +1,51 @@
+# Template file for 'guile3'
+pkgname=guile3
+version=3.0.2
+revision=1
+wrksrc=guile-${version}
+build_style=gnu-configure
+configure_args="--disable-static --disable-error-on-warning --program-suffix=3"
+hostmakedepends="pkg-config texinfo"
+makedepends="gc-devel gmp-devel libatomic_ops-devel libffi-devel libltdl-devel
+ libunistring-devel readline-devel"
+short_desc="Portable, embeddable Scheme implementation written in C"
+maintainer="Anjandev Momi <anjan@momi.ca>"
+license="GPL-3.0-or-later, LGPL-3.0-or-later"
+homepage="http://www.gnu.org/software/guile"
+distfiles="${GNU_SITE}/guile/guile-${version}.tar.gz"
+checksum=04485e759b2aec44e33cdd06ece28bbb859c1dbef73e8aeac02e4e7ca2fe0e57
+
+if [ "$CROSS_BUILD" ]; then
+	# Need host guile to cross compile
+	export GUILE_FOR_BUILD=guile3
+	hostmakedepends+=" guile3"
+fi
+
+pre_configure() {
+	# magically fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941218
+	case "$XBPS_TARGET_MACHINE" in
+		ppc*) export CFLAGS+=" -Os";;
+	esac
+}
+
+libguile3_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove "usr/lib/*.so.*"
+		vmove "usr/lib/guile/*/extensions/guile-readline.so.*"
+		vmkdir usr/share/gdb/auto-load/usr/lib
+		mv ${PKGDESTDIR}/usr/lib/*.scm ${PKGDESTDIR}/usr/share/gdb/auto-load/usr/lib
+	}
+}
+
+guile3-devel_package() {
+	short_desc+=" - development files"
+	depends="gmp-devel gc-devel guile3>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/guile-config3
+		vmove usr/include
+		vmove usr/share/aclocal
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

srcpkgs/guix/files/guix-daemon/conf

@@ -0,0 +1,4 @@
+export GUIX_LOCPATH=/var/guix/profiles/per-user/root/guix-profile/lib/locale
+export LC_ALL=en_US.utf8
+
+OPTS="--build-users-group=guixbuild"

srcpkgs/guix/files/guix-daemon/run

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+[ -r conf ] && . ./conf
+
+exec guix-daemon "${OPTS}"

srcpkgs/guix/template

@@ -0,0 +1,30 @@
+# Template file for 'guix'
+pkgname=guix
+version=1.1.0
+revision=1
+build_style=gnu-configure
+configure_args="--with-bash-completion-dir=${DESTDIR}/usr/share/bash-completion/completions
+ --with-fish-completion-dir=${DESTDIR}/usr/share/fish/vendor_completions.d
+ --with-zsh-completion-dir=${DESTDIR}/usr/share/zsh/site_functions"
+hostmakedepends="guile3 pkg-config"
+_guile_libs="gnutls guile-git guile-json guile-sqlite3 guile-gcrypt guile-ssh"
+makedepends="gnutls-devel guile3-devel ${_guile_libs} zlib-devel"
+depends="guile3 ${_guile_libs}"
+short_desc="Package management tool for the GNU system"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://guix.gnu.org/"
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=5c59106ff4ac497c6097686834b0c914109cf5e44eb6b94ebce818923043640f
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	broken="Guix doesn't support musl"
+fi
+
+if [ "$CROSS_BUILD" ]; then
+	hostmakedepends+=" ${_guile_libs}"
+fi
+
+post_install() {
+	vsv guix-daemon
+}

srcpkgs/libguile3

@@ -0,0 +1 @@
+guile3

srcpkgs/scheme-bytestructures/template

@@ -0,0 +1,17 @@
+# Template file for 'scheme-bytestructures'
+pkgname=scheme-bytestructures
+version=1.0.7
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake pkg-config guile3"
+makedepends="guile3-devel"
+short_desc="Structured access to bytevector contents"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/TaylanUB/scheme-bytestructures"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=cb5202289b0aa4fe470bf16a44b810631863afd48bf2677fd4bf53af017b52c8
+
+pre_configure() {
+	autoreconf -vfi
+}