compilefix gcc-5; eapi=6

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

6 files changed, 193 insertions, 19 deletions

diff --git a/media-plugins/vdr-sc/ChangeLog b/media-plugins/vdr-sc/ChangeLog
index 8c412dd..f145ad1 100644
--- a/media-plugins/vdr-sc/ChangeLog
+++ b/media-plugins/vdr-sc/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for media-plugins/vdr-sc
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vdr-sc-0.9.3.20120815-r4 (07 May 2016)
+
+  07 May 2016; Joerg Bornkessel <hd_brummy@gentoo.org>
+  vdr-sc-0.9.3.20120815-r2.ebuild, vdr-sc-0.9.3.20120815-r3.ebuild,
+  +vdr-sc-0.9.3.20120815-r4.ebuild, metadata.xml:
+  compilefix gcc-5; eapi=6
+
 *vdr-sc-0.9.3.20120815-r3 (18 Feb 2015)
 
   18 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
diff --git a/media-plugins/vdr-sc/Manifest b/media-plugins/vdr-sc/Manifest
index 7b547a3..ae4ddfe 100644
--- a/media-plugins/vdr-sc/Manifest
+++ b/media-plugins/vdr-sc/Manifest
@@ -4,15 +4,28 @@ Hash: SHA256
 AUX vdr-sc-0.9.3.20120815_makefile.diff 822 SHA256 71507b442940bf7c71ea40f2b8b47b882defd4bc4f0852d52fbc2f4e4b7494e0 SHA512 7339a522a6d17fe979608fbd3ed3d66b59c6cdbb77a466c27b89b227fd2ba2c7cc4330370d9000ab16db987471687979be8549f9d24f2ac7db94cf67931a7e1b WHIRLPOOL 1b0a9d1a45dabb27b4437687a8ce8fae1eac4a867679f1f272b20d3d3255f6356517f2bd9dda389a0274bfa35958bf7101be2e85bc43a3247839505ad9de300e
 AUX vdr-sc-0.9.3.20120815_vdr-2.1.4_compilefix.diff 2041 SHA256 3d3c3c1ce17e4fdceae68316c5500d88edb7e5f3c3b0dbadfc9f738d6f63473b SHA512 e33b50c28ce1e790867fa0cd1d241c769b69edc6a78e60bc30a77fabc8347ada51d11a4fae1f649466906a6520b7ebb119eb41f01bd136b298d5667ceeae2299 WHIRLPOOL ae71e16358429943bb89ab4e291ecf40fa696fc5cea191033856419a93ed86e8c31af7910ec9cbb0da59c05c7f27d55664b2bd79e359217c41096816ac34dea3
 DIST vdr-sc-0.9.3.20120815.tar.gz 609497 SHA256 72fa59ec671550a0d4d9b56565332885aa81b1a5546d731a5c05e953359a82d5 SHA512 cc8d3b6bf17372b4021bfa1b6fdce696c1a6c997d884911af73172362e78edeaf4ebd30a161ddefb342a6e4f94cfc46fceb2dbe7b3d14e413d5cd4ba5c0a0d3c WHIRLPOOL 3ba89c7789486224c76cda49568a5c5b2f7984b132d6b419f4da1041d732dbbd0dd8811e2c2447b7ee3190eda70f0caf2d8373726bb8b1ecb94ff1b9ab092354
