Workaround for recent cxxtools versions, http://projects.vdr-developer.org/issues/1351

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0x34C2808A

3 files changed, 114 insertions, 6 deletions

diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog
index 1256a376f574..26cd6a4f065f 100644
--- a/media-plugins/vdr-live/ChangeLog
+++ b/media-plugins/vdr-live/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-live
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.40 2013/04/07 18:20:39 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.41 2013/10/05 16:46:26 hd_brummy Exp $
+
+*vdr-live-0.3.0_p20130504 (05 Oct 2013)
+
+  05 Oct 2013; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-live-0.3.0_p20130504.ebuild:
+  Workaround for recent cxxtools versions,
+  http://projects.vdr-developer.org/issues/1351
 
 *vdr-live-0.3.0-r1 (07 Apr 2013)
 
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index 0135949dfbc1..15970c224f65 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -10,16 +10,18 @@ AUX vdr-live_pcre.patch 586 SHA256 290fe19ec39c638a78ca4b7f21ab9d337aa85657491e7
 DIST vdr-live-0.2.0.tar.gz 560582 SHA256 30ac64040be4defb75beb9d3a5b0218694fc5b10486926acd989e6eb6c72ca55
 DIST vdr-live-0.2.0_p20120325.tar.bz2 1992249 SHA256 c73873d810d154ec7ebc167fad727e892ddabc523a601447b180ddd6f298a138 SHA512 d7e1355a22437f9b81928675f8b3d250793aa5803b1bfb3a8685798fa5bf2f42eb87600279abbc156312c5edcf7f4b15a323e884847f9244f3021647784bfb6b WHIRLPOOL 8b4f7ee2f43bd6971f46407fb85715bb1ccc8301e4ab6ba76a875a62682e39d2f7d9656d15fd58fe18c655f1b12d5c5ad814d4d38a6957d4f812048a16e76129
 DIST vdr-live-0.3.0.tar.gz 786859 SHA256 c200042e51393c247be97e7f4667a1f3f06319d5c8e538adca32fdfac8d178da SHA512 4e3ce78ed3975e1bd54d0961b50b4884160690b32156864d545557e1b6900ebf40cabd0932c5ca1cb27e8abf3e9559f548ba31ddf62ff754e71dd7473bb408bd WHIRLPOOL 44738d7f44f39297342039ccf613479adbdecf83c468a72c24c4017f6c97c96f8c35c9dba276b8846498bb46e9c6ad1cd61ea6b1aee41bd751eac2d8c449ad3b
+DIST vdr-live-0.3.0_p20130504.tar.bz2 6348021 SHA256 edd577580b9e99de88bcd3794fcf792bee7df7ccc41bfebaeebef22bac5c78a7 SHA512 7a238a4567f90448b7813366dbdb5112ab98079fd5a2c9d59d09273853fd62ad520ca9ad373704a8888eb7c25119772421fe998d87069647c40d6d2d869e09c1 WHIRLPOOL 7f8d7ff69914d90af41d4c550df6f57a658e8263d320167fed84f4990063a5323c1f5d58d44283682807c673af81c8e32cd44e13a9aa57e849e3640b4ecac936
 EBUILD vdr-live-0.2.0.ebuild 1222 SHA256 25f86271282802d7a92f13cdf91b728b74d1d4a04f6344a103422fd968246d41 SHA512 cd5680a4a2aa74ac930ead073f54be0237337ae215ee9f81c9186b5f77cde0a356d795e0762178309f6dbcb528a283d0a3e421f75256f93f66f423e8c871c865 WHIRLPOOL 94350eca34ffeb35cf92c16142a8536c5cb61fd11bc67b35fd41e8df477346efd2b27907868545412edfa7c6312087a448e4af451622d52588fa40caa43bdd55
 EBUILD vdr-live-0.2.0_p20120325-r1.ebuild 2621 SHA256 d1a12df4430dbe1eac7566b1810454aac40ab08e82a27b9585fca762f6a7cd4b SHA512 9dde8b275e96dbd48a831f266d7419bb5625a4f8a75f5a91be22ee4a49a571ef30fc8952fc549ef83140b805ab0f9822bfdee876d21434699f7437f0c425f826 WHIRLPOOL fe4bc8d42217451fea682f69661a3f4cca80c747cbf6166d8ecd4e1f78af9ed1060eb5576d08820d95befe6e0d88071f5ea234a3f6360440057052a4864f7a85
 EBUILD vdr-live-0.3.0-r1.ebuild 2404 SHA256 939341a53669f1e0f2a06804fa6d38a7e13ea584f444fe0211c305ac7fda36ac SHA512 d9d37429ae8def6284ca963eb3d4e95c83f6fbeda02bd6dbc40e26945ae1f34e4e8fd16f01580bbed51ec8554a0bebc6e4cc83cdd7d67ae7586fe39ecd304ec9 WHIRLPOOL 444f6102f4bcbdf5e4164a15a89dec93ebf76a8bef8faf6da5298ab546d317f44d5d970a5b81d85f6122a73e56a7f1a1d1f6c649e5c49353936f26d10de1144a
