diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 37520 -> 37519 bytes | |||
| -rw-r--r-- | eclass/autotools.eclass | 6 | ||||
| -rw-r--r-- | eclass/toolchain.eclass | 19 |
3 files changed, 5 insertions, 20 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 1bd59843e2a6..5d8aae36574d 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index ab9040d99c73..e93338ac6b97 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -93,15 +93,15 @@ fi if [[ -n ${WANT_AUTOCONF} ]] ; then case ${WANT_AUTOCONF} in none) _autoconf_atom="" ;; # some packages don't require autoconf at all - 2.1) _autoconf_atom="~sys-devel/autoconf-2.13" ;; + 2.1) _autoconf_atom=">=sys-devel/autoconf-2.13-r7:2.1" ;; # if you change the "latest" version here, change also autotools_env_setup - latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.71" ;; + latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.71-r5" ;; *) die "Invalid WANT_AUTOCONF value '${WANT_AUTOCONF}'" ;; esac export WANT_AUTOCONF fi -_libtool_atom=">=sys-devel/libtool-2.4" +_libtool_atom=">=sys-devel/libtool-2.4.7" if [[ -n ${WANT_LIBTOOL} ]] ; then case ${WANT_LIBTOOL} in none) _libtool_atom="" ;; diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 4b96a087352c..2bed15110ece 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -100,12 +100,6 @@ tc_version_is_between() { # @DESCRIPTION: # Indicate the developer who hosts the patchset for an ebuild. -# @ECLASS_VARIABLE: TOOLCHAIN_SPHINX_BUILD -# @DEFAULT_UNSET -# @DESCRIPTION: -# Indicate if Sphinx is needed for this build. Enabled by default for -# >= 13.*.9999 (this is when upstream changed their docs from texinfo->sphinx). - # @ECLASS_VARIABLE: GCC_PV # @INTERNAL # @DESCRIPTION: @@ -295,8 +289,7 @@ fi #---->> DEPEND <<---- -RDEPEND=" - sys-libs/zlib +RDEPEND="sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) " @@ -327,18 +320,10 @@ BDEPEND=" test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 - ) -" + )" DEPEND="${RDEPEND}" -# Snapshots don't contain info or man pages. if [[ ${PN} == gcc && ${PV} == *_p* ]] ; then - # >= GCC 13 needs sphinx to generate the info and man pages. - # It still uses texinfo as well. - if [[ -n ${TOOLCHAIN_SPHINX_BUILD} ]] ; then - BDEPEND+=" dev-python/sphinx" - fi - # Snapshots don't contain info pages. # If they start to, adjust gcc_cv_prog_makeinfo_modern logic in toolchain_src_configure. # Needed unless/until https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106899 is fixed |