6 files changed, 87 insertions, 5 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 6f31e11e96c3..274f5147666b 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 923ca606d060..787fc5f4c1e9 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1,6 +1,6 @@
 AUX cpuid-20220620-makefile.patch 1359 BLAKE2B b16bd455de251f3989718fa56c1b19f97d79271998ccf774f74f0886ab8072be482e480604bfad462e0ac9c325470d12e80150e6fc588abfae629cd6499e0ea4 SHA512 680e477460679ae016c95d0e0c5cef916486629011b43cafb5f90c1c097b8c245d4c8b7861a20bdeee05b87b2220ad37a5ca589ff952dd9d7580ca301aac0ada
 DIST cpuid-20230120.src.tar.gz 141652 BLAKE2B 54843915be232762e35e6dfed3b7b582d192838bdc5e3b7ebb88b9ada217a3fd21d40faf248244047664f52c8e0c0689196b4373b01c2988aaa3738b7e69af3d SHA512 2b662c2db0ad013626245190be34aa3c04c01bb694111aafc4a491e0816fbb38d94e3d9b20770050efce0c08e6eaa9b22f6c8e9ea304d195afae17b6a4bbf2ab
-DIST cpuid-20230306.src.tar.gz 144993 BLAKE2B 7d33e5e1e8fdfe60d555807be72ab3e0dc2d27445f5ab351c62c767cedf035ce49e4af19b3c7bbdf9e2ba460485ab8355d0491bf0d54b95cf7b2aabc512455fa SHA512 f62e458091ba630f835ddede7225421f9e8d5f4fa6c5c3ac363af0191e5740aacee4da2dfa90b1e35206659e1eabc8bd2cb94645c1347e98780e3a83fcdfc3b6
+DIST cpuid-20230406.src.tar.gz 147932 BLAKE2B 530d1d9207d6c2cb2bfe7006a445ac870edac77b35193042aa198a463aa3815b0eaf398f6831e7d6ae026256224b06b74d7682de6e6a7554d023cc32065b2beb SHA512 7b53e36c104fddb8a4c29d45d5fef80ad57fa2025e1daa116bb22aa184a3415c751affcf8b190aadd08af7cdca7801504b8ba84d87d14226318e0be72ee914d5
 EBUILD cpuid-20230120.ebuild 600 BLAKE2B 0ef114696d7551a49446b327ee2ca0ac4207111703b304f75e850ded69988fd3003ea3de01d2253afe260291998c0ff50c5746b77334265b03ca3b8225f6f9fc SHA512 8458a7ce22cb425e738a18a1a764e8793de4e2af15fc6ac0b33af87a4792e00072c1cf8a27dcc1e2ecd0626c3ad9c243000e1eb63641f39a46dd8836bacb8ffa
-EBUILD cpuid-20230306.ebuild 602 BLAKE2B 432fc76d642caacbe4160969eb9af0d50b5f5a8bf2741eacca6ebbdb21b435f5c800b6b9bf78fb87a08d5e74810b754a129447ac5aeb094f641d219ebb23601f SHA512 274de9b03d2a816315f2f45d0512979cd03dfac584a059ec3027a66ef57ce5697600852542f141d11b7a84e451e2c74718801a98d671381b9c833608efbb2b3f
+EBUILD cpuid-20230406.ebuild 602 BLAKE2B 432fc76d642caacbe4160969eb9af0d50b5f5a8bf2741eacca6ebbdb21b435f5c800b6b9bf78fb87a08d5e74810b754a129447ac5aeb094f641d219ebb23601f SHA512 274de9b03d2a816315f2f45d0512979cd03dfac584a059ec3027a66ef57ce5697600852542f141d11b7a84e451e2c74718801a98d671381b9c833608efbb2b3f
 MISC metadata.xml 532 BLAKE2B 49d1eb34a9859763d42159adcf9a2dca3128af78aef52cedc4483950084238ba780bd841788f4b27eb72fc44e61c2c5bd264b6c6e2c57824ccf146b6ecad50e9 SHA512 f51db55a3cc5478afba39a42731122db8ac720af8685e093b6952efd2778c9f0668ac936d2a1cdacaf2586d62d0f13240d664a7bd4fbd18236c816e9e6745600
diff --git a/sys-apps/cpuid/cpuid-20230306.ebuild b/sys-apps/cpuid/cpuid-20230406.ebuild
index 18c1efcd3afe..18c1efcd3afe 100644
--- a/sys-apps/cpuid/cpuid-20230306.ebuild
+++ b/sys-apps/cpuid/cpuid-20230406.ebuild
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 6ac9b5b73557..160131534268 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -4,8 +4,10 @@ AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e
 AUX lesspipe-r1.sh 8135 BLAKE2B f11727136a5235f07ad86c1811c5ef8489a48fc3d032b8840bc67eda70e1800f03505a534870a0ba73aa62e4df4315444c76fe8aa89ab47c8b2f1e08fab5b6e2 SHA512 e7820d0c925da4d217214e093c671d6c2da51da00dcec98bed80fe3e6d664cfd3baf1b850eb711e9ccf9a1d09f943e2fc2efc3e8061bbfa45724c5b623dafe94
 DIST less-608.tar.gz 362346 BLAKE2B 988940745fef1222c43b0bf4edec7cc7206ded0ac5d89d3faf4dab706a249913581c2fe7aa6063cf3d717176ed07b69299d3e791ba8a60358483fe9d1bf7f7c6 SHA512 7945b7f88921832ebb1b45fba8cbb449ee0133342796b654a52c146dfff3d84db18724ee84e53349eeea6017a0ebe2d8eb5366210275981dde7bb7190118fa66
 DIST less-629-beta.tar.gz 374918 BLAKE2B 0276006cf81f310a3d25add7cfaedfd678b03f99d48b75eb462fb6dda6e171c495fa6af170257fb286a35b0d6f380136c5d37b6d9a088ee08d42d4f32033afcb SHA512 5b5d7f86b0e2d00d65257b1d27511fdab21fda52f60102f7dd6c31d1314edcf75754dc9a268c03ebfe08ffc7b88f3b7cad0fa5a9504d66b11bc13f5f52cab558
+DIST less-632-beta.tar.gz 375440 BLAKE2B 26c27a2e25882a4ce34e5e6e83bc0af784c8d4e8ac20691e0e31f1021bfb30f96e07024a6ff1ad634f7812875e0d920bd52394ccdba47a2a944ba7de92aa4c97 SHA512 5104f1fd76cdd59dfa957a61f8ccffe7c6e79345b94a5961abbd30f2d059f2b6d4b359a27dd5528993e5e1248c655439c1e4a39fd92234e4af23c7167f69f066
 EBUILD less-608-r1.ebuild 1644 BLAKE2B a985faac14059e82275b36c1122bd91da98c9959e816b9f1e8c97e484ce10b3013c915eeff3ea3ce695983eabb0fa71c1a49d5ec59daaec0f982d5ebec8d17ad SHA512 d8022242942862ef1229138d6dc21a3f54e95395510d23f694fec442fe336f2cea583a3ce3d7b5303d1bede89502c260fed51d7f6ea7c2ec401d5af85ade897a
 EBUILD less-608-r2.ebuild 1691 BLAKE2B 593af00b711b73345589db31b3765ca2de723db667de297a61356c09b919919355f9661a58738e47c92aa94933ee498d55240cbe87997fa912a8d443982639e8 SHA512 e5b372119ee823b4af84f9f747d7cb72ba990a83b5f41d95da6ca512c54cc27585e3fa3c8c2d934c3cd5814c041667487804bde52c568cca002284786ac39782
 EBUILD less-629_beta.ebuild 2238 BLAKE2B 8dea235c74da1c89561f168eef3b020d754c70a9fe8a5f0bd10bf7670eb114ae2abcc13679c95fdf9c5c68da93d3777399a7e70e5249fd0ee77107df6183021c SHA512 37ee9e63fbc572699aaec8278153b0b8eee5afdc702b0fc56c8d6edbf5e1722984e61fb9e386f4abaea533262cb82e265c3f0132c7db9c9273741a382a86cebe
