media-plugins/vdr-dvbapi: bump; libdvbcsa support; clean up

Package-Manager: portage-2.3.0
Manifest-Sign-Key: 0x93EB5F4DAA5832A1

5 files changed, 31 insertions, 179 deletions

diff --git a/media-plugins/vdr-dvbapi/Manifest b/media-plugins/vdr-dvbapi/Manifest
index 04a49a8..7e156f7 100644
--- a/media-plugins/vdr-dvbapi/Manifest
+++ b/media-plugins/vdr-dvbapi/Manifest
@@ -1,31 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST vdr-dvbapi-2.1.1.tar.gz 82813 SHA256 2724768de00a607d7119478296a3ad1cc592c12badbc95480edc5f7e6b3985d7 SHA512 fb632e66c9e477663eb1edf5e630a20b2165495c89d5bd6294d74d6a28c8386021d90914c9c6b958ea3c5c1d0958cc69efa5c65ef72c510c224d676f1eca39ae WHIRLPOOL af18c22bb00ddbb41aa8e3ee091f27a1bb7b79f0d90783af9c9503ad03a568193c88cc41db86e0e06fd8c503ad43242a582b0decc5f64c417283517f05d14727
-DIST vdr-dvbapi-2.2.0.tar.gz 84154 SHA256 fae293c7c0a862d8d2988bc575dac8fa618a0818a68f8b38c0c9949aebcad66a SHA512 ae8f85a580343ba0329bc9414dce70e0404f43598470f26fbe0f159fdb6690692acb5db3057ff96bbf506ee59cd125641601f0e7cf38ecd13f6833beba9f7b46 WHIRLPOOL 43a379e014e773c778afcc9bf2638382ecf7aa1793b08bb9a7df7d06b6b736971e009428a1d01a5e3475ecc6c7f1840bda014914b722224311b04f503a015c8d
-DIST vdr-dvbapi-2.2.2.tar.gz 83995 SHA256 86c00b7235952a6b49321efd6c931f0c97885475c9bdc81b0b35236fc7ec7f20 SHA512 01d3a6368e0233a7b96b6ea57b28884a004a130d63da2b2958b1616a1108e83389b68cbe32ec7fc6be65d6741912c4f46621b659fb13dba56e594a1a18af2c63 WHIRLPOOL 107c157c915876b17e437996957205559f2aaee144de732b366566f6817b456da992dfb9d061f9011bd06bb279ab346d394fb751fe87c7ceebddfffe23615a45
-EBUILD vdr-dvbapi-2.1.1.ebuild 2543 SHA256 1f8e16309e7cacf05c055402d5cad4883938e733a98db9fb15a34705e907ad7d SHA512 59a3fda45d4d7dd3a312819af0118e287042c5aa172862f1b3b8d2224c738342b55638aa9efc3a0172a21f44fa166c1de1398e174d49225641c1bc54516edb61 WHIRLPOOL bbfb3a7fa94af327c8dcf55377366f0b7468c4bc851e1af9a212a205699b8fa0e0bddf3c10f88625e7ab37da89a7ec3403097bf43b01661a2573dbd01bf6d1c1
-EBUILD vdr-dvbapi-2.2.0.ebuild 2543 SHA256 21bf2d05ae968f5c27f35dad976c0dccfbb7c92c693795f9c1473bde1c49deb6 SHA512 7ce05520936d050ad64b27e474305d65be8fd520ac48f494b3bbade89944e63ca556da8edab0b4ecc6a7e25abda1029ecfe620ea12f9001da79c789d45df9590 WHIRLPOOL c16da67245d9df8b87011dc1fcbc7e16e7ad2775385040133b860ce72a63a41ab51fa0374e2aca72675ec0857b77b52a74a0cc50ef51c0208f0ad6c894ef56e0
-EBUILD vdr-dvbapi-2.2.2.ebuild 2537 SHA256 c1f75e9e0f9c4889549e03309947b7f58778a1131be3a9afe38b20d24ee03662 SHA512 7241fab901379f8a00215b35357c18ea31fce3dd264b01539edd0dfdcd09aaed6a4997741438e488ac993a0d45a361aa98d08493b958723fcec4922a073b5aba WHIRLPOOL 40b3866fc6a0a017fa3c2b55215e1e09a793eac66faf7d0b73172adf2aacd6b94d88a2e851ab58e4212cf291d29c3ff0b43f4f7611499789f3da6a609ac06286
+DIST vdr-dvbapi-2.2.3.tar.gz 94415 SHA256 71029e1be5bfd07a1a79ef6faf8414f1b1f02f76b69b879319733b37cf584a41 SHA512 03950fcab7cb714990dd2611b6523d35be1c2e111b9a6bd9b9ffee8cdd56074cd5a56f771fc596d6f9e1780d9585eb69e73cd4c5994f7dc82abc1f20adea92a3 WHIRLPOOL 99dc48183121fb81a0848e190c7a09684abbfb8ed9556eecb4e8465831022eee10e633359d2ab922fdb020d9f693bc4c4a9b4cc6b51f8d888498bdfa294950f5
+EBUILD vdr-dvbapi-2.2.3.ebuild 2720 SHA256 2db26204c0a33c541585465a5c009ece6373d07c89055b7a13ba6dca96cff176 SHA512 7db95a2a414d67543d006c45cd8eb2c1862f29fb1a0a743b7d8f45514b07b83c9a1752c397df80644dbb411f5eafdc4c3697eb25bfefb5ad1090b66efb65708c WHIRLPOOL 390b051ed8f45d194a6671c500baa3706c07417825d5e869a7001a025aacb915df0d869b6123c869d09be0d19972842764d6b0112dbdd5ec18b8e492b3765b38
 MISC ChangeLog 502 SHA256 aaa39cf2a5077b6a794475c3a28367bc2fb1ca97b244c241a9f6ed1fdb111c39 SHA512 0c8f6c0e2a3a84a0e0d6eec76e7b4f99f2f379917820622c05995feb9a5c2b4c0e7fc550aed52e8336362b5adbc8077bd8744a5a65853f4afbcc6d9a174059d7 WHIRLPOOL 2d0f6ae0ba593165d8113a61aa559cfeac9293b194f1749bf66538f46e73b72e08b5b646b7b52d9f480d112ed91a5f7a41b0c10d77b18c70089ec879c9044c52
