new snapshot 20130821; compile fix vdr-2.1.10; cleanup; initsciptvdr-fronted to start sxfb

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x34C2808A

9 files changed, 244 insertions, 147 deletions

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index 7260ac9e642e..7c7354134ca6 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.79 2015/01/15 18:52:25 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.80 2015/02/12 10:11:33 hd_brummy Exp $
+
+*vdr-xineliboutput-2.0.0_p20130821 (12 Feb 2015)
+
+  12 Feb 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +vdr-xineliboutput-2.0.0_p20130821.ebuild, vdr-xineliboutput-9999.ebuild,
+  -files/vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff,
+  -files/vdr-xineliboutput-1.0.5-ldflags.patch, +files/confd-2.0.0,
+  -files/vdr-xineliboutput-9999-build-system.patch, +files/vdr-frontend:
+  new snapshot 20130821; compile fix vdr-2.1.10; cleanup; initsciptvdr-fronted
+  to start sxfb
 
   15 Jan 2015; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-xineliboutput-1.1.0.ebuild, vdr-xineliboutput-9999.ebuild:
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 2816b835aebc..e6d226c4279a 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -2,19 +2,20 @@
 Hash: SHA256
 
 AUX confd-1.0.0_pre6 856 SHA256 fd30a70c06553463414e93771306a59fdabbcf674218dac49d4af46096d6089b SHA512 67ab65984c2176edb7b3985b4a561bb41c8c529796d5cc44f559e275240c0c25bfee9e340744c7f25192de8a5231ff94f0bc87ace0edbb5b496846b0f8017fed WHIRLPOOL 7e9714a0b79c5cdf16fc57b3ad7a9b24b7c6591f97612cafea76dbb4c54857d881c6eb6e076d8561b14c8c08345ab94c40cff9c6f98c6196ead4aa94425375a5
-AUX vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff 3657 SHA256 e4062ec7b43136b2113173641a6b5b7a2d50cd892a0aec8cf778c97874f84743 SHA512 f7d36a2bae6f5a6fb956c03e3a542aed86e374ffcfe642ce607cd19c891b163d06dcce9b57457882fd6b413e547d3e6599608f9c103a15c8c871445a18cb1746 WHIRLPOOL 4b690a2a945cebc2b6e71b54f36590b2ade547e04bf32d1cfdbfb491a4175389b98dc591a4c1d61046799acdbed111dcc305f49c1ad969473c9bbd8db03a3e70
-AUX vdr-xineliboutput-1.0.5-ldflags.patch 1382 SHA256 e455aaf86c771e71848f01bd281ac4cbdc4c710a91b1896069bbf41da5c876ad SHA512 4623becc15b6ed628c467963c11957a239211a11635bf5c2a9048345bd78e248f0092fd0fd08c8d33aaf92956e7cfa30baafcb52629eec22a36b12962d642648 WHIRLPOOL 3dc1f909d2b1e03c74f00a18c8cb2324d29a90ba31b826cf6564d4e1b230475b4ae73615b3cf3e4822e1f3ec078aaf2accd66b0d9a5f7d6f1ac279bc4fbd3de4
-AUX vdr-xineliboutput-9999-build-system.patch 744 SHA256 43e52f8d29cb9aed4e487eb63f14101dfdbb30ba42f74ee57eb7bbf512f89bbd SHA512 0f67e0388bed7c38f04b5b13a7582396643771fb1a193368e6eebfc2acb11dd72c55d535c2ab9a07950a740eb85a16796c0787137c5f788914758648ccb26471 WHIRLPOOL bf9121e01429f16b302c0f251b5bf3bb2a001179cc40da6ae4533a1e3681a0b15c835c39b10c2a2f847d99af8e83fb706c4c6e694cd74427bf87f3a3488b2121
+AUX confd-2.0.0 1468 SHA256 d1ba657d9ff6296bd0b9ee31a804458e4cc0d214412adc49c638142719371466 SHA512 5e839bb300be1e08e3f35108c9a12d1eadfca46e7efda6c922c97833270b55fd26fffd3734971a1f44c016b342b4d262188ea7b82f623464be362ee8751b4ed0 WHIRLPOOL 2046252384d98de9e3ee1141a003044caf814f8658eea702b49ba2b2fa77643dd43ea89cfca63bf2939c41e15eff854ba69fd27ae73d7e9ccc8442faadd1c505
+AUX vdr-frontend 527 SHA256 74e558456dc042dcf59cc6c13c843522ca4256e51d6a3d5366d012bf9381be2c SHA512 6ed787ceee4d1a04a06aace49ae5daf97333e385799cf19de152f3c63f1d0f409e006f896772f9d64c2301d00025bd67499a6f4688b117adcc71f0cc7088e7a0 WHIRLPOOL 68879d37f3bb0665e719095f620a9a7f1e7a21be3bdaf24372182f498a87c95b43460ad1fb79fd4701d89b27668a34ca91bf4f6782e52ed74f00042c3cedd67e
 DIST vdr-xineliboutput-1.1.0.tgz 404820 SHA256 bddebfbf77e956a50faea1baa44513a31122961357bc502b588c521358da77d3 SHA512 255ae698c1dc9d9098847e62c386a6bd24ec1dc822fb695600ef944e18d0febfac0d5b487de57a17ea9f9bd3935d1d11763a06a5daa527ce95f9557a408c264d WHIRLPOOL be47aeb039bb69e85a0f964940b3173f4371ae911d58df76c6e0135b9843471cd21b27efdfc95001216a508c0bbdc1e4957cb0d50da1a3c49e7c4ba7dd24e55c
