public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-dev] [PATCH 1/4] toolchain-autoconf.eclass: Add option to disable Info slotting
@ 2023-03-26 20:30 Arsen Arsenović
  2023-03-26 20:30 ` [gentoo-dev] [PATCH 2/4] sys-devel/autoconf: Set TC_AUTOCONF_BREAK_INFOS=yes to prevent changes Arsen Arsenović
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: Arsen Arsenović @ 2023-03-26 20:30 UTC (permalink / raw
  To: gentoo-dev; +Cc: Arsen Arsenović

Closes: https://bugs.gentoo.org/902461
Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
---
 eclass/toolchain-autoconf.eclass | 46 +++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

diff --git a/eclass/toolchain-autoconf.eclass b/eclass/toolchain-autoconf.eclass
index 2ba27638468e..140ee4c9b5eb 100644
--- a/eclass/toolchain-autoconf.eclass
+++ b/eclass/toolchain-autoconf.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: toolchain-autoconf.eclass
@@ -18,6 +18,20 @@ esac
 if [[ -z ${_TOOLCHAIN_AUTOCONF_ECLASS} ]]; then
 _TOOLCHAIN_AUTOCONF_ECLASS=1
 
+# @ECLASS_VARIABLE: TC_AUTOCONF_BREAK_INFOS
+# @DESCRIPTION:
+# Enables slotting logic on the installed info pages.  This includes
+# mangling the pages in order to include a version number.  Empty by
+# default, and only exists for existing ebuild revisions to use.  Set
+# to a non-empty value to enable.
+# @DEPRECATED: none
+: "${TC_AUTOCONF_BREAK_INFOS:=}"
+
+# @ECLASS_VARIABLE: TC_AUTOCONF_INFOPATH
+# @DESCRIPTION:
+# Where to install info files if not slotting.
+TC_AUTOCONF_INFOPATH="${EPREFIX}/usr/share/autoconf-${PV}/info"
+
 toolchain-autoconf_src_prepare() {
 	find -name Makefile.in -exec sed -i '/^pkgdatadir/s:$:-@VERSION@:' {} + || die
 	default
@@ -26,7 +40,15 @@ toolchain-autoconf_src_prepare() {
 toolchain-autoconf_src_configure() {
 	# Disable Emacs in the build system since it is in a separate package.
 	export EMACS=no
-	econf --program-suffix="-${PV}" || die
+	local myconf=(
+		--program-suffix="-${PV}"
+	)
+	if [[ -z "${TC_AUTOCONF_BREAK_INFOS}" && "${SLOT}" != 0 ]]; then
+		myconf+=(
+			--infodir="${TC_AUTOCONF_INFOPATH}"
+		)
+	fi
+	econf "${myconf[@]}" || die
 	# econf updates config.{sub,guess} which forces the manpages
 	# to be regenerated which we dont want to do #146621
 	touch man/*.1
@@ -65,7 +87,25 @@ slot_info_pages() {
 
 toolchain-autoconf_src_install() {
 	default
-	slot_info_pages
+	if [[ -n "${TC_AUTOCONF_BREAK_INFOS}" ]]; then
+		slot_info_pages
+	else
+		rm -f dir || die
+
+		local major="$(ver_cut 1)"
+		local minor="$(ver_cut 2)"
+		local idx="$((99999-(major*1000+minor)))"
+		newenvd - "06autoconf${idx}" <<-EOF
+		INFOPATH="${TC_AUTOCONF_INFOPATH}"
+		EOF
+
+		pushd "${D}/${TC_AUTOCONF_INFOPATH}" >/dev/null || die
+		for f in *.info*; do
+			# Install convenience aliases for versioned Autoconf pages.
+			ln -s "$f" "${f/./-${PV}.}" || die
+		done
+		popd >/dev/null || die
+	fi
 }
 
 fi
-- 
2.40.0



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-dev] [PATCH 2/4] sys-devel/autoconf: Set TC_AUTOCONF_BREAK_INFOS=yes to prevent changes
  2023-03-26 20:30 [gentoo-dev] [PATCH 1/4] toolchain-autoconf.eclass: Add option to disable Info slotting Arsen Arsenović
@ 2023-03-26 20:30 ` Arsen Arsenović
  2023-03-26 20:30 ` [gentoo-dev] [PATCH 3/4] sys-devel/autoconf: Add revisions without Info path breaking Arsen Arsenović
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 8+ messages in thread
From: Arsen Arsenović @ 2023-03-26 20:30 UTC (permalink / raw
  To: gentoo-dev; +Cc: Arsen Arsenović

Recently, the toolchain-autoconf class was edited not to naively slot
Info pages, breaking them in the process.  To prevent existing revisions
from changing contents, TC_AUTOCONF_BREAK_INFOS was added to permit
using old behavior currently.

Closes: https://bugs.gentoo.org/902461
Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
---
 sys-devel/autoconf/autoconf-2.13-r2.ebuild | 4 +++-
 sys-devel/autoconf/autoconf-2.13-r7.ebuild | 4 +++-
 sys-devel/autoconf/autoconf-2.69-r5.ebuild | 4 +++-
 sys-devel/autoconf/autoconf-2.69-r8.ebuild | 4 +++-
 sys-devel/autoconf/autoconf-2.71-r1.ebuild | 4 +++-
 sys-devel/autoconf/autoconf-2.71-r5.ebuild | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/sys-devel/autoconf/autoconf-2.13-r2.ebuild b/sys-devel/autoconf/autoconf-2.13-r2.ebuild
index f26c02ae862c..787687f1b8c0 100644
--- a/sys-devel/autoconf/autoconf-2.13-r2.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,6 +33,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.13-perl-5.26.patch
 )
 
+TC_AUTOCONF_BREAK_INFOS=yes
+
 src_configure() {
 	# make sure configure is newer than configure.in
 	touch configure || die
diff --git a/sys-devel/autoconf/autoconf-2.13-r7.ebuild b/sys-devel/autoconf/autoconf-2.13-r7.ebuild
index 055d8286769d..b4942c1bcb7b 100644
--- a/sys-devel/autoconf/autoconf-2.13-r7.ebuild
+++ b/sys-devel/autoconf/autoconf-2.13-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,6 +35,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-Clang-16-fixes-for-various-tests.patch
 )
 
+TC_AUTOCONF_BREAK_INFOS=yes
+
 src_configure() {
 	# make sure configure is newer than configure.in
 	touch configure || die
diff --git a/sys-devel/autoconf/autoconf-2.69-r5.ebuild b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
index f51aa71c2d0a..947bf12f49b4 100644
--- a/sys-devel/autoconf/autoconf-2.69-r5.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,8 @@ PATCHES=(
 	"${WORKDIR}"/patches/${P}-runstatedir_info.patch
 )
 
+TC_AUTOCONF_BREAK_INFOS=yes
+
 src_prepare() {
 	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
 	if [[ ${CHOST} == *-darwin* ]] ; then
diff --git a/sys-devel/autoconf/autoconf-2.69-r8.ebuild b/sys-devel/autoconf/autoconf-2.69-r8.ebuild
index 3730430ac8a4..1c1ebcfc681e 100644
--- a/sys-devel/autoconf/autoconf-2.69-r8.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,6 +46,8 @@ PATCHES=(
 	"${WORKDIR}"/patches/${P}-texinfo.patch
 )
 
+TC_AUTOCONF_BREAK_INFOS=yes
+
 src_prepare() {
 	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
 	if [[ ${CHOST} == *-darwin* ]] ; then
diff --git a/sys-devel/autoconf/autoconf-2.71-r1.ebuild b/sys-devel/autoconf/autoconf-2.71-r1.ebuild
index 7ef4e0bcbeb7..9f2ea4b973fe 100644
--- a/sys-devel/autoconf/autoconf-2.71-r1.ebuild
+++ b/sys-devel/autoconf/autoconf-2.71-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,6 +43,8 @@ PDEPEND="emacs? ( app-emacs/autoconf-mode )"
 
 PATCHES=( "${FILESDIR}/${P}-time.patch" )
 
+TC_AUTOCONF_BREAK_INFOS=yes
+
 src_prepare() {
 	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
 	if [[ ${CHOST} == *-darwin* ]] ; then
diff --git a/sys-devel/autoconf/autoconf-2.71-r5.ebuild b/sys-devel/autoconf/autoconf-2.71-r5.ebuild
index 7749d47f435e..722aa8cc1e22 100644
--- a/sys-devel/autoconf/autoconf-2.71-r5.ebuild
+++ b/sys-devel/autoconf/autoconf-2.71-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,6 +50,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-K-R-decls-clang-deux.patch
 )
 
+TC_AUTOCONF_BREAK_INFOS=yes
+
 src_prepare() {
 	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
 	if [[ ${CHOST} == *-darwin* ]] ; then
-- 
2.40.0



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-dev] [PATCH 3/4] sys-devel/autoconf: Add revisions without Info path breaking
  2023-03-26 20:30 [gentoo-dev] [PATCH 1/4] toolchain-autoconf.eclass: Add option to disable Info slotting Arsen Arsenović
  2023-03-26 20:30 ` [gentoo-dev] [PATCH 2/4] sys-devel/autoconf: Set TC_AUTOCONF_BREAK_INFOS=yes to prevent changes Arsen Arsenović
