gentoo auto-resync : 01:06:2023 - 09:25:35

3 files changed, 8 insertions, 4 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index a52e70c6a40c..8d00ae7ee6c2 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 3ef6acce835d..6973d595a5eb 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -16,5 +16,5 @@ AUX rpc.svcgssd.initd 470 BLAKE2B c610a7abc44b86ca242d59f833ffa6e42f48d1c3bf9342
 DIST nfs-utils-2.6.2.tar.bz2 969689 BLAKE2B 8e0a3b309223779824276acd3ede13cfc161b955dc9376cc9426ffe9c604b111f7405088fe8e5a88a2d2ac1413d2742fbdf166a5b04c975e51a9e384e071fa60 SHA512 6e5dcc5147ad551b2ecbf0304e1b0e0713d1eff32c5a511562a6d03660589e027364e38fc9f6de1b06d32d8907d502f63c564a6e56171f58823b0ea68dd3a6b8
 DIST nfs-utils-2.6.3.tar.bz2 978167 BLAKE2B 776b4ce6edc728e1dd2291898f429fbc76327b949008f2a477af887231feb2e27505a94978f819e4e4ed7b2b8574e6c5b8d02a9ca6e94683ec620ce99a909a06 SHA512 870dee2a95f411de6694aa8dddeef2302ef9235389a9bdca381ef719303fdd1a463a815ca67e0336a5121fa68d5b448b1952d539679e38b36f1e6b69c1e2f853
 EBUILD nfs-utils-2.6.2-r1.ebuild 6273 BLAKE2B 13c6ac04c9d4b5c7d117537f6a89c82c9978780f29f5ea1d8949585cc7823e0aae8dec0478d6f2aa07c34d3ec0e98c4ae16015ebbb05fd970ffcfa9300f1661a SHA512 b7d271c5b949d4e248f310016b85d4e3a29e873a7baff6b83bff5512f8f09313cadb6572133bea220970b4c29bdad171a1f8db8cd6031cbdf1287c384103cc5d
-EBUILD nfs-utils-2.6.3.ebuild 6104 BLAKE2B fa8ad0804b123ac9b1ef021349b61f68b6a62ab4de0b1278573b481346ccaacf69a3bce24ec07fc929cbfd4a96196f660df9d9829065fa8e409bd364301b34c7 SHA512 e43f10a71a428c8e676f966981367a767e5edee3b04f3560dc1d1555a29cee4b298cb85d100c9c88e8dc8f68e4840e06869d725ff75b64c47ce202ec3e7ffffe
+EBUILD nfs-utils-2.6.3-r1.ebuild 6301 BLAKE2B a8edfde0c212e188aed7a2cc3f06a23c63ccbb55966ed25706e8cd113f6aa8c5eaa4cfb3d24f7c007fbdd2121bf8864057362a68f23165be53d76aae1c3c65f1 SHA512 5bc093ab3316b6b8ce829c337ce5e5bfeea359bffd0dff509ce3b5924f15cfafd05be50532221dd6923a028dbea822eaa00ff77cde819df3d97041ee5422cbfc
 MISC metadata.xml 931 BLAKE2B 68fe90eceb28d3941cf4a8179320b5e5839b3d84dddab9509f9a1bb7c70f413acbb32ef6fda9cb94349193e258df71edb2a518568780177b4a8cfe155f9b57a9 SHA512 af2f74e21226176eb2873ea5de7f96996f54b73b742800adb444ced7485c8ae3556aba20b47c58c0694655f9a9b56447307483f98fc426b322fe05c56a2ce8a9
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
index b95d66ce7f7f..242fef17126e 100644
--- a/net-fs/nfs-utils/nfs-utils-2.6.3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *_rc* ]] ; then
 	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
 else
 	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"
@@ -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[@]}"
 }