6 files changed, 46 insertions, 86 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index f3e59202bf6f..24a9a0355a5d 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/moar/Manifest b/sys-apps/moar/Manifest
index d0ffd25f800a..352574817208 100644
--- a/sys-apps/moar/Manifest
+++ b/sys-apps/moar/Manifest
@@ -4,7 +4,10 @@ DIST moar-1.17.1-deps.tar.xz 4760036 BLAKE2B 6fd72d710a620fdf104766be84f3fa68652
 DIST moar-1.17.1.tar.gz 2784584 BLAKE2B 486520a89969bde12bed683e28fd37a90d32b35ecc80261901595ccfe9d12deb26c307404ba0505919b1a35c237e07b59aa5469f04b51bd12d6e71e39571b648 SHA512 f502e930cf78c86eccacb4c23b1d4874bb39d5add2b36dbaa5426d269b5a315204782e1f539262f04adab510d177e374fcf9ff79df5ba2974f32e513e8d56fd6
 DIST moar-1.18.0-deps.tar.xz 4760036 BLAKE2B 6fd72d710a620fdf104766be84f3fa68652c760818cdee66bb8475cc8949872c82be026c04b54cb61c0108c5977cb1f787f9a4fa0316bde0293cdedb1f6f94f8 SHA512 f40520a1b2e94f4a3e97d6a4e19191484b66e13a57c7b30416c813d84cad3d29295e862d5b75870313cc905112425c731d052619d49e78b33fb3d5d8750df3df
 DIST moar-1.18.0.tar.gz 2784174 BLAKE2B 3d9ee7fda27419b419f47bae3336d9f0d7ae48bbdad1fb8c501c85b4ea34aaaf6cf1c865f1b56d195ec6e129333d63e552d96b147fb9c26c739482a546d6286e SHA512 a76f19465d03deec8f778fda213be6ab33fdd48d309231f4f0ad0cdd8ea2facc41e2bdb1b74771c4a9ce3a31c30a72754f790e5eb9edb06e19d26fe3e224b507
+DIST moar-1.18.1-deps.tar.xz 4760036 BLAKE2B 6fd72d710a620fdf104766be84f3fa68652c760818cdee66bb8475cc8949872c82be026c04b54cb61c0108c5977cb1f787f9a4fa0316bde0293cdedb1f6f94f8 SHA512 f40520a1b2e94f4a3e97d6a4e19191484b66e13a57c7b30416c813d84cad3d29295e862d5b75870313cc905112425c731d052619d49e78b33fb3d5d8750df3df
+DIST moar-1.18.1.tar.gz 2784232 BLAKE2B eee1b0d805150f5a0e09b3038dd13189d20886fbe8159e9fddea4ea97edfafba400b5ab542795ba222c2757e684e41e2db95774ad33a8039e62e1244cd69c16e SHA512 2dbe3b4f461f6ee77b8093e1783a06cf1703ec8c5682565cfb3d28d296296b562fd1032126f0f3ad835de9236d31e2930456b59ed8efb168c5243f4265c6b355
 EBUILD moar-1.16.2.ebuild 917 BLAKE2B aa1dde2fe5aa703f2e860ff05e2d5edb6521bb537143ff39432132e4340f3ba7609ff2a2b6f6a04f0c29f4d351ed587c1879eba36cd85bae4752828500d82131 SHA512 ce60b3e76cb7e8515760cdbf90728557fd5a9e2be4e3df816dbd6ad934506a826256f9560bd6968309c06c4a9dcaddcd4602d42984e5cea1b40b094418ea0f6e
 EBUILD moar-1.17.1.ebuild 917 BLAKE2B aa1dde2fe5aa703f2e860ff05e2d5edb6521bb537143ff39432132e4340f3ba7609ff2a2b6f6a04f0c29f4d351ed587c1879eba36cd85bae4752828500d82131 SHA512 ce60b3e76cb7e8515760cdbf90728557fd5a9e2be4e3df816dbd6ad934506a826256f9560bd6968309c06c4a9dcaddcd4602d42984e5cea1b40b094418ea0f6e
 EBUILD moar-1.18.0.ebuild 917 BLAKE2B aa1dde2fe5aa703f2e860ff05e2d5edb6521bb537143ff39432132e4340f3ba7609ff2a2b6f6a04f0c29f4d351ed587c1879eba36cd85bae4752828500d82131 SHA512 ce60b3e76cb7e8515760cdbf90728557fd5a9e2be4e3df816dbd6ad934506a826256f9560bd6968309c06c4a9dcaddcd4602d42984e5cea1b40b094418ea0f6e