-EBUILD vdr-sc-0.9.3.20120815-r2.ebuild 4074 SHA256 b31ee53e8a77ab82691aa2389d643130dbc97129802e4aca25305dfe3de4f4e2 SHA512 91bcd7838d8077095ed64cf7638d333f84c75c9dc5ab037e6a6f855ce152a3982f86452963a52c31ca531e1ced0bfd6d6ea6f607bb6b58d2b1140aa3f161347a WHIRLPOOL f9db268a15163604fb53a1f13f0f97598b43f7ef023bdc464cc0d13f1d669a2c048182db644e92a785f88b589951adee13552324040be8309c8b990c15acfd95
-EBUILD vdr-sc-0.9.3.20120815-r3.ebuild 4323 SHA256 7547b0795e05697ead5fc5efd98c39c708bb9259becda643c5905d9c240b00bd SHA512 e3bfca496e466900f151d71b3562feeb6f8c4da0378ca2aa401f7182fab0cda721484a1ca45cec37e3101640e2430bb39c4a642bd38846d34e41f1c9120523e6 WHIRLPOOL e3c976e6d6ebb546085a6310c64ed288714536de1282ff3266c870b7a48c74bd97dd1d11a2478d65a6279de84ffac9e5ed954648957534e7afaebe652eb798f8
-MISC ChangeLog 3213 SHA256 26af6b73516124ac8e378beb91056e72dd13951de5e9e79c811bff43eda84a48 SHA512 bd3f010e8995d705ffe64c96bfb7f2901e744e4be40fce324f4e87bb9cc35c93537a117b94ba1ce2ecc1bbceeaa1ab9e40091f2143d77f32a6e1fcdaa17c5fef WHIRLPOOL 409bda0ba9cb7d7b3973dec6f7cba4eb0e4b919bc0b55c666d9b299a4e0b2d2605ac24564aebbdf34b695e3a330a031ea157006ac905d87b849de3bc218d98fd
-MISC metadata.xml 1209 SHA256 69a03f6195737dd38bc8f6a67cf55fff9c38ba1581afffbc0708858a0aaed513 SHA512 e6fd4d9140593e64a3561d4eb7babb8fd5d556851233a3b6866e2762d77396b3194fb2adf19eccd8d84ecadfbd0bd14f8c4b236a011a9133d6bf132b858eaa78 WHIRLPOOL 7089a3e3c975ef2888ce9cb1648d37892eb998fb74bace60f6421f2dbac859fc5fc87c72a3d0087fb608b9f52f025f868df67c5187342627cd1b9c5a4ec9abf2
+EBUILD vdr-sc-0.9.3.20120815-r2.ebuild 4068 SHA256 d90c61bc9161e543f94df5b1cd0813d02fbbf01b68c84706445d465fba2c7683 SHA512 d6b149056e8202dc738cf3253b6ea4705f8f68aef2327e65f2aedae1f7f10f10d646d3560d0a7076462bebd7dbf1a5575ee52607d3fa1bd5a557d89298b51e35 WHIRLPOOL a1a182bd18de955b5ad864ebfa6ea3193ca4e3ca3272990afa309bc0dfc004fcc16640a5452682cfc90e567b22d71406f90bf2fcb781a7e2754ebbc3d09d0220
+EBUILD vdr-sc-0.9.3.20120815-r3.ebuild 4317 SHA256 ca81b8b0e6367ac6aa9ae62498faf608a8a1be80206af9b4d6210b7cfebb5450 SHA512 4071f13868608e1f03f36cd497c36ddc97e893f9d08dca5396e9968b00837d88e013e25595f8623ad22a1dcd198f3098c39e57764a10a772610ec362c19906b8 WHIRLPOOL f580be8b1782f02880621ecbcd721ff331cc36b12ec17d1ef60f1a73f3076253f1f2e8a102fdb765475ea96a40112ce58c443fbfd3cfa499445fe6567047a5fd
+EBUILD vdr-sc-0.9.3.20120815-r4.ebuild 4459 SHA256 146b887bce43019bca341370e7dc1a9fa224f8c5479009275d228bc73c6992d0 SHA512 a27ac5e3e74aded915b85dcec2843767f0306c028492db618962ed2c069325274be860f3dc084b7a5093b0a0acc76e740fe61e46d2d8572af8b9afacd6db46bb WHIRLPOOL c9ca5c28338b48a4cc622778d22c9c17a7df7f488753f45367011f2ad0cbfb87811a25be04ee9106013c4851b3db925f61b3d32443fd052350770b84de0ba456
+MISC ChangeLog 3455 SHA256 5dfc2b9156f33bddc541d4e7f7693985f73117849c313f6e13917a55c445fec2 SHA512 11b5dce0d032cd3f4fbc0cc41f89d65f0f00502f7dadae2f15a7060c854275cd8794d4a2a01b7cb7ad81860a2dd065644d3cbddb1ba56fa554b378e4f9360bec WHIRLPOOL 379c7e3ce31ddc04eb6ea25c6ea2579430c4b4494217cca8ea81a6c8e9b063b39bf410b9070adf965bd4cb4dde2f790fbf8a19fca470f0f8742ccdc5f9ba34ff
+MISC metadata.xml 1207 SHA256 c31fbb87d0158d80faa0530e8128c64e822c9110c9db54d1f4b1fd0c14fd4050 SHA512 5d9ee467fcbd36a0d8a5c3c063436b72d7dfb2786ac836415fcaf399cdf8e4a13fcc28b4ba084cfab11714dd734e1d9bcf87ed529693f3f3f892abeee50b609a WHIRLPOOL c78ca3aa1de07ea86d7753d59153e154c1774301dc33684fca9d93e7125ea78559971b246d02a4ec4310ed66583f34b3e181cc78b5f43c16c74db2856b6d656b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.1
+Comment: Signed-off-by: Jörg Bornkessel <hd_brummy@gentoo.org>
 
