Patch to fix build on linux 3.10

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0xB0A72FD2

5 files changed, 104 insertions, 8 deletions

diff --git a/sys-block/rts_pstor/ChangeLog b/sys-block/rts_pstor/ChangeLog
index 34421778f5c4..b1f425330f62 100644
--- a/sys-block/rts_pstor/ChangeLog
+++ b/sys-block/rts_pstor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-block/rts_pstor
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/rts_pstor/ChangeLog,v 1.2 2013/05/28 19:48:25 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/rts_pstor/ChangeLog,v 1.3 2013/07/03 00:36:45 vikraman Exp $
+
+*rts_pstor-1.10-r2 (03 Jul 2013)
+
+  03 Jul 2013; Vikraman <vikraman@gentoo.org> rts_pstor-1.10-r1.ebuild,
+  +rts_pstor-1.10-r2.ebuild, +files/rts_pstor-linux-3.10.patch:
+  Patch to fix build on linux 3.10
 
 *rts_pstor-1.10-r1 (28 May 2013)
 
diff --git a/sys-block/rts_pstor/Manifest b/sys-block/rts_pstor/Manifest
index 68e7e4d20ab2..a1e301131cc1 100644
--- a/sys-block/rts_pstor/Manifest
+++ b/sys-block/rts_pstor/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX rts_pstor-linux-3.10.patch 1268 SHA256 7307731af269615507b1ac27bd3d23c717731c085bf2cbe743cf3366184e5ca6 SHA512 51eb565d7498e7f8a3805b2142dae013224ee9161bf988a9f34b11fa2dd57499a4bd603e7cff1e9960e92a235f023bc89ff97c28fb8fc586a9598683388183b3 WHIRLPOOL 554c2d59a0bb429593fb9ca2415524656ebaff23cf4d900d30d92f7695d0019d8245e33302c6472ef1e50d88393ac3d4269f68c7be3bc860db1ca1b957ce914f
 AUX rts_pstor-linux-3.8.patch 829 SHA256 4a07d2b27d19997bceb50619dcff29a552cf329a642f797bed97ca440fcf2608 SHA512 8ee281925ebbd45d857614a8bcd5d0f92ba8df3e360646d0ffb5288765638e93dde7e92996b55f8c11bcdc2b7e12ae22230a1ea394eb6b2a5c00913570075753 WHIRLPOOL 1086685f3df997d59548e90b0d8ef535cac831299754a64d9bd233bea1be62696865c48a8faebcffe333db14f83c7514f2039e37a43b372fed92524268669a18
 DIST rts_pstor-1.10.tar.bz2 79549 SHA256 21d819a9b89f029a86fdc807f212ca38ed903e071bed204b2ddb84b2a017a31f SHA512 26d29ccda55672adab8b96a8318e240d0c9d50ebf614853284cf218058c5788cc83b818ce118ac313c0ce6a67aef8ad13d93ed26212db7e05db51b8a7860b48d WHIRLPOOL 15d4cb19ababfffd41b95160531ca048cf2d1affc9ac8f846c7ea7e3c92289a47751e028908333e973c2a92e3ff18b606c92c8223ae8a48fdf5ef911e5c1d43c
