From 4c588f061163483deaeecd52e6a5743762d2603e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 15 Jan 2024 19:18:29 +0000 Subject: gentoo auto-resync : 15:01:2024 - 19:18:28 --- eclass/Manifest.gz | Bin 38951 -> 38957 bytes eclass/autotools.eclass | 26 +++++++++++++------------- eclass/php-ext-source-r3.eclass | 4 ++-- eclass/toolchain-autoconf.eclass | 6 +++--- eclass/xorg-3.eclass | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index 8beb4ae938d6..97d7b8030b38 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 7f48c78739c7..2290e8067813 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: autotools.eclass @@ -95,8 +95,8 @@ _LATEST_AUTOCONF=( 2.72-r1:2.72 2.71-r6:2.71 ) # WANT value by using a colon: : _LATEST_AUTOMAKE=( 1.16.5:1.16 ) -_automake_atom="sys-devel/automake" -_autoconf_atom="sys-devel/autoconf" +_automake_atom="dev-build/automake" +_autoconf_atom="dev-build/autoconf" if [[ -n ${WANT_AUTOMAKE} ]] ; then case ${WANT_AUTOMAKE} in none) @@ -105,12 +105,12 @@ if [[ -n ${WANT_AUTOMAKE} ]] ; then # the autoreconf tool, so this requirement is correct, bug #401605. ;; latest) - printf -v _automake_atom_tmp '>=sys-devel/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ } + printf -v _automake_atom_tmp '>=dev-build/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ } _automake_atom="|| ( ${_automake_atom_tmp} )" unset _automake_atom_tmp ;; *) - _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" + _automake_atom="=dev-build/automake-${WANT_AUTOMAKE}*" ;; esac export WANT_AUTOMAKE @@ -126,19 +126,19 @@ if [[ -n ${WANT_AUTOCONF} ]] ; then _autoconf_atom="" ;; 2.1) - _autoconf_atom=">=sys-devel/autoconf-2.13-r7:2.1" + _autoconf_atom=">=dev-build/autoconf-2.13-r7:2.1" ;; 2.5) - _autoconf_atom=">=sys-devel/autoconf-2.71-r6:2.71" + _autoconf_atom=">=dev-build/autoconf-2.71-r6:2.71" ;; 2.69) - _autoconf_atom=">=sys-devel/autoconf-2.69-r9:2.69" + _autoconf_atom=">=dev-build/autoconf-2.69-r9:2.69" ;; 2.71) - _autoconf_atom=">=sys-devel/autoconf-2.71-r6:2.71" + _autoconf_atom=">=dev-build/autoconf-2.71-r6:2.71" ;; latest) - printf -v _autoconf_atom_tmp '>=sys-devel/autoconf-%s:%s ' ${_LATEST_AUTOCONF[@]/:/ } + printf -v _autoconf_atom_tmp '>=dev-build/autoconf-%s:%s ' ${_LATEST_AUTOCONF[@]/:/ } _autoconf_atom="|| ( ${_autoconf_atom_tmp} )" unset _autoconf_atom_tmp ;; @@ -149,7 +149,7 @@ if [[ -n ${WANT_AUTOCONF} ]] ; then export WANT_AUTOCONF fi -_libtool_atom=">=sys-devel/libtool-2.4.7" +_libtool_atom=">=dev-build/libtool-2.4.7" if [[ -n ${WANT_LIBTOOL} ]] ; then case ${WANT_LIBTOOL} in none) _libtool_atom="" ;; @@ -570,7 +570,7 @@ autotools_env_setup() { hv_args="-b" ;; esac - has_version ${hv_args} "=sys-devel/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break + has_version ${hv_args} "=dev-build/automake-${pv}*" && export WANT_AUTOMAKE="${pv}" && break done # During bootstrap in prefix there might be no automake merged yet @@ -599,7 +599,7 @@ autotools_env_setup() { hv_args="-b" ;; esac - has_version ${hv_args} "=sys-devel/autoconf-${pv}*" && export WANT_AUTOCONF="${pv}" && break + has_version ${hv_args} "=dev-build/autoconf-${pv}*" && export WANT_AUTOCONF="${pv}" && break done # During bootstrap in prefix there might be no autoconf merged yet diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass index e463d3282e83..0d58db5031c9 100644 --- a/eclass/php-ext-source-r3.eclass +++ b/eclass/php-ext-source-r3.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: php-ext-source-r3.eclass @@ -128,7 +128,7 @@ REQUIRED_USE+=") ${PHP_EXT_OPTIONAL_USE:+ )}" PHPDEPEND+=" ${PHP_EXT_OPTIONAL_USE:+ )}" TOOLDEPS=" sys-devel/m4 - sys-devel/libtool + dev-build/libtool " RDEPEND="${PHPDEPEND}" diff --git a/eclass/toolchain-autoconf.eclass b/eclass/toolchain-autoconf.eclass index 137f0efac159..1eaf681496d4 100644 --- a/eclass/toolchain-autoconf.eclass +++ b/eclass/toolchain-autoconf.eclass @@ -1,14 +1,14 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: toolchain-autoconf.eclass # @MAINTAINER: # # @SUPPORTED_EAPIS: 7 8 -# @BLURB: Common code for sys-devel/autoconf ebuilds +# @BLURB: Common code for dev-build/autoconf ebuilds # @DESCRIPTION: # This eclass contains the common phase functions migrated from -# sys-devel/autoconf eblits. +# dev-build/autoconf eblits. case ${EAPI} in 7|8) ;; diff --git a/eclass/xorg-3.eclass b/eclass/xorg-3.eclass index a9825fc31132..dde954ca77aa 100644 --- a/eclass/xorg-3.eclass +++ b/eclass/xorg-3.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: xorg-3.eclass @@ -130,7 +130,7 @@ fi # Set up autotools shared dependencies # Remember that all versions here MUST be stable EAUTORECONF_DEPEND+=" - >=sys-devel/libtool-2.2.6a + >=dev-build/libtool-2.2.6a sys-devel/m4" if [[ ${PN} != util-macros ]] ; then EAUTORECONF_DEPEND+=" >=x11-misc/util-macros-1.18" -- cgit v1.2.3