gentoo auto-resync : 16:05:2024 - 00:01:30

7 files changed, 73 insertions, 28 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 8473a4216aa9..4b075b517685 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/azure-nvme-utils/Manifest b/sys-apps/azure-nvme-utils/Manifest
index 3563305b633f..fa19e4932aa4 100644
--- a/sys-apps/azure-nvme-utils/Manifest
+++ b/sys-apps/azure-nvme-utils/Manifest
@@ -1,4 +1,4 @@
 AUX azure-nvme-utils-werror.patch 1077 BLAKE2B ee0a9778769c88478b04db6c45c2812077b96949f48df87ff146a429feb54c41fe08037de04beeb303fb197ce2b6b5f63eeae4bfa7916e4edd49cd26e71f2eca SHA512 5de7ebbe04eb5233f7b9d458d93a6763cb8755fa70ebff37462febf18c59afe75ad05987e0dd9abab8cd62732ba8a3f5df263a3f783e326b586692e086c913fd
 DIST azure-nvme-utils-0.1.3.tar.gz 11365 BLAKE2B 97b040a6cdacdd1e8eede89b16722a8e870c6027f0318ce0700ce4087f93fb2df7b25ab3154567548a1704cd9585a4f0cda3cf2bdde408990a715b96639225b4 SHA512 42b6ada9ec2db9d53e4b7f9b4a4dc581a06af2954c0da94a5851ed88b66cc2d349c3b6b3a7d4bcf73a68094620df4cd9d480dde31edaf9b80d5235129b634fa8
-EBUILD azure-nvme-utils-0.1.3.ebuild 784 BLAKE2B dff5ccddcc75db64bde82d781f69d237ab03445f9bcbe4470ebaed5a989c68305f236a409546a63f86c80e711a5e2d75ceaf2d2890f398f99ff0090b81f4d41b SHA512 dd425d221ac713263d5db216f08ecb68c1232e72452ef2f140d8d26bee4f0ad2f7e2be237981d9b96d75c4e8071164b60e73b1cc39ba2b155bcc026777b1c185
+EBUILD azure-nvme-utils-0.1.3.ebuild 783 BLAKE2B a1bda7e91dd5fa55a7c601845ef0fdffbd7424492de9d5a7f870f59ee2649e028ae9898d0a72a5cb35a6ab7ef32f11c6449edc95451e847f3e2b1ba18880fc38 SHA512 f2182fa4db29f5b46eb1eed3b476b4732541bdfc081eb00fb48c5c29d9204a2c465e8d9fc0a224d9ef463a462b5c1c583f48181106b6093a370e96cdddc83f6d
 MISC metadata.xml 426 BLAKE2B 24ec8a7528b7d42d8b9b704ed26572cd5171914a588f7665d881723a82cb3ba5eed5543c3ff376f65fb9e1bd0abc641eef2cfc078812d36ca43e1a82c509ece3 SHA512 9ff643547af48d07106069966935403b31ab5259009bcd3e9609cec2a5a1e8d05b931acdfb2c0a42fb5068d934f709b769dbc838b762199071c81deaeb320164
diff --git a/sys-apps/azure-nvme-utils/azure-nvme-utils-0.1.3.ebuild b/sys-apps/azure-nvme-utils/azure-nvme-utils-0.1.3.ebuild
index 0eaa5b559aab..8e4a460d1369 100644
--- a/sys-apps/azure-nvme-utils/azure-nvme-utils-0.1.3.ebuild
+++ b/sys-apps/azure-nvme-utils/azure-nvme-utils-0.1.3.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64"
 IUSE="doc +lun-fallback"
 
 BDEPEND="
