gentoo resync : 24.12.2018

4 files changed, 57 insertions, 3 deletions

diff --git a/sys-block/rts_pstor/Manifest b/sys-block/rts_pstor/Manifest
index 4831bdbe72aa..a585bcabe668 100644
--- a/sys-block/rts_pstor/Manifest
+++ b/sys-block/rts_pstor/Manifest
@@ -1,6 +1,9 @@
 AUX rts_pstor-linux-3.10.patch 1268 BLAKE2B 110165baca81dce2c176cf26852665f666826cdf6d962086d69a59f954e0f800ec555e951cc6829890fa88353f782c04db74b3c9326f2fb6495d26114d38861e SHA512 51eb565d7498e7f8a3805b2142dae013224ee9161bf988a9f34b11fa2dd57499a4bd603e7cff1e9960e92a235f023bc89ff97c28fb8fc586a9598683388183b3
 AUX rts_pstor-linux-3.8.patch 829 BLAKE2B 8cdd7c26c905156cd1cdd8e1a4c2ab5c1a0c82d77cf46cb158f226d3dd7f0f7bcaafaa52b6c70ac500a624beb8fbe2cdfa353c3046ee3f1c5d82ee2e586d50ff SHA512 8ee281925ebbd45d857614a8bcd5d0f92ba8df3e360646d0ffb5288765638e93dde7e92996b55f8c11bcdc2b7e12ae22230a1ea394eb6b2a5c00913570075753
+AUX rts_pstor-makefile.patch 319 BLAKE2B afb25a7184c13b90fd9babf975cfc7710d4e643aad97994ff5d2f4f9bf77fc9928a1a2391890723e10c51107ad0cf4a5919418a9cb0787885d57de5e9cb08b03 SHA512 ae6b3890edef023d9b965d765baf7aefa75b0b44d51296f4997b0bb20a41c6a0d6ee19381a3d9194c23198b59da2a4523a1547363e3c82ba27c3625009f8d8ca
 AUX rts_pstor-vmalloc.patch 1403 BLAKE2B 3421a93ef3af630538aa22dbbbfaaddf5629f6a647a60c48d3fa66584021e8b84da105ac20590ee73335ffdaf130de7700fad84ae0a56f5c218e376f8c24b2bb SHA512 4d6f73129b3df94ff9de5e486811a9a771988b0fd4b1452f703c513921750a99b81a1c4bb66e761a021f5da7614f7dde430ebd8fd0593da08500ebfdbc7fdd8c
 DIST rts_pstor-1.10.tar.bz2 79549 BLAKE2B 6ed1a31c46920f30b16c3cd4bda9978bffe40c2f88fdd2d63ef128d3a4ce22a6850846e4f5f1bf55200ed03a227a61bfcaefec4abdf598a43c8a7d8ca2991280 SHA512 26d29ccda55672adab8b96a8318e240d0c9d50ebf614853284cf218058c5788cc83b818ce118ac313c0ce6a67aef8ad13d93ed26212db7e05db51b8a7860b48d
+DIST rts_pstor-1.10_p20160103.tar.gz 108102 BLAKE2B 9cbca345211f7c99c6d9cf71b0ed207a4c911569eee6c63bfbe15c094be08f64c4550f04d9df688969f43564b2ff6a91d5cc72b8ab281cfdffb6884688b354de SHA512 d802a52b1e2da447a218472e77ca6ecc56e3b3767e3eb8daf634152675171c79c86e3b5ca9654b67cf32f63740c347bf7ecee5a1d20eb1c15a3a2ad3e9774311
 EBUILD rts_pstor-1.10-r5.ebuild 1050 BLAKE2B 812cd16868a170c297e8b76f5e0f58c68665b7108f8cd8c1c2a1892d436583eced16475372c4af521672045ca39629f02ac7c270cd5df68c43f644c07082cc99 SHA512 d625c0e31adfbfb4761f61a21f5075b5d029eb32011e04cb75cad13d84bdb87fa86e1fa2dd426dd82c18d6379b4f4d2928b9e3c9584b5ddce33f409fa5fcb072
