9 files changed, 110 insertions, 8 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f4b0d6c333e4..a818b4805db3 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index 5e9e7fbbe049..38fb8cb68027 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,5 +1,8 @@
 AUX icdiff-1.9.5-tests.patch 761 BLAKE2B a1e837489ea14ea0a2ee88dd23294bf9dc6368fa052b5bf888ca1a37401903717792651833e751a8711c8b865ce4a038615ad4c23f91586af6b46511d28dfb52 SHA512 c1587ce221b7c1e9191b429c1b16c84bdc698e889e5f3c0ce722442adcdb836f2b7f38c193163ba5bc210ef31da4a3e3afd90ae44d3ad285ebe563993125f8cb
 AUX icdiff-2.0.6-tests.patch 1765 BLAKE2B e088a9d704ae90e12df17a35a6fbb2f65a55988348d69901f7817f8498e556a6e3d330f933a418b13ca70306908eafbf46cb24f812732a32e525b1b8b838b54a SHA512 c19f6593bc09929bcb6157198ecb5911f9af9a3b8e5812c46133a9fce8f2d1d436378b6eb5b01629bf30fac1e0049f60914a51ab243d92cf34571b0468bebb2b
+AUX icdiff-2.0.7-tests.patch 784 BLAKE2B e9551960101822173623eb411d67116d6691ceee687d102247ef01e960af4a5d66197edc91eec47828618cab65c0575886dd32be81f886548c68f87fd6f99ea2 SHA512 9c402168c6e87fa68eaa0bfdc7476fb42ea2e66488dd05bbe59713acba43d62db7639b3c831d4d34195091ee4b3720bf5418e8903b53d3da0991231f7b5191c4
 DIST icdiff-2.0.6.tar.gz 39715 BLAKE2B 931799040c158c522b3788941bddaef074a5e769cc56b6d80ca9515ee0c437e0ec0b7453c7409133c5567b98e7d41355e1d9f647d1939c78d07c2bf4c010fa5e SHA512 23ed93cc68ae44e661d61cef7e489249fc39e9f8fd18cac5551e89a713aef8cd2ecb37b0f301f543a4ba7003c74b5a311430ab8666760a76ee8441a4ac920ff5
+DIST icdiff-2.0.7.tar.gz 40150 BLAKE2B 54e8528a5e0fec305787a42657dc6f54849a1732509b231ecf948856f4e681ba75654bedf7bc964d96a2b1c2e95d672c837e1ebc55c9a291f572c91600a2e4aa SHA512 0fb3a8f91120ecd5dd55254fdea0f055bc46905c3b257efcd1b8b0b47927b2b2575b7255e3e260c97b76cd2f40548c8a3653a622a7a1aaac528a4cdae64a8b16
 EBUILD icdiff-2.0.6.ebuild 693 BLAKE2B 5507251e7bf057fd9342fd201a0b3697727347d705b53033ea0fe17ecffaa856126cc2c71d1016cfa67eeca6392ed0d26009047089de5ee5a83ed9025e6c83a5 SHA512 2de660d451e75f7a652ab2712e05d731b0a4661756669cd18aa9000fa64d705f018a9b9c14a51b12ee9d805e204d895342fad406b7318517aac36cc39ef4347a
+EBUILD icdiff-2.0.7.ebuild 693 BLAKE2B dcbdc93344a504bab496fc4def39d5525f7d435ce02e47f231bf0a30c1d1db3bd9c4bb3e33f31856ddb7234d6b30b20168239070752b17c25633c969f02f007b SHA512 eee62adb2eceb2a0de770c0c82a573b05e267d89064962fae2e4236d663f62f0cbab74d2ea9cc5a13f7ccbf40315049f2200cb6ed3d3a1b543c50c3843109085
 MISC metadata.xml 343 BLAKE2B a9942d59eb56cb6389a59b3d5c2995a5131f53cfe82ceabd2b608a57e9110066977b5eb1c7413f2a76a147c64a7580a4b75c76b2f03abd43d667b5a1d6aa8a23 SHA512 9b0da11632fa80fb598a5fe673cb15bdf3612ad9bd5cf84d9f5e2aa7217cd133039db509daabd6d98fac202c453b82ba40bd927401a346cf4c6039c47b45e697
