gentoo resync : 28.04.2021

6 files changed, 47 insertions, 308 deletions

diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index ffb0ee521e2b..e1c2f32dac61 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,10 +1,9 @@
 AUX confd-2.0.0 1476 BLAKE2B a1f852cb07940ff54125d88bae9467e5068e66e903b4dcdbde295cb3aa89a49d92ff7e89632882ad8be59037ff44e1f6f1d6a4f53d7200024e0fe69b499da693 SHA512 8ab8b99e770dacbaadfc97ccc80f3d2c857bf95b662b9152959ccd88b940f4d2f7d2957ea4f6390f30470aca809cb3bb04b8b9e696122131fbb6d9f5d010f579
 AUX vdr-frontend 392 BLAKE2B 99afb106dce6908c8d3a02d22c6072bbe4f9917bb8090175997769c465eede475a84329bb7b7bbd5ab1cde9a77d459652fb8b1c8b7630ebcb99034398a78fb55 SHA512 1c25d59809c7fafb837755eb9719bc11526b333cea01c6467aa83bf8b3284f10a4a62fafba00321a15f6cef4b462456ece1313b1fca00ce36b828418af883351
-DIST vdr-xineliboutput-2.1.0.tgz 415333 BLAKE2B 8311271dda889cde5ab69d5bf1f643c8f6b1991ca615ce6322ea5585aac12b07b32f6fd933bf6c3797d45971597e61d429e4d9de356246109cab7c8f059b4d79 SHA512 226654dcd47864e9df8282ef401509d291677587b2850872c535abb7bee468a7c6d72c30953090890d002f0977aa1ee357a0fe6938ce3f3c1b6324e82b926537
+AUX vdr-xineliboutput-2.2.0_no-gcc.patch 981 BLAKE2B ea8daf82a19d7f8dd7cf5b56e90ed51ea5b9a986d589611c3922a750e61f1a1208d2291f761c2bce1992cd4de9c15d41de93fd1ceccb3d17cf59d5f0c6268eba SHA512 c8861a49f9c9849dafc6ac600df3696606d810f6b58ee24026355899aa1708ad309548c2c8f7b00850faa2ebd54674aec450af276c3eb556c4a5f9b7dc5d28c0
 DIST vdr-xineliboutput-2.2.0.tgz 426058 BLAKE2B 8a5e325e0dd45dffdbcf1b9e49d4ae2486d3b3c7585dbca81855264a0a9057c48da7626acd5e9d7b2113b200eead178b19a0d9834ace5d25cd97157912d50bfa SHA512 d3b753fe496c6f73d491195cc1dac3333a46f2ef6350683fc15e3e8a423a90946574c3fdf0ed43727d61f007a8abdf3041e274317216bf06a8146dc9206f88d9
