gentoo resync : 14.05.2020

6 files changed, 318 insertions, 6 deletions

diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 96adeb02b793..30cdffb27b2a 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -2,7 +2,9 @@ AUX confd-2.0.0 1476 BLAKE2B a1f852cb07940ff54125d88bae9467e5068e66e903b4dcdbde2
 AUX vdr-frontend 400 BLAKE2B 49713e916fbbf849517440d50343f4cedc6ffb7f65e44235df5706d4ef5881fbc92b657a0079f6c0ca9d93b3eb0fe582385b41c1d87b2dc835abd1783c723edb SHA512 e6ef3d51fa02290db8456c5b37f9a97f90557bb7943c1310ff2d8e77ee1beee3c98b1a6f012c9d97e048e3d7079b72cdeab9fa13e2a494bcb6dc58c2cd426e1f
 DIST vdr-xineliboutput-2.1.0.tgz 415333 BLAKE2B 8311271dda889cde5ab69d5bf1f643c8f6b1991ca615ce6322ea5585aac12b07b32f6fd933bf6c3797d45971597e61d429e4d9de356246109cab7c8f059b4d79 SHA512 226654dcd47864e9df8282ef401509d291677587b2850872c535abb7bee468a7c6d72c30953090890d002f0977aa1ee357a0fe6938ce3f3c1b6324e82b926537
 DIST vdr-xineliboutput-2.2.0.tgz 426058 BLAKE2B 8a5e325e0dd45dffdbcf1b9e49d4ae2486d3b3c7585dbca81855264a0a9057c48da7626acd5e9d7b2113b200eead178b19a0d9834ace5d25cd97157912d50bfa SHA512 d3b753fe496c6f73d491195cc1dac3333a46f2ef6350683fc15e3e8a423a90946574c3fdf0ed43727d61f007a8abdf3041e274317216bf06a8146dc9206f88d9
