4 files changed, 14 insertions, 98 deletions
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 3c751ab5cdd6..f186c3dad59a 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -2,12 +2,10 @@ 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.93.tar.xz 5533720 BLAKE2B 384539c5b0d05a1b25634d0ab9836f9a2b3eb0bb046d2fc3ada5ed1c9428fbd4f129537f2c027a4087129fdd7cffeff277c52415a5fd86d5d5f945e5ae945fa8 SHA512 d491689e297fd2dfdeca2068d01350d7478d97ebbaeef2c702d673a01d55ca87e3e7a9c5c93a4e51b3a124bb432cde61189442329b66eb0fdcfabb27ebfdef4c
-DIST texinfo-7.0.94.tar.xz 5535352 BLAKE2B d16598e1f8b1f12fa730fdd291c8afdc84c7753dd270c478d4fda4c19de81c8e18f4abb4940c8561443df2cf3e89b5c04951f46b310d5ecdbcca02293563f0c2 SHA512 e7330a82695f9a03a639236afbab9e6121ea2f8baa3dc230d09f93537ebcfd428dc566aa4954c33e16abe4eec40be77769ada9d4673408727d199b4a91adbfe1
+DIST texinfo-7.1.tar.xz 5545720 BLAKE2B 4385ca6250daeaa4f6bfedd9ab41f25993613031bcb8da55360365701213f4f3cf786d958749c59dc1c9dda328eca42f028aa051a7062313142aa92f55a96ecd SHA512 ceab03e8422d800b08c7b44e8263b0a1f35bb7758d83a81136df6f3304a14daecda98a12a282afb85406d2ca2f665b2295e10b6f4064156ea1285d80d5d355db
 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.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
+EBUILD texinfo-7.1.ebuild 2420 BLAKE2B 00a6229dafba601a69b0464aa5086d5608b18b824c1c4cda0cef2dd60cd0f10a9eaf41c7d5da20df840cb925f9717527b2ba6f1baf8bef0be70012ea63e04f6d SHA512 77303e18fc7b649ed0bbbe75fc93a1b30c13311e0d3e4bcd5768ab446ac7c135badf2e1d33da261167dfae750334aed876fc87eb4675125a2d8d96fb93a12471
+EBUILD texinfo-9999.ebuild 2420 BLAKE2B 00a6229dafba601a69b0464aa5086d5608b18b824c1c4cda0cef2dd60cd0f10a9eaf41c7d5da20df840cb925f9717527b2ba6f1baf8bef0be70012ea63e04f6d SHA512 77303e18fc7b649ed0bbbe75fc93a1b30c13311e0d3e4bcd5768ab446ac7c135badf2e1d33da261167dfae750334aed876fc87eb4675125a2d8d96fb93a12471
 MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015
diff --git a/sys-apps/texinfo/texinfo-7.0.94.ebuild b/sys-apps/texinfo/texinfo-7.0.94.ebuild
deleted file mode 100644
index 7c36a9271893..000000000000
--- a/sys-apps/texinfo/texinfo-7.0.94.ebuild
+++ /dev/null
@@ -1,92 +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
-	virtual/perl-Unicode-Collate
-	standalone? ( >=dev-lang/perl-5.8.1 )
-	!standalone?  (
-		>=dev-lang/perl-5.8.1:=
-		dev-libs/libunistring:=
-	)
-	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
-
-	# TODO:
-	# --with-external-Unicode-EastAsianWidth
-	# --with-external-Text-Unidecode
-	#
-	# Also, 7.0.91 seemed to introduce a included-libunistring w/ USE=-standalone
-	# but it doesn't seem to do anything?
-	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.93.ebuild b/sys-apps/texinfo/texinfo-7.1.ebuild
index 7c36a9271893..7c36a9271893 100644
--- a/sys-apps/texinfo/texinfo-7.0.93.ebuild
+++ b/sys-apps/texinfo/texinfo-7.1.ebuild
diff --git a/sys-apps/texinfo/texinfo-9999.ebuild b/sys-apps/texinfo/texinfo-9999.ebuild
index 6f76f5ea1afe..7c36a9271893 100644
--- a/sys-apps/texinfo/texinfo-9999.ebuild
+++ b/sys-apps/texinfo/texinfo-9999.ebuild
@@ -38,8 +38,12 @@ RDEPEND="
 	>=sys-libs/ncurses-5.2-r2:=
 	virtual/perl-Data-Dumper
 	virtual/perl-Encode
+	virtual/perl-Unicode-Collate
 	standalone? ( >=dev-lang/perl-5.8.1 )
-	!standalone?  ( >=dev-lang/perl-5.8.1:= )
+	!standalone?  (
+		>=dev-lang/perl-5.8.1:=
+		dev-libs/libunistring:=
+	)
 	nls? ( virtual/libintl )
 "
 DEPEND="${RDEPEND}"
@@ -72,6 +76,12 @@ src_configure() {
 
 	use static && append-ldflags -static
 
+	# TODO:
+	# --with-external-Unicode-EastAsianWidth
+	# --with-external-Text-Unidecode
+	#
+	# Also, 7.0.91 seemed to introduce a included-libunistring w/ USE=-standalone
+	# but it doesn't seem to do anything?
 	local myeconfargs=(
 		--cache-file="${S}"/config.cache
 		$(use_enable nls)