diff --git a/app-misc/icdiff/files/icdiff-2.0.7-tests.patch b/app-misc/icdiff/files/icdiff-2.0.7-tests.patch
new file mode 100644
index 000000000000..3ef2f83a20f6
--- /dev/null
+++ b/app-misc/icdiff/files/icdiff-2.0.7-tests.patch
@@ -0,0 +1,37 @@
+From 741d8b24bf7694d535b68fdbe23db6c33f4a5420 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 21 Aug 2023 23:52:20 +0200
+Subject: [PATCH] test.sh: Stop running flake8 and black
+
+---
+ test.sh | 14 --------------
+ 1 file changed, 14 deletions(-)
+
+diff --git a/test.sh b/test.sh
+index 4fc09fb..fb22fb0 100755
+--- a/test.sh
++++ b/test.sh
+@@ -213,20 +213,6 @@ function ensure_installed() {
+   fi
+ }
+ 
+-ensure_installed "black"
+-echo 'Running black formatter...'
+-if ! black icdiff --quiet --line-length 79 --check; then
+-  echo ""
+-  echo 'Consider running `black icdiff --line-length 79`'
+-  fail
+-fi
+-
+-ensure_installed "flake8"
+-echo 'Running flake8 linter...'
+-if ! flake8 icdiff; then
+-  fail
+-fi
+-
+ if ! $REGOLD; then
+   echo PASS
+ fi
+-- 
+2.41.0
+
diff --git a/app-misc/icdiff/icdiff-2.0.7.ebuild b/app-misc/icdiff/icdiff-2.0.7.ebuild
new file mode 100644
index 000000000000..730d47332909
--- /dev/null
+++ b/app-misc/icdiff/icdiff-2.0.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Colourized diff that supports side-by-side diffing"
+HOMEPAGE="https://www.jefftk.com/icdiff"
+SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-release-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+	"${FILESDIR}/icdiff-1.9.5-tests.patch"
+	"${FILESDIR}/icdiff-2.0.7-tests.patch"
+)
+
+DOCS=(README.md ChangeLog)
+
+python_test() {
+	bash test.sh "${EPYTHON%.*}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/app-misc/no-more-secrets/Manifest b/app-misc/no-more-secrets/Manifest
index 10f53b749dda..a658155ccaf7 100644
--- a/app-misc/no-more-secrets/Manifest
+++ b/app-misc/no-more-secrets/Manifest
@@ -1,6 +1,8 @@
 AUX no-more-secrets-0.3.3-respect-ldflags.patch 1424 BLAKE2B 22c17b3f816168ff1e9dbeff36da16221b018c78c6d213af26450c5c8d9150f98448e3e272db5a5ff7b17ca538d6dfc167c339e82ee2894df5a9228b0d4c050a SHA512 f08b50ebf89b9d2ee2c605b774d9f653b342175c2dff65476d174a9c27b7e5b2f860a0b34b5e20bd1a84c4a96a993afc30a4cfd3e08cafe01779b52c5fb6d8f0
 AUX no-more-secrets-9999-2018-10-25-respect-ldflags.patch 1492 BLAKE2B 9f65f7ca747cb044913f26070337031bb6a1d441a3aa2d1b3b9c745cb948e47482cce1500f58384968059e408429e2e6af43762f022197213e7c0bf67ab66c59 SHA512 50215e6003f262e27c1b58f12e70b7b2101e9cca39d48bc3056c4474219fcd6bd60fdc3408910d01981efb00318da5289cd5a2258868ae616761af969c0980b5
 DIST no-more-secrets-0.3.3.tar.gz 24713 BLAKE2B c47cc71e72c8bc10bfc27b382e22d1b808b1efa65f3355ce0b435490c1628e476824414541fd12c58c99b47822724bb8cb6cdf1a0b0edf05068e7400cfcef09a SHA512 d261c9d2f7617149815627a4b6817aa5b483045cefbad148038ac9f13bc231b571034791aaaabc2ce9ab112cecc6015efc74167955099b8b57d1810f81210b31
+DIST no-more-secrets-1.0.1.tar.gz 25251 BLAKE2B 6508c65281c36effff7ccba80ad47b76c0f6c509bb4aeb4ffb35adef0b25612991e9923737128c1581a28b20bf2338cef7315b60ed8a637ea9b499d390193299 SHA512 436f092af23252d043f9b790f2e92fdfe0316fb07da66d7c35eda3967aeeab48a402ee6ca8b3630677798f74846f375ca071d828d0d5493f58418366dfc3366f
 EBUILD no-more-secrets-0.3.3.ebuild 709 BLAKE2B eb76dc2153b180b0324a559dcefcf5c50de32a95cc896d4f6d66d0cc809de29bd24ff95757ab8083ef56e5f0c68a86b7a860d780fa54167d59787fc9535d2128 SHA512 d108dd35f47573a22d61f7a90b71ae7c5bbdd424c2bfc9e21e8e1469d22e06ded601feab880d8b6280b89452a9b7dd45ba0a08bae47c433c1243415e876b2abc
-EBUILD no-more-secrets-9999.ebuild 729 BLAKE2B 95e3238654c9425a1adc01e5913cff9df11af1a1d6d4e3c58a0a77d33cfea6b82e442ee5f422d12cc0cfc22735c516f2582be18dee8c86c91c50f7e0f963acab SHA512 7f6d742a634de914615c49eb4462fc5f3c122dfa1464024f82d458a52a7380a8d1389d154cf72651e1021d900c4164e5412db3a8dfec2f460a3f8dae9d610748
+EBUILD no-more-secrets-1.0.1.ebuild 742 BLAKE2B a5d2aa1c157ea7ffb6c45872c5bf6dddc6ff4bac0303c886b1fc05cf0650950878fb3b42d080e0c72a775810ace4f3c60824e1400cec6193c1889f53d8d5cbe2 SHA512 db48ed890a8313dca4990cfb632caf5b6c7ea50916a7e15be41d1711cbff8c1538fe53923f2f621b320ce032ae86bca014ef12ce2aafb59bf5238a4fd098567f
+EBUILD no-more-secrets-9999.ebuild 742 BLAKE2B a5d2aa1c157ea7ffb6c45872c5bf6dddc6ff4bac0303c886b1fc05cf0650950878fb3b42d080e0c72a775810ace4f3c60824e1400cec6193c1889f53d8d5cbe2 SHA512 db48ed890a8313dca4990cfb632caf5b6c7ea50916a7e15be41d1711cbff8c1538fe53923f2f621b320ce032ae86bca014ef12ce2aafb59bf5238a4fd098567f
 MISC metadata.xml 337 BLAKE2B dc9cb4f67c7cbf5802a3a6c6234d3606e9ea344fa265f9036de5f80bfd44aa495ba9237f6d54ebaafce376a4fc122a29b877e39035135c6fc2a68284787bef84 SHA512 d1654156a95759e042eca3dfe336cb8e70f0be672db54fe5598fe38354d00196d9af4667fb48aa2f660afc1a50922a916a86777a116b00266f25d28e1ed2d844
diff --git a/app-misc/no-more-secrets/no-more-secrets-1.0.1.ebuild b/app-misc/no-more-secrets/no-more-secrets-1.0.1.ebuild
new file mode 100644
index 000000000000..54a201cd898d
--- /dev/null
+++ b/app-misc/no-more-secrets/no-more-secrets-1.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/bartobri/no-more-secrets.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/bartobri/no-more-secrets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+DESCRIPTION="Recreate decrypting text from 1992 movie 'Sneakers'"
+HOMEPAGE="https://github.com/bartobri/no-more-secrets"
+
+LICENSE="GPL-3"
+SLOT=0
+
+BDEPEND=""
+DEPEND="sys-libs/ncurses:0="
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/no-more-secrets-9999-2018-10-25-respect-ldflags.patch )
+
+src_compile() {
+	CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" emake all
+}
diff --git a/app-misc/no-more-secrets/no-more-secrets-9999.ebuild b/app-misc/no-more-secrets/no-more-secrets-9999.ebuild
index 6fcda186cfdf..54a201cd898d 100644
--- a/app-misc/no-more-secrets/no-more-secrets-9999.ebuild
+++ b/app-misc/no-more-secrets/no-more-secrets-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/bartobri/no-more-secrets/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 DESCRIPTION="Recreate decrypting text from 1992 movie 'Sneakers'"
@@ -19,11 +19,12 @@ HOMEPAGE="https://github.com/bartobri/no-more-secrets"
 LICENSE="GPL-3"
 SLOT=0
 
