Signed-off-by: Matt Turner <matts...@gentoo.org>
---
GitHub PR: https://github.com/gentoo/portage/pull/789
bin/dohtml.py | 2 -
bin/eapi.sh | 116 ++++----
bin/phase-functions.sh | 4 +-
bin/phase-helpers.sh | 2 +-
doc/package/ebuild/eapi/4-python.docbook | 160 ------------
doc/package/ebuild/eapi/5-progress.docbook | 247 ------------------
doc/portage.docbook | 2 -
lib/portage/__init__.py | 2 -
lib/portage/eapi.py | 44 +---
lib/portage/tests/dep/test_isvalidatom.py | 9 -
.../tests/update/test_update_dbentry.py | 32 +--
repoman/cnf/repository/linechecks.yaml | 3 -
.../modules/linechecks/patches/patches.py | 2 -
13 files changed, 75 insertions(+), 550 deletions(-)
delete mode 100644 doc/package/ebuild/eapi/4-python.docbook
delete mode 100644 doc/package/ebuild/eapi/5-progress.docbook
diff --git a/bin/dohtml.py b/bin/dohtml.py
index e7cfa591e..ae0abeb64 100755
--- a/bin/dohtml.py
+++ b/bin/dohtml.py
@@ -161,8 +161,6 @@ class OptionsClass:
self.DOCDESTTREE = normalize_path(self.DOCDESTTREE)
self.allowed_exts = ["css", "gif", "htm", "html", "jpeg", "jpg", "js",
"png"]
- if os.environ.get("EAPI", "0") in ("4-python", "5-progress"):
- self.allowed_exts += ["ico", "svg", "xhtml", "xml"]
self.allowed_files = []
self.disallowed_dirs = ["CVS"]
self.recurse = False
diff --git a/bin/eapi.sh b/bin/eapi.sh
index 362cc07c0..b6d2e07f1 100644
--- a/bin/eapi.sh
+++ b/bin/eapi.sh
@@ -17,7 +17,7 @@ ___eapi_has_src_configure() {
}
___eapi_default_src_test_disables_parallel_jobs() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
}
___eapi_has_S_WORKDIR_fallback() {
@@ -31,19 +31,19 @@ ___eapi_has_prefix_variables() {
}
___eapi_has_BROOT() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$
]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
}
___eapi_has_SYSROOT() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$
]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
}
___eapi_has_BDEPEND() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$
]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
}
___eapi_has_IDEPEND() {
- [[ ! ${1-${EAPI-0}} =~
^(0|1|2|3|4|4-python|4-slot-abi|5|5-hdepend|5-progress|6|7)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|5-hdepend|6|7)$ ]]
}
___eapi_has_RDEPEND_DEPEND_fallback() {
@@ -51,15 +51,15 @@ ___eapi_has_RDEPEND_DEPEND_fallback() {
}
___eapi_has_PORTDIR_ECLASSDIR() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
}
___eapi_has_accumulated_PROPERTIES() {
- [[ ! ${1-${EAPI-0}} =~
^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
___eapi_has_accumulated_RESTRICT() {
- [[ ! ${1-${EAPI-0}} =~
^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
# HELPERS PRESENCE
@@ -73,11 +73,11 @@ ___eapi_has_dosed() {
}
___eapi_has_einstall() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
}
___eapi_has_dohtml() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
}
___eapi_has_dohtml_deprecated() {
@@ -85,7 +85,7 @@ ___eapi_has_dohtml_deprecated() {
}
___eapi_has_dolib_libopts() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
}
___eapi_has_docompress() {
@@ -93,7 +93,7 @@ ___eapi_has_docompress() {
}
___eapi_has_dostrip() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$
]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
}
___eapi_has_nonfatal() {
@@ -101,85 +101,85 @@ ___eapi_has_nonfatal() {
}
___eapi_has_doheader() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
}
___eapi_has_usex() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
}
___eapi_has_get_libdir() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
}
___eapi_has_einstalldocs() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
}
___eapi_has_eapply() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
}
___eapi_has_eapply_user() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
}
___eapi_has_in_iuse() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
}
___eapi_has_version_functions() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$
]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
}
___eapi_has_hasq() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$
]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
___eapi_has_hasv() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$
]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
___eapi_has_useq() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$
]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
___eapi_has_master_repositories() {
- [[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^$ ]]
}
___eapi_has_repository_path() {
- [[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^$ ]]
}
___eapi_has_available_eclasses() {
- [[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^$ ]]
}
___eapi_has_eclass_path() {
- [[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^$ ]]
}
___eapi_has_license_path() {
- [[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^$ ]]
}
___eapi_has_package_manager_build_user() {
- [[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^$ ]]
}
___eapi_has_package_manager_build_group() {
- [[ ${1-${EAPI-0}} =~ ^(5-progress)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^$ ]]
}
# HELPERS BEHAVIOR
___eapi_best_version_and_has_version_support_--host-root() {
- [[ ${1-${EAPI-0}} =~ ^(5|5-progress|6)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^(5|6)$ ]]
}
___eapi_best_version_and_has_version_support_-b_-d_-r() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$
]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
}
___eapi_unpack_supports_xz() {
@@ -187,19 +187,19 @@ ___eapi_unpack_supports_xz() {
}
___eapi_unpack_supports_txz() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
}
___eapi_unpack_supports_7z() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$
]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
___eapi_unpack_supports_lha() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$
]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
___eapi_unpack_supports_rar() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$
]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
___eapi_econf_passes_--disable-dependency-tracking() {
@@ -207,23 +207,23 @@ ___eapi_econf_passes_--disable-dependency-tracking() {
}
___eapi_econf_passes_--disable-silent-rules() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
}
___eapi_econf_passes_--datarootdir() {
- [[ ! ${1-${EAPI-0}} =~
^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
___eapi_econf_passes_--disable-static() {
- [[ ! ${1-${EAPI-0}} =~
^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
___eapi_econf_passes_--docdir_and_--htmldir() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
}
___eapi_econf_passes_--with-sysroot() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$
]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
}
___eapi_use_enable_and_use_with_support_empty_third_argument() {
@@ -239,7 +239,7 @@ ___eapi_doins_and_newins_preserve_symlinks() {
}
___eapi_newins_supports_reading_from_standard_input() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi)$ ]]
}
___eapi_helpers_can_die() {
@@ -247,61 +247,61 @@ ___eapi_helpers_can_die() {
}
___eapi_unpack_is_case_sensitive() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
}
___eapi_unpack_supports_absolute_paths() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
}
___eapi_die_can_respect_nonfatal() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
}
___eapi_domo_respects_into() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
}
___eapi_has_DESTTREE_INSDESTTREE() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
}
___eapi_has_dosym_r() {
- [[ ! ${1-${EAPI-0}} =~
^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
___eapi_usev_has_second_arg() {
- [[ ! ${1-${EAPI-0}} =~
^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
___eapi_doconfd_respects_insopts() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$
]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
___eapi_doenvd_respects_insopts() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$
]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
___eapi_doheader_respects_insopts() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$
]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
___eapi_doinitd_respects_exeopts() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6|7)$
]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6|7)$ ]]
}
# OTHERS
___eapi_enables_failglob_in_global_scope() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
}
___eapi_enables_globstar() {
- [[ ${1-${EAPI-0}} =~ ^(4-python|5-progress)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^$ ]]
}
___eapi_bash_3_2() {
- [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress)$ ]]
+ [[ ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5)$ ]]
}
___eapi_bash_4_2() {
@@ -313,9 +313,9 @@ ___eapi_bash_5_0() {
}
___eapi_has_ENV_UNSET() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|4-slot-abi|5|5-progress|6)$
]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-slot-abi|5|6)$ ]]
}
___eapi_has_strict_keepdir() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|4-python|5|5-progress|6|7)$ ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2|3|4|5|6|7)$ ]]
}
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 5eb031805..301ce75ea 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -918,7 +918,7 @@ __ebuild_phase_funcs() {
fi
# defaults starting with EAPI 6
- if ! has ${eapi} 2 3 4 4-python 4-slot-abi 5
5-progress; then
+ if ! has ${eapi} 2 3 4 4-slot-abi 5; then
[[ ${phase_func} == src_prepare ]] && \
default_src_prepare() {
__eapi6_src_prepare; }
[[ ${phase_func} == src_install ]] && \
@@ -929,7 +929,7 @@ __ebuild_phase_funcs() {
fi
# defaults starting with EAPI 8
- if ! has ${eapi} 2 3 4 4-python 4-slot-abi 5 5-progress
6 7; then
+ if ! has ${eapi} 2 3 4 4-slot-abi 5 6 7; then
[[ ${phase_func} == src_prepare ]] && \
default_src_prepare() {
__eapi8_src_prepare; }
fi
diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 6a078caad..a6aaa7926 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -246,7 +246,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-python|4-slot-abi)$
]] ; then
+ ! ${EAPI} =~ ^(0|1|2|3|4|4-slot-abi)$ ]] ; 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}"
diff --git a/doc/package/ebuild/eapi/4-python.docbook
b/doc/package/ebuild/eapi/4-python.docbook
deleted file mode 100644
index 5fc6ea023..000000000
--- a/doc/package/ebuild/eapi/4-python.docbook
+++ /dev/null
@@ -1,160 +0,0 @@
-<section id='package-ebuild-eapi-4-python'>
- <title>EAPI 4-python</title>
- <para>
- Also see the <ulink
url="https://people.apache.org/~Arfrever/EAPI_4-python_Specification";>official
EAPI 4-python Specification</ulink>.
- </para>
- <section id='package-ebuild-eapi-4-python-helpers'>
- <title>Helpers</title>
- <section
id='package-ebuild-eapi-4-python-helpers-dohtml-extended-default-list-of-extensions'>
- <title>Extended default list of extensions in
dohtml</title>
- <para>
- dohtml by default additionally installs files
with .ico, .svg, .xhtml and .xml extensions.
- </para>
- </section>
- <section
id='package-ebuild-eapi-4-python-helpers-banned-in-global-scope'>
- <title>Helpers Banned in Global Scope</title>
- <para>
- <itemizedlist>
-
<listitem><para>diropts</para></listitem>
-
<listitem><para>docompress</para></listitem>
-
<listitem><para>exeopts</para></listitem>
-
<listitem><para>insopts</para></listitem>
-
<listitem><para>libopts</para></listitem>
- <listitem><para>use</para></listitem>
-
<listitem><para>use_enable</para></listitem>
-
<listitem><para>use_with</para></listitem>
- <listitem><para>useq</para></listitem>
- <listitem><para>usev</para></listitem>
- </itemizedlist>
- </para>
- </section>
- </section>
- <section id='package-ebuild-eapi-4-python-metadata'>
- <title>Metadata</title>
- <section
id='package-ebuild-eapi-4-python-metadata-package-names-allow-period-characters'>
- <title>Support for Period Characters in Package
Names</title>
- <para>
- The "." character is allowed in package names.
- </para>
- </section>
- <section
id='package-ebuild-eapi-4-python-metadata-use-flags-allow-period-characters'>
- <title>Support for Period Characters in USE
Flags</title>
- <para>
- The "." character is allowed in USE flags.
- </para>
- </section>
- <section
id='package-ebuild-eapi-4-python-metadata-repository-dependencies'>
- <title>Repository Dependencies</title>
- <para>
- Repository dependencies are supported in atoms
in DEPEND, PDEPEND and RDEPEND and atoms passed to best_version and has_version
functions.
- Repository dependency is specified by two
colons followed by repository name.
- </para>
- <table><title>Repository Dependency Examples</title>
- <tgroup cols='1' align='left'>
- <colspec colname='atom'/>
- <thead>
- <row>
- <entry>Atom</entry>
- </row>
- </thead>
- <tbody>
- <row>
-
<entry>dev-lang/python::progress</entry>
- </row>
- <row>
-
<entry>>=dev-lang/python-3.2::progress</entry>
- </row>
- <row>
-
<entry>dev-lang/python:3.2::progress</entry>
- </row>
- <row>
-
<entry>dev-lang/python::progress[xml]</entry>
- </row>
- <row>
-
<entry>dev-lang/python:3.2::progress[xml]</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </section>
- </section>
- <section id='package-ebuild-eapi-4-python-globstar'>
- <title>globstar shell option enabled by default</title>
- <para>
- globstar shell option is enabled by default, which
enables recursive expansion of ** pattern in pathname expansion context.
- </para>
- </section>
- <section id='package-ebuild-eapi-4-python-variables'>
- <title>Variables</title>
- <section id='package-ebuild-eapi-4-python-variables-repository'>
- <title>REPOSITORY Variable</title>
- <para>
- The new REPOSITORY variable is set in ebuild
environment. This variable contains name of repository, which contains
currently used ebuild.
- </para>
- </section>
- </section>
- <section id='package-ebuild-eapi-4-python-repo-level-config'>
- <title>Extended Repository-Level Configuration</title>
- <para>
- Repository-level configuration in
${repository_path}/profiles is supported for the following files:
- <itemizedlist>
- <listitem><para>make.defaults</para></listitem>
- <listitem><para>package.use</para></listitem>
-
<listitem><para>package.use.force</para></listitem>
-
<listitem><para>package.use.mask</para></listitem>
- <listitem><para>use.force</para></listitem>
- <listitem><para>use.mask</para></listitem>
- </itemizedlist>
- </para>
- </section>
- <section id='package-ebuild-eapi-4-python-directories'>
- <title>Directories Allowed for Profile-Level and
Repository-Level Configuration</title>
- <para>
- The following files can be directories:
- <itemizedlist>
- <listitem><para>package.mask</para></listitem>
- <listitem><para>package.use</para></listitem>
-
<listitem><para>package.use.force</para></listitem>
-
<listitem><para>package.use.mask</para></listitem>
- <listitem><para>use.force</para></listitem>
- <listitem><para>use.mask</para></listitem>
- </itemizedlist>
- </para>
- </section>
- <section id='package-ebuild-eapi-4-python-use-aliases'>
- <title>USE Flag Aliases</title>
- <para>
- USE flag aliases are supported to allow to satisfy
dependencies of packages from other repositories, which require differently
named USE flags. USE flag aliases are defined in
${repository_path}/profiles/use.aliases and
${repository_path}/profiles/package.use.aliases files.
- </para>
- <table><title>use.aliases Example</title>
- <tgroup cols='1' align='left'>
- <tbody>
- <row>
- <entry>real_flag1 alias1
alias2</entry>
- </row>
- <row>
- <entry>real_flag2 alias3
alias4</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <table><title>package.use.aliases Example</title>
- <tgroup cols='1' align='left'>
- <tbody>
- <row>
- <entry>category/package1
real_flag1 alias1 alias2</entry>
- </row>
- <row>
- <entry>category/package1
real_flag2 alias3 alias4</entry>
- </row>
- <row>
- <entry>=category/package2-1*
real_flag3 alias5 alias6</entry>
- </row>
- <row>
- <entry>=category/package2-2*
real_flag4 alias5 alias6</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </section>
-</section>
diff --git a/doc/package/ebuild/eapi/5-progress.docbook
b/doc/package/ebuild/eapi/5-progress.docbook
deleted file mode 100644
index 4d07be86e..000000000
--- a/doc/package/ebuild/eapi/5-progress.docbook
+++ /dev/null
@@ -1,247 +0,0 @@
-<section id='package-ebuild-eapi-5-progress'>
- <title>EAPI 5-progress</title>
- <para>
- Also see the <ulink
url="https://people.apache.org/~Arfrever/EAPI_5-progress_Specification";>official
EAPI 5-progress Specification</ulink>.
- </para>
- <section id='package-ebuild-eapi-5-progress-helpers'>
- <title>Helpers</title>
- <section
id='package-ebuild-eapi-5-progress-helpers-master-repositories'>
- <title>master_repositories</title>
- <para>
- New master_repositories function prints
space-separated list of master repositories for specified repository.
- </para>
- </section>
- <section
id='package-ebuild-eapi-5-progress-helpers-repository-path'>
- <title>repository_path</title>
- <para>
- New repository_path function prints path to
specified repository.
- </para>
- </section>
- <section
id='package-ebuild-eapi-5-progress-helpers-available-eclasses'>
- <title>available_eclasses</title>
- <para>
- New available_eclasses function prints
space-separated list of available eclasses for current repository.
- </para>
- </section>
- <section
id='package-ebuild-eapi-5-progress-helpers-eclass-path'>
- <title>eclass_path</title>
- <para>
- New eclass_path function prints path to
specified eclass for current repository.
- </para>
- </section>
- <section
id='package-ebuild-eapi-5-progress-helpers-license-path'>
- <title>license_path</title>
- <para>
- New license_path function prints path to
specified license for current repository.
- </para>
- </section>
- <section
id='package-ebuild-eapi-5-progress-helpers-package-manager-build-user'>
- <title>package_manager_build_user</title>
- <para>
- New package_manager_build_user function prints
name of user used by package manager in build phases.
- </para>
- </section>
- <section
id='package-ebuild-eapi-5-progress-helpers-package-manager-build-group'>
- <title>package_manager_build_group</title>
- <para>
- New package_manager_build_group function prints
name of group used by package manager in build phases.
- </para>
- </section>
- <section
id='package-ebuild-eapi-5-progress-helpers-dohtml-extended-default-list-of-extensions'>
- <title>Extended default list of extensions in
dohtml</title>
- <para>
- dohtml by default additionally installs files
with .ico, .svg, .xhtml and .xml extensions.
- </para>
- </section>
- <section
id='package-ebuild-eapi-5-progress-helpers-unpack-case-insensitive'>
- <title>Case-insensitive matching of extensions in
unpack</title>
- <para>
- unpack matches extensions case-insensitively.
- </para>
- </section>
- <section
id='package-ebuild-eapi-5-progress-helpers-banned-in-global-scope'>
- <title>Helpers Banned in Global Scope</title>
- <para>
- <itemizedlist>
-
<listitem><para>diropts</para></listitem>
-
<listitem><para>docompress</para></listitem>
-
<listitem><para>exeopts</para></listitem>
-
<listitem><para>insopts</para></listitem>
-
<listitem><para>libopts</para></listitem>
- <listitem><para>use</para></listitem>
-
<listitem><para>use_enable</para></listitem>
-
<listitem><para>use_with</para></listitem>
- <listitem><para>useq</para></listitem>
- <listitem><para>usev</para></listitem>
- <listitem><para>usex</para></listitem>
- </itemizedlist>
- </para>
- </section>
- </section>
- <section id='package-ebuild-eapi-5-progress-metadata'>
- <title>Metadata</title>
- <section
id='package-ebuild-eapi-5-progress-metadata-package-names-allow-period-characters'>
- <title>Support for Period Characters in Package
Names</title>
- <para>
- The "." character is allowed in package names.
- </para>
- </section>
- <section
id='package-ebuild-eapi-5-progress-metadata-use-flags-allow-period-characters'>
- <title>Support for Period Characters in USE
Flags</title>
- <para>
- The "." character is allowed in USE flags.
- </para>
- </section>
- <section
id='package-ebuild-eapi-5-progress-metadata-repository-dependencies'>
- <title>Repository Dependencies</title>
- <para>
- Repository dependencies are supported in atoms
in DEPEND, PDEPEND and RDEPEND and atoms passed to best_version and has_version
functions.
- Repository dependency is specified by two
colons followed by repository name.
- </para>
- <table><title>Repository Dependency Examples</title>
- <tgroup cols='1' align='left'>
- <colspec colname='atom'/>
- <thead>
- <row>
- <entry>Atom</entry>
- </row>
- </thead>
- <tbody>
- <row>
-
<entry>dev-lang/python::progress</entry>
- </row>
- <row>
-
<entry>>=dev-lang/python-3.2::progress</entry>
- </row>
- <row>
-
<entry>dev-lang/python:3.2::progress</entry>
- </row>
- <row>
-
<entry>dev-lang/python::progress[xml]</entry>
- </row>
- <row>
-
<entry>dev-lang/python:3.2::progress[xml]</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </section>
- <section
id='package-ebuild-eapi-5-progress-metadata-automatic-unpack-dependencies'>
- <title>Automatic Unpack Dependencies</title>
- <para>
- Dependencies on packages required to unpack
archives specified in SRC_URI are automatically appended to DEPEND. These
dependencies are calculated from filename extensions of archives specified in
SRC_URI. Dependencies (for ebuilds using given EAPI) corresponding to given
filename extensions are configured in
${repository_path}/profiles/unpack_dependencies/${EAPI} files.
- </para>
- <table><title>Unpack Dependencies Configuration
Examples</title>
- <tgroup cols='1' align='left'>
- <tbody>
- <row>
- <entry>bz2
app-arch/bzip2</entry>
- </row>
- <row>
- <entry>gz
app-arch/gzip</entry>
- </row>
- <row>
- <entry>tar
app-arch/tar</entry>
- </row>
- <row>
- <entry>tar.bz2
app-arch/tar app-arch/bzip2</entry>
- </row>
- <row>
- <entry>tar.gz
app-arch/tar app-arch/gzip</entry>
- </row>
- <row>
- <entry>zip
app-arch/unzip</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </section>
- </section>
- <section id='package-ebuild-eapi-5-progress-globstar'>
- <title>globstar shell option enabled by default</title>
- <para>
- globstar shell option is enabled by default, which
enables recursive expansion of ** pattern in pathname expansion context.
- </para>
- </section>
- <section id='package-ebuild-eapi-5-progress-variables'>
- <title>Variables</title>
- <section
id='package-ebuild-eapi-5-progress-variables-repository'>
- <title>REPOSITORY Variable</title>
- <para>
- The new REPOSITORY variable is set in ebuild
environment. This variable contains name of repository, which contains
currently used ebuild.
- </para>
- </section>
- </section>
- <section id='package-ebuild-eapi-5-progress-repo-level-config'>
- <title>Extended Repository-Level Configuration</title>
- <para>
- Repository-level configuration in
${repository_path}/profiles is supported for the following files:
- <itemizedlist>
- <listitem><para>make.defaults</para></listitem>
- <listitem><para>package.use</para></listitem>
-
<listitem><para>package.use.force</para></listitem>
-
<listitem><para>package.use.mask</para></listitem>
-
<listitem><para>package.use.stable.force</para></listitem>
-
<listitem><para>package.use.stable.mask</para></listitem>
- <listitem><para>use.force</para></listitem>
- <listitem><para>use.mask</para></listitem>
-
<listitem><para>use.stable.force</para></listitem>
-
<listitem><para>use.stable.mask</para></listitem>
- </itemizedlist>
- </para>
- </section>
- <section id='package-ebuild-eapi-5-progress-directories'>
- <title>Directories Allowed for Profile-Level and
Repository-Level Configuration</title>
- <para>
- The following files can be directories:
- <itemizedlist>
- <listitem><para>package.mask</para></listitem>
- <listitem><para>package.use</para></listitem>
-
<listitem><para>package.use.force</para></listitem>
-
<listitem><para>package.use.mask</para></listitem>
-
<listitem><para>package.use.stable.force</para></listitem>
-
<listitem><para>package.use.stable.mask</para></listitem>
- <listitem><para>use.force</para></listitem>
- <listitem><para>use.mask</para></listitem>
-
<listitem><para>use.stable.force</para></listitem>
-
<listitem><para>use.stable.mask</para></listitem>
- </itemizedlist>
- </para>
- </section>
- <section id='package-ebuild-eapi-5-progress-use-aliases'>
- <title>USE Flag Aliases</title>
- <para>
- USE flag aliases are supported to allow to satisfy
dependencies of packages from other repositories, which require differently
named USE flags. USE flag aliases are defined in
${repository_path}/profiles/use.aliases and
${repository_path}/profiles/package.use.aliases files.
- </para>
- <table><title>use.aliases Example</title>
- <tgroup cols='1' align='left'>
- <tbody>
- <row>
- <entry>real_flag1 alias1
alias2</entry>
- </row>
- <row>
- <entry>real_flag2 alias3
alias4</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- <table><title>package.use.aliases Example</title>
- <tgroup cols='1' align='left'>
- <tbody>
- <row>
- <entry>category/package1
real_flag1 alias1 alias2</entry>
- </row>
- <row>
- <entry>category/package1
real_flag2 alias3 alias4</entry>
- </row>
- <row>
- <entry>=category/package2-1*
real_flag3 alias5 alias6</entry>
- </row>
- <row>
- <entry>=category/package2-2*
real_flag4 alias5 alias6</entry>
- </row>
- </tbody>
- </tgroup>
- </table>
- </section>
-</section>
diff --git a/doc/portage.docbook b/doc/portage.docbook
index 04db26303..77cf7e87e 100644
--- a/doc/portage.docbook
+++ b/doc/portage.docbook
@@ -20,10 +20,8 @@
<!ENTITY package_ebuild_eapi_2 SYSTEM "package/ebuild/eapi/2.docbook">
<!ENTITY package_ebuild_eapi_3 SYSTEM "package/ebuild/eapi/3.docbook">
<!ENTITY package_ebuild_eapi_4 SYSTEM "package/ebuild/eapi/4.docbook">
- <!ENTITY package_ebuild_eapi_4_python SYSTEM
"package/ebuild/eapi/4-python.docbook">
<!ENTITY package_ebuild_eapi_4_slot_abi SYSTEM
"package/ebuild/eapi/4-slot-abi.docbook">
<!ENTITY package_ebuild_eapi_5 SYSTEM "package/ebuild/eapi/5.docbook">
- <!ENTITY package_ebuild_eapi_5_progress SYSTEM
"package/ebuild/eapi/5-progress.docbook">
<!ENTITY qa SYSTEM "qa.docbook">
<!ENTITY config SYSTEM "config.docbook">
<!ENTITY config_bashrc SYSTEM "config/bashrc.docbook">
diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py
index 3042de1aa..7687c5971 100644
--- a/lib/portage/__init__.py
+++ b/lib/portage/__init__.py
@@ -546,11 +546,9 @@ _deprecated_eapis = frozenset(
"3_pre1",
"3_pre2",
"4_pre1",
- "4-python",
"4-slot-abi",
"5_pre1",
"5_pre2",
- "5-progress",
"6_pre1",
"7_pre1",
]
diff --git a/lib/portage/eapi.py b/lib/portage/eapi.py
index adee87d00..56d87b7ce 100644
--- a/lib/portage/eapi.py
+++ b/lib/portage/eapi.py
@@ -13,7 +13,7 @@ def eapi_has_iuse_defaults(eapi):
def eapi_has_iuse_effective(eapi):
- return eapi not in ("0", "1", "2", "3", "4", "4-python", "4-slot-abi")
+ return eapi not in ("0", "1", "2", "3", "4", "4-slot-abi")
def eapi_has_slot_deps(eapi):
@@ -21,7 +21,7 @@ def eapi_has_slot_deps(eapi):
def eapi_has_slot_operator(eapi):
- return eapi not in ("0", "1", "2", "3", "4", "4-python")
+ return eapi not in ("0", "1", "2", "3", "4")
def eapi_has_src_uri_arrows(eapi):
@@ -35,10 +35,8 @@ def eapi_has_selective_src_uri_restriction(eapi):
"2",
"3",
"4",
- "4-python",
"4-slot-abi",
"5",
- "5-progress",
"6",
"7",
)
@@ -77,7 +75,7 @@ def eapi_exports_replace_vars(eapi):
def eapi_exports_EBUILD_PHASE_FUNC(eapi):
- return eapi not in ("0", "1", "2", "3", "4", "4-python", "4-slot-abi")
+ return eapi not in ("0", "1", "2", "3", "4", "4-slot-abi")
def eapi_exports_PORTDIR(eapi):
@@ -87,10 +85,8 @@ def eapi_exports_PORTDIR(eapi):
"2",
"3",
"4",
- "4-python",
"4-slot-abi",
"5",
- "5-progress",
"6",
)
@@ -102,16 +98,14 @@ def eapi_exports_ECLASSDIR(eapi):
"2",
"3",
"4",
- "4-python",
"4-slot-abi",
"5",
- "5-progress",
"6",
)
def eapi_exports_REPOSITORY(eapi):
- return eapi in ("4-python", "5-progress")
+ return False
def eapi_has_pkg_pretend(eapi):
@@ -131,7 +125,7 @@ def eapi_has_required_use(eapi):
def eapi_has_required_use_at_most_one_of(eapi):
- return eapi not in ("0", "1", "2", "3", "4", "4-python", "4-slot-abi")
+ return eapi not in ("0", "1", "2", "3", "4", "4-slot-abi")
def eapi_has_use_dep_defaults(eapi):
@@ -145,27 +139,25 @@ def eapi_requires_posixish_locale(eapi):
"2",
"3",
"4",
- "4-python",
"4-slot-abi",
"5",
- "5-progress",
)
def eapi_has_repo_deps(eapi):
- return eapi in ("4-python", "5-progress")
+ return False
def eapi_allows_dots_in_PN(eapi):
- return eapi in ("4-python", "5-progress")
+ return False
def eapi_allows_dots_in_use_flags(eapi):
- return eapi in ("4-python", "5-progress")
+ return False
def eapi_supports_stable_use_forcing_and_masking(eapi):
- return eapi not in ("0", "1", "2", "3", "4", "4-python", "4-slot-abi")
+ return eapi not in ("0", "1", "2", "3", "4", "4-slot-abi")
def eapi_allows_directories_on_profile_level_and_repository_level(eapi):
@@ -173,11 +165,11 @@ def
eapi_allows_directories_on_profile_level_and_repository_level(eapi):
def eapi_has_use_aliases(eapi):
- return eapi in ("4-python", "5-progress")
+ return False
def eapi_has_automatic_unpack_dependencies(eapi):
- return eapi in ("5-progress",)
+ return False
def eapi_allows_package_provided(eapi):
@@ -187,10 +179,8 @@ def eapi_allows_package_provided(eapi):
"2",
"3",
"4",
- "4-python",
"4-slot-abi",
"5",
- "5-progress",
"6",
)
@@ -202,10 +192,8 @@ def eapi_has_bdepend(eapi):
"2",
"3",
"4",
- "4-python",
"4-slot-abi",
"5",
- "5-progress",
"6",
)
@@ -217,10 +205,8 @@ def eapi_has_idepend(eapi):
"2",
"3",
"4",
- "4-python",
"4-slot-abi",
"5",
- "5-progress",
"6",
"7",
)
@@ -233,10 +219,8 @@ def eapi_empty_groups_always_true(eapi):
"2",
"3",
"4",
- "4-python",
"4-slot-abi",
"5",
- "5-progress",
"6",
)
@@ -248,10 +232,8 @@ def eapi_path_variables_end_with_trailing_slash(eapi):
"2",
"3",
"4",
- "4-python",
"4-slot-abi",
"5",
- "5-progress",
"6",
)
@@ -263,10 +245,8 @@ def eapi_has_broot(eapi):
"2",
"3",
"4",
- "4-python",
"4-slot-abi",
"5",
- "5-progress",
"6",
)
@@ -278,10 +258,8 @@ def eapi_has_sysroot(eapi):
"2",
"3",
"4",
- "4-python",
"4-slot-abi",
"5",
- "5-progress",
"6",
)
diff --git a/lib/portage/tests/dep/test_isvalidatom.py
b/lib/portage/tests/dep/test_isvalidatom.py
index ddd2b58db..c21fb6376 100644
--- a/lib/portage/tests/dep/test_isvalidatom.py
+++ b/lib/portage/tests/dep/test_isvalidatom.py
@@ -184,9 +184,6 @@ class IsValidAtom(TestCase):
IsValidAtomTestCase(
"sys-apps/portage::repo", False, allow_repo=None, eapi="5"
),
- IsValidAtomTestCase(
- "sys-apps/portage::repo", True, allow_repo=None,
eapi="5-progress"
- ),
IsValidAtomTestCase(
"sys-apps/portage::repo", False, allow_repo=None, eapi="7"
),
@@ -195,9 +192,6 @@ class IsValidAtom(TestCase):
IsValidAtomTestCase(
"sys-apps/portage::repo", False, allow_repo=False, eapi="5"
),
- IsValidAtomTestCase(
- "sys-apps/portage::repo", False, allow_repo=False,
eapi="5-progress"
- ),
IsValidAtomTestCase(
"sys-apps/portage::repo", False, allow_repo=False, eapi="7"
),
@@ -205,9 +199,6 @@ class IsValidAtom(TestCase):
IsValidAtomTestCase(
"sys-apps/portage::repo", True, allow_repo=True, eapi="5"
),
- IsValidAtomTestCase(
- "sys-apps/portage::repo", True, allow_repo=True,
eapi="5-progress"
- ),
IsValidAtomTestCase(
"sys-apps/portage::repo", True, allow_repo=True, eapi="7"
),
diff --git a/lib/portage/tests/update/test_update_dbentry.py
b/lib/portage/tests/update/test_update_dbentry.py
index 3b49cba9d..25cab198d 100644
--- a/lib/portage/tests/update/test_update_dbentry.py
+++ b/lib/portage/tests/update/test_update_dbentry.py
@@ -190,7 +190,7 @@ class UpdateDbentryTestCase(TestCase):
},
"dev-libs/B-1::test_repo": {
"RDEPEND": "dev-libs/M dev-libs/N dev-libs/P",
- "EAPI": "4-python",
+ "EAPI": "4",
},
"dev-libs/M-1::test_repo": {
"EAPI": "4",
@@ -199,7 +199,7 @@ class UpdateDbentryTestCase(TestCase):
"EAPI": "4",
},
"dev-libs/N-2::test_repo": {
- "EAPI": "4-python",
+ "EAPI": "4",
},
}
@@ -215,7 +215,7 @@ class UpdateDbentryTestCase(TestCase):
},
"dev-libs/B-1::test_repo": {
"RDEPEND": "dev-libs/M dev-libs/N dev-libs/P",
- "EAPI": "4-python",
+ "EAPI": "4",
},
}
@@ -224,7 +224,6 @@ class UpdateDbentryTestCase(TestCase):
updates = textwrap.dedent(
"""
move dev-libs/M dev-libs/M-moved
- move dev-libs/N dev-libs/N.moved
"""
)
@@ -296,29 +295,6 @@ class UpdateDbentryTestCase(TestCase):
self.assertTrue(old_pattern.search(rdepend) is None)
self.assertTrue("dev-libs/M-moved" in rdepend)
- # EAPI 4-python/*-progress N -> N.moved
- rdepend = vardb.aux_get("dev-libs/B-1", ["RDEPEND"])[0]
- old_pattern = re.compile(r"\bdev-libs/N(\s|$)")
- self.assertTrue(old_pattern.search(rdepend) is None)
- self.assertTrue("dev-libs/N.moved" in rdepend)
- rdepend = bindb.aux_get("dev-libs/B-1", ["RDEPEND"])[0]
- self.assertTrue(old_pattern.search(rdepend) is None)
- self.assertTrue("dev-libs/N.moved" in rdepend)
- self.assertRaises(KeyError, vardb.aux_get, "dev-libs/N-2",
["EAPI"])
- vardb.aux_get("dev-libs/N.moved-2", ["RDEPEND"])[0]
-
- # EAPI 4 does not allow dots in package names for N ->
N.moved
- rdepend = vardb.aux_get("dev-libs/A-1", ["RDEPEND"])[0]
- self.assertTrue("dev-libs/N" in rdepend)
- self.assertTrue("dev-libs/N.moved" not in rdepend)
- rdepend = bindb.aux_get("dev-libs/A-1", ["RDEPEND"])[0]
- self.assertTrue("dev-libs/N" in rdepend)
- self.assertTrue("dev-libs/N.moved" not in rdepend)
- vardb.aux_get("dev-libs/N-1", ["RDEPEND"])[0]
- self.assertRaises(
- KeyError, vardb.aux_get, "dev-libs/N.moved-1", ["EAPI"]
- )
-
# dont_apply_updates
rdepend = vardb.aux_get("dev-libs/A-2", ["RDEPEND"])[0]
self.assertTrue("dev-libs/M" in rdepend)
@@ -330,8 +306,6 @@ class UpdateDbentryTestCase(TestCase):
selected_set.load()
self.assertTrue("dev-libs/M" not in selected_set)
self.assertTrue("dev-libs/M-moved" in selected_set)
- self.assertTrue("dev-libs/N" not in selected_set)
- self.assertTrue("dev-libs/N.moved" in selected_set)
finally:
playground.cleanup()
diff --git a/repoman/cnf/repository/linechecks.yaml
b/repoman/cnf/repository/linechecks.yaml
index c323ac1f0..528fdd99c 100644
--- a/repoman/cnf/repository/linechecks.yaml
+++ b/repoman/cnf/repository/linechecks.yaml
@@ -236,7 +236,6 @@ usex_supported_eapis:
- "2"
- "3"
- "4"
- - "4-python"
- "4-slot-abi"
in_iuse_supported_eapis:
@@ -245,7 +244,5 @@ in_iuse_supported_eapis:
- "2"
- "3"
- "4"
- - "4-python"
- "4-slot-abi"
- "5"
- - "5-progress"
diff --git a/repoman/lib/repoman/modules/linechecks/patches/patches.py
b/repoman/lib/repoman/modules/linechecks/patches/patches.py
index d5149d151..ca9a4cada 100644
--- a/repoman/lib/repoman/modules/linechecks/patches/patches.py
+++ b/repoman/lib/repoman/modules/linechecks/patches/patches.py
@@ -17,8 +17,6 @@ class EbuildPatches(LineCheck):
"2",
"3",
"4",
- "4-python",
"4-slot-abi",
"5",
- "5-progress",
)
--
2.34.1