-MISC metadata.xml 253 SHA256 733b5f5a72e8593838a9ef87f787a5d28ee5ffd1c58bc39f92ab8ebc079d8dc5 SHA512 5c82c2e225e6f5fcd670074178b523f1390c7145a3247b7a5680e58bbcaaa1a41b6c5ea8f55a49e4b2e6befe5ef69b17db8046c00757ab4b6d3f7342e64994bb WHIRLPOOL 474ee0fd8bfe7ea5da24f36c10f682ca07ad7cf4f39921a473c28cc6d7a73b7ea7afd6efe8f6d3db6a1dd8a283daaa23c64ff1baff873e2098811d6a31e2a276
+MISC metadata.xml 364 SHA256 bdbbf997bbc9fa435573fa243e17a1751e37389777366d03d9aae634127ab94d SHA512 c907e3ca927ae83e85af8d4f864f1197a3e338a178cbf636a31affec674d0353af0ab227788daa465e234d82978608f84ca28b933bb5bd033468f1fb06b2744c WHIRLPOOL 5fc1af2daf820e60bba8e9935cb3e9b95bf2f7e515a8c33fccc1632cfdff9a131b132f530d75048c1f38216da848d4d2e2e01daa54eb49698a20caef44d5d2d9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 Comment: Signed-off-by: Jörg Bornkessel <hd_brummy@gentoo.org>
 
