From 499ef9a76d481cba000e9c71e6ccab83fd1d3186 Mon Sep 17 00:00:00 2001
From: Vikraman Choudhury <vikraman@gentoo.org>
Date: Sun, 31 May 2015 07:12:25 +0000
Subject: Fix build with linux 4.0.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB0A72FD2
---
 sys-block/rts_pstor/ChangeLog                | 10 ++++++--
 sys-block/rts_pstor/Manifest                 | 26 +++++++++++++------
 sys-block/rts_pstor/rts_pstor-1.10-r3.ebuild | 35 -------------------------
 sys-block/rts_pstor/rts_pstor-1.10-r4.ebuild | 38 ++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 45 deletions(-)
 delete mode 100644 sys-block/rts_pstor/rts_pstor-1.10-r3.ebuild
 create mode 100644 sys-block/rts_pstor/rts_pstor-1.10-r4.ebuild

(limited to 'sys-block')

diff --git a/sys-block/rts_pstor/ChangeLog b/sys-block/rts_pstor/ChangeLog
index e98259f60fa8..73befc36cba0 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/rts_pstor/ChangeLog,v 1.5 2014/08/14 18:10:46 vikraman Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/rts_pstor/ChangeLog,v 1.6 2015/05/31 07:12:23 vikraman Exp $
+
+*rts_pstor-1.10-r4 (31 May 2015)
+
+  31 May 2015; Vikraman Choudhury (vikraman) <vikraman@gentoo.org>
+  +rts_pstor-1.10-r4.ebuild, -rts_pstor-1.10-r3.ebuild:
+  Fix build with linux 4.0.
 
 *rts_pstor-1.10-r3 (14 Aug 2014)
 
diff --git a/sys-block/rts_pstor/Manifest b/sys-block/rts_pstor/Manifest
index 3bb152bb86a3..f87930ca9556 100644
--- a/sys-block/rts_pstor/Manifest
+++ b/sys-block/rts_pstor/Manifest
@@ -4,15 +4,25 @@ 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-r3.ebuild 1058 SHA256 fb41b23fa10601d33689b0b0c3b8b91b2644b29f49bb752f85d784eef039df3b SHA512 2e90fbf8771aa04955dfbf24d6fc8b334deaeb5dbed8b10c4b4fa3ddb75eb43998cabf6cfdfa6be8c9f7ec8d3aa734ae4b6ace6ffac9cf71e0828734e30077e1 WHIRLPOOL ef0a9c727c27714794d76954a3fe97cd1dee65a88d9234a5a23073ef8a001fc38020766987e35806717c32bdd13e3e7b822267e590016cb9db64b125045d3418
-MISC ChangeLog 1161 SHA256 b4e59d922dc900645aba8a5c4cfb8864aa3bc3248f9e86800ad691e49f28f80c SHA512 424a8499ac89f14249470c4c41af90ce34e5ab819f0707160c2471c15b6555eddf91bf045efebef8e07b4990af3791d0dd7f0fc108fc60bb21ff572a10aa2c23 WHIRLPOOL 750ac95f0b8f8fb39b1b4e6812af00f09ab26c31c1c077a21a7e7c0c941807a8dda8ef56c844fdcae9134598e60ceb5f21bf39a5d7b1f0951325f43df16ac4be
+EBUILD rts_pstor-1.10-r4.ebuild 1128 SHA256 d367a5c8b47603bc6974bfd9fabf0bda4f3e5db15fefbed440b5d9a5b1de3675 SHA512 5fca0b00d2a67e57119c304fde10b0f4e035fe21637ae101c6aa6ea320d04ebdbddce996d541f2469915bc72bf55c807f48df74dadb32593938dfd4f5afa0be1 WHIRLPOOL 583273c4e77c55b146e34cd4e5b680b47187f0a672ee921f7c7f3ab9e5c9e58b6330514b4bb5ae4983f63eabf95c0d1925e4e28c8308f98d8f564e08ad89746d
+MISC ChangeLog 1347 SHA256 d26c45f68c2b68532caeafabd0723de8a73351797419a6ea13f5c582ebe8b25a SHA512 4003f7b9c69948831ab0bfdb7c8a01fd4dc1eed8aca704d727f99c662186c7d544ac7efbca3c66b8dcb5cdb2b1e9c45f8243a47f9e4aec774ba0b76ef7bfe3d8 WHIRLPOOL a012d73c1edee49536773abca1f6fbcb797a118505c88bb299335c4e579b4420815dc8925f8aa6ff2b40ff9b24446477b01836d89fd61289cde7ef01354b6ede
 MISC metadata.xml 334 SHA256 0d45e4fc5d6fc2b6612bfe461ee947b96965c2e6443333543df2c0166356dcbc SHA512 38fe96eadfead9361b512a25e017c757aab1bd8a50682a53c24273bebf04c3ee087ba0cb90de107b4add86f681df612f9e1b4c8788a558855af6f6a44733cb9d WHIRLPOOL 7f2262c8515530eb889a6f182afea2f462cbd7023a81783ee1affc349795e3e54249a1519ebb45dea346bfd96dfb37c4bc8c919188ed8faefac52a0da8efe0dc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iL4EAREIAGYFAlPs+6hfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldENFNTJBQkRBNTQzRTQ5NTdCMDQ5ODMwNzQ3