+DIST xineliboutput-2.0.0_p20130821.tar.bz2 356633 SHA256 3ccff26c1112267e12858bbacd1d9081c999881da77c0da91f1fcc525cc225e9 SHA512 ee25447749dc5b8fe93da3c021823f8dd552619d64575525918c15447135af0d6684e613b20a1aa99a1fd8bd5334344ea03962ab75bbbffb0204d92adf36f9ed WHIRLPOOL 1feabc1f333593fb194065d1a62a0da80374a6c9714c8e1af4623e047ed4f0ef6c5433e8401f072e7c4a460830c2d1b902ce2a78f7ecad5e8533b159eda6db00
 EBUILD vdr-xineliboutput-1.1.0.ebuild 3351 SHA256 dcd1fb307cfc8fe679079f9d163b4eb5c2b77ab4e51cc2838ccd5b1051880636 SHA512 cb292b5da5cc574ff9ed3ba4b40ce9243b7bdf580ae3af39748e0414b189259737b7a1c4a0a91981c3a77f2d793fe8dc98874c05dea507a251d1ef1add425272 WHIRLPOOL b302e65d8fba224f06d6a9d2a1f40b21afbe9fb965943d111bf535f4af5e17716b82dac04b013219c2e29b1b4ba91e1e82a9f71b517df945cf1a8a9cc9d955ef
