commit: 41a10cf44b022f88604535fc5d4fd6c0c62cbf55 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Dec 27 19:38:21 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Dec 27 20:57:07 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41a10cf4
autotools.eclass: treat 2.5 as 2.71 for now Having an unbound dependency (no slot) causes all sorts of problems. Add cases for each slot. I think we should really have the slots aligned to PV and slotmove as required but let's handle that another time. This would've hidden the original bug at least. Bug: https://bugs.gentoo.org/920822 Signed-off-by: Sam James <sam <AT> gentoo.org> eclass/autotools.eclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 5eab543409a5..5c266c701e25 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -118,6 +118,8 @@ fi if [[ -n ${WANT_AUTOCONF} ]] ; then # TODO: Fix the slot mess here and just have proper PV-as-SLOT? + # TODO: Make _LATEST_AUTOCONF an assoc. array and instead iterate over + # its keys. case ${WANT_AUTOCONF} in none) # some packages don't require autoconf at all @@ -127,7 +129,13 @@ if [[ -n ${WANT_AUTOCONF} ]] ; then _autoconf_atom=">=sys-devel/autoconf-2.13-r7:2.1" ;; 2.5) - _autoconf_atom=">=sys-devel/autoconf-2.71-r6" + _autoconf_atom=">=sys-devel/autoconf-2.71-r6:2.71" + ;; + 2.69) + _autoconf_atom=">=sys-devel/autoconf-2.69-r9:2.69" + ;; + 2.71) + _autoconf_atom=">=sys-devel/autoconf-2.71-r6:2.71" ;; latest) printf -v _autoconf_atom_tmp '>=sys-devel/autoconf-%s:%s ' ${_LATEST_AUTOCONF[@]/:/ }