-EBUILD vdr-xineliboutput-2.1.0-r1.ebuild 3201 BLAKE2B 1d057379decee9e23aff0a443d655ff7793bec2cfd06d4e19f6c05505442f7baa3a1058017c21a0d5b1816f8e096c47db69ed30783faa328d49f0a4526002e08 SHA512 e0ebb6a9968b85fca262fa246e9a4d47c8ab2ceccb09b5acf288a3b7054b0fad8066de4f989311c5b2171175a0f4f15de587bf8e7dfd4e8f3d7719b9764c95e1
-EBUILD vdr-xineliboutput-2.1.0-r2.ebuild 3318 BLAKE2B f25c8ac3e048007869b5227400925715daae5ddf982c60ff219330647f2ecb55cde5995467a84b50acfa942e4e833243d0daaaff3c84993c299cb4ebf950b883 SHA512 9b5293041b576fa295584e64830aa2536c984f84331410ae0462503ddb94bb4325395a77aa45e4b6de3965417b9e346ba5ace208b0e5bfb7763dc1d6b8b61bc5
-EBUILD vdr-xineliboutput-2.2.0-r1.ebuild 3177 BLAKE2B 11e044f0c5012d8c88d73d033a2e20038135d0d325a117642e937031b93c26e039dc7bc6ced959d78bdcf142f275a9eb86cde4ea220a8e2478ac6b6fc06cf11a SHA512 49e2aee2f8004805b733d2ddb9da424ec991d13bba198eaf7c61675035ee62539a83963349a9cf87b88e7f250ee20715d1f6c1537bf8ef888de3b332478a4c92
-EBUILD vdr-xineliboutput-2.2.0-r2.ebuild 3293 BLAKE2B d42ae8f3753098b65dd9f06cfcbb00a8b758e4d0934154503ab866515c58b898a8e637ecb02c2a4fb43b0f4fb005b3689a1142337bc70dde9195800d95388487 SHA512 892b34de3311128690475d41bdd190b040031f0c1ef7415e1d0afa9e406abec54408aa9c7185913ded27377d7995af87c32ebe72cc5b9393798cff68798ca9a8
+DIST vdr-xineliboutput-2.2.0_clang.patch.bz2 7405 BLAKE2B 80d4a0ca3673f61cd14538c2fbdc03017f8c993a55b4c3de0349c799b7239052bc452fbd78689e9ccace2e865b4d08ec69365ed9ad6900e08205676135dac3b9 SHA512 c02cc9a6ee8c9b3458dec6439ea4fa85421f3ac01828e65b123d13db689a75cbba5622a7e1fd76066a19a714c2debdb08f4c78139573a4563aefab19107a5512
+EBUILD vdr-xineliboutput-2.2.0-r2.ebuild 3302 BLAKE2B fdf7d87e60040c920e51471a355502bc16bcb2d90d283e61d6372df570c905eb5f9a60e704452d3caa6231305d69db682bc9c9608e5a5ad747d9fed15aeb980c SHA512 ef250e619f44b4171cc81bd9b7c31d2fa16d915d024efe6a59b730f48961508035a36045be484af9a02b9ab5fbff6e361fd274c0a01f8d8a3dce7b0e5d10daac
+EBUILD vdr-xineliboutput-2.2.0-r4.ebuild 3445 BLAKE2B b1b14d6f9223524d5ab239d85e3f64b6670852b6f042aefb3cd35b3e397edfac81913b33ac3df4dfb5fc2dbf9538a6ba6c6d0095ddf42a130de7dc02ff576f9d SHA512 2a5ae525383b7ca2883420f4b9d742e126c90714fa05a681e48689bd86949b08bcc7d8c2ab77dddce932c32a3b212edd289380deaa438f39fc3a8d205133e57b
 EBUILD vdr-xineliboutput-9999.ebuild 3352 BLAKE2B a41dec91c3b93b71253984d17bc9bf4c959d25c112983d379f7e919fcd840f5cbc836a1ec1ad93ac2b129679e86d571594be8c1bd59e8e05065a93d4b98a40ca SHA512 6a9b0b7df8b77304b347b574840b69295d2916296e39298a74e7f0f90d84e4d19cba212b7eadad6cd2023b74126cc0db4dacd3983d654e999627db81e6927278
 MISC metadata.xml 830 BLAKE2B 04a0e0ba5a0afc1b2c3669a442bb5b62f44d25159c16c3a6539c541b43d22b4f30c8c6ea60b076f6326aed51ca4308af52971c3b3cc5bb5c93c3128ec22f6302 SHA512 4407810d8c94d896214a12e33698432024ffed5e788be0bf850aa706f2b3eefd9a5ecb58eaf37d6f3d28611ccaae9683b8feb97d2b1cc074386e67b6dc58e1e0
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-2.2.0_no-gcc.patch b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-2.2.0_no-gcc.patch
new file mode 100644
index 000000000000..ac7cf5007ce4
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-2.2.0_no-gcc.patch
@@ -0,0 +1,33 @@
+get rid off call cc gcc directly
+disabled apple darwin check
+we are on gentoo!!!
+https://bugs.gentoo.org/show_bug.cgi?id=780462
+
+Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2021/April/07 )
+diff -Naur xineliboutput-2.2.0.orig/Makefile xineliboutput-2.2.0/Makefile
+--- xineliboutput-2.2.0.orig/Makefile	2021-04-07 20:28:54.667000000 +0200
++++ xineliboutput-2.2.0/Makefile	2021-04-07 20:29:31.558000000 +0200
+@@ -19,9 +19,9 @@
+ 
+ # check for Apple Darwin
+ ARCH_APPLE_DARWIN = no
+-ifeq ($(shell gcc -dumpmachine | grep -q 'apple-darwin' && echo "1" || echo "0"), 1)
+-    ARCH_APPLE_DARWIN = yes
+-endif
++#ifeq ($(shell gcc -dumpmachine | grep -q 'apple-darwin' && echo "1" || echo "0"), 1)
++#    ARCH_APPLE_DARWIN = yes
++#endif
+ 
+ #
+ # Override configuration here or in ../../../Make.config
+@@ -43,8 +43,8 @@
+ ### The C++ compiler and options:
+ ###
+ 
+-CXX      ?= g++
+-CC       ?= gcc 
++#CXX      ?= g++
++#CC       ?= gcc 
+ OPTFLAGS ?= 
+ 
+ ifeq ($(ARCH_APPLE_DARWIN), yes)
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
deleted file mode 100644
index 26cc8d658f5c..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic 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_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-r1.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
deleted file mode 100644
index 5f905220218f..000000000000
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic 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_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-2.2.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
index 67a25eda7352..c3df9aff749c 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -61,7 +61,7 @@ pkg_setup() {
 	vdr-plugin-2_pkg_setup
 
 	if use xine; then
-		XINE_PLUGIN_DIR=$(pkg-config --variable=plugindir libxine)
+		XINE_PLUGIN_DIR=$($(tc-getPKG_CONFIG) --variable=plugindir libxine)
 		[ -z "${XINE_PLUGIN_DIR}" ] && die "Could not find xine plugin dir"
 	fi
 }
diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
index 22b0356c3c50..b9d615c9322d 100644
--- a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.1.0-r2.ebuild
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-2.2.0-r4.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs vdr-plugin-2
+inherit 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"
+SRC_URI="mirror://sourceforge/${PN#vdr-}/${P}.tgz
+		http://vdr.websitec.de/download/${PN}/${P}_clang.patch.bz2"
 
 SLOT="0"
 LICENSE="GPL-2+"
@@ -71,6 +72,10 @@ src_prepare() {
 
 	# bug 711978
 	sed -e "s:X11  opengl:X11  OpenGl:" -i configure || die
+
+	# bug 771036,780462 do not call cc directly
+	eapply "${FILESDIR}/${P}_no-gcc.patch"
+	eapply "${WORKDIR}/${P}_clang.patch"
 }
 
 src_configure() {
@@ -100,7 +105,6 @@ src_configure() {
 		$(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) \