+EBUILD moar-1.18.1.ebuild 917 BLAKE2B aa1dde2fe5aa703f2e860ff05e2d5edb6521bb537143ff39432132e4340f3ba7609ff2a2b6f6a04f0c29f4d351ed587c1879eba36cd85bae4752828500d82131 SHA512 ce60b3e76cb7e8515760cdbf90728557fd5a9e2be4e3df816dbd6ad934506a826256f9560bd6968309c06c4a9dcaddcd4602d42984e5cea1b40b094418ea0f6e
 MISC metadata.xml 316 BLAKE2B 19b5d071afbcad1f05744cca494156dc634f3fc35afaf4828dcf1e691e75a0f47f162b6cf548e5a333441f25327970f6a71d6acb436b60a68deeb7fb44659d45 SHA512 44155ffd972d79d47e41fe2ed38583e41eaaeb9f6b0de7e52b666930906f561e73d1f604acf602750ae1bed50e516dbbe36327b47ba2005813438e0d2db070e1
diff --git a/sys-apps/moar/moar-1.18.1.ebuild b/sys-apps/moar/moar-1.18.1.ebuild
new file mode 100644
index 000000000000..091d314e2ac3
--- /dev/null
+++ b/sys-apps/moar/moar-1.18.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Pager designed to do the right thing without any configuration"
+HOMEPAGE="https://github.com/walles/moar"
+SRC_URI="https://github.com/walles/moar/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-deps.tar.xz"
+
+LICENSE="BSD-2 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!dev-lang/moarvm"
+BDEPEND="
+	test? (
+		app-arch/bzip2
+		app-arch/xz-utils
+	)
+"
+
+src_compile() {
+	# https://github.com/walles/moar/blob/master/build.sh#L28
+	ego build -ldflags="-w -X main.versionString=${PV}" -o moar
+}
+
+src_test() {
+	# From test.sh (we don't run that because it has some linting etc)
+	ego test -timeout 20s ./...
+}
+
+src_install() {
+	dobin moar
+	doman moar.1
+	einstalldocs
+}
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 3a6a6fbeafdf..3c751ab5cdd6 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -2,14 +2,12 @@ AUX texinfo-6.8-undo-gnulib-nonnul.patch 7627 BLAKE2B d8edefca829682e0bbebfecf1c
 DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
 DIST texinfo-7.0.2.tar.xz 4875424 BLAKE2B 23737cc800392c949add14c1d0a01a294e8c224d958c03325c96d6540dcfae49db5c2d4a8c29310c0603f8ac8477f6ee00a14db4aa6caab317b19e776139e617 SHA512 26dd5bb1392f2197ecde296ba157d4533f4b11fadf1238481da4cf2b3796c665ce96049df8d2f9a6d4fa22b7e9013d9978d195e525288663f0a54482bbc22b2b
 DIST texinfo-7.0.3.tar.xz 4886668 BLAKE2B 38710faba2f717f7990228d58924901ea7d7378cc02e2059a437b5127f9e2dc67f732584e3f45fc34e8ef6d7671a546fe66871dadbd29e772f3417768622a650 SHA512 7d14f7458f2b7d0ee0b740e00a5fc2a9d61d33811aa5905d649875ec518dcb4f01be46fb0c46748f7dfe36950597a852f1473ab0648d5add225bc8f35528a8ff
