From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/arch/hppa/, profiles/arch/mips/, profiles/arch/arm64/, ...
Date: Sat, 28 Sep 2024 20:43:22 +0000 (UTC) [thread overview]
Message-ID: <1727556186.b54738872b490558153d026e987639c29fe888b3.chewi@gentoo> (raw)
commit: b54738872b490558153d026e987639c29fe888b3
Author: Yongxiang Liang <tanekliang <AT> gmail <DOT> com>
AuthorDate: Fri Sep 6 16:41:47 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 20:43:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5473887
media-libs/libsdl2: rename use flag fcitx4 to fcitx
Closes: https://bugs.gentoo.org/920548
Closes: https://bugs.gentoo.org/936970
Signed-off-by: Yongxiang Liang <tanekliang <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38487
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../{libsdl2-2.28.5-r2.ebuild => libsdl2-2.28.5-r3.ebuild} | 8 ++++----
.../libsdl2/{libsdl2-2.30.7.ebuild => libsdl2-2.30.7-r1.ebuild} | 6 +++---
media-libs/libsdl2/metadata.xml | 2 +-
profiles/arch/alpha/package.use.mask | 2 +-
profiles/arch/arm/package.use.mask | 2 +-
profiles/arch/arm64/package.use.stable.mask | 2 +-
profiles/arch/hppa/package.use.stable.mask | 2 +-
profiles/arch/mips/package.use.mask | 2 +-
profiles/arch/sparc/package.use.mask | 2 +-
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild b/media-libs/libsdl2/libsdl2-2.28.5-r3.ebuild
similarity index 96%
rename from media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild
rename to media-libs/libsdl2/libsdl2-2.28.5-r3.ebuild
index 23b8259aee87..3f7518518e08 100644
--- a/media-libs/libsdl2/libsdl2-2.28.5-r2.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.28.5-r3.ebuild
@@ -15,11 +15,11 @@ LICENSE="ZLIB"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv 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 doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video video_cards_vc4 vulkan wayland X 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 doc fcitx gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video video_cards_vc4 vulkan wayland X xscreensaver"
RESTRICT="!test? ( test )"
REQUIRED_USE="
alsa? ( sound )
- fcitx4? ( dbus )
+ fcitx? ( dbus )
gles1? ( video )
gles2? ( video )
haptic? ( joystick )
@@ -38,7 +38,7 @@ COMMON_DEPEND="
virtual/libiconv[${MULTILIB_USEDEP}]
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 )
+ fcitx? ( app-i18n/fcitx:* )
gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] )
gles2? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2(+)] )
ibus? ( app-i18n/ibus )
@@ -206,7 +206,7 @@ multilib_src_configure() {
$(use_enable vulkan video-vulkan)
$(use_enable udev libudev)
$(use_enable dbus)
- $(use_enable fcitx4 fcitx)
+ $(use_enable fcitx fcitx)
$(use_enable ibus)
--disable-directx
--disable-rpath
diff --git a/media-libs/libsdl2/libsdl2-2.30.7.ebuild b/media-libs/libsdl2/libsdl2-2.30.7-r1.ebuild
similarity index 95%
rename from media-libs/libsdl2/libsdl2-2.30.7.ebuild
rename to media-libs/libsdl2/libsdl2-2.30.7-r1.ebuild
index a3648ce7571c..d9c01ce0e13c 100644
--- a/media-libs/libsdl2/libsdl2-2.30.7.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.30.7-r1.ebuild
@@ -15,11 +15,11 @@ LICENSE="ZLIB"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~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 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx4 gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video vulkan wayland X xscreensaver"
+IUSE="alsa aqua cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 custom-cflags dbus doc fcitx gles1 gles2 +haptic ibus jack +joystick kms libsamplerate nas opengl oss pipewire pulseaudio sndio +sound static-libs test +threads udev +video vulkan wayland X xscreensaver"
RESTRICT="!test? ( test )"
REQUIRED_USE="
alsa? ( sound )
- fcitx4? ( dbus )
+ fcitx? ( dbus )
gles1? ( video )
gles2? ( video )
haptic? ( joystick )
@@ -76,7 +76,7 @@ COMMON_DEPEND="
"
RDEPEND="
${COMMON_DEPEND}
- fcitx4? ( app-i18n/fcitx:4 )
+ fcitx? ( app-i18n/fcitx:* )
gles1? ( media-libs/mesa[${MULTILIB_USEDEP},gles1(+)] )
gles2? ( media-libs/mesa[${MULTILIB_USEDEP},gles2(+)] )
vulkan? ( media-libs/vulkan-loader )
diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml
index a96219c59be3..5388257b6225 100644
--- a/media-libs/libsdl2/metadata.xml
+++ b/media-libs/libsdl2/metadata.xml
@@ -24,7 +24,7 @@
Perl, PHP, Pike, Python, and Ruby.
</longdescription>
<use>
- <flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag>
+ <flag name="fcitx">Enable support for <pkg>app-i18n/fcitx</pkg></flag>
<flag name="gles1">include OpenGL ES 1.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>
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index ac17a7c8a9f1..a9a88e0bb322 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -274,7 +274,7 @@ media-sound/fluidsynth lash
# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
# app-i18n/fcitx:4 not keyworded.
-media-libs/libsdl2 fcitx4
+media-libs/libsdl2 fcitx
# Sergei Trofimovich <slyfox@gentoo.org> (2020-09-18)
# media-libs/libilbc is not ported to alpha
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 00bbe3720940..184bd8baf26c 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -225,7 +225,7 @@ net-wireless/gnuradio ctrlport
# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
# app-i18n/fcitx:4 not keyworded.
-media-libs/libsdl2 fcitx4
+media-libs/libsdl2 fcitx
# Adam Feldman <NP-Hardass@gentoo.org> (2020-09-05)
# dev-util/dogtail is not keyworded for arm
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index c6bd67ba8846..d43977feeedb 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -95,7 +95,7 @@ media-gfx/enblend doc
# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
# app-i18n/fcitx:4 not stable.
-media-libs/libsdl2 fcitx4
+media-libs/libsdl2 fcitx
# Sam James <sam@gentoo.org> (2020-10-06)
# Not yet stable on arm64.
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index f807a8939936..14afbb12801f 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -197,7 +197,7 @@ x11-base/xorg-server xorg
# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
# app-i18n/fcitx:4 not stable.
-media-libs/libsdl2 fcitx4
+media-libs/libsdl2 fcitx
# Rolf Eike Beer <eike@sf-mail.de> (2020-06-10)
# not stable dev-vcs/mercurial because of broken dependencies: bug #727390
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index c857e05beafd..d7cac0a393f7 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -188,7 +188,7 @@ app-alternatives/ninja samurai
# matoro <matoro_gentoo@matoro.tk> (2023-06-18)
# app-i18n/fcitx:4 not keyworded here
-media-libs/libsdl2 fcitx4
+media-libs/libsdl2 fcitx
# Sam James <sam@gentoo.org> (2023-06-18)
# Qt 5 not keyworded here
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index f8a633d80465..55d49431d68f 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -335,7 +335,7 @@ xfce-base/tumbler epub
# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2020-10-14)
# app-i18n/fcitx:4 not keyworded.
-media-libs/libsdl2 fcitx4
+media-libs/libsdl2 fcitx
# Matt Turner <mattst88@gentoo.org> (2020-08-11)
# No drivers on this architecture support Vulkan
reply other threads:[~2024-09-28 20:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1727556186.b54738872b490558153d026e987639c29fe888b3.chewi@gentoo \
--to=chewi@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox