diff --git a/app-backup/grub-btrfs/grub-btrfs-4.11.ebuild b/app-backup/grub-btrfs/grub-btrfs-4.11.ebuild
index cd3f71ad13..740e6ce1f0 100644
--- a/app-backup/grub-btrfs/grub-btrfs-4.11.ebuild
+++ b/app-backup/grub-btrfs/grub-btrfs-4.11.ebuild
@@ -16,26 +16,23 @@ PATCHES=( "${FILESDIR}/${P}-remove-docs-from-make.patch" )
DEPEND="
sys-fs/btrfs-progs
sys-boot/grub
- virtual/awk
- >=app-shells/bash-4
+ virtual/awk
+ >=app-shells/bash-4
"
RDEPEND="${DEPEND}"
BDEPEND=""
-src_prepare() {
- default
-}
src_compile(){
true
}
src_install(){
default
dodoc README.md
- mv ./initramfs/readme.md initramfs-overlayfs.md
+ mv ./initramfs/readme.md initramfs-overlayfs.md || die
dodoc initramfs-overlayfs.md
}
pkg_postinst() {
elog "run 'grub-mkconfig -o /boot/grub/grub.cfg' to update your Grub menu."
- elog "update your /etc/grub.d/41_snapshots-btrfs script (e.g. with dispatch-conf or etc-update)"
+ elog "update your /etc/grub.d/41_snapshots-btrfs script (e.g. with dispatch-conf or etc-update)"
}
diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
new file mode 100644
index 0000000000..f6034158c9
--- /dev/null
+++ b/app-crypt/tpm2-openssl/Manifest
@@ -0,0 +1 @@
+DIST tpm2-openssl-1.1.0.tar.gz 415118 BLAKE2B c82410b1694b5db3e7b6614b1c4e2eef7354c87574334e1e81631bba707398e3d33d975dba2f2cbbf1b09d90f8ae94e7f01531c98b1efd666ca43298a02ead0a SHA512 a57e25d8efcbaa3a898a2803d816169e4227466f9391e5dc7c80a44686865cae0c24ee1973c6376d86d5be8081850f7b35cd0d4cb0b3a8cf654d400d78ae383b
diff --git a/app-crypt/tpm2-openssl/metadata.xml b/app-crypt/tpm2-openssl/metadata.xml
new file mode 100644
index 0000000000..fdd29c016a
--- /dev/null
+++ b/app-crypt/tpm2-openssl/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ salah.coronya@gmail.com
+ Christopher Byrne
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
new file mode 100644
index 0000000000..10a17e8b50
--- /dev/null
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="OpenSSL Provider for TPM2 integration"
+
+HOMEPAGE="https://github.com/tpm2-software/tpm2-openssl"
+SRC_URI="https://github.com/tpm2-software/tpm2-openssl/releases/download/${PV}/${P}.tar.gz"
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+# Needs IBM's software TPM simulator, which isn't in Portage
+RESTRICT="test"
+
+RDEPEND=">=app-crypt/tpm2-tss-3.2.0:=
+ =dev-libs/openssl-3.0*:0="
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="sys-devel/autoconf-archive
+ virtual/pkgconfig"
+
+src_prepare() {
+ # See bug #833887 (and similar); eautoreconf means version information
+ # could be incorrectly embedded
+
+ sed -i \
+ "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
+ "${S}/configure.ac" || die
+ eautoreconf
+ default
+}
+
+src_install() {
+ default
+ find ${ED} -iname \*.la -delete || die
+
+ # No libtool files are install, so nothing to check for bug #833887
+}
diff --git a/app-doc/ford/Manifest b/app-doc/ford/Manifest
index d69fbbd9f7..6ec9e05b5d 100644
--- a/app-doc/ford/Manifest
+++ b/app-doc/ford/Manifest
@@ -1,5 +1,3 @@
-DIST FORD-6.1.4.tar.gz 5838415 BLAKE2B fb98ec7b06b948e17d8df2896c1de125f779fdcf1c00303813db34164db5d39f46e5404264acde947aa3ba7d92765670139b7f1e6e19d7f5fcb8541eb3d9582c SHA512 15e1318d0653c2477c32cb07e74b5090bf0509fb94fe3ad63e15ccc98fce56b9e28f0f38ba48e235241b15fe3b52fa27db2eac1dc405bb53c1fd557d0140df82
-DIST FORD-6.1.5.tar.gz 5841811 BLAKE2B 15c08e3f36794e789d02b021477a76a9d97d08517eb05b13a8c919fd5b3d28df267019fb0728be6bdfe638e4f912fbbd7e4d74cf12accefbfe03a0f7c3bc8e65 SHA512 32cc6cfd8668a1970909c88837c03bb711caae894e844466db848358f08273d2596d964a010fb8494dbab4b3796387c4d6681d3aa3703dfc6df98a6db39a9eb5
-DIST FORD-6.1.7.tar.gz 5841796 BLAKE2B 7a81cc46521cf9d293c1da70457124be91879ee8a6a2be9152d3c3f5b68ae5621fceeba62ed82a13dadaa7d508ae0ed14ff5b583fb134b0341ff777121300d15 SHA512 fad397e439facbbca50879972633ac5a85aa57b4fc4cbcf5deeb17e8e4964aa2d5182ef3ad72fd0d3bf1f113bb61ba0bb439cc9b2890bda185842770ad3edb2c
DIST FORD-6.1.8.tar.gz 5843274 BLAKE2B a902dc204abbe389dbd2920b494e00a81f74de9c710247e61a13d63a05bb5e8ad9bb5da84cab035836e218c92aac33863dd97c16c025f449966b9114e180bf18 SHA512 618efac6ea4759cb08fc877493360a80eb6da1e21fd513a831639316e8d9cbbdb76cfdb36ce668dbe76f00bb2ef5abcce347ba714a91de8322b3d96b3a67adad
DIST FORD-6.1.10.tar.gz 5847455 BLAKE2B b575be88434b129289c5098fc3da0216190fa2a953a4ed2bfcc1275a22cc37d8c096dad6fb45ff2606a87ffa179ce31b172ff0a641cf40444f151b30c2cb3bc0 SHA512 2116bb28a3d678216d3b61d53955ef6f199e50d2286491d0d9e867a2f8d53a8c7b5a1cace1671390380a21bdaa86814a3d9625d3919bdce03a22b25b02e06757
+DIST FORD-6.1.11.tar.gz 5848224 BLAKE2B f8092b678ab1621f3d295e77b8a308d2f4787baa77b989a0dc07a9b23c0723945a97bca81bda879d7929b8910eb49b635bd052304b3b6d1ba25f8dbb552b676e SHA512 325e8c05b5df6435c164adf24871d9743d2927d862010b005ba87dafd0e44cf1f52dae50d1b2bec5a5f39f935859286e0c9ba5156b24843bc58dc1335c5e1913
diff --git a/app-doc/ford/ford-6.1.7.ebuild b/app-doc/ford/ford-6.1.11.ebuild
similarity index 95%
rename from app-doc/ford/ford-6.1.7.ebuild
rename to app-doc/ford/ford-6.1.11.ebuild
index 2293d62f54..369eb1f96d 100644
--- a/app-doc/ford/ford-6.1.7.ebuild
+++ b/app-doc/ford/ford-6.1.11.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
dev-python/jinja[${PYTHON_USEDEP}]
dev-python/markdown[${PYTHON_USEDEP}]
dev-python/markdown-include[${PYTHON_USEDEP}]
- dev-python/md-environ[${PYTHON_USEDEP}]
dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/python-markdown-math[${PYTHON_USEDEP}]
dev-python/tqdm[${PYTHON_USEDEP}]
dev-python/toposort[${PYTHON_USEDEP}]
"
diff --git a/app-doc/ford/ford-6.1.4.ebuild b/app-doc/ford/ford-6.1.4.ebuild
deleted file mode 100644
index 4602560ddf..0000000000
--- a/app-doc/ford/ford-6.1.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-MY_PN="FORD"
-DESCRIPTION="FORD, automatic documentation generator for modern Fortran programs"
-HOMEPAGE="https://github.com/Fortran-FOSS-Programmers/ford"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/graphviz[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markdown[${PYTHON_USEDEP}]
- dev-python/markdown-include[${PYTHON_USEDEP}]
- dev-python/md-environ[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/tqdm[${PYTHON_USEDEP}]
- dev-python/toposort[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGELOG.md README.md README.rst )
-
-distutils_enable_tests pytest
-
-python_test(){
- # The 'test/test_projects' tests use subprocess, i.e. require FORD to be installed.
- distutils_install_for_testing
- distutils-r1_python_test
-}
diff --git a/app-doc/ford/ford-6.1.5.ebuild b/app-doc/ford/ford-6.1.5.ebuild
deleted file mode 100644
index 22cf4cef72..0000000000
--- a/app-doc/ford/ford-6.1.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1
-
-MY_PN="FORD"
-DESCRIPTION="FORD, automatic documentation generator for modern Fortran programs"
-HOMEPAGE="https://github.com/Fortran-FOSS-Programmers/ford"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RDEPEND="
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/graphviz[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/markdown[${PYTHON_USEDEP}]
- dev-python/markdown-include[${PYTHON_USEDEP}]
- dev-python/md-environ[${PYTHON_USEDEP}]
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/tqdm[${PYTHON_USEDEP}]
- dev-python/toposort[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGELOG.md README.md README.rst )
-
-distutils_enable_tests pytest
-
-python_test(){
- # The 'test/test_projects' tests use subprocess, i.e. require FORD to be installed.
- distutils_install_for_testing
- distutils-r1_python_test
-}
diff --git a/app-emulation/spice-html5/spice-html5-0.3.0-r1.ebuild b/app-emulation/spice-html5/spice-html5-0.3.0-r1.ebuild
index 815680a942..940a6e22b2 100644
--- a/app-emulation/spice-html5/spice-html5-0.3.0-r1.ebuild
+++ b/app-emulation/spice-html5/spice-html5-0.3.0-r1.ebuild
@@ -13,7 +13,7 @@ SLOT="0"
KEYWORDS="~amd64"
src_compile() {
- sed -e "s/VERSION/$(PV)/" < package.json.in > package.json || die
+ sed -e "s/VERSION/${PV}/" < package.json.in > package.json || die
}
src_install() {
diff --git a/app-metrics/scaphandre/Manifest b/app-metrics/scaphandre/Manifest
index 92a72152a1..f53ff1c1c7 100644
--- a/app-metrics/scaphandre/Manifest
+++ b/app-metrics/scaphandre/Manifest
@@ -119,7 +119,7 @@ DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c899
DIST rustls-0.19.0.crate 208339 BLAKE2B 55f627e2cd497d8fec205c3e5419804db23eea1b216aac606a136d4a53dd81fbcba8eb00a28c52f785cadcc3fe61dff839eb306828d0a924e3580c10d536515e SHA512 4c06462a67c5f6e5593fb1e747bdb2e35222e3b5512996051ee933e0cbfd3c376e30cc4bc692330b8678e286042240d096f9ec60fc484194c8fbeb9b48a8d886
DIST rustls-pemfile-0.2.0.crate 14079 BLAKE2B caf708085d1ea04a7ca40de476415c0c6f88a246e4fcc091e77f7529cddfdf8c5bac541468b1b80cfdc011c493deba67d6778babc5b04413f1f2e58ddd3d581b SHA512 c2f405c2a0381bf253003b00f35b726e9dcb10ac6fcfccf12acf27f42178e5d887197906f2f7bacd7058dc461187aa9dfdcfe1033d46b179bd423be9dfa622bb
DIST ryu-1.0.5.crate 49570 BLAKE2B 3bfba4a5f290a429de7ac3b86823b2a973f40eb6f48c15329173d95964d31ada36f2618be4b36774a03f97f2ce61364900c6a3ad5465a294e2df311a1f4104ed SHA512 d1708ffa3112a684edf2956b6730ead040401d38f1457cde074eaaa59c249007dc8b925629e7f6df89f7ea757e9d0826649d685cc8ede0a04d50296048bf476c
-DIST scaphandre-0.4.1.zip 2030573 BLAKE2B 41797d7db4a14ede5f0951edc1cafe1dc177d8ff56eff08225857d403e24b98f051da503b3cdc80d91edc73931281d1b9e940300837a894b8122187688185de2 SHA512 a0fb29b7958937373f49ba368e6018ec4ef46591217cc5553e7e3c0b007aabd0e27f5106c8286ea9269f5abd2700555573458d1d538e2a70b14586647b03d8e6
+DIST scaphandre-0.4.1.tar.gz 1998613 BLAKE2B e241bd66c05d2dab91eddd087a90371f477087362fc9535ce9b068f5b33aa7410ba243d3b2f4683c23ce297048d8ff621ecd889be4af8073ece63fd89197fdc1 SHA512 c730842981b74d5f2edc7f44fe90047402181e7e7ab89828eb7a4775fb754301bd32078a11218a67c24b907f1ffe4beabd60d2687f218e4815bd9cdd7eab098c
DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0
DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
DIST sct-0.6.0.crate 28777 BLAKE2B b1e86bb40d30f8201e1fe94fbd4d5820754ffd6867815e4085bfbd710ea79712125207fd8c8d9a2bb73c5092a457890381e6f73867b1b9d1a3d37115657f0b38 SHA512 fed46a52834b90495a8bc37993ad0754f20fedef6db442368559594d7184a12b43e31a7d42a595b032e54f8aa535cae0030d9eccc828c9df2fb457267e782b15
diff --git a/app-metrics/scaphandre/scaphandre-0.4.1.ebuild b/app-metrics/scaphandre/scaphandre-0.4.1.ebuild
index 9752431d68..63163f7241 100644
--- a/app-metrics/scaphandre/scaphandre-0.4.1.ebuild
+++ b/app-metrics/scaphandre/scaphandre-0.4.1.ebuild
@@ -205,7 +205,7 @@ DESCRIPTION="Electrical power consumption measurement agent."
# Double check the homepage as the cargo_metadata crate
# does not provide this value so instead repository is used
HOMEPAGE="https://github.com/hubblo-org/scaphandre"
-SRC_URI="https://github.com/hubblo-org/${PN}/archive/refs/tags/v${PV}.zip -> ${P}.zip $(cargo_crate_uris ${CRATES})"
+SRC_URI="https://github.com/hubblo-org/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz $(cargo_crate_uris ${CRATES})"
# restricting test because '/proc/modules' does not appear to be present in the CI
RESTRICT="mirror test"
# License set may be more restrictive as OR is not respected
diff --git a/app-misc/doublecmd-bin/Manifest b/app-misc/doublecmd-bin/Manifest
index e361ebe6f2..2f37a6770a 100644
--- a/app-misc/doublecmd-bin/Manifest
+++ b/app-misc/doublecmd-bin/Manifest
@@ -1,12 +1,8 @@
-DIST doublecmd-1.0.1.gtk2.i386.tar.xz 7336892 BLAKE2B 178230ff3f6e49692304881558fe9ba0433fef8d0b19e6be77e6d327e20d0d521595714c366027e5f953cb23c3aae19e2a16544469bd2425b3092836089dc775 SHA512 3fce7394d6bb59132f70e7f35c5675b017cd74699d09cf69ae96649afec7d2ea9d704534222dd6eac82a7c0ec9e4ad59cf46ba1bc2216f71ae4e21465d9179bb
-DIST doublecmd-1.0.1.gtk2.x86_64.tar.xz 8082796 BLAKE2B 5a13f686d984acc587cd7b0f218616b32ccd9efad1cf0a978f29f0604779f1f4fe37a01ab6228e30f7f85cd6e636b805ffa2357a59c53e57e9031a481c804fca SHA512 921c0f43c2ab05f97b62cd71be81519f8a4d2da3db02fe25d798f14ba6557dbc348aa9756ab80aee1458841b0a8a7775f61044cd222df14d49b625e0e7dcddf3
-DIST doublecmd-1.0.1.qt.i386.tar.xz 7891088 BLAKE2B c417394c6194a46caba4069d0bb8dd155b4a8716deb7625ad79a73fa1a0ccaabfab2a18a380b94922acdecab073a4ecc930c2cab67408f07f81d9ae8a4bd5622 SHA512 660ff3ab15a9368c70dd5cbbea8f8d0dde735da3a96940345cd5fe1ceaca2e24d939bea92e40ade40afd2e9878a8b4881e8b0cd7b69354c70e8f21992b6c441c
-DIST doublecmd-1.0.1.qt.x86_64.tar.xz 8542408 BLAKE2B 882e1145133643532748d215d49afd3934f606818be9c6a44b842b2c2af1bf7a8126d0a36c7b691f66919c99c09f45a9bdbe7feed786ef09e80eb44504dbb941 SHA512 d70f35bcb2d78a1aa4505d5cb4d04306992b2a580b4cc5c3fd0075ab8b029319619a93dcdad188c9007cab8667fa05435ce74b3933ac6069a1fb3eb9fba3fc9a
-DIST doublecmd-1.0.2.gtk2.i386.tar.xz 7340356 BLAKE2B 2c3d9dbde52112959017991cccc051f1d2e93c635aac9b5ad674a4ad9cce1d3dd0ab90852f78589a2c9ea41283749efa77729848acf0d9508a9d32da553ed872 SHA512 c84b913bf1b222108295468265c88997452f185fa7a7a7536264b6f6bfe0a27ef13dd7be9ae0d1b5447198a3cc921a94ca0af75a725b856124fac8223628a9ca
-DIST doublecmd-1.0.2.gtk2.x86_64.tar.xz 8084912 BLAKE2B 11b9146699bbce99dc72b4892a8df22096661acbc84dc8154a0303374aad978bb9958677365900c6304909d9227a0e1b60df43c46f25d73b3cbffb97a8403fae SHA512 0ac8b03e040ee256f05e8f9ce779cde9a83506f5154bc4323ac5c26e14fcebe94aa3e27db7f6bdc2b3417481f69703ec7431ddfe5de1adec70366ea7c0abfb35
-DIST doublecmd-1.0.2.qt.i386.tar.xz 7894460 BLAKE2B ff5f42e985509786d015da1ac2f7dcab1fa473f228bab90eb2f8142dbed73bad79f96c63a2e046ae421493bfc7bfed39481b6283e7c22f091756c822502c7c4e SHA512 68ce77999eb020f6e91a97830581f721667885e4dd92c3d24c45efa08e5288505b607914d19c68d7597273c49205e306f78373d62a0bef6da9639e89101e18fe
-DIST doublecmd-1.0.2.qt.x86_64.tar.xz 8546928 BLAKE2B 31e9e54e2b261b5b185b2ff315f046957306b59d8e6b086962caa5db7ece966de874f56988a95adde72927c58b92f2bd83849a815fa4fbdc16cdbd207f8b5495 SHA512 5b05080de9cc5c012bfe38ffecc87c654d078edbb0a9d3ff7c8f7648b17d469d68214e2a4d0846d32e38419186aa3f51ad495a33ef373d3b9a3f00872169d5a9
DIST doublecmd-1.0.4.gtk2.i386.tar.xz 7341060 BLAKE2B 1b9fbb2240fc3cbbf294a8b90d2138c288d09a0e41a3b329780a97ddca2cecb02e8d45d1dcf6b069d572fe025f4f759b763cfc0532825673b726a9ba201cc40f SHA512 895015a8316532fa264d8dd522a2419081917417cae08dffce9e68671c6bb681f45b629513a739515e849e76ab90f8abe9c5a2f19861e605c026fc6b116ed6dc
DIST doublecmd-1.0.4.gtk2.x86_64.tar.xz 8086492 BLAKE2B 2ce56bff0e69bbe2d24d2b2bcda0f4dc9dcc9fdef0f5b0f151db41475a0bdb19122904c95c7506911986260cc50dd95097a5ccf43db1ddc352be52fe142b213b SHA512 3916a4d8637787c0ec3440cbafc6285614109ed81bbcbf9991ecc9b63951f59f8dd3380596904eb189dce930ba635c2f70860286ade380cf96a3a3f9aea30c2b
DIST doublecmd-1.0.4.qt.i386.tar.xz 7895604 BLAKE2B f4edad234ec99b6204c349aeee20907f547a63467b9f48ab4e40023f6d15d3ba63cc6e8d58d03e0b7fc434cdb3dac7004d0e9525cbac29b82f832f59c016e51c SHA512 6f17c1246602d179632e67f22067ddd47588d2548d6ddbc211816e2c2a0d924f34f340bbfd1d176108c2fb87f9918e4337e725ff66f891480367ffb3e6ca1832
DIST doublecmd-1.0.4.qt.x86_64.tar.xz 8583292 BLAKE2B 0959d68f0d62e71b67bde8f542313c44727a3b4a43e5c6633bae4eee5517147d5c3166955c74649b3e01ff51442962c31a0e26bb51c12829fda98cf16d318080 SHA512 1b57199d177145b0e08b099593bbb9b7791d35cb6c4943a6857a79eaa9c61ceef8471fab69d49a9a33e5bc70ae93e82514757fe7b85306b73480c0a1e535030a
+DIST doublecmd-1.0.5.gtk2.i386.tar.xz 7378356 BLAKE2B a952eb20cff96704a274e69a492dd47e39300fef790040df4422ca3144aa2fc83a9a7b33bf86c34e61dcc70704a5ecd5e30efc4f2c92f8037e7d64e3e2683f73 SHA512 2b3702983197b5d50cefdb27c1f736da8b058c69e696f0033b85d4e27dcd32beaa315b5b95a8f92f91203f364ecdc993ea3411a4cea006dc906170190ac5c1e7
+DIST doublecmd-1.0.5.gtk2.x86_64.tar.xz 8127412 BLAKE2B 15bf8e3cb04f13624b7583513aa72b4c7df7be81efd0e25322bf65677798dc0a90086221eedd22757eb4537a103a049277c79c86f58e0028ffd13348118c679b SHA512 04faf907896e3532efc079c24a04594e4a662675f9827d5ea68cea2dbbba16e4df301d1c9eb64c39243b6db25a263b39ebc1aab2b0811dce95bd15cdb2553c6d
+DIST doublecmd-1.0.5.qt.i386.tar.xz 7932080 BLAKE2B 1939ff0eb213d6ae99158586401006e755c004c92ba6aef428dc649ebd674fef36465990b25f3bc56036c44e27c617593af10e058b821f1d7e8398027afbf7da SHA512 2c413e7b4578a2869051698b33a2b608c60ed68030dcf1ac3a25c58460c8f88c8ddb45bc829968136c851efb95fa14c50f26dd762a0de09dee6fb08d3a005cd1
+DIST doublecmd-1.0.5.qt.x86_64.tar.xz 8613076 BLAKE2B b1a6ec59545519d71d6da243c930ff5f5b3c2f288fae1fc25e634f1a15f55539dc29acadc24c3ff5b11705ba3570d7b60afd738a3b2bf7ba7229062ce4e79a6e SHA512 dc5c5da59858a40575ddb9b383fce75d706b0fa0c5d341f3ebe1b953b1aa32097b733a4d5736313394e7bb5e598c020bd015f7443a79645a449a02740a9ee968
diff --git a/app-misc/doublecmd-bin/doublecmd-bin-1.0.2.ebuild b/app-misc/doublecmd-bin/doublecmd-bin-1.0.2.ebuild
deleted file mode 100644
index d2c6bd683c..0000000000
--- a/app-misc/doublecmd-bin/doublecmd-bin-1.0.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop wrapper xdg
-
-MY_PN="doublecmd"
-DESCRIPTION="Free cross platform open source file manager with two panels side by side."
-HOMEPAGE="https://doublecmd.sourceforge.io/"
-
-SRC_URI="amd64? (
- gtk? ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV}.gtk2.x86_64.tar.xz )
- qt5? ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV}.qt.x86_64.tar.xz )
- )
- x86? (
- gtk? ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV}.gtk2.i386.tar.xz )
- qt5? ( mirror://sourceforge/${MY_PN}/${MY_PN}-${PV}.qt.i386.tar.xz )
- )"
-
-# Licenses for package and plugins
-LICENSE="GPL-2+ LGPL-2-with-linking-exception LGPL-2.1+ LGPL-3 GPL-1 freedist"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-IUSE="gtk qt5"
-REQUIRED_USE=" ^^ ( gtk qt5 ) "
-
-S="${WORKDIR}/${MY_PN}"
-
-QA_PREBUILT="
- */doublecmd
- */libQt5Pas.so.1
-"
-
-## "ldd doublecmd" output show linking to some libraries provided by sys-libs/glibc:2.2
-## (maybe virtual/libc-1) and no libraries of sys-libs/ncurses (that removed here).
-## x11-libs/X11 is optional dependency of dev-qt/qtgui:5 by [xcb] or [X]
-## therefore it is mentioned here explicitly.
-RDEPEND="
- dev-libs/glib:2
- sys-apps/dbus
- x11-libs/libX11
- virtual/libc
- gtk? ( x11-libs/gtk+:2 )
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtx11extras:5
- )
-"
-
-src_prepare(){
- default
- ## Create partial init config that allows to store config within user home directory
- cp "${FILESDIR}/doublecmd.xml" "${S}/"
-}
-
-src_install(){
- insinto "/opt/${PN}"
- doins -r "${S}/."
-
- exeinto "/opt/${PN}"
- doexe "${S}/${MY_PN}"
- make_wrapper ${MY_PN} "/opt/${PN}/${MY_PN}" "" "/opt/${PN}" "/opt/bin/"
-
- doicon -s 48 ${MY_PN}.png
- make_desktop_entry "${MY_PN}" "Double Commander" "${MY_PN}" "Utility;" || die "Failed making desktop entry!"
-}
diff --git a/app-misc/doublecmd-bin/doublecmd-bin-1.0.1.ebuild b/app-misc/doublecmd-bin/doublecmd-bin-1.0.5.ebuild
similarity index 97%
rename from app-misc/doublecmd-bin/doublecmd-bin-1.0.1.ebuild
rename to app-misc/doublecmd-bin/doublecmd-bin-1.0.5.ebuild
index d4220268b6..6b4c8bebf6 100644
--- a/app-misc/doublecmd-bin/doublecmd-bin-1.0.1.ebuild
+++ b/app-misc/doublecmd-bin/doublecmd-bin-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
diff --git a/app-misc/vocabsieve/Manifest b/app-misc/vocabsieve/Manifest
index 4b4087e5f6..7b613913e9 100644
--- a/app-misc/vocabsieve/Manifest
+++ b/app-misc/vocabsieve/Manifest
@@ -1 +1 @@
-DIST vocabsieve-0.7.0.tar.gz 157190 BLAKE2B 6985d189f24cb526e1b079a741d10cea20bbbe70d84425fbbf8ee2a251c6622ab5979dbc74a26810135b5a63acb987f7ede453f8a139ec941570c691fc2a2fd8 SHA512 3f0db2a77c77f8f78453300d03d2941cbe5c735a3c15877b8288d5f83ef8bfc6edd5b5dff8732f1930b7bd7e5d809269b427f4e9815de4d42985db31c9e13ab7
+DIST vocabsieve-0.7.2.tar.gz 157099 BLAKE2B 50561f9b218819e2d43f0413631cbe01f57f5fad74330420eecbe24cadce0872c4fbf1266c39890e042495b45e2d9815de19911494bf06bb41700111e1a7664c SHA512 244de4b23a3795b0d60bced1da8973dd15eda6c13f53516bc6b62f249c5f328496e687bac85786a973c91899ff52bf049c7647653ac1becbb8bb1b1c926bdef0
diff --git a/app-misc/vocabsieve/vocabsieve-0.7.0.ebuild b/app-misc/vocabsieve/vocabsieve-0.7.2.ebuild
similarity index 100%
rename from app-misc/vocabsieve/vocabsieve-0.7.0.ebuild
rename to app-misc/vocabsieve/vocabsieve-0.7.2.ebuild
diff --git a/app-misc/zellij/Manifest b/app-misc/zellij/Manifest
index 920e145f6c..dd97ee747f 100644
--- a/app-misc/zellij/Manifest
+++ b/app-misc/zellij/Manifest
@@ -22,10 +22,13 @@ DIST backtrace-0.3.64.crate 74311 BLAKE2B 32650d755fec8a9e04f915572c999eb6cffc78
DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
+DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
DIST block-buffer-0.9.0.crate 7108 BLAKE2B 42e99ec46c6e43d5f85e8d6d0a8fcef7175c97828758c93e55505c0e18e2646ae77bf264076041bf682532e28268a4978dd9c822c0475347ee3d29c5df2601fb SHA512 2d0f8908f59d4b1cccd1fbca0c1fa3cc4b224f09549669b28a16af5acfd4369b66851e9be8d65e1df71be998fbc42fc130ad32b71e035d6055724e8fa31fbf98
+DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
DIST blocking-1.2.0.crate 18494 BLAKE2B 252a17536290d3898015b6eb844225c7fb78cd84424fda2459331d5eda56d19efff48c670b692288d32d870f62a539449a9b3ad7aef947de50f8862d44fbd9a7 SHA512 aa5cc62a340fb94859e90bd54b9e61d897026ee66570f15f94a0be287b470f5222233dbf30cdf1b0860c4a24abdb0c40f925d9ccbabfbf38fa27b5b17917aa33
DIST boxfnonce-0.1.1.crate 9698 BLAKE2B 678cd597d002850a2ed7ae430b23fb71f7218cda3a874339f98e698c570fb1be466862db1365e80f62d0b5d9c0561cf65fed004ed460896f1f9dbb704c4c3cff SHA512 e027de23cb7c58fcf47dcdf1dc2adf7477408f2b4e6303b51a72e2b87de232d4898dcc064f43d7bd86e337f7e1b0c1f6324daa1cb8e9ba0e530674fb358eecc6
DIST bumpalo-3.9.1.crate 77507 BLAKE2B b248a0c2a9faaf52061f2fe0a82b9fd4efb4dae01da9dbd986493941f3ef2632f1d5608d167f2d088536dc96b4cce28981602220062892a7af51c3ead7a74a4b SHA512 40bf3f0d261aaff1f7c30a539953b9c14f4526f05586af0dbe2e4df4cc042cbe6180e3dcc2fbc6f1802e694066f72e629e74de40bc2951c5527edaf551722a52
+DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
DIST cache-padded-1.2.0.crate 9125 BLAKE2B d50b506aca9cfad3117be593c33bba4a5240034a838610925f9eac969155f22e0064c91f8d3588333880d1f5b6b936df87c0728530f80cd1062c73d570bfd1e4 SHA512 5b67d06908981d0e1ba01912a973cc5c90ce6612f227b306d12b13500594f5d2376d437a046e10b9cf959b609cb67fa6e24193fc651cb2d84e1f77338c6823fc
DIST cassowary-0.3.0.crate 22876 BLAKE2B 7e74a08e02050548ade7dd1ebba7ce4e4360d258ea6acf126453889dbf16df433bed7b68789736881c957f4c09eead1f763a0c02f2474157b1650a1e77e6eca9 SHA512 0838c0b79ed31f0c514fe4ac82633976e34b0d6cb08616313cda0e00623514fc6498c6c308cfef54ea029f1fdbaafe2991ca8ac3c38437a113ac62e37f9397f8
@@ -51,13 +54,12 @@ DIST cranelift-entity-0.68.0.crate 24360 BLAKE2B 69583cf381545191c50b80ed3418da3
DIST cranelift-frontend-0.68.0.crate 31971 BLAKE2B 68d08afc9c4859a8c6231d56d5bfe698f88d7bc21c1fe89ae2a1db05762e5076edd3de92b3315265a9af282c63ac6b60dd4b6268a736eed6ae67355bf1c8723e SHA512 2a879c32757179eb4828acc5ead38bb9ca59d9adb058f06b7d2994b09a85c4f104e9f974f1aa07f03c2a5120ce894a78a48c5b29af7d70fa25fefffcd63a3b9a
DIST crc32fast-1.3.2.crate 38661 BLAKE2B ce3762b03d24d5367d89738991c060f4b3af7840e0a7ac7fc17d01ed438caf964bbaefad0fc4d0c438dafa5a578429ddd353c71197f8b54b1ec441395f2f7ee0 SHA512 a683943e252afdb1b9d626a07533ed11cf7a63af603c19640056c5d2b9c884ad9aff33ac54c0853ffca2f6cf94b0730eae6c05abf3e53e55e709d180c8152357
DIST crossbeam-0.8.1.crate 10429 BLAKE2B 4f915d623533a226370eeceefa5c196438b1b332a8b5eb6223853e416385ac4e1a207bf1989646478b219f7a68c8ca0656a808e87db58361f1d77a5554cc2a76 SHA512 564f5623d1a4da7b0253f14946f2e71d14ac9195d80ab3b0ad8e2ba6fc7229745c8c70c2899852d48fc93cef009109d7d7cf2dc9c875273cb8ce9223b92b0beb
-DIST crossbeam-channel-0.5.3.crate 88179 BLAKE2B 4fd2b35e36ee9176341e336096d717d649087b8605d81871ba9642a9ad827569e60769cfebe8a96a55e5c79a5180cf42e79c62fb1418d50b0c65f4c711181a66 SHA512 2c1033f514a6c0cffa247031b0aa2d3a8e52bfab9b2a04d9f11c0b5050dc3779fad2325589b52c8d33c7e8d15f74b04ebf802b262b6d8d03b976619525a65bd0
DIST crossbeam-channel-0.5.4.crate 88237 BLAKE2B ffcab003305b80586a9b61c6309dcf6f4ced483856c4501753cddd23fb0fa9a71b7870b676ccba78119cc29f03974ff4731cef9a92840c0b38ae944f0b3825b5 SHA512 39b17dbaefc15d7faafca4ae6b060665471d384956aca7439fc407ed2632bd458e473efb62b74629b42a5f3d237e13503d2084cac6f6b3f42b9e03aa1fde0982
DIST crossbeam-deque-0.8.1.crate 20852 BLAKE2B 0e7a2616b82c5e501c0f74935adfea3ee09db5475408be83db8f1b6faab4cd5509de2e029bdf6df90435e474ef91f3fc8d482ce3a72966b2a3bec5967666bdc4 SHA512 44a4fe1d4ab7457e2b0950be787b76b15e1bb0b1c108d032381ce3fe99bf7bf76f3d1718085660083d813e2639e66fdd3635d9186e85a9eb7267063b117eaca4
DIST crossbeam-epoch-0.9.8.crate 46012 BLAKE2B 181df06d1a9925ad1b3e2df70f290fc9c75682037d68c4d3727b3e5bc0f92eaf01c2f8ec239b77f524bc4af53d014cb3c4d49dc82922fa9e65baebee68904a6b SHA512 c102e7ce9e927424f6c7c20f5eef5dee3457ef6ae3b81ab26e7dd4c787dc525610f1dcd85c3b06773b263c0835a717ce39bf35b927cea03abea62bc0a0a15624
DIST crossbeam-queue-0.3.5.crate 16341 BLAKE2B 83389842b96f88cca9e7711baae0cb3bbc99d680a5fb5e121c7f93f55e13140201959dd66243a43c27745bd8b81016dd9fd2e869fedae1d71cd8a6e32a614daf SHA512 ada7505beabf0a8b7dfe9ce13b37aa1423fb51af2ef1bfec422d04df779372ab889ab842b8bcf4be90922a183f0c3f82c03cf94bc0968e862025e8b90e0c6c4f
DIST crossbeam-utils-0.8.8.crate 39681 BLAKE2B 2b3e64bfcaa044a9351c1cc8e9ea53fd68fd0bb9875ae523e0cd309a85ad23b340267bdb742d363b5d99fc065ed74f6cbb3ad1e33dec7d14d99ec458875e7e10 SHA512 ab960afdb82863160a3fa1c21c64b35b3112725bd72fc8e0724175937f4b23d0628253032229501938cd86a8e406a59c06cb44e8bdf34619de781a84ebb46ea0
-DIST ctor-0.1.21.crate 9303 BLAKE2B 8feeaacd3d870b721ecfed7c8df60a27005de1f2a099eef816bd6df2d7b07dbfa00badeef44027398ff4505871a69814d7d4ec90b07d36e371099e4d0aebfae6 SHA512 18a914f5bd55172e5ff199778babad9a20dd4214f36f24cc00531db5e169af66f77eacab425e8e64d053907366ebd3b448a0c3275ee1f8244822778b62c4cb71
+DIST csscolorparser-0.5.0.crate 14944 BLAKE2B 124289b6feda11701465bdf2f254147187bcef546e48b19d4627d8e2c61ff5cf8cebcfacbdee4dc6de839ffd3ebe2d33e729f084c3e4252150db66ac981ce217 SHA512 2d4b209136cd9a0eb86bfc5946633274f65f712f45038775d7f1946d97e645542a794e48808c1f5eddab22a7f480100218c716af5ee9d9835b7af99936c2c13e
DIST ctor-0.1.22.crate 9311 BLAKE2B a13fb97cf767fae19486ca8b970f1712bfcf4ec9edda40c01add4bdb7a81e9136acb1208c79763cd612160bf39b342460fecc334c6e421e7f7ff610c4bc44e2f SHA512 cd7c60dae8fb19c3b10e0bf1ffbcedac90cbbd147d564335e4da2d5483f64ea3dc10ad17d7573b00958db0a72cce45f8b7bc10c32864dd943fe64df8d22aaaab
DIST daemonize-0.4.1.crate 14494 BLAKE2B 807b6270122b78cbd19792101d9be258b87b316d5bea4a25b4c600debe0a89f43ff69f4f9eb1366f905fc9d1adf4b1cfcb140a725769b1e04930d1eb6e906bd0 SHA512 acde0f361ad152e523877ebc714f4e5706b3c506914612ea8b2cace473df58c6153b327011acdfe039379d1bf13f45173092cf6ead3190fb77b5c27bd91e74de
DIST darling-0.13.1.crate 20097 BLAKE2B cf72b572ee0672a3599d2154a7d42bfc71fb927640b7db80c8e93c9044fdb182b351a353788155776194a33a00def7951c572302555e1e5d03a119989876affd SHA512 0271198be875ee1a42d14e2f34b4d26bfc8cfc4cb86361f21c0bc079aceef4ad86bbcba919d7066abb891a87549404c432df53b0ec0e96fe293408b114c5ba99
@@ -65,6 +67,7 @@ DIST darling_core-0.13.1.crate 50847 BLAKE2B d7117ecc836e3c56eac69e4e81d350b2d8f
DIST darling_macro-0.13.1.crate 1910 BLAKE2B 3c40b45ee8ff5a5b7a6dd365c561025dbb66db4121dd732806c7ad9d691ac423c367e97693d90b9037626211c7b31939ed4360e107dff0b958f640916ba879ca SHA512 41b190019f1c02e664020dccf21b4248f85182d16b6d1a8eb0b82fb6da1cf871b07959fc2cc65620fec6d23b309c0d188603d35ff288165250fdc807780dc149
DIST derivative-2.2.0.crate 48076 BLAKE2B 56d27e27493c3b818ad45703efda607a0a0d9a48b0d43785b6a013443b8b964b67bb5b5284d242358415c5fb81b86b02079ee7c0595ec07bc658240eb114b887 SHA512 3c65ecdabd2dc202be3d83b06f96b6f68504fe542ede7e2285093c6d360a33ec76a3787c436c6e5ff8f59d430436a4b8ce2f908cf7b2b08cd8b0045de4e5d1da
DIST dialoguer-0.9.0.crate 23539 BLAKE2B d7fb00405377db6ba3e951000e0feb8866d452495d505f223560b8ef589ee8a231812d8510cf242582a732d2eb6850d459f1a7aef334ba7fbe1e528b21b9086e SHA512 8636a89cb05e54f36799576a0431b969a359682221b07cb68e59cd83adb22936daaa7bb2b38a31d1a8fcf8043838437c543787401d628cd87892df17d1d485dd
+DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
DIST digest-0.9.0.crate 13247 BLAKE2B c5f2fa8a5bc12021d99ea63f08fa8c8b5b3353d90cf9d58ba84252b3f81b88b52f28c15c24c61fcee44f7d547a0bad11def7fa8f4616d070db163e48f89ab64b SHA512 8637a322c429f51ecb0fa4c3b58fabef01368c1a093492fad65f48eeeec2366fd1b7876e6e47723e089ec5ce11f881bfe4dcebdc605811252b797db027746a45
DIST directories-next-2.0.0.crate 15153 BLAKE2B 8bbd996cfa72d75fe7177a9d8be7fb6b96ff3fc456b7e06db61cc463a83290765d68f09da3bf8b9e958553b1940ef35f3a4a45d179918ead92f604dd05512470 SHA512 5a0c094dd2e858c59c93655d5abce1282866ced1e7657397c62f959078adc544bb895dbcd2ed578ad7dd0122d8025deb0bbdad955ab2aaf43d9a0dc7d37162d8
DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
@@ -74,9 +77,9 @@ DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70
DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
DIST enumset-1.0.8.crate 17434 BLAKE2B c7837a75b9f686eaa6a594c1dde8afa2f02b4291da6abd58775758c79ebfa667d9d6b3b52f67e02cd10a6f0dfad103d6164ab38a27a3ffa0b5a4c4baacae417d SHA512 55be419de116a2fc3374a5d7455239d7945b4e900b8958266155724bfc8fc1410166c5c8da3ac8d779459a4753cee1dc359e4f5b3091bfd55364c551b44e3683
DIST enumset_derive-0.5.5.crate 10295 BLAKE2B 89366859e97130f96019daf2c33347ea08315f673141acc547ac56ee248f1df89290323c875c8fac660b46e0260344aac592431e3b9078b9dc4a461806802fd6 SHA512 0b9ba46cf72fd7408c416eb615bc77df0eefe287e0acf6083f83c26286f5b0456fc36e7589b7417285dc35549affafabce8c369afe88678d6032aead5a0fdb49
-DIST erased-serde-0.3.19.crate 26405 BLAKE2B 94586be4ce826aee3d52b2b0b90054772b0b4a40ff06ef528d719241d4d766e6378d8ae362933c926b81bf2ddb7162430685d05c9c1bb3bea88b4df37a6e289b SHA512 b283682e01e665e5fe8d8c777b67d2130915b094b812d39bbae389516db37c11939911c87af9ba246106986c0f15fc78c866ae91991282a6a99a1e86d00f806d
DIST erased-serde-0.3.20.crate 26473 BLAKE2B c55de1e10ae724b5dba249d0557cad7e4a6ced4b85864f057372b941e2557a7dbfccfbef241943ab9477b3e31e86a320e48c34732b2236ef6ba6c7effe13bc32 SHA512 b11981c37b706de3546cc72943c4a7eb33cc7e5987d42d4759636552aee95b8eb5bd80b960755c0ec220f541e96bd598b534882d7af2571b89ce1c58ed83b000
DIST event-listener-2.5.2.crate 15225 BLAKE2B 3a8b8fbc6b938fd6c2882dabc1bc23eefbaff2c1a931972bdae6866d9d03cbf3e03f49b4d57a98104b311e1bff38f83715c1e3494197d9283f494678168692ea SHA512 65a9c5669799dfad5a1dab9a500244f444693e9728b14a70aa72967f90cec6e9de06311966d85f8408950bc94e24697d9d4eaf253754a19232bb52347ba989ef
+DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
DIST fallible-iterator-0.2.0.crate 18509 BLAKE2B 9630fcadb2f30fbd8a2a057eb992bf33c0aa2d163e6fbd43de9c8c350e3e932ebca79a6576b215e17a0566898f6e37aef806a643d20c16a6aa73ca515fcf30c0 SHA512 c558fea3fcf3a7756acc0b63d38f76dfe7eeed4dd9c12c46b7a7e8b8bea64d00e0cc115492e8b3a1a19e86e6083477dcf7d2d72ef960b44f24d61819a3077e79
DIST fastrand-1.7.0.crate 11265 BLAKE2B 318f6c903a0ad0d0eac39638aceb162739868efd61dc0b54f6aac4c96b7b1283c8d463b48b36f9ea1fee640a2081a0eda39238cd53cdcc24efc4d17b4a3a09d4 SHA512 6a1a8cd4f6f9bfff07a4ca18ef84839e4427ca9bf9b6733bb15b1b70cf2439820d6a770ae9f3e5e10166a6144449e37e6f3f6ed9acb761688207fd7c53d2c673
DIST filedescriptor-0.8.2.crate 10830 BLAKE2B 964470acbd1f36487755a74666a46649d6012c0782b3622652bd41b086e5d804298d6126c980ecce5a2ce91994d3a006288739b472ecc518099d4e690c89f402 SHA512 dd808b8f26bff4d8b37826241f30c9396bb0f731a0fc3ef53ecb3bd0c0fb7adec6bfe5ff6ecebb6e02c9de6fc5f2f6c0fc361e9c6ba564708dd1c29ab2662f65
@@ -94,6 +97,7 @@ DIST futures-sink-0.3.21.crate 7843 BLAKE2B e4b2ac98e89063b23f5e278cad1df6b1b8f9
DIST futures-task-0.3.21.crate 11815 BLAKE2B ec3f2e2c025e9a482d86912099e68722099c22c0024669906036504d0e70998cb9cb5fd4074928d21847334611ccfcbe6d3e2f686c4d4d7d4436f1e7f501b8fb SHA512 8f3b27865d8c7a290471903297e3c0b52caebfaa55550a4738d7915008b893fce67c7d9ae5c5bd03f2a42ee72a96aa0245c4bee70fc06977b3493eb81bca2033
DIST futures-util-0.3.21.crate 153768 BLAKE2B b3bc5632bbc7616d33f74361d68f83e0cb051125475101c84212ea2bd03307e927cd125e2f93eeb0f84946cc45d3964a590dcbfcfff88d3ce1970f127e71aed3 SHA512 ff952fb74a54e793de943e3aee2ac771357bf9f1aa5de89af128868c46a6b44e414fc4ea97f2d9b201ff7ff41023e119f1adf90d314343ff53ab987c3e07f5d4
DIST generational-arena-0.2.8.crate 20899 BLAKE2B 73cccc9e3b836ddd37e7f64b6389c7bec6763ac9c390a5a9b4adc9b35200e7d26d21ba0748fc808aafac52087f552a4c56e8e10ebf8d016507e1781c579f1e73 SHA512 a5e073a8d26aa32b617fb4130d2b9401c3a3d9ff51a2910f2de4de019ddfd2e5077f2489acb40330e640c573139c1c911ce59a36011bd439c011a3af922bdc1d
+DIST generic-array-0.12.4.crate 18212 BLAKE2B 6e7d77c884ea5a2a8a2d34d7d714730709bdf52f0ebbdb232a1ec8403de4b4f431eafedfc3c2d7ea1f8a28a84660fd34b71b09117dee4bb86052912143142734 SHA512 f92002b549aa9db2a80f65c50357c1f0f490a63e104fae7a271e0b16d6c43ec9146cb7f371f00eb1575a1bfc713ded3beb51f9e96ede93f2ce66ebf78ec85cb8
DIST generic-array-0.14.5.crate 28915 BLAKE2B 0a8c7f20ec91d218fad8a9a87b0700564744ccbdc2f1eb84bc363fd55e86a5ad68c68e446b100752238d45abd7c005f1994bc26e079270d42635c6e296e96f29 SHA512 30c86b24222503245b494c5f88cdf8115ba08c73df55930bb01bafcea22560f4d20e38c348c3896d6e1ef03209cc1571745881b4a77fd28f66b0cc435f5249a2
DIST getopts-0.2.21.crate 18457 BLAKE2B 10651e947e49acc768d99ae56ca5a7f37c1f61bbd1674e2ca58e3ae563fd64f3563d53ccdd0ae7a878710a39e13a99ac8c274974157db2c691f8c222de14992d SHA512 5515ae6ccb0f03efb783683f46cfd1755342c4e83bb673ff8914c7f9dea0dae333f8d9703865e992659a359067df0e8b0e2253de0d4b0c7707cbe7d73401bb1f
DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
@@ -124,18 +128,17 @@ DIST kv-log-macro-1.0.7.crate 16842 BLAKE2B ad3c028863d78730e4b2bb2e8cb980581b13
DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
DIST leb128-0.2.5.crate 11843 BLAKE2B e1e298486eaa14ee39b574adf8b628500d07239d32ea69830dceb0b08e43cda39a6704dcc69478c4c92eb3469582f97a051854d6fd9bfddd1059d5a718951974 SHA512 ef07318c1da0e130e601595256abc964e8fc9c5733cd93ca09203bd4869daaca0d92b5103481376723b20da57ef320723250125da59f9b39f8533a01bce93780
DIST lev_distance-0.1.1.crate 4182 BLAKE2B 7cfd3f080fb816e62e760f6f306d897c0885157a6445a6024df201d643292b3b3558009e33c617f5742691bc7958bfd7a5434b0217253353b5ea010dea3e5631 SHA512 5a587a01deb332de8d900bf7af827f7609375e6c61e8cd252b19d754b3ae8c414963076c9fab9c7ac7c09dbc555b773e9d9f896fd0f0006036af45e160a1f5f6
-DIST libc-0.2.120.crate 574677 BLAKE2B e9deaa26d610c1085f12acc6bd9d3c71ad9d7586d1749141066ea47f14df7143f8dad8173020e549fe81aef65a72d7ba189fdd3ee0038f62bde75dce362f4f5d SHA512 42aadea2670f63d6a2c38d4d6949d9071c535395ecf458a694751a7a17f2a4a6495ea1dbdcbcb5340cb62e3a40419419141ca39c4d4dcda8cccbe480aa34a014
DIST libc-0.2.121.crate 574702 BLAKE2B bae9215a7318e5b5b6d821d2320ce28e883d04af0bca40ede49b9c5d575d28307b07077b3d59be28347bffc4c69d6c9dd334733f0c519c16de704360f6fa8738 SHA512 aa1ee710b2a4008ead7118e85d7f2d29fab8aa0e1111436db8039a84737727b8d1a8a1cb72acd38abd2656d22a5025046d7be7d8154537f8a503017e0548e953
DIST libloading-0.6.7.crate 25037 BLAKE2B 108f5b10c60986ea89f4c754bd3c6d4b73f70a7352042dc1a177ae40a98f716171d242c9f52d81ec47972e55457cf2421ce0578995c644de1da3e15fe8a6d234 SHA512 4f4f37c5a04c20860c38407e8c7aa81386dfeb091773e480dfe87b5fb2a462dc195ec0c39a1add59cad7620373a671772e8f032f4efc624580c6227ae902e10e
DIST libssh2-sys-0.2.23.crate 493516 BLAKE2B 00c0c1396f3d6723ad750112e7af8c8ac098af7b3d11e3fafbb4dc3b90c0defeb8184e007de3c740bf1111e12a53b71c355d697c4567deb3a30ebe3fee2e0caa SHA512 9617fb1d5826dacce23658b42e3eb3f8427b33db1b5a4424081e148bd90a3f776aa50ef66183c93ae19086d64321fc10b19b1a496c3feb12a669c7313cdf39cf
DIST libz-sys-1.1.5.crate 1494933 BLAKE2B b53e39d2a1f0db29edde3f03cab97e1970f9903222777e2a5c55b265a5873a0fae3927724d592fe754e04861aa999e0b9b22122ee09f836ece8d7a0fcfe20e3f SHA512 51ac64c26df57d91f4b7e089600e283354ebf636d8a50ff530ddb031ad0eb74601aca687a087f9e7f51f2b00187d8daa03ca2999ea48ea274c87ad8c7ba8d9ac
DIST linked-hash-map-0.5.4.crate 16166 BLAKE2B d6bfa091265355ae124885f76212c968f2a87af80f3d306c13223ab7fa1d6a449ffda8d042bdb887501d2ffd8adbc638f18cdfeefc16c39a1eb9f57b7c658bf0 SHA512 2938883357ec0e7d9c9fc5746063ae419c97250ddceeb8de3480c89e97e0a29d175cc9199bdb3ddf81cd5d6a2a1e319ee1644a7309eea96058221074cf87c0b6
DIST lock_api-0.4.6.crate 25215 BLAKE2B af1d28010f7c340dc0857afbaf8acd2396228cabca26e52f79526cc4eafb072c2aee8987bdd9ace4ba87c272f6fc816fc6f62a69e4d7e66a5c6e91ae3e824ede SHA512 ba14d341564eba91bb5ec58bb2e0d6c87e70b3694c4609396f0c0f4afc0c6c105a88cb99c303b1e9761b0fc6cae56f79ba6a7663b063454ab1ede4d49274906d
-DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
DIST log-0.4.16.crate 37758 BLAKE2B b9a88c3d75232ba57de8c30d97e6ba056bb1ec128c2c154c52cc8fa47e0617902526fbf1cd526152d79db9236b00c51afca1eef7d9ceaa205177993849d55d4f SHA512 b12dfcd8bec2f44864b8174776d3151ddf1fa1d82bc8a54fb155d5af3b2af959aab4899d72835a3c25cf58d6c41cd7f1b16c2accbdc20a0eba7e8be3d1883ee1
DIST log-mdc-0.1.0.crate 6711 BLAKE2B fa0f6ead476fe7d64541300e13b0bd26dd06d4a48148a5ba5ee615f07e53220c09bfaac927b2bc7892d21a78c1a49cf163015ae749842995396c428393df30c1 SHA512 1504ba38ce6845994072eb23ccce0e84f4ea83f9494bbc0b49484632d257c6c60f4ee9ca008b5f98096bdc3bd9c39a1db723dff4ca09713c884e1dd0ba634862
DIST log4rs-1.0.0.crate 54778 BLAKE2B d77f5e47a5126e07588c5d5aa7dc9ff4025b8d395ef5a2dcb0407a3bf69595fbbbe4f52d1ec5d80d2c139e59ce13ca8aaefc5b1530baf6697ef82efd408a8dd7 SHA512 e4b1bf26c07cc976ffab818b27a357786fa9dde7aa08fe0574dc7d0ca0b775e2770716f7a66747098114dd3b423aacf6c5dbeef7b200e635ff73342bf5667648
DIST mach-0.3.2.crate 19611 BLAKE2B 683aba7d140a3697933835efe4e2e5a6a107f0a6122ce4533bd9079c0de4346dd1a817abeca4372a44a85406a424af9deff87496e79359df4c8d9ff89daab7e9 SHA512 73622b37915f3445a57cbac5eb378bfee61f5a2383c0dd8bd7c29b5e46447405ebaeb706f3a3274e5afe37b0506afaf1511836cb8897d9d480a3abd41f18fa26
+DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
DIST memchr-2.4.1.crate 64977 BLAKE2B 31479718c118093b684bed946eae0706d77d9d275bd49f5aeff4de490f479abd60c7dc462150eafffc6d6fc1da0853123b78be038826b775d2a41a4c39d93ab5 SHA512 d8912e3902a2126f86159bdc998532a2890b882cbb7d59b5a470fffcad4c32281e045f2fff48a235aa4189f1928866bf3d33b699d50866ad6b6c272bba7adb11
DIST memmap2-0.2.3.crate 17669 BLAKE2B 7b34c460eca434e13010af93ca942b12ba136994883c0e07aeb7a8834dda5c500860420d644ff936f3755c2fb08d98a5101fa0c71a6c94dac50042eefbca325d SHA512 1f7869918606e90de2798497d20f7f6c36162d439278de22835478a1f21121558aea3804f3e07de0aef48e1ddb0a514ef24096185af76df9566c0f377b18df3a
@@ -148,7 +151,6 @@ DIST mio-0.7.14.crate 87429 BLAKE2B b8277f844429d32b6085dac9649fcee20bfd1922eca5
DIST miow-0.3.7.crate 24563 BLAKE2B 24375754245e4ac50620a8b6da6b21958914a6af6422a470487841c2524587d596673cc3718a85979ee911f104d71b59b38fbe9db28c1c7e4b702b9373215cb7 SHA512 451073e8913148889493de0373bc0450c8b23e136e151b48b9976292e4e03b7c3f3279ecf49dda5196badfe662a661a998cfa456d2ec340a495d54a4d2382699
DIST more-asserts-0.2.2.crate 7033 BLAKE2B 4ed05b38dc0b6639e2e476d79b8a4c95dbecfb06f915902eb7ee1f9d1662e9d5d80c570eca299db030e4b8f90616aedd7deab2c81cbc6b2f6b945af6519e8549 SHA512 8f2185dc025f1323a5b2a821acbac13257f48dfc1686c8d02886f7b0d4ff7c70df9cdb2dff79b12cca6ea58edd38352c9c9455204e000d6122ba82318f97fc09
DIST names-0.11.0.crate 12123 BLAKE2B 61f6b1a3468b5d5d973cb0afba254c273d0e7aac7726fec8732a7422eb26475e05829e4b0b833b7160ff35ff078337b37668746170efabbaed6cb9f17205d8fa SHA512 78934a6e5064f98ee804e4f437a413c8ca68e72a71c585f57776b2429a2be3dfb96e69e27b6fa422b55959cf2f59c965113acb5979ae96dd183c81fcf2e15392
-DIST nix-0.19.1.crate 213462 BLAKE2B 6abc355e7635272adf3933ec5835704a1b1b13b2d2a0e1a4d93280d91093184c7a0a115b75aecd44420b5f4f8e766fa0a86ae3cb96f71ab91bcbd0455a2bcc09 SHA512 0ac549babd0ea438825ad875dbaa4563d8eb90d83160dde429c0a97bb77d4ed3f19f1ad17437c61da69aed3f23382d464e99bbed0199678f7de41cd38953b51c
DIST nix-0.23.1.crate 240531 BLAKE2B 8e03f4edbad39a467c1557083cfbbd6eff4b78d5ec4e0f1ba06eb043f853352f5154f115ce75556e0d672f0499a9d4c03650bc5a1f57ba1b920cd1595cc50ea9 SHA512 23431030b094ebb027200d8cdc05d0ac1730fbb86ee088795a2314f1ba19b76ed5f24373c1aba8125575bf69f8e7d4d9c08344b9cb49a4ae3d8f7987b5f4e6b6
DIST nom-5.1.2.crate 136174 BLAKE2B 32387d6ded0fbcdee8a1a0d0a08cd36bf92c38906cd199b574b6b9b24f6c245f2287e04374f7d84e2867d2785aa16d8c01ae3bd3bc811829770232681e2d33a5 SHA512 53b8ddab62475588efae46c78b5fd086a14c0fa505c84e625fbedd6dc74d4ac047e9fbed7312b797f126e9ca1f056458d8ffe0ab13f0117de685ef8b43f86aca
DIST ntapi-0.3.7.crate 126994 BLAKE2B 320b513d86af462c6e4d3349e4edfd28d73ddc8f09264adc24eebbbb79976642a9d530bf9af4e61e0409e35f4164d49f9ec054dee9694cfbcc76b237d6c84104 SHA512 6f5fc3b3629f028e03e878681a5a426945e471578c5dc78e121560887a9af285fe432f7401b19b7422e65c3b762651afb9a57a2f7605884c851ddf41b741585c
@@ -156,24 +158,27 @@ DIST num-derive-0.3.3.crate 14545 BLAKE2B 3af73d35ced61f8e4fa2f2bef695f72a3cf1f1
DIST num-integer-0.1.44.crate 22216 BLAKE2B e1c08427e006cde6f2084adadb6086e87e6d6f8bb8dfa757a8228aa671e862a366e4bd8ca5e0500008c18bab128aead9bd5b1e53568a4f40afadcaf3882ee98f SHA512 d07e27ede02a1d007373935fd91e57a26e0e84ae14bbe24be66763baae6850788bd64ad2598d2bde4f4fad6c8a4675c40bfe0927164b16b9b69de5e9a83d9771
DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
DIST num_cpus-1.13.1.crate 14752 BLAKE2B 27490aeee349d944c29e50b44e9a84371030459353a9316ffaa0245ce499df4424e39c25a81be59cd0f9a19c3214c78bdc7a84b632059282be476d8f918c44d6 SHA512 91ffe0ec792228621d6c2d5cc544ef4744203d19fc9c86e0aad2610038c43aca0448b6c27d82979417a0f6c939ea73523303a44c28df0d1c1b8d09814d5306d9
-DIST numtoa-0.1.0.crate 8999 BLAKE2B 6a8cbf17458227fa87bdd6a35404e09afc092a1ea45d68c6c035e08a9d344fdb356b1bc7b52239dd6354ed9094e9338ccac599542bd7f0caf167ab8d17ad5fa7 SHA512 41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354
DIST object-0.22.0.crate 181505 BLAKE2B 5a7430b47954c8aa89624d7895b861dd1a8daad926a59f2cf4f6c4528bfb794c1b0715782844ab142c8f1121eabaae71958e5fb8b67c45ba801bd31053cd08d4 SHA512 9491319361ff42d19f0e3dc72186dfa2a21e28090516a0a1be5bfa78a267fc5447e1be73b16f25709586113a78ba5d49d8d6c72243c9adee3d3e4d7aa2f268e6
DIST object-0.27.1.crate 228030 BLAKE2B 48ebfff83ebd0c1bad5f956f79a0f8628f9cdcd75638ecb92f040ed84f625425062c16449ce44b29d9d99c3950554fc1a480046fff922bba30348ac14d68d887 SHA512 3f25b663fdbf9a38090c2b1cdc03ca40bead87fb83f99143e79a272dfa4f2fedc387a50d3412d42a53aab228bbcbc6967fdb5a0c8db0a8a3e3ae9cdcf1061589
DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
+DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
DIST opaque-debug-0.3.0.crate 5767 BLAKE2B fb5d32c876a271b41582563f5d6978d75bc1cba2cc34167f491bc198e6eded45b9dea65effa3aa972ede20978808b37ad1aadb6837f926fa3378ffd382076d41 SHA512 9909b06668a4f97b4d0e916de3e1d0a922a5a0b911a7ce190de786f62ceaccd382cbd0dbe01ab0f15e5472c10848482da2307a6d897928b6b7d5365bc0321cae
DIST openssl-sys-0.9.72.crate 56510 BLAKE2B 32a346a5c98fa6de7dda0c592ebbe5144de777ed5fe63b96e5ba1891831c73099e7d01ec2c1a6890150d01a77d909fc18bc961b3fd8ea7c4b85317a79d988e98 SHA512 c1a6a50c4ea30b2bd7da520bc98bbd22a22ebc327d71c12f807f518cdeb10d81117b65df9294ba9391513a60577709723b93e75fc75423e970e9fa552edad32d
DIST ordered-float-2.10.0.crate 15589 BLAKE2B 76561b2ab32b61ae69bef039f5f4636a05533cb8002b894ea18ce776ada1b5911c3067af2318126f359a305d7a9d3844053be62af1cbd2c3c9c1f45443a1cc9c SHA512 cb883ddd723d1bedfe13d16c9546dcb84d17d4fb1c6dc6d632a0c385d80b0b881694b3364a406e5d7f073c5a7e9e80810f343dd1d6f22df6188322b3e89cf77f
DIST os_str_bytes-6.0.0.crate 21046 BLAKE2B 9d2a9f47aac852ca2e27e63a22c7267e1a4affde2277d50e128b54f377758322f07ca7263478c39c91e11a2b32b0e7a5fc5ba1b31e0ee014b412a4151642e605 SHA512 d2d3741a1190092cf251e035d2c55a7d022d99512160ed4ddccccb44ca85f664f94f8a937a76eff88581b593e2ebaddab6e753009f3046a8a2ebf451418e41d8
-DIST owo-colors-3.2.0.crate 26928 BLAKE2B 7a415f1acc6adbfcfed53613de62e4e927fe3c09274130d2e1d192cc9890e5d3f1352cfc2614608ac7604a3b575eb927908312f1d0fcc32346adf798b65090e4 SHA512 bac9c5f653447d98a9c324c217b47d40e9df4990593f17a973ae8cf998290cf1ec078221b9608ae548a1ed9c8d2e88feba765a60e118ced946dc48ef6c9edcb1
DIST owo-colors-3.3.0.crate 27287 BLAKE2B 7b557c7bf358797bf259d520f6bde27b9fc1322e5dcea2934e4c71c89e549509f295aee9c8704f32bb6375fc70311a1dbd887426c8a6dca3cfaa4116e35e9359 SHA512 177b23fe7c665da52b489f274d013b3d52cf126af6cf185cd842658ac3dbf1bcbe9a9b341870e3f7ad978270fb78cb302f7e7a28e83be84105e76b6d357234fe
DIST parking-2.0.0.crate 9714 BLAKE2B e3ecd48e90289fe173b1419ad3f68350dd05359461c5842e52304e20fef9b5e089803e0c0a8e85b249a546f61cf8624367e6ec164ef7638850b451d325851075 SHA512 21c5723dc0281ade1c2cd6a1c2215ba70eb47a721a4a594ef1e54061bc79579ffe9c31f06e534fd847f936ed265cd65a59dfa9e38880f8bd42c6e8ac70a13f93
DIST parking_lot-0.11.2.crate 39869 BLAKE2B 67c555e87b68f5763a7790563fd8d542e126bcb77f91267f3b76c51fd73060a2c32dcb91f9d0db7ea772e555d91576c8d7ff48053a9c35fbd3b749d2459a660c SHA512 526b176363dffa59501c18324bb723a3846ef5b0ff9bf1d890e40ad10e7023284f7c8012eda87520eaa94515ee828d9ef52692a9ed590a55e176383d6d472f9e
DIST parking_lot_core-0.8.5.crate 32466 BLAKE2B 44d9cb65444ea93fded7e216e3bdbe2256ba1611f5cb6f80d67a01e71d428b81e6c7fc73cb928e2125f34bac0abf4d1da39f622e813dff89b01fed7632308b7e SHA512 c4315df551748d1ae77655e4d9f8c90f911498856e5358009e9e02e410bb8085f006f369188b0753a298371ebd74a5c383d848b65e31b55f3462381308c83a00
DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
+DIST pest_derive-2.1.0.crate 14049 BLAKE2B b85c5a625579e9bddf22ceda1ff808e33989d259f07ddfacaf833ee313029e1a8a01f824da915cfd3d57de57394608a9b506589d642be30e8d5e6a3afcac6a9e SHA512 4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba
+DIST pest_generator-2.1.3.crate 14227 BLAKE2B 2fba3732d71e6036a911e6455d12ec7f4a1a14331b50f762fda1d6dd244269106130b72025d21e684bdadc0b5971c4b19ccf1f113067c26aa5f1ac71c78def8d SHA512 8be05ef3fd59dc4ccb7871388f8e3cb24cbc2f64eacf7a32fb887f1d8911b528ec545fe78bdd7beb03e2c04eb7fc0ad98ac9fce8579f95ea71cc280912f07c3b
+DIST pest_meta-2.1.3.crate 27818 BLAKE2B bd96b36d47e39d6f8cc6f07ab373d1bf8b8f9907afb8b3774f62677c800914f40a0b44531f50b065ae9d11ec77a940da865b5a574d0cb0d2dc51059f718fa826 SHA512 f31492b452b58c632c0c5c3e357ba2b41ae2b5816d0ec432c1a281dfc681c5b5c2ab4f194c1049938e671ac232d85667aab91323e986df4edf6093a4e2d47ac3
DIST phf-0.8.0.crate 3902 BLAKE2B 3f1d4f9c23cfa2a3a0b7e4f809ff00783d71bb4839b27246d5244e5aee61a211498715ed576f00749e8132a6af1cdf50b2eb27d2f49896f006212981886a0e44 SHA512 a3013c4106ba72aa3cf22bd3f903eeacc24ac7cc47aad791bc5e9a63e1aff928a537399b6a86b0346c5eb37979ec01b404807e622e79a0a70a0e01e63c07a47f
DIST phf_codegen-0.8.0.crate 3192 BLAKE2B 65c733fb896fa034c97482d122a2ed4c39d763cbb65ee48a229cdb320910aefeef125674bb1305a4a12f5fccefd71f859e33cb26c3e6be09ed8f776f9ff9b463 SHA512 6649779b50683b1b83c89da921ee52963fd517660540148e9ba4b59f9639c705e08400c4da972880ed161564816c7ad45704d6bd51d1429717137de8f46cb941
DIST phf_generator-0.8.0.crate 7604 BLAKE2B 936c9ad95d2d5b6b4bc97dac9bcf99813462950f6280d9cbb8c8ae9253d3197f25b8173c202cdd51c4a2d3f422ca1d6f5c9055e7a87e45b2dc5fbe5aa6aa45ce SHA512 de045f47567defd43fe32fc62191a9a892e5a478e1a84b853cff3005e94967ded68e5770eacb43f2e97e58b8f4283327a38a3bdbd55e1d5c708dab601ea66270
+DIST phf_macros-0.8.0.crate 5814 BLAKE2B 39f40a52c177da227b3bf54d0fe4f05a2d6c382183ab0400d74a06d34fb3f28a23342496f6e0d48d25a792bb848bd9ed740a10d37c39969ad79c929fdc98d743 SHA512 ba56661aa92393fad7712f774fe4f0b7bf25d483aa7d4c4617409e655e9448b39780a904b8865293e16f8e63d62440aa0d653fe231beda4f58194de455598170
DIST phf_shared-0.8.0.crate 2860 BLAKE2B db48d88ad6e7aa6bdb2f6750ab66063a55d005b4f5e92ededb59da1f1fa9b1296d30f87d32d036f08e3a74111ea4d8287e8eb6c86d0edd76b3ceb38f223696db SHA512 6ad7ac732b7cc42e7e179329fbfee7074d26652d73eb4f2b97224491d978ad9b14c66e5a539c96b84c70124ac44cfc009bf963a42c438d028bd9737b99f463f3
DIST pin-project-lite-0.2.8.crate 27847 BLAKE2B a9f192e644ee443904becb1ff5cc2179c7c9a6aba5b64d2e9998f9b4b8f8e95f5d54b46963910756832d0ab1b55bbc66cf85edc94b0d04e9a8b3f4ecd4719602 SHA512 9ecb86d550f4440e19eb16c6a9a418b5c4ad859ed2449b02f77d4b07b1e3e3e6b6b7ffba44a358958679342eb21222992fe6fdfe6d9bcb7a699a3e5816f1bfa8
DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70
@@ -183,8 +188,8 @@ DIST ppv-lite86-0.2.16.crate 22245 BLAKE2B 03cba61af42dc3a78ab8f6b03d833c028b7ed
DIST pretty-bytes-0.2.2.crate 2488 BLAKE2B 2713d02a2ffeb0e0c783c5a7a6de03fc39fa87fb3e511c0329867e4857797d6f2c465bbb48ed2d64daf6c07d3952079f40fa1db0c9e0a88edce87e401e2f7bfe SHA512 64916c18c259a290723277dd7b90d81b2405728474d38f17c227e78837888d848ef06423e7ae79da08c918a17d6ad21cadf2cfc59f0a295326938f9a822d6420
DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db
DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495
+DIST proc-macro-hack-0.5.19.crate 15556 BLAKE2B 98c22fc3e5f5fa8b6f44d15de42b6ffcc82ba3f98a07ffa48bcbc5d3abcfca6af136c5d0d8c7f1ca34261ed8f8c9c17a394231f97a4c342c81aa7f8b9e74b203 SHA512 9e4cbec41056438287f5b23086264c86e2f0cdc193064006556736377b2954229de13a585149b9995002c9aee3334ee2a80ae4afdcc96cabe7ed2bf718476952
DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a
-DIST quote-1.0.15.crate 27281 BLAKE2B 5612633415d30e26e646a968ab7a64ecdc978b02efdbd40dfecf5afa489c21bbc6a9c93ecce2a2b45519db6be3384bb372cfc9f597846e8399f7c2b57e8b34e1 SHA512 76403bfac4e9a018b29ddf8f911135206d4fdc266db38a95cc92f6159a8b436d39d64c4ae6c3fd16ad83117270ed329b6a151d589cab46c75443c57b533dfaeb
DIST quote-1.0.16.crate 27566 BLAKE2B 3352f4ed2158cb8d29947d5435b7414ed223088887718f9d258f1f5d555034a4fbb79cbfb3cb772be4868be366853feabec777fba7f275ac36d8091eb3b371c7 SHA512 489f4dcaa8a8a2041b39fc8fc815fa7943c0a456881283398e4eb65f7b50f220a6e5493d60d1d5019a48b189ca217fd8c62056b552bf94b9329ec963cce01c74
DIST rand-0.3.23.crate 11318 BLAKE2B 5ad9b187fcdfc515c606a73bd1e9aa3215e367659c35a013c9d4d0f80f9832331dfb971ca370a627c0a2afe2b8860514740e00b1d7572e221a557b5570cff6ff SHA512 a4f46fb7dfe39677dfc112eeb56fb3c28cec4cdaaf95f336f2a494f0b2b30fdf22ceb9ea956f90e13c7ffe711a68aef9fc1a80d9a911d93221ae263c243fb2c3
DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
@@ -203,8 +208,6 @@ DIST rayon-core-1.9.1.crate 64961 BLAKE2B 7201024124324d2cf2d5785b7e79d2195adc7d
DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
DIST redox_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
DIST redox_syscall-0.2.11.crate 24032 BLAKE2B 28d71b8c1419e34c4b0a0a1e0ca1bcc34bdf97614a1e33a5f58f867d743a0430ed19e6f76601702802e366c2801d245a3a88c9bd657bf8aaebdda463aeaeea86 SHA512 dcdc6335a0db6a01a31b61aaf9eb684f264b36868a351094d3e2fb3fe84f0c4269db89ad40b9e0fedfe1ebe2096baa20e7a6232a4de5a3dda3b7876eaaca75fc
-DIST redox_termios-0.1.2.crate 3268 BLAKE2B 5f3f4e2b7e7a8172f92e8161eb1dcd208b86320868ec351e2f7b47d8ed170b3f44ad8180e44ea7a554de0e53fc268365e683244ad59e4afabd11a09ae378d2b0 SHA512 d8624b2c78d02c5d3afcbecea9ad8d218bff508703cb50684d6ae05614a9f41bf2aa8c47440fbb7d964f01eb9085364222833fbf9c45984508e9d755dac563c1
-DIST redox_users-0.4.0.crate 13023 BLAKE2B 66d0d1169f98a27a00930c86365f289c38659c0d7b248a6870d1c144dfe63c9752429b2912006527d42aa321f9605892ffa85257eeff1ae148254bf370dafd02 SHA512 4058ffb2fd57631eb6346c8839262653af3f2e670a69bb5739d64adeef7347849b18e191c594303da1f5e29b4a3cb000161fc1b3ea4b7f94585977597a2574b9
DIST redox_users-0.4.2.crate 15302 BLAKE2B f98145aa9b00a63873beee7408998190cd3da3f294f954ab08b222fa08f74be25fbeb3edf47477a3740842091abf6778f2675bba329d58326d3bbd15e27cfe29 SHA512 66f974ee56a98a384456ca131aefb1a324e209805a27c065f3e1d80e13fb1485e8453041230d1238326b2ea25fdd668c216f7cc91fae0eb65a11a85f78d5af88
DIST regalloc-0.0.31.crate 170781 BLAKE2B fc70637949e39c70e148c9c6e5afb959865a4c5fd39b7df6c61095c9a8cb042980f5446907b75a79111a949af7df52f6b1e17b4dc6f6f46d315c6b56f8ed3846 SHA512 708ea74faee3b4e9e07b913a754891d083b9a66128e83285f56a82c4771a494033c0eac48ba262f9be15b2764a3e0b99ec2eea74dc265cd2619449315d50cad5
DIST regex-1.5.5.crate 238119 BLAKE2B 175cec668da4321930a070993feb1671e14348b78e8b432f9fa25afd764863ff233b0d1d8931951ff99a3b5bc2e18774f68a6c0a4e31125ffcdb990b5b1b009c SHA512 a5873edc75a64f03be77151c318bc90c7dff565f838d811f5973ebca2e86247efd58830b0a8ba41e372f5a72f5402d93873f8d34c36481fa4359874b2fa5d571
@@ -223,6 +226,7 @@ DIST serde_bytes-0.11.5.crate 11067 BLAKE2B eeb75e1346aeb8b49458cce8c71437809b34
DIST serde_derive-1.0.136.crate 54776 BLAKE2B 687524001bf61c42266d91a7263661ab80aa9556e570975a39bdf56a5cb1a2ec3ad1baf22dff586c7ad4ff66d035555d0a9d4a431c49402dcad6d79d0ef40cee SHA512 92c99455a5a9ac0fe45eb6ff1ad3ea55db860031fb912ace3755d1d2aad0dd880b2d83add4d41872823bd60557ebe1cb36e898bf0ac975b1093caa9819f7c289
DIST serde_json-1.0.79.crate 144451 BLAKE2B d04f8788d3ef0d4854d73232a4f441c1f3a42934442679a91853c311262ac9a4f554240d0c44c69f2e22cdd225a3e4d4751dc928ee5092b4371c198325fca0b3 SHA512 83987c1a7eddc6adf8ae359c30e2db1fea98edabd6dc49bde840c37a56258fa845612e8ae270a7dca4cfbe9a3532dc55028091e14cdf1dd3b1ceea4bb86a2dd7
DIST serde_yaml-0.8.23.crate 42140 BLAKE2B 49d28913954173d1c062fe4668c2228286adde3d3e210befd09e04f8e43dcde469c6aeb86349a7a604188343d0c211078c9520c079249780923a4d70e3132d9b SHA512 7831299cedf0fa9155a76b61436ec1cbc06adfe672a102973e8cffc8b277d99b4104d70951ed16b18283f3291c8047d6af413e0438da3e6bc6745bfb6816628a
+DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
DIST sha2-0.9.9.crate 22247 BLAKE2B 4ac2c92325ad92881f41e777010516870fd001617c2dc1d20495318219167e2622309831ecb9509d7a4b87f936c9e5b2d335bfc1842876a8b2aecedada367421 SHA512 bc267467089ed546edc1caaa7a00f3f769fd1d5deeb655c1968985d284bd32e4fcee4e721cf89c30e8c3cadd2f88ac557b91f90183cab112702c587f753e5877
DIST signal-hook-0.1.17.crate 27085 BLAKE2B 0e58cb64b07cb8c76a043f603edbf27bcc92040a1aadb2d0c96993b1ea1a55ef63a222ec51e1396d95bb4907016e1dbf20ba3f0c1915303828f187af44ba2df4 SHA512 253d1478d7a6491a0b423637a706c941cc2a9707d32d29126f48af808daf8acd88e59013936f8e164df687c04e3a8f5c201b5eeb1952e3269b1419efdb4df94f
DIST signal-hook-0.3.13.crate 49252 BLAKE2B 21016fca85e48a2ff7d360b379e06aba6d044a282740e71b0e567e57ec16db0df7cb53e9db47f5875caffb5af00eca2167bd038103674bccc225fbe8faffa1d2 SHA512 c4632d31ca158fdfba5da44585f0d6211469ee17b7e22d86688af11b4ed976b0134e87e0ad686dc2e5a8fac0ecb08838108080ac875a7b55322e0735ff1ccfdb
@@ -244,7 +248,6 @@ DIST suggestion-0.3.3.crate 7276 BLAKE2B cee8d581eb3b55cee97ab38e9c24ab958e34d3e
DIST supports-color-1.3.0.crate 9422 BLAKE2B 60669bd561fefe4415c2c79739f1055629fe32ad0c882dd5b25a44d07d6201361d5b4424cf4456c6dddb36e5c7bf54df656a04c24118bb54214bac23539a1c56 SHA512 3e77067b24e90bf06758a59f5b480c085956b80390c3a1db786de2fd251dc7c737b8e869c88b0a8605fcbc471f1db262890929b009a02398fa059ffbbd946657
DIST supports-hyperlinks-1.2.0.crate 7564 BLAKE2B 59fed82a0713957e25fd54e5760806aeba4ff926b2a20b3a20ed133d56e9ebc1309fa246f2ff787a630d9dfb4017d808fbd4177cdf10f8782295adba37b6113d SHA512 fd8791e108230b263c34b4094c4ef116a1c12da84b39100937b1373149473070aab7cd2493987ccf2f51767aad0caffc9cec8b58a78a3bd1167509feadeb3945
DIST supports-unicode-1.0.2.crate 7241 BLAKE2B b93c7bd5922082a65ff28e5b2c3bf2d3b95cdf1da987df42d20bfbcefac46d706396620faeb96e323604e60f055656e9c916be67791d435bef2be03f02f8cb6f SHA512 b73716a2f66fa2ee765080281fd4c5b2e05f050dc300b1b32bd5c0fd1bad4d5e15d0a599a5fcc4c5d25f10577802e89900e6e3a05f64b1da6611d68369ff4875
-DIST syn-1.0.88.crate 236112 BLAKE2B 7d652d9685cfe275c57154a6f3e2b0ec741e498316a512f73664de67aa85541c3ac135007003d72a912714c7a9040c710a6292fe95fbba70dac7a4b185248e97 SHA512 a342b635859cba36b41bc82c204b76c83a3032c5cceddf3aa11137b21238a4f4ebd75f3bffe39eecb9aab9559b04639891f02d77b38011b268b5ddcc8d9ffa61
DIST syn-1.0.89.crate 235966 BLAKE2B 8f0e5be9f04f5faeb080fc94d13df0926f03a15ff702a2a88e5eb3194215441882c6f2795506ea05cbafc66f6844de3dc61aef720495932f4675c34be0ef6ee0 SHA512 6b2a9411c015b2b0ed5c5e18cae67f357d1a735e184416c6f8533be191ba65c0963dc9341ba3829195c6616ce71d4a79cbc7768fdbaa98b798b8f67746c6ab4a
DIST sysinfo-0.22.5.crate 116712 BLAKE2B 1415ce2deeec9cabc729f526ac37e11bf94e75e621e3daae81a3b0a995e1d810036b1daf6c3732e2a0c7a183b6cd03442e826e4ef3c0b0ddeff8d985df65c919 SHA512 8443b3947942ae788d11f232039a4a852abc9d5b3decaf0f956c2b9c29d868bc4f94ac8182f35660aeb2d856a5ff2cad8a160cb3f6baf039353af2de7eacd574
DIST target-lexicon-0.11.2.crate 21796 BLAKE2B 254923a6dafd0727bbb3626cebc4d16a6f6deead7a9f43e7f8b34debe66c02400ba614a5414202768d89a5c4c4f3cc10d91eae3b52dcce436ac1b085072a6128 SHA512 46d2cab7682787b1ae5024b07823ee706e9f86d08f5ebdfadf308a209ce672a9693c737d1cc9e318bdbb151d22075a93c1a8c7320ba532ae3768fdd1dc5f1578
@@ -252,9 +255,9 @@ DIST tempfile-3.3.0.crate 27578 BLAKE2B e98c5ed4c59b6ff411e89ad4eb529bbe15264d67
DIST termcolor-1.1.3.crate 17242 BLAKE2B 5aef69c0004081bd3cc4d531d13d63627cc02313868c0faab62358d13abfa7b4ba82f142c2801d25a6ae46ecbc8b7bdbeaa21c9105ea3b8950ab6a38cdb88513 SHA512 5838fcbfd70f300cb4b62aab50565db52074c56b152ccc8ac1173e4676c0d5a636271bf5a645a77da6e1d4edbf0091af2cd4dd6d73b85c3d198c760898c06f3a
DIST terminal_size-0.1.17.crate 9141 BLAKE2B 048d8e8e9dad08aecde12323681d428b9182afb737136cd6699e13d231f7882091c9167cb10a08e5151df912421a6f89132645627e42ccc73d07553cadb1c8cd SHA512 96ec1bc8abd597f01ae59da567036d5d40b422764a4da662e2030c3ef4ce80a983c8b6a4ef1f34d88e649e0b1ea27b206d56a31924bcd2d31ff7e5a2e96d4201
DIST terminfo-0.7.3.crate 48821 BLAKE2B 73c01dc5104a1df1a48ae7c407da7a5600598b86a9df82beb7da3d484c97d8bda3d18789dac558d64f27cb30de4a8d381f6632a09d4982731830b1d16aabb4ee SHA512 9382e8846401b9717dd6fd8ea223ce46a3534466a21ded2325b2d7525a685e6bb588e1110ca421b63982e1881ee3be94b89e594b56e24977e1a185fc361ac735
-DIST termion-1.5.6.crate 22677 BLAKE2B b918dc82bfa370bb9662bace34211bc7afa03a042dbd25f4456a7e3859521d4f32ab755780e58070f29eb7903f3b4f8129eb9447cda953b9190f9df3b7eb3aea SHA512 228b6fa7e2f280d6bfc7cef77e7a1d0d8f597178e66af0bde1b1fb6553857b511ba8a6786165815aac6d8a082fd37191f4ea35a47f1e1182f7f2c6086eb34a8c
DIST termios-0.3.3.crate 17103 BLAKE2B 855b1115d02dcb275ea772dec3db383f9a6f84c14876ac037a5e3bbd1e71e26d3adc64e41521145093256acbea56c28b6c14f7e3e2bc9fda37e7cea113abe214 SHA512 3d4cacdaa8bbbd9083a050e723c93510829210f5ca8eb806e661a3a1e3c8aee33565142c5df34fca74aad0d26319525ee70ca6faf3f55a29427423d37fda43ff
DIST termwiz-0.15.0.crate 213726 BLAKE2B 72b9e8574b4f2fb9e4aa7f6a9ae203dd024ac11d25f4410dbf7a1911a09982623a5ba267f8602a3dd682f9fb9e5b4d3cc8c7ec39d43949d1748c84aabbb65fc7 SHA512 aba6349089143efaef27548bdb110ca89209bdfc4281994c2033d583b6c4cf8693c0815d1bccd85e1dc119711ebc2183e97bd85b978e787be4db9ebaa4614176
+DIST termwiz-0.16.0.crate 266204 BLAKE2B 8ec118517fa1bb75bdf5f280ac4733e5563344ea5afd4255f8c883f1fda586f3a5a7244763acc15c503f7dbb5bfd34234d2a6af8fdc3c9c6d93e5e37426c4b53 SHA512 5d73db2fb356b454502a6bcb9d81cda33f271f2df7a48f4263564977d13f4661acfcea92b96821badf83e1d99546ab2b1de151ba9a4af86f14d8fae943a88680
DIST textwrap-0.14.2.crate 52016 BLAKE2B db80b15ba23db718064ef0214578ea6aa4f0ee3b76723adaca131be26b770324205f2ead13c8f5c1e438ae1b5c9476cf1ede8f4ed82426c9d99d9406f2b83191 SHA512 521ab37e03aae8fcce5b909541399fc90a23020e353f95102c658fa94ffc56b9bdff43f47fb3da6e30f5c9cc9447fab72fe21d7276dfa21fe5a1a5a1c874e371
DIST textwrap-0.15.0.crate 52998 BLAKE2B f6c3057ea6ffde88dd9824cd3159d398316d9d21f327d2af59239ff84d79f893a9d0e96dfbd883aab6c64b631dc99457018e38baf14d40789f02d633425ded86 SHA512 f44271c542c22f17a4e3a459255f95e6c02d999f7d6bc8414d3973fd4ac9353aa4ef436932a45340738126905463d776902715feaa9329371f8a14f14b5a7bfd
DIST thiserror-1.0.30.crate 17748 BLAKE2B b9d8a8f824de03c57af43d0ef8f2e157321e7e6a220660581299a38988e7bd43733126fc9b8d8b8ae38ac1d788ef08fbcb2352beb5ddc014113e0058c2bf60d0 SHA512 0e6cbc160ee1b6236a9073dec225a4290e7a82632ee7cec00bf02797b04851adb2d3071fa268b54f7fa9fe22eeada55a83d44fbddf824520023608eda8ea2e99
@@ -287,6 +290,7 @@ DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d23
DIST vte-0.10.1.crate 24947 BLAKE2B c7e94b7bba2423d14e5aa85f94dba856a6c984261551f204f029c55ef923c0012b259e5b229974b54b4eb5da1e85bae3c8cdb680372b5f9dc6caf51d1075b0ba SHA512 0c8fed2cfca5ad07d2a146e1e26979d390347a409cdc2b960246fc2fadd85019b9febf2dfd618f7a144493084b55f285c58ef5204e613bd9013af26faa9f2033
DIST vte_generate_state_changes-0.1.1.crate 2422 BLAKE2B 6e8fb4ce0ca0fd6b9a4dcccdfb02445babbc13d47de5fae9bbb81e8c67ada8a40e8dc5e57c120c36876293b111ccc71e1069ea3fdabade6f9ba5ea2d44ff4632 SHA512 ba09352e037cbd279cbf5641c9783a24f76e54f1f09e13f0ab1ca99c9646c1e3c958e8e302d7cc88431073bad2e2d5619410f2f93f96f1db25f0f0ded0236f7e
DIST vtparse-0.6.0.crate 11238 BLAKE2B 2884a6d36de616c218cc7d8344c625c319a37e96f6b77d1056b8ab72fc25f46fc6e7541336f182ba5b65daba0d6ffe85ffa577afdacf5b7f320edb81e1d22070 SHA512 df6a2225f103adea77e2c30b63c360bc40b4edec725268f0c7fcc0494b5ec55758eee0234f92e31cc7539af716447c7559dcd24d6764b898f2a5a9420fb3ef81
+DIST vtparse-0.6.1.crate 11265 BLAKE2B 5b8ba29f864d6c9382db31742d616fa0b8212a449e81f7d28964c4b6959b62ccc97273cfb6e80a77754aec5d01277a48f3657e9ba0c8f3986a329878ed4d6197 SHA512 23742a30bd921ae12e491fe82684d620ff07a44aba62e89ad6f99ff195ae21e3042f49573a8e8510b1bd03da194f37de1168590580cac314b4174fcab43c177a
DIST waker-fn-1.1.0.crate 7114 BLAKE2B e510eec0490f0caca3930000cecccde209ad387d1657c380f95122c68ccc15fcbe0684315d0aea28f094f2c65f7b7b08ae62f6ec95e0d67fc47e6af0ba4589e9 SHA512 80f612597534d9f8bdcd5e6bdff740805efe28242822bc6db360e114a23cb47ff88c74b8ab855bc764f0a73545e85a69d76bce1441e5899a36e41ca270695dc5
DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88
DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
@@ -312,14 +316,14 @@ DIST wast-39.0.0.crate 101366 BLAKE2B a21d08b97bba75bee92de7b67249404709c5a94f2a
DIST wat-1.0.41.crate 9185 BLAKE2B a0095b7eaf7493608362376c05f38cc7ae6b8fde9a9a9658292ac3d2ec30d73e51bb15d27d2a7615aa26c426751a86462dc297266d9df09b983e295d4d948379 SHA512 576210ca8d0aba1a6c929cbcbf45197dbf7d4ad84be11ed7a2e487328b32bfb696c1a21fa0baf1688d9d53e9ef98dbe495dd06ee7ab20bf6e1176513f269e3ec
DIST web-sys-0.3.56.crate 666465 BLAKE2B 903a54a43cdb7d990ac3e01b3ab7bd9ad33a7877fca2873296d3df3d7e1fc47d2eac52296d37579cfa1055746a0d07d3aa3d909cd86f1524e7c1ba60af16a3b2 SHA512 00db771aff344a7c05ff0c6e3c7648646913ebf16a38eb83cdb4b9afaae3ea90215ba802fe8586e50e20ccb96af11b8dcf2f81b6a11f44e26a2b0f9978b7e641
DIST wepoll-ffi-0.1.2.crate 31309 BLAKE2B cd1b01c9fdb6482baff3ab12a9926c1a5a9b6e430e4609890a94b13480f8223de166558724b4d6926d6e9dd7f466926c783df54f9beabc75d646edf4f3429a73 SHA512 f0f5c379d08642aee9c6ef36175b9d858ee1cb7d444b832d6e7ad194167a4db2de5aaee3b2356ca42ef9f48a9872928c61b456305c05dd40cc53e5204686b8a7
-DIST which-4.2.4.crate 9259 BLAKE2B 0371c0c04843ba3c72b4bae2df5ae4539a4750e0d2da0105e370350b7a8985e7fc7a57815dcfe6b3a48ea7c0161b5ca5db3c03b9bf65bd8252adde77fb8055a5 SHA512 9ca2bbec727040197fc12efdc7cd70bc94bd1b4abd03bf86f6043fd960de73053b84c7d101d897563583b8d6d85377025e1e7213640987ebdfdd54fa629e3b80
+DIST wezterm-bidi-0.1.0.crate 1828892 BLAKE2B c5b86e261ca0472db5df93e83372c02423a9edf6c2600f26ea221afeb9f41c6355ed8188ac3d153fc508340e5cd32ca7ddc2212ac9b7039d6f92b72d0c335520 SHA512 34846339a5bba10fa8f9cc00d9e7e78ae049c2adbd2dc3022f28d5dbe9e66332f4562693602af570d3c9d4f7567ece2e9396c7cf8e29b3fd8af4297405d4f49e
+DIST wezterm-color-types-0.1.0.crate 11637 BLAKE2B 15e22742030f7294c56f6dcb08800cdf3e5784ad8a37d5f94193214ef148a01fc216d99aaea825299223f684b80d3fb8992711511642aa0e24dbe8e2aca799d0 SHA512 2c6bb82ee191efce3ce2604738ba19009b957d37c5dd9c0335c2ec70f8db1a1aab7513e88adfef0a3ea3c4896aad0fdeedb6594fb991035406d774b8283ffa89
DIST which-4.2.5.crate 9326 BLAKE2B 8aea79157007f2326d21083e1eba387611233a19f39368904cf2b0e9b6f09b4fdf6dc469cff83373912bec6e2aeec191d217b0b1e720ee0db1848b6f64d37054 SHA512 2b2b44773b568946799035e5b90c1f0c304b399f4d330c1e063323f631f56ddc6c5d8a9d026d987cb39c801ccbfb614450064030fc19e1de34ab6a495f053395
DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-DIST zellij-0.26.1.tar.gz 8662314 BLAKE2B 6beaede25e9df8fb6510ded507649205e8606913a3eeb51f89399d5019fe026dcd441041ec9372d1803dd139b7c4d71fa8f59c0d524f891c565e677be699cba3 SHA512 eb1d446df28fea9a2025b6622c4c3b1233edea3e7186d3fe78a965a96781082226f53a3de12622da7ca35fcbb3395c1ccf57ea0326eda6cbfbcb1aed10be4381
DIST zellij-0.27.0.tar.gz 8682634 BLAKE2B 0d63630199acb267a7a6032b5ee1a3bfc960cb2d5d3bb5a2c34df50190af16a5b8a66d18d9b8640f67e1c24188eab22ee8c909760e1bb03c6f343da53ad49eed SHA512 b113e759f70ed7831bdab0d47e4e82ca42bc8d5d04510838e182f736560d40c6fb492993cab2481e447a56adaee6a92edc8380dcbfe6b0ae9b6b58cc0b96dea1
-DIST zeroize-1.5.3.crate 17287 BLAKE2B 3399a8c9d498c1a7c4e09e038c830d1ea83b4d2fdb9c82d8e5efe9e8e52218fc568b35f62600f086673de0da41ce94aa8e740a2518f5d33ec67a41be21bb72f1 SHA512 14cdb8893ccfb1c6f762b0bf16855119a489822b820dcdeeec6ddc6578013bf2447f7ce3fa8de24209aeb58ca543e30c9189bdf037f49512979bb7c59bd6d90f
+DIST zellij-0.28.1.tar.gz 8688678 BLAKE2B 1f6b241a726ff0ecacf4c2ce3447f3ff05150ddb3229109d4207f249517ab9ddca0e20bdc3438e5855394292fe2624a22e6f671d5ed5a55f627031749b5ffe99 SHA512 735eff7aaf50a374d636d706769ded69fd608b3f95b4902f2b1c6eed9a90a093892951a259accab534379662c7f97f1a1207fbb33154a033d2a42338f399a2eb
DIST zeroize-1.5.4.crate 17586 BLAKE2B 0bcb58b428adcf743f06a01f431aaba0b483f0e00b70e1f9fd3da37350982a8d4511301fcb0016892264deed10e2efbf3b85becde9d74e91538715db63e231fc SHA512 c581d3ab3e7a1d5803c0d1e0d054aec1f47fa0387625fe9367dce7875c2f015d921f70cadc33ac596c96b87461ddf9fd35c5213b61b705aecaf213635a551445
diff --git a/app-misc/zellij/files/zellij-PR-1226.patch b/app-misc/zellij/files/zellij-PR-1226.patch
deleted file mode 100644
index 862903ca4e..0000000000
--- a/app-misc/zellij/files/zellij-PR-1226.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From 22cff5439ca33c0beafd6a77c160959dff7fddf7 Mon Sep 17 00:00:00 2001
-From: a-kenji
-Date: Wed, 16 Mar 2022 21:49:41 +0100
-Subject: [PATCH 1/4] fix(feat): `disable_automatic_asset_installation`
-
-This fixes a regression in the feature system:
-The asset installation didn't get turned off by the feature.
-
-Add error logging to the install functions.
-
-Properly show features in setup
-
-* fix(feat): disable `mkdir` in wasm_wm
-
-The `wasm_vm` creates the `plugin_dir` before mounting it.
-Turn that behavior off on `feature-disable-asset-installation`.
-
-Alternative:
- Is this even needed? We make sure the directory is there upon the
- normal asset installation.
-
-fixes #1130
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -64,4 +64,4 @@ bin-dir = "{ bin }{ binary-ext }"
- pkg-fmt = "tgz"
-
- [features]
--disable_automatic_asset_installation = []
-+disable_automatic_asset_installation = [ "zellij-utils/disable_automatic_asset_installation" ]
---- a/src/commands.rs
-+++ b/src/commands.rs
-@@ -89,7 +89,6 @@ fn create_new_client() -> ClientInfo {
-
- fn install_default_assets(opts: &CliArgs) {
- let data_dir = opts.data_dir.clone().unwrap_or_else(get_default_data_dir);
-- #[cfg(not(disable_automatic_asset_installation))]
- populate_data_dir(&data_dir);
- }
-
---- a/src/install.rs
-+++ b/src/install.rs
-@@ -1,7 +1,10 @@
-+#[cfg(not(feature = "disable_automatic_asset_installation"))]
- use std::fs;
- use std::path::Path;
-+#[cfg(not(feature = "disable_automatic_asset_installation"))]
- use zellij_utils::{consts::VERSION, shared::set_permissions};
-
-+#[cfg(not(feature = "disable_automatic_asset_installation"))]
- macro_rules! asset_map {
- ($($src:literal => $dst:literal),+ $(,)?) => {
- {
-@@ -14,6 +17,7 @@ macro_rules! asset_map {
- }
- }
-
-+#[cfg(not(feature = "disable_automatic_asset_installation"))]
- pub(crate) fn populate_data_dir(data_dir: &Path) {
- // First run installation of default plugins & layouts
- let mut assets = asset_map! {
-@@ -29,10 +33,14 @@ pub(crate) fn populate_data_dir(data_dir: &Path) {
- for (path, bytes) in assets {
- let path = data_dir.join(path);
- let parent_path = path.parent().unwrap();
-- fs::create_dir_all(parent_path).unwrap();
-- set_permissions(parent_path).unwrap();
-+ fs::create_dir_all(parent_path).unwrap_or_else(|e| log::error!("{:?}", e));
-+ set_permissions(parent_path).unwrap_or_else(|e| log::error!("{:?}", e));
- if out_of_date || !path.exists() {
-- fs::write(path, bytes).expect("Failed to install default assets!");
-+ fs::write(path, bytes)
-+ .unwrap_or_else(|e| log::error!("Failed to install default assets! {:?}", e));
- }
- }
- }
-+
-+#[cfg(feature = "disable_automatic_asset_installation")]
-+pub(crate) fn populate_data_dir(_data_dir: &Path) {}
---- a/zellij-server/src/wasm_vm.rs
-+++ b/zellij-server/src/wasm_vm.rs
-@@ -92,7 +92,9 @@ pub(crate) fn wasm_thread_main(
- let mut connected_clients: Vec = vec![];
- let plugin_dir = data_dir.join("plugins/");
- let plugin_global_data_dir = plugin_dir.join("data");
-- fs::create_dir_all(&plugin_global_data_dir).unwrap();
-+
-+ #[cfg(not(feature = "disable_automatic_asset_installation"))]
-+ fs::create_dir_all(&plugin_global_data_dir).unwrap_or_else(|e| log::error!("{:?}", e));
-
- loop {
- let (event, mut err_ctx) = bus.recv().expect("failed to receive event on channel");
---- a/zellij-utils/Cargo.toml
-+++ b/zellij-utils/Cargo.toml
-@@ -46,3 +46,5 @@ features = ["unstable"]
- [dev-dependencies]
- tempfile = "3.2.0"
-
-+[features]
-+disable_automatic_asset_installation = [ ]
-
-From e4cc8bc1e6b029ba7c61b12b60fc2916bd181157 Mon Sep 17 00:00:00 2001
-From: a-kenji
-Date: Thu, 17 Mar 2022 08:13:08 +0100
-Subject: [PATCH 2/4] fixup: make assets installation more robust
-
---- a/src/install.rs
-+++ b/src/install.rs
-@@ -32,12 +32,17 @@ pub(crate) fn populate_data_dir(data_dir: &Path) {
-
- for (path, bytes) in assets {
- let path = data_dir.join(path);
-- let parent_path = path.parent().unwrap();
-- fs::create_dir_all(parent_path).unwrap_or_else(|e| log::error!("{:?}", e));
-- set_permissions(parent_path).unwrap_or_else(|e| log::error!("{:?}", e));
-- if out_of_date || !path.exists() {
-- fs::write(path, bytes)
-- .unwrap_or_else(|e| log::error!("Failed to install default assets! {:?}", e));
-+ // TODO: Is the [path.parent()] really necessary here?
-+ // We already have the path and the parent through `data_dir`
-+ if let Some(parent_path) = path.parent() {
-+ fs::create_dir_all(parent_path).unwrap_or_else(|e| log::error!("{:?}", e));
-+ set_permissions(parent_path).unwrap_or_else(|e| log::error!("{:?}", e));
-+ if out_of_date || !path.exists() {
-+ fs::write(path, bytes)
-+ .unwrap_or_else(|e| log::error!("Failed to install default assets! {:?}", e));
-+ }
-+ } else {
-+ log::error!("The path {:?} has no parent directory", path);
- }
- }
- }
-
-From 3506ca50de0ab5443479011e44f750845f6bf5e1 Mon Sep 17 00:00:00 2001
-From: a-kenji
-Date: Thu, 17 Mar 2022 08:22:09 +0100
-Subject: [PATCH 3/4] fix(feat): disable `mkdir` in `wasm_vm`
-
-disable `mkdir` in `wasm_vm` on `feature-disable-asset-installation`
---- a/zellij-server/src/wasm_vm.rs
-+++ b/zellij-server/src/wasm_vm.rs
-@@ -272,7 +272,14 @@ fn start_plugin(
- let input = Pipe::new();
- let stderr = LoggingPipe::new(&plugin.location.to_string(), plugin_id);
- let plugin_own_data_dir = plugin_global_data_dir.join(Url::from(&plugin.location).to_string());
-- fs::create_dir_all(&plugin_own_data_dir).unwrap();
-+ #[cfg(not(feature = "disable_automatic_asset_installation"))]
-+ fs::create_dir_all(&plugin_own_data_dir).unwrap_or_else(|e| {
-+ log::error!(
-+ "Could not create plugin_own_data_dir in {:?} \n Error: {:?}",
-+ &plugin_own_data_dir,
-+ e
-+ )
-+ });
-
- let mut wasi_env = WasiState::new("Zellij")
- .env("CLICOLOR_FORCE", "1")
-
-From be35cf5731aa786cbac85491f260321be3953a88 Mon Sep 17 00:00:00 2001
-From: a-kenji
-Date: Thu, 17 Mar 2022 10:25:15 +0100
-Subject: [PATCH 4/4] fixup! Use `cache_directory` for plugin hashes
-
-Use `cache_directory` rather than the `plugin_directory`
-for plugin hashes.
---- /dev/null
-+++ b/update-toolchain.sh
-@@ -0,0 +1,11 @@
-+#!/usr/bin/env bash
-+set -euxo pipefail
-+
-+get_latest_release() {
-+ curl --silent "https://api.github.com/repos/$1/releases/latest" | # Get latest release from GitHub api
-+ grep '"tag_name":'
-+ #| # Get tag line
-+ #sed -E 's/.*"([^"]+)".*/\1/' # Pluck JSON value
-+}
-+
-+get_latest_release "$1"
---- a/zellij-server/src/wasm_vm.rs
-+++ b/zellij-server/src/wasm_vm.rs
-@@ -29,7 +29,7 @@ use crate::{
- };
-
- use zellij_utils::{
-- consts::{VERSION, ZELLIJ_PROJ_DIR, ZELLIJ_TMP_DIR},
-+ consts::{VERSION, ZELLIJ_PROJ_DIR, ZELLIJ_TMP_DIR, ZELLIJ_CACHE_DIR},
- errors::{ContextType, PluginContext},
- };
- use zellij_utils::{
-@@ -271,8 +271,7 @@ fn start_plugin(
- let output = Pipe::new();
- let input = Pipe::new();
- let stderr = LoggingPipe::new(&plugin.location.to_string(), plugin_id);
-- let plugin_own_data_dir = plugin_global_data_dir.join(Url::from(&plugin.location).to_string());
-- #[cfg(not(feature = "disable_automatic_asset_installation"))]
-+ let plugin_own_data_dir = ZELLIJ_CACHE_DIR.join(Url::from(&plugin.location).to_string());
- fs::create_dir_all(&plugin_own_data_dir).unwrap_or_else(|e| {
- log::error!(
- "Could not create plugin_own_data_dir in {:?} \n Error: {:?}",
---- a/zellij-utils/src/consts.rs
-+++ b/zellij-utils/src/consts.rs
-@@ -53,6 +53,7 @@ lazy_static! {
- pub static ref ZELLIJ_TMP_DIR: PathBuf = PathBuf::from(format!("/tmp/zellij-{}", *UID));
- pub static ref ZELLIJ_TMP_LOG_DIR: PathBuf = ZELLIJ_TMP_DIR.join("zellij-log");
- pub static ref ZELLIJ_TMP_LOG_FILE: PathBuf = ZELLIJ_TMP_LOG_DIR.join("zellij.log");
-+ pub static ref ZELLIJ_CACHE_DIR: PathBuf = ZELLIJ_PROJ_DIR.cache_dir().to_path_buf();
- }
-
- pub const FEATURES: &[&str] = &[
diff --git a/app-misc/zellij/zellij-0.26.1-r1.ebuild b/app-misc/zellij/zellij-0.28.1.ebuild
similarity index 86%
rename from app-misc/zellij/zellij-0.26.1-r1.ebuild
rename to app-misc/zellij/zellij-0.28.1.ebuild
index 8c0dc70545..8dfa5985d2 100644
--- a/app-misc/zellij/zellij-0.26.1-r1.ebuild
+++ b/app-misc/zellij/zellij-0.28.1.ebuild
@@ -28,9 +28,13 @@ CRATES="
base64-0.13.0
bincode-1.3.3
bitflags-1.3.2
+ block-buffer-0.7.3
+ block-buffer-0.9.0
+ block-padding-0.1.5
blocking-1.2.0
boxfnonce-0.1.1
bumpalo-3.9.1
+ byte-tools-0.3.1
byteorder-1.4.3
cache-padded-1.2.0
cassowary-0.3.0
@@ -47,6 +51,7 @@ CRATES="
concurrent-queue-1.2.2
console-0.15.0
core-foundation-sys-0.8.3
+ cpufeatures-0.2.1
cranelift-bforest-0.68.0
cranelift-codegen-0.68.0
cranelift-codegen-meta-0.68.0
@@ -55,28 +60,35 @@ CRATES="
cranelift-frontend-0.68.0
crc32fast-1.3.2
crossbeam-0.8.1
- crossbeam-channel-0.5.3
+ crossbeam-channel-0.5.4
crossbeam-deque-0.8.1
crossbeam-epoch-0.9.8
crossbeam-queue-0.3.5
crossbeam-utils-0.8.8
- ctor-0.1.21
+ csscolorparser-0.5.0
+ ctor-0.1.22
daemonize-0.4.1
darling-0.13.1
darling_core-0.13.1
darling_macro-0.13.1
derivative-2.2.0
dialoguer-0.9.0
+ digest-0.8.1
+ digest-0.9.0
directories-next-2.0.0
+ dirs-2.0.2
+ dirs-sys-0.3.7
dirs-sys-next-0.1.2
either-1.6.1
encode_unicode-0.3.6
enumset-1.0.8
enumset_derive-0.5.5
- erased-serde-0.3.19
+ erased-serde-0.3.20
event-listener-2.5.2
+ fake-simd-0.1.2
fallible-iterator-0.2.0
fastrand-1.7.0
+ filedescriptor-0.8.2
fnv-1.0.7
form_urlencoded-1.0.1
fuchsia-cprng-0.1.1
@@ -91,7 +103,10 @@ CRATES="
futures-task-0.3.21
futures-util-0.3.21
generational-arena-0.2.8
+ generic-array-0.12.4
+ generic-array-0.14.5
getopts-0.2.21
+ getrandom-0.1.16
getrandom-0.2.5
ghost-0.1.2
gimli-0.22.0
@@ -101,6 +116,7 @@ CRATES="
heck-0.3.3
heck-0.4.0
hermit-abi-0.1.19
+ hex-0.4.3
highway-0.6.4
humantime-2.1.0
ident_case-1.0.1
@@ -118,19 +134,21 @@ CRATES="
lazy_static-1.4.0
leb128-0.2.5
lev_distance-0.1.1
- libc-0.2.120
+ libc-0.2.121
libloading-0.6.7
libssh2-sys-0.2.23
libz-sys-1.1.5
linked-hash-map-0.5.4
lock_api-0.4.6
- log-0.4.14
+ log-0.4.16
log-mdc-0.1.0
log4rs-1.0.0
mach-0.3.2
+ maplit-1.0.2
matches-0.1.9
memchr-2.4.1
memmap2-0.2.3
+ memmem-0.1.1
memoffset-0.6.5
miette-3.3.0
miette-derive-3.3.0
@@ -139,23 +157,35 @@ CRATES="
miow-0.3.7
more-asserts-0.2.2
names-0.11.0
- nix-0.19.1
+ nix-0.23.1
+ nom-5.1.2
ntapi-0.3.7
+ num-derive-0.3.3
num-integer-0.1.44
num-traits-0.2.14
num_cpus-1.13.1
- numtoa-0.1.0
object-0.22.0
object-0.27.1
once_cell-1.10.0
+ opaque-debug-0.2.3
+ opaque-debug-0.3.0
openssl-sys-0.9.72
ordered-float-2.10.0
os_str_bytes-6.0.0
- owo-colors-3.2.0
+ owo-colors-3.3.0
parking-2.0.0
parking_lot-0.11.2
parking_lot_core-0.8.5
percent-encoding-2.1.0
+ pest-2.1.3
+ pest_derive-2.1.0
+ pest_generator-2.1.3
+ pest_meta-2.1.3
+ phf-0.8.0
+ phf_codegen-0.8.0
+ phf_generator-0.8.0
+ phf_macros-0.8.0
+ phf_shared-0.8.0
pin-project-lite-0.2.8
pin-utils-0.1.0
pkg-config-0.3.24
@@ -164,22 +194,27 @@ CRATES="
pretty-bytes-0.2.2
proc-macro-error-1.0.4
proc-macro-error-attr-1.0.4
+ proc-macro-hack-0.5.19
proc-macro2-1.0.36
- quote-1.0.15
+ quote-1.0.16
rand-0.3.23
rand-0.4.6
+ rand-0.7.3
rand-0.8.5
+ rand_chacha-0.2.2
rand_chacha-0.3.1
rand_core-0.3.1
rand_core-0.4.2
+ rand_core-0.5.1
rand_core-0.6.3
+ rand_hc-0.2.0
+ rand_pcg-0.2.1
rayon-1.5.1
rayon-core-1.9.1
rdrand-0.4.0
redox_syscall-0.1.57
redox_syscall-0.2.11
- redox_termios-0.1.2
- redox_users-0.4.0
+ redox_users-0.4.2
regalloc-0.0.31
regex-1.5.5
regex-syntax-0.6.25
@@ -189,15 +224,21 @@ CRATES="
rustc-hash-1.1.0
ryu-1.0.9
scopeguard-1.1.0
+ semver-0.11.0
+ semver-parser-0.10.2
serde-1.0.136
serde-value-0.7.0
serde_bytes-0.11.5
serde_derive-1.0.136
serde_json-1.0.79
serde_yaml-0.8.23
+ sha-1-0.8.2
+ sha2-0.9.9
+ signal-hook-0.1.17
signal-hook-0.3.13
signal-hook-registry-1.4.0
similar-2.1.0
+ siphasher-0.3.10
slab-0.4.5
smallvec-1.8.0
smawk-0.3.1
@@ -213,13 +254,15 @@ CRATES="
supports-color-1.3.0
supports-hyperlinks-1.2.0
supports-unicode-1.0.2
- syn-1.0.88
+ syn-1.0.89
sysinfo-0.22.5
target-lexicon-0.11.2
tempfile-3.3.0
termcolor-1.1.3
terminal_size-0.1.17
- termion-1.5.6
+ terminfo-0.7.3
+ termios-0.3.3
+ termwiz-0.16.0
textwrap-0.14.2
textwrap-0.15.0
thiserror-1.0.30
@@ -233,8 +276,10 @@ CRATES="
tracing-core-0.1.23
traitobject-0.1.0
typemap-0.3.3
+ typenum-1.15.0
typetag-0.1.8
typetag-impl-0.1.8
+ ucd-trie-0.1.3
unicode-bidi-0.3.7
unicode-linebreak-0.1.2
unicode-normalization-0.1.19
@@ -249,7 +294,9 @@ CRATES="
version_check-0.9.4
vte-0.10.1
vte_generate_state_changes-0.1.1
+ vtparse-0.6.1
waker-fn-1.1.0
+ wasi-0.9.0+wasi-snapshot-preview1
wasi-0.10.0+wasi-snapshot-preview1
wasm-bindgen-0.2.79
wasm-bindgen-backend-0.2.79
@@ -273,13 +320,15 @@ CRATES="
wat-1.0.41
web-sys-0.3.56
wepoll-ffi-0.1.2
- which-4.2.4
+ wezterm-bidi-0.1.0
+ wezterm-color-types-0.1.0
+ which-4.2.5
winapi-0.3.9
winapi-i686-pc-windows-gnu-0.4.0
winapi-util-0.1.5
winapi-x86_64-pc-windows-gnu-0.4.0
yaml-rust-0.4.5
- zeroize-1.5.3
+ zeroize-1.5.4
"
inherit bash-completion-r1 cargo xdg
@@ -324,8 +373,6 @@ BDEPEND="
QA_FLAGS_IGNORED="usr/bin/zellij"
-PATCHES=( "${FILESDIR}/${PN}-PR-1226.patch" )
-
src_configure() {
local myfeatures=(
disable_automatic_asset_installation
diff --git a/app-office/sc-im/files/sc-im-0.8.2-automagic.patch b/app-office/sc-im/files/sc-im-0.8.2-automagic.patch
new file mode 100644
index 0000000000..dbdc73ca18
--- /dev/null
+++ b/app-office/sc-im/files/sc-im-0.8.2-automagic.patch
@@ -0,0 +1,54 @@
+--- src/Makefile
++++ src/Makefile
+@@ -83,7 +83,7 @@
+ endif
+
+ # Check for gnuplot existance
+-ifneq (, $(shell which gnuplot))
++ifeq ($(PLOTS),yes)
+ CFLAGS += -DGNUPLOT
+ endif
+
+@@ -116,38 +116,31 @@
+ endif
+
+ # NOTE: libxlsreader (libxls) is required for xls file reading support
+- ifneq ($(shell pkg-config --exists libxls || echo 'no'),no)
++ ifeq ($(XLS),yes)
+ CFLAGS += -DXLS $(shell pkg-config --cflags libxls)
+ LDLIBS += $(shell pkg-config --libs libxls)
+ endif
+
+ # NOTE: libxml and libzip are required for xlsx file import support
+- ifneq ($(shell pkg-config --exists libzip libxml-2.0 || echo 'no'),no)
++ ifeq ($(XML_ZIP),yes)
+ CFLAGS += -DODS -DXLSX $(shell pkg-config --cflags libxml-2.0 libzip)
+ LDLIBS += $(shell pkg-config --libs libxml-2.0 libzip)
+ endif
+
+ # NOTE: libxlsxwriter is required for xlsx file export support
+- ifneq ($(shell pkg-config --exists xlsxwriter || echo 'no'),no)
++ ifeq ($(XLSX),yes)
+ CFLAGS += -DXLSX_EXPORT $(shell pkg-config --cflags xlsxwriter)
+ LDLIBS += $(shell pkg-config --libs xlsxwriter)
+ endif
+
+ # NOTE: lua support
+- ifneq ($(shell pkg-config --exists lua || echo 'no'),no) # Check for user's default lua
++ ifeq ($(LUA),yes)
+ CFLAGS += -DXLUA $(shell pkg-config --cflags lua)
+ ifneq ($(shell uname -s),Darwin)
+ LDLIBS += $(shell pkg-config --libs lua) -Wl,--export-dynamic
+ else
+ LDLIBS += $(shell pkg-config --libs lua) -rdynamic
+ endif
+- else ifneq ($(shell pkg-config --exists luajit || echo 'no'),no) # If not found, check for luajit
+- CFLAGS += -DXLUA $(shell pkg-config --cflags luajit)
+- ifneq ($(shell uname -s),Darwin)
+- LDLIBS += $(shell pkg-config --libs luajit) -Wl,--export-dynamic
+- else
+- LDLIBS += $(shell pkg-config --libs luajit) -rdynamic
+- endif
+ endif
+ else ifeq ($(shell uname -s),Darwin)
+ # macOS without pkg-config
diff --git a/app-office/sc-im/files/sc-im-0.8.2-clipboard.patch b/app-office/sc-im/files/sc-im-0.8.2-clipboard.patch
new file mode 100644
index 0000000000..88815c8269
--- /dev/null
+++ b/app-office/sc-im/files/sc-im-0.8.2-clipboard.patch
@@ -0,0 +1,32 @@
+--- src/Makefile
++++ src/Makefile
+@@ -57,8 +57,19 @@
+ #
+ # Choose one of the following commands for copying to different clipboards:
+ # You can later change it at runtime.
++ifeq ($(TMUX),yes)
++ CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""tmux load-buffer"\"
++ CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""tmux show-buffer"\"
++else ifeq ($(WAYLAND),yes)
++ CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""wl-copy <"\"
++ CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""wl-paste"\"
++else ifeq ($(X),yes)
++ CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""xclip -i -selection clipboard <"\"
++ CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""xclip -o -selection clipboard"\"
++endif
++
+ #to copy to tmux clipboard:
+-CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""tmux load-buffer"\"
++#CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""tmux load-buffer"\"
+ #to copy to X clipboard:
+ #CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""xclip -i -selection clipboard <"\"
+ #to copy to OSX clipboard:
+@@ -66,7 +77,7 @@
+ #
+ # Choose one of the proposed commands for pasting from different clipboards:
+ # You can later change it at runtime.
+-CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""tmux show-buffer"\"
++#CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""tmux show-buffer"\"
+ #CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""xclip -o -selection clipboard"\"
+ #CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""pbpaste"\"
+
diff --git a/app-office/sc-im/files/sc-im-0.8.2-tmux.patch b/app-office/sc-im/files/sc-im-0.8.2-tmux.patch
deleted file mode 100644
index 63f910c547..0000000000
--- a/app-office/sc-im/files/sc-im-0.8.2-tmux.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/Makefile
-+++ src/Makefile
-@@ -58,16 +58,16 @@
- # Choose one of the following commands for copying to different clipboards:
- # You can later change it at runtime.
- #to copy to tmux clipboard:
--#CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""tmux load-buffer"\"
-+CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""tmux load-buffer"\"
- #to copy to X clipboard:
--CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""xclip -i -selection clipboard <"\"
-+#CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""xclip -i -selection clipboard <"\"
- #to copy to OSX clipboard:
- #CFLAGS += -DDEFAULT_COPY_TO_CLIPBOARD_CMD=\""pbcopy <"\"
- #
- # Choose one of the proposed commands for pasting from different clipboards:
- # You can later change it at runtime.
--#CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""tmux show-buffer"\"
--CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""xclip -o -selection clipboard"\"
-+CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""tmux show-buffer"\"
-+#CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""xclip -o -selection clipboard"\"
- #CFLAGS += -DDEFAULT_PASTE_FROM_CLIPBOARD_CMD=\""pbpaste"\"
-
- # Command to open file or link under cursor
diff --git a/app-office/sc-im/metadata.xml b/app-office/sc-im/metadata.xml
index ed2ff157e0..5b29a497a1 100644
--- a/app-office/sc-im/metadata.xml
+++ b/app-office/sc-im/metadata.xml
@@ -7,9 +7,11 @@
diff --git a/app-office/sc-im/sc-im-0.8.2.ebuild b/app-office/sc-im/sc-im-0.8.2.ebuild
index f170c72d45..e61cbc8f93 100644
--- a/app-office/sc-im/sc-im-0.8.2.ebuild
+++ b/app-office/sc-im/sc-im-0.8.2.ebuild
@@ -3,6 +3,10 @@
EAPI=7
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit lua-single
+
DESCRIPTION="Spreadsheet Calculator Improvised -- An ncurses spreadsheet program for terminal"
HOMEPAGE="https://github.com/andmarti1424/sc-im"
SRC_URI="https://github.com/andmarti1424/sc-im/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -10,28 +14,35 @@ SRC_URI="https://github.com/andmarti1424/sc-im/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="BSD-4"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="X plots xls lua ods tmux"
+IUSE="X plots wayland xls xlsx lua ods tmux"
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
PATCHES=(
"${FILESDIR}/${P}-prefix.patch"
- "${FILESDIR}/${P}-tmux.patch"
+ "${FILESDIR}/${P}-automagic.patch"
+ "${FILESDIR}/${P}-clipboard.patch"
)
DEPEND="
sys-libs/ncurses
- X? ( x11-misc/xclip )
- tmux? ( app-misc/tmux )
- plots? ( sci-visualization/gnuplot )
- xls? (
- dev-libs/libxlsxwriter
- dev-haskell/libxml
- dev-libs/libzip
- dev-libs/libxls
- )
+
lua? (
- dev-lang/lua
+ ${LUA_DEPS}
)
ods? (
+ dev-haskell/libxml
+ dev-libs/libzip
+ )
+ plots? ( sci-visualization/gnuplot )
+ tmux? ( app-misc/tmux )
+ wayland? ( gui-apps/wl-clipboard )
+ X? ( x11-misc/xclip )
+ xls? (
+ dev-libs/libxls
+ )
+ xlsx? (
+ dev-libs/libxlsxwriter
+ dev-haskell/libxml
dev-libs/libzip
)
"
@@ -39,8 +50,27 @@ RDEPEND="${DEPEND}"
BDEPEND="virtual/pkgconfig"
S="${WORKDIR}/${P}/src"
-src_prepare() {
- eapply "${FILESDIR}/${P}-prefix.patch"
- use tmux && eapply "${FILESDIR}/${P}-tmux.patch"
- eapply_user
+pkg_setup() {
+ export X=$(usex X)
+ export TMUX=$(usex tmux)
+ export WAYLAND=$(usex wayland)
+ export PLOTS=$(usex plots)
+ export XLS=$(usex xls)
+ export XLSX=$(usex xlsx)
+ export LUA=$(usex lua)
+ ( use xlsx || use ods ) && export XML_ZIP="yes"
+
+ # Notifying the user about which clipboard support is enabled if conflicting flags are set
+ # Prefer wayland support over X, and tmux support over both wayland and X.
+ CONFLICTING=$(usex tmux "tmux " "")$(usex wayland "wayland " "")$(usex X "X" "")
+ if ( use tmux && ( use wayland || use X ) ) ; then
+ elog "Conflicting flags for clipboard support are set: ${CONFLICTING}"
+ elog "tmux support has been preferred."
+ elif ( use wayland && use X ) ; then
+ elog "Conflicting flags for clipboard support are set: ${CONFLICTING}"
+ elog "Wayland support has been preferred."
+ fi
+
+ # Run lua setup
+ lua-single_pkg_setup
}
diff --git a/dev-R/Rcpp/Rcpp-1.0.8.3.ebuild b/dev-R/Rcpp/Rcpp-1.0.8.3.ebuild
index 5376521a85..70f9a5eb4f 100644
--- a/dev-R/Rcpp/Rcpp-1.0.8.3.ebuild
+++ b/dev-R/Rcpp/Rcpp-1.0.8.3.ebuild
@@ -6,14 +6,24 @@ EAPI="7"
inherit R-packages
DESCRIPTION='Seamless R and C++ Integration'
-LICENSE='GPL-2+'
HOMEPAGE="
https://www.rcpp.org
http://dirk.eddelbuettel.com/code/rcpp.html
https://github.com/RcppCore/Rcpp
https://cran.r-project.org/package=Rcpp
"
+
+LICENSE='GPL-2+ Boost-1.0'
KEYWORDS="~amd64"
+IUSE="examples"
+
+src_prepare() {
+ if ! use examples ; then
+ rm -r inst/examples || die
+ fi
+ rm -r inst/tinytest || die
+ R-packages_src_prepare
+}
SUGGESTED_PACKAGES="
dev-R/tinytest
diff --git a/dev-R/scales/Manifest b/dev-R/scales/Manifest
index 315237dcd5..43e9375ca4 100644
--- a/dev-R/scales/Manifest
+++ b/dev-R/scales/Manifest
@@ -1 +1 @@
-DIST scales_1.1.1.tar.gz 515201 BLAKE2B 0f6251a82c74b336809a1fa647eaca13e529c6213e5b47233ead3c0e4bc2565eabfe4915dfce6eb7c5728089a7887e169620866465c9f96c63938b73aa663ffb SHA512 5e0eb71d0122e94577243747a8bf12dffcfab7a466bee7ae8bcd92cc17e188fdb617d0ab7a60a4728a2a27b5f8953684b2eb43bee22973de2ff708f8c8ad855d
+DIST scales_1.2.0.tar.gz 270188 BLAKE2B 460c51f230b938e15e53ce8c9549f969adffb3ca047df31f59e60ff1f9759d13630728d5fb22506eb4a52b046249dab3d4574c047df94dd559f0700d100f0815 SHA512 aa87291406e91645817499d6e8ab1067b223e60ff2920efce9e528eb521e256835dfa82d18d84b26643f7f77fa193e0d694d6bb23386bb777ad4249095744202
diff --git a/dev-R/scales/scales-1.1.1.ebuild b/dev-R/scales/scales-1.2.0.ebuild
similarity index 51%
rename from dev-R/scales/scales-1.1.1.ebuild
rename to dev-R/scales/scales-1.2.0.ebuild
index 84428e5816..1f9c05e40a 100644
--- a/dev-R/scales/scales-1.1.1.ebuild
+++ b/dev-R/scales/scales-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -6,6 +6,11 @@ EAPI=7
inherit R-packages
DESCRIPTION='Scale Functions for Visualization'
+HOMEPAGE="
+ https://scales.r-lib.org/
+ https://github.com/r-lib/scales
+ https://cran.r-project.org/package=scales
+"
KEYWORDS="~amd64"
LICENSE='MIT'
@@ -17,6 +22,18 @@ DEPEND="
>=dev-R/munsell-0.5
dev-R/lifecycle
dev-R/R6
+ >=dev-R/rlang-1.0.0
dev-R/viridisLite
"
RDEPEND="${DEPEND}"
+
+SUGGESTED_PACKAGES="
+ dev-R/bit64
+ dev-R/covr
+ dev-R/dichromat
+ dev-R/ggplot2
+ >=dev-R/hms-0.5.0
+ dev-R/stringi
+ >=dev-R/testthat-3.0.0
+ >=dev-R/waldo-0.4.0
+"
diff --git a/dev-R/vctrs/Manifest b/dev-R/vctrs/Manifest
index 292e69a4a9..f7d6ef4a80 100644
--- a/dev-R/vctrs/Manifest
+++ b/dev-R/vctrs/Manifest
@@ -1 +1 @@
-DIST vctrs_0.4.0.tar.gz 916665 BLAKE2B af948dfe2f00431ca8f4467cf16e2dff8b9b95ba8a3d51387a4fe2857f8d0c4debfc148beb6f096b41a0aea3d2c78ee487bd73a7408e34afbb6e9ba52c02f6c0 SHA512 026587a20220d29870394946c611465c4608bbdee57a7ef52ea4401a16d2f1ec2f4d1063041344652f59c22e88669b3025880b0ec2af287ba5f4fcfa2ca94266
+DIST vctrs_0.4.1.tar.gz 916782 BLAKE2B 518c1aea1d1587dcfd7c93d327be65a4c1b4d67afb2e77d6ba46915f305a498a8680c0ca337a016f5d84e98920fa77ebd81313c67e86ac7ac8007f25061d1223 SHA512 3b135106ac641774a08840f0487546d12ffba660ddc3c2ee3d3197e941bcab1c2b165d7babd8d31b60f954d4966352029776de77aa22f7e2f25f5e33f4024bc5
diff --git a/dev-R/vctrs/vctrs-0.4.0.ebuild b/dev-R/vctrs/vctrs-0.4.1.ebuild
similarity index 96%
rename from dev-R/vctrs/vctrs-0.4.0.ebuild
rename to dev-R/vctrs/vctrs-0.4.1.ebuild
index f86462ab26..e526eb7eec 100644
--- a/dev-R/vctrs/vctrs-0.4.0.ebuild
+++ b/dev-R/vctrs/vctrs-0.4.1.ebuild
@@ -7,6 +7,7 @@ inherit R-packages
DESCRIPTION='Vector Helpers'
HOMEPAGE="
+ https://vctrs.r-lib.org/
https://github.com/r-lib/vctrs
https://cran.r-project.org/package=vctrs
"
diff --git a/dev-cpp/fbthrift/Manifest b/dev-cpp/fbthrift/Manifest
index ebe4d535f5..bb9e7f8eab 100644
--- a/dev-cpp/fbthrift/Manifest
+++ b/dev-cpp/fbthrift/Manifest
@@ -1 +1 @@
-DIST fbthrift-2022.03.21.00.tar.gz 7178541 BLAKE2B 6e875f19ae19b5ccd1740d5eadb0b4f106d96b95ca1ced9e05a5bfd7f8e7de84aec722f0dfb0721c81e320185359d3f9c595ebfebef8638b6ca6788df98d37d4 SHA512 8d2d9430dc3a4ecc23042cd9bcf4eee888824449d05d98baec408aef806b934d643e578d3876169f69966c846aeddbe0aa84416c4e020cba028a49d2fccfe7ab
+DIST fbthrift-2022.04.11.00.tar.gz 7475837 BLAKE2B 27e035296d7c73562824a192f2bdc8789aa9ff674f9693e991b71b4543b417ad41aaf186681bdddbe494557fe0a3a4471751111e667e98348c763321e9343412 SHA512 e45088151e9de051e30b5ac34b07c35b965092ea0ad8075029fce57de5df44c908d0c30663ce35b455ad96f277d8935e08e3ecba331708b1835333cf90e87ce1
diff --git a/dev-cpp/fbthrift/fbthrift-2022.03.21.00.ebuild b/dev-cpp/fbthrift/fbthrift-2022.04.11.00.ebuild
similarity index 100%
rename from dev-cpp/fbthrift/fbthrift-2022.03.21.00.ebuild
rename to dev-cpp/fbthrift/fbthrift-2022.04.11.00.ebuild
diff --git a/dev-cpp/fizz/Manifest b/dev-cpp/fizz/Manifest
index 7e54932b02..d9cf2728ec 100644
--- a/dev-cpp/fizz/Manifest
+++ b/dev-cpp/fizz/Manifest
@@ -1 +1 @@
-DIST fizz-2022.03.21.00.tar.gz 581670 BLAKE2B 2dc9691abfaf646db56e047a74894b745102764c773b9f244c4b357b74b6d00d1a2548664a5e343f2c5f84458de36d453e99b9901c89bc621c54840a7b45b5e4 SHA512 81a7b764c2c2e17fd5df32a69ecb368eb01df04df6dbd1155a40b68fc39cda4f86ce81afc5c89425a5751ef7f4dbb8a40df8b5095685e72ce5e9043c0a74682e
+DIST fizz-2022.04.11.00.tar.gz 591060 BLAKE2B 5d773af07c70244f54b46927cf28677ef7eb7a9a822a47d497c0ddc9ee4abac34a13462cbcae5372dae5bb3370b7eafc3528c3b63c7b50c564d88c59d6a878f9 SHA512 94278ccda36c0781512a3f9245637573891c8b51d35e5b991d62aad86f2883a9a85406e004e88fd342f0a4020365a19e068ba975e0bf826bf7c360916862a1c8
diff --git a/dev-cpp/fizz/fizz-2022.03.21.00.ebuild b/dev-cpp/fizz/fizz-2022.04.11.00.ebuild
similarity index 93%
rename from dev-cpp/fizz/fizz-2022.03.21.00.ebuild
rename to dev-cpp/fizz/fizz-2022.04.11.00.ebuild
index 12e7ec5679..0c689e15b7 100644
--- a/dev-cpp/fizz/fizz-2022.03.21.00.ebuild
+++ b/dev-cpp/fizz/fizz-2022.04.11.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -24,7 +24,6 @@ RDEPEND="
dev-libs/libsodium
dev-libs/openssl:0=
"
-#TODO: discover if gtest is linked
DEPEND="
${RDEPEND}
test? (
-Date: Sun, 12 Jul 2020 10:39:31 +0200
-Subject: [PATCH 2/3] cmake: Install ETF and XDP plugin headers
-
-When the corresponding features are enabled, the headers should be installed as
-well.
-
-Signed-off-by: Kurt Kanzenbach
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -907,6 +907,7 @@ if(UA_ENABLE_PUBSUB)
- list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_udp.h)
- list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_udp.c)
- if(UA_ENABLE_PUBSUB_ETH_UADP_ETF)
-+ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_etf.h)
- list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_etf.c)
- endif()
- if(UA_ENABLE_PUBSUB_ETH_UADP)
-@@ -916,6 +917,7 @@ if(UA_ENABLE_PUBSUB)
- if(UA_ENABLE_PUBSUB_ETH_UADP_XDP)
- if(EXISTS "${XDP_LIBRARY}")
- list(APPEND open62541_LIBRARIES ${XDP_LIBRARY})
-+ list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/include/open62541/plugin/pubsub_ethernet_xdp.h)
- list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_pubsub_ethernet_xdp.c)
- else()
- MESSAGE(WARNING "samples in bpf-next directory were not built. Build the bpf-next to use XDP")
diff --git a/dev-libs/open62541/files/open62541-1.3-disable-xdp.patch b/dev-libs/open62541/files/open62541-1.3-disable-xdp.patch
new file mode 100644
index 0000000000..cb5cb6e8f4
--- /dev/null
+++ b/dev-libs/open62541/files/open62541-1.3-disable-xdp.patch
@@ -0,0 +1,21 @@
+From: Kurt Kanzenbach
+Subject: pubsub: Disable XDP code
+
+The XDP code assumes < dev-libs/libbpf-0.0.7. Disable it.
+
+Signed-off-by: Kurt Kanzenbach
+---
+ plugins/ua_pubsub_ethernet.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/plugins/ua_pubsub_ethernet.c
++++ b/plugins/ua_pubsub_ethernet.c
+@@ -43,7 +43,7 @@ static UA_THREAD_LOCAL UA_Byte ReceiveMs
+ #include
+
+ #if defined __has_include
+-# if __has_include() && __has_include() && __has_include()
++# if 0
+ # define LIBBPF_EBPF
+ /* Libbpf headers */
+ # include
diff --git a/dev-libs/open62541/files/open62541-1.2.4-tests.patch b/dev-libs/open62541/files/open62541-1.3-tests.patch
similarity index 69%
rename from dev-libs/open62541/files/open62541-1.2.4-tests.patch
rename to dev-libs/open62541/files/open62541-1.3-tests.patch
index e8b83fe087..292cd73fc6 100644
--- a/dev-libs/open62541/files/open62541-1.2.4-tests.patch
+++ b/dev-libs/open62541/files/open62541-1.3-tests.patch
@@ -1,18 +1,16 @@
-From ab9a4a1c826bb662816f71020054ba2558afefc7 Mon Sep 17 00:00:00 2001
From: Kurt Kanzenbach
-Date: Sat, 20 Jun 2020 14:28:57 +0200
-Subject: [PATCH 1/3] cmake: pubsub: Disable failing tests within portage
+Subject: test: Remove PubSub tests
-The Pub/Sub tests won't work within portage. Disable them.
+Remove PubSub tests. They don't run within portage.
Signed-off-by: Kurt Kanzenbach
---
- tests/CMakeLists.txt | 103 ---------------------------------------------------
- 1 file changed, 103 deletions(-)
+ tests/CMakeLists.txt | 125 ---------------------------------------------------
+ 1 file changed, 125 deletions(-)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
-@@ -341,109 +341,6 @@ if(UA_ENABLE_DISCOVERY)
+@@ -381,131 +381,6 @@ if(UA_ENABLE_DISCOVERY)
add_test_valgrind(discovery ${TESTS_BINARY_DIR}/check_discovery)
endif()
@@ -20,48 +18,74 @@ Signed-off-by: Kurt Kanzenbach
- add_executable(check_pubsub_encoding pubsub/check_pubsub_encoding.c $ $)
- target_link_libraries(check_pubsub_encoding ${LIBS})
- add_test_valgrind(pubsub_encoding ${TESTS_BINARY_DIR}/check_pubsub_encoding)
-- add_executable(check_pubsub_pds pubsub/check_pubsub_pds.c $ $)
+- add_executable(check_pubsub_pds pubsub/check_pubsub_pds.c $ $)
- target_link_libraries(check_pubsub_pds ${LIBS})
- add_test_valgrind(pubsub_pds ${TESTS_BINARY_DIR}/check_pubsub_pds)
-- add_executable(check_pubsub_connection_udp pubsub/check_pubsub_connection_udp.c $ $)
+- add_executable(check_pubsub_connection_udp pubsub/check_pubsub_connection_udp.c $ $)
- target_link_libraries(check_pubsub_connection_udp ${LIBS})
- add_test_valgrind(pubsub_connection_udp ${TESTS_BINARY_DIR}/check_pubsub_connection_udp)
-- add_executable(check_pubsub_publish pubsub/check_pubsub_publish.c $ $)
+- add_executable(check_pubsub_publish pubsub/check_pubsub_publish.c $ $)
- target_link_libraries(check_pubsub_publish ${LIBS})
- add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish)
-- add_executable(check_pubsub_publish_uadp pubsub/check_pubsub_publish_uadp.c $ $)
+- add_executable(check_pubsub_publish_uadp pubsub/check_pubsub_publish_uadp.c $ $)
- target_link_libraries(check_pubsub_publish_uadp ${LIBS})
- add_test_valgrind(pubsub_publish ${TESTS_BINARY_DIR}/check_pubsub_publish_uadp)
-- add_executable(check_pubsub_get_state pubsub/check_pubsub_get_state.c $ $)
+- add_executable(check_pubsub_get_state pubsub/check_pubsub_get_state.c $ $)
- target_link_libraries(check_pubsub_get_state ${LIBS})
- add_test_valgrind(check_pubsub_get_state ${TESTS_BINARY_DIR}/check_pubsub_get_state)
-
- #Link libraries for executing subscriber unit test
-- add_executable(check_pubsub_subscribe pubsub/check_pubsub_subscribe.c $ $)
+- add_executable(check_pubsub_subscribe pubsub/check_pubsub_subscribe.c $ $)
- target_link_libraries(check_pubsub_subscribe ${LIBS})
-- add_executable(check_pubsub_publishspeed pubsub/check_pubsub_publishspeed.c $ $)
+- add_executable(check_pubsub_publishspeed pubsub/check_pubsub_publishspeed.c $ $)
- target_link_libraries(check_pubsub_publishspeed ${LIBS})
- add_test_valgrind(pubsub_publishspeed ${TESTS_BINARY_DIR}/check_pubsub_publish)
-- add_executable(check_pubsub_config_freeze pubsub/check_pubsub_config_freeze.c $ $)
+- add_executable(check_pubsub_config_freeze pubsub/check_pubsub_config_freeze.c $ $)
- target_link_libraries(check_pubsub_config_freeze ${LIBS})
- add_test_valgrind(check_pubsub_config_freeze ${TESTS_BINARY_DIR}/check_pubsub_config_freeze)
-- add_executable(check_pubsub_publish_rt_levels pubsub/check_pubsub_publish_rt_levels.c $ $)
+- add_executable(check_pubsub_publish_rt_levels pubsub/check_pubsub_publish_rt_levels.c $ $)
- target_link_libraries(check_pubsub_publish_rt_levels ${LIBS})
- add_test_valgrind(check_pubsub_publish_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_publish_rt_levels)
-- add_executable(check_pubsub_subscribe_config_freeze pubsub/check_pubsub_subscribe_config_freeze.c $ $)
+- add_executable(check_pubsub_subscribe_config_freeze pubsub/check_pubsub_subscribe_config_freeze.c $ $)
- target_link_libraries(check_pubsub_subscribe_config_freeze ${LIBS})
- add_test_valgrind(check_pubsub_subscribe_config_freeze ${TESTS_BINARY_DIR}/check_pubsub_subscribe_config_freeze)
-- add_executable(check_pubsub_subscribe_rt_levels pubsub/check_pubsub_subscribe_rt_levels.c $ $)
+- add_executable(check_pubsub_subscribe_rt_levels pubsub/check_pubsub_subscribe_rt_levels.c $ $)
- target_link_libraries(check_pubsub_subscribe_rt_levels ${LIBS})
- add_test_valgrind(check_pubsub_subscribe_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_subscribe_rt_levels)
-- add_executable(check_pubsub_multiple_subscribe_rt_levels pubsub/check_pubsub_multiple_subscribe_rt_levels.c $ $)
+- add_executable(check_pubsub_multiple_subscribe_rt_levels pubsub/check_pubsub_multiple_subscribe_rt_levels.c $ $)
- target_link_libraries(check_pubsub_multiple_subscribe_rt_levels ${LIBS})
- add_test_valgrind(check_pubsub_multiple_subscribe_rt_levels ${TESTS_BINARY_DIR}/check_pubsub_multiple_subscribe_rt_levels)
-
-- add_executable(check_pubsub_multiple_layer pubsub/check_pubsub_multiple_layer.c $ $)
+- add_executable(check_pubsub_multiple_layer pubsub/check_pubsub_multiple_layer.c $ $)
- target_link_libraries(check_pubsub_multiple_layer ${LIBS})
- add_test_valgrind(pubsub_multiple_layer ${TESTS_BINARY_DIR}/check_pubsub_multiple_layer)
-
+- if(UA_ENABLE_PUBSUB_ENCRYPTION)
+- add_executable(check_pubsub_encryption pubsub/check_pubsub_encryption.c
+- $
+- $)
+- target_link_libraries(check_pubsub_encryption ${LIBS})
+- add_test_valgrind(check_pubsub_encryption ${TESTS_BINARY_DIR}/check_pubsub_encryption)
+-
+- add_executable(check_pubsub_encryption_aes256 pubsub/check_pubsub_encryption_aes256.c
+- $
+- $)
+- target_link_libraries(check_pubsub_encryption_aes256 ${LIBS})
+- add_test_valgrind(check_pubsub_encryption_aes256 ${TESTS_BINARY_DIR}/check_pubsub_encryption_aes256)
+-
+- add_executable(check_pubsub_decryption pubsub/check_pubsub_decryption.c
+- $
+- $)
+- target_link_libraries(check_pubsub_decryption ${LIBS})
+- add_test_valgrind(check_pubsub_decryption ${TESTS_BINARY_DIR}/check_pubsub_decryption)
+-
+- add_executable(check_pubsub_subscribe_encrypted pubsub/check_pubsub_subscribe_encrypted.c
+- $
+- $)
+- target_link_libraries(check_pubsub_subscribe_encrypted ${LIBS})
+- add_test_valgrind(check_pubsub_subscribe_encrypted ${TESTS_BINARY_DIR}/check_pubsub_subscribe_encrypted)
+- endif()
+-
- if (UA_ENABLE_PUBSUB_MONITORING)
- add_executable(check_pubsub_subscribe_msgrcvtimeout pubsub/check_pubsub_subscribe_msgrcvtimeout.c
- $
@@ -71,35 +95,31 @@ Signed-off-by: Kurt Kanzenbach
- endif()
-
- if(UA_ENABLE_PUBSUB_ETH_UADP)
-- if(NOT UA_ENABLE_PUBSUB_ETH_UADP_ETF)
-- add_executable(check_pubsub_connection_ethernet pubsub/check_pubsub_connection_ethernet.c $ $)
-- target_link_libraries(check_pubsub_connection_ethernet ${LIBS})
-- add_test_valgrind(pubsub_connection_ethernet ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet)
-- add_executable(check_pubsub_publish_ethernet pubsub/check_pubsub_publish_ethernet.c $ $)
-- target_link_libraries(check_pubsub_publish_ethernet ${LIBS})
-- add_test_valgrind(pubsub_publish_ethernet ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet)
-- endif()
-- if(UA_ENABLE_PUBSUB_ETH_UADP_XDP)
-- add_executable(check_pubsub_connection_xdp pubsub/check_pubsub_connection_xdp.c $ $)
+- add_executable(check_pubsub_connection_ethernet pubsub/check_pubsub_connection_ethernet.c $ $)
+- target_link_libraries(check_pubsub_connection_ethernet ${LIBS})
+- add_test_valgrind(pubsub_connection_ethernet ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet)
+- add_executable(check_pubsub_publish_ethernet pubsub/check_pubsub_publish_ethernet.c $ $)
+- target_link_libraries(check_pubsub_publish_ethernet ${LIBS})
+- add_test_valgrind(pubsub_publish_ethernet ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet)
+- add_executable(check_pubsub_connection_ethernet_etf pubsub/check_pubsub_connection_ethernet_etf.c $ $)
+- target_link_libraries(check_pubsub_connection_ethernet_etf ${LIBS})
+- add_test_valgrind(pubsub_connection_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet_etf)
+- add_executable(check_pubsub_publish_ethernet_etf pubsub/check_pubsub_publish_ethernet_etf.c $ $)
+- target_link_libraries(check_pubsub_publish_ethernet_etf ${LIBS})
+- add_test_valgrind(pubsub_publish_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet_etf)
+- if(LIB_BPF)
+- add_executable(check_pubsub_connection_xdp pubsub/check_pubsub_connection_xdp.c $ $)
- target_link_libraries(check_pubsub_connection_xdp ${LIBS})
- add_test_valgrind(pubsub_connection_xdp ${TESTS_BINARY_DIR}/check_pubsub_connection_xdp)
- endif()
- endif()
-- if(UA_ENABLE_PUBSUB_ETH_UADP_ETF)
-- add_executable(check_pubsub_connection_ethernet_etf pubsub/check_pubsub_connection_ethernet_etf.c $ $)
-- target_link_libraries(check_pubsub_connection_ethernet_etf ${LIBS})
-- add_test_valgrind(pubsub_connection_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_connection_ethernet_etf)
-- add_executable(check_pubsub_publish_ethernet_etf pubsub/check_pubsub_publish_ethernet_etf.c $ $)
-- target_link_libraries(check_pubsub_publish_ethernet_etf ${LIBS})
-- add_test_valgrind(pubsub_publish_ethernet_etf ${TESTS_BINARY_DIR}/check_pubsub_publish_ethernet_etf)
-- endif()
-
- if(UA_ENABLE_PUBSUB_INFORMATIONMODEL)
-- add_executable(check_pubsub_informationmodel pubsub/check_pubsub_informationmodel.c $ $)
+- add_executable(check_pubsub_informationmodel pubsub/check_pubsub_informationmodel.c $ $)
- target_link_libraries(check_pubsub_informationmodel ${LIBS})
- add_test_valgrind(check_pubsub_informationmodel ${TESTS_BINARY_DIR}/check_pubsub_informationmodel)
- if(UA_ENABLE_PUBSUB_INFORMATIONMODEL_METHODS)
-- add_executable(check_pubsub_informationmodel_methods pubsub/check_pubsub_informationmodel_methods.c $ $)
+- add_executable(check_pubsub_informationmodel_methods pubsub/check_pubsub_informationmodel_methods.c $ $)
- target_link_libraries(check_pubsub_informationmodel_methods ${LIBS})
- add_test_valgrind(check_pubsub_informationmodel_methods ${TESTS_BINARY_DIR}/check_pubsub_informationmodel_methods)
-
@@ -107,13 +127,13 @@ Signed-off-by: Kurt Kanzenbach
- endif()
- if(UA_ENABLE_PUBSUB_MQTT)
- if(NOT WIN32)
-- add_executable(check_pubsub_connection_mqtt pubsub/check_pubsub_connection_mqtt.c $ $)
+- add_executable(check_pubsub_connection_mqtt pubsub/check_pubsub_connection_mqtt.c $ $)
- target_link_libraries(check_pubsub_connection_mqtt ${LIBS})
- add_test_valgrind(pubsub_connection_mqtt ${TESTS_BINARY_DIR}/check_pubsub_connection_mqtt)
- endif()
- endif()
- if(UA_ENABLE_PUBSUB_FILE_CONFIG)
-- add_executable(check_pubsub_configuration pubsub/check_pubsub_configuration.c $ $)
+- add_executable(check_pubsub_configuration pubsub/check_pubsub_configuration.c $ $)
- target_link_libraries(check_pubsub_configuration ${LIBS})
- add_test_valgrind(pubsub_configuration ${TESTS_BINARY_DIR}/check_pubsub_configuration)
- endif()
diff --git a/dev-libs/open62541/metadata.xml b/dev-libs/open62541/metadata.xml
index 67d1ce55fb..fa5a942adc 100644
--- a/dev-libs/open62541/metadata.xml
+++ b/dev-libs/open62541/metadata.xml
@@ -20,9 +20,6 @@
Enable encryption support
-
- Enable pub/sub using Earliest TxTime First Qdisc
-
Use mbedtls for encryption
@@ -35,9 +32,6 @@
Build additional shell tools
-
- Enable pub/sub with eXpress Data Path (XDP)
-
open62541/open62541
diff --git a/dev-libs/open62541/open62541-1.2.4.ebuild b/dev-libs/open62541/open62541-1.3.ebuild
similarity index 82%
rename from dev-libs/open62541/open62541-1.2.4.ebuild
rename to dev-libs/open62541/open62541-1.3.ebuild
index 9717773303..2f5c0abfa3 100644
--- a/dev-libs/open62541/open62541-1.2.4.ebuild
+++ b/dev-libs/open62541/open62541-1.3.ebuild
@@ -14,14 +14,12 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="doc encryption examples etf mbedtls pubsub openssl test tools xdp"
+IUSE="doc encryption examples mbedtls pubsub openssl test tools"
RESTRICT="!test? ( test )"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
encryption? ( || ( mbedtls openssl ) )
- etf? ( pubsub )
- xdp? ( pubsub )
"
BDEPEND="
@@ -52,7 +50,7 @@ RDEPEND="
"
PATCHES=(
- "${FILESDIR}/${P}-headers.patch"
+ "${FILESDIR}/${P}-disable-xdp.patch"
"${FILESDIR}/${P}-tests.patch"
)
@@ -70,15 +68,15 @@ src_configure() {
-DUA_BUILD_EXAMPLES=OFF
-DUA_BUILD_TOOLS=$(usex tools)
-DUA_BUILD_UNIT_TESTS=$(usex test)
- -DUA_ENABLE_ENCRYPTION=$(usex encryption)
- -DUA_ENABLE_ENCRYPTION_MBEDTLS=$(usex mbedtls)
- -DUA_ENABLE_ENCRYPTION_OPENSSL=$(usex openssl)
-DUA_ENABLE_PUBSUB=$(usex pubsub)
-DUA_ENABLE_PUBSUB_ETH_UADP=$(usex pubsub)
- -DUA_ENABLE_PUBSUB_ETH_UADP_ETF=$(usex etf)
- -DUA_ENABLE_PUBSUB_ETH_UADP_XDP=$(usex xdp)
)
+ if use encryption; then
+ use mbedtls && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=MBEDTLS)
+ use openssl && mycmakeargs+=(-DUA_ENABLE_ENCRYPTION=OPENSSL)
+ fi
+
cmake_src_configure
}
diff --git a/dev-ml/angstrom/angstrom-0.15.0-r2.ebuild b/dev-ml/angstrom/angstrom-0.15.0-r2.ebuild
index b218bce609..f9b6e5321d 100644
--- a/dev-ml/angstrom/angstrom-0.15.0-r2.ebuild
+++ b/dev-ml/angstrom/angstrom-0.15.0-r2.ebuild
@@ -6,25 +6,36 @@ EAPI=8
inherit dune multiprocessing
DESCRIPTION="Parser combinators built for speed and memory efficiency"
-HOMEPAGE="https://github.com/inhabitedtype/angstrom"
+HOMEPAGE="
+ https://github.com/inhabitedtype/angstrom
+ https://opam.ocaml.org/packages/angstrom/
+"
SRC_URI="https://github.com/inhabitedtype/angstrom/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64"
-IUSE="async lwt-unix ocamlopt unix"
+IUSE="async lwt-unix ocamlopt test unix"
RDEPEND="
- async? ( dev-ml/async )
+ async? ( dev-ml/async:= )
lwt-unix? (
- dev-ml/base
- dev-ml/lwt
+ dev-ml/base:=
+ dev-ml/lwt:=
)
- unix? ( dev-ml/base )
+ unix? ( dev-ml/base:= )
- dev-ml/bigstringaf
+ dev-ml/bigstringaf:=
"
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-ml/ppx_let
+ dev-ml/alcotest
+ )
+"
+
+RESTRICT="!test? ( test )"
src_compile() {
local pkgs="angstrom"
diff --git a/dev-ml/arp/arp-3.0.0.ebuild b/dev-ml/arp/arp-3.0.0.ebuild
index b8507a44d1..4c7ecec5d9 100644
--- a/dev-ml/arp/arp-3.0.0.ebuild
+++ b/dev-ml/arp/arp-3.0.0.ebuild
@@ -18,14 +18,14 @@ KEYWORDS="~amd64"
IUSE="ocamlopt test"
RDEPEND="
- dev-ml/cstruct
- dev-ml/ipaddr
- dev-ml/logs
- dev-ml/mirage-time
- dev-ml/lwt
- dev-ml/duration
- dev-ml/mirage-profile
- dev-ml/ethernet
+ dev-ml/cstruct:=
+ dev-ml/ipaddr:=
+ dev-ml/logs:=
+ dev-ml/mirage-time:=
+ dev-ml/lwt:=
+ dev-ml/duration:=
+ dev-ml/mirage-profile:=
+ dev-ml/ethernet:=
"
DEPEND="
${RDEPEND}
@@ -36,6 +36,7 @@ DEPEND="
dev-ml/fmt
dev-ml/mirage-vnetif
dev-ml/mirage-clock
+ dev-ml/mirage-clock-unix
dev-ml/mirage-time[unix]
dev-ml/mirage-flow
)
diff --git a/dev-ml/asn1-combinators/Manifest b/dev-ml/asn1-combinators/Manifest
index 1675e1fbd0..6162dbb690 100644
--- a/dev-ml/asn1-combinators/Manifest
+++ b/dev-ml/asn1-combinators/Manifest
@@ -1 +1,2 @@
DIST asn1-combinators-v0.2.5.tbz 28306 BLAKE2B 0a49a1b3b9340c6992f176ef58c4d19bd7fe73450b9146fb69f6ad5704403be9b9638fb9a8989ba34f04a5bb20b3b1ce31eb58aec60ca759a92db779198855fd SHA512 49767d04129bb842215e57e4efeb79f6fba025ddd67e474d9a3f51625c5101e583208cc0ff6dd69bcbcd4ab415c83b410125c1b9eb66c8cde60132b243b06158
+DIST asn1-combinators-v0.2.6.tbz 28781 BLAKE2B a22ada6a8818318a26b905aeb87ea80a4c52c2154ee494d674ef53a36d2c7cdca5bcc3186a842fb245e6da60b70f4bbcb01c5d9f80225f86024592468ea4fa84 SHA512 4c1b28f1d230395ff1ad3b8e8d03981b10015062ec270f29e2521914eb64c2fa4d5df68363e339e9a1158c3b58aef0e25156f7ec6addd85a580fecadc17edfac
diff --git a/dev-ml/asn1-combinators/asn1-combinators-0.2.6.ebuild b/dev-ml/asn1-combinators/asn1-combinators-0.2.6.ebuild
new file mode 100644
index 0000000000..1ab999dec3
--- /dev/null
+++ b/dev-ml/asn1-combinators/asn1-combinators-0.2.6.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Embed typed ASN.1 grammars in OCaml"
+HOMEPAGE="
+ https://github.com/mirleft/ocaml-asn1-combinators
+ https://opam.ocaml.org/packages/asn1-combinators/
+"
+SRC_URI="https://github.com/mirleft/ocaml-${PN}/releases/download/v${PV}/${MY_P}.tbz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="ocamlopt test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.08.0:=[ocamlopt?]
+ >=dev-ml/cstruct-6.0.0:=
+ dev-ml/ptime:=
+ dev-ml/zarith:=
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-ml/alcotest )
+"
+
+RESTRICT="!test? ( test )"
diff --git a/dev-ml/ca-certs/Manifest b/dev-ml/ca-certs/Manifest
index c90323a187..5cdcf8625a 100644
--- a/dev-ml/ca-certs/Manifest
+++ b/dev-ml/ca-certs/Manifest
@@ -1 +1,2 @@
DIST ca-certs-v0.2.1.tbz 26566 BLAKE2B e48c5230501ba790acb5abf078c0a3e3eb26da7a7ba946c001d2c37b8d45952ebc1e8fa7f4ee033e944e18cb9dbe1598be336d29b41e4f04d74006b6d790f319 SHA512 5b337812047e75b97218d0fc28d13dd37c8aebe2672954679884d3eb3ddda59c9678aea2a66dd66def4b2eb0a6b9e25812a95a5e8cae47c074759b2e9ff7a3c9
+DIST ca-certs-v0.2.2.tbz 27138 BLAKE2B c5e2c1d0be29b3ea05739bf74ff53080da6b7ba5d2b34460c901eac8e8c705aa9b8eb0c1042e371899a56ea80ef833b50ad25220c3708bc9cc715cfebbb6bea8 SHA512 70e564a5bb69a66018ff3387bf7b4b6af2ec1507d9f2f140f2aa8519e405920ec1469e56d1fa2aa8b452d05531a35f22df2c1ac08071f9a322525e95de8e3e1f
diff --git a/dev-ml/ca-certs/ca-certs-0.2.2.ebuild b/dev-ml/ca-certs/ca-certs-0.2.2.ebuild
new file mode 100644
index 0000000000..135cc848ef
--- /dev/null
+++ b/dev-ml/ca-certs/ca-certs-0.2.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Detect root CA certificates from the operating system"
+HOMEPAGE="
+ https://github.com/mirage/ca-certs
+ https://opam.ocaml.org/packages/ca-certs/
+"
+SRC_URI="https://github.com/mirage/${PN}/releases/download/v${PV}/${MY_P}.tbz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="ocamlopt test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.08.0:=[ocamlopt?]
+ dev-ml/astring:=
+ dev-ml/bos:=
+ dev-ml/fpath:=
+ dev-ml/ptime:=
+ dev-ml/logs:=
+ dev-ml/mirage-crypto:=
+ >=dev-ml/x509-0.13.0:=
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-ml/alcotest
+ >=dev-ml/fmt-0.8.7
+ )
+"
+
+RESTRICT="!test? ( test )"
diff --git a/dev-ml/cohttp/cohttp-5.0.0.ebuild b/dev-ml/cohttp/cohttp-5.0.0.ebuild
index 767e429e4b..b4ac29f2ad 100644
--- a/dev-ml/cohttp/cohttp-5.0.0.ebuild
+++ b/dev-ml/cohttp/cohttp-5.0.0.ebuild
@@ -6,7 +6,10 @@ EAPI=8
inherit dune multiprocessing
DESCRIPTION="Very lightweight HTTP server using Lwt or Async"
-HOMEPAGE="https://github.com/mirage/ocaml-cohttp"
+HOMEPAGE="
+ https://github.com/mirage/ocaml-cohttp
+ https://opam.ocaml.org/packages/cohttp/
+"
SRC_URI="https://github.com/mirage/ocaml-cohttp/archive/v${PV}.tar.gz -> ocaml-cohttp-${PV}.tar.gz"
S="${WORKDIR}/ocaml-cohttp-${PV}"
@@ -17,76 +20,78 @@ IUSE="async bench curl curl-async curl-lwt lwt lwt-jsoo lwt-unix mirage ocamlopt
RDEPEND="
async? (
- dev-ml/async
- dev-ml/async_kernel
- dev-ml/async_unix
- dev-ml/base
- dev-ml/core_unix
- dev-ml/conduit[async]
- dev-ml/fmt
- dev-ml/ipaddr
- dev-ml/logs
- dev-ml/magic-mime
- dev-ml/mirage-crypto
+ dev-ml/async:=
+ dev-ml/async_kernel:=
+ dev-ml/async_unix:=
+ dev-ml/base:=
+ dev-ml/core_unix:=
+ dev-ml/conduit:=[async]
+ dev-ml/fmt:=
+ dev-ml/ipaddr:=
+ dev-ml/logs:=
+ dev-ml/magic-mime:=
+ dev-ml/mirage-crypto:=
)
bench? (
- dev-ml/core
- dev-ml/core_bench
+ dev-ml/core:=
+ dev-ml/core_bench:=
)
curl-async? (
- dev-ml/async_kernel
- dev-ml/async_unix
- dev-ml/core_kernel
- dev-ml/ocurl
+ dev-ml/async_kernel:=
+ dev-ml/async_unix:=
+ dev-ml/core_kernel:=
+ dev-ml/ocurl:=
)
- curl? ( dev-ml/ocurl )
+ curl? ( dev-ml/ocurl:= )
curl-lwt? (
- dev-ml/lwt
- dev-ml/ocurl
+ dev-ml/lwt:=
+ dev-ml/ocurl:=
)
lwt? (
- dev-ml/logs
- dev-ml/lwt
- dev-ml/ppx_sexp_conv
+ dev-ml/logs:=
+ dev-ml/lwt:=
+ dev-ml/ppx_sexp_conv:=
)
lwt-jsoo? (
- dev-ml/js_of_ocaml[lwt,ppx]
- dev-ml/logs
- dev-ml/lwt
+ >=dev-ml/js_of_ocaml-3.5.0:=[lwt,ppx]
+ dev-ml/logs:=
+ >=dev-ml/lwt-3.0.0:=
)
lwt-unix? (
- dev-ml/base-unix
- dev-ml/cmdliner
- dev-ml/conduit[lwt,lwt-unix]
- dev-ml/fmt
- dev-ml/logs
- dev-ml/lwt
- dev-ml/magic-mime
- dev-ml/ppx_sexp_conv
+ dev-ml/base-unix:=
+ dev-ml/cmdliner:=
+ >=dev-ml/conduit-5.0.0:=[lwt,lwt-unix]
+ >=dev-ml/fmt-0.8.2:=
+ dev-ml/logs:=
+ >=dev-ml/lwt-3.0.0:=
+ dev-ml/magic-mime:=
+ >=dev-ml/ppx_sexp_conv-0.13.0:=
)
mirage? (
- dev-ml/astring
- dev-ml/conduit[mirage]
- dev-ml/fmt
- dev-ml/lwt
- dev-ml/magic-mime
- dev-ml/mirage-channel
- dev-ml/mirage-flow
- dev-ml/mirage-kv
- dev-ml/ppx_sexp_conv
+ dev-ml/astring:=
+ >=dev-ml/conduit-2.0.2:=[mirage]
+ >=dev-ml/fmt-0.8.7:=
+ >=dev-ml/lwt-2.4.3:=
+ dev-ml/magic-mime:=
+ >=dev-ml/mirage-channel-4.0.0:=
+ >=dev-ml/mirage-flow-2.0.0:=
+ >=dev-ml/mirage-kv-3.0.0:=
+ >=dev-ml/ppx_sexp_conv-0.13.0:=
)
server-lwt-unix? (
- dev-ml/lwt
+ dev-ml/lwt:=
)
- dev-ml/ocaml-base64
- dev-ml/re
- dev-ml/sexplib0
- dev-ml/stringext
- dev-ml/uri[sexp]
+ >=dev-lang/ocaml-4.08:=[ocamlopt?]
+ >=dev-ml/ocaml-base64-3.1.0:=
+ >=dev-ml/re-1.9.0:=
+ dev-ml/sexplib0:=
+ dev-ml/stringext:=
+ >=dev-ml/uri-2.0.0:=[sexp]
"
DEPEND="
${RDEPEND}
+ dev-ml/jsonm:=
test? (
dev-ml/alcotest
dev-ml/base_quickcheck
@@ -99,7 +104,7 @@ DEPEND="
dev-ml/crowbar
dev-ml/fmt
dev-ml/conduit[lwt,lwt-unix]
- dev-ml/ounit
+ dev-ml/ounit2
dev-ml/lwt
net-libs/nodejs[npm]
dev-ml/mirage-crypto
diff --git a/dev-ml/crc/crc-2.1.0.ebuild b/dev-ml/crc/crc-2.1.0.ebuild
index c2ffd4341b..cea103182f 100644
--- a/dev-ml/crc/crc-2.1.0.ebuild
+++ b/dev-ml/crc/crc-2.1.0.ebuild
@@ -8,7 +8,10 @@ inherit dune
MYPN="ocaml-${PN}"
DESCRIPTION="Library for finding the CRC of parts of various kinds of data in-place"
-HOMEPAGE="https://github.com/xapi-project/ocaml-crc"
+HOMEPAGE="
+ https://github.com/xapi-project/ocaml-crc
+ https://opam.ocaml.org/packages/crc/
+"
SRC_URI="https://github.com/xapi-project/${MYPN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${MYPN}-${PV}"
@@ -18,13 +21,14 @@ KEYWORDS="~amd64"
IUSE="ocamlopt test"
DEPEND="
- dev-ml/cstruct
- dev-ml/rpc
- dev-ml/ppx_sexp_conv
+ dev-ml/cstruct:=
+ dev-ml/rpc:=
+ dev-ml/ppx_sexp_conv:=
"
RDEPEND="
${DEPEND}
- test? ( dev-ml/ounit )
+ test? ( dev-ml/ounit2 )
"
RESTRICT="!test? ( test )"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"
diff --git a/dev-ml/crc/files/crc-2.1.0-ounit2.patch b/dev-ml/crc/files/crc-2.1.0-ounit2.patch
new file mode 100644
index 0000000000..c3b049e298
--- /dev/null
+++ b/dev-ml/crc/files/crc-2.1.0-ounit2.patch
@@ -0,0 +1,37 @@
+From f34b740604cf6cdb924c056d38ec08be4c781048 Mon Sep 17 00:00:00 2001
+From: Alessandro-Barbieri
+Date: Sat, 16 Apr 2022 20:24:29 +0200
+Subject: [PATCH] use ounit2
+
+Signed-off-by: Alessandro-Barbieri
+---
+ crc.opam | 2 +-
+ test/dune | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/crc.opam b/crc.opam
+index 74f21a8..7923009 100644
+--- a/crc.opam
++++ b/crc.opam
+@@ -12,7 +12,7 @@ depends: [
+ "dune"
+ "ocaml" {>= "4.00.1"}
+ "cstruct" {>= "1.0.1"}
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ "odoc" {with-doc}
+ "ppx_deriving_rpc"
+ "ppx_sexp_conv" {>= "v0.11.0"}
+diff --git a/test/dune b/test/dune
+index 769e090..bad69da 100644
+--- a/test/dune
++++ b/test/dune
+@@ -10,7 +10,7 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
+ (executable
+ (name crc_test)
+ (flags (:standard))
+- (libraries oUnit crc)
++ (libraries ounit2 crc)
+ (preprocess (pps ppx_deriving_rpc ppx_sexp_conv %s))
+ )
+
diff --git a/dev-ml/cstruct/cstruct-6.0.1.ebuild b/dev-ml/cstruct/cstruct-6.0.1.ebuild
index 4c1a41d623..5b3f8ce469 100644
--- a/dev-ml/cstruct/cstruct-6.0.1.ebuild
+++ b/dev-ml/cstruct/cstruct-6.0.1.ebuild
@@ -6,7 +6,10 @@ EAPI=8
inherit dune multiprocessing
DESCRIPTION="Map OCaml arrays onto C-like structs"
-HOMEPAGE="https://github.com/mirage/ocaml-cstruct"
+HOMEPAGE="
+ https://github.com/mirage/ocaml-cstruct
+ https://opam.ocaml.org/packages/cstruct/
+"
SRC_URI="https://github.com/mirage/ocaml-cstruct/archive/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/ocaml-${P}"
@@ -41,7 +44,6 @@ DEPEND="
dev-ml/alcotest
dev-ml/crowbar
dev-ml/ocaml-migrate-parsetree
- dev-ml/ounit
dev-ml/ppx_sexp_conv
dev-ml/cppo
dev-ml/lwt
diff --git a/dev-ml/diet/diet-0.4.ebuild b/dev-ml/diet/diet-0.4.ebuild
index aece1850fc..c1cc5d0921 100644
--- a/dev-ml/diet/diet-0.4.ebuild
+++ b/dev-ml/diet/diet-0.4.ebuild
@@ -8,7 +8,10 @@ inherit dune
MYPN="ocaml-${PN}"
DESCRIPTION="A simple implementation of Discrete Interval Encoding Trees"
-HOMEPAGE="https://github.com/mirage/ocaml-diet"
+HOMEPAGE="
+ https://opam.ocaml.org/packages/diet/
+ https://github.com/mirage/ocaml-diet
+"
SRC_URI="https://github.com/mirage/${MYPN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${MYPN}-${PV}"
@@ -17,10 +20,11 @@ SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="ocamlopt test"
-RDEPEND="dev-ml/stdlib-shims"
+RDEPEND="dev-ml/stdlib-shims:="
DEPEND="
${RDEPEND}
- test? ( dev-ml/ounit )
+ test? ( dev-ml/ounit2 )
"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/diet/files/diet-0.4-ounit2.patch b/dev-ml/diet/files/diet-0.4-ounit2.patch
new file mode 100644
index 0000000000..e65b7e6d89
--- /dev/null
+++ b/dev-ml/diet/files/diet-0.4-ounit2.patch
@@ -0,0 +1,45 @@
+From 5557ef1e0779a94454cbe4324de7581dca4a997f Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri
+Date: Sat, 16 Apr 2022 14:45:55 +0200
+Subject: [PATCH 1/3] depend on ounit2
+
+--- a/diet.opam
++++ b/diet.opam
+@@ -9,7 +9,7 @@ depends: [
+ "ocaml" {>= "4.03.0"}
+ "dune"
+ "stdlib-shims"
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ ]
+ build: [
+ ["dune" "subst"] {pinned}
+
+From 64428455c8b1d3e81ce006476cbd6fe10d200176 Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri
+Date: Sat, 16 Apr 2022 14:47:13 +0200
+Subject: [PATCH 2/3] use ounit2
+
+--- a/lib_test/dune
++++ b/lib_test/dune
+@@ -1,3 +1,3 @@
+ (tests
+ (names test)
+- (libraries diet oUnit))
++ (libraries diet ounit2))
+
+From 41c6f7adf7a321cf334a99a72ffe0bf3be1eb4ba Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri
+Date: Sat, 16 Apr 2022 14:47:35 +0200
+Subject: [PATCH 3/3] use ounit2
+
+--- a/.merlin
++++ b/.merlin
+@@ -1,6 +1,6 @@
+ PKG astring cmdliner cstruct logs lwt mirage-block mirage-block-unix ppx_sexp_conv ppx_tools ppx_type_conv
+ PKG io-page io-page.unix logs.fmt result sexplib
+-PKG ezjsonm mirage-block-ramdisk nbd ounit
++PKG ezjsonm mirage-block-ramdisk nbd ounit2
+ S lib
+ S lib_test
+ B _build/**
diff --git a/dev-ml/eqaf/Manifest b/dev-ml/eqaf/Manifest
index 95528d5eb8..df082106f7 100644
--- a/dev-ml/eqaf/Manifest
+++ b/dev-ml/eqaf/Manifest
@@ -1 +1,2 @@
DIST eqaf-v0.7.tbz 19149 BLAKE2B bd73571d7118b7007a89c07b65eeaaadc34722b2e3923ef045d7a39c5e6d92292f38c6507934bad27af744a9a5eac5be16a9446d0353d998bc727dd86fc2d0bd SHA512 38a2687bafb5cd1d1deb51ceceba94fcff9ce88515fd2c61ec1182808c50c0e3373a4d71fe51a17a23c74616c5ab350a4cf7914de656886981538abf2b57ff61
+DIST eqaf-v0.8.tbz 29219 BLAKE2B 04f4e31fa7ebe7eb4777ee77cdc08495500562e61767bdc064c3cf2f90df64cf47f8160cbc2fb0c633ae32893566fed41aec6c329f6086439c9ad30a3bbff435 SHA512 303749bdbaae8fc27f57ebaa5cf9b16ed5b8cbaee35f0a35d69f91a437b1a3411a613d145d3aff7ff74a587509d877cc0a569fdae4d00cec65bf50d705361e25
diff --git a/dev-ml/eqaf/eqaf-0.8.ebuild b/dev-ml/eqaf/eqaf-0.8.ebuild
new file mode 100644
index 0000000000..5d0a8bcd98
--- /dev/null
+++ b/dev-ml/eqaf/eqaf-0.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Constant time equal function to avoid timing attacks in OCaml"
+HOMEPAGE="
+ https://github.com/mirage/eqaf
+ https://opam.ocaml.org/packages/eqaf/
+"
+SRC_URI="https://github.com/mirage/eqaf/releases/download/v${PV}/${MY_P}.tbz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="ocamlopt test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.07.0:=[ocamlopt?]
+ >=dev-ml/cstruct-1.1.0:=
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-ml/ocaml-base64
+ dev-ml/alcotest
+ dev-ml/crowbar
+ )
+"
+
+RESTRICT="!test? ( test )"
diff --git a/dev-ml/gmap/gmap-0.3.0-r2.ebuild b/dev-ml/gmap/gmap-0.3.0-r2.ebuild
index 513c6ad691..2d6dcda348 100644
--- a/dev-ml/gmap/gmap-0.3.0-r2.ebuild
+++ b/dev-ml/gmap/gmap-0.3.0-r2.ebuild
@@ -6,13 +6,24 @@ EAPI=8
inherit dune
DESCRIPTION="Heterogenous Map over a GADT"
-HOMEPAGE="https://github.com/hannesm/gmap"
+HOMEPAGE="
+ https://github.com/hannesm/gmap
+ https://opam.ocaml.org/packages/gmap/
+"
SRC_URI="https://github.com/hannesm/gmap/releases/download/${PV}/${P}.tbz"
LICENSE="ISC"
SLOT="0/${PV}"
KEYWORDS="~amd64"
-IUSE="ocamlopt"
+IUSE="ocamlopt test"
RDEPEND=""
-DEPEND="${RDEPEND}"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-ml/alcotest
+ dev-ml/fmt
+ )
+"
+
+RESTRICT="!test? ( test )"
diff --git a/dev-ml/inotify/inotify-2.3_p20211118.ebuild b/dev-ml/inotify/inotify-2.3_p20211118.ebuild
index 1d4a7544b5..6b478199dc 100644
--- a/dev-ml/inotify/inotify-2.3_p20211118.ebuild
+++ b/dev-ml/inotify/inotify-2.3_p20211118.ebuild
@@ -19,13 +19,13 @@ KEYWORDS="~amd64"
IUSE="ocamlopt test"
DEPEND="
- dev-ml/base-unix
- dev-ml/base-bytes
+ dev-ml/base-unix:=
+ dev-ml/base-bytes:=
"
RDEPEND="
${DEPEND}
test? (
- >=dev-ml/ounit-2
+ dev-ml/ounit2
dev-ml/ocaml-fileutils
dev-ml/lwt
)
diff --git a/dev-ml/io-page/files/io-page-2.4.0-ounit2.patch b/dev-ml/io-page/files/io-page-2.4.0-ounit2.patch
new file mode 100644
index 0000000000..32c8deabf2
--- /dev/null
+++ b/dev-ml/io-page/files/io-page-2.4.0-ounit2.patch
@@ -0,0 +1,34 @@
+From d6432606b9d76ce399f47263992d39c306eb2fcf Mon Sep 17 00:00:00 2001
+From: Alessandro-Barbieri
+Date: Sat, 16 Apr 2022 18:45:58 +0200
+Subject: [PATCH] switch to ounit2
+
+Signed-off-by: Alessandro-Barbieri
+---
+ io-page.opam | 2 +-
+ lib_test/dune | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/io-page.opam b/io-page.opam
+index eca0112..b72af2e 100644
+--- a/io-page.opam
++++ b/io-page.opam
+@@ -11,7 +11,7 @@ depends: [
+ "ocaml" {>= "4.08.0"}
+ "dune" {>= "2.6"}
+ "cstruct" {>= "2.0.0"}
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ ]
+ build: [
+ ["dune" "subst"] {dev}
+diff --git a/lib_test/dune b/lib_test/dune
+index 9eb6161..f23440b 100644
+--- a/lib_test/dune
++++ b/lib_test/dune
+@@ -1,4 +1,4 @@
+ (test
+ (name portable)
+ (package io-page)
+- (libraries io-page oUnit))
++ (libraries io-page ounit2))
diff --git a/dev-ml/io-page/io-page-2.2.0.ebuild b/dev-ml/io-page/io-page-2.2.0.ebuild
index dcb8fdb37b..4e775d0cc3 100644
--- a/dev-ml/io-page/io-page-2.2.0.ebuild
+++ b/dev-ml/io-page/io-page-2.2.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- test? ( dev-ml/ounit )
+ test? ( dev-ml/ounit2 )
unix? ( dev-ml/configurator )
"
diff --git a/dev-ml/io-page/io-page-2.4.0.ebuild b/dev-ml/io-page/io-page-2.4.0.ebuild
index 528316a847..c4ae6c82ca 100644
--- a/dev-ml/io-page/io-page-2.4.0.ebuild
+++ b/dev-ml/io-page/io-page-2.4.0.ebuild
@@ -8,7 +8,10 @@ inherit dune
MY_P="${PN}-v${PV}"
DESCRIPTION="IO memory page library for Mirage backends"
-HOMEPAGE="https://github.com/mirage/io-page"
+HOMEPAGE="
+ https://github.com/mirage/io-page
+ https://github.com/mirage/io-page
+"
SRC_URI="https://github.com/mirage/io-page/releases/download/v${PV}/${MY_P}.tbz"
S="${WORKDIR}/${MY_P}"
@@ -18,13 +21,14 @@ KEYWORDS="~amd64"
IUSE="ocamlopt test"
RDEPEND="
- dev-ml/bigarray-compat
- dev-ml/cstruct
+ dev-ml/bigarray-compat:=
+ dev-ml/cstruct:=
"
DEPEND="
${RDEPEND}
- test? ( dev-ml/ounit )
+ test? ( dev-ml/ounit2 )
"
BDEPEND="virtual/pkgconfig"
RESTRICT="!test? ( test )"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"
diff --git a/dev-ml/ipaddr/files/ipaddr-5.3.0-ounit2.patch b/dev-ml/ipaddr/files/ipaddr-5.3.0-ounit2.patch
new file mode 100644
index 0000000000..d2d1ec5829
--- /dev/null
+++ b/dev-ml/ipaddr/files/ipaddr-5.3.0-ounit2.patch
@@ -0,0 +1,129 @@
+From c0352e7e1c2fdbc22e06dedb839831f5694d7429 Mon Sep 17 00:00:00 2001
+From: Alessandro-Barbieri
+Date: Sat, 16 Apr 2022 18:36:24 +0200
+Subject: [PATCH] switch to ounit2
+
+Signed-off-by: Alessandro-Barbieri
+---
+ README.md | 2 +-
+ ipaddr-sexp.opam | 2 +-
+ ipaddr.opam | 4 ++--
+ lib_test/dune | 8 ++++----
+ macaddr-sexp.opam | 2 +-
+ macaddr.opam | 4 ++--
+ 6 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/README.md b/README.md
+index 6e1ec56..4aace13 100644
+--- a/README.md
++++ b/README.md
+@@ -4,7 +4,7 @@ A library for manipulation of IP and MAC address representations.
+
+ Features:
+
+- * oUnit-based tests
++ * ounit2-based tests
+ * IPv4 and IPv6 support
+ * IPv4 and IPv6 CIDR prefix support
+ * IPv4 and IPv6 [CIDR-scoped address](http://tools.ietf.org/html/rfc4291#section-2.3) support
+diff --git a/ipaddr-sexp.opam b/ipaddr-sexp.opam
+index 735ad08..4f4be93 100644
+--- a/ipaddr-sexp.opam
++++ b/ipaddr-sexp.opam
+@@ -16,7 +16,7 @@ depends: [
+ "dune" {>= "1.9.0"}
+ "ipaddr" {= version}
+ "ipaddr-cstruct" {with-test & = version}
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ "ppx_sexp_conv" {>= "v0.9.0"}
+ "sexplib0"
+ ]
+diff --git a/ipaddr.opam b/ipaddr.opam
+index 240d9c8..02f5570 100644
+--- a/ipaddr.opam
++++ b/ipaddr.opam
+@@ -5,7 +5,7 @@ synopsis: "A library for manipulation of IP (and MAC) address representations"
+ description: """
+ Features:
+ * Depends only on sexplib (conditionalization under consideration)
+- * oUnit-based tests
++ * ounit2-based tests
+ * IPv4 and IPv6 support
+ * IPv4 and IPv6 CIDR prefix support
+ * IPv4 and IPv6 [CIDR-scoped address](http://tools.ietf.org/html/rfc4291#section-2.3) support
+@@ -32,7 +32,7 @@ depends: [
+ "macaddr" {= version}
+ "stdlib-shims"
+ "domain-name" {>= "0.3.0"}
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ "ppx_sexp_conv" {with-test & >= "v0.9.0"}
+ ]
+ build: [
+diff --git a/lib_test/dune b/lib_test/dune
+index 8dd7d27..fc6f285 100644
+--- a/lib_test/dune
++++ b/lib_test/dune
+@@ -27,22 +27,22 @@
+ (name test_ipaddr)
+ (package ipaddr-sexp)
+ (modules test_ipaddr)
+- (libraries ipaddr ipaddr-cstruct test_ipaddr_sexp oUnit))
++ (libraries ipaddr ipaddr-cstruct test_ipaddr_sexp ounit2))
+
+ (test
+ (name test_ipaddr_b128)
+ (package ipaddr-sexp)
+ (modules test_ipaddr_b128 ipaddr_internal)
+- (libraries ipaddr ipaddr-cstruct test_ipaddr_sexp oUnit))
++ (libraries ipaddr ipaddr-cstruct test_ipaddr_sexp ounit2))
+
+ (test
+ (name test_macaddr)
+ (package macaddr-sexp)
+ (modules test_macaddr)
+- (libraries macaddr macaddr-cstruct test_macaddr_sexp oUnit))
++ (libraries macaddr macaddr-cstruct test_macaddr_sexp ounit2))
+
+ (test
+ (name test_ppx)
+ (modules test_ppx)
+ (package ipaddr-sexp)
+- (libraries ipaddr macaddr test_ipaddr_sexp test_macaddr_sexp oUnit))
++ (libraries ipaddr macaddr test_ipaddr_sexp test_macaddr_sexp ounit2))
+diff --git a/macaddr-sexp.opam b/macaddr-sexp.opam
+index 26e6fcf..e7773fe 100644
+--- a/macaddr-sexp.opam
++++ b/macaddr-sexp.opam
+@@ -12,7 +12,7 @@ depends: [
+ "dune" {>= "1.9.0"}
+ "macaddr" {= version}
+ "macaddr-cstruct" {with-test & = version}
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ "ppx_sexp_conv" {>= "v0.9.0"}
+ "sexplib0"
+ ]
+diff --git a/macaddr.opam b/macaddr.opam
+index 13fcf31..6e2106f 100644
+--- a/macaddr.opam
++++ b/macaddr.opam
+@@ -10,7 +10,7 @@ bug-reports: "https://github.com/mirage/ocaml-ipaddr/issues"
+ depends: [
+ "ocaml" {>= "4.04.0"}
+ "dune" {>= "1.9.0"}
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ "ppx_sexp_conv" {with-test & >= "v0.9.0"}
+ ]
+ conflicts: [ "ipaddr" {< "3.0.0"} ]
+@@ -25,7 +25,7 @@ A library for manipulation of MAC address representations.
+
+ Features:
+
+- * oUnit-based tests
++ * ounit2-based tests
+ * MAC-48 (Ethernet) address support
+ * `Macaddr` is a `Map.OrderedType`
+ * All types have sexplib serializers/deserializers optionally via the `Macaddr_sexp` library.
diff --git a/dev-ml/ipaddr/ipaddr-5.3.0.ebuild b/dev-ml/ipaddr/ipaddr-5.3.0.ebuild
index 3cd8e9e431..7a9bdd812e 100644
--- a/dev-ml/ipaddr/ipaddr-5.3.0.ebuild
+++ b/dev-ml/ipaddr/ipaddr-5.3.0.ebuild
@@ -6,7 +6,10 @@ EAPI=8
inherit dune multiprocessing
DESCRIPTION="OCaml library for manipulation of IP (and MAC) address representations"
-HOMEPAGE="https://github.com/mirage/ocaml-ipaddr"
+HOMEPAGE="
+ https://github.com/mirage/ocaml-ipaddr
+ https://opam.ocaml.org/packages/ipaddr/
+"
SRC_URI="https://github.com/mirage/ocaml-ipaddr/archive/v${PV}.tar.gz -> ocaml-${P}.tar.gz"
S="${WORKDIR}/ocaml-${P}"
@@ -16,30 +19,31 @@ KEYWORDS="~amd64"
IUSE="cstruct macaddr-cstruct macaddr-sexp ocamlopt sexp test"
RDEPEND="
- dev-ml/domain-name
- dev-ml/stdlib-shims
+ dev-ml/domain-name:=
+ dev-ml/stdlib-shims:=
- cstruct? ( dev-ml/cstruct )
- macaddr-cstruct? ( dev-ml/cstruct )
+ cstruct? ( dev-ml/cstruct:= )
+ macaddr-cstruct? ( dev-ml/cstruct:= )
macaddr-sexp? (
- dev-ml/ppx_sexp_conv
- dev-ml/sexplib0
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/sexplib0:=
)
sexp? (
- dev-ml/ppx_sexp_conv
- dev-ml/sexplib0
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/sexplib0:=
)
"
DEPEND="
${RDEPEND}
test? (
- dev-ml/ounit
+ dev-ml/ounit2
dev-ml/ppx_sexp_conv
)
"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( cstruct macaddr-cstruct macaddr-sexp sexp )"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"
src_compile() {
local pkgs="ipaddr,macaddr"
diff --git a/dev-ml/mirage-block-unix/mirage-block-unix-2.14.0.ebuild b/dev-ml/mirage-block-unix/mirage-block-unix-2.14.0.ebuild
index 6ef1150c25..8eba961206 100644
--- a/dev-ml/mirage-block-unix/mirage-block-unix-2.14.0.ebuild
+++ b/dev-ml/mirage-block-unix/mirage-block-unix-2.14.0.ebuild
@@ -15,20 +15,20 @@ KEYWORDS="~amd64"
IUSE="ocamlopt test"
RDEPEND="
- dev-ml/cstruct[lwt]
- dev-ml/lwt
- dev-ml/mirage-block
- dev-ml/rresult
- dev-ml/uri
- dev-ml/logs
- dev-ml/io-page
+ dev-ml/cstruct:=[lwt]
+ dev-ml/lwt:=
+ dev-ml/mirage-block:=
+ dev-ml/rresult:=
+ dev-ml/uri:=
+ dev-ml/logs:=
+ dev-ml/io-page:=
"
DEPEND="
${RDEPEND}
test? (
dev-ml/fmt
- >=dev-ml/ounit-2
+ dev-ml/ounit2
dev-ml/diet
)
"
diff --git a/dev-ml/mirage-clock-unix/Manifest b/dev-ml/mirage-clock-unix/Manifest
new file mode 100644
index 0000000000..a7bc1c7de8
--- /dev/null
+++ b/dev-ml/mirage-clock-unix/Manifest
@@ -0,0 +1 @@
+DIST mirage-clock-v3.1.0.tbz 7716 BLAKE2B 0cd18f0969e040456d6335b97f151b8d37bc25cbfa6a24dd4a62a6ee8548b536445966e4a18a398915eb256ba461c5262c69598ac7e7188aee331c2094e4fc4b SHA512 a1dbac3ae5671e02d77ebe5b9d8c53d787c0fcce59ec74a5d5ebd5ed28919d838ef6ab1c00ee18e0c261f7bafcb86de34548f1271129838b77654ee1a82ca4ff
diff --git a/dev-ml/mirage-clock-unix/metadata.xml b/dev-ml/mirage-clock-unix/metadata.xml
new file mode 100644
index 0000000000..5c0849326b
--- /dev/null
+++ b/dev-ml/mirage-clock-unix/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ co-maintainers welcome
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
+ mirage/mirage-clock
+
+
diff --git a/dev-ml/mirage-clock-unix/mirage-clock-unix-3.1.0.ebuild b/dev-ml/mirage-clock-unix/mirage-clock-unix-3.1.0.ebuild
new file mode 100644
index 0000000000..7df285588e
--- /dev/null
+++ b/dev-ml/mirage-clock-unix/mirage-clock-unix-3.1.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+BASE_PN="mirage-clock"
+
+DESCRIPTION="Unix-based implementation for the MirageOS Clock interface"
+HOMEPAGE="https://github.com/mirage/mirage-clock"
+SRC_URI="https://github.com/mirage/mirage-clock/releases/download/v${PV}/${BASE_PN}-v${PV}.tbz"
+S="${WORKDIR}/${BASE_PN}-v${PV}"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="ocamlopt"
+
+DEPEND="dev-ml/mirage-clock:="
+RDEPEND="${DEPEND}"
+BDEPEND="dev-ml/dune-configurator"
diff --git a/dev-ml/mirage-crypto/Manifest b/dev-ml/mirage-crypto/Manifest
index bda186885e..89f9043cb5 100644
--- a/dev-ml/mirage-crypto/Manifest
+++ b/dev-ml/mirage-crypto/Manifest
@@ -1 +1,2 @@
DIST mirage-crypto-v0.10.1.tbz 1200115 BLAKE2B 4a7557adb0e16834a6e298fb52f40b85e67cde44fdc04607dfd46a8a29a1957e1a61bfcec1c35f80477e1319dc2fe850fc65aac3c07ba9b706e6cfdec563a0e6 SHA512 08ba60ae7cc0e0c77b4d71fa05241bfd2e47bfb907cf7e1a4f6bd8bf62854ee82becd2f4e65eade1a01b58d91fb33829f4f69b39e8910df9cfeaa87c933a336d
+DIST mirage-crypto-v0.10.5.tbz 1207228 BLAKE2B bea0dc169c9ae79196ab4f74b624f191a45f051b8cf0c3774d4eb7323f1139d1e7e78b59f46c986bffba4c570c408d9d4f8db19cce4f6d4b233aa00d00f7ec04 SHA512 18b493be1e7909e8429bc5ddd1f0d1175aab9e21a10711e95749b74f1d9f851a5cfd3ee1a5b3b73a47b5fc54d6458a911ec586ab243e63bf276d2777a787ae51
diff --git a/dev-ml/mirage-crypto/mirage-crypto-0.10.1.ebuild b/dev-ml/mirage-crypto/mirage-crypto-0.10.1.ebuild
index 3b71217ebf..29c57a47b0 100644
--- a/dev-ml/mirage-crypto/mirage-crypto-0.10.1.ebuild
+++ b/dev-ml/mirage-crypto/mirage-crypto-0.10.1.ebuild
@@ -18,33 +18,32 @@ KEYWORDS="~amd64"
IUSE="ec ocamlopt pk rng rng-async rng-mirage test"
DEPEND="
- dev-ml/cstruct
- dev-ml/dune-configurator
- dev-ml/eqaf
+ dev-ml/cstruct:=
+ dev-ml/eqaf:=
pk? (
dev-libs/gmp
- dev-ml/mirage
- dev-ml/sexplib0
- dev-ml/zarith
+ dev-ml/mirage:=
+ dev-ml/sexplib0:=
+ dev-ml/zarith:=
)
rng? (
- dev-ml/duration
- dev-ml/logs
+ dev-ml/duration:=
+ dev-ml/logs:=
)
- rng-async? ( dev-ml/async )
+ rng-async? ( dev-ml/async:= )
rng-mirage? (
- dev-ml/lwt
- dev-ml/mirage
- dev-ml/mirage-clock
- dev-ml/mirage-time[unix]
- dev-ml/mirage-unix
+ dev-ml/lwt:=
+ dev-ml/mirage:=
+ dev-ml/mirage-clock:=
+ dev-ml/mirage-time:=[unix]
+ dev-ml/mirage-unix:=
)
"
RDEPEND="
${DEPEND}
test? (
- >=dev-ml/ounit-2
+ dev-ml/ounit2
dev-ml/randomconv
dev-ml/hex
dev-ml/asn1-combinators
@@ -52,9 +51,13 @@ RDEPEND="
dev-ml/ppx_deriving_yojson
dev-ml/yojson
dev-ml/alcotest
+ dev-ml/mirage-clock-unix
)
"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+ dev-ml/dune-configurator
+ virtual/pkgconfig
+"
RESTRICT="!test? ( test )"
REQUIRED_USE="
diff --git a/dev-ml/mirage-crypto/mirage-crypto-0.10.5.ebuild b/dev-ml/mirage-crypto/mirage-crypto-0.10.5.ebuild
new file mode 100644
index 0000000000..debf5985f6
--- /dev/null
+++ b/dev-ml/mirage-crypto/mirage-crypto-0.10.5.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune multiprocessing
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="Simple symmetric cryptography for the modern age"
+HOMEPAGE="
+ https://github.com/mirage/mirage-crypto
+ https://opam.ocaml.org/packages/mirage-crypto/
+"
+SRC_URI="https://github.com/mirage/mirage-crypto/releases/download/v${PV}/${MY_P}.tbz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="ec ocamlopt pk rng rng-async rng-mirage test"
+
+DEPEND="
+ >=dev-lang/ocaml-4.08.0:=[ocamlopt?]
+ >=dev-ml/cstruct-6.0.0:=
+ >=dev-ml/eqaf-0.8:=
+
+ pk? (
+ dev-libs/gmp
+ >=dev-ml/mirage-4.0:=
+ dev-ml/sexplib0:=
+ >=dev-ml/zarith-1.4:=
+ )
+ rng? (
+ dev-ml/duration:=
+ dev-ml/logs:=
+ >=dev-ml/lwt-4.0.0:=
+ >=dev-ml/mtime-1.0.0:=
+ )
+ rng-async? ( >=dev-ml/async-0.14:= )
+ rng-mirage? (
+ >=dev-ml/lwt-4.0.0:=
+ >=dev-ml/mirage-3.8.0:=
+ >=dev-ml/mirage-clock-3.0.0:=
+ )
+"
+RDEPEND="
+ ${DEPEND}
+ test? (
+ dev-ml/ounit2
+ >=dev-ml/randomconv-0.1.3
+ dev-ml/hex
+ >=dev-ml/asn1-combinators-0.2.5
+ dev-ml/ppx_deriving
+ dev-ml/ppx_deriving_yojson
+ >=dev-ml/yojson-1.6.0
+ dev-ml/alcotest
+ >=dev-ml/mirage-clock-unix-3.0.0
+ >=dev-ml/mirage-time-2.0.0[unix]
+ >=dev-ml/mirage-unix-5.0.0
+ )
+"
+BDEPEND="
+ >=dev-ml/dune-configurator-2.0.0
+ virtual/pkgconfig
+"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+ test? ( ec pk rng )
+ ec? ( rng )
+ pk? ( rng )
+ rng-async? ( rng )
+ rng-mirage? ( rng )
+"
+
+src_compile() {
+ local pkgs="mirage-crypto"
+ for u in rng rng-async rng-mirage pk ec ; do
+ if use ${u} ; then
+ pkgs="${pkgs},mirage-crypto-${u}"
+ fi
+ done
+ dune build -p "${pkgs}" -j $(makeopts_jobs) || die
+}
+
+src_install() {
+ dune_src_install mirage-crypto
+ use rng && dune_src_install mirage-crypto-rng
+ use ec && dune_src_install mirage-crypto-ec
+ use pk && dune_src_install mirage-crypto-pk
+ use rng-async && dune_src_install mirage-crypto-rng-async
+ use rng-mirage && dune_src_install mirage-crypto-rng-mirage
+}
diff --git a/dev-ml/mirage-profile/mirage-profile-0.9.1.ebuild b/dev-ml/mirage-profile/mirage-profile-0.9.1.ebuild
index 341d92f632..2d84dc0459 100644
--- a/dev-ml/mirage-profile/mirage-profile-0.9.1.ebuild
+++ b/dev-ml/mirage-profile/mirage-profile-0.9.1.ebuild
@@ -16,11 +16,11 @@ KEYWORDS="~amd64"
IUSE="ocamlopt unix" # xen
RDEPEND="
- dev-ml/cstruct
- dev-ml/lwt
- dev-ml/ocplib-endian
+ dev-ml/cstruct:=
+ dev-ml/lwt:=
+ dev-ml/ocplib-endian:=
- unix? ( dev-ml/mtime )
+ unix? ( dev-ml/mtime:= )
"
# xen? (
# dev-ml/io-page[xen]
@@ -30,9 +30,11 @@ RDEPEND="
# )
DEPEND="
${RDEPEND}
- dev-ml/cstruct[ppx]
+ dev-ml/cstruct:=[ppx]
"
+RESTRICT="test" # https://github.com/mirage/mirage-profile/issues/11
+
src_compile() {
local pkgs="mirage-profile"
# use xen && pkgs="${pkgs},mirage-profile-xen"
diff --git a/dev-ml/mirage-vnetif/mirage-vnetif-0.6.0.ebuild b/dev-ml/mirage-vnetif/mirage-vnetif-0.6.0.ebuild
index 5bf9f7f539..ef340ea549 100644
--- a/dev-ml/mirage-vnetif/mirage-vnetif-0.6.0.ebuild
+++ b/dev-ml/mirage-vnetif/mirage-vnetif-0.6.0.ebuild
@@ -15,22 +15,22 @@ KEYWORDS="~amd64"
IUSE="ocamlopt stack test"
RDEPEND="
- dev-ml/result
- dev-ml/lwt
- dev-ml/mirage-net
- dev-ml/cstruct
- dev-ml/ipaddr
- dev-ml/mirage-profile
- dev-ml/duration
- dev-ml/logs
+ dev-ml/result:=
+ dev-ml/lwt:=
+ dev-ml/mirage-net:=
+ dev-ml/cstruct:=
+ dev-ml/ipaddr:=
+ dev-ml/mirage-profile:=
+ dev-ml/duration:=
+ dev-ml/logs:=
stack? (
- dev-ml/mirage-time
- dev-ml/mirage-clock
- dev-ml/mirage-random
- dev-ml/tcpip
- dev-ml/ethernet
- dev-ml/arp
+ dev-ml/mirage-time:=
+ dev-ml/mirage-clock:=
+ dev-ml/mirage-random:=
+ dev-ml/tcpip:=
+ dev-ml/ethernet:=
+ dev-ml/arp:=
)
"
DEPEND="
@@ -38,6 +38,7 @@ DEPEND="
test? (
dev-ml/alcotest
dev-ml/mirage-random-test
+ dev-ml/mirage-clock-unix
)
"
diff --git a/dev-ml/mustache/files/mustache-3.1.0-ounit2.patch b/dev-ml/mustache/files/mustache-3.1.0-ounit2.patch
new file mode 100644
index 0000000000..3dccb16287
--- /dev/null
+++ b/dev-ml/mustache/files/mustache-3.1.0-ounit2.patch
@@ -0,0 +1,37 @@
+From 002360c97f11981aee736292c372057425ef23c0 Mon Sep 17 00:00:00 2001
+From: Alessandro-Barbieri
+Date: Sat, 16 Apr 2022 20:20:29 +0200
+Subject: [PATCH] use ounit2
+
+Signed-off-by: Alessandro-Barbieri
+---
+ dune-project | 2 +-
+ mustache.opam | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dune-project b/dune-project
+index 5f64694..921db30 100644
+--- a/dune-project
++++ b/dune-project
+@@ -27,7 +27,7 @@ Contains the `mustache` command line utility for driving logic-less templates.
+ ")
+ (depends
+ (jsonm (>= 1.0.1))
+- (ounit :with-test)
++ (ounit2 :with-test)
+ (ezjsonm :with-test)
+ (menhir (>= 20180703))
+ (cmdliner (>= 1.0.4))
+diff --git a/mustache.opam b/mustache.opam
+index d5fedca..51e5a0a 100644
+--- a/mustache.opam
++++ b/mustache.opam
+@@ -18,7 +18,7 @@ bug-reports: "https://github.com/rgrinberg/ocaml-mustache/issues"
+ depends: [
+ "dune" {>= "2.7"}
+ "jsonm" {>= "1.0.1"}
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ "ezjsonm" {with-test}
+ "menhir" {>= "20180703"}
+ "cmdliner" {>= "1.0.4"}
diff --git a/dev-ml/mustache/mustache-3.1.0.ebuild b/dev-ml/mustache/mustache-3.1.0.ebuild
index afd8eea783..592fe964b7 100644
--- a/dev-ml/mustache/mustache-3.1.0.ebuild
+++ b/dev-ml/mustache/mustache-3.1.0.ebuild
@@ -8,7 +8,10 @@ inherit dune
MYPN="ocaml-${PN}"
DESCRIPTION="mustache.js logic-less templates in OCaml"
-HOMEPAGE="https://github.com/rgrinberg/ocaml-mustache"
+HOMEPAGE="
+ https://github.com/rgrinberg/ocaml-mustache
+ https://opam.ocaml.org/packages/mustache/
+"
SRC_URI="https://github.com/rgrinberg/${MYPN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${MYPN}-${PV}"
@@ -18,16 +21,13 @@ KEYWORDS="~amd64"
IUSE="ocamlopt test"
DEPEND="
- dev-ml/jsonm
- dev-ml/menhir
- dev-ml/cmdliner
+ dev-ml/menhir:=
+ dev-ml/ezjsonm:=
"
RDEPEND="
${DEPEND}
- test? (
- dev-ml/ounit
- dev-ml/ezjsonm
- )
+ test? ( dev-ml/ounit2 )
"
RESTRICT="!test? ( test )"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"
diff --git a/dev-ml/ounit/Manifest b/dev-ml/ounit/Manifest
deleted file mode 100644
index 5fc736a568..0000000000
--- a/dev-ml/ounit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ounit-2.2.6.tbz 58186 BLAKE2B 6d6305eebef450968dc0a87c01f0a591faa855cc829fd130783c1b3d1b0546e2a9e167be397314ed69bceb7afea222551940cbb60e502bb04635a7a4273ba8af SHA512 d7cb36a1fe245d02afab606cd1ee755a178ee4cb18fbbfec1df32baa88fa90ef6c9a50d9fd5bde46c7fd9c481f2debe4bafac75c4e3bdfbdb63fc18b0ccce3cc
diff --git a/dev-ml/ounit/metadata.xml b/dev-ml/ounit/metadata.xml
deleted file mode 100644
index 6e56a9a78a..0000000000
--- a/dev-ml/ounit/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- co-maintainers welcome
- lssndrbarbieri@gmail.com
- Alessandro Barbieri
-
-
-
diff --git a/dev-ml/ounit/ounit-2.2.6.ebuild b/dev-ml/ounit/ounit-2.2.6.ebuild
deleted file mode 100644
index 9bbaaf352a..0000000000
--- a/dev-ml/ounit/ounit-2.2.6.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit dune findlib multiprocessing
-
-DESCRIPTION="Unit testing framework for OCaml"
-HOMEPAGE="https://github.com/gildor478/ounit"
-SRC_URI="https://github.com/gildor478/ounit/releases/download/v${PV}/${P}.tbz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="lwt ocamlopt"
-
-RDEPEND="
- dev-ml/base-bytes:=
- dev-ml/base-unix:=
- dev-ml/seq:=
- dev-ml/stdlib-shims:=
-
- lwt? ( dev-ml/lwt:= )
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
- local pkgs="ounit,ounit2"
- use lwt && pkgs="${pkgs},ounit-lwt,ounit2-lwt"
- dune build -p "${pkgs}" -j $(makeopts_jobs) || die
-}
-
-src_install() {
- for p in ounit{,2} ; do
- dune_src_install "${p}"
- done
- if use lwt; then
- for p in ounit{,2}-lwt ; do
- dune_src_install "${p}"
- done
- fi
-}
diff --git a/dev-ml/pbkdf/Manifest b/dev-ml/pbkdf/Manifest
index 32c5f4f373..7e7023f69e 100644
--- a/dev-ml/pbkdf/Manifest
+++ b/dev-ml/pbkdf/Manifest
@@ -1 +1,2 @@
DIST pbkdf-1.1.0.tbz 5237 BLAKE2B 80d7e1984f30c73cfe846b665c01a4b417553430c2d0363bb5c1088fa390ccbf5d2d99106181b2ea2a91db0ecf23cc8bf361b59d58ce34c2578fe6a841b01ddf SHA512 7c31f5470b9028a5f0b3baf670494f26c632af0449e59911efbe126d71e69fe8ebd73522f4fc96761cd71b67125579a5bbd75762f8753f9fb8c746f98bbb0aa5
+DIST pbkdf-1.2.0.tar.gz 5602 BLAKE2B ccce1c7559da39423a53b00a9ec0cd99d48e0b337eac434a047ded29b8a5f1fe0949a6bf9142e93a544d8b7743fe84788f827c9ccc439bb38dba3cb6af12cc0f SHA512 d6f7d5efd761b87dd420ddcf97c2f9d4402dcc81d65cd1f4d81039b70c4d8c1e803bbaf4251482de8de7076da9f40b48c7eb1684e31e7a316deb5036c192bd3c
diff --git a/dev-ml/pbkdf/pbkdf-1.2.0.ebuild b/dev-ml/pbkdf/pbkdf-1.2.0.ebuild
new file mode 100644
index 0000000000..08fbd39be0
--- /dev/null
+++ b/dev-ml/pbkdf/pbkdf-1.2.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+MYPN="ocaml-${PN}"
+
+DESCRIPTION="Password based key derivation functions (PBKDF) from PKCS#5"
+HOMEPAGE="
+ https://github.com/abeaumont/ocaml-pbkdf
+ https://opam.ocaml.org/packages/pbkdf/
+"
+SRC_URI="https://github.com/abeaumont/${MYPN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MYPN}-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="ocamlopt test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.07.0:=[ocamlopt?]
+ >=dev-ml/cstruct-6.0.0:=
+ dev-ml/mirage-crypto
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( >=dev-ml/alcotest-0.8.1 )
+"
+
+RESTRICT="!test? ( test )"
diff --git a/dev-ml/pcap-format/files/pcap-format-0.5.2-ounit2.patch b/dev-ml/pcap-format/files/pcap-format-0.5.2-ounit2.patch
new file mode 100644
index 0000000000..1f04a86900
--- /dev/null
+++ b/dev-ml/pcap-format/files/pcap-format-0.5.2-ounit2.patch
@@ -0,0 +1,34 @@
+From 463fad03eeb27c7d8613931f4173429ce0e5d3d1 Mon Sep 17 00:00:00 2001
+From: Alessandro-Barbieri
+Date: Sat, 16 Apr 2022 20:16:39 +0200
+Subject: [PATCH] use ounit2
+
+Signed-off-by: Alessandro-Barbieri
+---
+ lib_test/dune | 2 +-
+ pcap-format.opam | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib_test/dune b/lib_test/dune
+index 9eedff0..0a72894 100644
+--- a/lib_test/dune
++++ b/lib_test/dune
+@@ -1,4 +1,4 @@
+ (test
+ (name test)
+ (deps dhcp.pcap)
+- (libraries pcap-format oUnit))
++ (libraries pcap-format ounit2))
+diff --git a/pcap-format.opam b/pcap-format.opam
+index 36a471f..87156b8 100644
+--- a/pcap-format.opam
++++ b/pcap-format.opam
+@@ -11,7 +11,7 @@ depends: [
+ "dune" {>= "1.0"}
+ "cstruct" {>= "1.9.0"}
+ "ppx_cstruct" {> "0"}
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ ]
+ build: [
+ ["dune" "subst"] {dev}
diff --git a/dev-ml/pcap-format/pcap-format-0.5.2-r2.ebuild b/dev-ml/pcap-format/pcap-format-0.5.2-r2.ebuild
index 4be1c548db..29435bdcd6 100644
--- a/dev-ml/pcap-format/pcap-format-0.5.2-r2.ebuild
+++ b/dev-ml/pcap-format/pcap-format-0.5.2-r2.ebuild
@@ -6,7 +6,10 @@ EAPI=8
inherit dune
DESCRIPTION="Read and write pcap-formatted network packet traces"
-HOMEPAGE="https://github.com/mirage/ocaml-pcap"
+HOMEPAGE="
+ https://github.com/mirage/ocaml-pcap
+ https://opam.ocaml.org/packages/pcap-format/
+"
SRC_URI="https://github.com/mirage/ocaml-pcap/archive/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/ocaml-pcap-${PV}"
@@ -15,13 +18,14 @@ SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="ocamlopt test"
-RDEPEND="dev-ml/cstruct[ppx]"
+RDEPEND="dev-ml/cstruct:=[ppx]"
DEPEND="
${RDEPEND}
test? (
- dev-ml/ounit
+ dev-ml/ounit2
dev-ml/mmap
)
"
RESTRICT="!test? ( test )"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"
diff --git a/dev-ml/pci/files/pci-1.0.1-ounit2.patch b/dev-ml/pci/files/pci-1.0.1-ounit2.patch
new file mode 100644
index 0000000000..e570551974
--- /dev/null
+++ b/dev-ml/pci/files/pci-1.0.1-ounit2.patch
@@ -0,0 +1,84 @@
+From 9015f66fae0eddaac7080fd0ef164015c7d73865 Mon Sep 17 00:00:00 2001
+From: Alessandro-Barbieri
+Date: Sat, 16 Apr 2022 20:10:49 +0200
+Subject: [PATCH] use ounit2
+
+Signed-off-by: Alessandro-Barbieri
+---
+ .merlin | 2 +-
+ _oasis | 2 +-
+ _tags | 4 ++--
+ opam | 2 +-
+ setup.ml | 2 +-
+ 5 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/.merlin b/.merlin
+index f18d84c..e5b208a 100644
+--- a/.merlin
++++ b/.merlin
+@@ -1,7 +1,7 @@
+ PRJ pci
+ PKG ctypes
+ PKG ctypes.stubs
+-PKG oUnit
++PKG ounit2
+
+ S lib
+ S lib_test
+diff --git a/_oasis b/_oasis
+index 53db238..0443598 100644
+--- a/_oasis
++++ b/_oasis
+@@ -58,7 +58,7 @@ Executable test_pci
+ CompiledObject: best
+ ByteOpt: -warn-error +1..45
+ NativeOpt: -warn-error +1..45
+- BuildDepends: pci, oUnit
++ BuildDepends: pci, ounit2
+
+ Test test_pci
+ Command: $test_pci -runner sequential
+diff --git a/_tags b/_tags
+index 81eaa26..b8e20fc 100644
+--- a/_tags
++++ b/_tags
+@@ -63,11 +63,11 @@ true: annot, bin_annot
+ : oasis_executable_test_pci_native
+ : oasis_executable_test_pci_native
+ : pkg_ctypes.stubs
+-: pkg_oUnit
++: pkg_ounit2
+ : use_pci
+ : use_pci_bindings
+ : pkg_ctypes.stubs
+-: pkg_oUnit
++: pkg_ounit2
+ : use_pci
+ : use_pci_bindings
+ # Executable lspci
+diff --git a/opam b/opam
+index bc03b69..6e5e197 100644
+--- a/opam
++++ b/opam
+@@ -21,7 +21,7 @@ remove: [
+ depends: [
+ "ctypes" {>= "0.4"}
+ "ocamlfind" {build}
+- "ounit" {test}
++ "ounit2" {test}
+ ]
+ available: [ocaml-version >= "4.01.0" & os = "linux"]
+ depexts: [
+diff --git a/setup.ml b/setup.ml
+index c3907bf..b1f3074 100644
+--- a/setup.ml
++++ b/setup.ml
+@@ -7681,7 +7681,7 @@ let setup_t =
+ bs_build_depends =
+ [
+ InternalLibrary "pci";
+- FindlibPackage ("oUnit", None)
++ FindlibPackage ("ounit2", None)
+ ];
+ bs_build_tools = [ExternalTool "ocamlbuild"];
+ bs_interface_patterns =
diff --git a/dev-ml/pci/pci-1.0.1.ebuild b/dev-ml/pci/pci-1.0.1.ebuild
index 070a12855c..634e6cd747 100644
--- a/dev-ml/pci/pci-1.0.1.ebuild
+++ b/dev-ml/pci/pci-1.0.1.ebuild
@@ -8,7 +8,10 @@ inherit findlib opam
MY_P="ocaml-${P}"
DESCRIPTION="OCaml bindings to libpci using Ctypes"
-HOMEPAGE="https://github.com/simonjbeaumont/ocaml-pci"
+HOMEPAGE="
+ https://github.com/simonjbeaumont/ocaml-pci
+ https://opam.ocaml.org/packages/pci/
+"
SRC_URI="https://github.com/simonjbeaumont/ocaml-pci/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${MY_P}"
@@ -19,19 +22,20 @@ IUSE="test"
RDEPEND="
sys-apps/pciutils
- dev-ml/ocaml-ctypes
+ dev-ml/ocaml-ctypes:=
"
DEPEND="
${RDEPEND}
- dev-ml/ounit
+ test? ( dev-ml/ounit2 )
"
RESTRICT="!test? ( test )"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"
OPAM_FILE=opam
src_configure() {
myconf=(
- $(usex test '--enable-test' '')
+ $(usex test '--enable-tests' '')
--prefix "/usr"
--destdir "${D}"
--libdir "/usr/$(get_libdir)"
diff --git a/dev-ml/qmp/files/qmp-0.17.0-ounit2.patch b/dev-ml/qmp/files/qmp-0.17.0-ounit2.patch
new file mode 100644
index 0000000000..b5d86aac30
--- /dev/null
+++ b/dev-ml/qmp/files/qmp-0.17.0-ounit2.patch
@@ -0,0 +1,66 @@
+From a3ebbbd2760e4ba3774529a6975ac868baff091c Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri
+Date: Sat, 16 Apr 2022 15:03:29 +0200
+Subject: [PATCH 1/3] use ounit2
+
+---
+ lib_test/dune | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib_test/dune b/lib_test/dune
+index acc68b9..a587594 100644
+--- a/lib_test/dune
++++ b/lib_test/dune
+@@ -6,5 +6,5 @@
+
+ (executable
+ (name messages)
+- (libraries libqmp oUnit)
++ (libraries libqmp ounit2)
+ )
+
+From d09f6df5f07eed691d77136cca4ea36a98e630c3 Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri
+Date: Sat, 16 Apr 2022 15:05:34 +0200
+Subject: [PATCH 2/3] install ounit2
+
+---
+ README.md | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/README.md b/README.md
+index cc6df4b..0595368 100644
+--- a/README.md
++++ b/README.md
+@@ -8,7 +8,7 @@ OCaml implementation of the Qemu Monitor Protocol (QMP)
+ Install the dependencies using OPAM:
+
+ ```sh
+-opam install yojson cmdliner dune ounit
++opam install yojson cmdliner dune ounit2
+ ```
+
+ Build the library, tests, and CLI:
+
+From dcd85772065d646d0272160be14ebf9e28bb6bde Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri
+Date: Sat, 16 Apr 2022 15:06:05 +0200
+Subject: [PATCH 3/3] depend on ounit2
+
+---
+ qmp.opam | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qmp.opam b/qmp.opam
+index 242b3c8..e36fb3f 100644
+--- a/qmp.opam
++++ b/qmp.opam
+@@ -18,7 +18,7 @@ depends: [
+ "dune" {build}
+ "yojson"
+ "cmdliner"
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ ]
+ dev-repo: "git://github.com/xapi-project/ocaml-qmp"
+ synopsis: "OCaml implementation of a Qemu Message Protocol (QMP) client"
diff --git a/dev-ml/qmp/qmp-0.17.0.ebuild b/dev-ml/qmp/qmp-0.17.0.ebuild
index 4e3f4699cf..b6b2f2a57f 100644
--- a/dev-ml/qmp/qmp-0.17.0.ebuild
+++ b/dev-ml/qmp/qmp-0.17.0.ebuild
@@ -8,7 +8,10 @@ inherit dune
MYPN="ocaml-${PN}"
DESCRIPTION="A Qemu Message Protocol (QMP) client in OCaml"
-HOMEPAGE="https://github.com/xapi-project/ocaml-qmp"
+HOMEPAGE="
+ https://github.com/xapi-project/ocaml-qmp
+ https://opam.ocaml.org/packages/qmp/
+"
SRC_URI="https://github.com/xapi-project/${MYPN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${MYPN}-${PV}"
@@ -18,13 +21,14 @@ KEYWORDS="~amd64"
IUSE="ocamlopt test"
DEPEND="
- dev-ml/base-unix
- dev-ml/yojson
- dev-ml/cmdliner
+ dev-ml/base-unix:=
+ dev-ml/yojson:=
+ dev-ml/cmdliner:=
"
RDEPEND="
${DEPEND}
- test? ( dev-ml/ounit )
+ test? ( dev-ml/ounit2 )
"
RESTRICT="!test? ( test )"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"
diff --git a/dev-ml/shared-block-ring/shared-block-ring-3.0.0.ebuild b/dev-ml/shared-block-ring/shared-block-ring-3.0.0.ebuild
index ad7e707b04..5bf002603f 100644
--- a/dev-ml/shared-block-ring/shared-block-ring-3.0.0.ebuild
+++ b/dev-ml/shared-block-ring/shared-block-ring-3.0.0.ebuild
@@ -34,7 +34,10 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- test? ( >=dev-ml/ounit-2 )
+ test? (
+ dev-ml/ounit2
+ dev-ml/mirage-clock-unix
+ )
"
RESTRICT="!test? ( test )"
diff --git a/dev-ml/stringext/files/stringext-1.6.0-ounit2.patch b/dev-ml/stringext/files/stringext-1.6.0-ounit2.patch
new file mode 100644
index 0000000000..7d490edb28
--- /dev/null
+++ b/dev-ml/stringext/files/stringext-1.6.0-ounit2.patch
@@ -0,0 +1,44 @@
+From 77a838f9b550d14009257b852761d601b1d5af8b Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri
+Date: Sat, 16 Apr 2022 16:00:25 +0200
+Subject: [PATCH 1/2] use ounit2
+
+---
+ lib_test/dune | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib_test/dune b/lib_test/dune
+index fff54f2..79ec525 100644
+--- a/lib_test/dune
++++ b/lib_test/dune
+@@ -1,6 +1,6 @@
+ (executables
+ (names test_stringext test_stringext_qcheck)
+- (libraries stringext oUnit qcheck))
++ (libraries stringext ounit2 qcheck))
+
+ (alias
+ (name runtest)
+
+From a2dce7cdf26df0ab29b7da3bf1d459a70a46b81d Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri
+Date: Sat, 16 Apr 2022 16:00:53 +0200
+Subject: [PATCH 2/2] depend on ounit2
+
+---
+ stringext.opam | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/stringext.opam b/stringext.opam
+index febd494..5ad782a 100644
+--- a/stringext.opam
++++ b/stringext.opam
+@@ -7,7 +7,7 @@ bug-reports: "https://github.com/rgrinberg/stringext/issues"
+ depends: [
+ "ocaml" {>= "4.02.3"}
+ "dune" {build & >= "1.0"}
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ "qtest" {with-test & >= "2.2"}
+ "base-bytes"
+ ]
diff --git a/dev-ml/stringext/stringext-1.6.0-r2.ebuild b/dev-ml/stringext/stringext-1.6.0-r2.ebuild
index 95464acb20..8565766b5c 100644
--- a/dev-ml/stringext/stringext-1.6.0-r2.ebuild
+++ b/dev-ml/stringext/stringext-1.6.0-r2.ebuild
@@ -6,7 +6,10 @@ EAPI=8
inherit dune
DESCRIPTION="Extra string functions for OCaml"
-HOMEPAGE="https://github.com/rgrinberg/stringext"
+HOMEPAGE="
+ https://github.com/rgrinberg/stringext
+ https://opam.ocaml.org/packages/stringext/
+"
SRC_URI="https://github.com/rgrinberg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
@@ -18,9 +21,10 @@ RDEPEND=""
DEPEND="
${RDEPEND}
test? (
- dev-ml/ounit
+ dev-ml/ounit2
dev-ml/qtest
)
"
RESTRICT="!test? ( test )"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"
diff --git a/dev-ml/tar/tar-2.0.1.ebuild b/dev-ml/tar/tar-2.0.1.ebuild
index 8ddc49ac34..c993136e2b 100644
--- a/dev-ml/tar/tar-2.0.1.ebuild
+++ b/dev-ml/tar/tar-2.0.1.ebuild
@@ -18,23 +18,23 @@ KEYWORDS="~amd64"
IUSE="mirage ocamlopt test unix"
RDEPEND="
- dev-ml/camlp-streams
- dev-ml/cstruct
- dev-ml/re
- dev-ml/lwt
+ dev-ml/camlp-streams:=
+ dev-ml/cstruct:=
+ dev-ml/re:=
+ dev-ml/lwt:=
mirage? (
- dev-ml/io-page
- dev-ml/mirage-block
- dev-ml/mirage-kv
- dev-ml/ptime
+ dev-ml/io-page:=
+ dev-ml/mirage-block:=
+ dev-ml/mirage-kv:=
+ dev-ml/ptime:=
)
"
DEPEND="
${RDEPEND}
test? (
dev-ml/mirage-block-unix
- >=dev-ml/ounit-2[lwt]
+ dev-ml/ounit2
)
"
diff --git a/dev-ml/tcpip/tcpip-7.1.0.ebuild b/dev-ml/tcpip/tcpip-7.1.0.ebuild
index 5d3645a7e9..9cbf52d3ab 100644
--- a/dev-ml/tcpip/tcpip-7.1.0.ebuild
+++ b/dev-ml/tcpip/tcpip-7.1.0.ebuild
@@ -17,24 +17,24 @@ KEYWORDS="~amd64"
IUSE="ocamlopt test"
RDEPEND="
- dev-ml/cstruct[lwt,ppx]
- dev-ml/mirage-net
- dev-ml/mirage-clock
- dev-ml/mirage-random
- dev-ml/mirage-time
- dev-ml/ipaddr[macaddr-cstruct]
- dev-ml/mirage-profile
- dev-ml/fmt
- dev-ml/lwt
- dev-ml/lwt-dllist
- dev-ml/logs
- dev-ml/duration
- dev-ml/randomconv
- dev-ml/ethernet
- dev-ml/arp
- dev-ml/mirage-flow
- dev-ml/lru
- dev-ml/metrics
+ dev-ml/cstruct:=[lwt,ppx]
+ dev-ml/mirage-net:=
+ dev-ml/mirage-clock:=
+ dev-ml/mirage-random:=
+ dev-ml/mirage-time:=
+ dev-ml/ipaddr:=[macaddr-cstruct]
+ dev-ml/mirage-profile:=
+ dev-ml/fmt:=
+ dev-ml/lwt:=
+ dev-ml/lwt-dllist:=
+ dev-ml/logs:=
+ dev-ml/duration:=
+ dev-ml/randomconv:=
+ dev-ml/ethernet:=
+ dev-ml/arp:=
+ dev-ml/mirage-flow:=
+ dev-ml/lru:=
+ dev-ml/metrics:=
"
DEPEND="
${RDEPEND}
@@ -43,6 +43,7 @@ DEPEND="
dev-ml/alcotest
dev-ml/pcap-format
dev-ml/mirage-clock
+ dev-ml/mirage-clock-unix
dev-ml/mirage-random-test
dev-ml/ipaddr[cstruct]
)
diff --git a/dev-ml/tls/tls-0.13.1.ebuild b/dev-ml/tls/tls-0.13.1.ebuild
index 8be88f06b0..4af736e464 100644
--- a/dev-ml/tls/tls-0.13.1.ebuild
+++ b/dev-ml/tls/tls-0.13.1.ebuild
@@ -18,32 +18,32 @@ KEYWORDS="~amd64"
IUSE="async mirage ocamlopt test"
RDEPEND="
- dev-ml/ppx_sexp_conv
- dev-ml/cstruct[ppx,sexp]
- dev-ml/sexplib
- dev-ml/mirage-crypto[ec,pk,rng]
- dev-ml/x509
- dev-ml/domain-name
- dev-ml/fmt
- dev-ml/lwt
- dev-ml/ptime
- dev-ml/hkdf
- dev-ml/logs
- dev-ml/ipaddr[sexp]
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/cstruct:=[ppx,sexp]
+ dev-ml/sexplib:=
+ dev-ml/mirage-crypto:=[ec,pk,rng]
+ dev-ml/x509:=
+ dev-ml/domain-name:=
+ dev-ml/fmt:=
+ dev-ml/lwt:=
+ dev-ml/ptime:=
+ dev-ml/hkdf:=
+ dev-ml/logs:=
+ dev-ml/ipaddr:=[sexp]
async? (
- dev-ml/async
- dev-ml/async_unix
- dev-ml/core
- dev-ml/cstruct[async]
- dev-ml/ppx_jane
- dev-ml/mirage-crypto[rng-async]
+ dev-ml/async:=
+ dev-ml/async_unix:=
+ dev-ml/core:=
+ dev-ml/cstruct:=[async]
+ dev-ml/ppx_jane:=
+ dev-ml/mirage-crypto:=[rng-async]
)
mirage? (
- dev-ml/mirage-flow
- dev-ml/mirage-kv
- dev-ml/mirage-clock
- dev-ml/mirage-crypto[pk]
+ dev-ml/mirage-flow:=
+ dev-ml/mirage-kv:=
+ dev-ml/mirage-clock:=
+ dev-ml/mirage-crypto:=[pk]
)
"
DEPEND="
@@ -52,7 +52,7 @@ DEPEND="
dev-ml/cstruct[unix]
dev-ml/alcotest
dev-ml/randomconv
- >=dev-ml/ounit-2
+ dev-ml/ounit2
)
"
diff --git a/dev-ml/uri/files/uri-4.2.0-ounit2.patch b/dev-ml/uri/files/uri-4.2.0-ounit2.patch
new file mode 100644
index 0000000000..6703ce1d3c
--- /dev/null
+++ b/dev-ml/uri/files/uri-4.2.0-ounit2.patch
@@ -0,0 +1,95 @@
+From 73e4b497b3afa6530fabb1d445d0d4285fa302b5 Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri
+Date: Sat, 16 Apr 2022 15:16:33 +0200
+Subject: [PATCH 1/4] use ounit2
+
+---
+ lib_test/dune | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib_test/dune b/lib_test/dune
+index ba44355..f61938d 100644
+--- a/lib_test/dune
++++ b/lib_test/dune
+@@ -2,10 +2,10 @@
+ (name test_runner)
+ (package uri)
+ (modules test_runner)
+- (libraries uri uri.services oUnit))
++ (libraries uri uri.services ounit2))
+
+ (test
+ (name test_runner_sexp)
+ (package uri-sexp)
+ (modules test_runner_sexp)
+- (libraries uri uri.services uri-sexp oUnit))
++ (libraries uri uri.services uri-sexp ounit2))
+
+From e40a51aec751ff397c94cbde8faa7fc01141a281 Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri
+Date: Sat, 16 Apr 2022 15:17:15 +0200
+Subject: [PATCH 2/4] depend on ounit2
+
+---
+ uri-sexp.opam | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/uri-sexp.opam b/uri-sexp.opam
+index d4b2e44..fb249a5 100644
+--- a/uri-sexp.opam
++++ b/uri-sexp.opam
+@@ -16,7 +16,7 @@ depends: [
+ "dune" {>= "1.2.0"}
+ "ppx_sexp_conv" {>= "v0.13.0"}
+ "sexplib0"
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ ]
+ build: [
+ ["dune" "subst"] {pinned}
+
+From 2615ace2358efc166f49b6dbc7167232086cadde Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri
+Date: Sat, 16 Apr 2022 15:17:48 +0200
+Subject: [PATCH 3/4] depend on ounit2
+
+---
+ uri-re.opam | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/uri-re.opam b/uri-re.opam
+index 3d525a0..3d34e3e 100644
+--- a/uri-re.opam
++++ b/uri-re.opam
+@@ -15,7 +15,7 @@ for parsing URI or URLs.
+ depends: [
+ "ocaml" {>= "4.04.0"}
+ "dune" {>= "1.2.0"}
+- "ounit" {with-test & >= "1.0.2"}
++ "ounit2" {with-test & >= "1.0.2"}
+ "ppx_sexp_conv" {with-test & >= "v0.9.0"}
+ "re" {>= "1.9.0"}
+ "stringext" {>= "1.4.0"}
+
+From a3b57ec4b8582b73b49bd95c163b44b885fe582f Mon Sep 17 00:00:00 2001
+From: Alessandro Barbieri
+Date: Sat, 16 Apr 2022 15:18:10 +0200
+Subject: [PATCH 4/4] depend on ounit2
+
+---
+ uri.opam | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/uri.opam b/uri.opam
+index ab1cbf6..78d08b0 100644
+--- a/uri.opam
++++ b/uri.opam
+@@ -15,7 +15,7 @@ for parsing URI or URLs.
+ depends: [
+ "ocaml" {>= "4.04.0"}
+ "dune" {>= "1.2.0"}
+- "ounit" {with-test & >= "1.0.2"}
++ "ounit2" {with-test & >= "1.0.2"}
+ "ppx_sexp_conv" {with-test & >= "v0.9.0"}
+ "stringext" {>= "1.4.0"}
+ "angstrom" {>= "0.14.0"}
diff --git a/dev-ml/uri/uri-4.2.0.ebuild b/dev-ml/uri/uri-4.2.0.ebuild
index afff9437d7..4f5d62e814 100644
--- a/dev-ml/uri/uri-4.2.0.ebuild
+++ b/dev-ml/uri/uri-4.2.0.ebuild
@@ -6,7 +6,10 @@ EAPI=8
inherit dune multiprocessing
DESCRIPTION="RFC3986 URI parsing library for OCaml"
-HOMEPAGE="https://github.com/mirage/ocaml-uri"
+HOMEPAGE="
+ https://github.com/mirage/ocaml-uri
+ https://opam.ocaml.org/packages/uri/
+"
SRC_URI="https://github.com/mirage/ocaml-uri/archive/v${PV}.tar.gz -> ocaml-${P}.tar.gz"
S="${WORKDIR}/ocaml-${P}"
@@ -16,26 +19,25 @@ KEYWORDS="~amd64"
IUSE="ocamlopt re sexp test"
RDEPEND="
- dev-ml/angstrom
- dev-ml/stringext
+ >=dev-ml/angstrom-0.14.0:=
+ >=dev-ml/stringext-1.4.0:=
- re? (
- dev-ml/re
- )
+ re? ( >=dev-ml/re-1.9.0:= )
sexp? (
- dev-ml/ppx_sexp_conv
- dev-ml/sexplib0
+ >=dev-ml/ppx_sexp_conv-0.13.0:=
+ dev-ml/sexplib0:=
)
"
DEPEND="
${RDEPEND}
test? (
- dev-ml/ounit
- dev-ml/ppx_sexp_conv
+ dev-ml/ounit2
+ >=dev-ml/ppx_sexp_conv-0.9.0
)
"
RESTRICT="!test? ( test )"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"
src_compile() {
local pkgs="uri"
diff --git a/dev-ml/vchan/files/vchan-6.0.1-ounit2.patch b/dev-ml/vchan/files/vchan-6.0.1-ounit2.patch
new file mode 100644
index 0000000000..86a8bdc38b
--- /dev/null
+++ b/dev-ml/vchan/files/vchan-6.0.1-ounit2.patch
@@ -0,0 +1,78 @@
+From 56fe85c077bb3dfe936dcf9eaa96229a223d2028 Mon Sep 17 00:00:00 2001
+From: Alessandro-Barbieri
+Date: Sat, 16 Apr 2022 20:00:53 +0200
+Subject: [PATCH] use ounit2
+
+Signed-off-by: Alessandro-Barbieri
+---
+ .coverage.sh | 2 +-
+ lib_test/dune | 2 +-
+ vchan-unix.opam | 2 +-
+ vchan-xen.opam | 2 +-
+ vchan.opam | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/.coverage.sh b/.coverage.sh
+index bd8dcc8..c263bb7 100644
+--- a/.coverage.sh
++++ b/.coverage.sh
+@@ -11,7 +11,7 @@ if [ -z "$KEEP" ]; then trap "popd; rm -rf $COVERAGE_DIR" EXIT; fi
+ $(which cp) -r ../* .
+
+ eval `opam config env`
+-opam install -y bisect_ppx oasis ocveralls ounit
++opam install -y bisect_ppx oasis ocveralls ounit2
+
+ sed -i 's/BuildDepends:/BuildDepends: bisect_ppx,/g' _oasis
+ oasis setup
+diff --git a/lib_test/dune b/lib_test/dune
+index ce2e21b..c8fa076 100644
+--- a/lib_test/dune
++++ b/lib_test/dune
+@@ -1,6 +1,6 @@
+ (executables
+ (names test)
+- (libraries cmdliner lwt lwt.unix vchan oUnit))
++ (libraries cmdliner lwt lwt.unix vchan ounit2))
+
+ (alias
+ (name runtest)
+diff --git a/vchan-unix.opam b/vchan-unix.opam
+index c2d3194..0c948ec 100644
+--- a/vchan-unix.opam
++++ b/vchan-unix.opam
+@@ -26,7 +26,7 @@ depends: [
+ "xen-gnt"
+ "fmt" {>= "0.8.7"}
+ "cmdliner" {with-test}
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ ]
+ build: [
+ ["dune" "subst"] {dev}
+diff --git a/vchan-xen.opam b/vchan-xen.opam
+index 4bd58f5..a461dd4 100644
+--- a/vchan-xen.opam
++++ b/vchan-xen.opam
+@@ -21,7 +21,7 @@ depends: [
+ "mirage-xen" {>= "7.0.0"}
+ "xenstore_transport" {>= "1.0.0"}
+ "sexplib"
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ "cmdliner" {with-test}
+ ]
+ build: [
+diff --git a/vchan.opam b/vchan.opam
+index b7ce1a2..bb42aa9 100644
+--- a/vchan.opam
++++ b/vchan.opam
+@@ -25,7 +25,7 @@ depends: [
+ "xenstore_transport" {>= "1.0.0"}
+ "sexplib"
+ "cmdliner" {with-test}
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ ]
+ build: [
+ ["dune" "subst"] {dev}
diff --git a/dev-ml/vchan/vchan-6.0.1.ebuild b/dev-ml/vchan/vchan-6.0.1.ebuild
index d21da75dc7..3c72529bc7 100644
--- a/dev-ml/vchan/vchan-6.0.1.ebuild
+++ b/dev-ml/vchan/vchan-6.0.1.ebuild
@@ -8,7 +8,10 @@ inherit dune multiprocessing
MY_PN="ocaml-${PN}"
DESCRIPTION="Pure OCaml implementation of the vchan shared-memory communication protocol"
-HOMEPAGE="https://github.com/mirage/ocaml-vchan"
+HOMEPAGE="
+ https://github.com/mirage/ocaml-vchan
+ https://opam.ocaml.org/packages/vchan/
+"
SRC_URI="https://github.com/mirage/${MY_PN}/releases/download/v${PV}/${P}.tbz"
LICENSE="ISC"
@@ -17,32 +20,33 @@ KEYWORDS="~amd64"
IUSE="ocamlopt test unix xen"
RDEPEND="
- dev-ml/lwt
- dev-ml/ppx_sexp_conv
- dev-ml/io-page
- dev-ml/mirage-flow
- dev-ml/xenstore
- dev-ml/xenstore-clients
- dev-ml/sexplib
- dev-ml/cstruct[ppx]
+ dev-ml/lwt:=
+ dev-ml/ppx_sexp_conv:=
+ dev-ml/io-page:=
+ dev-ml/mirage-flow:=
+ dev-ml/xenstore:=
+ dev-ml/xenstore-clients:=
+ dev-ml/sexplib:=
+ dev-ml/cstruct:=[ppx]
unix? (
- dev-ml/xen-evtchn[unix]
- dev-ml/xen-gnt[unix]
- dev-ml/fmt
+ dev-ml/xen-evtchn:=[unix]
+ dev-ml/xen-gnt:=[unix]
+ dev-ml/fmt:=
)
- xen? ( dev-ml/mirage-xen )
+ xen? ( dev-ml/mirage-xen:= )
"
DEPEND="
${RDEPEND}
test? (
dev-ml/cmdliner
- dev-ml/ounit
+ dev-ml/ounit2
)
"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( unix xen )"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"
src_compile() {
local pkgs="vchan"
diff --git a/dev-ml/vhd/files/vhd-0.12.2-ounit2.patch b/dev-ml/vhd/files/vhd-0.12.2-ounit2.patch
new file mode 100644
index 0000000000..d85225cf8f
--- /dev/null
+++ b/dev-ml/vhd/files/vhd-0.12.2-ounit2.patch
@@ -0,0 +1,36 @@
+From 8a0acca0482680b120f6a4f5434dde7d9d240c16 Mon Sep 17 00:00:00 2001
+From: Alessandro-Barbieri
+Date: Sat, 16 Apr 2022 20:05:20 +0200
+Subject: [PATCH] use ounit2
+
+Signed-off-by: Alessandro-Barbieri
+---
+ vhd-format-lwt.opam | 2 +-
+ vhd_format_lwt_test/dune | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/vhd-format-lwt.opam b/vhd-format-lwt.opam
+index 1e57f03..e92913f 100644
+--- a/vhd-format-lwt.opam
++++ b/vhd-format-lwt.opam
+@@ -11,7 +11,7 @@ depends: [
+ "cstruct"
+ "lwt" {>= "3.2.0"}
+ "mirage-block" {>= "2.0.1"}
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ "vhd-format"
+ "io-page-unix" {with-test}
+ "dune" {>= "1.0"}
+diff --git a/vhd_format_lwt_test/dune b/vhd_format_lwt_test/dune
+index f1ef8ec..43309d7 100644
+--- a/vhd_format_lwt_test/dune
++++ b/vhd_format_lwt_test/dune
+@@ -1,6 +1,6 @@
+ (executable
+ (name parse_test)
+- (libraries cstruct disk io-page.unix lwt lwt.unix oUnit vhd-format
++ (libraries cstruct disk io-page.unix lwt lwt.unix ounit2 vhd-format
+ vhd_format_lwt))
+
+ (alias
diff --git a/dev-ml/vhd/vhd-0.12.2.ebuild b/dev-ml/vhd/vhd-0.12.2.ebuild
index 07ba2d35fb..aa05722ef5 100644
--- a/dev-ml/vhd/vhd-0.12.2.ebuild
+++ b/dev-ml/vhd/vhd-0.12.2.ebuild
@@ -8,7 +8,10 @@ inherit dune multiprocessing
MYPN="ocaml-${PN}"
DESCRIPTION="Read and write .vhd-format format data"
-HOMEPAGE="https://github.com/mirage/ocaml-vhd-format"
+HOMEPAGE="
+ https://github.com/mirage/ocaml-vhd
+ https://opam.ocaml.org/packages/vhd-format/
+"
SRC_URI="https://github.com/mirage/${MYPN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${MYPN}-${PV}"
@@ -18,27 +21,28 @@ KEYWORDS="~amd64"
IUSE="lwt ocamlopt test"
RDEPEND="
- dev-ml/cstruct
- dev-ml/io-page
- dev-ml/rresult
- dev-ml/uuidm
- dev-ml/stdlib-shims
+ dev-ml/cstruct:=
+ dev-ml/io-page:=
+ dev-ml/rresult:=
+ dev-ml/uuidm:=
+ dev-ml/stdlib-shims:=
lwt? (
- dev-ml/mirage-block
- dev-ml/lwt
+ dev-ml/mirage-block:=
+ dev-ml/lwt:=
)
"
DEPEND="
${RDEPEND}
test? (
- dev-ml/ounit
+ dev-ml/ounit2
dev-ml/io-page[unix(-)]
)
"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( lwt )"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"
src_compile() {
local pkgs="vhd-format"
diff --git a/dev-ml/x509/Manifest b/dev-ml/x509/Manifest
index 9de5accc46..9ce215b4b3 100644
--- a/dev-ml/x509/Manifest
+++ b/dev-ml/x509/Manifest
@@ -1 +1,2 @@
+DIST x509-0.16.0.tbz 156180 BLAKE2B e8777e44a61d075bfc49f7db41dcf4cbc742b40470ec3b8b00424834fd8e1bc73e803057f859b06d877dd6ef0b9ad2ca2cb7275dd39c15c4d3ec9c5429cfe6c9 SHA512 c9b4cf55d16d8b1e6b6faa18fc9ac08065fa09937f07a3447d4b637539b37bea6374c98d184eba159a8ba8eba860303a78563097e47ef30529fedaaf722115c6
DIST x509-v0.13.0.tbz 143302 BLAKE2B d4079a5cce87617ea611ed5624697577b97cf69a1df830fe2b4775ffa47ab557a72cb01bf24b6b56478f6fb22afb87e971ab260ae6acd7e75ef6ad0ff4052c24 SHA512 ab6d4df7e6b6796b962d4ec3d949723c2a039fc9d534a196d8ebd71499dce310716aba3be7bd9600428b534f5eadf7b8b106f77633a63f46c16eceb447e946cc
diff --git a/dev-ml/x509/x509-0.16.0.ebuild b/dev-ml/x509/x509-0.16.0.ebuild
new file mode 100644
index 0000000000..e3375a3d36
--- /dev/null
+++ b/dev-ml/x509/x509-0.16.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+MY_PN="ocaml-${PN}"
+
+DESCRIPTION="Public Key Infrastructure purely in OCaml"
+HOMEPAGE="
+ https://github.com/mirleft/ocaml-x509
+ https://opam.ocaml.org/packages/x509/
+"
+SRC_URI="https://github.com/mirleft/${MY_PN}/releases/download/v${PV}/${P}.tbz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="ocamlopt test"
+
+RDEPEND="
+ >=dev-lang/ocaml-4.08.0:=[ocamlopt?]
+ >=dev-ml/asn1-combinators-0.2.0:=
+ >=dev-ml/cstruct-6.0.0:=
+ >=dev-ml/domain-name-0.3.0:=
+ >=dev-ml/fmt-0.8.7:=
+ >=dev-ml/gmap-0.3.0:=
+ >=dev-ml/ipaddr-5.2.0:=
+ dev-ml/logs:=
+ >=dev-ml/mirage-crypto-0.10.0:=[ec,pk,rng]
+ >=dev-ml/ocaml-base64-3.3.0:=
+ dev-ml/pbkdf:=
+ dev-ml/ptime:=
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-ml/alcotest
+ >=dev-ml/cstruct-3.0.0[unix]
+ )
+"
+
+RESTRICT="!test? ( test )"
diff --git a/dev-ml/xapi-test-utils/xapi-test-utils-1.4.0.ebuild b/dev-ml/xapi-test-utils/xapi-test-utils-1.4.0.ebuild
index 9700d133a9..e9c041071b 100644
--- a/dev-ml/xapi-test-utils/xapi-test-utils-1.4.0.ebuild
+++ b/dev-ml/xapi-test-utils/xapi-test-utils-1.4.0.ebuild
@@ -14,9 +14,9 @@ SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="ocamlopt test"
-DEPEND=""
-RDEPEND="
- ${DEPEND}
+RDEPEND=""
+DEPEND="
+ ${RDEPEND}
test? ( dev-ml/alcotest )
"
diff --git a/dev-ml/xen-evtchn/files/xen-evtchn-2.1.0-ounit2.patch b/dev-ml/xen-evtchn/files/xen-evtchn-2.1.0-ounit2.patch
new file mode 100644
index 0000000000..d0782f08bb
--- /dev/null
+++ b/dev-ml/xen-evtchn/files/xen-evtchn-2.1.0-ounit2.patch
@@ -0,0 +1,36 @@
+From b05b3dc57901a2312d48ce88418fde0ea495575f Mon Sep 17 00:00:00 2001
+From: Alessandro-Barbieri
+Date: Sat, 16 Apr 2022 19:05:44 +0200
+Subject: [PATCH] use ounit2
+
+Signed-off-by: Alessandro-Barbieri
+---
+ lib_test/dune | 2 +-
+ xen-evtchn-unix.opam | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib_test/dune b/lib_test/dune
+index bdec54e..57dda23 100644
+--- a/lib_test/dune
++++ b/lib_test/dune
+@@ -1,6 +1,6 @@
+ (executables
+ (names main)
+- (libraries xen-evtchn xen-evtchn-unix oUnit lwt.unix))
++ (libraries xen-evtchn xen-evtchn-unix ounit2 lwt.unix))
+
+ (alias
+ (name runtest)
+diff --git a/xen-evtchn-unix.opam b/xen-evtchn-unix.opam
+index 4a94d81..cbc8250 100644
+--- a/xen-evtchn-unix.opam
++++ b/xen-evtchn-unix.opam
+@@ -14,7 +14,7 @@ depends: [
+ "lwt-dllist"
+ "lwt"
+ "cmdliner"
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ "conf-xen" {build}
+ ]
+ build: [
diff --git a/dev-ml/xen-evtchn/xen-evtchn-2.1.0.ebuild b/dev-ml/xen-evtchn/xen-evtchn-2.1.0.ebuild
index ae76783a04..2cbe21c27f 100644
--- a/dev-ml/xen-evtchn/xen-evtchn-2.1.0.ebuild
+++ b/dev-ml/xen-evtchn/xen-evtchn-2.1.0.ebuild
@@ -8,7 +8,10 @@ inherit dune multiprocessing
MY_P="${PN}-v${PV}"
DESCRIPTION="Xen event channel interface for Mirage"
-HOMEPAGE="https://github.com/mirage/ocaml-evtchn"
+HOMEPAGE="
+ https://github.com/mirage/ocaml-evtchn
+ https://opam.ocaml.org/packages/xen-evtchn/
+"
SRC_URI="https://github.com/mirage/ocaml-evtchn/releases/download/v${PV}/${MY_P}.tbz"
S="${WORKDIR}/${MY_P}"
@@ -18,19 +21,20 @@ KEYWORDS="~amd64"
IUSE="ocamlopt test unix"
RDEPEND="
- dev-ml/lwt
- dev-ml/lwt-dllist
- dev-ml/cmdliner
+ dev-ml/lwt:=
+ dev-ml/lwt-dllist:=
+ dev-ml/cmdliner:=
unix? ( app-emulation/xen )
"
DEPEND="
${RDEPEND}
- test? ( dev-ml/ounit )
+ test? ( dev-ml/ounit2 )
"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( unix )"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"
src_compile() {
local pkgs="xen-evtchn"
diff --git a/dev-ml/xenstore-clients/files/xenstore-clients-1.1.0-ounit2.patch b/dev-ml/xenstore-clients/files/xenstore-clients-1.1.0-ounit2.patch
new file mode 100644
index 0000000000..2058c8df86
--- /dev/null
+++ b/dev-ml/xenstore-clients/files/xenstore-clients-1.1.0-ounit2.patch
@@ -0,0 +1,34 @@
+From a1a62c6928fc19a7268f4fa627f0bb0243b5eb94 Mon Sep 17 00:00:00 2001
+From: Alessandro-Barbieri
+Date: Sat, 16 Apr 2022 18:40:19 +0200
+Subject: [PATCH] switch to ounit2
+
+Signed-off-by: Alessandro-Barbieri
+---
+ test/dune | 2 +-
+ xenstore_transport.opam | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/dune b/test/dune
+index 3b5134b..f92c0df 100644
+--- a/test/dune
++++ b/test/dune
+@@ -1,4 +1,4 @@
+ (tests
+ (names client_test server_test)
+ (package xenstore_transport)
+- (libraries xenstore_transport xenstore xenstore.unix oUnit))
++ (libraries xenstore_transport xenstore xenstore.unix ounit2))
+diff --git a/xenstore_transport.opam b/xenstore_transport.opam
+index 0934220..23caac4 100644
+--- a/xenstore_transport.opam
++++ b/xenstore_transport.opam
+@@ -23,7 +23,7 @@ depends: [
+ "dune" {build & >= "1.0"}
+ "lwt"
+ "xenstore" {>= "2.0.0"}
+- "ounit" {with-test}
++ "ounit2" {with-test}
+ ]
+ build: [
+ ["dune" "subst"] {pinned}
diff --git a/dev-ml/xenstore-clients/xenstore-clients-1.1.0.ebuild b/dev-ml/xenstore-clients/xenstore-clients-1.1.0.ebuild
index 8c480bfc5f..88b925594e 100644
--- a/dev-ml/xenstore-clients/xenstore-clients-1.1.0.ebuild
+++ b/dev-ml/xenstore-clients/xenstore-clients-1.1.0.ebuild
@@ -16,15 +16,16 @@ KEYWORDS="~amd64"
IUSE="ocamlopt test"
DEPEND="
- dev-ml/lwt
- dev-ml/xenstore
+ dev-ml/lwt:=
+ dev-ml/xenstore:=
"
RDEPEND="
${DEPEND}
- test? ( dev-ml/ounit )
+ test? ( dev-ml/ounit2 )
"
RESTRICT="!test? ( test )"
+PATCHES="${FILESDIR}/${P}-ounit2.patch"
src_install() {
dune_src_install xenstore_transport
diff --git a/dev-python/XenAPI/XenAPI-22.14.0.ebuild b/dev-python/XenAPI/XenAPI-22.14.0.ebuild
index 4097ba38b5..4f066b0410 100644
--- a/dev-python/XenAPI/XenAPI-22.14.0.ebuild
+++ b/dev-python/XenAPI/XenAPI-22.14.0.ebuild
@@ -101,7 +101,7 @@ DEPEND="
${RDEPEND}
test? (
dev-ml/mirage-crypto[rng]
- >=dev-ml/ounit-2
+ dev-ml/ounit2
dev-ml/qcheck
)
"
diff --git a/dev-python/glyphsets/Manifest b/dev-python/glyphsets/Manifest
index f15e0e525b..af8a6f862c 100644
--- a/dev-python/glyphsets/Manifest
+++ b/dev-python/glyphsets/Manifest
@@ -1 +1,2 @@
DIST glyphsets-0.2.1.tar.gz 1265612 BLAKE2B 29aeadf2345887eef4b0a2f91bfee272fe8a45a3c0fefdcd6ebd70eef556b899294fc9a58b8e72a8913f9fa9bc63d2b378b7d6229afb516c0a57063ff2e6d08a SHA512 0a937ec231c617ee2fe6cc0d7a4f8930b2b49342a94b82577968e0334224a84ebcfa76f104cce526da854a283c0179da3dd9b7a2dea0d3fdbabdce626f108a9e
+DIST glyphsets-0.3.1.tar.gz 1619668 BLAKE2B d09b07e46a444c55ab5e91b59fa4410af9d1ed0549fe401f4b1c353ed761794e849bd3e3eb61effe80916c63a062af22cd915ecf9cc4df22ea4305465b64870a SHA512 333bcf4aec9c0a78e7c02d4ef9985b053d84a7d7bdbb37adb785003b03184cd94fbe2f19197c76521db53e2220c8e1041480f5ffbef2a7153d3463279ab936d6
diff --git a/dev-python/glyphsets/glyphsets-0.3.1.ebuild b/dev-python/glyphsets/glyphsets-0.3.1.ebuild
new file mode 100644
index 0000000000..1c7b2530ad
--- /dev/null
+++ b/dev-python/glyphsets/glyphsets-0.3.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python API for evaluating coverage of glyph sets in font projects"
+HOMEPAGE="
+ https://github.com/googlefonts/glyphsets
+ https://pypi.org/project/glyphsets/
+"
+SRC_URI="https://github.com/googlefonts/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0"
+
+#ufoLib2 is an indirect dependency
+RDEPEND="
+ dev-python/fonttools[${PYTHON_USEDEP}]
+ dev-python/ufoLib2[${PYTHON_USEDEP}]
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-python/setuptools_scm-4[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+ export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}"
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pg8000/Manifest b/dev-python/pg8000/Manifest
index a2d0e5be9f..c03d285693 100644
--- a/dev-python/pg8000/Manifest
+++ b/dev-python/pg8000/Manifest
@@ -1,2 +1,2 @@
-DIST pg8000-1.22.0.tar.gz 116910 BLAKE2B a6779fe30a114f4e66c8a09924a4174ab9c128ee286138b80d60c7cc879c496abd56943c22bee1d396de460002a6971762580112f3dd2808f96f4c46db176e4d SHA512 ec506464a7d13d8befee7f8e0837983c4cbc6193b8ec7d8847c46cb04788c23339db6557b31e88d567e395cb45100e3c0a68ac3ba34a031380a980c24857ed87
DIST pg8000-1.24.1.tar.gz 118816 BLAKE2B 43ed4cfb1850288f65c7b7d9dc20c0459f381b67829199855d5188d030212bd3ff9a4135258b515f2073e4303b7909d1961e7428cd208bb2dfc52abe35bb02c2 SHA512 3260d74eaefc5bcdf179e509b1ff3aceaeb8bf76f01e1ec6886e79d40b564540686e355c8de3fca9ace34447bdbb3ae3b2616e5941655eff890a28e336abef57
+DIST pg8000-1.24.2.tar.gz 118893 BLAKE2B 7856e62239c11d97fea378a690b31c73ee08aecc8b3f66deb16ca37ba1013553c820a2ffce9820dffa4e906b99add5fd2d8fc4d3047c53c6208e34a38a425616 SHA512 0985f05d9f3f252e3c67380c7642e51309964a21b12b0abe300eb3f5a751f75d1544d06a6761874b0798c0004eb61468e27d6c4238576a1d57f9ca4b2c6f77a1
diff --git a/dev-python/pg8000/pg8000-1.22.0.ebuild b/dev-python/pg8000/pg8000-1.24.2.ebuild
similarity index 80%
rename from dev-python/pg8000/pg8000-1.22.0.ebuild
rename to dev-python/pg8000/pg8000-1.24.2.ebuild
index f7d89f1627..d51a98bf19 100644
--- a/dev-python/pg8000/pg8000-1.22.0.ebuild
+++ b/dev-python/pg8000/pg8000-1.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,12 +18,11 @@ SLOT="0"
LICENSE="BSD"
KEYWORDS="~amd64"
-RDEPEND="
- dev-python/scramp[${PYTHON_USEDEP}]
-"
-DEPEND="
- ${RDEPEND}
+RDEPEND=">=dev-python/scramp-1.4.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
test? (
+ dev-db/postgresql
dev-python/pytest-mock[${PYTHON_USEDEP}]
dev-python/pytest-benchmark[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
diff --git a/dev-python/rchitect/Manifest b/dev-python/rchitect/Manifest
index 0016442365..15d2f25b17 100644
--- a/dev-python/rchitect/Manifest
+++ b/dev-python/rchitect/Manifest
@@ -1 +1 @@
-DIST rchitect-0.3.36.tar.gz 32682 BLAKE2B dbd9dec8d60f0b3558d0b8fac5c3a02e5ce210778b941b4cd994ee7f815205a34897605a8a7cd29e96791f223ba9d611bdf3064b93f13647c98084e9d07747bc SHA512 53b9cd3cc5cd566d39e74fd70dcb9b6eeb259885b57dde6c42beaea775db07b12f0745abc996218d0df0522d3db39919e953eb1bc13b8e89f69f583b6323476c
+DIST rchitect-0.3.36-github.tar.gz 35978 BLAKE2B 022479c72a6610210ffa05a4758ab843a2e373663adb5d694f05b3b7c33cf4de1c83211f767f8619d76e9e31cb44612b3bf16d9bc30e848835b20fc9c47462e6 SHA512 8ca8428f53d104fad3e950b14e2b7f733b4aba5715f926faa0ac061003775f0f48a15b5e14a634527f0ca28d1cdc316053ddc3f79b061102ed9e81f59c3ec63d
diff --git a/dev-python/rchitect/rchitect-0.3.36.ebuild b/dev-python/rchitect/rchitect-0.3.36.ebuild
index 7210f6e6c2..4eb5420018 100644
--- a/dev-python/rchitect/rchitect-0.3.36.ebuild
+++ b/dev-python/rchitect/rchitect-0.3.36.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://pypi.org/project/rchitect/
https://github.com/randy3k/rchitect
"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/randy3k/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}-github.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-python/sphinx-click/Manifest b/dev-python/sphinx-click/Manifest
index fa88c6f6e6..d68daafa5a 100644
--- a/dev-python/sphinx-click/Manifest
+++ b/dev-python/sphinx-click/Manifest
@@ -1,2 +1,2 @@
-DIST sphinx-click-3.0.2.tar.gz 19764 BLAKE2B 7190958afaa8edab311e6728c5b2ea37e04d9402882c8bb0ceac935fc1bc93b5c087cbe6847396f9331b9b6b4d7fcb2a439d725661bd8d4cebdde6851f38f78a SHA512 dcf60ca31dcc7c1f45157ed88a5d723d8b531f01b617fb0cc4ada8f09c709b23b55a86bcf8bbe66bf4c2f5ef77329123d271724887022a43b86747087e87ed7c
DIST sphinx-click-3.1.0.tar.gz 20265 BLAKE2B ca38720636c8c3009db4b4345534883b63e647bd1e2fe1a5d79a4e80c2221a0e9543518d4f1ae9663571259cd14aff8b89f302f05a335b2c824ec24622e04853 SHA512 fe44d9e104216a7edadc2cdd467fd704deeacf580908b2d6e597104dabbf5d1006ee08019aa1252895d2929c42f34fc8ae540530a7bf20023cedcce8267c9a8b
+DIST sphinx-click-4.0.2.tar.gz 21218 BLAKE2B 6590e5604bd6c07249f9a7aeb5c43660e913e24d889dad046012e53dc682f981d80df0c6955c7a930c98986378731fb16037ed5e9cd50b45c4a4299d183eadb6 SHA512 f44a3ada5e2a73fed1d4b92d6868b6875cc3c1790b427c8db71e4c8e50e86eec8ef00a46762a34ff539f5061cc3e258494523ba25e9035beaa92c41560ab554a
diff --git a/dev-python/sphinx-click/sphinx-click-3.0.2.ebuild b/dev-python/sphinx-click/sphinx-click-4.0.2.ebuild
similarity index 85%
rename from dev-python/sphinx-click/sphinx-click-3.0.2.ebuild
rename to dev-python/sphinx-click/sphinx-click-4.0.2.ebuild
index d2a0b6b246..ed3df918fb 100644
--- a/dev-python/sphinx-click/sphinx-click-3.0.2.ebuild
+++ b/dev-python/sphinx-click/sphinx-click-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,16 +15,15 @@ HOMEPAGE="
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64"
SLOT="0"
RDEPEND="
>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
- >=dev-python/click-7[${PYTHON_USEDEP}]
+ >=dev-python/click-7.0[${PYTHON_USEDEP}]
dev-python/docutils[${PYTHON_USEDEP}]
"
BDEPEND=">=dev-python/pbr-2.0[${PYTHON_USEDEP}]"
distutils_enable_tests pytest
-
distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-util/afdko/afdko-3.8.1.ebuild b/dev-util/afdko/afdko-3.8.1.ebuild
index 99fcfd6e8c..d61cd48f3d 100644
--- a/dev-util/afdko/afdko-3.8.1.ebuild
+++ b/dev-util/afdko/afdko-3.8.1.ebuild
@@ -21,6 +21,7 @@ SLOT="0"
#lxml, unicodedata2, fs, brotli, brotlicffi, zopfli, fontpens are indirect dependencies
RDEPEND="
+ dev-cpp/antlr-cpp:4
>=dev-python/lxml-4.8.0[${PYTHON_USEDEP}]
>=dev-python/fs-2.2.0[${PYTHON_USEDEP}]
>=app-arch/brotli-1.0.1[python,${PYTHON_USEDEP}]
@@ -54,6 +55,7 @@ DOCS=( {README,NEWS}.md docs )
PATCHES=(
"${FILESDIR}/${PN}-3.6.2-_get_scripts-to-data_files.patch"
"${FILESDIR}/${P}-no-cmake-ninja-deps.patch"
+ "${FILESDIR}/${P}-antlr.patch"
)
distutils_enable_tests pytest
diff --git a/dev-util/afdko/files/afdko-3.8.1-antlr.patch b/dev-util/afdko/files/afdko-3.8.1-antlr.patch
new file mode 100644
index 0000000000..3db0bc93e8
--- /dev/null
+++ b/dev-util/afdko/files/afdko-3.8.1-antlr.patch
@@ -0,0 +1,41 @@
+diff '--color=auto' -ru afdko-3.8.1-orig/c/makeotf/lib/hotconv/CMakeLists.txt afdko-3.8.1/c/makeotf/lib/hotconv/CMakeLists.txt
+--- a/c/makeotf/lib/hotconv/CMakeLists.txt 2022-04-16 18:04:34.060438876 +0200
++++ b/c/makeotf/lib/hotconv/CMakeLists.txt 2022-04-16 18:11:51.280732567 +0200
+@@ -68,8 +68,8 @@
+ )
+
+ set_property(TARGET hotconv PROPERTY C_STANDARD 99)
+-target_include_directories(hotconv PRIVATE AFTER $<$:${ANTLR4_INCLUDE_DIRS}>)
+-target_link_libraries(hotconv PUBLIC antlr4_static)
++target_include_directories(hotconv PUBLIC /usr/include/antlr4-runtime)
++target_link_libraries(hotconv PUBLIC -lantlr4-runtime)
+
+ if ( CMAKE_COMPILER_IS_GNUCC )
+ target_compile_options(hotconv PRIVATE -Wall -Wno-attributes)
+diff '--color=auto' -ru afdko-3.8.1-orig/CMakeLists.txt afdko-3.8.1/CMakeLists.txt
+--- a/CMakeLists.txt 2022-04-16 18:04:34.055438815 +0200
++++ b/CMakeLists.txt 2022-04-16 18:05:14.656930402 +0200
+@@ -27,23 +27,6 @@
+
+ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+-# Antlr 4 configuration
+-
+-# This is an alternate way of supplying the Antlr 4 sources that will override
+-# the git clone of the tag listed below. This is especially useful if you
+-# encounter compiler problems and need to make small edits to compensate. Start
+-# with the Antlr project's sources, e.g.
+-# https://www.antlr.org/download/antlr4-cpp-runtime-4.9.2-source.zip
+-# set(ANTLR4_ZIP_REPOSITORY "/path_to_antlr4_archive/a4.zip")
+-
+-add_definitions(-DANTLR4CPP_STATIC)
+-set(ANTLR4_WITH_STATIC_CRT OFF)
+-# Use slightly more recent commit than 4.9.2 to deal with utfcpp test
+-# compilation problems
+-# set(ANTLR4_TAG tags/4.9.2)
+-set(ANTLR4_TAG 916f03366edf15bf8b50010b11d479c189bf9f96)
+-include(ExternalAntlr4Cpp)
+-
+ # sanitizer support
+ # work around https://github.com/pypa/setuptools/issues/1928 with environment
+ # variable
diff --git a/dev-util/annobin/Manifest b/dev-util/annobin/Manifest
index 2704283dd1..7649141a1a 100644
--- a/dev-util/annobin/Manifest
+++ b/dev-util/annobin/Manifest
@@ -1,2 +1 @@
-DIST annobin-10.60.tar.xz 848432 BLAKE2B df7dafd25af009bf0cbe779088892bd11120cf99f587293f7730083007586d84c452737d4e3b32e2b73586ab51958ba8f16d358cef9041ccb493198e72bc1b37 SHA512 7d5158da6a59000d686fb837b0ac1a86351898c00a93e29c2cb599ec6eccb325b66fbd775855bd3661d2d9541e3d2cb2493b087b6670fca137f9992f33c68082
-DIST annobin-10.62.tar.xz 849684 BLAKE2B 363cc54f56199e210edb82549b7743f9d70e62f481faab7363f715ce3ab2f127e9025f04cf92ccbd0402804df4fe8ff1c92259639b32b6c76f47eb82de0c022b SHA512 60f65d80158dc074f9293ae4d35e312a8b2129b20e10eb3268d335be215e8eee9f6bb0efc341bcaae7169a32a5fbdbf8d81fd372e6b3c793d7380682e1baf595
+DIST annobin-10.65.tar.xz 849952 BLAKE2B 6f6124f6470d3f6fe37ce766dc65af43b3020d0ea745cbaf501c3757a83c500f590276cde98048bd5c47602b8ca954d43039060779cec3d8d2abdd5f1695fac8 SHA512 c7191fc88072431f3c62ae2abe405b88c78b3d703353810aef6bb6bf0c3fa16ad2db84d5e5e940864518474119393454aadc40fdca84bdbba18d686face59ce1
diff --git a/dev-util/annobin/annobin-10.62.ebuild b/dev-util/annobin/annobin-10.62.ebuild
deleted file mode 100644
index 2a3dfe7f1a..0000000000
--- a/dev-util/annobin/annobin-10.62.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 2018-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_MAX_SLOT=14
-
-inherit autotools llvm toolchain-funcs
-
-DESCRIPTION="Binary annotation compiler plugin and tools"
-HOMEPAGE="https://nickc.fedorapeople.org"
-SRC_URI="https://nickc.fedorapeople.org/${P}.tar.xz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="clang doc llvm test"
-
-RDEPEND="
- app-arch/rpm
- dev-libs/elfutils
- sys-libs/binutils-libs
-
- clang? (
+
+
+
+ adel.ks@zegrapher.com
+ Adel KARA SLIMANE
+
+
+ flightlessmango/MangoHud
+ https://github.com/flightlessmango/MangoHud/issues
+
+
+
diff --git a/gui-apps/gcolor3/Manifest b/gui-apps/gcolor3/Manifest
new file mode 100644
index 0000000000..e8598e7bda
--- /dev/null
+++ b/gui-apps/gcolor3/Manifest
@@ -0,0 +1 @@
+DIST gcolor3-v2.4.0.tar.bz2 158552 BLAKE2B 8ecbfd6211883f4f963275bb33196f74bfb974de081a5bffc30e7ee2b029c9a145e0b6f49d2984757cfb7b3e1afbea57fb5cd004d61c896e9c6de1ebc0c78ebe SHA512 7bce100a91fb3062ae20228c56a8e4ba93cc0b902552fc7ca3eb10d6a345727fa33d47b43d30a59990ef6179dc1af4e370092dc3651c670f3c6cb4d18d4cd0fc
diff --git a/gui-apps/gcolor3/files/gcolor3-2.4.0-update-to-libportal-0.5.patch b/gui-apps/gcolor3/files/gcolor3-2.4.0-update-to-libportal-0.5.patch
new file mode 100644
index 0000000000..f10b98719d
--- /dev/null
+++ b/gui-apps/gcolor3/files/gcolor3-2.4.0-update-to-libportal-0.5.patch
@@ -0,0 +1,58 @@
+# Upstream commit to make gcolor3 work with >=libportal-0.5.
+#
+
+From 1750369a3fd922aa9db6916207dc460c6f885e14 Mon Sep 17 00:00:00 2001
+From: Michal Vasilek
+Date: Mon, 27 Dec 2021 13:47:14 +0100
+Subject: [PATCH] Update to libportal 0.5
+
+---
+ meson.build | 2 ++
+ src/gcolor3-color-selection.c | 2 +-
+ src/meson.build | 1 +
+ 3 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6453679..7d6dc50 100644
+--- a/meson.build
++++ b/meson.build
+@@ -7,9 +7,11 @@ dep_gtk = dependency('gtk+-3.0', version: '>= 3.20.0', required: true)
+ dep_libportal = dependency(
+ 'libportal',
+ required: true,
++ version: '>= 0.5',
+ fallback: ['libportal', 'libportal_dep'],
+ default_options: ['gtk_doc=false'],
+ )
++dep_libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5', required: true)
+ cc = meson.get_compiler('c')
+ dep_lm = cc.find_library('m', required: true)
+
+diff --git a/src/gcolor3-color-selection.c b/src/gcolor3-color-selection.c
+index 7413850..5df9d54 100644
+--- a/src/gcolor3-color-selection.c
++++ b/src/gcolor3-color-selection.c
+@@ -41,7 +41,7 @@
+ #include
+ #include
+ #include
+-#include
++#include
+
+ #ifdef ENABLE_NLS
+ #define P_(String) g_dgettext(GETTEXT_PACKAGE "-properties",String)
+diff --git a/src/meson.build b/src/meson.build
+index 3998f68..d488e51 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -42,6 +42,7 @@ executable(
+ dependencies: [
+ dep_gtk,
+ dep_libportal,
++ dep_libportal_gtk3,
+ dep_lm
+ ],
+ install: true,
+--
+GitLab
+
diff --git a/gui-apps/gcolor3/gcolor3-2.4.0.ebuild b/gui-apps/gcolor3/gcolor3-2.4.0.ebuild
new file mode 100644
index 0000000000..d642168348
--- /dev/null
+++ b/gui-apps/gcolor3/gcolor3-2.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="A simple color chooser written in GTK3"
+HOMEPAGE="https://gitlab.gnome.org/World/gcolor3"
+SRC_URI="https://gitlab.gnome.org/World/gcolor3/-/archive/v${PV}/gcolor3-v${PV}.tar.bz2"
+S="${WORKDIR}/${PN}-v${PV}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ dev-libs/libportal[gtk]
+ >=gui-libs/libhandy-1.5.0
+ x11-libs/gtk+:3
+"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/gettext"
+
+# NOTE: remove for next version
+PATCHES=( "${FILESDIR}/${P}-update-to-libportal-0.5.patch" )
+
+src_prepare() {
+ # Updates desktop database and icon cache
+ sed -i "/^meson\.add_install_script('meson_install\.sh'/d" meson.build \
+ || die "Could not remove install script from build recipe"
+
+ default
+}
diff --git a/gui-apps/gcolor3/metadata.xml b/gui-apps/gcolor3/metadata.xml
new file mode 100644
index 0000000000..21d27b956a
--- /dev/null
+++ b/gui-apps/gcolor3/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ gentoo@tastytea.de
+ Ronny (tastytea) Gutbrod
+
+
+ https://gitlab.gnome.org/World/gcolor3/-/issues
+
+
diff --git a/media-gfx/bonzomatic/Manifest b/media-gfx/bonzomatic/Manifest
index 3750150fe9..7198612cb9 100644
--- a/media-gfx/bonzomatic/Manifest
+++ b/media-gfx/bonzomatic/Manifest
@@ -1 +1,2 @@
DIST bonzomatic-2021.03.07.tar.gz 2721345 BLAKE2B ef943aea11bbeab18b21a95a589caceb2694512a17bbf7ec83019243b30ce2aa1c91a1eff688bfc277885bbf6c1dccad4d1e4ad866800c9020edd83093e3a7d8 SHA512 d462fc7c44a62a00dfe4af7fa2a16718b767317a9d3de5bf4599fc83f19a665575d041c88c0de90c036a0497ec8576700189bc813a057a97883d509f3b3fd4b6
+DIST bonzomatic-2022.02.05.tar.gz 2721552 BLAKE2B 0c89a88e82c0eeb20d3b40f2107590ae37168a16327431d1e296c6e9cb0ae6dc661d669a0b4c91c8cd9124e2001defbf0bcf4840161efb64e20ee9b2fe93f495 SHA512 5a1ed8c2dd1b2f45de5a9cb3b859b6d599d833114a8bab95b25ac1f3ad62b536371fffd4e19ee317b79190afd1bacaa2a46000c9c5f17ff239068d13e6630bd1
diff --git a/media-gfx/bonzomatic/bonzomatic-2022.02.05.ebuild b/media-gfx/bonzomatic/bonzomatic-2022.02.05.ebuild
new file mode 100644
index 0000000000..9582d65a30
--- /dev/null
+++ b/media-gfx/bonzomatic/bonzomatic-2022.02.05.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Live shader coding tool and Shader Showdown workhorse"
+HOMEPAGE="https://github.com/Gargaj/Bonzomatic"
+if [[ "${PV}" == "9999" ]]
+then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/Gargaj/Bonzomatic"
+else
+ MY_PV="$(ver_rs 1- -)"
+ SRC_URI="https://github.com/Gargaj/Bonzomatic/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/Bonzomatic-${MY_PV}"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Unlicense"
+SLOT="0"
+IUSE="system-glfw system-glew system-stb system-kissfft wayland"
+
+# TODO: system-miniaudio, system-jsonxx/json++, system-scintilla
+# !system-glfw copied from media-libs/glfw-3.3.3::gentoo
+# !system-glew copied from media-libs/glew-2.2.0::gentoo
+DEPEND="
+ system-glfw? ( media-libs/glfw )
+ !system-glfw? (
+ wayland? (
+ dev-libs/wayland
+ media-libs/mesa[egl(+),wayland]
+ dev-libs/wayland-protocols
+ )
+ !wayland? (
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXxf86vm
+ x11-libs/libXi
+ )
+ )
+ system-glew? ( media-libs/glew:= )
+ !system-glew? (
+ >=x11-libs/libX11-1.6.2
+ >=x11-libs/libXext-1.3.2
+ >=x11-libs/libXi-1.7.2
+ >=x11-libs/libXmu-1.1.1-r1
+ )
+ system-stb? ( dev-libs/stb )
+ system-kissfft? ( sci-libs/kissfft )
+ virtual/opengl
+ virtual/glu
+ media-libs/alsa-lib
+ media-libs/fontconfig
+"
+RDEPEND="${DEPEND}"
+BDEPEND="!system-glfw? ( wayland? ( dev-libs/wayland-protocols ) )"
+
+src_configure() {
+ local mycmakeargs=(
+ -DBONZOMATIC_USE_SYSTEM_GLFW=$(usex system-glfw)
+ -DGLFW_USE_WAYLAND="$(usex wayland)"
+ -DBONZOMATIC_USE_SYSTEM_GLEW=$(usex system-glew)
+ -DBONZOMATIC_USE_SYSTEM_STB=$(usex system-stb)
+ -DBONZOMATIC_USE_SYSTEM_KISSFFT=$(usex system-kissfft)
+ )
+
+ cmake_src_configure
+}
diff --git a/net-p2p/monero/metadata.xml b/net-p2p/monero/metadata.xml
index 7b6989c63f..45b9047d22 100644
--- a/net-p2p/monero/metadata.xml
+++ b/net-p2p/monero/metadata.xml
@@ -5,6 +5,10 @@
telans@posteo.de
James Beddek
+
+ cantcuckthis@danwin1210.de
+ Dex Conner
+
Monero is a private, secure, untraceable, decentralised digital
currency. You are your bank, you control your funds, and nobody
diff --git a/profiles/package.mask b/profiles/package.mask
index 8cc1d3aefa..31e1be0fbf 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -9,6 +9,16 @@
# TODO: Either fix per profile masking in overlays, or move
# relevant entries to the relevant package.mask files in ::gentoo
+# Arthur Zamarin (2022-04-17)
+# Depends on various old python dependencies, which don't exist already
+# in gentoo tree.
+# Bug #828723
+media-sound/spotify_dl
+
+# Christopher Byrne (2022-04-15)
+# Depends on masked dev-libs/openssl-3.0.*
+app-crypt/tpm2-openssl
+
# Adrian Schollmeyer (2022-03-15)
# Package will be removed after 2022-04-15 from ::guru, since it is no longer
# being used by net-im/abaddon and has no other reverse dependencies.
diff --git a/profiles/use.desc b/profiles/use.desc
new file mode 100644
index 0000000000..fba1f8c909
--- /dev/null
+++ b/profiles/use.desc
@@ -0,0 +1,4 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+autoload - Enable the plugin for all users
diff --git a/sci-mathematics/radian/Manifest b/sci-mathematics/radian/Manifest
index 9b2202d0a2..5f5ef5daec 100644
--- a/sci-mathematics/radian/Manifest
+++ b/sci-mathematics/radian/Manifest
@@ -1 +1 @@
-DIST radian-0.6.0.tar.gz 53164 BLAKE2B e2384beb41b1099830afb4f48ad4d220da2fc0267df2968ec51164dd1b592705c63c185767a2a229528ac0156391b41299c747c3ea552da31dea6a0eda6e65f8 SHA512 e7b1b22347c9d6cf7b80b1c07cdbb30942b4c285fea211a0ee53b1874f7dac33d0c139fc04a8efb19a19161dbac6642a98c6a134b36371b1c2f6514c79be5407
+DIST radian-0.6.0-github.tar.gz 73474 BLAKE2B 5691848c9e13ef8e3b55692e8270f2a189a067aeaf658ef4e5252ad1855bd4fb9224e26db512f51151887bcb58747732a88e48d74f77d1af61e08666effe90b1 SHA512 dcd2183248b62bda728ff6dfc5e15bd80d6d21c8f0fd3a4f976c4e6149b306b6c70af8de6aa202386b97734d6b7b309667314677d183899b469debce098fb532
diff --git a/sci-mathematics/radian/radian-0.6.0.ebuild b/sci-mathematics/radian/radian-0.6.0.ebuild
index f82d06ee17..fd152ab472 100644
--- a/sci-mathematics/radian/radian-0.6.0.ebuild
+++ b/sci-mathematics/radian/radian-0.6.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="
https://pypi.org/project/radian/
https://github.com/randy3k/radian
"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/randy3k/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}-github.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/sys-auth/keystone/files/keystone-21.0.0.0_rc1-no-usr-local-bin.patch b/sys-auth/keystone/files/keystone-21.0.0-no-usr-local-bin.patch
similarity index 100%
rename from sys-auth/keystone/files/keystone-21.0.0.0_rc1-no-usr-local-bin.patch
rename to sys-auth/keystone/files/keystone-21.0.0-no-usr-local-bin.patch
diff --git a/sys-boot/zfsbootmenu/Manifest b/sys-boot/zfsbootmenu/Manifest
new file mode 100644
index 0000000000..9fdbab689b
--- /dev/null
+++ b/sys-boot/zfsbootmenu/Manifest
@@ -0,0 +1 @@
+DIST zfsbootmenu-1.12.0.tar.gz 1688946 BLAKE2B 291dcc813767def653bc4983cb9ff4c5b1d9f191cb8fee6e9a58cd6826fe0204606aa095339e9eeb6e4dd3201f5f9ad1b4cc3a26712960bf057198225f4b65f9 SHA512 5af3d258eee3ade3e9e11e084f4de0d251acc952348fdc4d3656b32f8fec7460c2d59fa883e06f482bd2f59e1055d6b908cf43c29aee47059d369231197a6645
diff --git a/sys-boot/zfsbootmenu/files/zfsbootmenu-branding.patch b/sys-boot/zfsbootmenu/files/zfsbootmenu-branding.patch
new file mode 100644
index 0000000000..95e2e130b2
--- /dev/null
+++ b/sys-boot/zfsbootmenu/files/zfsbootmenu-branding.patch
@@ -0,0 +1,20 @@
+--- a/etc/zfsbootmenu/config.yaml
++++ b/etc/zfsbootmenu/config.yaml
+@@ -3,14 +3,15 @@ Global:
+ BootMountPoint: /boot/efi
+ DracutConfDir: /etc/zfsbootmenu/dracut.conf.d
+ Components:
+- ImageDir: /boot/efi/EFI/void
++ ImageDir: /boot/efi/EFI/gentoo
+ Versions: 3
+ Enabled: true
+ syslinux:
+ Config: /boot/syslinux/syslinux.cfg
+ Enabled: false
+ EFI:
+- ImageDir: /boot/efi/EFI/void
++ ImageDir: /boot/efi/EFI/gentoo
++ Stub: /usr/lib/systemd/boot/efi/linuxx64.elf.stub
+ Versions: false
+ Enabled: false
+ Kernel:
diff --git a/sys-boot/zfsbootmenu/metadata.xml b/sys-boot/zfsbootmenu/metadata.xml
new file mode 100644
index 0000000000..cd7ee30a2a
--- /dev/null
+++ b/sys-boot/zfsbootmenu/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ c@cgps.ch
+ Chaquen Beliakov Amaya
+
+
diff --git a/sys-boot/zfsbootmenu/zfsbootmenu-1.12.0.ebuild b/sys-boot/zfsbootmenu/zfsbootmenu-1.12.0.ebuild
new file mode 100644
index 0000000000..ab7602504d
--- /dev/null
+++ b/sys-boot/zfsbootmenu/zfsbootmenu-1.12.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="ZFS bootloader for root-on-ZFS systems"
+HOMEPAGE="https://zfsbootmenu.org"
+SRC_URI="https://github.com/zbm-dev/zfsbootmenu/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-branding.patch
+)
+
+RDEPEND="
+app-shells/fzf
+sys-apps/kexec-tools
+sys-block/mbuffer
+dev-perl/Sort-Versions
+dev-perl/Config-IniFiles
+dev-perl/YAML-PP
+dev-perl/boolean
+sys-fs/zfs
+sys-kernel/dracut"
+
+pkg_postinst () {
+ elog "Please consult upstream doumentation to install the bootloader
+ https://github.com/zbm-dev/zfsbootmenu"
+}
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 1a96049d47..a98a308fb2 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,2 +1 @@
-DIST openstack-heat-18.0.0.0rc1.tar.gz 2449476 BLAKE2B d1a616bd9d5d07e4b513ac73b8ad555a9641796b85e26b5682814e8cce01cd5785a312e3a26da2a98c2fba9145f84e801090b95739a3e9c61ab9cca9b7521b42 SHA512 891e2357be5334a1e542338ddb51baeda904a553a35ed3376d1ea7ba29818b5fb517d648f48d4e192d3e7a8f407d3a1363447a0bf701a87311e6904b4716703b
DIST openstack-heat-18.0.0.tar.gz 2449231 BLAKE2B a285cc9bb3ac9bb88c5694cefd664ae5e4ffe130317a290e39b5faadd7512cdd515fdc14bc5a03bd610bd11f4fb1f85627c5dd1974f14ad06f13f9a594c1c141 SHA512 222c9ae91a7ab189fe98908629f6c64ccb0cc7dd10fc331c206c10a31a499cc3bdc8717656d2e3c746857de8c85ae13289a8efd2c1a800b9b88553696c2e14e4
diff --git a/sys-cluster/heat/heat-18.0.0.0_rc1.ebuild b/sys-cluster/heat/heat-18.0.0.0_rc1.ebuild
deleted file mode 100644
index 0d5f545e2a..0000000000
--- a/sys-cluster/heat/heat-18.0.0.0_rc1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MYP="${P/_rc/rc}"
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1 linux-info systemd
-
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine"
-HOMEPAGE="
- https://launchpad.net/heat
- https://opendev.org/openstack/heat/
- https://pypi.org/project/openstack-heat/
-"
-SRC_URI="https://tarballs.openstack.org/${PN}/openstack-${MYP}.tar.gz"
-KEYWORDS="~amd64"
-S="${WORKDIR}/openstack-${MYP}"
-
-LICENSE="Apache-2.0 GPL-2"
-SLOT="0"
-IUSE="+mysql +memcached postgres sqlite"
-
-RDEPEND="
- >=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
- >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
- >=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
- >=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
- >=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
- >=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
- >=dev-python/keystoneauth-3.18.0[${PYTHON_USEDEP}]
- >=dev-python/keystonemiddleware-5.1.0[${PYTHON_USEDEP}]
- >=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
- >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
- >=dev-python/neutron-lib-1.14.0[${PYTHON_USEDEP}]
- >=dev-python/openstacksdk-0.28.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-6.8.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-2.22.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-db-6.0.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-4.3.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-policy-3.7.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-2.25.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-upgradecheck-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-4.5.0[${PYTHON_USEDEP}]
- >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
- >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
- >=dev-python/aodhclient-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
- >=dev-python/python-blazarclient-1.0.1[${PYTHON_USEDEP}]
- >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
- >=dev-python/python-designateclient-2.7.0[${PYTHON_USEDEP}]
- >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/python-heatclient-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/python-ironicclient-2.8.0[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/python-magnumclient-2.3.0[${PYTHON_USEDEP}]
- >=dev-python/python-manilaclient-1.16.0[${PYTHON_USEDEP}]
- >=dev-python/python-mistralclient-3.1.0[${PYTHON_USEDEP}]
- >=dev-python/python-monascaclient-1.12.0[${PYTHON_USEDEP}]
- >=dev-python/python-neutronclient-6.14.0[${PYTHON_USEDEP}]
- >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}]
- >=dev-python/python-octaviaclient-1.8.0[${PYTHON_USEDEP}]
- >=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
- >=dev-python/python-saharaclient-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/python-vitrageclient-2.7.0[${PYTHON_USEDEP}]
- >=dev-python/python-zaqarclient-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/python-zunclient-3.4.0[${PYTHON_USEDEP}]
- >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
- >=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
- >=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
- >=dev-python/tenacity-6.1.0[${PYTHON_USEDEP}]
- >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-3.1.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
- >=dev-python/yaql-1.1.3[${PYTHON_USEDEP}]
-
- mysql? (
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
- )
- postgres? (
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
- )
- sqlite? (
- >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
- )
-
- acct-user/heat
- acct-group/heat
-"
-DEPEND="
- ${RDEPEND}
- app-admin/sudo
-"
-BDEPEND="
- test? (
- >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
- >=dev-python/kombu-5.0.1[${PYTHON_USEDEP}]
- >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
- >=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
- >=dev-python/tempest-17.1.0[${PYTHON_USEDEP}]
- )
-"
-
-REQUIRED_USE="
- test? ( mysql )
- || ( mysql postgres sqlite )
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- sed -i '/^hacking/d' test-requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- oslo-config-generator --config-file=config-generator.conf
- oslopolicy-sample-generator --config-file etc/heat/heat-policy-generator.conf
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- diropts -m 0750 -o heat -g heat
- keepdir /etc/heat
- dodir /etc/heat/environment.d
- dodir /etc/heat/templates
-
- for svc in api api-cfn engine; do
- newinitd "${FILESDIR}/heat.initd" "heat-${svc}"
- done
-
- insinto /etc/heat
- insopts -m 0640 -o heat -g heat
- doins heat.conf.sample
- doins etc/heat/policy.yaml.sample
- doins "etc/heat/api-paste.ini"
- insinto /etc/heat/templates
- doins "etc/heat/templates/"*
- insinto /etc/heat/environment.d
- doins "etc/heat/environment.d/default.yaml"
-
- dodir /var/log/heat
- fowners heat:heat /var/log/heat
- keepdir /var/log/heat
-
- systemd_dounit "${FILESDIR}/heat-engine.service"
- systemd_dounit "${FILESDIR}/heat-api.service"
-
- insinto /etc/logrotate.d
- doins "${FILESDIR}/heat.logrotate"
-
- rm -r "${ED}/usr/etc"
-}
diff --git a/sys-process/btop/Manifest b/sys-process/btop/Manifest
index 1394a7c043..21b9ed3a3e 100644
--- a/sys-process/btop/Manifest
+++ b/sys-process/btop/Manifest
@@ -1 +1 @@
-DIST btop-1.2.5.tar.gz 971598 BLAKE2B 892be951cd88b01a1a108cd0374f8c920f2111dc8c75aa4fd0c192729f408d34b0720adca1e484b2c71aff4840e5737a8cce8802effb9b634e60163decde5d0f SHA512 f881c2f8e85ccf7609ef443b4bec3c20e4f41c9b45171ddc3110a5484bf39cb2c3e4b7eff0a97930fe550d557526cec58b5867d55ed9d75f4a8976f0c92d5d10
+DIST btop-1.2.6.tar.gz 971853 BLAKE2B 217a7c1c7a6caf0aa7261acd362f4df136833620ac4e09b19db31e1c439c9feeef381ed66888a44e48c5a6b53c632854b8d45476a2699cb7f7de9777c8a5f654 SHA512 8eeb3dee050b392817747db076fc85d012e3cd528b70d7ef2dae801614d332cef5bab636bca2803904027a1e0ac98e30a95ee1cc8aa34c7c9d093e3accf885c9
diff --git a/sys-process/btop/btop-1.2.5.ebuild b/sys-process/btop/btop-1.2.6.ebuild
similarity index 100%
rename from sys-process/btop/btop-1.2.5.ebuild
rename to sys-process/btop/btop-1.2.6.ebuild