gentoo resync : 21.09.2018

4 files changed, 25 insertions, 40 deletions

diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index a354dbd7c418..5750f454536a 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,11 +1,11 @@
 AUX gst-plugins-bad-0.10.23-CVE-2015-0797.patch 1044 BLAKE2B fe60f1069711c17e8e14e7e08081ca4c97697bb866587be45c471a85539d8c161d425a92aa8f01565bfece5aad0f5a3cd835d711edab977e11c9e9355d7d795f SHA512 cbe01dd53450cffb4cddf9313e78f2b61b27a8e1c35da13ab9429fa0de6cfce2585a4bbe1d3a9f6aac503c79a5a9d661420001b0196683a3c8b778685844c969
 DIST gst-plugins-bad-0.10.23-h264-patches.tar.xz 5284 BLAKE2B 90ad2a742de6d6b3efedb1a2fc16a9f24cf0566fd455a27f113afa0fc2ceff5f2517a31e8db8ed6ed8b4c92595b333a29dbb451077975f3d726808976f4a8671 SHA512 528ed30edb544dd970047fd4b0f05bf75f9f49f07a8118f805430c56c3ec75643013799491aeba70c62cb0343cd3e72758bf5c167d00e90a6a3f13857e4860e1
 DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
-DIST gst-plugins-bad-1.12.4.tar.xz 4709272 BLAKE2B a4d1fec48fdd67fc66eb5588dbee820c22b19a41dda4f5643b1ae326bfc827cd4796fc7a523fb0a9758605952377a2491f4e53ea74237ca7841659dea4ddcbc0 SHA512 a8e281aee1f1d0bb3f171fbe4242e997c661cbfd0be78da3913c0f55d68d6b7c3d34cabfcdd8c25728217ff885b86a7bedc0be34a7b14e2eb2a6c6236753231b
 DIST gst-plugins-bad-1.14.1.tar.xz 4651852 BLAKE2B 915798f9d07e18b445cae818978def1356299034d14ca2cba8f07df93d5dcf5ed257290bf111298c4f8063b32ceee38dd78c02eae508f6e88956b132740bfa36 SHA512 6969b6c91279fb96bc28acde0284ce980b3982ae0c77820284a903beee61dffa863554dcfadb55de1987404b59c3c7c421372e65dc7b4014fe64a0c91d4ce729
 DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017ad997c4d0ef136845a7ad34d15745d5f1abf4486dda7a226feb5ff6c7c65c8788cd39eb5e9901f3f15a426d79bf2b81e78c SHA512 7282c8941f1eabf7141362bb8e61097b3b26ef39410ae767712c34d7e40779fc22f6ea97a950009fdb6d62175f9a153d435ead8f663cf66cc6af5aac7f2a73db
+DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
 EBUILD gst-plugins-bad-0.10.23-r4.ebuild 1565 BLAKE2B 8907f6548ae1d077342bf0f35280c9cd59c492bd8a2e23e9c176c1682e32cab561835123af61fc40067f55c43574e401aa16e418ede39a56786744f741f203f7 SHA512 6c68c102487868c23bc177aa65a9a734f7e2cd89bcca5af827d98dcfb61d26a84b09a07d4ec6d7397a17ffa57ab33fdbfc5fc290bb9eb397209150da86ebb492