-iD8DBQFU5Rx8dn07HTTCgIoRCEVpAKC0MGyufMiHIzHkld3+aPJeDz9BhwCfa1/m
-TGE2NVn6NSY8PlmrOm2wFoU=
-=tSfU
+iQJ8BAEBCABmBQJXLkEWXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwRTBBQTFFRTFERjQ0MUQ3QTNGNTIxQzI5
+M0VCNUY0REFBNTgzMkExAAoJEJPrX02qWDKhglIQAODa1dC8U4a9nuCmXNAgE5oV
+CJO/YSBnXUy8SKx2qUBdumdUFFkFZ6OQPGDd+SETRm19AWKXy3f+AeaB09bWw0ne
+f6te7z/6gNukSO8aLtvaehcZYBPjffLG3n+Bh1ouTampyvxVZvl//IxJeZr4EHsG
+6hUurTkurR4HffSINIbL7nPynfy7P/PNzJb8vCPWW71MWGyt6soTYEUgue8HYwOF
+oV/1DsWnqzBa2+GF9WVNBHUwGvEtoxNJb3up//H6j5Q98Y0VYJPtg3pGmrmk8130
+466cEQfj3oomT49bVe/fidFHvh/6Yq4UQaE5ZtPuaQzbx3mWWWrVer9PVRz10w93
+Np3fnnd8dBY0hhN/vzLZpZ0gLg6+QgmOTZ8drHbvcAUx/FjTccb88gjzUOigxYV9
+OrEtixSVN2XlSkPr9+kateE2EUfjB93+Z/zcYAYQXn5EH2qDWrtS9Ifht6LQ8LlA
+jcKe+u3J185yeaa3Bm0KQmgzf2oKVBhJxUe+TfZIsGxCLKAqYc56C0ivaeiqxhyH
+nuTG9Yy2dULCD8u4BnmxhwlwDf+t7qb/W9G1YsEgNn2O1IkHawWIXKc5+eQ+EUoK
+DCKMG5E2qNiF22Lsk6SrSnr8GN4s/MJ0K1u9FQK/Lsvnb5qkdZ5P1S541gLAtlkF
+sFJdE7UY6RsuL3obpYdO
+=Q7l7
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-sc/metadata.xml b/media-plugins/vdr-sc/metadata.xml
index 5fa4053..1c861f3 100644
--- a/media-plugins/vdr-sc/metadata.xml
+++ b/media-plugins/vdr-sc/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-<maintainer>
-<email>hd_brummy@gentoo.org</email>
-<name>Joerg Bornkessel</name>
-</maintainer>
+	<maintainer type="person">
+		<email>hd_brummy@gentoo.org</email>
+		<name>Joerg Bornkessel</name>
+	</maintainer>
 	<use>
 		<flag name='cardclient'>No Description</flag>
 		<flag name='conax'>No Description</flag>
