bump; fixed -9999.ebuild to checkout the FernetMenta tree, as vnssiver plugin has removed from Opdenkamp branch

Package-Manager: portage-2.2.15
Manifest-Sign-Key: 34C2808A

4 files changed, 63 insertions, 16 deletions

diff --git a/media-plugins/vdr-vnsiserver/ChangeLog b/media-plugins/vdr-vnsiserver/ChangeLog
index 8cab174..48b0913 100644
--- a/media-plugins/vdr-vnsiserver/ChangeLog
+++ b/media-plugins/vdr-vnsiserver/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for media-plugins/vdr-vnsiserver
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vdr-vnsiserver-1.2.0 (08 Jan 2015)
+
+  08 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-vnsiserver-1.2.0.ebuild, vdr-vnsiserver-9999.ebuild:
+  bump; fixed -9999.ebuild to checkout the FernetMenta tree, as vnssiver plugin
+  has removed from Opdenkamp branch
+
 *vdr-vnsiserver-0.9.4_p20140213 (18 Feb 2014)
 
   18 Feb 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
diff --git a/media-plugins/vdr-vnsiserver/Manifest b/media-plugins/vdr-vnsiserver/Manifest
index fcef596..b44167c 100644
--- a/media-plugins/vdr-vnsiserver/Manifest
+++ b/media-plugins/vdr-vnsiserver/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST vdr-vnsiserver-1.2.0.tar.gz 77805 SHA256 86f29a869b9d0fce62eb6c7471b976dcd7fd3cf55485bff82d9478d42accd201 SHA512 011d75ef3fffdb7fe5c5f413d04918a052ed7f4246681de61272d5c6114744bc2a26326255d3febc096c049da1b5cb947c44122512fbe612108273ae2ac5bcc0 WHIRLPOOL 63d75767704c3330134d73b8bd4cff7d0a023d2167b8364e01ca4c1241420286f3a86b5718a81c82e5e82ef3b1917d93fd92a34dfdd14a3f8a699a4ee4ac3483
 EBUILD vdr-vnsiserver-0.9.0_p20130105.ebuild 1048 SHA256 4a2801aa15454aad28792bff843d13fce09deb25d79f9b4a301bda4fd9c7af46 SHA512 94646a4f35a3c8f963bcf7902b55ecce6690a0d0291e1824cf503ac24ce4dbe703f180f4a916fecb089c03eae16ae9c9cd750d12abd0f35159d384a51add5e67 WHIRLPOOL 5560d1d3c9f2e5537155c1261ac587199310c1652b94b207b5767712a32572ae94266272bec2ae28a29f11396fe79bde9ac01df51ecbb412d37b5bb693fe825a
 EBUILD vdr-vnsiserver-0.9.2_p20131021.ebuild 1048 SHA256 72094ee0a5118406d78b127bab11c32b4b9a72abfa13cf3efe3602d8fdcc0f00 SHA512 65be95ce288eb61efc34f2557b671ff3514b4f84412c6a554d60d97a48ca93a7ae2322dabdca97b8fd571e4547e2192223bc644ba67736a92b0680d85264e4a4 WHIRLPOOL 64baa8f6323f28d7d9b9de94d7f31c223ab5c0c52d10263100e0ffe84d496dbb7eea1a3b1e081a595bf43d05339f90c92eba5209157101dbbab470ae2a046122
 EBUILD vdr-vnsiserver-0.9.3_p20140104.ebuild 918 SHA256 004b583d168b4e99ef49b637c8c65a4e305dbc7c5be4644b6483753a203a322a SHA512 a1d01d5b1138e29898e21f269461a711e622ec85d637878db8f4ee68831b719e8c99051220932d47893ae56d1460611194f29023975b74251cd776f3c2d35dfd WHIRLPOOL 37c8eb6eb4395bb8372fc45976fe4ea2a94e1af380ba3287e4f179f08bfc83669da72dafdd4147cc70f5fefde45856ad6b81aa1a0a0bce8d5fe4cf933d123a98
 EBUILD vdr-vnsiserver-0.9.4_p20140213.ebuild 1134 SHA256 9f7154f7c25977e993f0f75b7f022ac8b4b3c12b026aea13d791213b2ddc310f SHA512 0296337f32ac121e5461828b774c7d913788a27d1ca55d3b796664e80d09b55c6b5c6ed9a3ae913258ad6631a7e5fe1d54809c52b9454d945746eab5efb08c5b WHIRLPOOL 583adb6c9746af52635f1176310f09ea70d0de67f68980915e8cef7cf69d79ad084ef0d576a0b235464133ea6bfa0e73053119f79b3560506fa38fd02479e16e