-REQ1NDg0QjBBNzJGRDIACgkQR91UhLCnL9JFAQD7BIIWH4rH+8ARR2F7cfjFmuWC
-WstujTpBq6xncT9eTIABAOUJXmgJlxqwmd4MmR24IRRSk1mdv7wsguEXyZXDzk9x
-=OWE7
+iQJ8BAEBCABmBQJVarRYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4QTA5RTJEMTkyOEREMUE5OUNBMTc5OEJG
+MjUzMEU0QTk2RUQzMzBDAAoJEPJTDkqW7TMM5JQQAJe7MVYrNnhycqc66i+FFVDY
++KwzJFl09LqL/kgFK/i3atacfGj71k2SUhdMailLbNuc/aiRh6xRJtSdpSlNAAAW
+VhLsBgELfEJO9DPeBMOrL0G/OhQ5MVDEWrUY2OenvOmBjOD8UDl+EI17QpHTilT2
+tKhk1KAz/WGJI4sOjl+nocJkAUvUoRBbFDs0lTM3qBXsiBoF+19MIv9RWBTzyBgU
+16ZBBxYzn2mYArBXZA/zKFuWuHBH5oPeqz4asGU5dqqCZNvKtAtCxyxqyqKHUgdk
+41Olp8hLQH51QG+RHSdro4WmTXwiC9zpfmd9U5XbduDk2dppCuygUcNSDdQoDyxf
+ZasQWcttjzxeL3e94860dvQ449BrehziLT+q9tsEgBBnXK9R0mBPiHJ5agGdaXgq
+mmS2c0zrh395l9zIS8Lf+78b8FETXSXVxTfWMQxNni7r5TvvDV5udYKGVq4gnNSl
+YPUQNz3Lt9yFunzCmT8VJFj0sewqX4sgkczXLm71Bcfc97FgIWOpD4kLWtA7uBHZ
+YsUz6SCcY0WSOXTX3V63t7VZ4x9JKDdruktCgyrG6q3RsNNpMjaEdOzkTHGKLc/U
+/E4wr60oSfZTL2Gx3fGlr5ixJfPVYU7e6ikFIAFrSmnjtrYhD410/5ZuSUtYF/tr
+PcHiaKPx6UZI+rgzWFEC
+=hP1/
 -----END PGP SIGNATURE-----
diff --git a/sys-block/rts_pstor/rts_pstor-1.10-r3.ebuild b/sys-block/rts_pstor/rts_pstor-1.10-r3.ebuild
deleted file mode 100644
index eeccf1a2e28d..000000000000
--- a/sys-block/rts_pstor/rts_pstor-1.10-r3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 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-r3.ebuild,v 1.1 2014/08/14 18:10:46 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(misc/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}"
-}
diff --git a/sys-block/rts_pstor/rts_pstor-1.10-r4.ebuild b/sys-block/rts_pstor/rts_pstor-1.10-r4.ebuild
new file mode 100644
index 000000000000..d55c67670589
--- /dev/null
+++ b/sys-block/rts_pstor/rts_pstor-1.10-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 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-r4.ebuild,v 1.1 2015/05/31 07:12:23 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(misc/drivers/scsi)"
+BUILD_TARGETS="default"
+
+src_prepare() {
+	sed -e 's/\/lib\/modules\/\$(shell uname -r)\/build\//\$(KERNELDIR)/g' \
+		-i Makefile || die "Sed failed!"
+	([ ${KV_MAJOR} -gt 3 ] || ([ ${KV_MAJOR} -eq 3 ] && [ ${KV_MINOR} -ge 8 ])) \
+		&& epatch "${FILESDIR}/${PN}-linux-3.8.patch"
+	([ ${KV_MAJOR} -gt 3 ] || ([ ${KV_MAJOR} -eq 3 ] && [ ${KV_MINOR} -ge 10 ])) \
+		&& epatch "${FILESDIR}/${PN}-linux-3.10.patch"
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+	BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
+}
-- 
cgit v1.2.3-65-gdbad