gentoo resync : 20.03.2022

3 files changed, 3 insertions, 55 deletions

diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index dd684a2afc7e..61629fa7b5dc 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,5 +1,3 @@
-DIST vhba-module-20211023.tar.xz 16144 BLAKE2B 70f922c9cf4de5e495ccf812c2b4eecbf3ba4dc49bb59763b97754505198506de4fce7789a4ef6e93dce4cef5275f7aff6c5c45b856a40ad6f62a5fae58d7187 SHA512 e398f8bbdff8d57d001633d98d3720d7cd424d0279de96d9d3e30dcc9013eedc4afaef4e2ab9962306e2073b30ed9d36ccff328253e1d6d36fde1944b2b78e5a
 DIST vhba-module-20211218.tar.xz 16168 BLAKE2B 37fcc56cc34dfbc68c8a8212f30a54c6a04f3b9014a5964b995bfef59df1b8f5a005e6cbfff97f1233451d215b6c4fd3c09a0cd39ebf6cb86bd6b327e5d7d718 SHA512 02b554bb2d0c91c090edeeb7c692164f378273e475a64653df845cb30cdd15d689f7fbe5fa890f77f82bf778d4d228384f656d202b6b6baf02d08321d7c2598d
-EBUILD vhba-20211023.ebuild 1085 BLAKE2B d340728beb02725c1cc7c70c6abf61457cb63e53e07b1c0b7c6fea2d03dbb5467777e3dd0e0dcf73e8d4d90a00a86c1afd6efd0382e21ac9aa518885f46a76e6 SHA512 18d9b3e6bd8fb2e2869936e6cbecee30220af174258284db217899c31a090c559643d5751dba69941b1a570a7d6beb4dce90e32e1b0bd4e6fc5655d203d9fe7a
-EBUILD vhba-20211218.ebuild 1087 BLAKE2B dfb152749f95783d44e0e83757dab6ef703103d148b8cb583ebbddc24e453e8a147b94f4d7b1199be451154d8a8e0ef7de62b8f85924f967718b5e1b331ecfe1 SHA512 09fa9bfe73beb92ee0fcee18a61983db0b168b60beeadd69dc44cb89904b256ea6f49e9912e0a90fc2b1cc4984f6c6e587114ede1065f8307d65c6b24378328e
+EBUILD vhba-20211218.ebuild 1085 BLAKE2B a62c5b7806ddd554eee19cd545cd72ac19f18e93482c6432e4185ce3cd826816cd4bb079e3bfdc59738e5e849848beace551439cecfb019ef184e285fe12aaf1 SHA512 c3840faf010683360e42a7204bc9abcf8141ef0c54cf5561d7a73757b8f7a5f00e0931edd9a8f23b81022bddf0bde760f9fca5f18dd570472f0f86bc5b8f19fb
 MISC metadata.xml 333 BLAKE2B 99feb77e860cccd95f60688c7c2104267b6abb6188a8f24e50728b39487892ef29c58e5ddfb7a56578d27c34e9d4bb16371298449d2a3de5e6a79a6a5712e37c SHA512 2a387604d78412e81477271c793d46b197609d4d9037aa55d0146cfbbc9eae01633a7a9ac6908f923174ecfedf7336792147dc6e7c5b13db057855282e45e129
diff --git a/sys-fs/vhba/vhba-20211023.ebuild b/sys-fs/vhba/vhba-20211023.ebuild
deleted file mode 100644
index d9e0c2610800..000000000000
--- a/sys-fs/vhba/vhba-20211023.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 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"
-IUSE=""
-
-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
-}
diff --git a/sys-fs/vhba/vhba-20211218.ebuild b/sys-fs/vhba/vhba-20211218.ebuild
index 458a74bf9381..3261cbfecf35 100644
--- a/sys-fs/vhba/vhba-20211218.ebuild
+++ b/sys-fs/vhba/vhba-20211218.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="virtual/udev"