Bump, port to EAPI4, install udev rules in /lib/udev, and update description. (bug #369063)

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

5 files changed, 103 insertions, 11 deletions

diff --git a/sys-fs/vhba/ChangeLog b/sys-fs/vhba/ChangeLog
index 6758f2f1cf21..38e0fd08d0ab 100644
--- a/sys-fs/vhba/ChangeLog
+++ b/sys-fs/vhba/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/vhba
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/ChangeLog,v 1.24 2011/11/22 20:39:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/ChangeLog,v 1.25 2011/11/23 09:40:00 tetromino Exp $
+
+*vhba-20110915 (23 Nov 2011)
+
+  23 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> vhba-1.2.1.ebuild,
+  vhba-20101015-r1.ebuild, +vhba-20110915.ebuild:
+  Bump, port to EAPI4, install udev rules in /lib/udev, and update description.
+  (bug #369063)
 
   22 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> metadata.xml:
   Add myself as maintainer.
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index 090c229de3ea..f783ec16ea94 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -11,14 +11,16 @@ AUX vhba-1.2.1-kernel-2.6.34.patch 517 RMD160 43906e3240da7f85eb6f27fe0672ae7a8a
 AUX vhba-20101015-scsi-host-lock-push-down.patch 1972 RMD160 0f4c1900b46d98c8a50f6600a49274cb942ee800 SHA1 a329c5b80ded0f9af2f3bbc24d7939c16e5efa56 SHA256 7d428d5d6f8be7088f98a1edacc8900ebfb2072d28e79cb613012b40552c1235
 DIST vhba-module-1.2.1.tar.bz2 6585 RMD160 ecdbbd40f34b68816b0eefe43a64a4c664b31580 SHA1 5226b3dd16d793cd58a712e8ca44f3b45194e248 SHA256 1ab729d029c49e5e6231cdec3b9f88f17c44a292fe77f2bfbab506b62999a3ae
 DIST vhba-module-20101015.tar.bz2 16309 RMD160 6994cbffd44037d42b8c74b3786c1bea06e664c6 SHA1 e0bc1a9e5b99bf13e5dea1474254c51484ec217c SHA256 3b115054803cdbc1497591dc7a3a57ebeb2bd39086fb8909016ed418d3667d1a
-EBUILD vhba-1.2.1.ebuild 1578 RMD160 50a36a90b6932b94aedbbae71f118a7ab4e2e4fd SHA1 4eddc16b6ce61a7bb34ad3995ee36078cd70b712 SHA256 9d2b2d6bac53ebb0b7115bcd89f5cb0ecae116e02847dd50cca4150ddea9b41a
-EBUILD vhba-20101015-r1.ebuild 1571 RMD160 673e24e690c2a5b330301124e9a330d32e74f2c0 SHA1 a62f27dfa2fdf61279004f837661b1df8c4a851c SHA256 32c2d5eedc1542f83bd9c21a940f2cc456fdc68f6d9cb9fba73b044cdcf7295e
-MISC ChangeLog 4941 RMD160 69802e3b671cdbfe920d180a6daa24a992f5d7cd SHA1 1c8eca5a31ad049dddd61c457555fb99e929150d SHA256 3720c394d6941b6e51c692ec0eba6127769603b1ad030399bff86e4802d0f44e
+DIST vhba-module-20110915.tar.gz 17773 RMD160 4a9cd360e81b9b73ee1909a70b92b18b04bb1d94 SHA1 7da02bfce3557e77b7895dfff5e11b4ec4bb4564 SHA256 9597ab6b66c364962a4db48d11cb324f789106e9e69d264e894f829bedb34fbd
+EBUILD vhba-1.2.1.ebuild 1577 RMD160 3fdfe9cf731515ff92cd1d9106102e2a57b94181 SHA1 dfd82f4190f6597cf2237d05ce5ac0e805992bbb SHA256 eb3d57de341669eb5290846a72dbfca2efde49f4e7cd5ba9fb04b30de3517403
+EBUILD vhba-20101015-r1.ebuild 1570 RMD160 ae618efb61c76d98b9e21a662ae618219b8a39b8 SHA1 9f6f608efdee2fe482bd4a9e0714af931421ef1f SHA256 bec1f4b4479d5d7747f58c93b246f5350efdbb7376650db312c6df3d5b9c4053
+EBUILD vhba-20110915.ebuild 2315 RMD160 35863c72dff4f302ae926c42531f8fa34c5fe5d2 SHA1 22e8d15e93fa94e44d36f2f0eb13bfb3326a829a SHA256 835ca453eca3e566ffdd6cff2caa9d98f458a47e8d9ff9c69c65e900a7d46270
+MISC ChangeLog 5196 RMD160 13c5dbe85f75e641276ed7eaa17b2e08a5becec0 SHA1 d35c81695d9970dec8d665321b16459c22b33ae0 SHA256 9e419f0db88f90a071c224fb7f35acdde6106808634c091e84b1e79c274041b4
 MISC metadata.xml 240 RMD160 0e579a0eee987b510062c61fb213844574fee876 SHA1 0dcf565094dc7c485f71651d488cc41dfbca1132 SHA256 4a0db93c159180b93d98dadc1cb36f054f18a7413357a0dd753c9264a43f7477
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7MCJwACgkQdjK8w9WeBnC4YwEArgsy15eOwtRv+wsSxNfIfTiO
-mZMIP/x4YEk8PuuxvKgBAK/iEzNDwm572Tjn8Srocz8g7qqF3tBc/r6EizvzXGGS
-=88gB
+iF4EAREIAAYFAk7Mv3UACgkQdjK8w9WeBnAVngEAsLU9NHs/BruNigBksXRtAeDR
+/so7OaIXxAemdet/0TwBALawqlU45Of3WkULqrFSBOZ9tZoI1JzHX+a90tE+z8Fv
+=RYge
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/vhba/vhba-1.2.1.ebuild b/sys-fs/vhba/vhba-1.2.1.ebuild
index eaa90b7e1ecb..9d43fda24581 100644
--- a/sys-fs/vhba/vhba-1.2.1.ebuild
+++ b/sys-fs/vhba/vhba-1.2.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/vhba-1.2.1.ebuild,v 1.8 2011/04/28 19:01:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/vhba-1.2.1.ebuild,v 1.9 2011/11/23 09:40:00 tetromino Exp $
 
 EAPI="2"
 
 inherit linux-mod eutils
 
-DESCRIPTION="VHBA module provides Virtual (SCSI) Host Bus Adapter for the cdemu suite"
+DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
 HOMEPAGE="http://cdemu.org"
 SRC_URI="mirror://sourceforge/cdemu/vhba-module-${PV}.tar.bz2"
 
diff --git a/sys-fs/vhba/vhba-20101015-r1.ebuild b/sys-fs/vhba/vhba-20101015-r1.ebuild
index 19c2ca58d79c..af40630cb3ff 100644
--- a/sys-fs/vhba/vhba-20101015-r1.ebuild
+++ b/sys-fs/vhba/vhba-20101015-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/vhba-20101015-r1.ebuild,v 1.2 2011/04/28 19:01:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/vhba-20101015-r1.ebuild,v 1.3 2011/11/23 09:40:00 tetromino Exp $
 
 # Use svn snapshots:
 # https://sourceforge.net/tracker/?func=detail&atid=603423&aid=3041832&group_id=93175
@@ -12,7 +12,7 @@ EAPI="2"
 inherit linux-mod eutils
 
 MY_P=vhba-module-${PV}
-DESCRIPTION="VHBA module provides Virtual (SCSI) Host Bus Adapter for the cdemu suite"
+DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
 HOMEPAGE="http://cdemu.org"
 SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
diff --git a/sys-fs/vhba/vhba-20110915.ebuild b/sys-fs/vhba/vhba-20110915.ebuild
new file mode 100644
index 000000000000..9c5c150949ac
--- /dev/null
+++ b/sys-fs/vhba/vhba-20110915.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/vhba-20110915.ebuild,v 1.1 2011/11/23 09:40:00 tetromino Exp $
+
+EAPI="4"
+
+inherit eutils linux-mod
+
+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.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-fs/udev-125"
+DEPEND=""
+
+S=${WORKDIR}/${MY_P}
+MODULE_NAMES="vhba(block:${S})"
+BUILD_TARGETS=all
+
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
+	check_extra_config
+	BUILD_PARAMS="KDIR=${KV_DIR}"
+	linux-mod_pkg_setup
+
+	enewgroup cdemu
+}
+
+src_prepare() {
+	# Avoid "make jobserver unavailable" warning
+	sed -e 's:\t$(KMAKE):\t+$(KMAKE):g' -i Makefile || die "sed failed"
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog README
+	linux-mod_src_install
+
+	einfo "Generating udev rules ..."
+	dodir /lib/udev/rules.d/
+	cat > "${D}"/lib/udev/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
+}