-EBUILD vdr-xineliboutput-9999.ebuild 3470 SHA256 e9b677b5f8b972e78d9577c178dcb760fabad80897e5e48bd30e6ef3b54ce92e SHA512 a7b259c4c1b1bf05443479778799fb401388ec5c381615d4a3ba922eb107edca1b49d7282ca795eadf1239c15519bd8ad20f0daee6eec48621c5e453de3ad18b WHIRLPOOL e763765dc511ae0d8d2cbec4f487d5adbc39cde361cb8b58c61d9705a1da23eaa6fce457115c7fe6b35f081c7f5f461ec3ab49827c20bb99e2826e3233542d3f
-MISC ChangeLog 15919 SHA256 3add0acc5c0f94cd38b7bf34607ba135ce344f421fef7f8f469970b1872765be SHA512 e28b2d4e794dbe61c777e11a285587ea97d59d1333005cfb3caae29b9d2543ec7e12582d2665e33d2bf6f621033bd33ccfd51d98dc80a1da0ca9b7a5561d4fdc WHIRLPOOL a896a14bb8134626ac9d40c6743ebaf89e56081c518a47622c7a44da7630289e6ea486e342e58ea6a9216c32c739e1d80d47cd29c2e881c2dfa07386c1797928
+EBUILD vdr-xineliboutput-2.0.0_p20130821.ebuild 3460 SHA256 a24c128ffca4fa7e565ed6619fc71658341b113729403e234009435af3856dc9 SHA512 75209d87d014a6e936097b433bb9c05e5562d12c158c01fa372a78d92a0f1c475357c9db7ef1b7348f6d22f53ffda3bdad5be6d0bfc44d3b2ac16950987d86c6 WHIRLPOOL f582d46a73aca0fb2f10c9a8cfac09292e43f04783f91a41d9289dd59fc4e5c022e2b61b439720730007b94a952a02843ebcb462152d0fde4714f27b02b36b95
+EBUILD vdr-xineliboutput-9999.ebuild 3503 SHA256 eb7367d009b0fc65971b57d1794c796eeaa0b407fa99941e98d98b520796d0cc SHA512 e8b442596ce63f9e8904e4627605a7a92be70d659dc4be43a27745e2a6b2eba03255038c66c3cd2806c031a36316b8deb66d7596da6a7da8227c7380864b486c WHIRLPOOL 535fa419cd89d1c3ab6f285ddb4cade135c7b9f3951967dcee4193252cf20fc9ebb2d66b7ff9f1440e7368f7e189a731e31cc6a47c01122ad5ce2de0bdf752d6
+MISC ChangeLog 16398 SHA256 e186e06a976088fdee7ae62ccc9f4d2008a056df8d339fafe072f317681edc88 SHA512 abe77a7a7fdd7aee47dc748d839a4f129bf71c33dba86df1f91bd1282db0067270d2177b0f7ac299fb81be1201e493143e6d47e481b2fdd070cb6f3d24216898 WHIRLPOOL 8dd356bc6f6b9c719b5f114be4b1632eb4b9b119cd75aa69182584d5f317579ec9dbfa8e81f7e4ebe17ae9ba56fe83e83bbbfea6f906a24acdccc19afecbfa03
 MISC metadata.xml 841 SHA256 3dc039001ddd3c3a6630f615fb2e94261f369931cd73cd5405644937145bb189 SHA512 9afc4d17ddd1e4d0bfcfb86ed2e1b4587c333e40950e2b8a3b7b92b09944a34bab4621f097d7bcc72878abdcc3cbef3b5733ab1f913e0bff044987838477fe94 WHIRLPOOL 73885acc6772ad53abaacb9416f64f9a7b6f29078cce1adf052097770a051631cb59f1e549031c9f2a1214f86e0ba0cbdae2b33cc2304481fec3e4bd16da5af0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFUuAxvdn07HTTCgIoRCAK1AJ0X/ABcTNDL+K5v/inDqhmdSxGqfwCglr0V