+BDEPEND=""
 DEPEND="sys-libs/ncurses:0="
-RDEPEND="${DEPEND}"
+RDEPEND=""
 
 PATCHES=( "${FILESDIR}"/no-more-secrets-9999-2018-10-25-respect-ldflags.patch )
 
 src_compile() {
-	CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" emake
+	CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" emake all
 }
diff --git a/app-misc/ola/Manifest b/app-misc/ola/Manifest
index dbe7560b9da9..6cf94d4e7239 100644
--- a/app-misc/ola/Manifest
+++ b/app-misc/ola/Manifest
@@ -1,4 +1,4 @@
 AUX ola-0.10.9-nullptr.patch 7412 BLAKE2B f03facd9b48493a47d35744d33edab8fbae87e0440053cd7f1610af40fae1a4d56b6a20beb2b3ca8b4fb64d023795ca9e12fd8149d69a150bc105f9978eaddbb SHA512 669ab2bab44cbab87f8c99f92799faa1422a0d0aaeb7da3c8b2dcdb71f47515e93f773b8fab372c66aa47a23797fce0725722ca25354e868ae2926510282058d
 DIST ola-0.10.9.tar.gz 2578760 BLAKE2B 8cace370b21788d0fe65e56d33fdc9436a5103837d370e3e7e07b43318d4ec3b29536b55c4b117f515a4698ebab88f58718759a0cf9a00f79d0b839e7a79d581 SHA512 e8e2f4249d6e1f63f6c36ae548d9e3a82080f0da82829f923ba6b4d63685fb89f9baccf4588fd6fcbf756708d91e27d022c0d623e7c03c84ec058e7dc7c46bdf