-	doc? ( app-text/pandoc )
+	doc? ( virtual/pandoc )
 "
 
 PATCHES=(
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index 195b83ea94a8..8cec2a265c79 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,8 +1,10 @@
 DIST gentoo-functions-0.19.tar.bz2 12079 BLAKE2B be0a3a54d4dee1755866047b670a69cd6fec368239123c3f0c08180b79a33c20147bca0e35e568faef6877513551e731bdf0c181aeb0460f6574d2d708219373 SHA512 2674d3fe5724cc6d685ae58bf0ee33f4a1bdba2c5e5809cfb193fd0a710d4678c2d9392c2c62d2321cf455f524950266dc1629ab684fe46632d179e539d5a39e
 DIST gentoo-functions-1.0.tar.bz2 18066 BLAKE2B a843de65d5d8f93396713dd5c80377dad478482d5749736ec3a08e0d0cc40f1a2ce5c967282b8060452d73f6377590f06e5c2a12cdfc753e7f6a18754cde4997 SHA512 057a7159a613108710a40f2ca54403adf64ab9649732be49d3a72314e2ca3c65d7a9093168e26ec12814203e1fe14cc1fc5cf2cefa2f923ec8bb714972d20f55
 DIST gentoo-functions-1.1.tar.bz2 14277 BLAKE2B 150b5481668b766a6d1c3d8fff331df66c352d03971adaf7cb0332aef32cd881bd49a64165dc5070f24033f6b0a3d91c07d2e762b4d915fb7f137b8269def76a SHA512 1345f5b87f70422ff9c8577e75743fdc9ae871be4605b7983b602918bd352a396cfd2bb9e34cb1586b951bbca7264967a5412b9c89646bdcb60646b501f946e8
+DIST gentoo-functions-1.2.tar.bz2 14277 BLAKE2B 17ce3a81a2563b11083553a51240f75b8fe174c573d06d645b475efdd7e537300ba656e10c814f30609eae15ed91cd00d4978b8bc0433935e6058d1ca8b7ccd7 SHA512 924f515c088811ddb7e2e7fd4fc75304866e2a159caa6619b2eb62eaab504b3720951bae8496f4faf93e9feae1c8b20ec3b4cbbc9cee1adbbdca703d5f87ee97
 EBUILD gentoo-functions-0.19.ebuild 877 BLAKE2B 457e5c405c05e9e928c4f8e9e764fe07b7ace335750bebb01d7226e9b7b1f7ceac0fcb49148087439c8a6b42c034aa1f7590b4203e9d42f06031f2b3acee58d4 SHA512 c846b3451c764b64ec601e9d579542a47d68775e94eac97b8680a08891076226279f0611a19a72ba1b75b0cb35941b22ff3c734831e6c8665c2ca5b65cd1f5b4
 EBUILD gentoo-functions-1.0.ebuild 1025 BLAKE2B ec059aed56465fcfd1ee9e057b77c1d1f9c4c251a863c742806a191459b2432a1bc5c7d339d4028fd80f4a77de2c8a21bd7d3724e2dd7c17fa628e7110d658c6 SHA512 0e0b913559b3bd975a53a69bdebb1b04350f59c6c3f5e761ad3ac6472db70a8cbe4c3273158569ce35597d4e81a0e4e15c5805e2585e6ff3025967b02e0b503d
 EBUILD gentoo-functions-1.1.ebuild 1025 BLAKE2B ec059aed56465fcfd1ee9e057b77c1d1f9c4c251a863c742806a191459b2432a1bc5c7d339d4028fd80f4a77de2c8a21bd7d3724e2dd7c17fa628e7110d658c6 SHA512 0e0b913559b3bd975a53a69bdebb1b04350f59c6c3f5e761ad3ac6472db70a8cbe4c3273158569ce35597d4e81a0e4e15c5805e2585e6ff3025967b02e0b503d
+EBUILD gentoo-functions-1.2.ebuild 1025 BLAKE2B ec059aed56465fcfd1ee9e057b77c1d1f9c4c251a863c742806a191459b2432a1bc5c7d339d4028fd80f4a77de2c8a21bd7d3724e2dd7c17fa628e7110d658c6 SHA512 0e0b913559b3bd975a53a69bdebb1b04350f59c6c3f5e761ad3ac6472db70a8cbe4c3273158569ce35597d4e81a0e4e15c5805e2585e6ff3025967b02e0b503d
 EBUILD gentoo-functions-9999.ebuild 1025 BLAKE2B fdfa38a3fa0dbd7bceff4f1a211924f5efa890b6f4ee75e1a46d182a508eb89e153994a6d2805147f1c8cf0556460927479e598cb053ff716b6c81a45f1fca53 SHA512 31dd91c713f4172825d28c2d018baaf46b7e0e408cd2c0f1f9cfafaba6932d1a8ea80e9a9b9402b7d483295524a384de2320adae70ed63820e3334acfab1bc7b
 MISC metadata.xml 487 BLAKE2B c34b1b196d84a44ca3f2729101b826a6460f6b560f942e95e444d23b821256e9c4f330e5b7a2530dabd34b0f1e0a3844ed4b52ea5944500b0b4c72bd955f988a SHA512 3c3008734be30e74ccf3a1f34e4112eef2df0f4e8b0b5d1dd1e90037d130428b21b05ad3686a74c18e5a035a15b32e89cd04de4274e311aa1e30a42ad8cf97f0
diff --git a/sys-apps/gentoo-functions/gentoo-functions-1.2.ebuild b/sys-apps/gentoo-functions/gentoo-functions-1.2.ebuild
new file mode 100644
index 000000000000..8df3a1e88bad
--- /dev/null
+++ b/sys-apps/gentoo-functions/gentoo-functions-1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2014-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+inherit meson
+
+DESCRIPTION="Base functions required by all Gentoo systems"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
+
+LICENSE="GPL-2 public-domain"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Specifically needs GNU find, as well.
+RDEPEND=">=sys-apps/findutils-4.9"
+
+src_configure() {
+	local emesonargs=(
+		# Deliberately avoid /usr as consumers assume we're at /lib/gentoo.
+		--prefix="${EPREFIX:-/}"
+		--mandir="${EPREFIX}/usr/share/man"
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
+}
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 4fa5ebecfead..5eb45770debe 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -4,5 +4,5 @@ AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba
 AUX keyutils-1.6.3-fix-rpmspec-check.patch 1400 BLAKE2B 135c2f9caf216ea57997ea48b6fe0a2546a6f087f39261bb28521c570455d0dd6ce54cd74f007b3cb1611e5ab7e6330513823adba5006151d8fb99d7ac14774c SHA512 8bf8ff09af6f1e763ecfcaff842a9edfbcecaba3e4187805db2ce11d46c789e58133464fb73297934f078a49c2420a010541a6e9c860f3918dc46e1d909bd7d7
 AUX keyutils-1.6.3-tests.patch 2335 BLAKE2B cedda01c2cc02dd6ae20c4300fce71ecc505a4db2543ddfafd1e525651998b13a3d8d781eea54c89a68b16478de875249f77c71c1fedf090f4226c94838f6a86 SHA512 cf0ce9f56e45a9d9aa72b2d0d28b93f59dacae7f69eaf24d9c40121ff44dacceaec9a5d0bf01fcc836c58aa954dfd2cabc8d1402e7393a8139f77869880379b0
 DIST keyutils-1.6.3.tar.gz 137022 BLAKE2B b5620b1b6109415fec1268963c2c65d774f3ef7a69eb1ce8d5d8e78b4b807e4fdfda861662a1b5556975ef867add8f985362a31b6608ac2dc198c8d0395d516b SHA512 f65965b8566037078b8eeffa66c6fdbe121c8c2bea7fa5bce04cf7ba5ccc50d5b48e51f4a67ca91e4d5d9a12469e7e3eb3036c920ab25e3feba6e93b4c149cf9
-EBUILD keyutils-1.6.3-r1.ebuild 3580 BLAKE2B 3167910b21fb3dbefc7707bffb512feeb6d823c5c3c330318f04f59be0b56dc5a007b07b0758feee17f991920216b03d34812d3da4a3c73dcf616277463217b2 SHA512 3140119c875adb25d766f975b78b1ef87d3ab3fac8dbaeb95ad00e40f92ce7c9ebd8d37db6f55710320859b13256fac5762dc20b4048daec017c0c432cfeba92
+EBUILD keyutils-1.6.3-r1.ebuild 3640 BLAKE2B dd6379a479bd9ded9a30e781bb28e52744e4af2188e1b71bb3bef7040b63cb7611f50007a9dc0a747791eec58f12ebcb18386832266a664f1f9d7949bd2bc507 SHA512 3d355f4ad22cae381ea234c1f3ea6689e7ccb1a82e094f02d426be7d04ede4ae55c6ad9186a66081727b6e8de1a3d328b86882ff9ac3518d9699d8d34e61ad0d
 MISC metadata.xml 519 BLAKE2B c0bf6f0d10e2ba0230b8789bb20cd186ac7e01b44038eb01b3461e6bc663ddbb74af569d84477aa058e34e72a65aa12da59f922e83fa019f41ef54ca0137ff88 SHA512 e8b988a0a7b200d5d07822ca136d2532a4dd13c12f019aae27ae1958d93b75fa8f2bf5f05a2f492bb39274eea992e219a1bf0a1c821637859d4da19a50f632fc
diff --git a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
index c8d82212103a..6d09620c632a 100644
--- a/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.3-r1.ebuild
@@ -70,30 +70,38 @@ src_prepare() {
 	multilib_copy_sources
 }
 
+mymake() {
+	local args=(
+		PREFIX="${EPREFIX}/usr"
+		ETCDIR="${EPREFIX}/etc"
+		BINDIR="${EPREFIX}/bin"
+		SBINDIR="${EPREFIX}/sbin"
+		SHAREDIR="${EPREFIX}/usr/share/keyutils"
+		MANDIR="${EPREFIX}/usr/share/man"
+		INCLUDEDIR="${EPREFIX}/usr/include"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		USRLIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		CFLAGS="${CFLAGS}"
+		CXXFLAGS="${CXXFLAGS}"
+		RPATH=$(usex static -static '')
+		BUILDFOR=
+		NO_ARLIB="${NO_ARLIB}"
+	)
+	if use static; then
+		args+=( LIB_DEPENDENCY='$(ARLIB)' )
+	fi
+	emake "${args[@]}" "$@"
+}
+
 multilib_src_compile() {
-	tc-export AR CC CXX
-	sed -i \
-		-e "1iRPATH = $(usex static -static '')" \
-		-e '/^C.*FLAGS/s|:=|+=|' \
-		-e 's:-Werror::' \
-		-e '/^BUILDFOR/s:=.*:=:' \
-		-e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \
-		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
-		-e "s: /: ${EPREFIX}/:g" \
-		-e '/^NO_ARLIB/d' \
-		Makefile || die
-
-	# We need the static lib in order to statically link programs.
-	if use static ; then
-		export NO_ARLIB=0
-		# Hack the progs to depend on the static lib instead.
-		sed -i \
-			-e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) $(SONAME):' \
-			Makefile || die
+	local NO_ARLIB
+	if use static; then
+		NO_ARLIB=0
 	else
-		export NO_ARLIB=$(usex static-libs 0 1)
+		NO_ARLIB=$(usex static-libs 0 1)
 	fi
-	emake
+	tc-export AR CC CXX
+	mymake
 }
 
 multilib_src_test() {
@@ -101,14 +109,13 @@ multilib_src_test() {
 	# older versions already installed in the system.
 	LD_LIBRARY_PATH=${BUILD_DIR} \
 	PATH="${BUILD_DIR}:${PATH}" \
-	emake test
+	mymake test
 }
 
 multilib_src_install() {
 	# Possibly undo the setting for USE=static (see src_compile).
-	export NO_ARLIB=$(usex static-libs 0 1)
-
-	default
+	local NO_ARLIB=$(usex static-libs 0 1)
+	mymake DESTDIR="${D}" install
 }
 
 multilib_src_install_all() {