gentoo auto-resync : 27:01:2023 - 01:57:17

3 files changed, 100 insertions, 2 deletions

diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 6f995b996ee6..4fd1e4261844 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -7,5 +7,6 @@ DIST texinfo-7.0.2.tar.xz 4875424 BLAKE2B 23737cc800392c949add14c1d0a01a294e8c22
 EBUILD texinfo-6.8.ebuild 1717 BLAKE2B 0ce639bd82dac4bcc580415852c093773954c2f33a811133fcb4ee8361e30935b40ba2796bfe807f848bbebe3acf5985fb549f11dfc6d90dbcb397ab0fc959ea SHA512 017f861563fe14381776c7fb62b79b8a99059e63d0f752a4b8dc71559ba57c6c56307ef751bea42b01c1afd3ebfface75c108be260f920f1a1fc6e3ffd72c40f
 EBUILD texinfo-7.0.1-r1.ebuild 1990 BLAKE2B 873fe91105270820749a7313358bc96a9a63f38d9a95f3fccaf7f3babbbcc5f8908ed5f4d00a9fe24778a0644945f0049480845bf57ed8d15493fa24fe118d85 SHA512 7b7c81df07471d4a84de9151d18a753cd581677495ad445306214d647ef9a0ac05ef56b83387584526706728d0e831f882b38fcf909e3d5ac57ddffa203d0d18
 EBUILD texinfo-7.0.1.ebuild 1787 BLAKE2B e275a3450fe2ce726647a347066e0a7730b4a3fdaa8b931f18c56e6b36b3e847773960eb541349e9b85499c52fba3b80c9d2f1ea8a05790106bde3dafde22e82 SHA512 9cdaf80221be13e539633430915a193532c86ce9d9db8db5c7ba573afffcb6f153dfa922fea0ea5d05aba5919941a04de55cfc8c1377f71f6757d24a5d54e2ab
-EBUILD texinfo-7.0.2.ebuild 1883 BLAKE2B 267880406a158a289ed4b6d8ca42aec74531e19cb1914fd2dcdf6be69d0851a143bc8f6b76ad69fbef087727fb3ba78b32fbfa6c803ed5c181897a3c2892ad7d SHA512 961c76ba06977d91bcd38d673230b1fe70350282539e02d3c9a37d5575e510f1ef17d56f00e39fb76bdfde73532a6166d542630da7d6c4ae68a7cde1bacdb62f
+EBUILD texinfo-7.0.2.ebuild 2199 BLAKE2B fee1baa92960369a505a575d04d42676cb9fd833962c71987785a2192c92816476daa4f02427b79cdf8be755c7e2420460c4188adacdf3c3d1afcc1322e0844d SHA512 c59ea9f01268ba1c3bec0fdb31af6e68764dfdd3a5cd44680523b5fac767874ffae253db19e58be22b50f0c4920842f34fb6e2af03fd3fd831b093a321f6c3ec
+EBUILD texinfo-9999.ebuild 2199 BLAKE2B fee1baa92960369a505a575d04d42676cb9fd833962c71987785a2192c92816476daa4f02427b79cdf8be755c7e2420460c4188adacdf3c3d1afcc1322e0844d SHA512 c59ea9f01268ba1c3bec0fdb31af6e68764dfdd3a5cd44680523b5fac767874ffae253db19e58be22b50f0c4920842f34fb6e2af03fd3fd831b093a321f6c3ec
 MISC metadata.xml 588 BLAKE2B 4e5549f1b07df4c081d2cc03691f0f8ba13c0f8f86807a7e5e87ea618080895a2714f169e9a1294226e71207ed88586a027092a328ab618f417ae3a74ac2586b SHA512 343c287a2c0c7f7bcbd5a40373c0aebe718d46042947abcb8364fed0aeb6dd7e585e9d226ef5bfb0084074d085510e802faf3a3c08b1489ed35556b6c14d1015
diff --git a/sys-apps/texinfo/texinfo-7.0.2.ebuild b/sys-apps/texinfo/texinfo-7.0.2.ebuild
index 2e06ad1a4026..ab957b84c675 100644
--- a/sys-apps/texinfo/texinfo-7.0.2.ebuild
+++ b/sys-apps/texinfo/texinfo-7.0.2.ebuild
@@ -12,11 +12,21 @@ inherit flag-o-matic toolchain-funcs
 DESCRIPTION="The GNU info program and utilities"
 HOMEPAGE="https://www.gnu.org/software/texinfo/"
 
-if [[ $(ver_cut 3) -ge 90 || $(ver_cut 4) -ge 90 ]] ; then
+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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	REGEN_BDEPEND=""
 fi
 
 LICENSE="GPL-3+"
@@ -34,12 +44,17 @@ RDEPEND="
 "
 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
 
diff --git a/sys-apps/texinfo/texinfo-9999.ebuild b/sys-apps/texinfo/texinfo-9999.ebuild
new file mode 100644
index 000000000000..ab957b84c675
--- /dev/null
+++ b/sys-apps/texinfo/texinfo-9999.ebuild
@@ -0,0 +1,82 @@
+# 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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[@]}"
+}