-iQJ8BAEBCABmBQJXLl17XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJXucoUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwRTBBQTFFRTFERjQ0MUQ3QTNGNTIxQzI5
-M0VCNUY0REFBNTgzMkExAAoJEJPrX02qWDKhIhEP/1rf/3x3p6rVSlEU9yJsJ64E
-wyiR9kqE+gt1i6EuOIL4aJgE6zpDfOG6VGTcfXNeOkc5Z78DD2duvF0NHcH3d63G
-XbIZWx3+vgaAQ0cfSwhnePgu4qpjgyDa2gGP5Su+XgIcyLj2UFV5+YvdSD8Ulk4n
-Cl0Ve3y075IVtOv1Q3NyWjk+dEvQ1k91EW5L20UOq43gAuFrensoTlT/rPj32uWT
-MRuph1cSB0SsnJsRn6O0mQBbkZQfRXPSf3pzrmsVHqC5C2hWi5jqRdo0vHTmX02C
-zeO6oZXHDwilafaaUad8lu1bga07SVOfD525jlq55Z88Bk0MfJcLDCYPUGlwupby
-Y61Ubqm3xC2AtT1ANYdvcIypphQmrkb6jxYpRyDYzJIJuFaMua0ohDInnl1OP4Qw
-1h1jszkHCTzic3OLB/C9/w7eM5M4IHzgxJ5QLvnXZ4slPnVU0hLTMMfsFaeUnnkW
-Ox+LAhWCKZ8bHveflRIZI14QD9uEYQiFhkYbk6N0+ew7CsQN7f374rkq3x8dE6oa
-hq+yhT4doJo5xXjRbjzqLpPitiYUDm/1L3ifSb/zaG/FuK2+byMa6oh7hQSmQH23
-KyvxA+Tcb66HTQEIkg/j2PKUc8q7pGkhYtdtgr2L+QIgjVOiWBrKeeBh++2aJi5w
-yUvKTD679+8ZWgbbDRqX
-=06G/
+M0VCNUY0REFBNTgzMkExAAoJEJPrX02qWDKhCLQP/1537AHqWWHCzkP9JlPgFvz3
+/WEGV3Cx6KXSvs8VgJ2WKMnOjZvma20hOCFigYV4Qp4T5MLTxnESDI7C5zOo46Mj
+hciw/3xTIzmc6/kEt+fzYpJbM7uBpGaI42ZWNbjJQnc4wvNmu19ykKQ56W0e2dvx
+D8D1MG3I0yZeDT2hFQshprBOZTrkzjmCW0TzujI+qSAGOd2FiKG7KViPx9UsbOP/
+lxfJp0UrjJyrWCS0TjxnnOo/ssYtyo40co3JGoM7LsO5PmyYorNIF1+R3Y3m0t3f
+lhcCAP8zH7I3PBG6fuszRa2mU7ECb+fE3vS8xQSEXl2vw+kJL9ZWBfzQOKtPrpTV
+fw9MGD7eQ+QLUHV739AxKlk2QC/rc/77SAl00O9b1vhwNQrJJ9lkbAePdyf8UKOi
+rDIuKAWS/KK+mxlIW0rCpmMmEgFNA1pXOqcM/uhpDVIklOd8NZ+YqvrpYggAy5zE
+DOLHUcZDJTBaXjfTLS6m9M1vs8RkLGGMcYghX+Vwiqibgjk5Y9a5h0uK0Q3eM3+1
+5MBqPsbEr2QaZEW8h5nzY9pDXT1h/WV14hAF/p3sFTdJ1Of/amvZ6SzSoXIKw1jC
+1QkdMP1GxhwTh0IltWD62KUt3wox6TccIAk2fOT651XcvVxT/bzrWYs3cgIG63dL
+rp3i8UwXh/AKtK36Krv0
+=LlSG
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-dvbapi/metadata.xml b/media-plugins/vdr-dvbapi/metadata.xml
index 837c88a..17764da 100644
--- a/media-plugins/vdr-dvbapi/metadata.xml
+++ b/media-plugins/vdr-dvbapi/metadata.xml
@@ -5,5 +5,8 @@
 		<email>hd_brummy@gentoo.org</email>
 		<name>Joerg Bornkessel</name>
 	</maintainer>
+	<use>
+		<flag name="dvbcsa">support free implementation of the DVB Common Scrambling Algorithm</flag>
+	</use>
 </pkgmetadata>
 
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 3155fe4..0000000
--- a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.1.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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.0.ebuild b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.0.ebuild
deleted file mode 100644
index 73f98d1..0000000
--- a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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.3.ebuild
index 37be032..2fa28d8 100644
--- a/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.2.ebuild
+++ b/media-plugins/vdr-dvbapi/vdr-dvbapi-2.2.3.ebuild
@@ -13,16 +13,24 @@ SRC_URI="https://github.com/manio/vdr-plugin-dvbapi/archive/v${PV}.tar.gz -> vdr
 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"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 dvbcsa"
+
+DEPEND=">=media-video/vdr-2.1.4
+		dvbcsa? ( media-libs/libdvbcsa )"
 
-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
 
+	use dvbcsa &&\
+		sed -e "s:PLUGIN = dvbapi:PLUGIN = dvbapi\nLIBDVBCSA = 1:" \
+			-i Makefile
+
 	# respect the system CXXFLAGS
 	sed -e "s:FLAGS:CXXFLAGS:" -i FFdecsa/Makefile
 
@@ -64,6 +72,7 @@ src_prepare() {
 	fi
 
 	export PARALLEL
+
 }
 
 pkg_postinst() {