diff --git a/dev-build/autoconf/autoconf-2.73-r1.ebuild b/dev-build/autoconf/autoconf-2.73-r1.ebuild index f4b39dcc22fb2..13d5a52addf7e 100644 --- a/dev-build/autoconf/autoconf-2.73-r1.ebuild +++ b/dev-build/autoconf/autoconf-2.73-r1.ebuild @@ -81,7 +81,7 @@ src_prepare() { # usr/bin/libtool is provided by binutils-apple, need gnu libtool if [[ ${CHOST} == *-darwin* ]] ; then - PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch ) + PATCHES+=( "${FILESDIR}"/${PN}-2.73-darwin.patch ) fi # Save timestamp to avoid later makeinfo call diff --git a/dev-build/autoconf/autoconf-9999.ebuild b/dev-build/autoconf/autoconf-9999.ebuild index ec41a181b6638..13d5a52addf7e 100644 --- a/dev-build/autoconf/autoconf-9999.ebuild +++ b/dev-build/autoconf/autoconf-9999.ebuild @@ -55,12 +55,16 @@ BDEPEND+=" " RDEPEND=" ${BDEPEND} - >=dev-build/autoconf-wrapper-20231224 + >=dev-build/autoconf-wrapper-20260320 sys-devel/gnuconfig !~${CATEGORY}/${P}:2.5 " [[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3" +PATCHES=( + "${FILESDIR}"/${PN}-2.73-maintainer-mode-autoheader.patch +) + src_prepare() { if [[ ${PV} == *9999 ]] ; then # Avoid the "dirty" suffix in the git version by generating it @@ -77,7 +81,7 @@ src_prepare() { # usr/bin/libtool is provided by binutils-apple, need gnu libtool if [[ ${CHOST} == *-darwin* ]] ; then - PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch ) + PATCHES+=( "${FILESDIR}"/${PN}-2.73-darwin.patch ) fi # Save timestamp to avoid later makeinfo call diff --git a/dev-build/autoconf/files/autoconf-2.73-darwin.patch b/dev-build/autoconf/files/autoconf-2.73-darwin.patch new file mode 100644 index 0000000000000..94007e9ad455b --- /dev/null +++ b/dev-build/autoconf/files/autoconf-2.73-darwin.patch @@ -0,0 +1,13 @@ +We rename libtoolize -> glibtoolize on macOS to avoid conflicting with +the system tool. +--- a/bin/autoreconf.in ++++ b/bin/autoreconf.in +@@ -130,7 +130,7 @@ my %C = ( + autom4te => $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@', + automake => $ENV{'AUTOMAKE'} || 'automake', + aclocal => $ENV{'ACLOCAL'} || 'aclocal', +- libtoolize => $ENV{'LIBTOOLIZE'} || 'libtoolize', ++ libtoolize => $ENV{'LIBTOOLIZE'} || 'glibtoolize', + intltoolize => $ENV{'INTLTOOLIZE'} || 'intltoolize', + gtkdocize => $ENV{'GTKDOCIZE'} || 'gtkdocize', + autopoint => $ENV{'AUTOPOINT'} || 'autopoint',