-OFKakdB7/MBmW4Mg44URswE=
-=sbeO
+iD8DBQFU3Hxbdn07HTTCgIoRCAjOAJ4uCp8U1YJzDy1VjIV4HPK37Lw/aQCgkEMA
+OlJMe/KnUR5wNPsXDDvdF6I=
+=So3C
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-xineliboutput/files/confd-2.0.0 b/media-plugins/vdr-xineliboutput/files/confd-2.0.0
new file mode 100644
index 000000000000..c85cabcdf610
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/confd-2.0.0
@@ -0,0 +1,50 @@
+#
+# Usage examples (VDR plugin)
+#
+#  If no arguments are given, both X11 and framebuffer frontends are tried.
+#  First working frontend is used with best available video driver.
+#  Complete list of available command-line arguments can be obtained
+#  with "vdr --help".
+#
+#  Only local frontend, X11/Xv video, alsa audio:
+#    _EXTRAOPTS="--local=sxfe --video=xv --audio=alsa --noremote"
+#
+#  Only local frontend, (slow) X11 video, oss audio:
+#    _EXTRAOPTS="--local=sxfe --video=x11 --audio=oss --noremote"
+#
+#  Only local frontend, DirectFB: 
+#    _EXTRAOPTS="--local=fbfe --video=DirectFB --noremote"
+#
+#  Only remote frontend(s):
+#    _EXTRAOPTS="--local=none --remote=37890"
+#
+#  Local and remote frontends:
+#    _EXTRAOPTS="--local=sxfe --remote=37890"
+#  or
+#    _EXTRAOPTS="--local=fbfe --remote=37890"
+#
+#
+_EXTRAOPTS="--local=none --remote=37890"
+
+###################################################
+#       start sxfe remote frontend                #
+###################################################
+#
+# We do not add any start up paramaters by default
+# Please refer for detailed info to
+# media-plugins/vdr-xineliboutput README 
+# --> Using remote frontends
+#
+# Example:
+# --display=:1.0 --silent --fullscreen --syslog --reconnect xvdr://localhost &>/dev/null
+#
+# init script --> vdr-frontend
+#
+# DEBUG: do we need sxfb support? feedback please!
+#
+# sxfb start parameter
+#	allowed values: see README
+#	default: no paramters given
+#
+#REMOTE_FRONTEND=""
+
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-frontend b/media-plugins/vdr-xineliboutput/files/vdr-frontend
new file mode 100644
index 000000000000..56be30e87d8c
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/vdr-frontend
@@ -0,0 +1,13 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/files/vdr-frontend,v 1.1 2015/02/12 10:11:33 hd_brummy Exp $
+
+description="Start xineliboutput sxfe/fbfe remote frontend"
+
+source /etc/conf.d/vdr.xineliboutput
+
+command="/usr/bin/vdr-sxfe"
+command_args="${REMOTE_FRONTEND}"
+pidfile="/var/run/vdr-frontend.pid"
+start_stop_daemon_args="--user vdr --group vdr --make-pidfile --background"
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff
deleted file mode 100644
index 6c94b390fdf6..000000000000
--- a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -ru xineliboutput-cvs-20090810-orig/xine_fbfe_frontend.c xineliboutput-cvs-20090810/xine_fbfe_frontend.c
---- xineliboutput-cvs-20090810-orig/xine_fbfe_frontend.c	2009-08-10 13:17:33.000000000 +0200
-+++ xineliboutput-cvs-20090810/xine_fbfe_frontend.c	2009-08-10 13:55:13.996629416 +0200
-@@ -139,9 +139,10 @@
-                              int xpos, int ypos,
-                              int width, int height, int fullscreen, int hud,
-                              int modeswitch, const char *modeline, int aspect,
--                             fe_keypress_f keyfunc, int no_x_kbd,
-+                             fe_keypress_f keyfunc, int no_x_kbd, int gui_hotkeys,
-                              const char *video_port,
--                             int scale_video, int field_order)
-+                             int scale_video, int field_order,
-+			     const char *aspect_controller, int window_id)
- {
-   fe_t *this = (fe_t*)this_gen;
- 
-@@ -207,7 +208,7 @@
-  *
-  * configure windows
-  */
--static int fbfe_display_config(frontend_t *this_gen, int width, int height, int fullscreen, 
-+static int fbfe_display_config(frontend_t *this_gen, int xpos, int ypos, int width, int height, int fullscreen, 
- 			       int modeswitch, const char *modeline, int aspect, 
- 			       int scale_video, int field_order) 
- {
-diff -ru xineliboutput-cvs-20090810-orig/xine_frontend_main.c xineliboutput-cvs-20090810/xine_frontend_main.c
---- xineliboutput-cvs-20090810-orig/xine_frontend_main.c	2009-08-10 13:17:34.000000000 +0200
-+++ xineliboutput-cvs-20090810/xine_frontend_main.c	2009-08-10 13:59:13.453270355 +0200
-@@ -632,7 +632,14 @@
- 
-   /* Initialize display */
-   if(!fe->fe_display_open(fe, xpos, ypos, width, height, fullscreen, hud, 0,
--			  "", aspect, NULL, noxkbd, video_port, scale_video, 0)) {
-+			  "", aspect, NULL, noxkbd, 0, video_port, scale_video, 0,
-+			  aspect_controller,
-+#ifndef IS_FBFE
-+			  window_id
-+#else
-+			  0
-+#endif
-+			  )) {
-     fprintf(stderr, "Error opening display\n");
-     fe->fe_free(fe);
-     return -4;
-diff -ru xineliboutput-cvs-20090810-orig/xine_sxfe_frontend.c xineliboutput-cvs-20090810/xine_sxfe_frontend.c
---- xineliboutput-cvs-20090810-orig/xine_sxfe_frontend.c	2009-08-10 13:17:34.000000000 +0200
-+++ xineliboutput-cvs-20090810/xine_sxfe_frontend.c	2009-08-10 13:55:13.999963596 +0200
-@@ -903,8 +903,10 @@
-                              int xpos, int ypos,
-                              int width, int height, int fullscreen, int hud,
-                              int modeswitch, const char *modeline, int aspect,
--                             fe_keypress_f keyfunc, int no_x_kbd, const char *video_port,
--                             int scale_video, int field_order)
-+                             fe_keypress_f keyfunc, int no_x_kbd, int gui_hotkeys,
-+			     const char *video_port,
-+                             int scale_video, int field_order,
-+			     const char *aspect_controller, int window_id)
- {
-   sxfe_t    *this = (sxfe_t*)this_gen;
- 
-@@ -1156,6 +1158,7 @@
-  * configure windows
-  */
- static int sxfe_display_config(frontend_t *this_gen, 
-+			       int xpos, int ypos,
- 			       int width, int height, int fullscreen, 
- 			       int modeswitch, const char *modeline, 
- 			       int aspect, int scale_video, 
-@@ -1250,7 +1253,7 @@
-     this->ypos = this->origypos;
-   }
- 
--  this->fe.fe_display_config((frontend_t*)this, this->origwidth, this->origheight,
-+  this->fe.fe_display_config((frontend_t*)this, -1, -1, this->origwidth, this->origheight,
- 			     this->fullscreen ? 0 : 1, 
- 			     this->vmode_switch, this->modeline, 
- 			     this->aspect, this->scale_video, this->field_order);
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.5-ldflags.patch b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.5-ldflags.patch
deleted file mode 100644
index 64417a912b12..000000000000
--- a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.5-ldflags.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- xineliboutput-1.0.5/Makefile.orig	2010-10-05 15:26:49.000000000 +0200
-+++ xineliboutput-1.0.5/Makefile	2010-10-05 15:29:49.000000000 +0200
-@@ -111,11 +111,11 @@
- ifeq ($(APPLE_DARWIN), 1)
-     CXXFLAGS   ?= -O3 -pipe -Wall -Woverloaded-virtual -fPIC -g -fno-common -bundle -flat_namespace -undefined suppress
-     CFLAGS     ?= -O3 -pipe -Wall -fPIC -g -fno-common -bundle -flat_namespace -undefined suppress
--    LDFLAGS_SO ?= -fvisibility=hidden
-+    LDFLAGS_SO ?= $(LDFLAGS) -fvisibility=hidden
- else
-     CXXFLAGS   ?= -O3 -pipe -Wall -Woverloaded-virtual -fPIC -g 
-     CFLAGS     ?= -O3 -pipe -Wall -fPIC -g
--    LDFLAGS_SO ?= -shared -fvisibility=hidden 
-+    LDFLAGS_SO ?= $(LDFLAGS) -shared -fvisibility=hidden 
- endif
- LIBS_VDR ?= 
- 
-@@ -482,7 +482,7 @@
- 	@-rm -rf $(LIBDIR)/$(VDRPLUGIN_SXFE_SO).$(VERSION)
- 	@cp $@ $(LIBDIR)/$(VDRPLUGIN_SXFE_SO).$(VERSION)
- $(VDRSXFE): $(OBJS_SXFE)
--	$(CC) -g $(OBJS_SXFE) $(LIBS_X11) -ljpeg $(LIBS_XINE) -o $@
-+	$(CC) -g $(LDFLAGS) $(OBJS_SXFE) $(LIBS_X11) -ljpeg $(LIBS_XINE) -o $@
- endif
- 
- ifeq ($(XINELIBOUTPUT_FB), 1)
-@@ -491,7 +491,7 @@
- 	@-rm -rf $(LIBDIR)/$(VDRPLUGIN_FBFE_SO).$(VERSION)
- 	@cp $@ $(LIBDIR)/$(VDRPLUGIN_FBFE_SO).$(VERSION)
- $(VDRFBFE): $(OBJS_FBFE)
--	$(CC) -g $(OBJS_FBFE) $(LIBS_XINE) -ljpeg -o $@
-+	$(CC) -g $(LDFLAGS) $(OBJS_FBFE) $(LIBS_XINE) -ljpeg -o $@
- endif
- 
- ifeq ($(XINELIBOUTPUT_XINEPLUGIN), 1)
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch
deleted file mode 100644
index 9e4569347771..000000000000
--- a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: Makefile
-===================================================================
-RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/Makefile,v
-retrieving revision 1.106
-diff -u -b -B -r1.106 Makefile
---- Makefile	23 Jan 2011 19:42:08 -0000	1.106
-+++ Makefile	28 Feb 2011 21:16:10 -0000
-@@ -323,7 +323,7 @@
- install : XINELIBOUTPUT_INSTALL_MSG =
- 
- .PHONY: all
--all: config $(TARGETS_VDR) frontends i18n
-+all: config $(TARGETS_VDR) frontends
- 
- frontends: config $(TARGETS_FE) $(TARGETS_XINE)
- 	$(XINELIBOUTPUT_INSTALL_MSG)
-@@ -389,7 +389,7 @@
- # install
- #
- 
--install: all
-+install: all i18n
- ifeq ($(XINELIBOUTPUT_XINEPLUGIN), yes)
- 	@mkdir -p $(DESTDIR)/$(XINEPLUGINDIR)/post
- 	@echo Installing $(DESTDIR)/$(XINEPLUGINDIR)/$(XINEINPUTVDR)
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
new file mode 100644
index 000000000000..5d146436a235
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_p20130821.ebuild,v 1.1 2015/02/12 10:11:33 hd_brummy Exp $
+
+EAPI=5
+
+inherit vdr-plugin-2
+
+GENTOO_VDR_CONDITIONAL=yes
+
+DESCRIPTION="VDR Plugin: Xinelib PlugIn"
+HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
+SRC_URI="http://vdr.websitec.de/download/${PN}/xineliboutput-2.0.0_p20130821.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="bluray caps dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
+
+COMMON_DEPEND="
+	vdr? (
+		>=media-video/vdr-1.6.0
+		libextractor? ( >=media-libs/libextractor-0.5.20 )
+		caps? ( sys-libs/libcap )
+	)
+
+	xine? (
+		( >=media-libs/xine-lib-1.2
+			virtual/ffmpeg )
+		fbcon? ( jpeg? ( virtual/jpeg ) )
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrender
+			xinerama? ( x11-libs/libXinerama )
+			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
+			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2 )
+			jpeg? ( virtual/jpeg )
+			bluray? ( media-libs/libbluray )
+			opengl? ( virtual/opengl )
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-kernel/linux-headers
+	nls? ( sys-devel/gettext )
+	xine? (
+		X? (
+			x11-proto/xproto
+			x11-libs/libXxf86vm
+		)
+	)"
+RDEPEND="${COMMON_DEPEND}"
+
+REQUIRED_USE=" || ( vdr xine )"
+
+VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
+
+pkg_setup() {
+	vdr-plugin-2_pkg_setup
+
+	if use xine; then
+		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
+		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
+	fi
+}
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	if has_version ">=media-video/vdr-2.1.10"; then
+		sed -e "s:pm = RenderPixmaps():pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()):"\
+			-e "s:delete pm;:DestroyPixmap(pm);:"\
+			-i osd.c
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	if has_version ">=media-libs/xine-lib-1.2"; then
+		myconf="${myconf} --enable-libavutil"
+	else
+		myconf="${myconf} --disable-libavutil"
+	fi
+
+	# No autotools based configure script
+	./configure \
+		--cc=$(tc-getCC) \
+		--cxx=$(tc-getCXX) \
+		$(use_enable X x11) \
+		$(use_enable X xshm) \
+		$(use_enable X xdpms) \
+		$(use_enable X xshape) \
+		$(use_enable X xrender) \
+		$(use_enable fbcon fb) \
+		$(use_enable vdr) \
+		$(use_enable xine libxine) \
+		$(use_enable libextractor) \
+		$(use_enable caps libcap) \
+		$(use_enable jpeg libjpeg) \
+		$(use_enable xinerama) \
+		$(use_enable vdpau) \
+		$(use_enable dbus dbus-glib-1) \
+		$(use_enable nls i18n) \
+		$(use_enable bluray libbluray) \
+		$(use_enable opengl) \
+		${myconf} \
+		|| die
+
+	# UINT64_C is needed by ffmpeg headers
+	append-cxxflags -D__STDC_CONSTANT_MACROS
+}
+
+src_install() {
+	if use vdr; then
+		vdr-plugin-2_src_install
+
+		# bug 346989
+		insinto /etc/vdr/plugins/xineliboutput/
+		doins examples/allowed_hosts.conf
+		fowners -R vdr:vdr /etc/vdr/
+
+		if use nls; then
+			emake DESTDIR="${D}" i18n
+		fi
+
+		if use xine; then
+			doinit "${FILESDIR}"/vdr-frontend
+
+			insinto $XINE_PLUGIN_DIR
+			doins xineplug_inp_xvdr.so
+
+			insinto $XINE_PLUGIN_DIR/post
+			doins xineplug_post_*.so
+
+			if use fbcon; then
+				dobin vdr-fbfe
+
+				insinto $VDR_PLUGIN_DIR
+				doins libxineliboutput-fbfe.so.*
+			fi
+
+			if use X; then
+				dobin vdr-sxfe
+
+				insinto $VDR_PLUGIN_DIR
+				doins libxineliboutput-sxfe.so.*
+			fi
+		fi
+	else
+		emake DESTDIR="${D}" install
+
+		dodoc HISTORY README
+	fi
+}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index ca10952639d1..afcb0ce148c8 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild,v 1.18 2015/01/15 18:52:25 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild,v 1.19 2015/02/12 10:11:33 hd_brummy Exp $
 
 EAPI=5
 GENTOO_VDR_CONDITIONAL=yes
@@ -57,7 +57,7 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}"
 
 S=${WORKDIR}/${PN}
-VDR_CONFD_FILE="${FILESDIR}/confd-1.0.0_pre6"
+VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
 
 pkg_setup() {
 	if ! use vdr && ! use xine; then
@@ -131,6 +131,8 @@ src_install() {
 		fi
 
 		if use xine; then
+			doinit "${FILESDIR}"/vdr-frontend
+
 			insinto $XINE_PLUGIN_DIR
 			doins xineplug_inp_xvdr.so