gentoo resync : 15.01.2020

4 files changed, 94 insertions, 160 deletions

diff --git a/media-plugins/vdr-dvbapi/Manifest b/media-plugins/vdr-dvbapi/Manifest
index 24c5d614e71e..7f3e7f87f026 100644
--- a/media-plugins/vdr-dvbapi/Manifest
+++ b/media-plugins/vdr-dvbapi/Manifest
@@ -1,8 +1,6 @@
 AUX kernel-4.14-fix.diff 398 BLAKE2B b431d027c62f709ed4cd7ed663c10fb42a91390fe5b3bdcc4600f1e8593b2c5031912981aec0333ec2c87c3c924aa624e7ffef7ca216d340f04ea5ee13581e16 SHA512 c8f2662cb82dcd1686d3809b75ad0f3dfe67fe6e781dacb3a907d65b68061e993d7fba075319a3ad97b56454bdc12e713030181a1a43b692052de2383bcf3c77
-DIST vdr-dvbapi-2.1.1.tar.gz 82813 BLAKE2B 2dd2b4aa11a645b4168ebbae962371f94a6e70ff905b06230048a69921f31521468506f2959ce5d5327b4cf61edc620686210520239e751e142e524751640e0d SHA512 fb632e66c9e477663eb1edf5e630a20b2165495c89d5bd6294d74d6a28c8386021d90914c9c6b958ea3c5c1d0958cc69efa5c65ef72c510c224d676f1eca39ae
-DIST vdr-dvbapi-2.2.2.tar.gz 83995 BLAKE2B 6ddd9cc4e3edbd504505b7bbb9c40e203d53faab43b3d1afe9b9834cf3d751ba469536b5f27c24cfb04afeba1378ee3ac8dc0885db8a4576ce7a275233c88ca6 SHA512 01d3a6368e0233a7b96b6ea57b28884a004a130d63da2b2958b1616a1108e83389b68cbe32ec7fc6be65d6741912c4f46621b659fb13dba56e594a1a18af2c63
 DIST vdr-plugin-dvbapi-2.2.4.tar.gz 94419 BLAKE2B 326346b418ece22674aa0d84efd798a9eb8e958586d24385b4e468c11478f63ed89e94c742c57c5b1e955dc598db29a39e3730d71c93005aa6dcda262545e4e2 SHA512 d1313e927978fcf150ae14e570c16059caeeec07992066b03282295147872da3bdb191209408539c2a70c2ada868f731e9e5504a8dd737143f86e33a85fdf0c7
-EBUILD vdr-dvbapi-2.1.1.ebuild 2530 BLAKE2B c89a4b7a4c2c87fcf92b0e110bc6af3e9b4419a198d3f93b57aa269d3c85908e96a2f199126d49a0d1047096a071304bb158964771fdda275192eb2bffc4ee5e SHA512 7016fab9b4d196415afb2b3fe3351e968a85e7a1a45c0b32616933e21938f56567b8254cc8eda89c25e551c55ff4b8f3b6b6dbef034753b3cb8b7e7303699c44
-EBUILD vdr-dvbapi-2.2.2.ebuild 2574 BLAKE2B 9e31c575bbf54c7c2372e7f94a449e903cad6d444e49332339b627e1587e61f7bf8e6a7c70a6c5b7d9540246b584d8d9b53480af512b4a301aa177ad7de35d5b SHA512 f709f31b511f7ab778b311b6cffd43d79c80897d830fbbab3dfde52ef6bc54800b3245a4bc3e17d10b1ded000ef45ea3ce9c8f7f08600d4c11972de6dce60e39
+DIST vdr-plugin-dvbapi-2.2.5.tar.gz 95270 BLAKE2B dbab07bc7df8fdc7ec009b82723631a5e61cb1d4a9afdad16e32282a3e71d6bc87e7c78ec8cea73690606bda504c19bdd9123d1ca7a4e712b15ca884c77dabaa SHA512 7036705ddf706192774f511cab813c64d092a1db1c635003e28d6960d3d46ef484f44b86c15fae782d29ada728eae1861d009d91cb71ad77cb0a1b2ad316069b
 EBUILD vdr-dvbapi-2.2.4.ebuild 2949 BLAKE2B 395a2c3121e979d66c8a3660ac6d48eaf06dc4de971eb3a9a36633d0fca99c710d6c036303eb12b8103ffae7772ee6392e5bca87d32e285d4f16ddaea33f9bd1 SHA512 97ea158101db128c72f5a338cf3c9d2ec5d36322754c8d4672bb8abcfbcf8d2e0222f28f4d54ddffa05c5afcbc9f9f09f8d1cf4c4796728a784777f239327975
