| 1 |
commit: 933b7cdbd8e15c6b120aec9cb5bec3ec36a27485 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 30 14:08:37 2023 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 30 14:08:37 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=933b7cdb |
| 7 |
|
| 8 |
libq/tree: add support IDEPEND |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/892533 |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
libq/tree.c | 6 +++++- |
| 14 |
libq/tree.h | 5 +++-- |
| 15 |
2 files changed, 8 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/libq/tree.c b/libq/tree.c |
| 18 |
index 2a457ce..76190ed 100644 |
| 19 |
--- a/libq/tree.c |
| 20 |
+++ b/libq/tree.c |
| 21 |
@@ -1,5 +1,5 @@ |
| 22 |
/* |
| 23 |
- * Copyright 2005-2022 Gentoo Foundation |
| 24 |
+ * Copyright 2005-2023 Gentoo Foundation |
| 25 |
* Distributed under the terms of the GNU General Public License v2 |
| 26 |
* |
| 27 |
* Copyright 2005-2008 Ned Ludd - <solar@g.o> |
| 28 |
@@ -824,6 +824,7 @@ tree_read_file_md5(tree_pkg_ctx *pkg_ctx) |
| 29 |
assign_var(DEFINED_PHASES); |
| 30 |
assign_var(REQUIRED_USE); |
| 31 |
assign_var(BDEPEND); |
| 32 |
+ assign_var(IDEPEND); |
| 33 |
assign_var(EPREFIX); |
| 34 |
assign_var(_eclasses_); |
| 35 |
assign_var(_md5_); |
| 36 |
@@ -901,6 +902,7 @@ tree_read_file_ebuild(tree_pkg_ctx *pkg_ctx) |
| 37 |
match_key(EAPI); |
| 38 |
match_key(REQUIRED_USE); |
| 39 |
match_key(BDEPEND); |
| 40 |
+ match_key(IDEPEND); |
| 41 |
#undef match_key |
| 42 |
} |
| 43 |
|
| 44 |
@@ -1004,6 +1006,7 @@ tree_read_file_binpkg_xpak_cb( |
| 45 |
match_path(DEFINED_PHASES); |
| 46 |
match_path(REQUIRED_USE); |
| 47 |
match_path(BDEPEND); |
| 48 |
+ match_path(IDEPEND); |
| 49 |
match_path(CONTENTS); |
| 50 |
match_path(USE); |
| 51 |
match_path(EPREFIX); |
| 52 |
@@ -1513,6 +1516,7 @@ tree_foreach_packages(tree_ctx *ctx, tree_pkg_cb callback, void *priv) |
| 53 |
match_key2(REPO, repository); |
| 54 |
match_key(SIZE); |
| 55 |
match_key(BDEPEND); |
| 56 |
+ match_key(IDEPEND); |
| 57 |
match_key(PATH); |
| 58 |
match_key2(BUILD_ID, BUILDID); |
| 59 |
#undef match_key |
| 60 |
|
| 61 |
diff --git a/libq/tree.h b/libq/tree.h |
| 62 |
index 2f2c81f..efafe73 100644 |
| 63 |
--- a/libq/tree.h |
| 64 |
+++ b/libq/tree.h |
| 65 |
@@ -1,5 +1,5 @@ |
| 66 |
/* |
| 67 |
- * Copyright 2005-2022 Gentoo Foundation |
| 68 |
+ * Copyright 2005-2023 Gentoo Foundation |
| 69 |
* Distributed under the terms of the GNU General Public License v2 |
| 70 |
*/ |
| 71 |
|
| 72 |
@@ -96,8 +96,9 @@ struct tree_pkg_meta { |
| 73 |
char *Q_PDEPEND; |
| 74 |
char *Q_PROVIDE; /* line 14 */ |
| 75 |
char *Q_EAPI; |
| 76 |
- char *Q_PROPERTIES; |
| 77 |
+ char *Q_PROPERTIES; /* last line from metadata */ |
| 78 |
char *Q_BDEPEND; |
| 79 |
+ char *Q_IDEPEND; |
| 80 |
/* binpkgs/vdb */ |
| 81 |
char *Q_DEFINED_PHASES; |
| 82 |
char *Q_REQUIRED_USE; |
Archives