-EBUILD vdr-vnsiserver-9999.ebuild 813 SHA256 52f66fe38a9370d6b1a54108c32ab91b788f48e7511bf58c116f7759c55198fe SHA512 64283e38187a7809d25476f4f295d9179026b7b998ee8f4e2f0910b91e5137badeb13bede2da878122fa85ee7f3430c8069a914f16ab51777593fb7966786c90 WHIRLPOOL e3881c21a3280887cbf558a8ccfee7413944504965b2a34c37b004fe78789edf531de736a9539b66b6cb8fd997113e905ff377a78239c6f80cfc1376142a601d
-MISC ChangeLog 1769 SHA256 bc12defa43e213bd719d6394ede8d2ec77f294fb89a17235691b3c7f354793c1 SHA512 84868cbd87f3b03c41725ba42189a1052c1688b3192fb20f989edc31b7e2795ac76e0e1e3d80928df0d85668c55031ab2a099a64a4bb3b7d41a09119d49fc8c1 WHIRLPOOL cba6707e74ff45a572409443c1fb5e3deb4cddec251620f0c3c8807ed6e89aca33e3452c3afd949efb9624153bda0aa2c44f20874ee436874a67a7995716c7ad
+EBUILD vdr-vnsiserver-1.2.0.ebuild 1015 SHA256 ab07a9f0a2e704a1058556b11b1467a83ca81ba72fa3b68b74083b582f4fb957 SHA512 c66a92610ed6e5ac941db4fd7384240133e8e9ecf0daa75c02d9f380171c3fb72693fc8dfd6cd94bd9155db259e64eb84353314a015e48869edf6c52b6483686 WHIRLPOOL 9af3de9db73d60dbd6b6fff4b2f9902a3a5839c452a9cc87c5430c0165d2e37d9fbe86280db53a24288fe332ad6298a8db45e4b73eb3b07ca992c5142f796402
+EBUILD vdr-vnsiserver-9999.ebuild 766 SHA256 fbb7bf790369a4c0f70886d71970c3133c2de0e1ad966661084c9e921158b695 SHA512 39965d390b34720a6802c0220c218d7ddf234981bd69cda605aacda11654ef59f5b9a7b61467dc7b7a596a381554c9d0cca89c6d25afcc084b5edd3201146774 WHIRLPOOL 0a7422eeeb311d165ffbb27d44066e2bf5222eacc959f16565e63fdce989caad632802486808d5388affc5fa14c8b0f39e73e8b618ce68ed60b791a76f6e3b6a
+MISC ChangeLog 2038 SHA256 ca4189c7eb0aaaa95054ba987d929698941b190a21531ac4a466427f6bd66dbd SHA512 a305ab1b89dd8fedcfa873ed7aa87839f21b974a22debe8616b1c854c8d860118d3c82abd2250b7b4c127fb7f444130750535544b5aeb5c8bb6002e1fb05a629 WHIRLPOOL 8e13af545d783879f7587bb91d8ee44d3f463ea5f5214d549d1d6a9d18f9ee3f1273a1ac86cd57367a02fac8e2138ff3f136a39fdeb66bc297249c2517d4cef6
 MISC metadata.xml 251 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f SHA512 8f48311caba6e3069390a1871a0cb9b8731ff57b812b3b8d5a5b5147d4e2b8ad28232d059abb00f049ba78a10570d9326957a57349d2f080624b41b043112056 WHIRLPOOL 2b082e9ef2c0a111b189ec0a020a10fcf8ddb4ea6f2eb5d9627f98ab6edb72cac03a9a04f97ee4624f27852b85bb06f2d662a54b0ee421c777eba10e85e37cbe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFTA8Radn07HTTCgIoRCJpeAJ0SDlAAgEH5uGaQQ+4utIVxK/zP2gCeLFbL
