Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove support for 4-slot-abi EAPI #1413

Merged
merged 1 commit into from
Jan 11, 2025
Merged

Remove support for 4-slot-abi EAPI #1413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ Bug fixes:

* ebuild.sh: Allow CC and CXX to be changed in profile.bashrc.

* eapi.sh: Remove support for unofficial 4-slot-abi EAPI.

portage-3.0.66.1 (2024-09-18)
--------------

Expand Down
98 changes: 49 additions & 49 deletions bin/eapi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Copyright 2012-2024 Gentoo Authors
# Copyright 2012-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# PHASES
Expand All @@ -17,7 +17,7 @@ ___eapi_has_src_configure() {
}

___eapi_default_src_test_disables_parallel_jobs() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4)$ ]]
}

___eapi_has_S_WORKDIR_fallback() {
Expand All @@ -31,35 +31,35 @@ ___eapi_has_prefix_variables() {
}

___eapi_has_BROOT() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6)$ ]]
}

___eapi_has_SYSROOT() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6)$ ]]
}

___eapi_has_BDEPEND() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6)$ ]]
}

___eapi_has_IDEPEND() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

___eapi_has_RDEPEND_DEPEND_fallback() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3)$ ]]
}

___eapi_has_PORTDIR_ECLASSDIR() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6)$ ]]
}

___eapi_has_accumulated_PROPERTIES() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

___eapi_has_accumulated_RESTRICT() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

# HELPERS PRESENCE
Expand All @@ -73,71 +73,71 @@ ___eapi_has_dosed() {
}

___eapi_has_einstall() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5)$ ]]
}

___eapi_has_dohtml() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6)$ ]]
}

___eapi_has_dolib_libopts() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6)$ ]]
}

___eapi_has_docompress() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3)$ ]]
}

___eapi_has_dostrip() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6)$ ]]
}

___eapi_has_nonfatal() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3)$ ]]
}

___eapi_has_doheader() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4)$ ]]
}

___eapi_has_usex() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4)$ ]]
}

___eapi_has_get_libdir() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5)$ ]]
}

___eapi_has_einstalldocs() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5)$ ]]
}

___eapi_has_eapply() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5)$ ]]
}

___eapi_has_eapply_user() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5)$ ]]
}

___eapi_has_in_iuse() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5)$ ]]
}

___eapi_has_version_functions() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6)$ ]]
}

___eapi_has_hasq() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

___eapi_has_hasv() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

___eapi_has_useq() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

# HELPERS BEHAVIOR
Expand All @@ -147,51 +147,51 @@ ___eapi_best_version_and_has_version_support_--host-root() {
}

___eapi_best_version_and_has_version_support_-b_-d_-r() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6)$ ]]
}

___eapi_unpack_supports_xz() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2)$ ]]
}

___eapi_unpack_supports_txz() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5)$ ]]
}

___eapi_unpack_supports_7z() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

___eapi_unpack_supports_lha() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

___eapi_unpack_supports_rar() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

___eapi_econf_passes_--disable-dependency-tracking() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3)$ ]]
}

___eapi_econf_passes_--disable-silent-rules() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4)$ ]]
}

___eapi_econf_passes_--datarootdir() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

___eapi_econf_passes_--disable-static() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

___eapi_econf_passes_--docdir_and_--htmldir() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5)$ ]]
}

___eapi_econf_passes_--with-sysroot() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6)$ ]]
}

___eapi_use_enable_and_use_with_support_empty_third_argument() {
Expand All @@ -207,65 +207,65 @@ ___eapi_doins_and_newins_preserve_symlinks() {
}

___eapi_newins_supports_reading_from_standard_input() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4)$ ]]
}

___eapi_helpers_can_die() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3)$ ]]
}

___eapi_unpack_is_case_sensitive() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5)$ ]]
}

___eapi_unpack_supports_absolute_paths() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5)$ ]]
}

___eapi_die_can_respect_nonfatal() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5)$ ]]
}

___eapi_domo_respects_into() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6)$ ]]
}

___eapi_has_DESTTREE_INSDESTTREE() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6)$ ]]
}

___eapi_has_dosym_r() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

___eapi_usev_has_second_arg() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

___eapi_doconfd_respects_insopts() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

___eapi_doenvd_respects_insopts() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

___eapi_doheader_respects_insopts() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

___eapi_doinitd_respects_exeopts() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}

# OTHERS

___eapi_enables_failglob_in_global_scope() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5)$ ]]
}

___eapi_bash_3_2() {
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
[[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5)$ ]]
}

___eapi_bash_4_2() {
Expand All @@ -277,7 +277,7 @@ ___eapi_bash_5_0() {
}

___eapi_has_ENV_UNSET() {
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6)$ ]]
}

___eapi_has_strict_keepdir() {
Expand Down
6 changes: 3 additions & 3 deletions bin/phase-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

# Hardcoded bash lists are needed for backward compatibility with
Expand Down Expand Up @@ -934,7 +934,7 @@ __ebuild_phase_funcs() {
fi

# defaults starting with EAPI 6
if ! has ${eapi} 2 3 4 4-slot-abi 5; then
if ! has ${eapi} 2 3 4 5; then
[[ ${phase_func} == src_prepare ]] && \
default_src_prepare() { __eapi6_src_prepare; }
[[ ${phase_func} == src_install ]] && \
Expand All @@ -945,7 +945,7 @@ __ebuild_phase_funcs() {
fi

# defaults starting with EAPI 8
if ! has ${eapi} 2 3 4 4-slot-abi 5 6 7; then
if ! has ${eapi} 2 3 4 5 6 7; then
[[ ${phase_func} == src_prepare ]] && \
default_src_prepare() { __eapi8_src_prepare; }
fi
Expand Down
4 changes: 2 additions & 2 deletions bin/phase-helpers.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

if ___eapi_has_DESTTREE_INSDESTTREE; then
Expand Down Expand Up @@ -250,7 +250,7 @@ use() {
[[ -n ${EBUILD_PHASE} && -n ${PORTAGE_INTERNAL_CALLER} ]] ; then
if ! ___in_portage_iuse "${u}"; then
if [[ ${EMERGE_FROM} != binary &&
! ${EAPI} =~ ^(0|1|2|3|4|4-slot-abi)$ ]] ; then
! ${EAPI} =~ ^(0|1|2|3|4)$ ]] ; then
# This is only strict starting with EAPI 5, since implicit IUSE
# is not well defined for earlier EAPIs (see bug #449708).
die "USE Flag '${u}' not in IUSE for ${CATEGORY}/${PF}"
Expand Down
1 change: 0 additions & 1 deletion doc/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ docbook_src = [
'package/ebuild/eapi/2.docbook',
'package/ebuild/eapi/3.docbook',
'package/ebuild/eapi/4.docbook',
'package/ebuild/eapi/4-slot-abi.docbook',
'package/ebuild/eapi/5.docbook',
'package/ebuild/helper_functions.docbook',
'package/ebuild/phases.docbook',
Expand Down
Loading
Loading