From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6F61B15800F for ; Mon, 30 Jan 2023 14:15:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8043EE07E2; Mon, 30 Jan 2023 14:15:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 613A2E07E2 for ; Mon, 30 Jan 2023 14:15:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68D8E335D1F for ; Mon, 30 Jan 2023 14:14:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC744771 for ; Mon, 30 Jan 2023 14:14:56 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1675087717.933b7cdbd8e15c6b120aec9cb5bec3ec36a27485.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: libq/ X-VCS-Repository: proj/portage-utils X-VCS-Files: libq/tree.c libq/tree.h X-VCS-Directories: libq/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 933b7cdbd8e15c6b120aec9cb5bec3ec36a27485 X-VCS-Branch: master Date: Mon, 30 Jan 2023 14:14:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f1f5a29d-e433-47fd-9910-b812c1f72264 X-Archives-Hash: 456e3d1b793fdf8568eb835e8e757a59 commit: 933b7cdbd8e15c6b120aec9cb5bec3ec36a27485 Author: Fabian Groffen gentoo org> AuthorDate: Mon Jan 30 14:08:37 2023 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Jan 30 14:08:37 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=933b7cdb libq/tree: add support IDEPEND Bug: https://bugs.gentoo.org/892533 Signed-off-by: Fabian Groffen gentoo.org> libq/tree.c | 6 +++++- libq/tree.h | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libq/tree.c b/libq/tree.c index 2a457ce..76190ed 100644 --- a/libq/tree.c +++ b/libq/tree.c @@ -1,5 +1,5 @@ /* - * Copyright 2005-2022 Gentoo Foundation + * Copyright 2005-2023 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 * * Copyright 2005-2008 Ned Ludd - @@ -824,6 +824,7 @@ tree_read_file_md5(tree_pkg_ctx *pkg_ctx) assign_var(DEFINED_PHASES); assign_var(REQUIRED_USE); assign_var(BDEPEND); + assign_var(IDEPEND); assign_var(EPREFIX); assign_var(_eclasses_); assign_var(_md5_); @@ -901,6 +902,7 @@ tree_read_file_ebuild(tree_pkg_ctx *pkg_ctx) match_key(EAPI); match_key(REQUIRED_USE); match_key(BDEPEND); + match_key(IDEPEND); #undef match_key } @@ -1004,6 +1006,7 @@ tree_read_file_binpkg_xpak_cb( match_path(DEFINED_PHASES); match_path(REQUIRED_USE); match_path(BDEPEND); + match_path(IDEPEND); match_path(CONTENTS); match_path(USE); match_path(EPREFIX); @@ -1513,6 +1516,7 @@ tree_foreach_packages(tree_ctx *ctx, tree_pkg_cb callback, void *priv) match_key2(REPO, repository); match_key(SIZE); match_key(BDEPEND); + match_key(IDEPEND); match_key(PATH); match_key2(BUILD_ID, BUILDID); #undef match_key diff --git a/libq/tree.h b/libq/tree.h index 2f2c81f..efafe73 100644 --- a/libq/tree.h +++ b/libq/tree.h @@ -1,5 +1,5 @@ /* - * Copyright 2005-2022 Gentoo Foundation + * Copyright 2005-2023 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 */ @@ -96,8 +96,9 @@ struct tree_pkg_meta { char *Q_PDEPEND; char *Q_PROVIDE; /* line 14 */ char *Q_EAPI; - char *Q_PROPERTIES; + char *Q_PROPERTIES; /* last line from metadata */ char *Q_BDEPEND; + char *Q_IDEPEND; /* binpkgs/vdb */ char *Q_DEFINED_PHASES; char *Q_REQUIRED_USE;