diff --git a/dev-ml/bigstringaf/Manifest b/dev-ml/bigstringaf/Manifest
index 10c09f4724..1821f5db33 100644
--- a/dev-ml/bigstringaf/Manifest
+++ b/dev-ml/bigstringaf/Manifest
@@ -1,2 +1,3 @@
+DIST bigstringaf-0.10.0.tar.gz 12175 BLAKE2B 15c6ea44b824afee2ba33178ecd34af5bb6e01506960dab4a87a95bdc877f2c9c0e5cbb25c5fbd86bb1539dff3eb4c2b6a3bb2e9c5197e9371164e61b5eba6a9 SHA512 b51c756925d7016ffd7eac49e69393a1897391ca2685a8c30c7b6e3917b4d66c9400b49e8986d0f03329197b95ad52e096ff83dea5e03571cb5bc3d9a5170602
DIST bigstringaf-0.7.0.tar.gz 11896 BLAKE2B 4bc94264865cc7d90def66930dc76264169b14f907094cdc9e25222f308163df3384a2c1a4d9a5b278fe4f9a433bf96b75fbf791d1255ce7dec582decbfd7951 SHA512 ea0827eaa37b053c1a1756ed38f059209e85fbf7d3e19ed97de587416a9717e77c5b1017afa307e9eee938c18b4ef7cb6ff4adea683d5a9b8430358b4096b960
DIST bigstringaf-0.9.0.tar.gz 12431 BLAKE2B 12024a32d5ae9f3a5bdda223218abb8957519ebc70998ba34ebe841ef560d44d27f5b60413c88ca873fdf1a2a35ea08a3fafba00073c6cba26fe32237b3a56cf SHA512 c5148d967beef15bba21a706009cb8443fe6afd76b949d6a6bcf4fc6c6d410bd0ca4c86b4ef6897cad73c51449e5387ee0173347b8d43c49f1a62024a8aa4db5
diff --git a/dev-ml/bigstringaf/bigstringaf-0.10.0.ebuild b/dev-ml/bigstringaf/bigstringaf-0.10.0.ebuild
new file mode 100644
index 0000000000..57b0314eeb
--- /dev/null
+++ b/dev-ml/bigstringaf/bigstringaf-0.10.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Bigstring intrinsics and fast blits based on memcpy/memmove"
+HOMEPAGE="https://github.com/inhabitedtype/bigstringaf"
+SRC_URI="https://github.com/inhabitedtype/bigstringaf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-ml/dune-configurator-3.0:=
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+
+BDEPEND="
+ test? (
+ dev-ml/alcotest:=
+ )
+"
diff --git a/dev-ml/bigstringaf/metadata.xml b/dev-ml/bigstringaf/metadata.xml
index 195daf44e6..e6d1843508 100644
--- a/dev-ml/bigstringaf/metadata.xml
+++ b/dev-ml/bigstringaf/metadata.xml
@@ -5,6 +5,10 @@
fogti@ytrizja.de
Alain Emilia Anna Zscheile
+
+ tokusan441@gmail.com
+ Hiroki Tokunaga
+
Bigstring intrinsics and fast blits based on memcpy/memmove
The OCaml compiler has a bunch of intrinsics for Bigstrings, but they're not
diff --git a/dev-ml/ocaml-version/Manifest b/dev-ml/ocaml-version/Manifest
new file mode 100644
index 0000000000..c5db5f7a25
--- /dev/null
+++ b/dev-ml/ocaml-version/Manifest
@@ -0,0 +1 @@
+DIST ocaml-version-3.6.7.tar.gz 14315 BLAKE2B 6b6599ad17bbf3f023e809ae522db44d32632c6bcc9e09fcb7515bb9219658b36eb6cc1d9da4beff9d1843b1333642b207331c7c98ac07d81279b73e07a3c726 SHA512 879e0eac5ea672b98dc9ba7f236fc048ed829271fe5d95909f23b64e180d64d407684de83684fc0f07373a25feda3ae679daf005f72421a3f1173aa097be8c03
diff --git a/dev-ml/ocaml-version/metadata.xml b/dev-ml/ocaml-version/metadata.xml
new file mode 100644
index 0000000000..ef87a3352d
--- /dev/null
+++ b/dev-ml/ocaml-version/metadata.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ tokusan441@gmail.com
+ Hiroki Tokunaga
+
+ This library provides facilities to parse version numbers of the OCaml compiler, and enumerates the various official OCaml releases and configuration variants.
+
+OCaml version numbers are of the form `major.minor.patch+extra`, where the `patch` and `extra` fields are optional. This library offers the following functionality:
+
+- Functions to parse and serialise OCaml compiler version numbers.
+- Enumeration of official OCaml compiler version releases.
+- Test compiler versions for a particular feature (e.g. the `bytes` type)
+- [opam](https://opam.ocaml.org) compiler switch enumeration.
+
+### Further information
+
+- **Discussion:** Post on https://discuss.ocaml.org/ with the `ocaml` tag under the Ecosystem category.
+- **Bugs:** https://github.com/ocurrent/ocaml-version/issues
+- **Docs:** http://docs.mirage.io/ocaml-version
+
+ https://github.com/ocurrent/ocaml-version/issues
+ ocurrent/ocaml-version
+
+
diff --git a/dev-ml/ocaml-version/ocaml-version-3.6.7.ebuild b/dev-ml/ocaml-version/ocaml-version-3.6.7.ebuild
new file mode 100644
index 0000000000..26ec14736a
--- /dev/null
+++ b/dev-ml/ocaml-version/ocaml-version-3.6.7.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Library to parse and enumerate releases of the OCaml compiler"
+HOMEPAGE="https://github.com/ocurrent/ocaml-version"
+SRC_URI="https://github.com/ocurrent/ocaml-version/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+
+SLOT="0/${PV}"
+
+KEYWORDS="~amd64"
+IUSE="ocamlopt test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ test? (
+ dev-ml/alcotest:=
+ )
+"
diff --git a/dev-ml/ocamlc-loc/Manifest b/dev-ml/ocamlc-loc/Manifest
new file mode 100644
index 0000000000..f173e2e8cb
--- /dev/null
+++ b/dev-ml/ocamlc-loc/Manifest
@@ -0,0 +1 @@
+DIST ocamlc-loc-3.13.1.tar.gz 2891852 BLAKE2B 88cee2428134ddcd6b929915b6bbeb2d17be8b8190f963919a74c63ffcf80f596fb1556f88c41ee602b2386e02fdf396596a6b2097d67c720bd00e16cdda3a57 SHA512 910d4ddd55a91ee65d8ea35b8915506db74c924eb3b67f7b0715da5599ee5088ea3edec81ce6735addd5b17234e445608e59fa353b83e991c14768d83c97a2b5
diff --git a/dev-ml/ocamlc-loc/metadata.xml b/dev-ml/ocamlc-loc/metadata.xml
new file mode 100644
index 0000000000..2131acf3be
--- /dev/null
+++ b/dev-ml/ocamlc-loc/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ tokusan441@gmail.com
+ Hiroki Tokunaga
+
+
+ https://github.com/ocaml/dune/issues
+ ocaml/dune
+
+
diff --git a/dev-ml/ocamlc-loc/ocamlc-loc-3.13.1.ebuild b/dev-ml/ocamlc-loc/ocamlc-loc-3.13.1.ebuild
new file mode 100644
index 0000000000..5495cd1de1
--- /dev/null
+++ b/dev-ml/ocamlc-loc/ocamlc-loc-3.13.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Parse ocaml compiler output into structured form"
+HOMEPAGE="
+ https://opam.ocaml.org/packages/ocamlc-loc/
+ https://github.com/ocaml/dune
+"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+S="${WORKDIR}/dune-${PV}"
+
+LICENSE="MIT"
+
+SLOT="0/${PV}"
+
+KEYWORDS="~amd64"
+IUSE="ocamlopt"
+
+RESTRICT="test"
+
+RDEPEND="
+ ~dev-ml/dyn-${PV}:=
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ dune-compile ocamlc-loc
+}
+
+src_install() {
+ dune-install ocamlc-loc
+}
diff --git a/dev-ml/ppx_yojson_conv_lib/Manifest b/dev-ml/ppx_yojson_conv_lib/Manifest
new file mode 100644
index 0000000000..bf6c15970f
--- /dev/null
+++ b/dev-ml/ppx_yojson_conv_lib/Manifest
@@ -0,0 +1 @@
+DIST ppx_yojson_conv_lib-0.17.0.tar.gz 7370 BLAKE2B a9acbbee702eb670e6e4258bb91144337b4da7ad336e8c3b8b2b9995a8de26ebc8376aea356fed6c3c1111307c27161c87aed116669f282f4f91501493652d79 SHA512 a14fb7fc41ab9a27bf74582617d26b1d3e3e959a05b1f3848180d58480da33390f16d2da276a1adfa2865913f21866d35bfa747330b288b7d37780d43afed954
diff --git a/dev-ml/ppx_yojson_conv_lib/metadata.xml b/dev-ml/ppx_yojson_conv_lib/metadata.xml
new file mode 100644
index 0000000000..70f4d68707
--- /dev/null
+++ b/dev-ml/ppx_yojson_conv_lib/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ tokusan441@gmail.com
+ Hiroki Tokunaga
+
+
+ https://github.com/janestreet/ppx_yojson_conv_lib/issues
+ janestreet/ppx_yojson_conv_lib
+
+
diff --git a/dev-ml/ppx_yojson_conv_lib/ppx_yojson_conv_lib-0.17.0.ebuild b/dev-ml/ppx_yojson_conv_lib/ppx_yojson_conv_lib-0.17.0.ebuild
new file mode 100644
index 0000000000..479ee8717c
--- /dev/null
+++ b/dev-ml/ppx_yojson_conv_lib/ppx_yojson_conv_lib-0.17.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Runtime lib for ppx_yojson_conv"
+HOMEPAGE="https://github.com/janestreet/ppx_yojson_conv_lib"
+SRC_URI="https://github.com/janestreet/ppx_yojson_conv_lib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0/${PV}"
+
+KEYWORDS="~amd64"
+IUSE="ocamlopt test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-ml/yojson-1.7.0:=
+"
+
+DEPEND="
+ ${RDEPEND}
+"
diff --git a/dev-util/ocamlformat/Manifest b/dev-util/ocamlformat/Manifest
new file mode 100644
index 0000000000..183858fe31
--- /dev/null
+++ b/dev-util/ocamlformat/Manifest
@@ -0,0 +1 @@
+DIST ocamlformat-0.26.2.tar.gz 901463 BLAKE2B 619838f68f6031d8e98319a66c3a906b46e1c394c5d7ddce18a4c91029522add716f298d18b232503a84c1a0f6384edd280cc20faf0974f5b8c019e2e827a083 SHA512 c6df074b69a35a545898961f8cd578a5cafbf4a382bd0b9783a770a40072bdd91be864a53c27c175ceef7ffff5a25b165b475c7a92ac4f790bf19abc74897bbe
diff --git a/dev-util/ocamlformat/metadata.xml b/dev-util/ocamlformat/metadata.xml
new file mode 100644
index 0000000000..aaa09e3d59
--- /dev/null
+++ b/dev-util/ocamlformat/metadata.xml
@@ -0,0 +1,20 @@
+
+
+
+
+ tokusan441@gmail.com
+ Hiroki Tokunaga
+
+ ocamlformat is a code formatter for OCaml. It comes with opinionated default settings but is also fully customizable to suit your coding style.
+
+ Profiles: ocamlformat offers profiles we predefined formatting configurations. Profiles include default, ocamlformat, janestreet.
+ Configurable: Users can change the formatting profile and configure every option in their .ocamlformat configuration file.
+ Format Comments: ocamlformat can format comments, docstrings, and even code blocks in your comments.
+ RPC: ocamlformat provides an RPC server that can bed used by other tools to easily format OCaml Code.
+
+ocamlformat is part of the OCaml Platform, the recommended set of tools for OCaml.
+
+ https://github.com/ocaml-ppx/ocamlformat/issues
+ ocaml-ppx/ocamlformat
+
+
diff --git a/dev-util/ocamlformat/ocamlformat-0.26.2.ebuild b/dev-util/ocamlformat/ocamlformat-0.26.2.ebuild
new file mode 100644
index 0000000000..1ade5d9a29
--- /dev/null
+++ b/dev-util/ocamlformat/ocamlformat-0.26.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Auto-formatter for OCaml code"
+HOMEPAGE="https://github.com/ocaml-ppx/ocamlformat"
+SRC_URI="https://github.com/ocaml-ppx/ocamlformat/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0/${PV}"
+
+KEYWORDS="~amd64"
+IUSE="ocamlopt test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-ml/cmdliner:=
+ dev-ml/csexp:=
+ dev-ml/re:=
+
+ dev-ml/base:=
+ dev-ml/dune-build-info:=
+ dev-ml/either:=
+ dev-ml/fix:=
+ dev-ml/fpath:=
+ dev-ml/menhir:=
+ dev-ml/ocaml-version:=
+ dev-util/ocp-indent:=
+ dev-ml/stdio:=
+ dev-ml/uuseg:=
+ dev-ml/uutf:=
+ dev-ml/astring:=
+ dev-ml/camlp-streams:=
+"
+
+DEPEND="
+ ${RDEPEND}
+"
+
+BEPEND="
+ test? (
+ dev-ml/alcotest:=
+ )
+"
diff --git a/gui-apps/hyprpicker/hyprpicker-0.3.0.ebuild b/gui-apps/hyprpicker/hyprpicker-0.3.0-r1.ebuild
similarity index 85%
rename from gui-apps/hyprpicker/hyprpicker-0.3.0.ebuild
rename to gui-apps/hyprpicker/hyprpicker-0.3.0-r1.ebuild
index 6ae449d89d..12a894b6b1 100644
--- a/gui-apps/hyprpicker/hyprpicker-0.3.0.ebuild
+++ b/gui-apps/hyprpicker/hyprpicker-0.3.0-r1.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="~amd64"
RDEPEND="
dev-libs/wayland
x11-libs/cairo
+ x11-libs/libxkbcommon
x11-libs/pango
"
@@ -25,14 +26,4 @@ BDEPEND="
dev-util/wayland-scanner
media-libs/libglvnd
media-libs/libjpeg-turbo
- x11-libs/libxkbcommon
"
-
-src_compile() {
- emake protocols
- cmake_src_compile
-}
-
-src_install() {
- dobin "${BUILD_DIR}/${PN}"
-}
diff --git a/media-sound/supersonic/Manifest b/media-sound/supersonic/Manifest
new file mode 100644
index 0000000000..f4af8e81e9
--- /dev/null
+++ b/media-sound/supersonic/Manifest
@@ -0,0 +1,2 @@
+DIST supersonic-0.12.0-vendor.tar.xz 8597980 BLAKE2B 63d4ab29ef686972a91f777e3e116862f2aeae6ad54600255124aa67d18b1f589e530f55b569ae9271976fc2ffac1758fba713be9f2ec0dd08e619ec953cb9a6 SHA512 c72a5040f59da8d5f4d070864f3aaa9281c97a65823fe05e55a50b5496d0292f33637f794f4f711efd6058194aff6128b0dd4a3f4b9128ca2d616703d1aa99d1
+DIST supersonic-0.12.0.tar.gz 63643996 BLAKE2B 91782c2fd7921eeefa0c6e4c0db008ad3db43cfeed00e53adb4eda92491ec98c0f52fab0cd8dc05c6396f6503d1902aea9c9dbd657d215e536dc395998e0a523 SHA512 4da62497c8878ea939139a0752426ba6a2443137f46bebab16241dc67e222661614985841442234a38bf17270e62d1b8326598893b68a6359be02078737cd3e4
diff --git a/media-sound/supersonic/metadata.xml b/media-sound/supersonic/metadata.xml
new file mode 100644
index 0000000000..448169afa9
--- /dev/null
+++ b/media-sound/supersonic/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ davidroman96@gmail.com
+ David Roman
+
+
+ dweymouth/supersonic
+
+
diff --git a/media-sound/supersonic/supersonic-0.12.0.ebuild b/media-sound/supersonic/supersonic-0.12.0.ebuild
new file mode 100644
index 0000000000..bb012e141a
--- /dev/null
+++ b/media-sound/supersonic/supersonic-0.12.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A lightweight and full-featured cross-platform desktop client"
+HOMEPAGE="https://github.com/dweymouth/supersonic"
+SRC_URI="https://github.com/dweymouth/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://gentoo.kropotkin.rocks/go-pkgs/${P}-vendor.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+src_compile() {
+ ego build
+}
+
+src_install() {
+ dobin supersonic
+}
diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index 18f80eb0a0..e2f4fca5a6 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -1,2 +1,2 @@
-DIST megasync-5.3.0.0.tar.gz 24307650 BLAKE2B 4b4253f40abea54856d869ba5094d18dd7239f3c7a9d25611e1a053d370e943f29f3cbb4a672b559b1908600f6eafea586ec65e8a24cceb44a592337ff5e0f8a SHA512 61a4e0bf351816113bca23328dfe1872a031f6457368127dd1ec55f5147d22059e3cbb8998497398dbf706050eb228e09b41ed6300262a89c3abf71e1152f0e7
-DIST megasync-sdk-5.3.0.0.tar.gz 4146154 BLAKE2B 7b73f4475958f0d2ad341638f0f5c7ab1c9570f38ecceb7393268b4307cd4052a6ba5b358fabf3138ba7ad6e503c18c4314204d2a4c8c2d19846e4093889b24e SHA512 8b301cf8654112893bb79e3ce8f9f2c7ee27bafcc68df6f4bceb88bb54a2f5168cedf34bd262dfeb0ef0c67b46c9420259d7f0f13bc067f9ae7799cc09d28abc
+DIST megasync-5.4.0.0.tar.gz 24716654 BLAKE2B 06b2bfbdf6f0bda00bd53ae062c99352a71fa5f50fa88c75b9a2dcafb9b1f5d6b47be48bee2f052945e9a80f144024d8c1519698f5a951f140fa9170bfbbae27 SHA512 1e323fe637f6e32e893d3e22f512c3fbc1aca17eb5c85df24ef75d7492de9386fc18f20baa5fa7d28a83e763835e531da486c89c74e9223aa0e9216b9e343459
+DIST megasync-sdk-5.4.0.0.tar.gz 4158786 BLAKE2B bfaa09a358ba692477c8ba85fd86e9d919bb267b54390c02e2aa593d52ea6dd245721a854855576f72561500d6c8a763c4dbef9935e6defc38dede12b7fcd40f SHA512 78a7d478f1586c6dfa4b7f954e7cd00272b484996c4296fe18ea965198cfa6a342e9084a898a69b036e1e96b72aab28ac731e9397474713375f63e8dd9170e1d
diff --git a/net-misc/megasync/megasync-5.3.0.0-r1.ebuild b/net-misc/megasync/megasync-5.4.0.0.ebuild
similarity index 98%
rename from net-misc/megasync/megasync-5.3.0.0-r1.ebuild
rename to net-misc/megasync/megasync-5.4.0.0.ebuild
index 8b25de399b..01f7ff31d9 100644
--- a/net-misc/megasync/megasync-5.3.0.0-r1.ebuild
+++ b/net-misc/megasync/megasync-5.4.0.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]];then
EGIT_BRANCH="master"
EGIT_SUBMODULES=( '*' )
else
- MEGA_SDK_REV="eb8dba09149e1aad0210c3591f3ef6e50022f714" # commit of src/MEGASync/mega submodule
+ MEGA_SDK_REV="8ffa53c73b8295415f965139daf78cecbac70482" # commit of src/MEGASync/mega submodule
MEGA_TAG_SUFFIX="Linux"
SRC_URI="
https://github.com/meganz/MEGAsync/archive/v${PV}_${MEGA_TAG_SUFFIX}.tar.gz -> ${P}.tar.gz
diff --git a/net-p2p/monero/Manifest b/net-p2p/monero/Manifest
index 394d1ed3b7..a4b7a53221 100644
--- a/net-p2p/monero/Manifest
+++ b/net-p2p/monero/Manifest
@@ -1,10 +1,3 @@
-DIST monero-0.17.2.0.tar.gz 10622184 BLAKE2B c439e447f524a08a7ee79420873b7cf393f5cd3269460944aac30a315ac7c273c12fd809d86d41445bfc7e8c2feb0538d4e9fc1dadeb55f7e09f2920778f07a7 SHA512 85b764f1fc25127e7ca4ada67b1d832a9604c4cf65b160d689650e7ca7bbc36b73d8b26c5409fabdaad7369684997447cd812d1c521fad19d24f5b35f4789a1e
-DIST monero-0.17.2.3.tar.gz 10640501 BLAKE2B 15c7b92e7d00788214953c09af96d578e79c65ba9263d2a9ea19cfb9cc65e77d15770b873a10b77aae9e908dce74162d3577ed241600ebd57098b860bfd8f114 SHA512 7f3363c2cb66fa90a47a4cbb03b367182afa63af21d40bf07ea57cd91e4805684ec4795c0390bc966626a3b7b3c0a47167036873f5d1ea4b487a3d02bf01aaa4
-DIST monero-0.17.3.0.tar.gz 10659302 BLAKE2B fe73172e490f119a3d3730e3c11afd386e54fa22e12ac69d6f5e420d5409ba8201289feb01041520b374768325ea82132108972f68ef59114f414451232daea6 SHA512 97a40f594aaa6f588a3ad982142a0ea4f4410d208dd5ff43b09c70baadd32f87e92eac97abd800f25298e8d0613ae85f68605f586ceccf9dc078fcb189d7511a
DIST monero-0.17.3.2.tar.gz 10685156 BLAKE2B f313ec0e5e224797448a43ad46d4e990174eec6cdceec6dc9a25d62f014a775172e103d05a33558404bd84a8443ba6ada0c27f81a3a83fe630d16cbad97602f5 SHA512 2d34e0525b2ca1d7bddb8ea51776b49fec4fb866a1c1239c347460ed3369af2f430be32da45666f16c369cebef099f285971c0e806d75d60354f195c5f93891d
-DIST monero-0.18.1.2.tar.gz 11609034 BLAKE2B 3186a1038e9dd8f204a506df28c526bf3e0e5f788ad2d6b512f02735162a479be3f46d309d4e6888f30f962d68ecaf269888c8c0b21a066cad78b3c06f8cfc83 SHA512 d112f34b2fe6720c324560dd523badb68f08d03183d4bbbe7e1aa95f641cde4a1c4fa4042f1d47f9920f799269cc9620150136ebbef6dd66fcd4df0336c0d7f3
-DIST monero-0.18.2.0.tar.gz 11624875 BLAKE2B e8dc2e89c664cb218d900ce0803dd1716f1ee363bbddb232fbd22570818c9a9ca307df04808ffef1eb30ee6097fbe243f6977dfad181f57b9169f22d4819f145 SHA512 19625d8e6ee3e9f27ba06eb6027ef21571a2ae8261c9e32f6e74d2f7adf8c73e9dfe34516cd456426274c41ce941e1e5b7eba9f9d20492b99decbd9262aec434
-DIST monero-0.18.2.2.tar.gz 11640001 BLAKE2B 04b19e760b09636d7862af2a071128a28006d2829f08039cf55cfa1fd7d054b1382dbbcfc7f0ed381fcbd358e75ec437467349c7f250510e99e06527d1209da6 SHA512 78d4f7fee4eb37ba4837bc392c5869e21c9ea1e9bd9e95f768003bc833302935121c315fb3b4fcbe8f07a9513f928e9e9146dc7ca8892a3db2eb14cfe1371727
DIST monero-0.18.3.1.tar.gz 14005197 BLAKE2B 169d876caf94090894c9a2bd9d07b71e46411971b06da0f51fc57f01396de4f5f770062e08cbebf702b6b49dbcd47923675d2375795969f5673bf2091a7da742 SHA512 b29d25043d50fa30459e59e0c82627cc3dc4a7e2e28a727a353915a32cf5e70e36f548bda152dee13329cb2d09a978ff45c2121f8bf7acc8966957a53e772f03
DIST monero-0.18.3.3.tar.gz 14028018 BLAKE2B 07c3272175fb05645a2f5f7ce6cef4d65054ba1d80994c4dc8445ec4df13aebe2b268d5b4be49db0cdd35dcdce1bbd33874111e21503839d63fae70ea30b0dff SHA512 26aaa02be4d1109dfdae08981b9fee16a10c358030ba99ae809eb241e805c50edc8ad10b1a375cd02e3160fa3de8ae6773cca55618d39ca30614f1d6662c18e5
-DIST monero-8682.patch 1053 BLAKE2B 6252ee36961d41e6c7161004f2b3ddb0916a2dc91b91eed0e500a9681040366eb7e696abc91b138484bc735da5eb13f0a79ec1ded6f3c36dd3c8f8565113d7cf SHA512 2960a937ec04bc96a3564d2c730ca53cd1369f26d47567cd08c8e90abaf126f336a083e297b4240b5fae22ab3ad3cb45d741f2f48364d30f1442df393109a6eb
diff --git a/net-p2p/monero/files/monero-0.17.1.7-linkjobs.patch b/net-p2p/monero/files/monero-0.17.1.7-linkjobs.patch
deleted file mode 100644
index d0f59a6f9b..0000000000
--- a/net-p2p/monero/files/monero-0.17.1.7-linkjobs.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 12a78e5e745556c29e45b7716a8b038ecfbff800 Mon Sep 17 00:00:00 2001
-From: Matt Smith
-Date: Wed, 5 Aug 2020 18:39:44 +0100
-Subject: [PATCH] cmake: Use job pool feature to limit concurrent jobs
-
-Add two new options, MONERO_PARALLEL_COMPILE_JOBS and
-MONERO_PARALLEL_LINK_JOBS to try and prevent running out of memory when
-building everything.
-
-Requires >= cmake 3.0.0, and the use of the Ninja generator.
-
-Useful links:
-
-* https://cmake.org/cmake/help/latest/prop_gbl/JOB_POOLS.html
-* https://reviews.llvm.org/D6304
----
- CMakeLists.txt | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f63c07a35d..3729a6b659 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -55,6 +55,20 @@ else()
- message(STATUS "ccache deselected")
- endif()
-
-+if (${CMAKE_VERSION} VERSION_GREATER "3.0.0" AND CMAKE_MAKE_PROGRAM MATCHES "ninja")
-+ set(MONERO_PARALLEL_COMPILE_JOBS "" CACHE STRING "The maximum number of concurrent compilation jobs.")
-+ if (MONERO_PARALLEL_COMPILE_JOBS)
-+ set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${MONERO_PARALLEL_COMPILE_JOBS})
-+ set(CMAKE_JOB_POOL_COMPILE compile_job_pool)
-+ endif ()
-+
-+ set(MONERO_PARALLEL_LINK_JOBS "" CACHE STRING "The maximum number of concurrent link jobs.")
-+ if (MONERO_PARALLEL_LINK_JOBS)
-+ set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${MONERO_PARALLEL_LINK_JOBS})
-+ set(CMAKE_JOB_POOL_LINK link_job_pool)
-+ endif ()
-+endif()
-+
- enable_language(C ASM)
-
- function (die msg)
diff --git a/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch
deleted file mode 100644
index ea7f804996..0000000000
--- a/net-p2p/monero/files/monero-0.17.1.7-unbundle-dependencies.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 41f82e26c..3eb2b2e78 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -312,7 +312,7 @@ endif()
- # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
- # set(BSDI TRUE)
-
--include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include)
-+include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external )
-
- if(APPLE)
- include_directories(SYSTEM /usr/include/malloc)
-@@ -995,7 +995,6 @@ if(SODIUM_LIBRARY)
- set(ZMQ_LIB "${ZMQ_LIB};${SODIUM_LIBRARY}")
- endif()
-
--include(external/supercop/functions.cmake) # place after setting flags and before src directory inclusion
- add_subdirectory(contrib)
- add_subdirectory(src)
-
-diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index a8916a7d0..05ab35c82 100644
---- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -37,19 +37,7 @@
-
- find_package(Miniupnpc REQUIRED)
-
--message(STATUS "Using in-tree miniupnpc")
--add_subdirectory(miniupnp/miniupnpc)
--set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
--if(MSVC)
-- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
--elseif(NOT MSVC)
-- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
--endif()
--if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE")
--endif()
--
--set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
-+set(UPNP_LIBRARIES "miniupnpc" PARENT_SCOPE)
-
- find_package(Unbound)
-
-@@ -81,4 +69,3 @@ endif()
- add_subdirectory(db_drivers)
- add_subdirectory(easylogging++)
- add_subdirectory(qrcodegen)
--add_subdirectory(randomx EXCLUDE_FROM_ALL)
-diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt
-index 3b33fe90a..ba354a0e8 100644
---- a/src/crypto/CMakeLists.txt
-+++ b/src/crypto/CMakeLists.txt
-@@ -55,6 +55,7 @@ list(APPEND crypto_sources CryptonightR_template.S)
- endif()
-
- include_directories(${RANDOMX_INCLUDE})
-+include_directories(SYSTEM /usr/include/monero)
-
- set(crypto_headers)
-
-@@ -116,6 +117,3 @@ endif()
-
- # cheat because cmake and ccache hate each other
- set_property(SOURCE CryptonightR_template.S PROPERTY LANGUAGE C)
--
--# Must be done last, because it references libraries in this directory
--add_subdirectory(wallet)
-diff --git a/src/crypto/wallet/crypto.h b/src/crypto/wallet/crypto.h
-index a4c5d5a07..5c6b96cd8 100644
---- a/src/crypto/wallet/crypto.h
-+++ b/src/crypto/wallet/crypto.h
-@@ -29,7 +29,6 @@
- #pragma once
-
- #include
--#include "crypto/wallet/ops.h"
-
- namespace crypto {
- namespace wallet {
-diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt
-index ff2afba4b..26b0f4523 100644
---- a/src/device/CMakeLists.txt
-+++ b/src/device/CMakeLists.txt
-@@ -72,7 +72,7 @@ target_link_libraries(device
- ${HIDAPI_LIBRARIES}
- cncrypto
- ringct_basic
-- wallet-crypto
-+ monero-crypto
- ${OPENSSL_CRYPTO_LIBRARIES}
- ${Boost_SERIALIZATION_LIBRARY}
- PRIVATE
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 65db2615c..3ace310f6 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -60,9 +60,9 @@
- #include "cryptonote_core/cryptonote_core.h"
- #include "net/parse.h"
-
--#include
--#include
--#include
-+#include
-+#include
-+#include
-
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch b/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch
deleted file mode 100644
index 07a584a39b..0000000000
--- a/net-p2p/monero/files/monero-0.17.2.0-boost-176.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From c28d2f7c110c0a2161fa02d6c20df94a60a41965 Mon Sep 17 00:00:00 2001
-From: loqs
-Date: Sun, 23 May 2021 20:29:17 +0100
-Subject: [PATCH] Fix boost 1.76.0 compatibility
-
-Add missing header boost/mpl/contains.hpp
-monero-project/monero/issues/7728
----
- contrib/epee/include/storages/portable_storage.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/contrib/epee/include/storages/portable_storage.h b/contrib/epee/include/storages/portable_storage.h
-index 1e68605abf5..801bb2c3465 100644
---- a/contrib/epee/include/storages/portable_storage.h
-+++ b/contrib/epee/include/storages/portable_storage.h
-@@ -40,6 +40,8 @@
- #include "span.h"
- #include "int-util.h"
-
-+#include
-+
- namespace epee
- {
- namespace serialization
diff --git a/net-p2p/monero/files/monero-0.17.3.0-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.17.3.2-unbundle-dependencies.patch
similarity index 100%
rename from net-p2p/monero/files/monero-0.17.3.0-unbundle-dependencies.patch
rename to net-p2p/monero/files/monero-0.17.3.2-unbundle-dependencies.patch
diff --git a/net-p2p/monero/files/monero-0.18.1.0-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.18.1.0-unbundle-dependencies.patch
deleted file mode 100644
index 181b4ddccb..0000000000
--- a/net-p2p/monero/files/monero-0.18.1.0-unbundle-dependencies.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 41f82e26c..3eb2b2e78 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -382,7 +382,7 @@
- # elseif(CMAKE_SYSTEM_NAME MATCHES ".*BSDI.*")
- # set(BSDI TRUE)
-
--include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external external/supercop/include)
-+include_directories(external/rapidjson/include external/easylogging++ src contrib/epee/include external )
-
- if(APPLE)
- include_directories(SYSTEM /usr/include/malloc)
-@@ -1082,7 +1082,6 @@
- set(ZMQ_LIB "${ZMQ_LIB};${SODIUM_LIBRARY}")
- endif()
-
--include(external/supercop/functions.cmake) # place after setting flags and before src directory inclusion
- add_subdirectory(contrib)
- add_subdirectory(src)
-
-diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
-index a8916a7d0..05ab35c82 100644
---- a/external/CMakeLists.txt
-+++ b/external/CMakeLists.txt
-@@ -37,21 +37,7 @@
-
- find_package(Miniupnpc REQUIRED)
-
--message(STATUS "Using in-tree miniupnpc")
--set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
--add_subdirectory(miniupnp/miniupnpc)
--set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
--set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
--if(MSVC)
-- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
--elseif(NOT MSVC)
-- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
--endif()
--if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
-- set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE")
--endif()
--
--set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
-+set(UPNP_LIBRARIES "miniupnpc" PARENT_SCOPE)
-
- find_package(Unbound)
-
-@@ -83,4 +69,3 @@
- add_subdirectory(db_drivers)
- add_subdirectory(easylogging++)
- add_subdirectory(qrcodegen)
--add_subdirectory(randomx EXCLUDE_FROM_ALL)
---- a/src/crypto/CMakeLists.txt 2022-08-15 18:09:12.275043765 +0200
-+++ b/src/crypto/CMakeLists.txt 2022-08-15 18:10:52.687184277 +0200
-@@ -55,6 +55,7 @@
- endif()
-
- include_directories(${RANDOMX_INCLUDE})
-+include_directories(SYSTEM /usr/include/monero)
-
- set(crypto_headers)
-
-@@ -97,6 +98,3 @@
- # cheat because cmake and ccache hate each other
- set_property(SOURCE CryptonightR_template.S PROPERTY LANGUAGE C)
- set_property(SOURCE CryptonightR_template.S PROPERTY XCODE_EXPLICIT_FILE_TYPE sourcecode.asm)
--
--# Must be done last, because it references libraries in this directory
--add_subdirectory(wallet)
-diff --git a/src/crypto/wallet/crypto.h b/src/crypto/wallet/crypto.h
-index a4c5d5a07..5c6b96cd8 100644
---- a/src/crypto/wallet/crypto.h
-+++ b/src/crypto/wallet/crypto.h
-@@ -29,7 +29,6 @@
- #pragma once
-
- #include
--#include "crypto/wallet/ops.h"
-
- namespace crypto {
- namespace wallet {
-diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt
-index ff2afba4b..26b0f4523 100644
---- a/src/device/CMakeLists.txt
-+++ b/src/device/CMakeLists.txt
-@@ -73,7 +73,7 @@
- cncrypto
- cryptonote_format_utils_basic
- ringct_basic
-- wallet-crypto
-+ monero-crypto
- ${OPENSSL_CRYPTO_LIBRARIES}
- ${Boost_SERIALIZATION_LIBRARY}
- PRIVATE
-diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
-index 65db2615c..3ace310f6 100644
---- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -61,9 +61,9 @@
- #include "cryptonote_core/cryptonote_core.h"
- #include "net/parse.h"
-
--#include
--#include
--#include
-+#include
-+#include
-+#include
-
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
diff --git a/net-p2p/monero/files/monero-0.18.2.2-cstdint.patch b/net-p2p/monero/files/monero-0.18.2.2-cstdint.patch
deleted file mode 100644
index 8ac44be8ea..0000000000
--- a/net-p2p/monero/files/monero-0.18.2.2-cstdint.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From c32befe4f8385f5f893c0db611060bc7c7b425f3 Mon Sep 17 00:00:00 2001
-From: tobtoht
-Date: Sat, 6 May 2023 18:13:18 +0200
-Subject: [PATCH] fix missing includes
-
----
- contrib/epee/include/file_io_utils.h | 1 +
- contrib/epee/include/storages/parserse_base_utils.h | 1 +
- src/common/combinator.h | 1 +
- src/wallet/api/wallet2_api.h | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/contrib/epee/include/file_io_utils.h b/contrib/epee/include/file_io_utils.h
-index da05520c1b9..de95e58c3ea 100644
---- a/contrib/epee/include/file_io_utils.h
-+++ b/contrib/epee/include/file_io_utils.h
-@@ -29,6 +29,7 @@
-
- #include
- #include
-+#include
-
- namespace epee
- {
-diff --git a/contrib/epee/include/storages/parserse_base_utils.h b/contrib/epee/include/storages/parserse_base_utils.h
-index 898813ff9fd..4658eba77ad 100644
---- a/contrib/epee/include/storages/parserse_base_utils.h
-+++ b/contrib/epee/include/storages/parserse_base_utils.h
-@@ -30,6 +30,7 @@
-
- #include
- #include
-+#include
-
- namespace epee
- {
-diff --git a/src/common/combinator.h b/src/common/combinator.h
-index cb237ed8d40..6ef244a1ed1 100644
---- a/src/common/combinator.h
-+++ b/src/common/combinator.h
-@@ -34,6 +34,7 @@
- #include
- #include
- #include
-+#include
-
- namespace tools {
-
-diff --git a/src/wallet/api/wallet2_api.h b/src/wallet/api/wallet2_api.h
-index ab3d9732e8f..df86da847ea 100644
---- a/src/wallet/api/wallet2_api.h
-+++ b/src/wallet/api/wallet2_api.h
-@@ -38,6 +38,7 @@
- #include
- #include
- #include
-+#include
-
- // Public interface for libwallet library
- namespace Monero {
diff --git a/net-p2p/monero/files/monero-0.18.3.3-miniupnp-api-18.patch b/net-p2p/monero/files/monero-0.18.3.3-miniupnp-api-18.patch
new file mode 100644
index 0000000000..d281f60ec0
--- /dev/null
+++ b/net-p2p/monero/files/monero-0.18.3.3-miniupnp-api-18.patch
@@ -0,0 +1,30 @@
+diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
+index 30e3d31b9..c49783e1c 100644
+--- a/src/p2p/net_node.inl
++++ b/src/p2p/net_node.inl
+@@ -2989,7 +2989,12 @@ namespace nodetool
+ UPNPUrls urls;
+ IGDdatas igdData;
+ char lanAddress[64];
++#if MINIUPNPC_API_VERSION > 17
++ char wanAddress[64];
++ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, wanAddress, sizeof(wanAddress));
++#else
+ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress);
++#endif
+ freeUPNPDevlist(deviceList);
+ if (result > 0) {
+ if (result == 1) {
+@@ -3057,7 +3062,12 @@ namespace nodetool
+ UPNPUrls urls;
+ IGDdatas igdData;
+ char lanAddress[64];
++#if MINIUPNPC_API_VERSION > 17
++ char wanAddress[64];
++ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, wanAddress, sizeof(wanAddress));
++#else
+ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress);
++#endif
+ freeUPNPDevlist(deviceList);
+ if (result > 0) {
+ if (result == 1) {
diff --git a/net-p2p/monero/files/monero-0.18.1.2-unbundle-dependencies.patch b/net-p2p/monero/files/monero-0.18.3.3-unbundle-dependencies.patch
similarity index 100%
rename from net-p2p/monero/files/monero-0.18.1.2-unbundle-dependencies.patch
rename to net-p2p/monero/files/monero-0.18.3.3-unbundle-dependencies.patch
diff --git a/net-p2p/monero/monero-0.17.2.0.ebuild b/net-p2p/monero/monero-0.17.2.0.ebuild
deleted file mode 100644
index 6b1e9824b6..0000000000
--- a/net-p2p/monero/monero-0.17.2.0.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="The secure, private, untraceable cryptocurrency"
-HOMEPAGE="https://github.com/monero-project/monero"
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/monero-project/monero.git"
- EGIT_SUBMODULES=()
-else
- SRC_URI="https://github.com/monero-project/monero/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+daemon readline +tools +wallet-cli +wallet-rpc"
-REQUIRED_USE="|| ( daemon tools wallet-cli wallet-rpc )"
-RESTRICT="test"
-
-DEPEND="
- acct-group/monero
- acct-user/monero
-