-EBUILD rts_pstor-1.10-r1.ebuild 914 SHA256 b0f9fd4f2c3b9a54f6b65419912209eb0dfae248231af8f668571ad58168bb5e SHA512 86cbf5aebfa11e017b12409a8d0dee716d908d44d6320be3ece62483721a6aa995a4e9326b8e70d6261e7bbabd6e83ec7509812f026506bcbaa2aade02813d5e WHIRLPOOL 0825ca8196dad545bb2d9c655927f9632024b502cf8dea6bf0c87ef849dabfde47a1869f43659437098862ed732e3bfc8e0aa0d888f310e0435010b9c1ee8d6d
+EBUILD rts_pstor-1.10-r1.ebuild 964 SHA256 440585a56b69e3f39695be67da08d1376d776d2a32258cb40421a6b75d3d0552 SHA512 082c86ed695d30d331fedbc521d934bd6fc941b7d07416721be16dd26067b8a811076b8124b7da4e724d12894203e3506d341dfe59b474467ba79c3046727711 WHIRLPOOL 117fdd1e66ac6e0c2b2d9a88f4f546b9e155e6935cbed5a8abf72477a73b10ef6621ffd2c1e85247e485089c871bb1d670fd66b0518f5a2eb0ef561c350c7ca2
+EBUILD rts_pstor-1.10-r2.ebuild 1060 SHA256 71a48b4626761cce1ce95a84e260350526a5de400925008bacb18f248b01a2c7 SHA512 ad0a3cb284b7c23eef3938e83b66930d348c404eefc7bfac3c2a2d52b7fabfee0ccc25cf01a0ed09961b08d80b408c90abe3fd8cfab6c162233976233448e8c2 WHIRLPOOL a347ea6009501d76742f04c4f5d7d883aef807588c77d251bddf3e65d63abb5ad2f0202129ff9367c8dbe0688684911a25786ea29fd5b1eabff77dffc7fc1136
 EBUILD rts_pstor-1.10.ebuild 867 SHA256 b06c50c5f44b884f9cc5d433bcbd3a76744574b824603cbcc22d5969a6fe0aeb SHA512 62ced6f64b8675b01cd3de38edca294e03473832029ef6dbace33013c25732185b5fdabbcd165941e1d0005c8ff209293b14603645b476dcd3865919ac223bce WHIRLPOOL 2501a06c91b3b0e16c3eda1e76118444b210e6e9ee0d42cae1e9bbc0e2b7b29e8ec7652c4f8192e42934822e9fcbf0f9448794cebe76e05549480aa4cc0f6b74
-MISC ChangeLog 609 SHA256 aadd21ffee920a3a7b3d56d51111e9981ddc60c51caca43d99f2077b3136a7f7 SHA512 d2c5a02ab6ea11db34aec2e30e92e98c0f31a6ac1bcde3c0761c9b6cef01afd589a9088738863dafb18e88526a6781ac35e955a9bcef9160b700acc1279fbb15 WHIRLPOOL 800b82d6620152b2925b3cec414d7a21badc286f950f4410603cac49d9e57a861ce4684b380e08deaa4a41495726d9ff14dd703f9a2893b49687b48d5e228188
+MISC ChangeLog 815 SHA256 0a7c2d26858869f9d56ab834a3eeb8c9f31609ee431aabeddcecb55344fa660a SHA512 c438aabd8f9d76a258ffd85f4a56a7626185374359c7835a97822b0ceefced1fb8a1dabd7dc317a4953a9baa3b5e9d44266173fdb0b6faa3c490aad81c868265 WHIRLPOOL 6d8e078f9b46330b408a139867f2626c67832d3b9f91165f6c627f0088966714832d4ad643646dbdd57a714b9a18cd5f8f3cc6484202eabb2b9495a2db23fcaf
 MISC metadata.xml 334 SHA256 0d45e4fc5d6fc2b6612bfe461ee947b96965c2e6443333543df2c0166356dcbc SHA512 38fe96eadfead9361b512a25e017c757aab1bd8a50682a53c24273bebf04c3ee087ba0cb90de107b4add86f681df612f9e1b4c8788a558855af6f6a44733cb9d WHIRLPOOL 7f2262c8515530eb889a6f182afea2f462cbd7023a81783ee1affc349795e3e54249a1519ebb45dea346bfd96dfb37c4bc8c919188ed8faefac52a0da8efe0dc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGlCg4ACgkQR91UhLCnL9KM4wEA3QgvTltIx7s45/Ro57vddmrX
-xHcYco84XgPpS9NJHHgA/RaBidwuaTrcxBrskPxy1gzKv1/pdsFuQKk0BEvveNmW
-=Dchl
+iF4EAREIAAYFAlHTch4ACgkQR91UhLCnL9J3AQEAgO3DerSOOYAQSJQcwTxU/hT2
+YgB+mQoduKcrieASBRwA/R1kaFvMpWD/5aujuvYOCICxF8EJVho6teue8oxpE6nx
+=RAeX
 -----END PGP SIGNATURE-----
