proj/portage-utils:master commit in: /

commit:     9f782b0f6bf1de23dd76f2aca9f523eaacef93d2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 19:26:28 2026 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 19:26:28 2026 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=9f782b0f

initialize_portage_env: read use.mask files and apply to USE

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 applets.h |  1 +
 main.c    | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/applets.h b/applets.h
index a389db0b..b2470fed 100644
--- a/applets.h
+++ b/applets.h
@@ -205,6 +205,7 @@ extern set  *features;
 extern set  *ev_use;
 extern set  *accept_keywords;
 extern hash_t *package_masks;
+extern hash_t *use_masks;
 extern char *install_mask;
 extern char *binpkg_format;
 extern array *overlays;

diff --git a/main.c b/main.c
index 3a74d107..ddfbbd51 100644
--- a/main.c
+++ b/main.c
@@ -52,6 +52,7 @@ array *overlays;
 array *overlay_names;
 array *overlay_src;
 hash_t *package_masks = NULL;
+hash_t *use_masks = NULL;
 
 static char *portedb;
 static char *eprefix;
@@ -427,7 +428,7 @@ set_portage_env_var(env_vars *var, const char *value, const char *src)
 /* Helper to read a portage file (e.g. make.conf, package.mask), or
  * recursively if it points to a directory (we don't care about EAPI for
  * dirs, basically PMS 5.2.5 EAPI restriction is ignored) */
-enum portage_file_type { ENV_FILE, PMASK_FILE };
+enum portage_file_type { ENV_FILE, PMASK_FILE, UMASK_FILE };
 static void
 read_portage_file(const char *file, enum portage_file_type type, void *data)
 {
@@ -577,7 +578,8 @@ read_portage_file(const char *file, enum portage_file_type type, void *data)
 						portroot, file + 1, curline, cbeg, cend);
 				set_portage_env_var(&vars[i], s, npath);
 			}
-		} else if (type == PMASK_FILE) {
+		} else if (type == PMASK_FILE ||
+				   type == UMASK_FILE) {
 			if (*buf == '-') {
 				/* negation/removal, lookup and drop mask if it exists;
 				 * note that this only supports exact matches (PMS
@@ -590,7 +592,7 @@ read_portage_file(const char *file, enum portage_file_type type, void *data)
 				snprintf(npath, sizeof(npath), "%s%s:%zu:%zu-%zu",
 						portroot, file + 1, line, cbeg, cend);
 				/* if not necessary, but do it for static code analysers
-				 * which take into accound that hash_add might
+				 * which take into account that hash_add might
 				 * allocate a new set when masks would be NULL -- a case
 				 * which would never happen */
 				if (masks != NULL) {
@@ -714,7 +716,13 @@ overlay_from_path(const char *path)
 
 /* Helper to recursively read stacked make.defaults in profiles */
 static void
-read_portage_profile(const char *profile, env_vars vars[], hash_t *masks)
+read_portage_profile
+(
+	const char *profile,
+	env_vars    vars[],
+	hash_t     *masks,
+	hash_t     *umasks
+)
 {
 	char profile_file[_Q_PATH_MAX * 3];
 	char rpath[_Q_PATH_MAX];
@@ -791,7 +799,7 @@ read_portage_profile(const char *profile, env_vars vars[], hash_t *masks)
 			}
 			read_portage_profile(
 					realpath(profile_file, rpath) == NULL ?
-					profile_file : rpath, vars, masks);
+					profile_file : rpath, vars, masks, umasks);
 			/* restore original path in case we were repointed by profile */
 			if (p != NULL)
 				snprintf(profile_file, sizeof(profile_file), "%s/", profile);
@@ -806,6 +814,8 @@ read_portage_profile(const char *profile, env_vars vars[], hash_t *masks)
 	read_portage_file(profile_file, ENV_FILE, vars);
 	strcpy(profile_file + profile_len, "package.mask");
 	read_portage_file(profile_file, PMASK_FILE, masks);
+	strcpy(profile_file + profile_len, "use.mask");
+	read_portage_file(profile_file, UMASK_FILE, umasks);
 }
 
 env_vars vars_to_read[] = {
@@ -1021,6 +1031,7 @@ initialize_portage_env(void)
 	size_t      i;
 
 	package_masks = hash_new();
+	use_masks     = hash_new();
 
 	/* figure out where to find our config files, we need to do this
 	 * before handling the files, as it specifies where to find them */
@@ -1078,6 +1089,9 @@ initialize_portage_env(void)
 				snprintf(pathbuf, sizeof(pathbuf), "%s/profiles/package.mask",
 						(char *)array_get(overlays, n));
 				read_portage_file(pathbuf, PMASK_FILE, package_masks);
+				snprintf(pathbuf, sizeof(pathbuf), "%s/profiles/use.mask",
+						(char *)array_get(overlays, n));
+				read_portage_file(pathbuf, UMASK_FILE, use_masks);
 				break;
 			}
 		}
@@ -1088,12 +1102,12 @@ initialize_portage_env(void)
 			 portroot, configroot + 1);
 	read_portage_profile(
 			realpath(pathbuf, rpathbuf) == NULL ? pathbuf : rpathbuf,
-			vars_to_read, package_masks);
+			vars_to_read, package_masks, use_masks);
 	snprintf(pathbuf, sizeof(pathbuf), "%s%s/etc/portage/make.profile",
 			 portroot, configroot + 1);
 	read_portage_profile(
 			realpath(pathbuf, rpathbuf) == NULL ? pathbuf : rpathbuf,
-			vars_to_read, package_masks);
+			vars_to_read, package_masks, use_masks);
 
 	/* now read all Portage's config files */
 	snprintf(pathbuf, sizeof(pathbuf), "%s/etc/make.conf",
@@ -1197,6 +1211,42 @@ initialize_portage_env(void)
 		}
 	}
 
+	/* process use.mask in a funky way: simply find the flags in ev_use
+	 * and replace them with the name of the flag wrapped in
+	 * parenthesis, this makes it look like how Portage does it, and as
+	 * well will be impossible to match to a USE-flag lateron */
+	if (hash_size(use_masks) > 0)
+	{
+		char   usebuf[32];
+		char  *usebufp   = usebuf;
+		array *usemasks  = hash_keys(use_masks);
+		char  *use;
+		size_t n;
+		size_t usebuflen = sizeof(usebuf);
+
+		array_for_each(usemasks, n, use)
+		{
+			bool found = false;
+			set_delete(ev_use, use, &found);
+			if (found)
+			{
+				size_t needlen = strlen(use) + 2;
+				if (usebuflen <= needlen)
+				{
+					if (usebufp != usebuf)
+						free(usebufp);
+					usebuflen = needlen + 1;
+					usebufp = xmalloc(usebuflen);
+				}
+				snprintf(usebufp, usebuflen, "(%s)", use);
+				set_add(ev_use, usebufp);
+			}
+		}
+
+		if (usebufp != usebuf)
+			free(usebufp);
+	}
+
 	/* handle PORTDIR and primary_overlay to get a unified
 	 * administration in overlays */
 	{