-DIST texinfo-7.0.90.tar.xz 5474032 BLAKE2B 6578671213309a6d0ee5fa6eec8d4515416d0fc7c9e37a741309caeffecb970796dfb9b7164f5377fcc368ecf1fa0bbaff46ed5345afdcc17fd0e624ee0cf47b SHA512 cfff7e340c211488cb38d0acdfea54d1c74007f3deeadedb097741225c54eb3c13a05811426807f75d4b517b7e4bdd21238f06e6ceabfe8e7ae73a9b753800af
-DIST texinfo-7.0.92.tar.xz 5513304 BLAKE2B 0661ac8f148319097c7226bda25bad4c1ae611240d5d275847be339adb13055d6b543a09447a16040ae27ea0054f1978f4c49c5fc9eb3576ac6c83380c038401 SHA512 89f0d32fa4f380afa714c96be0f75972821f746b23557a58e570f7f73a5f7e5fc3f411045582b7147c57c7bc3543c0afd3e6972018849d9725cc672e6442cf78
 DIST texinfo-7.0.93.tar.xz 5533720 BLAKE2B 384539c5b0d05a1b25634d0ab9836f9a2b3eb0bb046d2fc3ada5ed1c9428fbd4f129537f2c027a4087129fdd7cffeff277c52415a5fd86d5d5f945e5ae945fa8 SHA512 d491689e297fd2dfdeca2068d01350d7478d97ebbaeef2c702d673a01d55ca87e3e7a9c5c93a4e51b3a124bb432cde61189442329b66eb0fdcfabb27ebfdef4c
+DIST texinfo-7.0.94.tar.xz 5535352 BLAKE2B d16598e1f8b1f12fa730fdd291c8afdc84c7753dd270c478d4fda4c19de81c8e18f4abb4940c8561443df2cf3e89b5c04951f46b310d5ecdbcca02293563f0c2 SHA512 e7330a82695f9a03a639236afbab9e6121ea2f8baa3dc230d09f93537ebcfd428dc566aa4954c33e16abe4eec40be77769ada9d4673408727d199b4a91adbfe1
 EBUILD texinfo-6.8.ebuild 1673 BLAKE2B 32b1b2a131178eb811a9b05a08718d09790b912cafdc96caeb0d8f78746efccbf86dc1e03c974047af1ed10f60af81dc9ab03dca8e96d2b017907695afb45717 SHA512 edf6247f34b2eaffe3f95fa017e7ee50c4e1f8a0ae8382ed47d0074601fd49e8712eb893454c78026e80db299e3ba75e2683f60e5cbe7b12fee7adbb4613d55d
 EBUILD texinfo-7.0.2.ebuild 2147 BLAKE2B fd68afccbc08c63d00b40fbd1807edcb6a4741776d6937d81a141f7dcb23a10a107f663d7321bb073ee7112fc693bfd2ef0670cb8515d1169e79c7c120ee530b SHA512 a86351dd587a6c196194b4196fb73cf6ec70bee96573334c12ea9b093b693a51f07aa5d32f311ae072a984fec872ab6a8fd13c4767502067ab7d3668aa10de6f
 EBUILD texinfo-7.0.3.ebuild 2147 BLAKE2B fd68afccbc08c63d00b40fbd1807edcb6a4741776d6937d81a141f7dcb23a10a107f663d7321bb073ee7112fc693bfd2ef0670cb8515d1169e79c7c120ee530b SHA512 a86351dd587a6c196194b4196fb73cf6ec70bee96573334c12ea9b093b693a51f07aa5d32f311ae072a984fec872ab6a8fd13c4767502067ab7d3668aa10de6f
-EBUILD texinfo-7.0.90.ebuild 2155 BLAKE2B 5cbbb2d466f226805cc639d1317733210760a09d00d6ba96ad7859bf46cf7fac2726aafdf209a5e85cd555b9e509629b5f3c7b76acedc10c1392da8028c56ecb SHA512 b2f1db5287ed7fa184828231aa59f923055444d8f8ff991fcbd2c29929e7952b89a8e5864f108173bc2cfc0bb23614b53f0a5508698e6d58f9b90ff1d23b0376
-EBUILD texinfo-7.0.92.ebuild 2420 BLAKE2B 00a6229dafba601a69b0464aa5086d5608b18b824c1c4cda0cef2dd60cd0f10a9eaf41c7d5da20df840cb925f9717527b2ba6f1baf8bef0be70012ea63e04f6d SHA512 77303e18fc7b649ed0bbbe75fc93a1b30c13311e0d3e4bcd5768ab446ac7c135badf2e1d33da261167dfae750334aed876fc87eb4675125a2d8d96fb93a12471
 EBUILD texinfo-7.0.93.ebuild 2420 BLAKE2B 00a6229dafba601a69b0464aa5086d5608b18b824c1c4cda0cef2dd60cd0f10a9eaf41c7d5da20df840cb925f9717527b2ba6f1baf8bef0be70012ea63e04f6d SHA512 77303e18fc7b649ed0bbbe75fc93a1b30c13311e0d3e4bcd5768ab446ac7c135badf2e1d33da261167dfae750334aed876fc87eb4675125a2d8d96fb93a12471
