cleanup; converted to vdr-plugin-2.eclass

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

9 files changed, 33 insertions, 875 deletions

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index d88fe4839f1a..79f5d7912e48 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.70 2013/10/19 18:40:11 idl0r Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.71 2014/01/08 19:42:13 hd_brummy Exp $
+
+*vdr-xineliboutput-1.0.5-r2 (08 Jan 2014)
+
+  08 Jan 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -vdr-xineliboutput-1.0.2.ebuild, -vdr-xineliboutput-1.0.3.ebuild,
+  -vdr-xineliboutput-1.0.4.ebuild, -vdr-xineliboutput-1.0.4_p20090810.ebuild,
+  -vdr-xineliboutput-1.0.4_p20090820.ebuild,
+  -vdr-xineliboutput-1.0.4_p20091118.ebuild, -vdr-xineliboutput-1.0.5.ebuild,
+  +vdr-xineliboutput-1.0.5-r2.ebuild:
+  cleanup; converted to vdr-plugin-2.eclass
 
   19 Oct 2013; Christian Ruppert <idl0r@gentoo.org>
   vdr-xineliboutput-9999.ebuild:
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 63adc967b840..8fc5a94b7fa8 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -5,32 +5,17 @@ AUX confd-1.0.0_pre6 856 SHA256 fd30a70c06553463414e93771306a59fdabbcf674218dac4
 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
-DIST vdr-xineliboutput-1.0.2.tgz 325042 SHA256 de8e4dbb60b73e91f7e13859b3bb246545c201edceb97431ae2bb08933b015b6
-DIST vdr-xineliboutput-1.0.3.tgz 329144 SHA256 a194fbdfc79791f0980715dcb98b1f9393562052e125aedb8401f4691be1ae92
-DIST vdr-xineliboutput-1.0.4.tgz 327859 SHA256 c1cb82e02b193356864c0f6e12fb9ef59406fc2ce94244925d7523b3ec58e8ef
 DIST vdr-xineliboutput-1.0.5.tgz 366309 SHA256 305f98f00f40d319bb5beb44f832a445e9d36a33a5c4966874f368f4bbffaf91
-DIST vdr-xineliboutput-cvs-20090810.tar.bz2 295621 SHA256 3630eadd9eb97fd997e3d238d2166a0be4e0018bb885d6719b3639461ac22db5
-DIST vdr-xineliboutput-cvs-20090820.tar.bz2 306261 SHA256 aead394ac521866acc31dd15621035fe8a061b72ffc5c76060195ff26f564824
-DIST vdr-xineliboutput-cvs-20091118.tar.bz2 330515 SHA256 2c3ef82851e01c895f93138fb16495a2f2676ecc151da9d63cd28056c093b8dc
-EBUILD vdr-xineliboutput-1.0.2.ebuild 2488 SHA256 07e188bd79a75a32dfa147b799d09dc0c375b617de5a29014ef843391d6eaac7 SHA512 a488b47113b4cda874e0647ff9f1b8b9583592c43f5cfbfc0ee8540c6befd6cbddf7ae6c292ee2f8c9b64480515c52cd249a62958d28bf3248e8e9f2d0f228c7 WHIRLPOOL 2a48a97668305d137141318cae2059d61a00c443451e28aa79d3635679318d20fbbf6fdf4293dc23cd48a4941e1d4788c49cde91655f11f485a563fb920f2354
-EBUILD vdr-xineliboutput-1.0.3.ebuild 2488 SHA256 83b1c4d738ed3e4e3ba0772fc2f209f55d7ec0e8bbc9580b18d98a1e09f19bae SHA512 4f725d1ff89b73ed171df320944f6a1bc350ae7a9d709358da3cdd1c8e7af93945270e439a9e67f6f9aee2cf47177a7b555444411fe2252ccc32215b8e1bd37e WHIRLPOOL 2f9f198f8ce3e353eeb5f4d4b6ce2314612e4e8db137cd278d452977a242080833f6bcc9a0efb0fd6e09ba90391f45e420d40c5982703e698a43ca151dcb9386
-EBUILD vdr-xineliboutput-1.0.4.ebuild 3237 SHA256 30e980fa3a43ee582962b2fe2682e77e54642cb4cfce3bf3a2d8d4d20b0baf5b SHA512 765af61c8db003568a1007c16f5b1ef773056a60cede11e2fd03d243f4caada76f19f2c59b19b9acc4a85ff20103064948690124f1bd04c043097d5fc0e3ddc9 WHIRLPOOL 063653436a28a8f69b7ea0367b165e16080aeb89697e118987c06c1db4425a0b6f43ce71eba43b3de1e82e39ca4ddbf80cf79b624f1def12d8ac9d3565501c25
-EBUILD vdr-xineliboutput-1.0.4_p20090810.ebuild 3447 SHA256 9ba6db79324ac63f0789ebeed542cbb47c2fc189a33625c088279016c2fc939d SHA512 84508dc53ca4e25144ed67b7b24db53dc014aa83a713134ba2fb1c7a05368c4e13b3ec94db2edfc2e2a07fb87542e60f8ce3899a129259c4073d14d1eb62be37 WHIRLPOOL 078924288a6c4700c4cde64f4e1ec63866fde9a3d733592fd0cccdaf653c55f40255ceabd1fe25f4bd469dc4c08430ddd997e237d00ed309b4cc7ce230090aa6
-EBUILD vdr-xineliboutput-1.0.4_p20090820.ebuild 3587 SHA256 979c8ece7a4e751e1818cea3d4293c12bd77e884c8181ef9aecbeb2658e1b724 SHA512 b34a88cbbaeef039d9441deb8e1356eb81eb30bd34d22f02c9c83667e0ed9745479d1c432469d2c99a4ce48eb24e9b56de43f64edda15b308d60f4c6094af933 WHIRLPOOL fa0c099841a3ff6821afae13d2ae4965c93157f3161c83f3c5e3b63a4809fcfcb532945d25268e73a96c7a58323febf6be958a5996650d90028b0edfc730402c
-EBUILD vdr-xineliboutput-1.0.4_p20091118.ebuild 3587 SHA256 6574a1399a7bbd9fd198bf74ccd47487d998e4e6a5e7647f18012fe8579c259b SHA512 96b570cdd6d3cbeb4e95d91b0cff391fe6c8c11b80cb646db623815770f8dac9a3f5616b3d657f6b5b41e82fae8cbdd34430c97050b25dde7b4692b6fbe3e99c WHIRLPOOL 7ca81ae98d275d99ffe98586fd6208154104bfd14af3c8eb4ebc7455599013bd8a3fe2a05293cc7179458b90f6b5c24db41a50cd5bc33f6bd93ca8d13780244a
 EBUILD vdr-xineliboutput-1.0.5-r1.ebuild 3596 SHA256 af78f428673cbd75a2c162ad9f6880368339b6e9de1b3075c3c8dc23ca31336a SHA512 691b2495ff03392994da767f1631c3e9d88f9ae7e2bada9a13ef0540550dcf7aaac50b8e6c1017d9730fb6482a261452e3f374985b44067878ee225425a7af9b WHIRLPOOL fe8ac59616b4bf05cc0993d6ebc60ba38f575604cbae94a99b8cc3c30de25e189b5b02d51578f980f9c35a797c4ba2408766e55aec6b0dd5e5d20cf7ab77b52c
