diff --git a/app-emulation/rars/Manifest b/app-emulation/rars/Manifest
new file mode 100644
index 0000000000..5d40f7a53c
--- /dev/null
+++ b/app-emulation/rars/Manifest
@@ -0,0 +1,2 @@
+DIST JSoftFloat-75c3a5d.gh.tar.gz 8612 BLAKE2B 214479edfcd3bd8b57908d201838cfaf37b9bf8f6cae69191a920fd6b9c197089b4e370f77c10a888117cad2baa189608119b3fbef4d66021dfe12d9fcd22820 SHA512 2fefce28475cdfbf7b7331e79b5c263021a31b4411803ae2bdd435dbfc2a3503d8711b56502d1cf2aadc52bc5bd7af80cbd33fb6cc077ddbb222bfe18cb19208
+DIST rars-1.6.gh.tar.gz 1596110 BLAKE2B dd30b5eca670741cf635418b149ec5fd24432bb10aede70e91b8f5d3469fe839207ef0d2c5f9e91fce3ff638b58e533528413330a46c80464060a5e6c5b2903d SHA512 543e4c16a023b25e330286315f095f2311dc4255c906dfbfe39cadd96cdc1856612ace805cfedf4a155e4fcd70ddea51493c25bf3cb30936d8b1aea4ece226d3
diff --git a/app-emulation/rars/metadata.xml b/app-emulation/rars/metadata.xml
new file mode 100644
index 0000000000..cc12615f14
--- /dev/null
+++ b/app-emulation/rars/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ gasc@eurecom.fr
+ Gasc Henri
+
+
+ TheThirdOne/rars
+
+
diff --git a/app-emulation/rars/rars-1.6.ebuild b/app-emulation/rars/rars-1.6.ebuild
new file mode 100644
index 0000000000..ca1429e680
--- /dev/null
+++ b/app-emulation/rars/rars-1.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-pkg-simple
+
+jsoft_hash="75c3a5d1ab1322ce4dde0b5994d6f9f6ff820529"
+
+DESCRIPTION="RARS -- RISC-V Assembler and Runtime Simulator"
+HOMEPAGE="https://github.com/TheThirdOne/rars"
+SRC_URI="
+ https://github.com/TheThirdOne/rars/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+ https://github.com/TheThirdOne/JSoftFloat/archive/${jsoft_hash}.tar.gz -> JSoftFloat-75c3a5d.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+S="${WORKDIR}/${P}"
+
+CP_DEPEND=""
+
+RDEPEND=">=virtual/jre-1.8:*
+ ${CP_DEPEND}"
+DEPEND=">=virtual/jdk-1.8:*
+ ${CP_DEPEND}"
+
+src_unpack() {
+ default
+ mv "${WORKDIR}/JSoftFloat-${jsoft_hash}" "${S}/src/jsoftfloat"
+}
+
+src_prepare() {
+ default
+ java-pkg_clean
+}
+
+src_compile() {
+ # Using the build-jar.sh script
+ cd "${S}"
+ mkdir -p build
+ find src -name "*.java" | xargs javac -d build
+ find src -type f -not -name "*.java" -exec cp --parents {} build \;
+ cp -rf build/src/* build
+ rm -r build/src
+ cp README.md License.txt build
+ cd build
+ jar cfm ../rars.jar ./META-INF/MANIFEST.MF *
+}
+
+src_install() {
+ java-pkg_dojar "${S}/rars.jar"
+ mkdir -p "${D}/usr/bin"
+ echo "#!/bin/bash" > "${D}/usr/bin/rars"
+ echo "java -jar /usr/share/rars/lib/rars.jar" >> "${D}/usr/bin/rars"
+ chmod 755 "${D}/usr/bin/rars"
+}
diff --git a/dev-embedded/arduino-cli/Manifest b/dev-embedded/arduino-cli/Manifest
new file mode 100644
index 0000000000..3deb3f5bc4
--- /dev/null
+++ b/dev-embedded/arduino-cli/Manifest
@@ -0,0 +1,2 @@
+DIST arduino-cli-0.34.2-vendor.tar.xz 2399168 BLAKE2B 22d0050aad84bbed7699d287c6b46293c7b0af0369809cb1c5291bda73c661a1fa9e6b5f882a86936452b51c2f8d58c5c157d13f96c22daec4fb6728594d48eb SHA512 9cf199eedf95007d5dd033c9f75c3bb54af152a36f6d353ae3237c2b3b31d44852b8b139983aaf35caabe77c0302a84f95b14481157c5638ca42e91ab03e9327
+DIST arduino-cli-0.34.2.tar.gz 10335801 BLAKE2B 2552d31699cdb0a8d3ded32e14a345354ab17e74e2085941c48cd69e5345b08224f84b3bf6d7fe543c895a3c2091a6114f557b48a141455bf9c3608f0ea489ab SHA512 5d16a2e45f31fc35ffe75fbaabeac62b6c8aca6d0151e48ebedf27325b757473ea55b7883f8f727df951b1230a671ad4bf3603bd600dfca8f7154f3189f2ca12
diff --git a/dev-embedded/arduino-cli/arduino-cli-0.34.2.ebuild b/dev-embedded/arduino-cli/arduino-cli-0.34.2.ebuild
new file mode 100644
index 0000000000..9833ac63cf
--- /dev/null
+++ b/dev-embedded/arduino-cli/arduino-cli-0.34.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="Next-generation arduino command line tool"
+HOMEPAGE="https://arduino.github.io/arduino-cli/latest/"
+
+SRC_URI="
+ https://github.com/arduino/arduino-cli/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+ https://pkg.artemis.sh/gentoo/pkg-deps/dev-embedded/arduino-cli/${P}-vendor.tar.xz
+"
+
+LICENSE="Apache-2.0 BSD BSD-2 GPL-2 GPL-3 LGPL-3 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+src_compile() {
+ ego build -tags xversion \
+ -ldflags "-X github.com/arduino/arduino-cli/version.versionString=${PV}"
+}
+
+src_install() {
+ dobin arduino-cli
+}
diff --git a/dev-embedded/arduino-cli/metadata.xml b/dev-embedded/arduino-cli/metadata.xml
new file mode 100644
index 0000000000..1b5d10e9b7
--- /dev/null
+++ b/dev-embedded/arduino-cli/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ artemis@artemis.sh
+ Primary maintainer
+ Artemis Everfree
+
+
+ arduino/arduino-cli
+
+
diff --git a/dev-python/cloup/Manifest b/dev-python/cloup/Manifest
new file mode 100644
index 0000000000..7d42675ff5
--- /dev/null
+++ b/dev-python/cloup/Manifest
@@ -0,0 +1 @@
+DIST cloup-3.0.2.gh.tar.gz 225377 BLAKE2B cec9fd4c493b46e4498eea7541b8eedd1b9902952fc8ec353c7b5fc14306aea778ef5683b3ec217b54989cfce2b681be3da262879ac3060d3db4284a3ac6c1f8 SHA512 4e19a058c7c07841296ff680cd6be0044d5ab181cd7bcd053b30c709f4dcc21720db8fac60045e453f91b2af7c168df1f0afa425d5dc9d5794040846c72bd79c
diff --git a/dev-python/cloup/cloup-3.0.2.ebuild b/dev-python/cloup/cloup-3.0.2.ebuild
new file mode 100644
index 0000000000..35e3d168d4
--- /dev/null
+++ b/dev-python/cloup/cloup-3.0.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Click + option groups + constraints + aliases + help themes + ..."
+HOMEPAGE="https://github.com/janluke/cloup https://pypi.org/project/cloup/"
+SRC_URI="https://github.com/janluke/cloup/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ >=dev-python/click-8.0[${PYTHON_USEDEP}]
+
+
+
+
+ gasc@eurecom.fr
+ Gasc Henri
+
+
+ cloup
+ janLuke/cloup
+ https://cloup.readthedocs.io/
+
+ Library to build command line interfaces based on (and 100% compatible) with Click. It's like using Click but with more built-in features: option groups, constraints (e.g. mutually exclusive params), command aliases, help themes, "did you mean ...?" suggestions and more.
+
diff --git a/gui-apps/wl-scripts/wl-scripts-1.2.3.ebuild b/gui-apps/wl-scripts/wl-scripts-1.2.3-r1.ebuild
similarity index 96%
rename from gui-apps/wl-scripts/wl-scripts-1.2.3.ebuild
rename to gui-apps/wl-scripts/wl-scripts-1.2.3-r1.ebuild
index 9501b4b7df..342a348b92 100644
--- a/gui-apps/wl-scripts/wl-scripts-1.2.3.ebuild
+++ b/gui-apps/wl-scripts/wl-scripts-1.2.3-r1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
app-misc/jq
>=gui-apps/wofi-1.3
gui-apps/slurp
- gui-wm/sway
+ gui-libs/wlroots
"
BDEPEND="" # scripts are just sh
diff --git a/net-misc/xkcd-handler/Manifest b/net-misc/xkcd-handler/Manifest
index 1a31bfe566..5b9e558d57 100644
--- a/net-misc/xkcd-handler/Manifest
+++ b/net-misc/xkcd-handler/Manifest
@@ -1 +1 @@
-DIST xkcd-1.0.12.tar.gz 14451 BLAKE2B e1426d615181a1281356ddc29654174f3ae5b4a275ddfb8914623cd48d9ee72dbf4e39640af0c0745b3e6986d22337a78d1efded92d1ca28b97174860d503ef4 SHA512 ac722fc03f82797c72f5b4bdeea4fabdd5d57d8bc13124d8aee6ee31ab2297e52e30a1bec3c50b6ea29345ea9bcadab207c0aeb92dbcec1dfb05b2d0bf1414e1
+DIST xkcd-1.0.13.tar.gz 14454 BLAKE2B beb21145b26ecb5efe1d5b4645f98c51440458e7c31203d20777af43b984ed02c8418b02bf22b81c242427a30126c96544db9c19b6e57e881cf2abef5c3b74c8 SHA512 01e79113b6ec072ca2d9340773497f32145233b945bba0bb5c11f78924fd305e832c9a4c3a39ca2972100d421d912b885333d5b78c5be90fcd53264223d187c7
diff --git a/net-misc/xkcd-handler/xkcd-handler-1.0.12.ebuild b/net-misc/xkcd-handler/xkcd-handler-1.0.13.ebuild
similarity index 100%
rename from net-misc/xkcd-handler/xkcd-handler-1.0.12.ebuild
rename to net-misc/xkcd-handler/xkcd-handler-1.0.13.ebuild