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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4311115806E for ; Thu, 1 Jun 2023 03:32:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84EE8E0964; Thu, 1 Jun 2023 03:32:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6FB2BE0964 for ; Thu, 1 Jun 2023 03:32:36 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE481340F79 for ; Thu, 1 Jun 2023 03:32:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44008990 for ; Thu, 1 Jun 2023 03:32:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1685590343.b5b33e1cc7f17d82aa95f3edb457f98330919584.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild net-fs/nfs-utils/nfs-utils-2.6.3.ebuild X-VCS-Directories: net-fs/nfs-utils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b5b33e1cc7f17d82aa95f3edb457f98330919584 X-VCS-Branch: master Date: Thu, 1 Jun 2023 03:32:34 +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: 27ff8c94-94ba-4e60-a535-e024aaeee15b X-Archives-Hash: fb8edf7648ea933235de97f20af618b0 commit: b5b33e1cc7f17d82aa95f3edb457f98330919584 Author: wjaskulski adva com> AuthorDate: Fri Apr 28 12:43:47 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jun 1 03:32:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5b33e1c net-fs/nfs-utils: add dev-db/sqlite and dev-libs/libevent to COMMON_DEPENDS Closes: https://bugs.gentoo.org/904718 Signed-off-by: Wiktor Jaskulski adva.com> Closes: https://github.com/gentoo/gentoo/pull/30789 Signed-off-by: Sam James gentoo.org> .../{nfs-utils-2.6.3.ebuild => nfs-utils-2.6.3-r1.ebuild} | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild similarity index 96% rename from net-fs/nfs-utils/nfs-utils-2.6.3.ebuild rename to net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild index e0b9d944e70f..e8c017f22555 100644 --- a/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild @@ -33,6 +33,8 @@ COMMON_DEPEND=" net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs + dev-db/sqlite:3 + dev-libs/libevent:= caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap:= @@ -43,8 +45,6 @@ COMMON_DEPEND=" ) libmount? ( sys-apps/util-linux ) nfsv4? ( - dev-db/sqlite:3 - dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] @@ -126,6 +126,10 @@ src_configure() { $(use_enable nfsv41) $(use_enable uuid) $(use_with tcpd tcp-wrappers) + # XXX: Remove this hack after 2.6.3 + # See bug #904718. + # Patch: https://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=bc4a5deef9f820c55fdac3c0070364c17cd91cca + LIBS="-lsqlite3 -levent_core" ) econf "${myeconfargs[@]}" }