gentoo resync : 25.04.2020

3 files changed, 12 insertions, 4 deletions

diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index fe9f1d816967..70f090464ae9 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -13,5 +13,5 @@ EBUILD kodi-18.3-r1.ebuild 9637 BLAKE2B f664ff7359fca7b8d9aa4cb02e21d83835ae9de2
 EBUILD kodi-18.4-r1.ebuild 9521 BLAKE2B 312c594e5dd8c851af3a21e8b373892aed11aab8a2f29ec7442b46439242fe7f9fb04be8ab1460e8752e15258174d1c5ff66fee07cd041a2c65bdc95e0a65e83 SHA512 364ced13e0db628cf535c99137bbad2b5f6cb6f071bb1781e96314b365625cec3936213bae1827fbe6f926ecb2565a32e356b58b3951b10794920d2f9df4aecd
 EBUILD kodi-18.5-r2.ebuild 9492 BLAKE2B 022c819338e0cf341f84e62d2b72381a71a41c2088b27eea9e21a598aaaec2e778df11c19a22448da4bb035611fc5e549d321c08cd76c3e234b4aa343d545739 SHA512 dca47435172ec06cb6ee9514d684559f67f6532c9c037e5b57f374ce3c5d36420c95ed441e914fe5ba35cbb0e6d3581f2797297328758be4d752261a806d501a
 EBUILD kodi-18.6.ebuild 9498 BLAKE2B 2a314aa8ea6034457824dcc3b47dacfb4b31b36abacd3d3837d009cbdcbab8fa336b4a7b0600f88f40be494c382e4fa584dedd1df8171806ff58390c11f839f3 SHA512 ac1f0bac4b001b4be1b2bcf7eec39179c424f36d7fbb8ba02b17343cc94b0e553c0402c9369994fb1e0395797fe1573e24f88f3c55009b2e0348b3a1e976fc7f
-EBUILD kodi-9999.ebuild 8946 BLAKE2B e7b132aec715483341eed1bf9ff972d8d6df8d63416a210a037ff6c03db3d835d9ae60421263bfb199f42b5e428a7aa40dda79aa6d97a8138447a4acae8b9af4 SHA512 60d7e0a7a79767669928f1b8715ec6dfd616233500816dd1c5a5b143ccdd217830c7157f4879bfcf499efb8d84f9ca2c74742688ec91f33df967590da3e91dbb
-MISC metadata.xml 1720 BLAKE2B 3158b87065286649496de2edf821c37042cafe7e729f7ba31c571ade72cf8f9fbce218485ac721ad896fa5ef751becfd2f3b4ce1645e97b4db673ec879884834 SHA512 f8d52358276ad8c2eb23632451f025ac45f799fa392bd59fcfd4417d9e9e76cf9ce066ac50cd8ee563319d7f2248b28c45fee3059a4e069ebb862e41d230b1da
+EBUILD kodi-9999.ebuild 9163 BLAKE2B 232fa6d040dcae59fa43d6b518a788c79303caf6bf6db81522df03e6c1d4224107fa496c6f73d864b8f7950b616bb27c43fcce3bbc44bac622e2b775d4a508b2 SHA512 a6d16e5ac550e49ad8846d0edf68613612abf5bdfc52655fc9d63dc4987fe1518a21bf61caeddfd30b640261bc73bfdb3e3699d05db0fa2df0c5f4f35fad9ed9
+MISC metadata.xml 1796 BLAKE2B da81fcbb0abedc4f78e82fa6f9453e4ffe824b1cedefcc9a1261dc09e0bd43482a7bd03e908f959d1a3033c284188d79644a1a9bca5064836eb3d0908b7d0d7f SHA512 d76d9f8d4683df4ab488dd30852437649810d0b093f0590db8f95404445f25aca7efdaa9d706d3222d67104cb2c4b02896154fcd7df1173b0bfe7e2557d73847
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 05abeb2ffc78..9bee9585390c 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -39,12 +39,13 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	|| ( gles opengl )
 	^^ ( gbm raspberry-pi wayland X )
 	?? ( mariadb mysql )
+	bluray? ( udf )
 	udev? ( !libusb )
 	udisks? ( dbus )
 	upower? ( dbus )
@@ -70,6 +71,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/libinput-1.10.5
 	>=dev-libs/libxml2-2.9.4
 	>=dev-libs/lzo-2.04
+	>=dev-libs/spdlog-1.5.0
 	dev-libs/tinyxml[stl]
 	$(python_gen_cond_dep '
 		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
@@ -110,6 +112,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	pulseaudio? ( media-sound/pulseaudio )
 	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
 	>=sys-libs/zlib-1.2.11
+	udf? ( >=dev-libs/libudfread-1.0.0 )
 	udev? ( virtual/udev )
 	vaapi? (
 		x11-libs/libva:=
@@ -157,7 +160,7 @@ DEPEND="${COMMON_DEPEND}
 	media-libs/giflib
 	>=media-libs/libjpeg-turbo-2.0.4:=
 	>=media-libs/libpng-1.6.26:0=
-	test? ( dev-cpp/gtest )
+	test? ( >=dev-cpp/gtest-1.10.0 )
 	virtual/pkgconfig
 	virtual/jre
 	x86? ( dev-lang/nasm )
@@ -227,6 +230,8 @@ src_configure() {
 		-DENABLE_INTERNAL_CROSSGUID=OFF
 		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
 		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_INTERNAL_GTEST=OFF
+		-DENABLE_INTERNAL_UDFREAD=OFF
 		-DENABLE_CAP=$(usex caps)
 		-DENABLE_LCMS2=$(usex lcms)
 		-DENABLE_LIRCCLIENT=$(usex lirc)
@@ -240,7 +245,9 @@ src_configure() {
 		-DENABLE_PLIST=$(usex airplay)
 		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
 		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_TESTING=$(usex test)
 		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UDFREAD=$(usex udf)
 		-DENABLE_UPNP=$(usex upnp)
 		-DENABLE_VAAPI=$(usex vaapi)
 		-DENABLE_VDPAU=$(usex vdpau)
diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml
index 269b8bfc2c46..1fa46eccbfd6 100644
--- a/media-tv/kodi/metadata.xml
+++ b/media-tv/kodi/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
 		<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag>
 		<flag name="libusb">Use <pkg>virtual/libusb</pkg> for usb device hotplug support. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use <pkg>sys-fs/udev</pkg>.</flag>
+		<flag name="udf">Enable UDF support. Required for playing blurays.</flag>
 		<flag name="udev">Use <pkg>sys-fs/udev</pkg> rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness.</flag>
 		<flag name="webserver">Enable internal webserver</flag>
 		<flag name="xslt">Enable XSLT support using <pkg>dev-libs/libxslt</pkg></flag>