-EBUILD gst-plugins-bad-1.12.4.ebuild 2819 BLAKE2B 19d7afaf0e34e98ffd67ac1dbb453ce8477cd719803560a445e0cf2c8829c07f8355780151cd2273ea36e4bf624c1bdb278507ab8aa0da44e42746037abab895 SHA512 3414136d383f5669e11edfee11732de39b5f4f1fe20f821e2add0cf0d66b675fc337bfeed392770d3beee2144b70505c067121a2b7381c67c347dec431986425
-EBUILD gst-plugins-bad-1.14.1-r1.ebuild 2609 BLAKE2B 721f749819d27e5a3f0ebca333c8f319c3515783b18d8b60e3512353917afcfd43b75db5139b55bbfb1baf5fa49c8ca07f38d3d75ce2849fbb9bf2ad02c7e78d SHA512 ec5c81a1d5dde75689cbcf11aafadb100fd7536cc74dc8deea5e7a90f210ca4acc165df844aac7946d2e17978cd36cea0ff05caddf51e0a6a564e87ebdf5a2b8
-EBUILD gst-plugins-bad-1.14.2.ebuild 2616 BLAKE2B b02623dc74e3d00029d03361886d00e45520d677eb600415c0a0c3343a5686f25c21c8706497f6516fef160f58207936460f842f9aafef42c37fc19c3db59ace SHA512 c335ce9e3f45831d1bbd8d84839d9a4093ff4e25f88eb855bd61dd5b80c5ae74c241b6fbc9649eb170bf3e6fb962d7c3cccef8a2342fbd95ea4bc1b19e93745d
+EBUILD gst-plugins-bad-1.14.1-r1.ebuild 2606 BLAKE2B 4d18489f73c95ae84fb95aa94e81abf98708e8d2188180557488f6f240f5a3940c001198c323ae5a2f6ec92bc24db006a4e44f27c3d02b8a0f7015e0393391a8 SHA512 82cf3f251494733a0b770deb0580c1977cfb84aa08846b9d5655a775cdd917d128522368f369cec6b5fd5fc82c95dfb7b90ad109fc9e08cdb8a4c85556318e36
+EBUILD gst-plugins-bad-1.14.2.ebuild 2637 BLAKE2B f08298066c2e0fb27822a8bf7c810139e942e74f9ccd1444827aa9f1409aa751ca8ba8082282831eb08ea464e236e318b12bde34ad96a7d4c1048948fcfbbd72 SHA512 e9d3a6893c4504d9e7bb6dca857650d289dba80188dbb8e67f68b9b2fe945dc39f2ce3e99042ced83c034ee21998225c03c6acc24cffee9aaaa12968c0361378
+EBUILD gst-plugins-bad-1.14.3.ebuild 2637 BLAKE2B f08298066c2e0fb27822a8bf7c810139e942e74f9ccd1444827aa9f1409aa751ca8ba8082282831eb08ea464e236e318b12bde34ad96a7d4c1048948fcfbbd72 SHA512 e9d3a6893c4504d9e7bb6dca857650d289dba80188dbb8e67f68b9b2fe945dc39f2ce3e99042ced83c034ee21998225c03c6acc24cffee9aaaa12968c0361378
 MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
index ee610b243d95..a911d06c1bfb 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.1-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # TODO: egl and gtk IUSE only for transition
 IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.2.ebuild
index ec03046828cd..c58d0a23e121 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.2.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.2.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
 "
 
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.12
 "
 
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.4.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
index 33a7e25a8878..c58d0a23e121 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.4.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.3.ebuild
@@ -4,46 +4,39 @@
 EAPI=6
 GST_ORG_MODULE="gst-plugins-bad"
 
-inherit eutils flag-o-matic gstreamer virtualx
+inherit flag-o-matic gstreamer virtualx
 
 DESCRIPTION="Less plugins for GStreamer"
 HOMEPAGE="https://gstreamer.freedesktop.org/"
 
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-
-IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland"
-REQUIRED_USE="
-	gles2? ( !opengl )
-	opengl? ( X )
-	wayland? ( egl )
-	egl? ( || ( opengl gles2 ) )
-"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# TODO: egl and gtk IUSE only for transition
+IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
 
-# X11 is automagic for now, upstream #709530
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
 RDEPEND="
 	>=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
 	>=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
-	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+	>=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
 	introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
 
 	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
-	opengl? (
-		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP}]
-		virtual/glu[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+	vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
 	wayland? (
 		>=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
 		>=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
 		>=dev-libs/wayland-protocols-1.4
 	)
 
-	gtk? ( >=x11-libs/gtk+-3.15:3[X?,wayland?,${MULTILIB_USEDEP}] )
+	gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
 	orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
 "
+
 DEPEND="${RDEPEND}
+	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.12
 "
 
@@ -56,35 +49,26 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myconf=()
-	if use opengl || use gles2 ; then
-		# Actually enable the gl element, not just libs
+	if use opengl || use gles2; then
 		myconf+=( --enable-gl )
+	else
+		myconf+=( --disable-gl )
 	fi
 
-	# Always enable gsettings (no extra dependency)
-	# and shm (need a switch for winnt ?)
+	# Always enable shm (shm_open) and ipcpipeline (sys/socket.h); no extra deps
 	gstreamer_multilib_src_configure \
 		$(multilib_native_use_enable introspection) \
 		$(use_enable bzip2 bz2) \
-		$(use_enable egl) \
-		$(use_enable gles2) \
-		$(use_enable gtk gtk3) \
-		$(use_enable opengl) \
-		$(use_enable opengl glx) \
 		$(use_enable orc) \
 		$(use_enable vcd) \
 		$(use_enable vnc librfb) \
 		$(use_enable wayland) \
-		$(use_enable X x11) \
 		--disable-examples \
 		--disable-debug \
-		--disable-cocoa \
 		--without-player-tests \
-		--disable-wgl \
 		--enable-shm \
-		${myconf[$@]}
-		# not ported
-		# --enable-gsettings
+		--enable-ipcpipeline \
+		"${myconf[@]}"
 
 	if multilib_is_native_abi; then
 		local x
@@ -103,5 +87,5 @@ multilib_src_test() {
 multilib_src_install_all() {
 	DOCS="AUTHORS ChangeLog NEWS README RELEASE"
 	einstalldocs
-	prune_libtool_files --modules
+	find "${ED}" -name '*.la' -delete || die
 }