-MISC metadata.xml 259 BLAKE2B 42221f4bc166ada2e6e96075feab3a0c487087cf04c695857361e93738e4d58af78b6f4064d5c7850e66d8553c953a165e109ad8c58e6d5e6625cb27892d9682 SHA512 7fa21b6ff9a7425d4f4077173e937a6f3eab5988c23832afbdea432ce25ae5152df356de2190d18202788fc490d2bc642456b42dce029e3c6d7e53d3ea509941
+EBUILD rts_pstor-1.10_p20160103.ebuild 1342 BLAKE2B b649f3ac801ab6fb1711fc13c8660a3ced1aba39d29c362487d9b1dd8b2efea8af04900ce1fdeef44c9a82f44f99e25228cb6a4643ba27396ae35f0877fdf111 SHA512 e6d936d860a7934e20cfc6fc85a3602649d98683d83c4b2fd303dcee084d0ad4e006377d0e1ff279a5a1411c030f72510fd5a6664cb7bf2486a2c26a7c757bf8
+MISC metadata.xml 433 BLAKE2B 68ad81664e636facb6f248effc7c3ef58ea0c3cc86cc306b0862113665a296bcffe4df996861367eb98e26589c6124282a75d193fe1b84e90cbce12819b9279f SHA512 ef139e88440c4ad838b50a762373588a832dd4230596034399cb1b2fbb246a1fe957c8af86d98d80918fa747f2a0abad960af8a5144acbcd808dc956a833515b
diff --git a/sys-block/rts_pstor/files/rts_pstor-makefile.patch b/sys-block/rts_pstor/files/rts_pstor-makefile.patch
new file mode 100644
index 000000000000..dc12cd68f52b
--- /dev/null
+++ b/sys-block/rts_pstor/files/rts_pstor-makefile.patch
@@ -0,0 +1,8 @@
+diff -N -a -u1 a/Makefile b/Makefile
+--- a/Makefile	2016-01-03 14:41:40.000000000 +0100
++++ b/Makefile	2018-12-11 23:47:44.942218496 +0100
+@@ -36,3 +36,3 @@
+ 	cp -f ./define.release ./define.h
+-	make -C /lib/modules/$(shell uname -r)/build/ SUBDIRS=$(PWD) modules
++	+make -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+ debug:
diff --git a/sys-block/rts_pstor/metadata.xml b/sys-block/rts_pstor/metadata.xml
index 854729740725..ab7993355b87 100644
--- a/sys-block/rts_pstor/metadata.xml
+++ b/sys-block/rts_pstor/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>martin.dummer@gmx.net</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
-		PCIE RTS5209 card reader driver for Linux.
+		PCI-E RTS5209 card reader driver for Linux.
 	</longdescription>
 </pkgmetadata>
diff --git a/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild b/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild
new file mode 100644
index 000000000000..73c7c69315d7
--- /dev/null
+++ b/sys-block/rts_pstor/rts_pstor-1.10_p20160103.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+GIT_COMMIT="c8313abffe083ac63bf76d2cc90d3edf5b2d1188"
+
+DESCRIPTION="PCI-E RTS5209 card reader driver for Linux"
+HOMEPAGE="https://github.com/gexplorer/RTS5209-linux-driver"
+SRC_URI="https://github.com/gexplorer/RTS5209-linux-driver/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="virtual/linux-sources"
+PATCHES=(
+	"${FILESDIR}/rts_pstor-makefile.patch"
+)
+S="${WORKDIR}/RTS5209-linux-driver-${GIT_COMMIT}"
+
+MODULE_NAMES="rts_pstor(misc/drivers/scsi)"
+MODULESD_RTS_PSTOR_ADDITIONS=(
+	"# when rts_pstor is installed, blacklist in-kernel driver rtsx_pci"
+	"blacklist rtsx_pci"
+)
+BUILD_TARGETS="default"
+BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
+CONFIG_CHECK="~!MISC_RTSX_PCI"
+ERROR_MISC_RTSX_PCI="CONFIG_MISC_RTSX_PCI: The in-kernel driver rtsx_pci is configured, which may have the same functionality than this driver. To make sure that your kernel loads only rts_pstor, the rtsx_pci module will be blacklisted."
+
+pkg_postinst() {
+	elog "This driver is based on code published by Realtek. There is a driver in the kernel named rtsx_pci which"
+	elog "should be preferred over this driver - but on some hardware only this driver is functional and rtsx_pci is not."
+}