* [gentoo-portage-dev] [PATCH] Remove obsolete FEATURES=force-prefix
@ 2023-01-22 8:18 Ulrich Müller
2023-01-22 9:16 ` James Le Cuirot
0 siblings, 1 reply; 3+ messages in thread
From: Ulrich Müller @ 2023-01-22 8:18 UTC (permalink / raw
To: gentoo-portage-dev; +Cc: Ulrich Müller
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
bin/dohtml.py | 6 ++----
bin/eapi.sh | 4 ++--
lib/portage/const.py | 3 +--
lib/portage/package/ebuild/config.py | 11 +++--------
man/make.conf.5 | 8 +-------
5 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/bin/dohtml.py b/bin/dohtml.py
index 4ebee7779..d1f0e3140 100755
--- a/bin/dohtml.py
+++ b/bin/dohtml.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
#
@@ -146,9 +146,7 @@ class OptionsClass:
self.PF = os.environ["PF"]
if self.PF:
self.PF = normalize_path(self.PF)
- if "force-prefix" not in os.environ.get(
- "FEATURES", ""
- ).split() and os.environ.get("EAPI", "0") in ("0", "1", "2"):
+ if os.environ.get("EAPI", "0") in ("0", "1", "2"):
self.ED = os.environ.get("D", "")
else:
self.ED = os.environ.get("ED", "")
diff --git a/bin/eapi.sh b/bin/eapi.sh
index d90c3cd2e..ae815f3a6 100644
--- a/bin/eapi.sh
+++ b/bin/eapi.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
-# Copyright 2012-2022 Gentoo Authors
+# Copyright 2012-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# PHASES
@@ -27,7 +27,7 @@ ___eapi_has_S_WORKDIR_fallback() {
# VARIABLES
___eapi_has_prefix_variables() {
- [[ ! ${1-${EAPI-0}} =~ ^(0|1|2)$ || " ${FEATURES} " == *" force-prefix "* ]]
+ [[ ! ${1-${EAPI-0}} =~ ^(0|1|2)$ ]]
}
___eapi_has_BROOT() {
diff --git a/lib/portage/const.py b/lib/portage/const.py
index a6f7a2242..99206fe2c 100644
--- a/lib/portage/const.py
+++ b/lib/portage/const.py
@@ -1,5 +1,5 @@
# portage: Constants
-# Copyright 1998-2021 Gentoo Authors
+# Copyright 1998-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
import os
@@ -156,7 +156,6 @@ SUPPORTED_FEATURES = frozenset(
"fakeroot",
"fixlafiles",
"force-mirror",
- "force-prefix",
"getbinpkg",
"gpg-keepalive",
"icecream",
diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py
index 23b524235..f66bf6485 100644
--- a/lib/portage/package/ebuild/config.py
+++ b/lib/portage/package/ebuild/config.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2021 Gentoo Authors
+# Copyright 2010-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
__all__ = [
@@ -3347,14 +3347,9 @@ class config:
if not (src_like_phase and eapi_attrs.broot):
mydict.pop("BROOT", None)
- # Prefix variables are supported beginning with EAPI 3, or when
- # force-prefix is in FEATURES, since older EAPIs would otherwise be
- # useless with prefix configurations. This brings compatibility with
- # the prefix branch of portage, which also supports EPREFIX for all
- # EAPIs (for obvious reasons).
+ # Prefix variables are supported beginning with EAPI 3.
if phase == "depend" or (
- "force-prefix" not in self.features
- and eapi is not None
+ eapi is not None
and not eapi_supports_prefix(eapi)
):
mydict.pop("ED", None)
diff --git a/man/make.conf.5 b/man/make.conf.5
index 34c3cd5b5..05832ce1c 100644
--- a/man/make.conf.5
+++ b/man/make.conf.5
@@ -1,4 +1,4 @@
-.TH "MAKE.CONF" "5" "Nov 2021" "Portage VERSION" "Portage"
+.TH "MAKE.CONF" "5" "Jan 2023" "Portage VERSION" "Portage"
.SH "NAME"
make.conf \- custom settings for Portage
.SH "SYNOPSIS"
@@ -522,12 +522,6 @@ fixes (order of flags, duplicated entries, ...)
Only fetch files from configured mirrors, ignoring \fBSRC_URI\fR,
except when \fImirror\fR is in the \fBebuild\fR(5) \fBRESTRICT\fR variable.
.TP
-.B force\-prefix
-Enable prefix support for all ebuilds, regardless of EAPI, since older EAPIs
-would otherwise be useless with prefix configurations. This brings
-compatibility with the prefix branch of portage, which also supports EPREFIX
-for all EAPIs (for obvious reasons).
-.TP
.B getbinpkg
Force emerges to always try to fetch files from the \fIPORTAGE_BINHOST\fR. See
\fBmake.conf\fR(5) for more information.
--
2.39.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [gentoo-portage-dev] [PATCH] Remove obsolete FEATURES=force-prefix
2023-01-22 8:18 [gentoo-portage-dev] [PATCH] Remove obsolete FEATURES=force-prefix Ulrich Müller
@ 2023-01-22 9:16 ` James Le Cuirot
2023-01-22 16:53 ` Fabian Groffen
0 siblings, 1 reply; 3+ messages in thread
From: James Le Cuirot @ 2023-01-22 9:16 UTC (permalink / raw
To: gentoo-portage-dev
[-- Attachment #1: Type: text/plain, Size: 442 bytes --]
On Sun, 2023-01-22 at 09:18 +0100, Ulrich Müller wrote:
> Signed-off-by: Ulrich Müller <ulm@gentoo.org>
> ---
> bin/dohtml.py | 6 ++----
> bin/eapi.sh | 4 ++--
> lib/portage/const.py | 3 +--
> lib/portage/package/ebuild/config.py | 11 +++--------
> man/make.conf.5 | 8 +-------
> 5 files changed, 9 insertions(+), 23 deletions(-)
+1
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 858 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [gentoo-portage-dev] [PATCH] Remove obsolete FEATURES=force-prefix
2023-01-22 9:16 ` James Le Cuirot
@ 2023-01-22 16:53 ` Fabian Groffen
0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen @ 2023-01-22 16:53 UTC (permalink / raw
To: gentoo-portage-dev
[-- Attachment #1: Type: text/plain, Size: 600 bytes --]
Sounds fine to me too.
On 22-01-2023 09:16:53 +0000, James Le Cuirot wrote:
> On Sun, 2023-01-22 at 09:18 +0100, Ulrich Müller wrote:
> > Signed-off-by: Ulrich Müller <ulm@gentoo.org>
> > ---
> > bin/dohtml.py | 6 ++----
> > bin/eapi.sh | 4 ++--
> > lib/portage/const.py | 3 +--
> > lib/portage/package/ebuild/config.py | 11 +++--------
> > man/make.conf.5 | 8 +-------
> > 5 files changed, 9 insertions(+), 23 deletions(-)
>
> +1
--
Fabian Groffen
Gentoo on a different level
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-22 16:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-22 8:18 [gentoo-portage-dev] [PATCH] Remove obsolete FEATURES=force-prefix Ulrich Müller
2023-01-22 9:16 ` James Le Cuirot
2023-01-22 16:53 ` Fabian Groffen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox