gentoo auto-resync : 01:12:2022 - 20:53:45

6 files changed, 98 insertions, 90 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 6a15f7545e69..52ee1e258f84 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 581872ce333d..6bb7eee76c4b 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -7,5 +7,6 @@ DIST multipath-tools-0.9.0.tar.gz 537311 BLAKE2B e7d4958d24d1e19da2b80be23585ad3
 DIST multipath-tools-0.9.3.tar.gz 552442 BLAKE2B e2065119cdd68bd8c2b4420bd0de9ce370601597972dba32c076bfc4df6d0a1a65356454a2f96f95f27cf681387685edcbac2eb41258d4a7049a1ef62cdf0949 SHA512 4faa2ee5a96a9d5d752219931ebc885cb70ed6b022d45ede985ad7919c043a3aee166e6f126d32dffd187c5c32d5cbce91747d87d0b55557e2f7f68b279583da
 EBUILD multipath-tools-0.8.9.ebuild 2091 BLAKE2B e6fa02e23e152cb1eb730ecf3f8714d75aa391daf48f8a55350780d711ef7239a6dd2aeda1dd4ede09024cdbe4f12d61b22be3d00094482a24318ecc2f1147de SHA512 9aa9722d0fd8927c09b4f1a631f5bdbc2a14d8bdf72fdbfe53da3a74cd7f6a7623d098534fb093e236d694c1a5594d611ffbc94879a4ecd6e046d823bb7830eb
 EBUILD multipath-tools-0.9.0.ebuild 1759 BLAKE2B b988f5cc90eb8e8b9d61154e1cdc901fca42a94bd2aef6fd7b999d25d666b43e09611b01a39dc757bb167b04428821225004d3d3dfb85d2e233aba6d246b6b77 SHA512 2849e1ee2e649dea2fa18a9cdd73da06ae6ff28babdd127a122f9a81c416be83f48eeb9556b90e11ba53489b5023e80e2d37e65618fdadb45f07024431e9f5a9
+EBUILD multipath-tools-0.9.3-r2.ebuild 2430 BLAKE2B 0fe03de138073d8c9c053ddc448c05f0dea199d3e03227b35e5ebdf981e88339d48598a2fef32ef191919a423550110a0f7f9c1426a5281e36339e71cdef290e SHA512 5c487f27bc81de3a1b8d43b03e3b765ff39406751649b7917bed3d92370667025d93d7f32171bb953cb18fe712345c2faed120b846fd8053fa21df893a980189
 EBUILD multipath-tools-0.9.3.ebuild 2328 BLAKE2B ff73af2f67386d163fd94f3f88ae4b299b447b95ee7449a860ea9e791305f92c7d41fa64d42d1633464c4322bc0491f5cff9024ca13a1bb7f62e990471c70d5c SHA512 a8d5572055b6d4883bd142b0288f034c4e6b3beb4c8c47b8c55d00c8e1d7d11dcf4802e5c8a63eef46d4d158ae49fb73ee35353d1207d029481a6da539615e68
 MISC metadata.xml 453 BLAKE2B 2f2a56731716bfb47dee061219c80834aa382daf9e6ce937cef2237fc1bbb05e988672cc178ad471d68e9ab4f9292677be71ef9198a163f85a7f3b8658f5d698 SHA512 e8df3db70f5d919789ff0512409365fc80dfbb31ede6079c49910e8acffc6b5289290a48acef8230bc59899262801255048d1a730f81c3642945f8c872ac5428