+EBUILD texinfo-7.0.94.ebuild 2420 BLAKE2B 00a6229dafba601a69b0464aa5086d5608b18b824c1c4cda0cef2dd60cd0f10a9eaf41c7d5da20df840cb925f9717527b2ba6f1baf8bef0be70012ea63e04f6d SHA512 77303e18fc7b649ed0bbbe75fc93a1b30c13311e0d3e4bcd5768ab446ac7c135badf2e1d33da261167dfae750334aed876fc87eb4675125a2d8d96fb93a12471
 EBUILD texinfo-9999.ebuild 2155 BLAKE2B 5cbbb2d466f226805cc639d1317733210760a09d00d6ba96ad7859bf46cf7fac2726aafdf209a5e85cd555b9e509629b5f3c7b76acedc10c1392da8028c56ecb SHA512 b2f1db5287ed7fa184828231aa59f923055444d8f8ff991fcbd2c29929e7952b89a8e5864f108173bc2cfc0bb23614b53f0a5508698e6d58f9b90ff1d23b0376
 MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015
diff --git a/sys-apps/texinfo/texinfo-7.0.90.ebuild b/sys-apps/texinfo/texinfo-7.0.90.ebuild
deleted file mode 100644
index 6f76f5ea1afe..000000000000
--- a/sys-apps/texinfo/texinfo-7.0.90.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Note: if your package uses the texi2dvi utility, it must depend on the
-# virtual/texi2dvi package to pull in all the right deps.  The tool is not
-# usable out-of-the-box because it requires the large tex packages.
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU info program and utilities"
-HOMEPAGE="https://www.gnu.org/software/texinfo/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/texinfo.git"
-	REGEN_BDEPEND="
-		>=sys-devel/autoconf-2.62
-		>=sys-devel/automake-1.16
-		sys-devel/libtool
-	"
-elif [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
-	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
-	REGEN_BDEPEND=""
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-	REGEN_BDEPEND=""
-fi
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="nls +standalone static"
-
-RDEPEND="
-	!=app-text/tetex-2*
-	>=sys-libs/ncurses-5.2-r2:=
-	virtual/perl-Data-Dumper
-	virtual/perl-Encode
-	standalone? ( >=dev-lang/perl-5.8.1 )
-	!standalone?  ( >=dev-lang/perl-5.8.1:= )
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${REGEN_BDEPEND}
-	nls? ( >=sys-devel/gettext-0.19.6 )
-"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]]; then
-		./autogen.sh || die
-	fi
-
-	# Needed if a patch touches install-info.c
-	#touch man/install-info.1 || die
-
-	if use prefix ; then
-		sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die
-		touch {doc,man}/{texi2dvi,texi2pdf,pdftexi2dvi}.1 || die
-	fi
-}
-
-src_configure() {
-	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions
-	# bug #622576
-	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}"
-	local -x PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
-
-	use static && append-ldflags -static
-
-	local myeconfargs=(
-		--cache-file="${S}"/config.cache
-		$(use_enable nls)
-		$(use_enable !standalone perl-xs)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/texinfo/texinfo-7.0.92.ebuild b/sys-apps/texinfo/texinfo-7.0.94.ebuild
index 7c36a9271893..7c36a9271893 100644
--- a/sys-apps/texinfo/texinfo-7.0.92.ebuild
+++ b/sys-apps/texinfo/texinfo-7.0.94.ebuild