gentoo auto-resync : 24:08:2023 - 21:52:33

4 files changed, 2 insertions, 64 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index dafcc0cbe182..8d74e177328c 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index fc12707c0f8f..8346015f2274 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,4 +1,3 @@
 DIST vhba-module-20211218.tar.xz 16168 BLAKE2B 37fcc56cc34dfbc68c8a8212f30a54c6a04f3b9014a5964b995bfef59df1b8f5a005e6cbfff97f1233451d215b6c4fd3c09a0cd39ebf6cb86bd6b327e5d7d718 SHA512 02b554bb2d0c91c090edeeb7c692164f378273e475a64653df845cb30cdd15d689f7fbe5fa890f77f82bf778d4d228384f656d202b6b6baf02d08321d7c2598d
-EBUILD vhba-20211218-r1.ebuild 1170 BLAKE2B 807564dec9756a003d560573788469f5f6488dbc8bd170bd8291c28e510ca630dcb9cb4fcf71c36e9298b8331952b0d967d8e3c7616c3351b177f487af3327bb SHA512 2da6de99e5d491658e90f02107694265a96c39e9cc2cfe661d6f960d3327a9be3c007381c67a3cc1716d6eaf48cbb1d24bb1f50b8dee199463bd7703434e90ee
-EBUILD vhba-20211218-r2.ebuild 1087 BLAKE2B d889a5b777149f3fdecc94523bffd4f1bcffa868300e0762128d78db8759d9cacd60a6de3c907e742c8c3441531c614b6fca14b92ab5d28a10ef51341168e179 SHA512 52ea7cf7723015479332aae2fde3603bb8e59c184f77ccf5dd1ee015ab29b45417ca1fba493600cb4bc069923de6d90bd2bd3b5f52529f285c80c1743c5aa558
+EBUILD vhba-20211218-r2.ebuild 1086 BLAKE2B 5060fff6e96533ee3001d5e2b4898082b6ea8aa8b76ff267a1c0935acd22c4ef653c8f343e440d4250ba8f749ab38416b48b9f8b3b77bc79abb324cd6369568a SHA512 66d3d519615ad07902709a8355aabed88de28368c5593c1a09ea670b1fa8891f690788e53b8f874beb35463bb2b915c7ada9bbc057d20029b7fb54245673156b
 MISC metadata.xml 333 BLAKE2B 99feb77e860cccd95f60688c7c2104267b6abb6188a8f24e50728b39487892ef29c58e5ddfb7a56578d27c34e9d4bb16371298449d2a3de5e6a79a6a5712e37c SHA512 2a387604d78412e81477271c793d46b197609d4d9037aa55d0146cfbbc9eae01633a7a9ac6908f923174ecfedf7336792147dc6e7c5b13db057855282e45e129
diff --git a/sys-fs/vhba/vhba-20211218-r1.ebuild b/sys-fs/vhba/vhba-20211218-r1.ebuild
deleted file mode 100644
index b22eb7530805..000000000000
--- a/sys-fs/vhba/vhba-20211218-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-mod udev
-
-MY_P=vhba-module-${PV}
-DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
-HOMEPAGE="https://cdemu.sourceforge.io/"
-SRC_URI="https://download.sourceforge.net/cdemu/vhba-module/${MY_P}.tar.xz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	virtual/udev
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-MODULE_NAMES="vhba(block:${S})"
-BUILD_TARGETS=modules
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
-	check_extra_config
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	# Avoid -Werror problems
-	sed -i -e '/ccflags/s/-Werror/-Wall/' Makefile || die "sed failed"
-	eapply_user
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README
-	linux-mod_src_install
-
-	einfo "Generating udev rules ..."
-	udev_newrules - 69-vhba.rules <<-EOF
-		# do not edit this file, it will be overwritten on update
-		#
-		KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"
-	EOF
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/sys-fs/vhba/vhba-20211218-r2.ebuild b/sys-fs/vhba/vhba-20211218-r2.ebuild
index 39c6613c4b49..02c4610fd256 100644
--- a/sys-fs/vhba/vhba-20211218-r2.ebuild
+++ b/sys-fs/vhba/vhba-20211218-r2.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	virtual/udev