diff --git a/media-plugins/vdr-sc/vdr-sc-0.9.3.20120815-r2.ebuild b/media-plugins/vdr-sc/vdr-sc-0.9.3.20120815-r2.ebuild
index e5bf68a..fd1b707 100644
--- a/media-plugins/vdr-sc/vdr-sc-0.9.3.20120815-r2.ebuild
+++ b/media-plugins/vdr-sc/vdr-sc-0.9.3.20120815-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
diff --git a/media-plugins/vdr-sc/vdr-sc-0.9.3.20120815-r3.ebuild b/media-plugins/vdr-sc/vdr-sc-0.9.3.20120815-r3.ebuild
index f64cccb..b87a311 100644
--- a/media-plugins/vdr-sc/vdr-sc-0.9.3.20120815-r3.ebuild
+++ b/media-plugins/vdr-sc/vdr-sc-0.9.3.20120815-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
diff --git a/media-plugins/vdr-sc/vdr-sc-0.9.3.20120815-r4.ebuild b/media-plugins/vdr-sc/vdr-sc-0.9.3.20120815-r4.ebuild
new file mode 100644
index 0000000..316c100
--- /dev/null
+++ b/media-plugins/vdr-sc/vdr-sc-0.9.3.20120815-r4.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit vdr-plugin-2
+
+HG_REVISION="29b7b5f231c8"
+HG_REVISION_DATE="20120815"
+
+DESCRIPTION="VDR Plugin: SoftCAM"
+HOMEPAGE="http://www.vdr-wiki.de/wiki/index.php/Sc-plugin"
+SRC_URI="http://vdr.websitec.de/download/${PN}/${P}.tar.gz"
+#SRC_URI="http://85.17.209.13:6100/archive/${HG_REVISION}.tar.gz -> vdr-sc-0.9.3.${HG_REVISION_DATE}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cardclient +conax +constcw +cryptoworks +irdeto +nagra +nds
+		+sc-conax +sc-cryptoworks +sc-irdeto +sc-nagra +sc-seca
+		+sc-viaccess +sc-videoguard2 +seca +shl +viaccess
+		dvbsddevice dvbhddevice
+		cpu_flags_x86_3dnow cpu_flags_x86_mmx
+		cpu_flags_x86_sse cpu_flags_x86_sse2"
+
+DEPEND=">=media-video/vdr-1.7.21
+	>=dev-libs/openssl-0.9.7:*
+	dvbsddevice? ( >=media-plugins/vdr-dvbsddevice-0.0.5-r1 )
+	dvbhddevice? ( >=media-plugins/vdr-dvbhddevice-0.0.4_p20120614 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/sc-${HG_REVISION}"
+
+# dirty fix, fails on more jobserver on FFdecsa
+export MAKEOPTS="-j1"
+
+src_configure() {
+	# plugin dvbsddevice/dvbhddevice with transfermode support
+	export "WITH_DVBSDDEVICE=$(usex dvbsddevice 1 0)"
+	export "WITH_DVBHDDEVICE=$(usex dvbhddevice 1 0)"
+}
+
+src_prepare() {
+	# fix bug 987654 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	vdr-plugin-2_src_prepare
+
+	if has_version ">=media-video/vdr-2.1.3"; then
+		sed -i device.c -e "s:MAXDVBDEVICES:MAXDEVICES:"
+	fi
+
+	if has_version ">=media-video/vdr-2.1.4"; then
+		eapply "${FILESDIR}"/vdr-sc-0.9.3.20120815_vdr-2.1.4_compilefix.diff
+	fi
+
+	sed -e 's:^SINCLUDES += :&-I/usr/include/vdr :' \
+		-e 's:^LIBDIR.*$:LIBDIR = ${S}:' \
+		-i  Makefile.system || "sed Makefile.system failed"
+
+	sed -e "s: -march=\$(CPUOPT)::" \
+		-e "s:\$(CSAFLAGS):\$(CXXFLAGS):" \
+		-e "s:ci.c:ci.h:" \
+		-i Makefile || die "sed Makefile failed"
+
+	sed -e "s:FLAGS:CXXFLAGS:" \
+		-i FFdecsa/Makefile || die "sed FFdecsa Makefile failed"
+
+	sed -e "s:\"../dvbsddevice/dvbsdffdevice.h\":<dvbsdffdevice.h>:" \
+		-i device-sd.c || die "sed device-sd.c failed"
+	sed -e "s:\"../dvbhddevice/dvbhdffdevice.h\":<dvbhdffdevice.h>:" \
+		-i device-hd.c || die "sed device-hd.c failed"
+
+	# Prepare flags for FFdeCSA
+	if [ -n "${VDR_SC_PARALLEL}" ]; then
+		PARALLEL="${VDR_SC_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_SC_PARALLEL not set, guessing value from USEflags (${PARALLEL})."
+		ewarn "This setting may be suboptimal, so you'll probably want to tweak it yourself."
+		ewarn "More info in docs/FFdecsa/how_to_compile.txt."
+	fi
+
+	export PARALLEL
+
+	eapply -p0 "${FILESDIR}/${P}_makefile.diff"
+
+	#gcc-5 compile fix
+	sed -e "s:int config:unsigned int config:" -i log.c
+
+	# Remove unwanted plugins
+	cd systems/ || die "cd systems/ failed"
+
+	local fl
+	for fl in *; do
+
+	# Remember to update IUSE when bumping!
+		if ! use "${fl}"; then
+			einfo "Removing ${fl} plugin"
+			rm -r -- "${fl}"
+		fi
+	done
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	exeinto "${VDR_PLUGIN_DIR}"
+	doexe libsc-*.so.* || die "doexe failed"
+
+	docinto FFdecsa
+	nonfatal dodoc FFdecsa/docs/*
+
+	docinto examples
+	nonfatal dodoc examples/*
+}
+
+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."
+	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
+}