-EBUILD vdr-xineliboutput-1.0.5.ebuild 3524 SHA256 4d49e4c4fdc1e4e9dd9e5fee5cdc064a68d3322d6902953c1dc02ca16b3f25d8 SHA512 80bf863a5f5760c526e4fcf008735a2695db9c88a0b79c440a1e3f972cd3129e8540d607e543bfa730c0f7e39fc0b188d4cc777b74289b80a4bc7c219c1c7b67 WHIRLPOOL d72892e765a8f15234c4f6fc7834c4f5699faa43da0679ce3360c70a385794e69a2b4ffcd6ddad980d50379cd4fa97e515216583e861d94060028100fd276860
+EBUILD vdr-xineliboutput-1.0.5-r2.ebuild 3580 SHA256 e072e330fad8149263ee5b215a8cbb9b9c666292277b09cfae6eb03065d25682 SHA512 2f6d67b1a849ea1e3138d893794f1b79753fb743785b2d102eb577b204a3c3bdc37e3ac24ab04a34bbb94ba431d3c6b02641943e9771bb01c688cedae4c7e5b9 WHIRLPOOL 8da5fd8e495acafa488d9bb992425e5626007dadd0399112ff1fb8ea0dd8539a6dc432b68488a5df29a55f2ef2a8f39c015d321b95d4a88f39de93cc018de5dd
 EBUILD vdr-xineliboutput-9999.ebuild 3544 SHA256 9a0336ac1ee13f344f4f30696360289ef302b231b7ad3916cdb9453e19c0a315 SHA512 eb11ee8e5f034f2158011024bbb83de2befec862365c9e458751327ac350c69af943133f611320aaab44c96c558111c04ef1faf93d4a3153b8e2be88667fd842 WHIRLPOOL 64e4f3f41847ea911267e43d185142478439e29a2055069093c5e5af8024bbf99f1e1156cfdc2b79a83a469a726aef959e6d7585cde9f2e1ab6d8bd0989763e0