@ 2023-03-26 20:30 ` Arsen Arsenović
  2023-03-26 20:30 ` [gentoo-dev] [PATCH 4/4] sys-devel/automake: Fix installing broken Info pages Arsen Arsenović
  2023-03-27  8:34 ` [gentoo-dev] [PATCH 1/4] toolchain-autoconf.eclass: Add option to disable Info slotting Florian Schmaus
  3 siblings, 0 replies; 8+ messages in thread
From: Arsen Arsenović @ 2023-03-26 20:30 UTC (permalink / raw
  To: gentoo-dev; +Cc: Arsen Arsenović

Closes: https://bugs.gentoo.org/902461
Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
---
 sys-devel/autoconf/autoconf-2.13-r8.ebuild | 59 +++++++++++++++
 sys-devel/autoconf/autoconf-2.69-r9.ebuild | 63 ++++++++++++++++
 sys-devel/autoconf/autoconf-2.71-r6.ebuild | 88 ++++++++++++++++++++++
 3 files changed, 210 insertions(+)
 create mode 100644 sys-devel/autoconf/autoconf-2.13-r8.ebuild
 create mode 100644 sys-devel/autoconf/autoconf-2.69-r9.ebuild
 create mode 100644 sys-devel/autoconf/autoconf-2.71-r6.ebuild

diff --git a/sys-devel/autoconf/autoconf-2.13-r8.ebuild b/sys-devel/autoconf/autoconf-2.13-r8.ebuild
new file mode 100644
index 000000000000..69156d4abf78
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.13-r8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="${PV:0:3}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-lang/perl
+	sys-devel/m4
+	test? ( dev-util/dejagnu )
+"
+RDEPEND="
+	${BDEPEND}
+	sys-apps/texinfo
+	>=sys-devel/autoconf-wrapper-13
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-destdir.patch
+	"${FILESDIR}"/${P}-test-fixes.patch #146592
+	"${FILESDIR}"/${P}-perl-5.26.patch
+	"${FILESDIR}"/${P}-K-R-decls-clang.patch
+	"${FILESDIR}"/${P}-Clang-16-fixes-for-various-tests.patch
+)
+
+src_configure() {
+	# make sure configure is newer than configure.in
+	touch configure || die
+
+	# need to include --exec-prefix and --bindir or our
+	# DESTDIR patch will trigger sandbox hate :(
+	#
+	# need to force locale to C to avoid bugs in the old
+	# configure script breaking the install paths #351982
+	#
+	# force to `awk` so that we don't encode another awk that
+	# happens to currently be installed, but might later be
+	# uninstalled (like mawk).  same for m4.
+	ac_cv_path_M4="m4" \
+	ac_cv_prog_AWK="awk" \
+	LC_ALL=C \
+	econf \
+		--exec-prefix="${EPREFIX}"/usr \
+		--bindir="${EPREFIX}"/usr/bin \
+		--program-suffix="-${PV}" \
+		--infodir="${TC_AUTOCONF_INFOPATH}"
+}
diff --git a/sys-devel/autoconf/autoconf-2.69-r9.ebuild b/sys-devel/autoconf/autoconf-2.69-r9.ebuild
new file mode 100644
index 000000000000..45c66d96f77c
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.69-r9.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz"
+	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"
+fi
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-3+"
+SLOT="${PV}"
+IUSE="emacs"
+
+BDEPEND="
+	>=sys-devel/m4-1.4.16
+	>=dev-lang/perl-5.6
+"
+RDEPEND="
+	${BDEPEND}
+	>=sys-devel/autoconf-wrapper-13
+	!~sys-devel/${P}:2.5
+"
+
+[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.69-perl-5.26.patch
+	"${FILESDIR}"/${P}-fix-libtool-test.patch
+	"${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch
+	"${FILESDIR}"/${P}-make-tests-bash5-compatible.patch
+	"${FILESDIR}"/${P}-K-R-decls-clang.patch
+
+	"${WORKDIR}"/patches/${P}-texinfo.patch
+)
+
+src_prepare() {
+	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch )
+	fi
+
+	# Save timestamp to avoid later makeinfo call
+	touch -r doc/{,old_}autoconf.texi || die
+
+	toolchain-autoconf_src_prepare
+
+	# Restore timestamp to avoid makeinfo call
+	# We already have an up to date autoconf.info page at this point.
+	touch -r doc/{old_,}autoconf.texi || die
+}
diff --git a/sys-devel/autoconf/autoconf-2.71-r6.ebuild b/sys-devel/autoconf/autoconf-2.71-r6.ebuild
new file mode 100644
index 000000000000..af4176383c24
--- /dev/null
+++ b/sys-devel/autoconf/autoconf-2.71-r6.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
+	inherit git-r3
+else
+	# For _beta handling replace with real version number
+	MY_PV="${PV}"
+	MY_P="${PN}-${MY_PV}"
+	#PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
+	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
+		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+	#SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz"
+
+	if ! [[ ${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
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain-autoconf
+
+DESCRIPTION="Used to create autoconfiguration files"
+HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
+
+LICENSE="GPL-3+"
+SLOT="${PV/_*}"
+IUSE="emacs"
+
+# for 2.71, our Perl time resolution patch changes our min Perl from 5.6
+# (vanilla upstream for 2.71) to 5.8.
+BDEPEND=">=sys-devel/m4-1.4.16
+	>=dev-lang/perl-5.8"
+RDEPEND="${BDEPEND}
+	>=sys-devel/autoconf-wrapper-15
+	sys-devel/gnuconfig
+	!~sys-devel/${P}:2.5"
+[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
+PDEPEND="emacs? ( app-emacs/autoconf-mode )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-AC_LANG_CALL_C_cxx.patch
+	"${FILESDIR}"/${P}-time.patch
+	"${FILESDIR}"/${P}-AC_C_BIGENDIAN-lto.patch
+	"${FILESDIR}"/${P}-K-R-decls-clang.patch
+	"${FILESDIR}"/${P}-make-4.4.patch
+	"${FILESDIR}"/${P}-K-R-decls-clang-deux.patch
+)
+
+src_prepare() {
+	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch )
+	fi
+
+	# Save timestamp to avoid later makeinfo call
+	touch -r doc/{,old_}autoconf.texi || die
+
+	local pdir
+	for pdir in "${WORKDIR}"/{upstream_,}patches ; do
+		if [[ -d "${pdir}" ]] ; then
+			eapply ${pdir}
+		fi
+	done
+
+	toolchain-autoconf_src_prepare
+
+	# Restore timestamp to avoid makeinfo call
+	# We already have an up to date autoconf.info page at this point.
+	touch -r doc/{old_,}autoconf.texi || die
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	toolchain-autoconf_src_install
+
+	local f
+	for f in config.{guess,sub} ; do
+		ln -fs ../../gnuconfig/${f} \
+			"${ED}"/usr/share/autoconf-*/build-aux/${f} || die
+	done
+}
-- 
2.40.0



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [gentoo-dev] [PATCH 4/4] sys-devel/automake: Fix installing broken Info pages
  2023-03-26 20:30 [gentoo-dev] [PATCH 1/4] toolchain-autoconf.eclass: Add option to disable Info slotting Arsen Arsenović
  2023-03-26 20:30 ` [gentoo-dev] [PATCH 2/4] sys-devel/autoconf: Set TC_AUTOCONF_BREAK_INFOS=yes to prevent changes Arsen Arsenović
  2023-03-26 20:30 ` [gentoo-dev] [PATCH 3/4] sys-devel/autoconf: Add revisions without Info path breaking Arsen Arsenović
@ 2023-03-26 20:30 ` Arsen Arsenović
  2023-03-27  8:38   ` Florian Schmaus
  2023-03-27  8:34 ` [gentoo-dev] [PATCH 1/4] toolchain-autoconf.eclass: Add option to disable Info slotting Florian Schmaus
  3 siblings, 1 reply; 8+ messages in thread
From: Arsen Arsenović @ 2023-03-26 20:30 UTC (permalink / raw
  To: gentoo-dev; +Cc: Arsen Arsenović

This commit replaces the Info page slotting mechanism with simple
INFOPATH setting.

Closes: https://bugs.gentoo.org/902461
Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
---
 sys-devel/automake/automake-1.11.6-r4.ebuild |  84 +++++++++++++
 sys-devel/automake/automake-1.16.5-r1.ebuild | 119 +++++++++++++++++++
 sys-devel/automake/automake-9999.ebuild      |  48 +++-----
 3 files changed, 220 insertions(+), 31 deletions(-)
 create mode 100644 sys-devel/automake/automake-1.11.6-r4.ebuild
 create mode 100644 sys-devel/automake/automake-1.16.5-r1.ebuild

diff --git a/sys-devel/automake/automake-1.11.6-r4.ebuild b/sys-devel/automake/automake-1.11.6-r4.ebuild
new file mode 100644
index 000000000000..4e0857012d71
--- /dev/null
+++ b/sys-devel/automake/automake-1.11.6-r4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="https://www.gnu.org/software/automake/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+RESTRICT="test"
+
+RDEPEND=">=dev-lang/perl-5.6
+	>=sys-devel/automake-wrapper-10
+	>=sys-devel/autoconf-2.69:*
+	sys-devel/gnuconfig"
+DEPEND="${RDEPEND}
+	sys-apps/help2man"
+BDEPEND="app-arch/gzip"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
+	"${FILESDIR}"/${PN}-1.11-install-sh-avoid-low-risk-race-in-tmp.patch
+	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
+)
+
+src_prepare() {
+	default
+	export WANT_AUTOCONF=2.5
+	export HELP2MAN=true
+	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
+	export TZ="UTC"  #589138
+}
+
+src_compile() {
+	# Also used in install.
+	infopath="${EPREFIX}/usr/share/automake-${PV}/info"
+	econf --infodir="${infopath}"
+
+	local x
+	for x in aclocal automake; do
+		help2man "perl -Ilib ${x}" > doc/${x}-${SLOT}.1
+	done
+}
+
+src_install() {
+	default
+
+	rm \
+		"${ED}"/usr/bin/{aclocal,automake} \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	local x
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
+	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+	gunzip "${tarfile}" || die
+	fi
+
+	pushd "${D}/${infopath}" >/dev/null || die
+	for f in *.info*; do
+		# Install convenience aliases for versioned Automake pages.
+		ln -s "$f" "${f/./-${PV}.}" || die
+	done
+	popd >/dev/null || die
+
+	local major="$(ver_cut 1)"
+	local minor="$(ver_cut 2)"
+	local idx="$((99999-(major*1000+minor)))"
+	newenvd - "06automake${idx}" <<-EOF
+	INFOPATH="${infopath}"
+	EOF
+}
diff --git a/sys-devel/automake/automake-1.16.5-r1.ebuild b/sys-devel/automake/automake-1.16.5-r1.ebuild
new file mode 100644
index 000000000000..d49dcf79faa3
--- /dev/null
+++ b/sys-devel/automake/automake-1.16.5-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit python-any-r1
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
+	inherit git-r3
+else
+	if [[ ${PV/_beta} == ${PV} ]]; then
+		MY_P="${P}"
+		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+			https://alpha.gnu.org/pub/gnu/${PN}/${MY_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"
+	else
+		MY_PV="$(ver_cut 1).$(($(ver_cut 2)-1))b"
+		MY_P="${PN}-${MY_PV}"
+
+		# Alpha/beta releases are not distributed on the usual mirrors.
+		SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+	fi
+
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Used to generate Makefile.in from Makefile.am"
+HOMEPAGE="https://www.gnu.org/software/automake/"
+
+LICENSE="GPL-2"
+# Use Gentoo versioning for slotting.
+SLOT="${PV:0:4}"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=dev-lang/perl-5.6
+	>=sys-devel/automake-wrapper-11
+	>=sys-devel/autoconf-2.69:*
+	sys-devel/gnuconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/gzip
+	sys-apps/help2man
+	test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+	"${FILESDIR}"/automake-1.16.2-py3-compile.patch
+	"${FILESDIR}"/automake-1.16.2-fix-instmany-python.sh-test.patch
+	"${FILESDIR}"/automake-1.16.2-fix-py-compile-basedir.sh-test.patch
+)
+
+pkg_setup() {
+	# Avoid python-any-r1_pkg_setup
+	:
+}
+
+src_prepare() {
+	default
+
+	export WANT_AUTOCONF=2.5
+	# Don't try wrapping the autotools - this thing runs as it tends
+	# to be a bit esoteric, and the script does `set -e` itself.
+	./bootstrap || die
+	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
+
+	# bug #628912
+	if ! has_version -b sys-apps/texinfo ; then
+		touch doc/{stamp-vti,version.texi,automake.info} || die
+	fi
+}
+
+src_configure() {
+	use test && python_setup
+	# Also used in install.
+	infopath="${EPREFIX}/usr/share/automake-${PV}/info"
+	econf --infodir="${infopath}"
+}
+
+src_install() {
+	default
+
+	rm "${ED}"/usr/share/aclocal/README || die
+	rmdir "${ED}"/usr/share/aclocal || die
+	rm \
+		"${ED}"/usr/bin/{aclocal,automake} \
+		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
+
+	# remove all config.guess and config.sub files replacing them
+	# w/a symlink to a specific gnuconfig version
+	local x
+	for x in guess sub ; do
+		dosym ../gnuconfig/config.${x} \
+			/usr/share/${PN}-${SLOT}/config.${x}
+	done
+
+	# Avoid QA message about pre-compressed file in docs
+	local tarfile="${ED}/usr/share/doc/${PF}/amhello-1.0.tar.gz"
+	if [[ -f "${tarfile}" ]] ; then
+		gunzip "${tarfile}" || die
+	fi
+
+	pushd "${D}/${infopath}" >/dev/null || die
+	for f in *.info*; do
+		# Install convenience aliases for versioned Automake pages.
+		ln -s "$f" "${f/./-${PV}.}" || die
+	done
+	popd >/dev/null || die
+
+	local major="$(ver_cut 1)"
+	local minor="$(ver_cut 2)"
+	local idx="$((99999-(major*1000+minor)))"
+	newenvd - "06automake${idx}" <<-EOF
+	INFOPATH="${infopath}"
+	EOF
+}
diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index df5d9b7ecfc6..382a5bfb5943 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -69,42 +69,14 @@ src_prepare() {
 
 src_configure() {
 	use test && python_setup
-	default
-}
-
-# Slot the info pages. Do this w/out munging the source so we don't have
-# to depend on texinfo to regen things. bug #464146 (among others)
-slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir
-
-	# Rewrite all the references to other pages.
-	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
-	# after:  * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation.   Generating aclocal.m4.
-	local p pages=( *.info ) args=()
-	for p in "${pages[@]/%.info}" ; do
-		args+=(
-			-e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
-			-e "s:(${p}):(${p}-${SLOT}):g"
-		)
-	done
-	sed -i "${args[@]}" * || die
-
-	# Rewrite all the file references, and rename them in the process.
-	local f d
-	for f in * ; do
-		d=${f/.info/-${SLOT}.info}
-		mv "${f}" "${d}" || die
-		sed -i -e "s:${f}:${d}:g" * || die
-	done
-
-	popd >/dev/null || die
+	# Also used in install.
+	infopath="${EPREFIX}/usr/share/automake-${PV}/info"
+	econf --infodir="${infopath}"
 }
 
 src_install() {
 	default
 
-	slot_info_pages
 	rm "${ED}"/usr/share/aclocal/README || die
 	rmdir "${ED}"/usr/share/aclocal || die
 	rm \
@@ -124,4 +96,18 @@ src_install() {
 	if [[ -f "${tarfile}" ]] ; then
 		gunzip "${tarfile}" || die
 	fi
+
+	pushd "${D}/${infopath}" >/dev/null || die
+	for f in *.info*; do
+		# Install convenience aliases for versioned Automake pages.
+		ln -s "$f" "${f/./-${PV}.}" || die
+	done
+	popd >/dev/null || die
+
+	local major="$(ver_cut 1)"
+	local minor="$(ver_cut 2)"
+	local idx="$((99999-(major*1000+minor)))"
+	newenvd - "06automake${idx}" <<-EOF
+	INFOPATH="${infopath}"
+	EOF
 }
-- 
2.40.0



^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [gentoo-dev] [PATCH 1/4] toolchain-autoconf.eclass: Add option to disable Info slotting
  2023-03-26 20:30 [gentoo-dev] [PATCH 1/4] toolchain-autoconf.eclass: Add option to disable Info slotting Arsen Arsenović
                   ` (2 preceding siblings ...)
  2023-03-26 20:30 ` [gentoo-dev] [PATCH 4/4] sys-devel/automake: Fix installing broken Info pages Arsen Arsenović
@ 2023-03-27  8:34 ` Florian Schmaus
  2023-03-27  9:53   ` Arsen Arsenović
  3 siblings, 1 reply; 8+ messages in thread
From: Florian Schmaus @ 2023-03-27  8:34 UTC (permalink / raw
  To: gentoo-dev

On 26/03/2023 22.30, Arsen Arsenović wrote:
> Closes: https://bugs.gentoo.org/902461
> Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
> ---
>   eclass/toolchain-autoconf.eclass | 46 +++++++++++++++++++++++++++++---
>   1 file changed, 43 insertions(+), 3 deletions(-)
> 
> diff --git a/eclass/toolchain-autoconf.eclass b/eclass/toolchain-autoconf.eclass
> index 2ba27638468e..140ee4c9b5eb 100644
> --- a/eclass/toolchain-autoconf.eclass
> +++ b/eclass/toolchain-autoconf.eclass
> @@ -1,4 +1,4 @@
> -# Copyright 1999-2022 Gentoo Authors
> +# Copyright 1999-2023 Gentoo Authors
>   # Distributed under the terms of the GNU General Public License v2
>   
>   # @ECLASS: toolchain-autoconf.eclass
> @@ -18,6 +18,20 @@ esac
>   if [[ -z ${_TOOLCHAIN_AUTOCONF_ECLASS} ]]; then
>   _TOOLCHAIN_AUTOCONF_ECLASS=1
>   
> +# @ECLASS_VARIABLE: TC_AUTOCONF_BREAK_INFOS
> +# @DESCRIPTION:
> +# Enables slotting logic on the installed info pages.  This includes
> +# mangling the pages in order to include a version number.  Empty by
> +# default, and only exists for existing ebuild revisions to use.  Set

Referring to "existing ebuild revisions" becomes confusing in the 
future, when there are existing ebuilds that do not use this variable.

Maybe "and only set by legacy ebuilds to phase out the broken slotting 
logic. New ebuilds should not set this variable."

- Flow



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [gentoo-dev] [PATCH 4/4] sys-devel/automake: Fix installing broken Info pages
  2023-03-26 20:30 ` [gentoo-dev] [PATCH 4/4] sys-devel/automake: Fix installing broken Info pages Arsen Arsenović
@ 2023-03-27  8:38   ` Florian Schmaus
  2023-03-27  9:54     ` Arsen Arsenović
  0 siblings, 1 reply; 8+ messages in thread
From: Florian Schmaus @ 2023-03-27  8:38 UTC (permalink / raw
  To: gentoo-dev

On 26/03/2023 22.30, Arsen Arsenović wrote:
> This commit replaces the Info page slotting mechanism with simple
> INFOPATH setting.
> 
> Closes: https://bugs.gentoo.org/902461
> Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
> ---
>   sys-devel/automake/automake-1.11.6-r4.ebuild |  84 +++++++++++++
>   sys-devel/automake/automake-1.16.5-r1.ebuild | 119 +++++++++++++++++++
>   sys-devel/automake/automake-9999.ebuild      |  48 +++-----
>   3 files changed, 220 insertions(+), 31 deletions(-)
>   create mode 100644 sys-devel/automake/automake-1.11.6-r4.ebuild
>   create mode 100644 sys-devel/automake/automake-1.16.5-r1.ebuild
> 
> diff --git a/sys-devel/automake/automake-1.11.6-r4.ebuild b/sys-devel/automake/automake-1.11.6-r4.ebuild
> new file mode 100644
> index 000000000000..4e0857012d71
> --- /dev/null
> +++ b/sys-devel/automake/automake-1.11.6-r4.ebuild
> @@ -0,0 +1,84 @@
> +# Copyright 1999-2023 Gentoo Authors
> +# Distributed under the terms of the GNU General Public License v2
> +
> +EAPI=7
> +
> +DESCRIPTION="Used to generate Makefile.in from Makefile.am"
> +HOMEPAGE="https://www.gnu.org/software/automake/"
> +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
> +
> +LICENSE="GPL-2"
> +# Use Gentoo versioning for slotting.
> +SLOT="${PV:0:4}"
> +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
> +IUSE=""
> +RESTRICT="test"
> +
> +RDEPEND=">=dev-lang/perl-5.6
> +	>=sys-devel/automake-wrapper-10
> +	>=sys-devel/autoconf-2.69:*
> +	sys-devel/gnuconfig"
> +DEPEND="${RDEPEND}
> +	sys-apps/help2man"
> +BDEPEND="app-arch/gzip"
> +
> +PATCHES=(
> +	"${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
> +	"${FILESDIR}"/${PN}-1.11-install-sh-avoid-low-risk-race-in-tmp.patch
> +	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
> +)
> +
> +src_prepare() {
> +	default
> +	export WANT_AUTOCONF=2.5
> +	export HELP2MAN=true
> +	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
> +	export TZ="UTC"  #589138
> +}
> +
> +src_compile() {
> +	# Also used in install.
> +	infopath="${EPREFIX}/usr/share/automake-${PV}/info"

Not sure if we have a style policy on this, but I read lowercase 
variables as local-function variables. However, 'infopath', as is, is 
used in a subsequent ebuild phase function. So maybe 
s/infopath/INFOPATH/ or maybe even MY_INFOPATH or AUTOMAKE_INFOPATH?

- Flow



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [gentoo-dev] [PATCH 1/4] toolchain-autoconf.eclass: Add option to disable Info slotting
  2023-03-27  8:34 ` [gentoo-dev] [PATCH 1/4] toolchain-autoconf.eclass: Add option to disable Info slotting Florian Schmaus
@ 2023-03-27  9:53   ` Arsen Arsenović
  0 siblings, 0 replies; 8+ messages in thread
From: Arsen Arsenović @ 2023-03-27  9:53 UTC (permalink / raw
  To: gentoo-dev; +Cc: Florian Schmaus

[-- Attachment #1: Type: text/plain, Size: 1721 bytes --]

Hi Florian,

Florian Schmaus <flow@gentoo.org> writes:

> On 26/03/2023 22.30, Arsen Arsenović wrote:
>> Closes: https://bugs.gentoo.org/902461
>> Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
>> ---
>>   eclass/toolchain-autoconf.eclass | 46 +++++++++++++++++++++++++++++---
>>   1 file changed, 43 insertions(+), 3 deletions(-)
>> diff --git a/eclass/toolchain-autoconf.eclass
>> b/eclass/toolchain-autoconf.eclass
>> index 2ba27638468e..140ee4c9b5eb 100644
>> --- a/eclass/toolchain-autoconf.eclass
>> +++ b/eclass/toolchain-autoconf.eclass
>> @@ -1,4 +1,4 @@
>> -# Copyright 1999-2022 Gentoo Authors
>> +# Copyright 1999-2023 Gentoo Authors
>>   # Distributed under the terms of the GNU General Public License v2
>>     # @ECLASS: toolchain-autoconf.eclass
>> @@ -18,6 +18,20 @@ esac
>>   if [[ -z ${_TOOLCHAIN_AUTOCONF_ECLASS} ]]; then
>>   _TOOLCHAIN_AUTOCONF_ECLASS=1
>>   +# @ECLASS_VARIABLE: TC_AUTOCONF_BREAK_INFOS
>> +# @DESCRIPTION:
>> +# Enables slotting logic on the installed info pages.  This includes
>> +# mangling the pages in order to include a version number.  Empty by
>> +# default, and only exists for existing ebuild revisions to use.  Set
>
> Referring to "existing ebuild revisions" becomes confusing in the future, when
> there are existing ebuilds that do not use this variable.

My intention was that this variable goes away as soon as said revisions
are out of tree, so I wasn't thinking about that time-frame but I'll
clarify and push to my branch.

Thanks, have a lovely day.

> Maybe "and only set by legacy ebuilds to phase out the broken slotting
> logic. New ebuilds should not set this variable."
>
> - Flow


-- 
Arsen Arsenović

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 381 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [gentoo-dev] [PATCH 4/4] sys-devel/automake: Fix installing broken Info pages
  2023-03-27  8:38   ` Florian Schmaus
@ 2023-03-27  9:54     ` Arsen Arsenović
  0 siblings, 0 replies; 8+ messages in thread
From: Arsen Arsenović @ 2023-03-27  9:54 UTC (permalink / raw
  To: gentoo-dev; +Cc: Florian Schmaus

[-- Attachment #1: Type: text/plain, Size: 2628 bytes --]


Florian Schmaus <flow@gentoo.org> writes:

> On 26/03/2023 22.30, Arsen Arsenović wrote:
>> This commit replaces the Info page slotting mechanism with simple
>> INFOPATH setting.
>> Closes: https://bugs.gentoo.org/902461
>> Signed-off-by: Arsen Arsenović <arsen@gentoo.org>
>> ---
>>   sys-devel/automake/automake-1.11.6-r4.ebuild |  84 +++++++++++++
>>   sys-devel/automake/automake-1.16.5-r1.ebuild | 119 +++++++++++++++++++
>>   sys-devel/automake/automake-9999.ebuild      |  48 +++-----
>>   3 files changed, 220 insertions(+), 31 deletions(-)
>>   create mode 100644 sys-devel/automake/automake-1.11.6-r4.ebuild
>>   create mode 100644 sys-devel/automake/automake-1.16.5-r1.ebuild
>> diff --git a/sys-devel/automake/automake-1.11.6-r4.ebuild
>> b/sys-devel/automake/automake-1.11.6-r4.ebuild
>> new file mode 100644
>> index 000000000000..4e0857012d71
>> --- /dev/null
>> +++ b/sys-devel/automake/automake-1.11.6-r4.ebuild
>> @@ -0,0 +1,84 @@
>> +# Copyright 1999-2023 Gentoo Authors
>> +# Distributed under the terms of the GNU General Public License v2
>> +
>> +EAPI=7
>> +
>> +DESCRIPTION="Used to generate Makefile.in from Makefile.am"
>> +HOMEPAGE="https://www.gnu.org/software/automake/"
>> +SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
>> +
>> +LICENSE="GPL-2"
>> +# Use Gentoo versioning for slotting.
>> +SLOT="${PV:0:4}"
>> +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
>> +IUSE=""
>> +RESTRICT="test"
>> +
>> +RDEPEND=">=dev-lang/perl-5.6
>> +	>=sys-devel/automake-wrapper-10
>> +	>=sys-devel/autoconf-2.69:*
>> +	sys-devel/gnuconfig"
>> +DEPEND="${RDEPEND}
>> +	sys-apps/help2man"
>> +BDEPEND="app-arch/gzip"
>> +
>> +PATCHES=(
>> +	"${FILESDIR}"/${PN}-1.10-perl-5.16.patch #424453
>> +	"${FILESDIR}"/${PN}-1.11-install-sh-avoid-low-risk-race-in-tmp.patch
>> +	"${FILESDIR}"/${PN}-1.13-perl-escape-curly-bracket-r1.patch
>> +)
>> +
>> +src_prepare() {
>> +	default
>> +	export WANT_AUTOCONF=2.5
>> +	export HELP2MAN=true
>> +	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
>> +	export TZ="UTC"  #589138
>> +}
>> +
>> +src_compile() {
>> +	# Also used in install.
>> +	infopath="${EPREFIX}/usr/share/automake-${PV}/info"
>
> Not sure if we have a style policy on this, but I read lowercase variables as
> local-function variables. However, 'infopath', as is, is used in a subsequent
> ebuild phase function. So maybe s/infopath/INFOPATH/ or maybe even MY_INFOPATH
> or AUTOMAKE_INFOPATH?

Yes, fair enough.  I'll update it to MY_INFOPATH.

> - Flow


-- 
Arsen Arsenović

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 381 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2023-03-27  9:55 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-26 20:30 [gentoo-dev] [PATCH 1/4] toolchain-autoconf.eclass: Add option to disable Info slotting Arsen Arsenović
2023-03-26 20:30 ` [gentoo-dev] [PATCH 2/4] sys-devel/autoconf: Set TC_AUTOCONF_BREAK_INFOS=yes to prevent changes Arsen Arsenović
2023-03-26 20:30 ` [gentoo-dev] [PATCH 3/4] sys-devel/autoconf: Add revisions without Info path breaking Arsen Arsenović
2023-03-26 20:30 ` [gentoo-dev] [PATCH 4/4] sys-devel/automake: Fix installing broken Info pages Arsen Arsenović
2023-03-27  8:38   ` Florian Schmaus
2023-03-27  9:54     ` Arsen Arsenović
2023-03-27  8:34 ` [gentoo-dev] [PATCH 1/4] toolchain-autoconf.eclass: Add option to disable Info slotting Florian Schmaus
2023-03-27  9:53   ` Arsen Arsenović

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox