gentoo auto-resync : 21:09:2023 - 11:14:12

4 files changed, 100 insertions, 16 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index a92e923b5f60..99fd9820a6cf 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest
index b3a5c2550b80..24215606b4d2 100644
--- a/sys-fs/bcache-tools/Manifest
+++ b/sys-fs/bcache-tools/Manifest
@@ -2,6 +2,8 @@ AUX 1.0.8_p20140220/bcache-tools-1.0.8-noprobe.patch 1335 BLAKE2B bb99576cd404dc
 AUX 1.1/bcache-tools-add-bcache-status.patch 13158 BLAKE2B e986d81d6fdf76f809ffcaad0c93869421e369e77efb7a51f81c1abe07b941c703bf80ce89e4c09bad42f5b4d76a7bb7c40fa5ad94c87f31237b676c40b41049 SHA512 bdcc2912d3b6e47781e9023433e2b152d628ce9fa538ae4ff7ed8385a495752786cdb32bd8f82d7a7c84ad068d49b22b3911c0125e235f561a729c20c8223363
 AUX 1.1/bcache-tools-add-man-page-bcache-status.8.patch 1431 BLAKE2B f88c54286ad07766e4ebe216a27b99838ee9eb63412bb50a1036c93e1e41d77ea9d02cc47c148105ab63115f954c4dcc52903e7c726399b2d2ec2066a7b24ecc SHA512 e6e5f073b01e0272710bc6effeecf5ce6786f1606986e12f18bf37a1124d25858a4ed25fa42f2da85bf04e95844e3c6156af2e83bed323bb83621601774b0802
 DIST bcache-tools-1.1.tar.gz 34548 BLAKE2B e6ebc0f609debe0cc123deba0e21076441c37cdbc6edd02bf2c16c0e36fe806f1fc160b9e9baed577f86f6358884182a4e3903f34bccee81943191c0ba6a2d11 SHA512 4ccbef47255bf3644a50242a79951b1f3720e71a55eb1e07dc6b8486df0245da99a77bba751b50197d489b4c5d738e5284aabc014c2f7f44816ddf6a1bb807ca
+DIST bcache-tools-1.1_p20230217.tar.gz 44025 BLAKE2B c6e1c3e64d1f53f581cd6ea80b919bd7db93e0ec048de70e65cfa1b28ae59e921c7cdcf4c3d0f25823ab323f76ef29671bc2e3db616bad34e8c193aaa3a38c89 SHA512 aac047cb773ebc9e9c139f0a3da5721511a24265a497ce26fd607a26195d402ef78fa5f3c76d609195ee48267395527bd7083abe996e9fa3009b43ac85f94652
 EBUILD bcache-tools-1.1-r1.ebuild 1721 BLAKE2B 1da4bebc45896d900aa6754d57efe7e1ba7498a4d7ae0f5b6259f5ff10ab2b65c3d285fb2475f851861dd85fef44a8b33b458505402ea77bfa325040edfe83fa SHA512 753bb448e3358adebd761c89913a6b3736dea8c343559eee876aaf32b0f75521d61c5888fae61ca91ab7fcb3be8d8e75692941d2026578e445f83bf594852468
-EBUILD bcache-tools-9999.ebuild 1538 BLAKE2B d33aef1aaed31fe49c0d2ef3efbfda552eac2295a5ff8e8bb5db6f5037df5694040756eae15a49c2e018957506fe83315f7a4e17764ca20d3ea1dec65ea38cc9 SHA512 13c5bc26b8443b5afa1683e7415380095350d16bd44a60cf3c6530a3fcb6bce705b1c9cc05d48b029576c2876359fec0dca7a2a98f3e961d2b24fc5f0e0bec3f
+EBUILD bcache-tools-1.1_p20230217-r1.ebuild 1651 BLAKE2B b9dd69d76386d0f27c8ec7d2d4e2dc9eb4d271c154d8487e87ce63b664a22df2a2a11b079a6ce0ac916091b809ef542f2097b81d332e86b380b97737d2cbc59a SHA512 0b418c205bcdc79cb49702aa21fe48f78f2330670b2cc6ec9ec7dae0bea695368b574e59d8191eda327d3e27a425c5840fdf9f384816fcff1c143b504cd16a66
+EBUILD bcache-tools-9999.ebuild 1582 BLAKE2B 96d6d1fe379cb63658534c2ff2528e45b7bdb587f117835e978b4b69cb10b27bee3b2d303ae201338eaeb6e4703c03d10c7d559d65c4a08bec949cbede633024 SHA512 b2a2814777be489ec72c7ebf3b510b0e56b910acdbb4a2cedacdc7585b3ed9b0811c7d7de34359867eb8a0bc33f8d3b3104e282ff7c3302619913fd599ea5aa1
 MISC metadata.xml 247 BLAKE2B 3cfe29afe8370e5f5195d26e19732debac8a921204f9788b2f0c2b803a4ffdb479c89b0a53f1b592764c1980ad587b5982c288b33e6fe522ecdcf5be3ed81750 SHA512 a9c3ee4b936ac1f2e739f4a46249a25e3b980b3a63f7ebc573743a33bf745cb8af2513e6724da71f73dc61931f69f4ff351df94a2dad348d4910a9d6f71d2d4c
