facts: Update some MacOS mappings

nbdkit finally enabled Cirrus CI testing, which exposed several stale
mappings detected by homebrew:

brew install autoconf automake bash bash-completion ccache cpanminus curl e2fsprogs expect flake8 git gnutls golang gzip jq libssh libtool libtorrent libvirt lua make ocaml perl perl5-devel pkg-config python3 python3-boto3 python3-libnbd qemu rust sfdisk socat tcl xorriso xz zlib zstd
Warning: No available formula with the name "libtorrent". Did you mean rtorrent?
==> Searching for similarly named formulae and casks...
==> Formulae
libtorrent-rakshasa
libtorrent-rasterbar
rtorrent
...
Warning: No available formula with the name "perl5-devel". Did you mean perl-build?'
...
Warning: No available formula with the name "python3-boto3". Did you mean python-yq?
...
Warning: No available formula with the name "python3-libnbd". Did you mean python-build?
...
Warning: No available formula with the name "sfdisk".

Looks like homebrew dropped bare 'libtorrent' in 2016 in favor of the
two explicit fork names.  It seems that rasterbar has more features of
the two forks, but Fedora is based on rakshasa; that said, nbdkit's
configure.ac currently checks PKG_CHECK_MODULES([LIBTORRENT],
[libtorrent-rasterbar]...), and I have not tested whether rakshasa
works in its place.  Meanwhile, 'pkg-config --cflags
libtorrent-rasterbar' does not include the necessary -I/path/to/boost
so compilation fails with missing <boost/config.hpp>; easiest is to
just skip the torrent plugin on MacOS.

As for perl5-devel, it looks like bare 'perl' on homebrew installs
enough to build C bindings against perl without needing a second
package; nbdkit used both 'perl' and 'perl-devel', but a project using
only 'perl-devel' will now get the same effect.

And for boto3, sfdisk, and libnbd, it looks like homebrew has not
picked these up yet; although boto3 can come in through pip.

For tcl, it looks like homebrew prefers the longer name tcl-tk.

Signed-off-by: Eric Blake <eblake@redhat.com>

3 files changed, 12 insertions, 13 deletions

diff --git a/lcitool/facts/mappings.yml b/lcitool/facts/mappings.yml
index 9483ac7..13f3115 100644
--- a/lcitool/facts/mappings.yml
+++ b/lcitool/facts/mappings.yml
@@ -1071,6 +1071,9 @@ mappings:
     default: libtorrent
     deb: libtorrent-dev
     rpm: libtorrent-devel
+    # homebrew has libtorrent-rasterbar, but pkg-config doesn't pick
+    # up proper references to compile with boost
+    MacOS:
 
   libubsan:
     deb: libubsan1
@@ -1277,6 +1280,7 @@ mappings:
     default: python3-libnbd
     apk:
     pkg:
+    MacOS:
     OpenSUSE:
     Debian10:
     Ubuntu1804:
@@ -1599,7 +1603,7 @@ mappings:
     deb: libperl-dev
     pkg: perl5-devel
     rpm: perl-devel
-    MacOS: perl5-devel
+    MacOS: perl
     OpenSUSE:
 
   perl-generators:
@@ -1681,6 +1685,7 @@ mappings:
     default: python3-boto3
     apk: py3-boto3
     pkg: py39-boto3
+    MacOS:
 
   python3-devel:
     default: python3
@@ -1918,6 +1923,7 @@ mappings:
     # option) and what's more the binary is called sfdisk-linux
     pkg:
     rpm: util-linux
+    MacOS:
 
   showmount:
     apk: nfs-utils
@@ -2020,6 +2026,7 @@ mappings:
     deb: tcl-dev
     pkg: tcl87
     rpm: tcl-devel
+    MacOS: tcl-tk
 
   tcpdump:
     default: tcpdump
diff --git a/tests/data/packages/out/macos-12.yml b/tests/data/packages/out/macos-12.yml
index 54e7487..d01f0da 100644
--- a/tests/data/packages/out/macos-12.yml
+++ b/tests/data/packages/out/macos-12.yml
@@ -97,7 +97,6 @@ native:
 - libssh2
 - libtasn1
 - libtool
-- libtorrent
 - libusb
 - libvirt
 - libvirt-glib
@@ -117,12 +116,9 @@ native:
 - ocaml-findlib
 - openjdk
 - perl
-- perl5-devel
 - pixman
 - pkg-config
 - python3
-- python3-boto3
-- python3-libnbd
 - qemu
 - readline
 - rpcgen
@@ -133,13 +129,12 @@ native:
 - scrub
 - sdl2
 - sdl2_image
-- sfdisk
 - snappy
 - socat
 - sparse
 - spice-gtk
 - spice-protocol
-- tcl
+- tcl-tk
 - tcpdump
 - tesseract
 - texinfo
@@ -159,6 +154,7 @@ native:
 pypi:
 - PyGObject
 - PyYAML
+- boto3
 - dbus-python
 - libxml2-python3
 - lxml
diff --git a/tests/data/packages/out/macos-13.yml b/tests/data/packages/out/macos-13.yml
index 54e7487..d01f0da 100644
--- a/tests/data/packages/out/macos-13.yml
+++ b/tests/data/packages/out/macos-13.yml
@@ -97,7 +97,6 @@ native:
 - libssh2
 - libtasn1
 - libtool
-- libtorrent
 - libusb
 - libvirt
 - libvirt-glib
@@ -117,12 +116,9 @@ native:
 - ocaml-findlib
 - openjdk
 - perl
-- perl5-devel
 - pixman
 - pkg-config
 - python3
-- python3-boto3
-- python3-libnbd
 - qemu
 - readline
 - rpcgen
@@ -133,13 +129,12 @@ native:
 - scrub
 - sdl2
 - sdl2_image
-- sfdisk
 - snappy
 - socat
 - sparse
 - spice-gtk
 - spice-protocol
-- tcl
+- tcl-tk
 - tcpdump
 - tesseract
 - texinfo
@@ -159,6 +154,7 @@ native:
 pypi:
 - PyGObject
 - PyYAML
+- boto3
 - dbus-python
 - libxml2-python3
 - lxml