gentoo resync : 15.12.2019

3 files changed, 12 insertions, 71 deletions

diff --git a/media-tv/v4l-dvb-saa716x/Manifest b/media-tv/v4l-dvb-saa716x/Manifest
index a1656ec02085..b5ccbe2a54f9 100644
--- a/media-tv/v4l-dvb-saa716x/Manifest
+++ b/media-tv/v4l-dvb-saa716x/Manifest
@@ -12,7 +12,6 @@ AUX v4l-dvb-saa716x-4.6.0-fix-compile.patch 692 BLAKE2B f3dd9279abafc087f38233f8
 AUX v4l-dvb-saa716x-4.9-fix-warnings.patch 6368 BLAKE2B 178bb6bf0c391ce3c2a9e2a69c2b1938ebb6137891eab2d18e3bda42547efbfdea98677a4175bb610b21a45c4b3d543166791b517b8d116ea1361b645d612170 SHA512 e697a87b14727d8877ecc78622050bb9d8e5b0d964796c5c3275a8d72359712ec85a578e2189a102b23eedcdb17381533de9641a22103982ad5b0c9702e77901
 AUX v4l-dvb-saa716x-Makefilepatch-2.diff 562 BLAKE2B 77adb5d5c67e14dddfce8462a98d565bc092b4e2f4dc48016602dfe0f1fa98d87e2c1317c0c3db1d1d1de8b91076e84cdd50d5b86350c060400fc2dd7ae9e5c1 SHA512 e0ff1c5a79f7b02323eff281bf6dc6ebb7a8fe7a43eb83ebd4a7379468924d3992790899bfabbbf2ee411cda6366ad6a677d8ad004a306e14b55d891f6f69dc0
 DIST v4l-dvb-saa716x-0.0.1_p20160322.tar.gz 5028181 BLAKE2B 6d0917e7c72a7c77ff376b1bb1e55a36421568cc7b9221f4724c9e24a9bb6334c201d99f48c92965365ada2cd085b22ca9758e55ca621deb5eb65de3ef3e9a38 SHA512 94a41467688a0363586c654102e35366071218432042bc324d041298ad4812139201f8df17eadb37ebb9baf2b097447fc0859270bcc4e8e0c73b17e0b8045343
-EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild 2360 BLAKE2B c125d676eebbebc4023c926adf261a5b065f228a3f306b785145df8f0d24feec6927f5b35380ebee114f30ada010d99f07c1a5d33db958b648a80ae8e5543bd8 SHA512 31ee224bae08d6305c8f540b6bf87cda3680f26dbb05446436ede1753cb0acc53cd0448f1784ae889ba0c126f9e2994010b434a1ae7778bdc3098fbffe7ce285
-EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild 2446 BLAKE2B e25bbb28e6ae8e7968e237e2cdd63fb6741986e1283e9f603d711d7b83ae31c51b65b1c623236090d4432aa312ebb381d77ca7020076cffe660363a583569c5d SHA512 ac919de8e2c04ca11b9b91535c5b43beaf084cccb69910dfa84dacd4ef4a04e8d25efb536d5f154a3d73d3575e2135c892d7721faf4e678f10423c2b88cfeffe
+EBUILD v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild 2491 BLAKE2B bf732e3c2a4282c4f5bfe2c4641a6605bf741acb64c837ad886bb0cd6f7655813e139643b27ebc74ef791a87e3b8d7e78a148170b899ce1f7ccd4fefabfd5997 SHA512 db832331826b7426cd0f2ce251ea48bebd87ef5b271a99ca708b3db8f5d71ae440f212a7091f698f9994df666d0a950346c449047b788509bb1558132be58b89
 EBUILD v4l-dvb-saa716x-0.0.1_p20170225.ebuild 2017 BLAKE2B 77b4e83a6e100fc1a07c447682defdf0e8860594e5ae344a450ef878f787a12ab3262b8e3dd96aeccc888f4c4f7ac52999c84dc1d23636202b94ec2faeacb88e SHA512 5dd9acd0e0300de379ef7f8ed21a9e5b81ae2f8f2dcd93d909aea6385ec868a26eed82fd7ee648b655e3d947ba62b302eb5e8639ad1512c281921c9e1a1aa9c8
 MISC metadata.xml 522 BLAKE2B 4fac71b04452341c84053cf601897155086cbe2d50bd0f04287ecae47ab06fb6b613197296ded88ebc8ac50230caa9d343449172eb73847d5ea763141bb6e3ba SHA512 651ce09fe8afac13810b4733051ccd326e8a468fae099c2a600fab0afac1071b2bba26837122fad5db235ddad25c80d56825d11b47e03eac8b0ca30dab1b3a61
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild
deleted file mode 100644
index d44065e9ba23..000000000000
--- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info linux-mod
-
-DESCRIPTION="driver for saa716x based dvb cards like TT S2-6400 or Skystar 2 eXpress HD"
-HOMEPAGE="https://bitbucket.org/powARman/v4l-dvb-saa716x/overview"
-
-HG_REVISION="3b9fce66666a"
-HG_REVISION_DATE="20160322"
-
-SRC_URI="https://bitbucket.org/powARman/v4l-dvb-saa716x/get/${HG_REVISION}.tar.gz
--> v4l-dvb-saa716x-0.0.1_p${HG_REVISION_DATE}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="+firmware"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	firmware? ( sys-firmware/tt-s2-6400-firmware )"
-
-S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
-
-BUILD_TARGETS="modules"
-MODULE_NAMES="saa716x_ff(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_core(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_budget(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_hybrid(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
-
-CONFIG_CHECK="~DVB_CORE ~DVB_STV6110x ~DVB_STV090x"
-
-src_prepare() {
-	default
-
-	eapply -p0 "${FILESDIR}/OSD_RAW_CMD_patch_2.diff"
-	eapply "${FILESDIR}/v4l-dvb-saa716x-Makefilepatch-2.diff"
-	kernel_is ge 3 19 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-3.19-set_gpio.patch"
-	kernel_is ge 4 2 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.2-fix-compile.patch"
-	kernel_is ge 4 5 2 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.5.2-fix-compile.patch"
-	kernel_is ge 4 6 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.6.0-fix-compile.patch"
-	kernel_is ge 4 9 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.9-fix-warnings.patch"
-	kernel_is ge 4 10 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.10-fix-compile.patch"
-	kernel_is ge 4 14 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.14.0-fix-compile.patch"
-	kernel_is ge 4 15 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.15-fix-autorepeat.patch"
-	kernel_is ge 4 15 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.15-fix-timers.patch"
-	kernel_is ge 4 16 0 && eapply "${FILESDIR}/v4l-dvb-saa716x-4.16-fix-compile.patch"
-}
-
-src_compile() {
-	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
-	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
-	CONFIG_DVB_SAA716X_HYBRID=m"
-	addpredict "${EROOT%/}"/usr/src/linux/
-	linux-mod_src_compile
-}
diff --git a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild
index 66babc6091c0..4688975810c6 100644
--- a/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild
+++ b/media-tv/v4l-dvb-saa716x/v4l-dvb-saa716x-0.0.1_p20170225-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,12 +26,13 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}/powARman-v4l-dvb-saa716x-${HG_REVISION}"
 
 BUILD_TARGETS="modules"
-MODULE_NAMES="saa716x_ff(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_core(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_budget(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
-	saa716x_hybrid(misc:${EROOT%/}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
+MODULE_NAMES="
+	saa716x_ff(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_core(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_budget(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)
+	saa716x_hybrid(misc:${EROOT}/usr/src/linux:${S}/linux/drivers/media/common/saa716x)"
 
-CONFIG_CHECK="~DVB_CORE ~DVB_STV6110x ~DVB_STV090x"
+CONFIG_CHECK="DVB_CORE DVB_STV6110x DVB_STV090x"
 
 src_prepare() {
 	default
@@ -52,9 +53,9 @@ src_prepare() {
 }
 
 src_compile() {
-	BUILD_PARAMS="SUBDIRS=${S}/linux/drivers/media/common/saa716x \
-	CONFIG_SAA716X_CORE=m CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m \
-	CONFIG_DVB_SAA716X_HYBRID=m"
-	addpredict "${EROOT%/}"/usr/src/linux/
+	kernel_is le 5 0 && BUILD_PARAMS="SUBDIRS" || BUILD_PARAMS="M"
+	BUILD_PARAMS+="=${S}/linux/drivers/media/common/saa716x CONFIG_SAA716X_CORE=m \
+		CONFIG_DVB_SAA716X_FF=m CONFIG_DVB_SAA716X_BUDGET=m CONFIG_DVB_SAA716X_HYBRID=m"
+	addpredict "${EROOT}"/usr/src/linux/
 	linux-mod_src_compile
 }