media-plugins/vdr-xineliboutput: version bump

commit will also include:
cleanup old
version control moved from CVS to Git
eapi=7

Suggested-By: Pertti Kosunen <pertti.kosunen@pp.nic.fi>
Suggested-By: Christian Kunkel <ch.kunkel@gmx.de>
Bug: https://bugs.gentoo.org/614136
Bug: https://bugs.gentoo.org/648748
Closes: https://bugs.gentoo.org/614136
Closes: https://bugs.gentoo.org/648748
Package-Manager: Portage-2.3.81, Repoman-2.3.18
Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org>

5 files changed, 21 insertions, 332 deletions

diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 269704ed6f11..023e8ba28089 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,4 +1,2 @@
-DIST vdr-xineliboutput-1.1.0.tgz 404820 BLAKE2B d2ed09b0b39878f6a865180e110502d774d6087b56bb905af0994c9b397de0db0d54599c6957022defeb9fcbcdd197de505aaf83b6e13845f55e14b65c825530 SHA512 255ae698c1dc9d9098847e62c386a6bd24ec1dc822fb695600ef944e18d0febfac0d5b487de57a17ea9f9bd3935d1d11763a06a5daa527ce95f9557a408c264d
 DIST vdr-xineliboutput-2.0.0.tgz 413085 BLAKE2B 85fffdbea51917035475863019095ed81bdda6e8e994c3d76b83433fca14cf680c64e268c04316199f6b707b5da7bf0ceafb991781ced552abebebf2e283fb5f SHA512 9410072bcd8ae71196e3417c12dc810da109f155748d58b3b0b422cd6d8cd29b3f8a7d0cbffada9dd22af679161ffeb096e952f620ed1c7f1122b46bf111f9ee
-DIST vdr-xineliboutput-2.0.0_p20150220.tar.xz 326520 BLAKE2B ee3c4c61b4df79fe8ae1a06119e0427e027d462c8d85f567b787604993427f70dc1d532c41dd1c1778ba96ff351c0f08db925820e075a3ed4a8837f7ae47cada SHA512 8e3a6fe4dad4875b1e2d2c6667e1c5d8f4542742fb74c40148aa5dc403b86743c32a49e1fb0979a59c312aaff4c038347f934105b0ca8d3097b61c59021966f3
-DIST xineliboutput-2.0.0_p20130821.tar.bz2 356633 BLAKE2B 499f3d341cfaf24ec00da4f159ad33182abf22295928cd57e87d9141fb971a4f75a66e5c3f38b7f3b5a227c5c91ec3a644160ebdbc203f8c4d733b8e1b12f64e SHA512 ee25447749dc5b8fe93da3c021823f8dd552619d64575525918c15447135af0d6684e613b20a1aa99a1fd8bd5334344ea03962ab75bbbffb0204d92adf36f9ed
+DIST vdr-xineliboutput-2.1.0.tgz 415333 BLAKE2B 8311271dda889cde5ab69d5bf1f643c8f6b1991ca615ce6322ea5585aac12b07b32f6fd933bf6c3797d45971597e61d429e4d9de356246109cab7c8f059b4d79 SHA512 226654dcd47864e9df8282ef401509d291677587b2850872c535abb7bee468a7c6d72c30953090890d002f0977aa1ee357a0fe6938ce3f3c1b6324e82b926537
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
deleted file mode 100644
index 22ecc06ccddf..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.1.0.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-GENTOO_VDR_CONDITIONAL=yes
-
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
-HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
-
-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-base/xorg-proto
-			x11-libs/libXxf86vm
-		)
-	)"
-RDEPEND="${COMMON_DEPEND}"
-
-REQUIRED_USE=" || ( vdr xine )"
-
-VDR_CONFD_FILE="${FILESDIR}/confd-1.0.0_pre6"
-
-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.2"; then
-		sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" \
-		-i config.c menu.c tools/udp_pes_scheduler.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
-			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-2.0.0_pre20130821.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
deleted file mode 100644
index 6f3eb19458b0..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20130821.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-GENTOO_VDR_CONDITIONAL=yes
-
-DESCRIPTION="VDR Plugin: Xinelib PlugIn"
-HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-MY_P=${PN#vdr-}-${PV/_pre/_p}
-SRC_URI="http://vdr.websitec.de/download/${PN}/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-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-base/xorg-proto
-			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
-			doinitd "${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-2.0.0_pre20150220.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
index d383380175cd..82652c7fe666 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.0.0_pre20150220.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit vdr-plugin-2
 
@@ -9,18 +9,16 @@ GENTOO_VDR_CONDITIONAL=yes
 
 DESCRIPTION="VDR Plugin: Xinelib PlugIn"
 HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
-MY_PV=${PV/_pre/_p}
-SRC_URI="http://vdr.websitec.de/download/${PN}/${PN}-${MY_PV}.tar.xz"
-S="${WORKDIR}/${VDRPLUGIN}-${MY_PV}"
+SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE="bluray caps dbus fbcon jpeg libextractor nls opengl +vdr vdpau +X +xine xinerama"
+IUSE="bluray caps cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
 
 COMMON_DEPEND="
 	vdr? (
-		>=media-video/vdr-1.6.0
+		media-video/vdr
 		libextractor? ( >=media-libs/libextractor-0.5.20 )
 		caps? ( sys-libs/libcap )
 	)
@@ -33,12 +31,13 @@ COMMON_DEPEND="
 			x11-libs/libX11
 			x11-libs/libXext
 			x11-libs/libXrender
-			xinerama? ( x11-libs/libXinerama )
+			bluray? ( media-libs/libbluray )
 			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 )