-MISC ChangeLog 7637 SHA256 d7cf2570fce2ff4d8d28d0e6d51a6e115db928b14cb8ef9df63b61cf4a19f28b SHA512 fc10f31e11377f0ac97c1002d3ab7839605c8ba57d2165d584919629f6de1ab7180a576956e92b4e29d8183a9c87d0ca5e930ef8e92eed3bd185744eba271940 WHIRLPOOL 3ceae4a7bc730f2c3bc526923cd4519671d846ccb9f3e8f5af31622964ad0c964771cf20e517176ce97efca1e1abb6c0883629bb6ae1b36b6dc8939e2b8e3db9
+EBUILD vdr-live-0.3.0_p20130504.ebuild 2467 SHA256 dabc5138201ef2a5128fb7f47f47f44a8ceabe52dea14ccc3f179aba7c92d8eb SHA512 50e2d238d75679605c078fbc9c180e8f5f55fce0634c70894ea2dec1b1cf904fbe4677af2aae9b4cae3c8142ed2ac6884f87ea4798a63987cf6bd2fff27583fa WHIRLPOOL f0d41ecb5edcdefd62c7dc68aebb9a514bba403b12dafa0b9da764a38b729569447c59e274ac5edecd7cb6cfd56e77726edac8203c851a159f13f0c05284b6f7
+MISC ChangeLog 7861 SHA256 008459d0739fcd5efeeb74255339d43ea441102eb2fbb365c344e4ca39f595c7 SHA512 ae7025152c061b85b5056e20de2e8287162e5bc5047a39fbf82e8516414cdfc466fb08c0a9782696a2b0487be405e7606d528fc76123cc6aa0f4810472674bd7 WHIRLPOOL c0db84e95e761b68529459c4f9faadc60ee9844eb2782c65f7b9882f75b7dbaa861606e41a80f172cfe953721fb56efcb747bcfa839d6b86b8152a1aab48c382
 MISC metadata.xml 251 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f SHA512 8f48311caba6e3069390a1871a0cb9b8731ff57b812b3b8d5a5b5147d4e2b8ad28232d059abb00f049ba78a10570d9326957a57349d2f080624b41b043112056 WHIRLPOOL 2b082e9ef2c0a111b189ec0a020a10fcf8ddb4ea6f2eb5d9627f98ab6edb72cac03a9a04f97ee4624f27852b85bb06f2d662a54b0ee421c777eba10e85e37cbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Comment: signed/commited by hd_brummy@gentoo.org
 
-iD8DBQFRYbj/dn07HTTCgIoRCClFAKC5ERKM2UoJ5yW9GEAHK1CmXdGHEQCfdKu/
-yRMCsRjOxwIFoATGRDPQQvs=
-=wfFN
+iD8DBQFSUEJpdn07HTTCgIoRCOSRAJ9leeaGDBNFaE2EeCV9fcn9Hu5VIQCfVTFB
+Kku1WWxWAtETTS5sXeza5JQ=
+=36Wp
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-live/vdr-live-0.3.0_p20130504.ebuild b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504.ebuild
new file mode 100644
index 000000000000..161c5c727b9e
--- /dev/null
+++ b/media-plugins/vdr-live/vdr-live-0.3.0_p20130504.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.3.0_p20130504.ebuild,v 1.1 2013/10/05 16:46:26 hd_brummy Exp $
+
+EAPI="5"
+
+inherit vdr-plugin-2 ssl-cert
+
+DESCRIPTION="VDR Plugin: Web Access To Settings"
+HOMEPAGE="http://live.vdr-developer.org"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+		http://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pcre ssl"
+
+DEPEND="media-video/vdr
+	>=dev-libs/tntnet-2.0[ssl=,sdk]
+	>=dev-libs/cxxtools-2.0
+	pcre? ( >=dev-libs/libpcre-8.12[cxx] )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}"
+
+VDR_CONFD_FILE="${FILESDIR}/confd-0.2"
+VDR_RCADDON_FILE="${FILESDIR}/rc-addon-0.2.sh"
+
+KEEP_I18NOBJECT="yes"
+
+make_live_cert() {
+	# TODO: still true?
+	# ssl-cert eclass creates a "invalid" cert, create our own one
+	local base=$(get_base 1)
+	local keydir="/etc/vdr/plugins/live"
+
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-VDR Plugin Live}"
+	SSL_COMMONNAME="${SSL_COMMONNAME:-`hostname -f`}"
+
+	echo
+	gen_cnf || return 1
+	echo
+	gen_key 1 || return 1
+	gen_csr 1 || return 1
+	gen_crt 1 || return 1
+	echo
+
+	install -d "${ROOT}${keydir}"
+	install -m0400 "${base}.key" "${ROOT}${keydir}/live-key.pem"
+	install -m0444 "${base}.crt" "${ROOT}${keydir}/live.pem"
+	chown vdr:vdr "${ROOT}"/etc/vdr/plugins/live/live{,-key}.pem
+}
+
+src_prepare() {
+	# remove untranslated language files
+	rm "${S}"/po/{ca_ES,da_DK,el_GR,et_EE,hr_HR,hu_HU,nl_NL,nn_NO,pt_PT,ro_RO,ru_RU,sl_SI,sv_SE,tr_TR}.po
+
+	vdr-plugin-2_src_prepare
+
+	if ! use pcre; then
+		sed -i "s:^HAVE_LIBPCRECPP:#HAVE_LIBPCRECPP:" Makefile || die
+	fi
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /usr/share/vdr/plugins/live
+	doins -r live/*
+
+	fowners -R vdr:vdr /usr/share/vdr/plugins/live
+}
+
+pkg_postinst() {
+	vdr-plugin-2_pkg_postinst
+
+	elog "To be able to use all functions of vdr-live"
+	elog "you should emerge and enable"
+	elog "media-plugins/vdr-epgsearch to search the EPG,"
+	elog "media-plugins/vdr-streamdev for Live-TV streaming"
+
+	elog "The default username/password is:"
+	elog "\tadmin:live"
+
+	if use ssl ; then
+		if path_exists -a "${ROOT}"/etc/vdr/plugins/live/live.pem; then
+			einfo "found an existing SSL cert, to create a new SSL cert, run:\n"
+			einfo "emerge --config ${PN}"
+		else
+			einfo "No SSL cert found, creating a default one now"
+			make_live_cert
+		fi
+	fi
+}
+
+pkg_config() {
+	make_live_cert
+}