diff --git a/sys-fs/bcache-tools/bcache-tools-1.1_p20230217-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.1_p20230217-r1.ebuild
new file mode 100644
index 000000000000..9577ad30f308
--- /dev/null
+++ b/sys-fs/bcache-tools/bcache-tools-1.1_p20230217-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit flag-o-matic python-r1 toolchain-funcs udev vcs-snapshot
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git https://kernel.googlesource.com/pub/scm/linux/kernel/git/colyli/bcache-tools.git"
+else
+	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/colyli/${PN}.git/snapshot/a5e3753516bd39c431def86c8dfec8a9cea1ddd4.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Tools for bcache"
+HOMEPAGE="https://bcache.evilpiepirate.org/ https://git.kernel.org/pub/scm/linux/kernel/git/colyli/bcache-tools.git/"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	sys-apps/util-linux
+	virtual/udev
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	tc-export CC
+	sed \
+		-e '/^CFLAGS/s:-O2::' \
+		-e '/^CFLAGS/s:-g::' \
+		-e '/.*INSTALL.*share\/man/d' \
+		-e '/.*INSTALL.*bcache-status/d' \
+		-i Makefile || die
+
+	append-lfs-flags
+}
+
+src_install() {
+	local udevdir="$(get_udevdir)"
+
+	local mydirs=(
+		sbin
+		"${udevdir}/rules.d"
+		/usr/share/initramfs-tools/hooks/bcache
+		/usr/lib/initcpio/install/bcache
+	)
+	dodir "${mydirs[@]}"
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}" \
+		UDEVLIBDIR="${udevdir}" \
+		DRACUTLIBDIR="/usr/lib/dracut" \
+		install
+
+	python_foreach_impl python_doscript bcache-status
+
+	doman *.8
+
+	dodoc README
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-fs/bcache-tools/bcache-tools-9999.ebuild b/sys-fs/bcache-tools/bcache-tools-9999.ebuild
index ebede1808118..baefd75f9838 100644
--- a/sys-fs/bcache-tools/bcache-tools-9999.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit flag-o-matic python-r1 toolchain-funcs udev
 
@@ -37,29 +37,33 @@ src_prepare() {
 	sed \
 		-e '/^CFLAGS/s:-O2::' \
 		-e '/^CFLAGS/s:-g::' \
+		-e '/.*INSTALL.*share\/man/d' \
+		-e '/.*INSTALL.*bcache-status/d' \
 		-i Makefile || die
 
 	append-lfs-flags
 }
 
 src_install() {
-	into /
-	dosbin bcache make-bcache bcache-super-show
-
-	exeinto $(get_udevdir)
-	doexe bcache-register probe-bcache bcache-export-cached
+	local udevdir="$(get_udevdir)"
+
+	local mydirs=(
+		sbin
+		"${udevdir}/rules.d"
+		/usr/share/initramfs-tools/hooks/bcache
+		/usr/lib/initcpio/install/bcache
+	)
+	dodir "${mydirs[@]}"
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}" \
+		UDEVLIBDIR="${udevdir}" \
+		DRACUTLIBDIR="/usr/lib/dracut" \
+		install
 
 	python_foreach_impl python_doscript bcache-status
 
-	udev_dorules 69-bcache.rules
-
-	insinto /etc/initramfs-tools/hooks/bcache
-	doins initramfs/hook
-
-	# that is what dracut does
-	insinto /usr/lib/dracut/modules.d/90bcache
-	doins dracut/module-setup.sh
-
 	doman *.8
 
 	dodoc README