+EBUILD vdr-dvbapi-2.2.5.ebuild 3053 BLAKE2B b4a535ce3d5ac0af98538afc8ae33fea8dd23a3dfccce012aab947f78a208483c9753ed2f550be713ce1e641ea221ab1b7697cfab51277c7f02d6abebb345a30 SHA512 789f03b8e09aec037216a8557a4604619d432df312054b16853e4cbc274242523e785199b854cde78a1b8c9851767df2b4277ee3c8b1eb85a97f1b1c27d109ee
 MISC metadata.xml 594 BLAKE2B 2a02df5ff3859e36c760f72ba49f97b3d827677e0c789c88ced7cb4e3ae91ad0501060d20db3e4cc33d2226a5c986203f03ae25ed29a4a831e7c218b54b2235d SHA512 0e0578c9e7fd629759210d01c1442c17ad107f681d53c1be7b067a961335dfd74a0d681af56d85dfbbbf948aa7c687e15325929350cb9d475ca6a1424ccbb46a
diff --git a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.1.1.ebuild b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.1.1.ebuild
deleted file mode 100644
index 78e776034747..000000000000
--- a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.1.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: allows connect VDR to OScam"
-HOMEPAGE="https://github.com/manio/vdr-plugin-dvbapi"
-SRC_URI="https://github.com/manio/vdr-plugin-dvbapi/archive/v${PV}.tar.gz -> vdr-dvbapi-${PV}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2"
-
-DEPEND=">=media-video/vdr-2.1.4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/vdr-plugin-dvbapi-${PV}"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	# respect the system CXXFLAGS
-	sed -e "s:FLAGS:CXXFLAGS:" -i FFdecsa/Makefile
-
-	# Prepare flags for FFdeCSA
-	if [ -n "${VDR_DVBAPI_PARALLEL}" ]; then
-		PARALLEL="${VDR_DVBAPI_PARALLEL}"
-	else
-		# [32/64] Core2 (SSSE3) achieves best results with SSE2 & SSE
-		# [64] Athlon64 (SSE2) does much better with 64_LONG
-		# [32] Athlon64 (SSE2) does best with MMX
-		# [32] Pentium4 & Atom (SSE2) work best with SSE2 & SSE
-		# [32] AthlonXP (SSE) has MMX faster
-
-		# To avoid parsing -march=, we use ugly assumption that Intels don't
-		# have 3dnow and AMDs do. SSE achieves good results only on Intel CPUs,
-		# and LONG is best on 64-bit AMD CPUs.
-
-		if ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse2; then
-			PARALLEL=PARALLEL_128_SSE2
-		elif ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse; then
-			PARALLEL=PARALLEL_128_SSE
-		elif use amd64; then
-			PARALLEL=PARALLEL_64_LONG
-		elif use cpu_flags_x86_mmx; then
-			PARALLEL=PARALLEL_64_MMX
-		else
-		# fallback values:
-		# PARALLEL_32_INT fails with gcc4.4 on x86&amd64
-		# PARALLEL_64_2INT fails with gcc4.4 on x86
-		# PARALLEL_128_4INT seems to be the fastest non-failing fallback
-			PARALLEL=PARALLEL_128_4INT
-		fi
-
-		ewarn "VDR_DVBAPI_PARALLEL in your system make.conf is not set, guessing value from USEflags (${PARALLEL})."
-		ewarn "This setting may be suboptimal, so you'll probably want to tweak it yourself."
-		ewarn "\n\tRun the script ${WORKDIR}/extra/FFdecsa-benchmark.sh"
-		ewarn "\tand add the output parameter from  PARALLEL= to your system make.conf"
-		ewarn "\tVDR_DVBAPI_PARALLEL= your parameter"
-	fi
-
-	export PARALLEL
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	elog "This software might be illegal in some countries or violate"
-	elog "rules of your DVB provider"
-	elog "Please respect these rules.\n"
-
-	elog "We do not offer support of any kind"
-	elog "Asking for keys or for installation help will be ignored by gentoo developers!\n"
-}
diff --git a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.2.ebuild b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.2.ebuild
deleted file mode 100644
index 58a6b05bf7c3..000000000000
--- a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: allows connect VDR to OScam"
-HOMEPAGE="https://github.com/manio/vdr-plugin-dvbapi"
-SRC_URI="https://github.com/manio/vdr-plugin-dvbapi/archive/v${PV}.tar.gz -> vdr-dvbapi-${PV}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2"
-
-DEPEND=">=media-video/vdr-2.1.4"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/vdr-plugin-dvbapi-${PV}"
-
-DOCS="HISTORY INSTALL README FFdecsa/docs"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	# respect the system CXXFLAGS
-	sed -e "s:FLAGS:CXXFLAGS:" -i FFdecsa/Makefile
-
-	# Prepare flags for FFdeCSA
-	if [ -n "${VDR_DVBAPI_PARALLEL}" ]; then
-		PARALLEL="${VDR_DVBAPI_PARALLEL}"
-	else
-		# [32/64] Core2 (SSSE3) achieves best results with SSE2 & SSE
-		# [64] Athlon64 (SSE2) does much better with 64_LONG
-		# [32] Athlon64 (SSE2) does best with MMX
-		# [32] Pentium4 & Atom (SSE2) work best with SSE2 & SSE
-		# [32] AthlonXP (SSE) has MMX faster
-
-		# To avoid parsing -march=, we use ugly assumption that Intels don't
-		# have 3dnow and AMDs do. SSE achieves good results only on Intel CPUs,
-		# and LONG is best on 64-bit AMD CPUs.
-
-		if ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse2; then
-			PARALLEL=PARALLEL_128_SSE2
-		elif ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse; then
-			PARALLEL=PARALLEL_128_SSE
-		elif use amd64; then
-			PARALLEL=PARALLEL_64_LONG
-		elif use cpu_flags_x86_mmx; then
-			PARALLEL=PARALLEL_64_MMX
-		else
-		# fallback values:
-		# PARALLEL_32_INT fails with gcc4.4 on x86&amd64
-		# PARALLEL_64_2INT fails with gcc4.4 on x86
-		# PARALLEL_128_4INT seems to be the fastest non-failing fallback
-			PARALLEL=PARALLEL_128_4INT
-		fi
-
-		ewarn "VDR_DVBAPI_PARALLEL in your system make.conf is not set, guessing value from USEflags (${PARALLEL})."
-		ewarn "This setting may be suboptimal, so you'll probably want to tweak it yourself."
-		ewarn "\n\tRun the script ${WORKDIR}/extra/FFdecsa-benchmark.sh"
-		ewarn "\tand add the output parameter from  PARALLEL= to your system make.conf"
-		ewarn "\tVDR_DVBAPI_PARALLEL= your parameter"
-	fi
-
-	export PARALLEL
-}
-
-pkg_postinst() {
-	vdr-plugin-2_pkg_postinst
-
-	elog "This software might be illegal in some countries or violate"
-	elog "rules of your DVB provider"
-	elog "Please respect these rules.\n"
-
-	elog "We do not offer support of any kind"
-	elog "Asking for keys or for installation help will be ignored by gentoo developers!\n"
-}
diff --git a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.5.ebuild b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.5.ebuild
new file mode 100644
index 000000000000..226f7268108c
--- /dev/null
+++ b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+MY_P="vdr-plugin-dvbapi-${PV}"
+
+DESCRIPTION="VDR Plugin: allows connect VDR to OScam"
+HOMEPAGE="https://github.com/manio/vdr-plugin-dvbapi"
+SRC_URI="https://github.com/manio/vdr-plugin-dvbapi/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dvbcsa"
+
+DEPEND=">=media-video/vdr-2.4.1
+	dvbcsa? ( media-libs/libdvbcsa )"
+RDEPEND="${DEPEND}"
+
+DOCS=( "FAQ" "HISTORY" "INSTALL" "README" "FFdecsa/docs" )
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-dvbapi.*
+	usr/lib64/vdr/plugins/libvdr-dvbapi.*"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# respect the system CXXFLAGS
+	sed -e "s:FLAGS:CXXFLAGS:" -i FFdecsa/Makefile || die "modifying FFdecsa/Makefile"
+
+	if use dvbcsa; then
+		sed -e "s:PLUGIN = dvbapi:PLUGIN = dvbapi\nLIBDVBCSA = 1:" -i Makefile || die "modifying Makefile"
+	else
+		# Prepare flags for FFdeCSA
+		if [[ -n "${VDR_DVBAPI_PARALLEL}" ]]; then
+			PARALLEL="${VDR_DVBAPI_PARALLEL}"
+		else
+			# [32/64] Core2 (SSSE3) achieves best results with SSE2 & SSE
+			# [64] Athlon64 (SSE2) does much better with 64_LONG
+			# [32] Athlon64 (SSE2) does best with MMX
+			# [32] Pentium4 & Atom (SSE2) work best with SSE2 & SSE
+			# [32] AthlonXP (SSE) has MMX faster
+
+			# To avoid parsing -march=, we use ugly assumption that Intels don't
+			# have 3dnow and AMDs do. SSE achieves good results only on Intel CPUs,
+			# and LONG is best on 64-bit AMD CPUs.
+
+			if ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse2; then
+				PARALLEL=PARALLEL_128_SSE2
+			elif ! use cpu_flags_x86_3dnow && use cpu_flags_x86_sse; then
+				PARALLEL=PARALLEL_128_SSE
+			elif use amd64; then
+				PARALLEL=PARALLEL_64_LONG
+			elif use cpu_flags_x86_mmx; then
+				PARALLEL=PARALLEL_64_MMX
+			else
+				# fallback values:
+				# PARALLEL_32_INT fails with gcc4.4 on x86&amd64
+				# PARALLEL_64_2INT fails with gcc4.4 on x86
+				# PARALLEL_128_4INT seems to be the fastest non-failing fallback
+				PARALLEL=PARALLEL_128_4INT
+			fi
+
+			ewarn "VDR_DVBAPI_PARALLEL in your system make.conf is not set, guessing"
+			ewarn "value from CPU_FLAGS_X86 USEflags, result: ${PARALLEL}"
+			ewarn "This setting may be suboptimal, so you'll probably want to tweak"
+			ewarn "it yourself."
+			ewarn
+			ewarn "To do this, unpack the source and run the script in"
+			ewarn "\t<unpackdir>/${MY_P}/extra/FFdecsa-benchmark.sh"
+			ewarn "and add the output value from  PARALLEL_MODE= to your system make.conf as"
+			ewarn "\tVDR_DVBAPI_PARALLEL=<your parameter>"
+			ewarn
+		fi
+		export PARALLEL
+	fi
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	elog "This software might be illegal in some countries or violate"
+	elog "rules of your DVB provideri. Please respect these rules."
+	elog
+	elog "We do not offer support of any kind."
+	elog "Asking for keys or for installation help will be ignored by gentoo developers!"
+	elog
+}