-EBUILD vdr-xineliboutput-2.1.0.ebuild 3184 BLAKE2B c92bae8a16ea267a2113d92bddeed12b964048dda20dc4175f4f9f4377b0390c212b7cd3c7fedd13063a42c7154c7b69bb5dbf7aea6aee27e8d4dc20a80683dc SHA512 79329bd06dc3def119f8b037b28d4eeef6b77729c562738a6ea78ed94da4b9378bc80eecb493562f56817a93e12941bcb1bfba1b46d5643b83e099c9913a2705
-EBUILD vdr-xineliboutput-2.2.0.ebuild 3160 BLAKE2B 5c52c25ce1c57801e1aae5b74786ff8b4a5ce4f4d70f158ae7c924c730fa9a0b28e2dd8e5d19e78e951558d230295e41f53a2bffe1155431da76cfdf54d124cf SHA512 b7d8d943e6070f55e89119fbbb971369e4b47b950322985b3f50198300cba1057cf91cbf62e995d69a3ae59c1cc1e07d70b4a312dd92b4042ea8b445b50a5e6e
-EBUILD vdr-xineliboutput-9999.ebuild 3335 BLAKE2B dd251a11d5b4d1371ad03e35eff49ed746acc29789a8d7e67658c07f1a80729a3e07e2f250d73beb1b028ab8a6391a9d4f17274cbee15270dd07695a3e48d075 SHA512 16a1e737980e841b5722d21e4735a49c5a9ba6555e8affe876fd1f62cb1652d8fd4331e106603f21a1d58771c2f720211f8a1bc4973229825849aefd2fc283e3
+EBUILD vdr-xineliboutput-2.1.0-r1.ebuild 3188 BLAKE2B 418f56485399f59bb76eb81bbb7e248c9f7442ac2b57573809f0c0a0313cbd1a636803d0bfe53aacf160a1de9ce56806272d298ebf5c3d124cdf9c5576359234 SHA512 4b46e11a54ca09c481bc587577aa32f5b81efdcbb01c1223164d4ec9fb05863c38cc3abf040d0e6a89e29bdd06f80e60b32234eb328f090becd31eeaab722279
+EBUILD vdr-xineliboutput-2.1.0-r2.ebuild 3305 BLAKE2B 71e9be805743f805bd054b8d5b0e6c20b90d1b7238f3e1ac9e6bc53cd6166bf5be58dcc42afbf88f82bbfc56d1dc48fad2e7005c732e7bd177e2b25ff7d4fb2d SHA512 596e3ada1130b726c7c28422399dbcab420f3db8b31462b6b27d49aa9b15137ff491a8e2668677ed91d2823d63f3e63b4a1e81976da5b96f072ba4d2dec3a712
+EBUILD vdr-xineliboutput-2.2.0-r1.ebuild 3164 BLAKE2B ef4f2508985dee1d6d3c63f72e73194291fb15ee823791ab65ec56483885feaed6d53e6d323c8f8bd18ab16ab830cb8031c78e1bfb42f14cc2629f66f7dc5081 SHA512 cdfeb5d8b6198f8adc2e698e3c52f9e39bca56819d5153c7a133d5746ed9a6446609a456c0c7eb17d52fecca8b119272f13061d66ff27703c3a8e46ba3462eac
+EBUILD vdr-xineliboutput-2.2.0-r2.ebuild 3280 BLAKE2B a71d3c7eb32020febac53465491b68eb9ed852a4a5d327b562cc63deb6a22c48a1ca02ba4d5388de37d165cea51c8cea9e08cd78b7283d21ff258c32d7edacac SHA512 91b52973a874b3a57c647f0f24ddeaa21c0308f7312c5e807a6f71a389eb71740c8993bd3afe6f41fa56d9a0885d3c2893063fa9be615f7aadadd320f2bd1ad0
+EBUILD vdr-xineliboutput-9999.ebuild 3339 BLAKE2B 98de50f9e2e1c39e8c6ebb7d7cb66a4e7886724083992cc09a23a66e0e1ab1452c9e11d73e4f152d2e1b1b412893424ee47a8109f833d352c24f2ab4c4dab518 SHA512 406ae53a9f2cc456c414d40712c110532928197fb42c02069a8c8bd04b57d08cc277b0a7aca06926de1602c48ef26561740d50aecffa4a91c76aeb87e47451ec
 MISC metadata.xml 830 BLAKE2B 04a0e0ba5a0afc1b2c3669a442bb5b62f44d25159c16c3a6539c541b43d22b4f30c8c6ea60b076f6326aed51ca4308af52971c3b3cc5bb5c93c3128ec22f6302 SHA512 4407810d8c94d896214a12e33698432024ffed5e788be0bf850aa706f2b3eefd9a5ecb58eaf37d6f3d28611ccaae9683b8feb97d2b1cc074386e67b6dc58e1e0
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
index 5ff1c0f0d47c..8fed3989426d 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 
 	xine? (
 		( >=media-libs/xine-lib-1.2
-			virtual/ffmpeg )
+			media-video/ffmpeg )
 		fbcon? ( jpeg? ( virtual/jpeg:* ) )
 		X? (
 			x11-libs/libX11
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..57b4c4f49d71
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs vdr-plugin-2
+
+GENTOO_VDR_CONDITIONAL=yes
+
+DESCRIPTION="VDR Plugin: 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 cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
+
+COMMON_DEPEND="
+	vdr? (
+		media-video/vdr
+		libextractor? ( >=media-libs/libextractor-0.5.20 )
+		caps? ( sys-libs/libcap )
+	)
+
+	xine? (
+		( >=media-libs/xine-lib-1.2
+			media-video/ffmpeg )
+		fbcon? ( jpeg? ( virtual/jpeg:* ) )
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrender
+			bluray? ( media-libs/libbluray )
+			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
+			jpeg? ( virtual/jpeg:* )
+			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 )
+		)
+	)"
+
+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
+
+	# bug 711978
+	sed -e "s:X11  opengl:X11  OpenGl:" -i configure || die
+}
+
+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 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) \
+		$(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.2.0.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
index a0ae0f345cf4..e56e63363ca6 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
@@ -25,7 +25,7 @@ COMMON_DEPEND="
 
 	xine? (
 		( >=media-libs/xine-lib-1.2
-			virtual/ffmpeg )
+			media-video/ffmpeg )
 		fbcon? ( jpeg? ( virtual/jpeg:* ) )
 		X? (
 			x11-libs/libX11
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..05f03857fb35
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs vdr-plugin-2
+
+GENTOO_VDR_CONDITIONAL=yes
+
+DESCRIPTION="VDR Plugin: 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 cec dbus fbcon jpeg libextractor nls opengl +vdr vaapi vdpau +X +xine xinerama"
+
+COMMON_DEPEND="
+	vdr? (
+		media-video/vdr
+		libextractor? ( >=media-libs/libextractor-0.5.20 )
+		caps? ( sys-libs/libcap )
+	)
+
+	xine? (
+		( >=media-libs/xine-lib-1.2
+			media-video/ffmpeg )
+		fbcon? ( jpeg? ( virtual/jpeg:* ) )
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXrender
+			bluray? ( media-libs/libbluray )
+			dbus? ( dev-libs/dbus-glib dev-libs/glib:2 )
+			jpeg? ( virtual/jpeg:* )
+			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 )
+		)
+	)"
+
+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
+
+	# bug 711978
+	sed -e "s:X11  opengl:X11  OpenGl:" -i configure || die
+}
+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 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 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-9999.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
index a262a36247f1..63a718c965dc 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-9999.ebuild
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 
 	xine? (
 		( >=media-libs/xine-lib-1.2
-			virtual/ffmpeg )
+			media-video/ffmpeg )
 		fbcon? ( jpeg? ( virtual/jpeg:* ) )
 		X? (
 			x11-libs/libX11