diff --git a/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
new file mode 100644
index 000000000000..ff744e92c05d
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.9.3-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info systemd toolchain-funcs udev tmpfiles
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv x86"
+IUSE="systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/json-c:=
+	dev-libs/libaio
+	dev-libs/userspace-rcu:=
+	>=sys-fs/lvm2-2.02.45
+	>=virtual/libudev-232-r3
+	sys-libs/readline:=
+	systemd? ( sys-apps/systemd )"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+src_prepare() {
+	default
+
+	sed -r -i -e '/^(CPPFLAGS|CFLAGS)\>/s,^(CPPFLAGS|CFLAGS)\>[[:space:]]+:=,\1 := $(GENTOO_\1),' \
+		"${S}"/Makefile.inc || die
+}
+
+src_compile() {
+	tc-export CC
+
+	# LIBDM_API_FLUSH involves grepping files in /usr/include,
+	# so force the test to go the way we want #411337.
+	emake \
+		prefix="${EPREFIX}/usr" \
+		plugindir="${EPREFIX}/$(get_libdir)/multipath" \
+		LIB="$(get_libdir)" \
+		LIBDM_API_FLUSH=1 \
+		PKGCONFIG="$(tc-getPKG_CONFIG)" \
+		GENTOO_CFLAGS="${CFLAGS}" \
+		GENTOO_CPPFLAGS="${CPPFLAGS}" \
+		FAKEVAR=1
+}
+
+src_install() {
+	dodir /sbin
+
+	# Please clean this up > 0.9.3: https://github.com/opensvc/multipath-tools/pull/53
+	# $(prefix) doesn't work correctly in makefile in 0.9.3.
+	emake \
+		DESTDIR="${ED}" \
+		prefix="${EPREFIX}" \
+		LIB="$(get_libdir)" \
+		RUN=run \
+		plugindir="${EPREFIX}/$(get_libdir)/multipath" \
+		unitdir="$(systemd_get_systemunitdir)" \
+		libudevdir="${EPREFIX}/$(get_udevdir)" \
+		pkgconfdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig" \
+		GENTOO_CFLAGS="${CFLAGS}" \
+		GENTOO_CPPFLAGS="${CPPFLAGS}" \
+		install
+
+	rmdir "${ED}"/usr/include
+	rmdir "${ED}"/usr/share
+	mv "${ED}"/include "${ED}"/usr/include || die
+	mv "${ED}"/share "${ED}"/usr/share || die
+	einstalldocs
+
+	newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
+	newinitd "${FILESDIR}"/multipath.rc multipath
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process /usr/lib/tmpfiles.d/multipath.conf
+	udev_reload
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you need multipath on your system, you must"
+		elog "add 'multipath' into your boot runlevel!"
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 16b494c5216f..a181193d00f4 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,14 +1,8 @@
 DIST ncdu-1.17.tar.gz 157187 BLAKE2B 7d36a648b8fb0a26d3b6bcc533ed8f510e7f37b3084cb585a0c785d73fd82f537e0f2f9493c3b56173eae1324255e7acf7617a1cd1614c92a3b7bf0d53b7d77f SHA512 aa2366797760f0c0b2bea866f0ae0446b8113e3ff6460192a4a42d4d888d473d7f37bc4acff6220fa86003bd96d71761168a2ae0ded36456072176a69564c775
 DIST ncdu-1.17.tar.gz.asc 833 BLAKE2B 8e285bc92351bcd5d3ae83e97772df96f98149e1f7a2aca882518b37448412756ecc24e89fd471b42dc960727dc272b17e05e3a602672e6712711d3bc342afac SHA512 7386901449a5bd98f2d7344dd8147a9facc274b59ec3676be2b3f78797f03b51154b3a6d85f657860e8260c5423140b561ca7e8067863face3320ca5a4951132
-DIST ncdu-2.1.2.tar.gz 52702 BLAKE2B fb64058bec2e8f286fa82e16986cddd9126e5c94d513740d48ff1c971e7ee95270fe6c1cfbbe240bb8e99fba4e3fd6d2624f99870422835da44447a2507f0b8b SHA512 ff48f2b9625e1aba29e5598051d16c4b5dc1a634fab897709226dd69d3b48031e6e62527c8514ec4753874d2d96800e538d6ad90b4a5f9851410d10579ccc67c
-DIST ncdu-2.1.2.tar.gz.asc 833 BLAKE2B 35144f60c76ac4be90e87af3b62954894a4714af7b664015b59cfd19b676a2ad86383feb1cd8fc4ccf3d0ce9e91a66391c3273a97c9b2d7929addb847373b16c SHA512 351b7955e82d9eac7f1c2796c75e343882893bfe6bd783fbecdd8e1bff7eec62cdb09940c04f5a0f749eed93ba791fac23d7845db6abea91cc059ebe8c37de09
 DIST ncdu-2.2.1-upstream-zig-0.10-updates-r1.patch 47546 BLAKE2B e805010c5d575ac01cc02794905ec08185cf7bc2810571b18021bedca9c7d1079f3d8206295da307c5db70b661b9fd85a35172f8ee1495c88cdb7e52a32ad697 SHA512 a5f703db236842f54f8ce91eadd513283a1c721fa5a2ab00e38f0b7b96e3becf3e086ad43e4284abe6712113ecb3ba3a7c0d149baa3eb16b52d84a7b7a976424
 DIST ncdu-2.2.1.tar.gz 55972 BLAKE2B ac7f281b2fd12144a3498b105594a60478c49049eabeb7b3951c4aac4d5b9c025f823806dc948327e4a6608e629da9d7b15a8073bdb79043116ba095d3becdce SHA512 63a3b0d12c1c265d826276a01b37f7785d50721da5dc35c2934ee6ba7923254c02ab906bc49df60b26b8bf18b7d4c49b0cc02eb7e805cf32cde3e0cd35187973
 DIST ncdu-2.2.1.tar.gz.asc 833 BLAKE2B 0582851ae5a04910765cc1d775a9462f81e966b56ba9aa053964fc38dbaa2dd93b953bfa99bdf7fd01592bcf2a029413e6cc28b04c277ed420731e828200b826 SHA512 e8b2844ecca28de3920512966a8dc1ec6b14c66e132d1e30b11eda0660d70d5152891b6f90524fc795ff7990cba275472242421133761c883ea1a7112efc7894
-DIST ncdu-2.2.tar.gz 55903 BLAKE2B 568760748ec54b193f17e31fa285d95085389a4f8e1abfe8e5fe5e2d67b0ca221cb7ca94cba248206808d6369058384286de690338f67faee7ff18f09832ebd9 SHA512 d491976b5e19726afe856860e07974c9c70b161c96cd17960a9f36dbc6fc1a51fd3d84da2e22e21cd3d384ab004a7d248096212e762d1ad3849e2cf8a036fc19
-DIST ncdu-2.2.tar.gz.asc 833 BLAKE2B 62dda735b6c552f5f44a75229851815d3f8b4ddbd812a7ca0844fe1e11169f5a996d83af66f665ca48af880551d2e65469dda139015541ec50002015d335adbe SHA512 61cb5ed9c574e68d9109f3ee0de1fe13198fd5e4018d8d6b6f09eed8d19df3c36edacb4246a31350f6a7a662276514a782c009b88c7bc123512a3f94b74df8ce
 EBUILD ncdu-1.17.ebuild 683 BLAKE2B c5566d9059a9ee0d9466a5e6f9605402b25a8e3e7e09fd951ccd0ed75c839bee71492ea50118b633cd3b1332280178296d9cf31e055409ea26d845961e297e9c SHA512 0ebac8ef306b017c515340b127ee98df3ab67f27f6fa2fff441ccf161dc1970aa432e37d9e74a1c6220ff303a7e54362df8c6a13065e20306523227fe7e49fbf
-EBUILD ncdu-2.1.2-r1.ebuild 918 BLAKE2B b7d86c350faa1f73fc8aac5f2e4f02fb26991d561d120a913b5a8b57b69ff8cc453980f983b54bbc1d7cd29379b44d4908df52ae4b89ed21c8f13fd3891b9579 SHA512 a23d3af1c960a2c2f7a5c7e61755a98880bcbadd79becb49cec562a7bba95121ec7b873186e5a1aa4655e01a0675d41db72aab6e19be8425eff0ab6a91b0d6c1
 EBUILD ncdu-2.2.1.ebuild 1209 BLAKE2B 31a2f4a4fda0a307acd74696e099fddde1e20d4dcf29d52322122d7bf133295d01511d392233070bb22722127619de19234e96c6bda2b9fd16a5101e4fe88a75 SHA512 2fc2b8a905169b13f8a826d60992a4f9e2f64f4210c0fd907bf0c23fd5a2e3a8fd7519b4b0542c1e10421d4755f082748ccd62f60304d2c57528dee67c19c1cb
-EBUILD ncdu-2.2.ebuild 918 BLAKE2B b7d86c350faa1f73fc8aac5f2e4f02fb26991d561d120a913b5a8b57b69ff8cc453980f983b54bbc1d7cd29379b44d4908df52ae4b89ed21c8f13fd3891b9579 SHA512 a23d3af1c960a2c2f7a5c7e61755a98880bcbadd79becb49cec562a7bba95121ec7b873186e5a1aa4655e01a0675d41db72aab6e19be8425eff0ab6a91b0d6c1
 MISC metadata.xml 863 BLAKE2B 771d7661e17426fc20d287dbda042d222816d22578614f243438d5680fd9ec5e966a6962dd4f301156e7fb9f850e400e09144788b205f149f6c561c5f1f6cc90 SHA512 a5b2aa2c3a9669873bf02d224a5deb324c8ec87dba54c761aa8bfd58b14a9bdd9b4f21668192b16020a9c6cece48e9c297f164f3147bb2d7e252f15d3ad2477d
diff --git a/sys-fs/ncdu/ncdu-2.1.2-r1.ebuild b/sys-fs/ncdu/ncdu-2.1.2-r1.ebuild
deleted file mode 100644
index 2790640a7daa..000000000000
--- a/sys-fs/ncdu/ncdu-2.1.2-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	https://dev.yorhel.nl/download/${P}.tar.gz
-	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	|| ( ~dev-lang/zig-0.9.1 ~dev-lang/zig-bin-0.9.1 )
-	virtual/pkgconfig
-	dev-lang/perl
-	verify-sig? ( sec-keys/openpgp-keys-yorhel )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/yoranheling.asc
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/ncdu"
-
-src_test() {
-	zig build test || die "Tests failed"
-}
-
-src_install() {
-	emake PREFIX="${ED}"/usr install
-
-	dodoc README.md ChangeLog
-}
diff --git a/sys-fs/ncdu/ncdu-2.2.ebuild b/sys-fs/ncdu/ncdu-2.2.ebuild
deleted file mode 100644
index 2790640a7daa..000000000000
--- a/sys-fs/ncdu/ncdu-2.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit verify-sig
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu"
-SRC_URI="
-	https://dev.yorhel.nl/download/${P}.tar.gz
-	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="sys-libs/ncurses:=[unicode(+)]"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	|| ( ~dev-lang/zig-0.9.1 ~dev-lang/zig-bin-0.9.1 )
-	virtual/pkgconfig
-	dev-lang/perl
-	verify-sig? ( sec-keys/openpgp-keys-yorhel )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/yoranheling.asc
-
-# see https://github.com/ziglang/zig/issues/3382
-# For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
-QA_FLAGS_IGNORED="usr/bin/ncdu"
-
-src_test() {
-	zig build test || die "Tests failed"
-}
-
-src_install() {
-	emake PREFIX="${ED}"/usr install
-
-	dodoc README.md ChangeLog
-}