[gentoo-commits] repo/gentoo:master commit in: sys-fs/vhba/files/, sys-fs/vhba/

[Michał Górny]

commit:     2d89d8b78e3f4e3211cfe6df6a10a7286fe85359
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  4 17:32:29 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Sep  4 17:33:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d89d8b7

sys-fs/vhba: Drop old

 sys-fs/vhba/Manifest                             |  1 -
 sys-fs/vhba/files/vhba-20161009-linux-4.11.patch | 35 ----------
 sys-fs/vhba/vhba-20140928.ebuild                 | 88 ------------------------
 3 files changed, 124 deletions(-)

diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index 2c57bc351bd..e679a2eb8e1 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,2 +1 @@
-DIST vhba-module-20140928.tar.bz2 15571 SHA256 45f56e4972b5aa7175903307901ca42d29da6fc8f92ab4c47007f53bc5bb55a2 SHA512 efa61b2ac44a015582f99affa4c26e4b6ccdd1506a7f14626c08833c4ffff300d128dd4e9040d83d5a51064b0bc9f95397c3cdfec7197c53c3d6f1a97953f779 WHIRLPOOL 4b96bb5010b8ab892db09f7e8f36fc67107533dd4d6beea6d5b89e6076c44ee969bee5d3b646b4ca5b1f0f6af446096fd892ab0970b8d6893fe4730f3eb18c07
 DIST vhba-module-20170610.tar.bz2 15622 SHA256 7970c93f989d9c4f2629371bf5ee7a76f95e4c12342c3320ddc528d0df02d9ec SHA512 bf27a6a7a6aabf6c1a4c1f16b1a08dce460ee675ea53b141c6db8edf0637dffa900e03b9141f9f1a672fcd8f84e6f2be86a07e1f78bc5667a7a7669d45f1f687 WHIRLPOOL b5e9c8ae140e7267d11c3bab71879f49c3be464504193e06c8a77d291f22c41d9c017a8dc06477566b89b89430305aee71c2542a2d3ce04783f7f08e7122e730

diff --git a/sys-fs/vhba/files/vhba-20161009-linux-4.11.patch b/sys-fs/vhba/files/vhba-20161009-linux-4.11.patch
deleted file mode 100644
index 02540193f6e..00000000000
--- a/sys-fs/vhba/files/vhba-20161009-linux-4.11.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 7dc0d29a3ef6e45455f537c8187791446ca7e1e5 Mon Sep 17 00:00:00 2001
-From: Rok Mandeljc <rok.mandeljc@×××××.com>
-Date: Sun, 26 Mar 2017 17:09:42 +0200
-Subject: VHBA: compatibility fix for upcoming kernel 4.11
-
-As per Bug #104, from 4.11-rc2 on, we need to include linux/sched/signal.h
-instead of linux/sched.h
-
-diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c
-index 4a14a10e..ff30e4cb 100644
---- a/vhba-module/vhba.c
-+++ b/vhba-module/vhba.c
-@@ -18,16 +18,21 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
-+#include <linux/version.h>
-+
- #include <linux/init.h>
- #include <linux/module.h>
- #include <linux/highmem.h>
- #include <linux/fs.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
-+#include <linux/sched/signal.h>
-+#else
- #include <linux/sched.h>
-+#endif
- #include <linux/platform_device.h>
- #include <linux/miscdevice.h>
- #include <linux/poll.h>
- #include <linux/slab.h>
--#include <linux/version.h>
- #ifdef CONFIG_COMPAT
- #include <linux/compat.h>
- #endif

diff --git a/sys-fs/vhba/vhba-20140928.ebuild b/sys-fs/vhba/vhba-20140928.ebuild
deleted file mode 100644
index f8d94012113..00000000000
--- a/sys-fs/vhba/vhba-20140928.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils linux-mod user udev
-
-MY_P=vhba-module-${PV}
-DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE=""
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-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
-
-	enewgroup cdemu
-}
-
-src_prepare() {
-	# Avoid "make jobserver unavailable" warning and -Werror problems
-	sed -e '/ccflags/s/-Werror$/-Wall/' \
-		-i Makefile || die "sed failed"
-
-	epatch "${FILESDIR}/${PN}-20161009-linux-4.11.patch"
-
-	epatch_user
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README
-	linux-mod_src_install
-
-	einfo "Generating udev rules ..."
-	dodir "$(get_udevdir)"/rules.d
-	cat > "${D}/$(get_udevdir)"/rules.d/70-vhba.rules <<-EOF || die
-	# do not edit this file, it will be overwritten on update
-	#
-	KERNEL=="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
-	EOF
-}
-
-pkg_postinst() {
-	elog "Don't forget to add your user to the cdemu group if you want to"
-	elog "be able to use virtual cdemu devices."
-
-	# Older versions of vhba installed their rule file in /etc/udev/rules.d,
-	# which overrides rules in /lib/udev/rules.d. We remove the old file
-	# automatically if it is identical to the default one installed by
-	# vhba-1.2.1 or 20101015-r1. Note that the comment at the top of the rules
-	# file states that it can be automatically overwritten by the system.
-	old_rules="${ROOT}etc/udev/rules.d/70-vhba.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  2959b3cf61cfe6e466cc3516a7bc19de* | 1e7a7e5d6d28c811eeec98ec26ed5d28* )
-		  	elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" ||
-				eerror "Failed, please remove ${old_rules} manually."
-			;;
-		  * )
-			ewarn
-			ewarn "The ${old_rules} file from a previous"
-			ewarn "installation of ${PN} is overriding ${P}'s"
-			ewarn "udev rules. Unless you had deliberately customized it,"
-			ewarn "you should remove it."
-			ewarn
-			;;
-		esac
-	fi
-
-	linux-mod_pkg_postinst
-}