diff --git a/sys-block/rts_pstor/files/rts_pstor-linux-3.10.patch b/sys-block/rts_pstor/files/rts_pstor-linux-3.10.patch
new file mode 100644
index 000000000000..0070549b88d8
--- /dev/null
+++ b/sys-block/rts_pstor/files/rts_pstor-linux-3.10.patch
@@ -0,0 +1,53 @@
+--- rts_pstor.a/rtsx.c	2013-07-03 05:39:26.316723407 +0530
++++ rts_pstor.b/rtsx.c	2013-07-03 05:28:28.584882761 +0530
+@@ -135,38 +135,18 @@
+ 
+ 
+ #undef SPRINTF
+-#define SPRINTF(args...) \
+-	do { if (pos < buffer+length) pos += sprintf(pos, ## args); } while (0)
++#define SPRINTF(args...) seq_printf(m, ##args)
+ 
+-static int proc_info (struct Scsi_Host *host, char *buffer,
+-		char **start, off_t offset, int length, int inout)
++static int show_info(struct seq_file *m, struct Scsi_Host *host)
+ {
+-	char *pos = buffer;
+-
+-	
+-	if (inout)
+-		return length;
+-
+ 	
+ 	SPRINTF("   Host scsi%d: %s\n", host->host_no, CR_DRIVER_NAME);
+-
+ 	
+ 	SPRINTF("       Vendor: Realtek Corp.\n");
+ 	SPRINTF("      Product: PCIE Card Reader\n");
+ 	SPRINTF("      Version: %s\n", DRIVER_VERSION);
+ 	SPRINTF("        Build: %s\n", DRIVER_MAKE_TIME);
+-
+-	/*
+-	 * Calculate start of next buffer, and return value.
+-	 */
+-	*start = buffer + offset;
+-
+-	if ((pos - buffer) < offset)
+-		return (0);
+-	else if ((pos - buffer - offset) < length)
+-		return (pos - buffer - offset);
+-	else
+-		return (length);
++    return 0;
+ }
+ 
+ 
+@@ -272,7 +252,7 @@
+ 	
+ 	.name =				CR_DRIVER_NAME,
+ 	.proc_name =			CR_DRIVER_NAME,
+-	.proc_info =			proc_info,
++	.show_info =			show_info,
+ 	.info =				host_info,
+ 
+ 	
diff --git a/sys-block/rts_pstor/rts_pstor-1.10-r1.ebuild b/sys-block/rts_pstor/rts_pstor-1.10-r1.ebuild
index 52847e49fe5d..7ec6d1c04dc6 100644
--- a/sys-block/rts_pstor/rts_pstor-1.10-r1.ebuild
+++ b/sys-block/rts_pstor/rts_pstor-1.10-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/rts_pstor/rts_pstor-1.10-r1.ebuild,v 1.1 2013/05/28 19:48:25 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/rts_pstor/rts_pstor-1.10-r1.ebuild,v 1.2 2013/07/03 00:36:45 vikraman Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ BUILD_TARGETS="default"
 
 src_prepare() {
 	sed -i -e 's/\/lib\/modules\/\$(shell uname -r)\/build\//\$(KERNELDIR)/g' Makefile || die "Sed failed!"
-	epatch "${FILESDIR}/${PN}-linux-3.8.patch"
+	[ ${KV_MAJOR} -ge 3 ] && [ ${KV_MINOR} -ge 8 ] && epatch "${FILESDIR}/${PN}-linux-3.8.patch"
 }
 
 pkg_setup() {
diff --git a/sys-block/rts_pstor/rts_pstor-1.10-r2.ebuild b/sys-block/rts_pstor/rts_pstor-1.10-r2.ebuild
new file mode 100644
index 000000000000..5bddc35754a9
--- /dev/null
+++ b/sys-block/rts_pstor/rts_pstor-1.10-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/rts_pstor/rts_pstor-1.10-r2.ebuild,v 1.1 2013/07/03 00:36:45 vikraman Exp $
+
+EAPI=4
+
+inherit linux-mod
+
+DESCRIPTION="PCIE RTS5209 card reader driver for Linux"
+HOMEPAGE="http://www.realtek.com.tw/Downloads/downloadsView.aspx?PNid=15&PFid=25&Level=4&Conn=3&DownTypeID=3"
+SRC_URI="http://dev.gentoo.org/~vikraman/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+MODULE_NAMES="rts_pstor(kernel/drivers/scsi)"
+BUILD_TARGETS="default"
+
+src_prepare() {
+	sed -i -e 's/\/lib\/modules\/\$(shell uname -r)\/build\//\$(KERNELDIR)/g' Makefile || die "Sed failed!"
+	[ ${KV_MAJOR} -ge 3 ] && [ ${KV_MINOR} -ge 8 ] && epatch "${FILESDIR}/${PN}-linux-3.8.patch"
+	[ ${KV_MAJOR} -ge 3 ] && [ ${KV_MINOR} -ge 10 ] && epatch "${FILESDIR}/${PN}-linux-3.10.patch"
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
+}