-MISC ChangeLog 14125 SHA256 d6a098e9ca028b1a7b17f2222d3bdae714b0da48ccac29b7000e3c9f0f1ed362 SHA512 7cb64c39bd6a3096e1b2a46388f223abaae889c6414c937aa86613864e82e75b51e3e7d80e24f7e4e0f835695e5b8e63388a3baf69c1d76aeca2aa42340800b2 WHIRLPOOL 76aeda27f018d81c449dca4d5a83d16e25e57563a35a7518b761d4d114962608d6c6bc82e2ab5e55eb7efbcabe5f13fd98dca00429cd26b2cd9081605e317ed2
+MISC ChangeLog 14579 SHA256 8cc40b25f64fae3e042c1ae25369081dddc3f12788deb61097d13c21674929da SHA512 711d3061637d81c29a284e0a640463a565c45527e1cb56e5cf98f543a38f02b49431eedef22037947b0eae0f33751d2af99c866304f640a00cb2b8519a1dd0ee WHIRLPOOL 526ac8af39720ae10350bff42c632cfae5f4b8ff51214481707c2ce89395051c3a1c798ea992db1e385da61c1898cc29766b70a6d65ea504809954508457aa2c
 MISC metadata.xml 661 SHA256 1a7101722ff9f256d842bc7ad8d6cf261c9c370198aaf1d2d4b63b50bc281c73 SHA512 225fdf6a2853e7f343dfebfbb39da2fdfda38035b9311da3ef78e0d9fbba8b760a83abb4c83efec0721752d0a956ae4a182a859ee1539aa15c086b2e975e683b WHIRLPOOL a6de244a81585d694a36c3c559385eb39501416c340f809a296e41a6a80318a888811c76c4447efcf2dd0f3acf3acc22242825e4bfa5204ce77e08436b3f3492
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iQEcBAEBCAAGBQJSYtIRAAoJEMOx0zmdw4Z1wVkIAJppgiwtfy5CwU+yCP6FUMQO
-1lr3lrg9k5y8L36ANLbdgRPAbBjL70bnc2Xjx+5DjLGdhIk0nXLstCxQSzrSHdPR
-6QP9rYkzZg6srWyKg8SYueb0fjV03em3n8iIXoOscte+BP94InfYomBL1xef32+Q
-OJt2zv2IYrY1lV+uU/ViUOmQ4mMW0xQWGPp2uV+K4BB4kmWcKszJkMR9Da/Jlk3e
-BGTQ3Bui43Ux0D30H3ac0dqoiKR7BH6MwG4yXwbdCPtMshxJ6y/gxOYBY6V1y9lL
-iOGBmikBNajU1FkZ02UTEXTQ9DPMKDqazHM1BcM4G2KSkg8Q8pOObP6wFqcG/Qg=
-=pT6R
+iD8DBQFSzaobdn07HTTCgIoRCKjxAKCeEIKM3oL+dqZC3SlqZmfLIQcjagCfWnUt
++oxXmrRAksQ9XeLEN9ekBmM=
+=FZ6d
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.2.ebuild
deleted file mode 100644
index 9de1e09b3450..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.2.ebuild,v 1.2 2011/02/26 18:57:57 signals Exp $
-
-inherit vdr-plugin eutils multilib versionator
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-SO_VERSION="${PV%_p*}"
-SO_VERSION="${SO_VERSION/_/}"
-
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
-HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${MY_P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="fbcon X libextractor"
-
-RDEPEND=">=media-video/vdr-1.4.0
-		>=media-libs/xine-lib-1.1.1
-		virtual/jpeg
-		libextractor? ( >=media-libs/libextractor-0.5.20 )
-		X? (
-			x11-proto/xextproto
-			x11-proto/xf86vidmodeproto
-			x11-proto/xproto
-			x11-proto/renderproto
-		)"
-
-DEPEND="${RDEPEND}
-		sys-kernel/linux-headers
-		X? (
-			x11-libs/libX11
-			x11-libs/libXv
-			x11-libs/libXext
-			x11-libs/libXrender
-		)"
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
-
-use_onoff() {
-	if use "$1"; then
-		echo 1
-	else
-		echo 0
-	fi
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	cd "${S}"
-
-	XINE_PLUGIN_DIR=$(xine-config --plugindir)
-	if [[ ${XINE_PLUGIN_DIR} = "" ]]; then
-		eerror "Could not find xine plugin dir"
-		die "Could not find xine plugin dir"
-	fi
-	# stop some automagic overwriting the stuff we set
-	sed -e '/XINELIBOUTPUT_VDRPLUGIN = 1/s/^/#/' \
-		-e '/HAVE_EXTRACTOR_H = 1/s/^/#/' \
-		-i Makefile
-
-	cat >>Make.config <<-EOF
-		XINELIBOUTPUT_XINEPLUGIN = 1
-		XINELIBOUTPUT_VDRPLUGIN = 1
-
-		XINELIBOUTPUT_FB = $(use_onoff fbcon)
-		XINELIBOUTPUT_X11 = $(use_onoff X)
-
-		HAVE_XRENDER = 1
-		HAVE_XDPMS = 1
-		HAVE_EXTRACTOR_H = $(use_onoff libextractor)
-	EOF
-
-	# patching makefile to work with this
-	# $ rm ${outdir}/file; cp file ${outdir}/file
-	# work in the sandbox
-	sed -i Makefile \
-		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
-		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
-	mkdir -p "${WORKDIR}/lib"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	use fbcon && dobin vdr-fbfe
-	use X && dobin vdr-sxfe
-
-	# There may be no sub-plugin, depending on use-flags
-	insinto ${VDR_PLUGIN_DIR}
-	local f
-	for f in libxineliboutput*.so.${SO_VERSION}; do
-		[[ -f "$f" ]] || continue
-		doins "${f}" || die "could not install sub-plugin ${f}"
-	done
-
-	insinto "${XINE_PLUGIN_DIR}"
-	doins xineplug_inp_*.so
-
-	insinto "${XINE_PLUGIN_DIR}"/post
-	doins xineplug_post_*.so
-}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.3.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.3.ebuild
deleted file mode 100644
index 73cbe100201f..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.3.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.3.ebuild,v 1.2 2011/02/26 18:57:57 signals Exp $
-
-inherit vdr-plugin eutils multilib versionator
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-SO_VERSION="${PV%_p*}"
-SO_VERSION="${SO_VERSION/_/}"
-
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
-HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${MY_P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="fbcon X libextractor"
-
-RDEPEND=">=media-video/vdr-1.4.0
-		>=media-libs/xine-lib-1.1.1
-		virtual/jpeg
-		libextractor? ( >=media-libs/libextractor-0.5.20 )
-		X? (
-			x11-proto/xextproto
-			x11-proto/xf86vidmodeproto
-			x11-proto/xproto
-			x11-proto/renderproto
-		)"
-
-DEPEND="${RDEPEND}
-		sys-kernel/linux-headers
-		X? (
-			x11-libs/libX11
-			x11-libs/libXv
-			x11-libs/libXext
-			x11-libs/libXrender
-		)"
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
-
-use_onoff() {
-	if use "$1"; then
-		echo 1
-	else
-		echo 0
-	fi
-}
-
-src_unpack() {
-	vdr-plugin_src_unpack
-
-	cd "${S}"
-
-	XINE_PLUGIN_DIR=$(xine-config --plugindir)
-	if [[ ${XINE_PLUGIN_DIR} = "" ]]; then
-		eerror "Could not find xine plugin dir"
-		die "Could not find xine plugin dir"
-	fi
-	# stop some automagic overwriting the stuff we set
-	sed -e '/XINELIBOUTPUT_VDRPLUGIN = 1/s/^/#/' \
-		-e '/HAVE_EXTRACTOR_H = 1/s/^/#/' \
-		-i Makefile
-
-	cat >>Make.config <<-EOF
-		XINELIBOUTPUT_XINEPLUGIN = 1
-		XINELIBOUTPUT_VDRPLUGIN = 1
-
-		XINELIBOUTPUT_FB = $(use_onoff fbcon)
-		XINELIBOUTPUT_X11 = $(use_onoff X)
-
-		HAVE_XRENDER = 1
-		HAVE_XDPMS = 1
-		HAVE_EXTRACTOR_H = $(use_onoff libextractor)
-	EOF
-
-	# patching makefile to work with this
-	# $ rm ${outdir}/file; cp file ${outdir}/file
-	# work in the sandbox
-	sed -i Makefile \
-		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
-		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
-	mkdir -p "${WORKDIR}/lib"
-}
-
-src_install() {
-	vdr-plugin_src_install
-
-	use fbcon && dobin vdr-fbfe
-	use X && dobin vdr-sxfe
-
-	# There may be no sub-plugin, depending on use-flags
-	insinto ${VDR_PLUGIN_DIR}
-	local f
-	for f in libxineliboutput*.so.${SO_VERSION}; do
-		[[ -f "$f" ]] || continue
-		doins "${f}" || die "could not install sub-plugin ${f}"
-	done
-
-	insinto "${XINE_PLUGIN_DIR}"
-	doins xineplug_inp_*.so
-
-	insinto "${XINE_PLUGIN_DIR}"/post
-	doins xineplug_post_*.so
-}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4.ebuild
deleted file mode 100644
index f17e663f831e..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4.ebuild,v 1.4 2012/04/13 19:31:39 ulm Exp $
-
-EAPI=2
-GENTOO_VDR_CONDITIONAL=yes
-
-inherit vdr-plugin eutils multilib versionator
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-SO_VERSION="${PV%_p*}"
-SO_VERSION="${SO_VERSION/_/}"
-
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
-HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${MY_P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+vdr +xine fbcon X libextractor"
-
-# both vdr plugin or vdr-sxfe can use X11
-COMMON_DEPEND="
-	vdr? ( >=media-video/vdr-1.4.0 )
-
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-
-	virtual/jpeg
-	libextractor? ( >=media-libs/libextractor-0.5.20 )"
-
-DEPEND="${COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? (
-		x11-libs/libX11
-		x11-libs/libXv
-		x11-libs/libXext
-		x11-libs/libXrender
-	)"
-RDEPEND="${COMMON_DEPEND}
-	X? (
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-		x11-proto/xproto
-		x11-proto/renderproto
-	)"
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! use vdr && ! use xine; then
-		eerror "Compiling ${PN} with USE='-vdr -xine' is not possible."
-		eerror "You either need at least one of these flags."
-		#die "${PN} cannot be used with vdr support and xine support disabled!"
-	fi
-}
-
-use_onoff() {
-	if use "$1"; then
-		echo 1
-	else
-		echo 0
-	fi
-}
-
-use_onoff_xine() {
-	if use xine && use "$1"; then
-		echo 1
-	else
-		echo 0
-	fi
-}
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	if use xine; then
-		XINE_PLUGIN_DIR=$(xine-config --plugindir)
-		if [[ ${XINE_PLUGIN_DIR} = "" ]]; then
-			eerror "Could not find xine plugin dir"
-			die "Could not find xine plugin dir"
-		fi
-	fi
-
-	# stop some automagic overwriting of the stuff we set
-	sed -e '/XINELIBOUTPUT_VDRPLUGIN = 1/s/^/#/' \
-		-e '/HAVE_EXTRACTOR_H = 1/s/^/#/' \
-		-i Makefile
-
-	cat >>Make.config <<-EOF
-		XINELIBOUTPUT_XINEPLUGIN = $(use_onoff xine)
-		XINELIBOUTPUT_VDRPLUGIN = $(use_onoff vdr)
-
-		XINELIBOUTPUT_FB = $(use_onoff_xine fbcon)
-		XINELIBOUTPUT_X11 = $(use_onoff_xine X)
-
-		HAVE_XRENDER = 1
-		HAVE_XDPMS = 1
-		HAVE_EXTRACTOR_H = $(use_onoff libextractor)
-	EOF
-
-	# patching makefile to work with this
-	# $ rm ${outdir}/file; cp file ${outdir}/file
-	# work in the sandbox
-	sed -i Makefile \
-		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
-		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
-	mkdir -p "${WORKDIR}/lib"
-}
-
-src_install() {
-	if use vdr; then
-		# install vdr plugin
-		vdr-plugin_src_install
-
-		# There may be no sub-plugin, depending on use-flags
-		insinto ${VDR_PLUGIN_DIR}
-		local f
-		for f in libxineliboutput*.so.${SO_VERSION}; do
-			[[ -f "$f" ]] || continue
-			doins "${f}" || die "could not install sub-plugin ${f}"
-		done
-	fi
-
-	if use xine; then
-		# install xine-plugins
-		insinto "${XINE_PLUGIN_DIR}"
-		doins xineplug_inp_*.so
-
-		insinto "${XINE_PLUGIN_DIR}"/post
-		doins xineplug_post_*.so
-
-		# install xine-based frontends
-		use fbcon && dobin vdr-fbfe
-		use X && dobin vdr-sxfe
-
-	fi
-}
-
-pkg_config() {
-	einfo "emerge --config is not supported"
-}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090810.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090810.ebuild
deleted file mode 100644
index 47417c4438b4..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090810.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090810.ebuild,v 1.4 2012/04/13 19:31:39 ulm Exp $
-
-EAPI=2
-GENTOO_VDR_CONDITIONAL=yes
-
-inherit vdr-plugin eutils multilib versionator
-
-MY_PV=${PV#*_p}
-MY_P=${PN}-cvs-${MY_PV}
-
-SO_VERSION="${PV%_p*}"
-SO_VERSION="${SO_VERSION/_/}"
-
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
-HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+vdr +xine fbcon X libextractor xinerama"
-
-# both vdr plugin or vdr-sxfe can use X11
-# still depends need some cleanup
-COMMON_DEPEND="
-	vdr? ( >=media-video/vdr-1.4.0 )
-
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-
-	virtual/jpeg
-	libextractor? ( >=media-libs/libextractor-0.5.20 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXv
-		x11-libs/libXext
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? (
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-		x11-proto/xproto
-		x11-proto/renderproto
-		xinerama? ( x11-proto/xineramaproto )
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! use vdr && ! use xine; then
-		eerror "Compiling ${PN} with USE='-vdr -xine' is not possible."
-		eerror "You either need at least one of these flags."
-		#die "${PN} cannot be used with vdr support and xine support disabled!"
-	fi
-}
-
-use_onoff() {
-	if use "$1"; then
-		echo 1
-	else
-		echo 0
-	fi
-}
-
-use_onoff_xine() {
-	if use xine && use "$1"; then
-		echo 1
-	else
-		echo 0
-	fi
-}
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-	epatch "${FILESDIR}/${P}-compile-fix.diff"
-
-	if use xine; then
-		XINE_PLUGIN_DIR=$(xine-config --plugindir)
-		if [[ ${XINE_PLUGIN_DIR} = "" ]]; then
-			eerror "Could not find xine plugin dir"
-			die "Could not find xine plugin dir"
-		fi
-	fi
-
-	# stop some automagic overwriting of the stuff we set
-	sed -e '/XINELIBOUTPUT_VDRPLUGIN = 1/s/^/#/' \
-		-e '/HAVE_EXTRACTOR_H = 1/s/^/#/' \
-		-i Makefile
-
-	cat >>Make.config <<-EOF
-		XINELIBOUTPUT_XINEPLUGIN = $(use_onoff xine)
-		XINELIBOUTPUT_VDRPLUGIN = $(use_onoff vdr)
-
-		XINELIBOUTPUT_FB = $(use_onoff_xine fbcon)
-		XINELIBOUTPUT_X11 = $(use_onoff_xine X)
-
-		HAVE_XRENDER = 1
-		HAVE_XDPMS = 1
-		HAVE_EXTRACTOR_H = $(use_onoff libextractor)
-		HAVE_XINERAMA = $(use_onoff xinerama)
-	EOF
-
-	# patching makefile to work with this
-	# $ rm ${outdir}/file; cp file ${outdir}/file
-	# work in the sandbox
-	sed -i Makefile \
-		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
-		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
-	mkdir -p "${WORKDIR}/lib"
-}
-
-src_install() {
-	if use vdr; then
-		# install vdr plugin
-		vdr-plugin_src_install
-
-		# There may be no sub-plugin, depending on use-flags
-		insinto ${VDR_PLUGIN_DIR}
-		local f
-		for f in libxineliboutput*.so.${SO_VERSION}; do
-			[[ -f "$f" ]] || continue
-			doins "${f}" || die "could not install sub-plugin ${f}"
-		done
-	fi
-
-	if use xine; then
-		# install xine-plugins
-		insinto "${XINE_PLUGIN_DIR}"
-		doins xineplug_inp_*.so
-
-		insinto "${XINE_PLUGIN_DIR}"/post
-		doins xineplug_post_*.so
-
-		# install xine-based frontends
-		use fbcon && dobin vdr-fbfe
-		use X && dobin vdr-sxfe
-
-	fi
-}
-
-pkg_config() {
-	einfo "emerge --config is not supported"
-}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild
deleted file mode 100644
index 46d5177cde14..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20090820.ebuild,v 1.5 2012/04/13 19:31:39 ulm Exp $
-
-EAPI=2
-GENTOO_VDR_CONDITIONAL=yes
-
-inherit vdr-plugin eutils multilib versionator
-
-MY_PV=${PV#*_p}
-MY_P=${PN}-cvs-${MY_PV}
-
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
-HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+vdr +xine fbcon X libextractor xinerama"
-
-# both vdr plugin or vdr-sxfe can use X11
-# still depends need some cleanup
-COMMON_DEPEND="
-	vdr? ( >=media-video/vdr-1.4.0 )
-
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-
-	virtual/jpeg
-	libextractor? ( >=media-libs/libextractor-0.5.20 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXv
-		x11-libs/libXext
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? (
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-		x11-proto/xproto
-		x11-proto/renderproto
-		xinerama? ( x11-proto/xineramaproto )
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! use vdr && ! use xine; then
-		eerror "Compiling ${PN} with USE='-vdr -xine' is not possible."
-		eerror "You either need at least one of these flags."
-		#die "${PN} cannot be used with vdr support and xine support disabled!"
-	fi
-}
-
-use_onoff() {
-	if use "$1"; then
-		echo 1
-	else
-		echo 0
-	fi
-}
-
-use_onoff_xine() {
-	if use xine && use "$1"; then
-		echo 1
-	else
-		echo 0
-	fi
-}
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-#	epatch "${FILESDIR}/${PN}-1.0.4_p20090810-compile-fix.diff"
-
-	if use xine; then
-		XINE_PLUGIN_DIR=$(xine-config --plugindir)
-		if [[ ${XINE_PLUGIN_DIR} = "" ]]; then
-			eerror "Could not find xine plugin dir"
-			die "Could not find xine plugin dir"
-		fi
-	fi
-
-	# stop some automagic overwriting of the stuff we set
-	sed -e '/XINELIBOUTPUT_VDRPLUGIN = 1/s/^/#/' \
-		-e '/HAVE_EXTRACTOR_H = 1/s/^/#/' \
-		-i Makefile
-
-	cat >>Make.config <<-EOF
-		XINELIBOUTPUT_XINEPLUGIN = $(use_onoff xine)
-		XINELIBOUTPUT_VDRPLUGIN = $(use_onoff vdr)
-
-		XINELIBOUTPUT_FB = $(use_onoff_xine fbcon)
-		XINELIBOUTPUT_X11 = $(use_onoff_xine X)
-
-		HAVE_XRENDER = 1
-		HAVE_XDPMS = 1
-		HAVE_EXTRACTOR_H = $(use_onoff libextractor)
-		HAVE_XINERAMA = $(use_onoff xinerama)
-	EOF
-
-	# patching makefile to work with this
-	# $ rm ${outdir}/file; cp file ${outdir}/file
-	# work in the sandbox
-	sed -i Makefile \
-		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
-		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
-	mkdir -p "${WORKDIR}/lib"
-}
-
-src_configure() { :; }
-
-src_install() {
-	if use vdr; then
-		# install vdr plugin
-		vdr-plugin_src_install
-
-		# version number that the sources contain
-		local SO_VERSION="$(grep 'static const char \*VERSION *=' xineliboutput.c |\
-						cut	-d'"' -f2)"
-	echo SO_VERSION=$SO_VERSION
-		insinto ${VDR_PLUGIN_DIR}
-		if use fbcon; then
-			doins libxineliboutput-fbfe.so.${SO_VERSION} || die "doins failed"
-		fi
-		if use X; then
-			doins libxineliboutput-sxfe.so.${SO_VERSION} || die "doins failed"
-		fi
-	fi
-
-	if use xine; then
-		# install xine-plugins
-		insinto "${XINE_PLUGIN_DIR}"
-		doins xineplug_inp_*.so
-
-		insinto "${XINE_PLUGIN_DIR}"/post
-		doins xineplug_post_*.so
-
-		# install xine-based frontends
-		use fbcon && dobin vdr-fbfe
-		use X && dobin vdr-sxfe
-
-	fi
-}
-
-pkg_config() {
-	einfo "emerge --config is not supported"
-}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild
deleted file mode 100644
index 06490794c065..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.4_p20091118.ebuild,v 1.5 2012/04/13 19:31:39 ulm Exp $
-
-EAPI=2
-GENTOO_VDR_CONDITIONAL=yes
-
-inherit vdr-plugin eutils multilib versionator
-
-MY_PV=${PV#*_p}
-MY_P=${PN}-cvs-${MY_PV}
-
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
-HOMEPAGE="http://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+vdr +xine fbcon X libextractor xinerama"
-
-# both vdr plugin or vdr-sxfe can use X11
-# still depends need some cleanup
-COMMON_DEPEND="
-	vdr? ( >=media-video/vdr-1.4.0 )
-
-	xine? ( >=media-libs/xine-lib-1.1.1 )
-
-	virtual/jpeg
-	libextractor? ( >=media-libs/libextractor-0.5.20 )
-
-	X? (
-		x11-libs/libX11
-		x11-libs/libXv
-		x11-libs/libXext
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-	)"
-
-DEPEND="${COMMON_DEPEND}
-	sys-kernel/linux-headers
-	X? (
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-		x11-proto/xproto
-		x11-proto/renderproto
-		xinerama? ( x11-proto/xineramaproto )
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S=${WORKDIR}/${MY_P#vdr-}
-
-VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
-
-pkg_setup() {
-	vdr-plugin_pkg_setup
-
-	if ! use vdr && ! use xine; then
-		eerror "Compiling ${PN} with USE='-vdr -xine' is not possible."
-		eerror "You either need at least one of these flags."
-		#die "${PN} cannot be used with vdr support and xine support disabled!"
-	fi
-}
-
-use_onoff() {
-	if use "$1"; then
-		echo 1
-	else
-		echo 0
-	fi
-}
-
-use_onoff_xine() {
-	if use xine && use "$1"; then
-		echo 1
-	else
-		echo 0
-	fi
-}
-
-src_prepare() {
-	vdr-plugin_src_prepare
-
-#	epatch "${FILESDIR}/${PN}-1.0.4_p20090810-compile-fix.diff"
-
-	if use xine; then
-		XINE_PLUGIN_DIR=$(xine-config --plugindir)
-		if [[ ${XINE_PLUGIN_DIR} = "" ]]; then
-			eerror "Could not find xine plugin dir"
-			die "Could not find xine plugin dir"
-		fi
-	fi
-
-	# stop some automagic overwriting of the stuff we set
-	sed -e '/XINELIBOUTPUT_VDRPLUGIN = 1/s/^/#/' \
-		-e '/HAVE_EXTRACTOR_H = 1/s/^/#/' \
-		-i Makefile
-
-	cat >>Make.config <<-EOF
-		XINELIBOUTPUT_XINEPLUGIN = $(use_onoff xine)
-		XINELIBOUTPUT_VDRPLUGIN = $(use_onoff vdr)
-
-		XINELIBOUTPUT_FB = $(use_onoff_xine fbcon)
-		XINELIBOUTPUT_X11 = $(use_onoff_xine X)
-
-		HAVE_XRENDER = 1
-		HAVE_XDPMS = 1
-		HAVE_EXTRACTOR_H = $(use_onoff libextractor)
-		HAVE_XINERAMA = $(use_onoff xinerama)
-	EOF
-
-	# patching makefile to work with this
-	# $ rm ${outdir}/file; cp file ${outdir}/file
-	# work in the sandbox
-	sed -i Makefile \
-		-e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:" \
-		-e 's:VDRINCDIR.*=.*:VDRINCDIR ?= /usr/include:'
-	mkdir -p "${WORKDIR}/lib"
-}
-
-src_configure() { :; }
-
-src_install() {
-	if use vdr; then
-		# install vdr plugin
-		vdr-plugin_src_install
-
-		# version number that the sources contain
-		local SO_VERSION="$(grep 'static const char \*VERSION *=' xineliboutput.c |\
-						cut	-d'"' -f2)"
-	echo SO_VERSION=$SO_VERSION
-		insinto ${VDR_PLUGIN_DIR}
-		if use fbcon; then
-			doins libxineliboutput-fbfe.so.${SO_VERSION} || die "doins failed"
-		fi
-		if use X; then
-			doins libxineliboutput-sxfe.so.${SO_VERSION} || die "doins failed"
-		fi
-	fi
-
-	if use xine; then
-		# install xine-plugins
-		insinto "${XINE_PLUGIN_DIR}"
-		doins xineplug_inp_*.so
-
-		insinto "${XINE_PLUGIN_DIR}"/post
-		doins xineplug_post_*.so
-
-		# install xine-based frontends
-		use fbcon && dobin vdr-fbfe
-		use X && dobin vdr-sxfe
-
-	fi
-}
-
-pkg_config() {
-	einfo "emerge --config is not supported"
-}
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.5.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.5-r2.ebuild
index b01c3b1598a8..4b203b7852c6 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.5.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.5-r2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.5.ebuild,v 1.3 2012/04/13 19:31:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.5-r2.ebuild,v 1.1 2014/01/08 19:42:13 hd_brummy Exp $
 
-EAPI=2
-GENTOO_VDR_CONDITIONAL=yes
+EAPI=5
 
-inherit vdr-plugin eutils multilib versionator
+inherit vdr-plugin-2 multilib versionator
 
 MY_PV=${PV#*_p}
 MY_P=${PN}-cvs-${MY_PV}
@@ -22,7 +21,10 @@ IUSE="+vdr +xine fbcon X libextractor xinerama"
 # both vdr plugin or vdr-sxfe can use X11
 # still depends need some cleanup
 COMMON_DEPEND="
-	vdr? ( >=media-video/vdr-1.4.0 )
+	vdr? (
+		>=media-video/vdr-1.4.0
+		!>=media-video/vdr-1.7
+	)
 
 	xine? ( >=media-libs/xine-lib-1.1.1 )
 
@@ -51,10 +53,12 @@ RDEPEND="${COMMON_DEPEND}"
 
 #S=${WORKDIR}/${MY_P#vdr-}
 
+GENTOO_VDR_CONDITIONAL=yes
+
 VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
 
 pkg_setup() {
-	vdr-plugin_pkg_setup
+	vdr-plugin-2_pkg_setup
 
 	if ! use vdr && ! use xine; then
 		eerror "Compiling ${PN} with USE='-vdr -xine' is not possible."
@@ -80,8 +84,9 @@ use_onoff_xine() {
 }
 
 src_prepare() {
-	vdr-plugin_src_prepare
+	vdr-plugin-2_src_prepare
 
+	epatch "${FILESDIR}/${P}-ldflags.patch"
 	if use xine; then
 		XINE_PLUGIN_DIR=$(xine-config --plugindir)
 		if [[ ${XINE_PLUGIN_DIR} = "" ]]; then
@@ -117,12 +122,10 @@ src_prepare() {
 	mkdir -p "${WORKDIR}/lib"
 }
 
-src_configure() { :; }
-
 src_install() {
 	if use vdr; then
 		# install vdr plugin
-		vdr-plugin_src_install
+		vdr-plugin-2_src_install
 
 		# version number that the sources contain
 		local SO_VERSION="$(grep 'static const char \*VERSION *=' xineliboutput.c |\