+			vaapi? ( x11-libs/libva >=media-libs/xine-lib-1.2[vaapi] )
+			vdpau? ( x11-libs/libvdpau >=media-libs/xine-lib-1.2[vdpau] )
+			xinerama? ( x11-libs/libXinerama )
 		)
 	)"
 
@@ -84,12 +83,14 @@ src_configure() {
 		$(use_enable X xshm) \
 		$(use_enable X xdpms) \
 		$(use_enable X xshape) \
+		$(use_enable X xrandr) \
 		$(use_enable X xrender) \
 		$(use_enable fbcon fb) \
 		$(use_enable vdr) \
 		$(use_enable xine libxine) \
 		$(use_enable libextractor) \
 		$(use_enable caps libcap) \
+		$(use_enable cec libcec) \
 		$(use_enable jpeg libjpeg) \
 		$(use_enable xinerama) \
 		$(use_enable vdpau) \
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index bca8332076fa..d84cc0931176 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 GENTOO_VDR_CONDITIONAL=yes
 
-inherit vdr-plugin-2 cvs toolchain-funcs
+inherit git-r3 toolchain-funcs vdr-plugin-2
 
-DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
+DESCRIPTION="VDR Plugin: Xinelib PlugIn"
 HOMEPAGE="https://sourceforge.net/projects/xineliboutput/"
 
-ECVS_SERVER="xineliboutput.cvs.sourceforge.net:/cvsroot/xineliboutput"
-ECVS_MODULE="${PN}"
+EGIT_REPO_URI="https://git.code.sf.net/p/xineliboutput/git"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -55,7 +55,8 @@ DEPEND="${COMMON_DEPEND}
 	)"
 RDEPEND="${COMMON_DEPEND}"
 
-S=${WORKDIR}/${PN}
+S=${WORKDIR}/${P}
+
 VDR_CONFD_FILE="${FILESDIR}/confd-2.0.0"
 
 pkg_setup() {
@@ -73,7 +74,7 @@ pkg_setup() {
 
 src_prepare() {
 	# Allow user patches to be applied without modifyfing the ebuild
-	epatch_user
+	eaplly_user
 
 	vdr-plugin-2_src_prepare