Version bump, now supports O_NONBLOCK (bug #472784, thanks to Henrik Stokseth and Rafał Mużyło). Remove old.

Package-Manager: portage-2.2.0_alpha180/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 32 insertions, 127 deletions

diff --git a/sys-fs/vhba/ChangeLog b/sys-fs/vhba/ChangeLog
index f32f0088721a..fb79934823b5 100644
--- a/sys-fs/vhba/ChangeLog
+++ b/sys-fs/vhba/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/vhba
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/ChangeLog,v 1.43 2012/12/03 02:23:12 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/ChangeLog,v 1.44 2013/06/17 00:43:42 tetromino Exp $
+
+*vhba-20130607 (17 Jun 2013)
+
+  17 Jun 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -vhba-20110915.ebuild, +vhba-20130607.ebuild,
+  -files/vhba-20110915-3.4-kmap_atomic.patch:
+  Version bump, now supports O_NONBLOCK (bug #472784, thanks to Henrik Stokseth
+  and Rafał Mużyło). Remove old.
 
   03 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> vhba-20110915.ebuild,
   vhba-20120422-r1.ebuild:
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index db954d9e2015..38c3f406fbfa 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,21 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX vhba-20110915-3.4-kmap_atomic.patch 4360 SHA256 4c6d87da270f19a1871b5f6456afc43b5e2c7f60f26f17ce6db27642a9c87f55 SHA512 00a62ecc1b80f4cd38471089d51e29f26c52cecd6d988e3c28326cbb6fa393eda024699b7378507b47dcda956263ab633f40729ec88356b9f00880ec17e73bc8 WHIRLPOOL e4f0ee62e6c03291a1b887d215bbf02a20d68330fd43cbb440afd528d6e214fdee9cef26729ffcb5a640d2f9ddbba67d45cc98a20d7a728da4a690e3ec9940c2
-DIST vhba-module-20110915.tar.gz 17773 SHA256 9597ab6b66c364962a4db48d11cb324f789106e9e69d264e894f829bedb34fbd SHA512 b4bed1adfd9108946091d2ba953b25d675dd17eb3dc38d8ebce8bf2b75056f04d609c9a1f7a02719153f114f2ad0f204b02bf22c8d8b00f854cdcd8a02b41fcb WHIRLPOOL 6103289b5193bbdff086f7ca21f0e310c013e4c068ea937cc1f2374e683ef67fa3329b3adef377ffdc91b15302225788681be29f6a675c0b1ae42f26097de49b
 DIST vhba-module-20120422.tar.bz2 15299 SHA256 23d968aa841af25579238bb75d0f8a8e73c2562d7205d22a5af63ef681e53f81 SHA512 f4c1747a7d5064dd074810cd0e6180b9a012a86886e090efc79f08f4cf4b1b7a03532917f82738172079a2bb6ad59255329e97f66f3d3dee7b6a9d6d983aa266 WHIRLPOOL 3a1fe6f865693fabbb0a212da602f1c42d4e4095a217a3b954304bcf372210ea26c9b20cb8c08255d2844316c7df48ef216c51ec44aa33d55f55f7280e918b65
-EBUILD vhba-20110915.ebuild 2537 SHA256 dbf0c91b5a5c400d37572933bb97199bdf58cc3d0114e88cbc7b5b457587134c SHA512 f6691eda5b94056e22eb31ad7a0a169cb1f30e73ee8590ff714d036d2ec96905a5a13c421a1c59025b9bf1041ace35e717820308e9c6a417e3be1ed888f62327 WHIRLPOOL 1a0fa6630c9fdc74fd0ba215f294c28230f55b0f034d1b5efc0bfecc5ad611a42f2a9e90b75e2f8643d675c3ae82692a4436da79dac18d14820e2c1734921e86
+DIST vhba-module-20130607.tar.bz2 15528 SHA256 d2c4919d2904a8f880e2730250f7ed6e3143575d5c4de6b88a97c2228aa2a185 SHA512 7ac359a3a20920a3baac81d1dd941f4ea04d77cffaf4bc63dc2d9b9d0f80883be82c00a911ab17b9b0da3719bd10f6bc392edd00f9342a332da5c5f036dfc4d7 WHIRLPOOL 85623ce6ae303ebf55512410f10c9f0b524f298104bf9305ce403516c8c12897eb253ab8163da6137c16e719d1abee4206b1864b8a73e9fd58bc95a6621d211e
 EBUILD vhba-20120422-r1.ebuild 2438 SHA256 41a5d31dfb23fadfbb10413910651edc8c1fa3d4aec8830b86af27b341462af8 SHA512 9450e9b4782b75af71048792ab0bd8da180161d7bb47817fcbe56a4aceadd30cededa7fa4cd7600b87b3733af794fb9ceddc6225baaf6643059fd40aba68041c WHIRLPOOL 2f247186ea65132655ff84bf3e65518f7d0121b9e690217bd2dae3f86946325f28c81706359a363742b501b67037e8325023bed3300f6a06d95a7105440f4478
-MISC ChangeLog 7952 SHA256 31223e5f0b3b2b9ab27661ba931b8263c184240001db101cd564223b25005c7e SHA512 83383b7b208401612c4da3794a3baa3594b26cf4e97570e633de881dcbbe9cc55d4bc37ce2989713caa5938d9de91d6743bada872e9f1d737bf39d87b7330e26 WHIRLPOOL f46574052134faf322d5717d5bc8c1b508028a2bcd526e4d8f47897a2307076aef1517ab1e8a7fbc626dbd3ad177e0a0ac372ad30718a142b1780dff54ff539c
+EBUILD vhba-20130607.ebuild 2401 SHA256 61c6ef7363b341901e01a131b45254d1335b0a5d5471d0e3ccd79cacfe52fb31 SHA512 866352d6396bbe57d9b7054ce5289bc439c0ae33367d208152aea3a598dc2790b82ca63338fa45a3b6192e063e5b896d1b9769353f7aeb70d956aedf6767bb51 WHIRLPOOL 2605ef9279ecfdbc2cdf8070d79f0d98608480fe4a26c289427579c29b0a27d705dd69c54c5cc85c41d1aee52aa5004eec8a20f1ced58dc19394387ad69a883c
+MISC ChangeLog 8252 SHA256 39236f333be35b346222923713b409d89a58b80317d0676b8ad89b55cfa9608b SHA512 fe0a10742d4e454db6d74287f57ae03e33601690aae25f72d3294c28d8b0df7e49d7babca2c2f38ac8a3ed927ec1e087312cded07a3014af24c098a61da5051e WHIRLPOOL 6c7acd161be1a7fdeeb25141899f1cd84b1f48a335f4078f54efdc3b83465c77241b8cbdf7ba53ea0e519d2e2db178a2800aaa229acb86062447eba0f2c12674
 MISC metadata.xml 240 SHA256 4a0db93c159180b93d98dadc1cb36f054f18a7413357a0dd753c9264a43f7477 SHA512 14c9405275f11667ad7e035376fe7e5caf99ac982596621cda18a2f8a99e9a9b2464806be5d016d1a4c2fa794bf8b1400a5cb658a7a874e65d825b8baea69d62 WHIRLPOOL 0e2fbd97c0146322cf226d3086acf3e95dc86d17409f3d350ba2de1b81a2d93b0dc3f370d5c444475e129fa511791ea5b48ca00c47583cedc6ed60ef9e61fae7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQvA0RAAoJEEdUh39IaPFNmk0H/0txsBxiZG7J0yF3rROBATXf
-loXcrILcwSi6zmm2imZc/L8zJX4z90tMR0tGJyRGUpb7NTHmVk0XOA0VKLcxvN5U
-o0A0HWm8NtUWK4JtXmGkVSUV7dWg31iwSSoKS0flbWs8BAEgBfdENX8TdBZAS1JM
-8VHid1FyX/NreTzEwmzcOd/6irIh/j7fY1j3B/x7N2YaapcM5zWs1g3cOaB6OF4S
-se6O0FQIWQcJp2d1x5TG/q+dqD1aNaBIa9A6iIZpIsDjFPHmPpUjw2HW6/wii17e
-iR8J8WhWzNLlkgqxQJt7lqwhOJteK3U9XdI+KoiO455xXNYITVTARukCMPD1XZU=
-=LS8Q
+iQEcBAEBCAAGBQJRvlu/AAoJEJ0WA1zPCt1hwDsH/2W++LaQmHRVMqU4JW4KMjbV
+WkGNHUIrAZSqWFhm1aiNOKV4aDkMH3tVNaDed4ct31sVw1m9QxYR43+1Wp8h1suA
+b1y1EbDTzjXFci7sCKYBi+LQ2hAb/x1Gmx22PQYSTObm1Scr0eH0RFjGFYPCOyGs
+9IZVHjrMHbrFSiNWrrJ9aiI+aZhY0WhAOpmXtXqAQuAn5slUSpWw3Li3hyqKQcT/
+pIyi5t+Vb3F1BQ9h+CZOWTPf3UZtHqhOhgotSLuFc+gej3/wDavJK+Sg7awSgRpY
+QRkMeH+FVQQdrBkIsVzCYIgnOGf38MJsTnZlj0Emaa5xkEMY0GHkYlIT6i1ZBto=
+=pT4S
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/vhba/files/vhba-20110915-3.4-kmap_atomic.patch b/sys-fs/vhba/files/vhba-20110915-3.4-kmap_atomic.patch
deleted file mode 100644
index 43bd58dacfaa..000000000000
--- a/sys-fs/vhba/files/vhba-20110915-3.4-kmap_atomic.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 0e051e8655c1d68d748d4b6976261aee7d2c248a Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 21 Apr 2012 14:16:59 -0400
-Subject: [PATCH] VHBA: 2-argument k[un]map_atomic is deprecated in >=3.4-rc1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The 1-argument form of k[un]map_atomic was introduced in 2.6.37-rc1, and
-the old 2-argument form is deprecated in 3.4-rc1 and higher. As a
-result, building vhba for a 3.4-rc* kernel that has
-CONFIG_ENABLE_WARN_DEPRECATED fails:
-
-/tmp/cdemu/vhba-module/vhba.c: In function ‘do_request’:
-/tmp/cdemu/vhba-module/vhba.c:487:33: error: ‘kmap_atomic_deprecated’ is
-deprecated (declared at include/linux/highmem.h:125)
-[-Werror=deprecated-declarations]
-/tmp/cdemu/vhba-module/vhba.c:492:1: error: ‘__kunmap_atomic_deprecated’
-is deprecated (declared at include/linux/highmem.h:135)
-[-Werror=deprecated-declarations]
-/tmp/cdemu/vhba-module/vhba.c: In function ‘do_response’:
-/tmp/cdemu/vhba-module/vhba.c:570:33: error: ‘kmap_atomic_deprecated’ is
-deprecated (declared at include/linux/highmem.h:125)
-[-Werror=deprecated-declarations]
-/tmp/cdemu/vhba-module/vhba.c:575:1: error: ‘__kunmap_atomic_deprecated’
-is deprecated (declared at include/linux/highmem.h:135)
-[-Werror=deprecated-declarations]
-cc1: all warnings being treated as errors
-
-To work around this problem, add vhba_k[un]map_atomic wrappers that
-default to the 1-argument form of k[un]map_atomic for 2.6.37 and newer,
-and to the old 2-argument form for older kernels.
----
- vhba-module/vhba.c |   23 +++++++++++++++++------
- 1 files changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c
-index 8937b94..a36fd59 100644
---- a/vhba-module/vhba.c
-+++ b/vhba-module/vhba.c
-@@ -27,6 +27,7 @@
- #include <linux/miscdevice.h>
- #include <linux/poll.h>
- #include <linux/slab.h>
-+#include <linux/version.h>
- #ifdef CONFIG_COMPAT
- #include <linux/compat.h>
- #endif
-@@ -64,6 +65,16 @@ MODULE_LICENSE("GPL");
- #define DATA_TO_DEVICE(dir) ((dir) == DMA_TO_DEVICE || (dir) == DMA_BIDIRECTIONAL)
- #define DATA_FROM_DEVICE(dir) ((dir) == DMA_FROM_DEVICE || (dir) == DMA_BIDIRECTIONAL)
- 
-+/* 1-argument form of k[un]map_atomic was introduced in 2.6.37-rc1;
-+   2-argument form was deprecated in 3.4-rc1 */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+#define vhba_kmap_atomic kmap_atomic
-+#define vhba_kunmap_atomic kunmap_atomic
-+#else
-+#define vhba_kmap_atomic(page) kmap_atomic(page, KM_USER0)
-+#define vhba_kunmap_atomic(page) kunmap_atomic(page, KM_USER0)
-+#endif
-+
- enum vhba_req_state {
-         VHBA_REQ_FREE,
-         VHBA_REQ_PENDING,
-@@ -473,12 +484,12 @@ static ssize_t do_request(struct scsi_cmnd *cmd, char __user *buf, size_t buf_le
-                                 size_t len = sg[i].length;
- 
- #ifdef KAT_SCATTERLIST_HAS_PAGE_LINK
--                                kaddr = kmap_atomic(sg_page(&sg[i]), KM_USER0);
-+                                kaddr = vhba_kmap_atomic(sg_page(&sg[i]));
- #else
--                                kaddr = kmap_atomic(sg[i].page, KM_USER0);
-+                                kaddr = vhba_kmap_atomic(sg[i].page);
- #endif
-                                 memcpy(kbuf, kaddr + sg[i].offset, len);
--                                kunmap_atomic(kaddr, KM_USER0);
-+                                vhba_kunmap_atomic(kaddr);
- 
-                                 if (copy_to_user(uaddr, kbuf, len)) {
-                                         if (kbuf != buf_stack)
-@@ -556,12 +567,12 @@ static ssize_t do_response(struct scsi_cmnd *cmd, const char __user *buf, size_t
-                                 uaddr += len;
- 
- #ifdef KAT_SCATTERLIST_HAS_PAGE_LINK
--                                kaddr = kmap_atomic(sg_page(&sg[i]), KM_USER0);
-+                                kaddr = vhba_kmap_atomic(sg_page(&sg[i]));
- #else
--                                kaddr = kmap_atomic(sg[i].page, KM_USER0);
-+                                kaddr = vhba_kmap_atomic(sg[i].page);
- #endif
-                                 memcpy(kaddr + sg[i].offset, kbuf, len);
--                                kunmap_atomic(kaddr, KM_USER0);
-+                                vhba_kunmap_atomic(kaddr);
- 
-                                 to_read -= len;
-                                 if (to_read == 0)
--- 
-1.7.8.5
-
diff --git a/sys-fs/vhba/vhba-20110915.ebuild b/sys-fs/vhba/vhba-20130607.ebuild
index c0a0fc91eb56..97273ed1aee0 100644
--- a/sys-fs/vhba/vhba-20110915.ebuild
+++ b/sys-fs/vhba/vhba-20130607.ebuild
@@ -1,27 +1,28 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.10 2012/12/03 02:23:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/vhba-20130607.ebuild,v 1.1 2013/06/17 00:43:42 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 
-inherit eutils linux-mod user udev
+inherit 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.gz"
+SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE=""
 
 RDEPEND="virtual/udev"
-DEPEND=""
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 MODULE_NAMES="vhba(block:${S})"
-BUILD_TARGETS=all
+BUILD_TARGETS=modules
 
 pkg_setup() {
 	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
@@ -33,11 +34,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Build failure with >=3.4-rc1 and CONFIG_ENABLE_WARN_DEPRECATED, #411459
-	epatch "${FILESDIR}/${P}-3.4-kmap_atomic.patch"
 	# Avoid "make jobserver unavailable" warning and -Werror problems
-	sed -e 's:\t$(KMAKE):\t+$(KMAKE):g' \
-		-e '/EXTRA_CFLAGS/s/-Werror$/-Wall/' \
+	sed -e '/ccflags/s/-Werror$/-Wall/' \
 		-i Makefile || die "sed failed"
 }