-EBUILD less-9999.ebuild 2238 BLAKE2B 8dea235c74da1c89561f168eef3b020d754c70a9fe8a5f0bd10bf7670eb114ae2abcc13679c95fdf9c5c68da93d3777399a7e70e5249fd0ee77107df6183021c SHA512 37ee9e63fbc572699aaec8278153b0b8eee5afdc702b0fc56c8d6edbf5e1722984e61fb9e386f4abaea533262cb82e265c3f0132c7db9c9273741a382a86cebe
+EBUILD less-632_beta.ebuild 2240 BLAKE2B 4b98a322c75483fbef2d3042c7407dcbb08de76ec7d1b47f8f02ae5e98ae171f3c8a1261de515a62e818fba91a9cf09f48cfa050ba4ac3b7233088168320fe4e SHA512 255fbee49b31ede5923c776afa3f1f58004380a20b7b50dc04e43e51dc00b7ccc3c7cb7564a90fac5ee9f1696962b63bc68c4bf0c611092be5b25b92397baaaf
+EBUILD less-9999.ebuild 2240 BLAKE2B 4b98a322c75483fbef2d3042c7407dcbb08de76ec7d1b47f8f02ae5e98ae171f3c8a1261de515a62e818fba91a9cf09f48cfa050ba4ac3b7233088168320fe4e SHA512 255fbee49b31ede5923c776afa3f1f58004380a20b7b50dc04e43e51dc00b7ccc3c7cb7564a90fac5ee9f1696962b63bc68c4bf0c611092be5b25b92397baaaf
 MISC metadata.xml 384 BLAKE2B ab69cbf4d7813bc4c96dc1c18ca35454dc9e9202bc95e3ff3b638c79b6cff4f9914fba1e7a35908aa305567a3874d3ead3a78f5faa83c9fbd3027afe12767eac SHA512 d799332d42f1c3115132216b3ba98a39f662d583aecb06fa2590e3da4c03b0ec07bab1eb0bbd397ef8249a5916ca9b457992c226899f66d4f4bef8bf1a20074f
diff --git a/sys-apps/less/less-632_beta.ebuild b/sys-apps/less/less-632_beta.ebuild
new file mode 100644
index 000000000000..77a01bd02a54
--- /dev/null
+++ b/sys-apps/less/less-632_beta.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WANT_AUTOMAKE=none
+WANT_LIBTOOL=none
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gwsw/less"
+	inherit git-r3
+fi
+
+inherit autotools
+
+# Releases are usually first a beta then promoted to stable if no
+# issues were found. Upstream explicitly ask "to not generally distribute"
+# the beta versions. It's okay to keyword beta versions if they fix
+# a serious bug, but otherwise try to avoid it.
+
+MY_PV=${PV/_beta/-beta}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="Excellent text file viewer"
+HOMEPAGE="https://www.greenwoodsoftware.com/less/"
+[[ ${PV} != 9999 ]] && SRC_URI="https://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P/?beta}
+
+LICENSE="|| ( GPL-3 BSD-2 )"
+SLOT="0"
+if [[ ${PV} != 9999 && ${PV} != *_beta* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="pcre"
+# As of 623_beta, lesstest is not included in dist tarballs
+# https://github.com/gwsw/less/issues/344
+RESTRICT="test"
+
+DEPEND="
+	>=app-misc/editor-wrapper-3
+	>=sys-libs/ncurses-5.2:=
+	pcre? ( dev-libs/libpcre2 )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	# Per upstream README to prepare live build
+	[[ ${PV} == 9999 ]] && emake -f Makefile.aut distfiles
+	# Upstream uses unpatched autoconf-2.69, which breaks with clang-16.
+	# https://bugs.gentoo.org/870412
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-regex=$(usex pcre pcre2 posix)
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	emake check VERBOSE=1
+}
+
+src_install() {
+	default
+
+	newbin "${FILESDIR}"/lesspipe-r1.sh lesspipe
+	newenvd "${FILESDIR}"/less.envd 70less
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
+		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
+		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
+		elog "Colorization support has been dropped.  If you want that, check out"
+		elog "the new app-text/lesspipe package."
+	fi
+}
diff --git a/sys-apps/less/less-9999.ebuild b/sys-apps/less/less-9999.ebuild
index 3dc457ca05ff..77a01bd02a54 100644
--- a/sys-apps/less/less-9999.ebuild
+++ b/sys-apps/less/less-9999.ebuild
@@ -21,8 +21,8 @@ inherit autotools
 MY_PV=${PV/_beta/-beta}
 MY_P=${PN}-${MY_PV}
 DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="http://www.greenwoodsoftware.com/less/"
-[[ ${PV} != 9999 ]] && SRC_URI="http://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
+HOMEPAGE="https://www.greenwoodsoftware.com/less/"
+[[ ${PV} != 9999 ]] && SRC_URI="https://www.greenwoodsoftware.com/less/${MY_P}.tar.gz"
 S="${WORKDIR}"/${MY_P/?beta}
 
 LICENSE="|| ( GPL-3 BSD-2 )"