-EBUILD ola-0.10.9.ebuild 2454 BLAKE2B 57ea1353e7e7d8568a11e306da5029b8c1479b27617f05545354dc3a943317ce65659d691db02d21a7f2e0df8c6b9438e32eb96ffae6baff60cb80cb316a9a47 SHA512 ed11a2149b0492a52722d24217e5f2ca15cbdc8488775f129b3a1199022e9d65b97e0b0de28e6a79651c520d276c9266a45c14892264139c557ba9672791fcfc
+EBUILD ola-0.10.9-r1.ebuild 2458 BLAKE2B a2d2a23b83b6a99fec7ca5fb922b7eedf9f30fa67f921736d0e684082d1c3d014cda60f4407472e346aa079d7145db94b5df2a7fff6f4800b6ccae886ee5be07 SHA512 dce199b01beb5f239ec1aa318c8a98a63ddae8c5df4395b3e4d76d28b77d8781ec3dc0a1a015f900a836c8f7d2f1ff8be034a99e69b95e4e919e72dbdce992aa
 MISC metadata.xml 1012 BLAKE2B 181177e538c6cdc37b3ba630b3bd3cffd1701e4f674cd51c6032c3b0367c11a0090482055328961e150203f47a1662597e2d0164c65c12662ce3ae2407db5a98 SHA512 01e6e96741b65a895229e7626e6fbfc51132d7b841c597933ea7055c302369264d014da1ff9c9bbad014c1cb812bb43d120a1d40c473c40eef6353ed4bfafc11
diff --git a/app-misc/ola/ola-0.10.9.ebuild b/app-misc/ola/ola-0.10.9-r1.ebuild
index 2ee3011b7098..c2e2066ba149 100644
--- a/app-misc/ola/ola-0.10.9.ebuild
+++ b/app-misc/ola/ola-0.10.9-r1.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-libs/protobuf:=
+RDEPEND="<dev-libs/protobuf-23:=
 	sys-apps/util-linux
 	sys-libs/ncurses
 	ftdi? ( dev-embedded/libftdi:1 )