Merge branch 'gentoo:master' into master

gentoo · Jan 15, 2025 · 1e9023c · 1e9023c
2 parents 4842869 + 0faca49
commit 1e9023c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/bin/eapi.sh b/bin/eapi.sh
@@ -273,7 +273,7 @@ ___eapi_bash_4_2() {
 }
 
 ___eapi_bash_5_0() {
-	true
+	[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
 }
 
 ___eapi_has_ENV_UNSET() {

diff --git a/doc/package/ebuild.docbook b/doc/package/ebuild.docbook
@@ -9,7 +9,6 @@
 &package_ebuild_eapi_2;
 &package_ebuild_eapi_3;
 &package_ebuild_eapi_4;
-&package_ebuild_eapi_4_slot_abi;
 &package_ebuild_eapi_5;
 </section>
 </chapter>
-Original file line number
+Diff line change
@@ Expand Up / @@ -273,7 +273,7 @@ ___eapi_bash_4_2() { @@
     }
     ___eapi_bash_5_0() {
-    	true
+    	[[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
     }
     ___eapi_has_ENV_UNSET() {
@@ Expand Down @@