gentoo resync : 25.11.2020

3 files changed, 18 insertions, 6 deletions

diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index 6fbb332d5476..621ddf20fa64 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -3,5 +3,5 @@ AUX libsdl2-2.0.12-static-libs.patch 2510 BLAKE2B 2c93b5a9ba38d797281d2d3b13eeb1
 AUX libsdl2-2.0.12-vulkan-headers.patch 536 BLAKE2B 5bc6f494aa3afb6c1176055193505bc091569925f2f31f6e623254fa19df3eeb3fe477b97b4eef1973a3f9961d8f5159cf62aae39b8ab84d178ca5f8cf8346fd SHA512 20a6f433c973bb521d4db19c682b1a063b314405a0f2b68ed88a68030ef2a4ba71a8b84c45c0980c6218f2b9f332cc3cfd1354aebcd0932584169161638e011e
 DIST SDL2-2.0.12.tar.gz 5720162 BLAKE2B 1e50d2d3060c38faadfc6610e3af7b0e54ce880101f8ca441b84431fb5f683cc6353402025be2eecbb8b9f85bb3982c9aea36e96067a97d079d39f9cd44964a0 SHA512 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317
 EBUILD libsdl2-2.0.12-r1.ebuild 5507 BLAKE2B 90e85b193d881a8c5e6309a21e0e49c63d747f1b1c961625f58d760b8170dee0107a6896b64b3ba47788128feaa0c669e5b325445f0bf2f7dfbb0d6a3293c649 SHA512 478a84f6c427a2dba3e97cf1932e004e6933d9e87fc0c902729381572ab1b97de0a8824bd1ea9a2bf8714165478a3030fff834ded36f6d565cc2114dc2fd4cdd
-EBUILD libsdl2-2.0.12-r2.ebuild 5561 BLAKE2B 0117b1f2e22eb15ee69cf0a821d2df7139bcdc70fc8ee77256b0ad65e600917443aef515fe5d4553c1b3bec4b26ca0fc6325e9502939b31f6cd3b0c248daf19e SHA512 0df266f12a34384e47eca0964337f7e28fa9a85c74fd275958c3432258e960fcb2ae45edf7e09c5ea481f5d4cad2c1e188be4f2325f8efcf3262b4b896c5f981
-MISC metadata.xml 1658 BLAKE2B 5c902cca2bed60d10864bd4d3524035b9472599f63a5a739348231c2471a01f40dd99ba49b63b710cffbfa51c870f06a1aa5a1d56a6a5dc6a2a3059550506443 SHA512 7c832d7bc52638ad658c4b53ffc1faf34486d551728240007b8af5f569dfa893a076df9b7ecc118c29795d1792b55e953401b2dbf81d831d002fc0cb0f28687c
+EBUILD libsdl2-2.0.12-r2.ebuild 5896 BLAKE2B 278c56e6c03189366d1050cb1cf42c5bdb302ef6b19cb31ab00b891e606c5efac2a5720f8578f511391be35707cbb59594917d028cae1241f2642004fc52b345 SHA512 b3eaaa899eb5be4c94d998840d664da39d8cb8e037e5e45a6ce1a485f8204a94228b7de7252f6f525914fb8229c868cecb613d3f03561ce29251c9e1ef64808d
+MISC metadata.xml 1805 BLAKE2B 16d4961cf6d0c9997fe706dd5deb51b98f153135cb4f0bedbc29e842d485ba2f4493003830385957b7ac92fd9f6d31bcf4319d800a7f2bd46a9a1772b86f3e5a SHA512 37e976d6a469c6e17e3efb178a189903c3ac2baf99d0e3aa7fb80bfc6d297e52c910ae6361e119fe1173d6d8a9d2aef47172bb4a1185ef4f99f36c75d1f8c19f
diff --git a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
index 5ba649b5a7b9..83131e2c099f 100644
--- a/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.12-r2.ebuild
@@ -11,12 +11,14 @@ SRC_URI="https://www.libsdl.org/release/${MY_P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
-IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus gles2 haptic jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
+IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 custom-cflags dbus fcitx4 gles2 haptic ibus jack +joystick kms libsamplerate nas opengl oss pulseaudio +sound static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
 REQUIRED_USE="
 	alsa? ( sound )
+	fcitx4? ( dbus )
 	gles2? ( video )
+	ibus? ( dbus )
 	jack? ( sound )
 	nas? ( sound )
 	opengl? ( video )
@@ -29,7 +31,9 @@ REQUIRED_USE="
 CDEPEND="
 	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	fcitx4? ( app-i18n/fcitx:4 )
 	gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
+	ibus? ( app-i18n/ibus )
 	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
 	kms? (
 		>=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
@@ -65,6 +69,7 @@ CDEPEND="
 RDEPEND="${CDEPEND}
 	vulkan? ( media-libs/vulkan-loader )"
 DEPEND="${CDEPEND}
+	ibus? ( dev-libs/glib:2[${MULTILIB_USEDEP}] )
 	vulkan? ( dev-util/vulkan-headers )
 	X? ( x11-base/xorg-proto )
 "
@@ -92,7 +97,7 @@ src_prepare() {
 
 	# Unbundle some headers.
 	rm -r src/video/khronos || die
-	ln -s "${SYSROOT}${EPREFIX}"/usr/include src/video/khronos || die
+	ln -s "${ESYSROOT}/usr/include" src/video/khronos || die
 
 	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
 }
@@ -100,6 +105,10 @@ src_prepare() {
 multilib_src_configure() {
 	use custom-cflags || strip-flags
 
+	if use ibus; then
+		local -x IBUS_CFLAGS="-I${ESYSROOT}/usr/include/ibus-1.0 -I${ESYSROOT}/usr/include/glib-2.0 -I${ESYSROOT}/usr/$(get_libdir)/glib-2.0/include"
+	fi
+
 	# sorted by `./configure --help`
 	local myeconfargs=(
 		$(use_enable static-libs static)
@@ -166,7 +175,8 @@ multilib_src_configure() {
 		$(use_enable vulkan video-vulkan)
 		$(use_enable udev libudev)
 		$(use_enable dbus)
-		--disable-ibus
+		$(use_enable fcitx4 fcitx)
+		$(use_enable ibus)
 		$(use_enable tslib input-tslib)
 		--disable-directx
 		--disable-rpath
diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml
index ec21c0415ca4..fb417beddc0a 100644
--- a/media-libs/libsdl2/metadata.xml
+++ b/media-libs/libsdl2/metadata.xml
@@ -24,8 +24,10 @@
 		Perl, PHP, Pike, Python, and Ruby.
 	</longdescription>
 	<use>
+		<flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag>
 		<flag name="gles2">include OpenGL ES 2.0 support</flag>
 		<flag name="haptic">Enable the haptic (force feedback) subsystem</flag>
+		<flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag>
 		<flag name="joystick">Control joystick support (disable at your own risk)</flag>
 		<flag name="kms">Build the KMSDRM video driver</flag>
 		<flag name="sound">Control audio support (disable at your own risk)</flag>