gentoo resync : 12.05.2022

3 files changed, 2 insertions, 72 deletions

diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index fa25d54ef5c2..61141d1ea0c5 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,6 +1,4 @@
 AUX texinfo-6.8-undo-gnulib-nonnul.patch 7627 BLAKE2B d8edefca829682e0bbebfecf1c97fd25874ecf0ec65228643c1a5d54558a22970ec2e6d532d37269fdb8a7359eb02c990b2c221591c8ececa3f17c6642c47516 SHA512 c6a482433af9a44e597ace4e92b6d5faf1c7aa6deaab7e474f4158769c31e4cf203f21d4697e071d29104b6b78ae06f353becc5da6aa1276ae9a3e39506a2af9
-DIST texinfo-6.7.tar.xz 4337984 BLAKE2B 1ec9617b90dac1569f17eaac0cd8611e8e57cb3db6ece1e2f6ff20ee96fee37eb4ff3d83e4830127ccaa469e2d02b598a5af5ede4e586dd4b53d47a2f2278b60 SHA512 da55a0d0a760914386393c5e8e864540265d8550dc576f784781a6d72501918e8afce716ff343e5c2a0ce09cf921bfaf0a48ecb49f6182a7d10e920ae3ea17e7
 DIST texinfo-6.8.tar.xz 4961528 BLAKE2B 0256dac5ba9c7f171c970644907b763f7a88fd9995111244df0458591aed1a0fe94c76045dde69f9138d65d6f780aae6869bbbc013f58e04ae7c62456b222bbb SHA512 0ff9290b14e4d83e32b889cfa24e6d065f98b2a764daf6b92c6c895fddbb35258398da6257c113220d5a4d886f7b54b09c4b117ca5eacfee6797f9bffde0f909
-EBUILD texinfo-6.7.ebuild 1941 BLAKE2B 99867e6ddf768ce09331f9db52e2c7940f7f6e59949dbd4f0f66262d9c07f3240914c7510f87c6f94ad6571caf8ab451fa4019bfa78d5dc0d17c09d95c2835f0 SHA512 803c530e4abffedadb084c4e091b3981c0df97e0b2100d21b46c54afe5e022d415605a29854534205561d9209289c43bcb3c3b475e77beb4c15080e5f151d438
-EBUILD texinfo-6.8.ebuild 1671 BLAKE2B dc820949dc468fe56a687fb5301ca1ab8abfd9093a8ee707eba14a5fa64863f2124356990f397f74dbf75c55ae1404084fe078c9ccc254bbcc5395b7cf36cf88 SHA512 770f0999f99b51a497e63fba786dc3e906d789b74c3897ecd1857efb0c39d1c682e19cc3dd40dd77669f3de80b20b1a0f9d98443e785639321edc87a0516a84d
+EBUILD texinfo-6.8.ebuild 1678 BLAKE2B c55d227aaf21a2855bd0d32ba623312d21987a9ebbbe79494fe3a63a8a43361382d533a53d7fa1c29453699edb21cf078302f78017fe0e4e078513e136a8f404 SHA512 f44742872a26edbc6d1051d980808c1d7daaa0f5a4d7763e1e249571631e327774998485767ccd2258fc939589014562daa79a8ec35a92332beed4a6dbac5386
 MISC metadata.xml 540 BLAKE2B 64b068c14cc3ce828768e85d21c46e25d8930f66287329bd6ec41893bb26b352a0384155688768aa472cf7c58113e02b79e88d99c98233c3f80b393a0d518443 SHA512 32c337ea240d5ec20130fbb17a9622e3736d8c4b577b6bdebebbe3344675cf9faf3140471ff9fe4c5862b75858017b5e9fd8fc34a1c1f53fe8babc106aa83af3
diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild b/sys-apps/texinfo/texinfo-6.7.ebuild
deleted file mode 100644
index 2a3060bb2484..000000000000
--- a/sys-apps/texinfo/texinfo-6.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2022 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=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU info program and utilities"
-HOMEPAGE="https://www.gnu.org/software/texinfo/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
-IUSE="nls +standalone static"
-
-RDEPEND="
-	!=app-text/tetex-2*
-	>=sys-libs/ncurses-5.2-r2:0=
-	standalone? ( dev-lang/perl )
-	!standalone?  (
-		dev-lang/perl:=
-		dev-perl/libintl-perl
-		dev-perl/Unicode-EastAsianWidth
-		dev-perl/Text-Unidecode
-	)
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( >=sys-devel/gettext-0.19.6 )"
-
-src_prepare() {
-	default
-
-	if use prefix ; then
-		sed -i -e '1c\#!/usr/bin/env sh' util/texi2dvi util/texi2pdf || die
-		touch doc/{texi2dvi,texi2pdf,pdftexi2dvi}.1
-	fi
-}
-
-src_configure() {
-	# Respect compiler and CPPFLAGS/CFLAGS/LDFLAGS for Perl extensions. #622576
-	local -x PERL_EXT_CC="$(tc-getCC)" PERL_EXT_CPPFLAGS="${CPPFLAGS}" PERL_EXT_CFLAGS="${CFLAGS}" PERL_EXT_LDFLAGS="${LDFLAGS}"
-
-	use static && append-ldflags -static
-	local myeconfargs
-	if use standalone ; then
-		myeconfargs=(
-			--without-external-libintl-perl
-			--without-external-Unicode-EastAsianWidth
-			--without-external-Text-Unidecode
-			$(use_enable nls)
-			--disable-perl-xs
-		)
-	else
-		myeconfargs=(
-			--with-external-libintl-perl
-			--with-external-Unicode-EastAsianWidth
-			--with-external-Text-Unidecode
-			$(use_enable nls)
-			--enable-perl-xs
-		)
-	fi
-	econf "${myeconfargs[@]}"
-}
diff --git a/sys-apps/texinfo/texinfo-6.8.ebuild b/sys-apps/texinfo/texinfo-6.8.ebuild
index 31c46a3263b5..be21633802a7 100644
--- a/sys-apps/texinfo/texinfo-6.8.ebuild
+++ b/sys-apps/texinfo/texinfo-6.8.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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"
+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"
 IUSE="nls +standalone static"
 
 RDEPEND="