-lRO+pBVVRFxD4eSj9zZVtWg=
-=ElVf
+iD8DBQFUrqgbdn07HTTCgIoRCPdAAJ4+tR397Jn/YfQXF61SyTihpvvR/ACeIZdq
+0CUM6ywL/7NhLmP9H/3ehWs=
+=wnk1
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-vnsiserver/vdr-vnsiserver-1.2.0.ebuild b/media-plugins/vdr-vnsiserver/vdr-vnsiserver-1.2.0.ebuild
new file mode 100644
index 0000000..f9cd9f7
--- /dev/null
+++ b/media-plugins/vdr-vnsiserver/vdr-vnsiserver-1.2.0.ebuild
@@ -0,0 +1,39 @@
+# 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: VNSI Streamserver Plugin (FernetManta repo)"
+HOMEPAGE="https://github.com/FernetMenta/vdr-plugin-vnsiserver"
+SRC_URI="https://github.com/FernetMenta/vdr-plugin-vnsiserver/archive/v1.2.0.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.7.14"
+RDEPEND="${DEPEND}
+		>=media-plugins/xbmc-addon-pvr-0.0.1_p20140213"
+# Maintainer, please add also media-plugins/xbmc-addon-pvr with the same patchlevel
+# to the tree, so it is guaranteed that the server and the addon fit together
+
+S="${WORKDIR}/vdr-plugin-${VDRPLUGIN}-${PV}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	fix_vdr_libsi_include demuxer.c
+	fix_vdr_libsi_include videoinput.c
+}
+
+src_install() {
+	vdr-plugin-2_src_install
+
+	insinto /etc/vdr/plugins/vnsiserver
+	doins vnsiserver/allowed_hosts.conf
+	diropts -gvdr -ovdr
+}
diff --git a/media-plugins/vdr-vnsiserver/vdr-vnsiserver-9999.ebuild b/media-plugins/vdr-vnsiserver/vdr-vnsiserver-9999.ebuild
index bc99a05..97fbc53 100644
--- a/media-plugins/vdr-vnsiserver/vdr-vnsiserver-9999.ebuild
+++ b/media-plugins/vdr-vnsiserver/vdr-vnsiserver-9999.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="5"
+EAPI=5
 
-inherit vdr-plugin-2 git-2
+inherit vdr-plugin-2 git-r3
 
-EGIT_REPO_URI="git://github.com/opdenkamp/xbmc-pvr-addons.git"
-EGIT_SOURCEDIR="${WORKDIR}"
+EGIT_REPO_URI="git://github.com/FernetMenta/vdr-plugin-vnsiserver.git"
 
-DESCRIPTION="VDR plugin: VNSI Streamserver Plugin (Odenkamp branch)"
-HOMEPAGE="https://github.com/opdenkamp/xbmc-pvr-addons"
+DESCRIPTION="VDR plugin: VNSI Streamserver Plugin (FernetMenta branch)"
+HOMEPAGE="https://github.com/FernetMenta/vdr-plugin-vnsiserver"
 SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-video/vdr-1.7.14"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/addons/pvr.vdr.vnsi/vdr-plugin-vnsiserver"
+S="${WORKDIR}/${P}"
 
 src_prepare() {
 	vdr-plugin-2_src_prepare