commit: 402400e3b7678dd62ef2a7f17d03d44d79cf41fc
Author: Yongxiang Liang <tanekliang <AT> gmail <DOT> com>
AuthorDate: Mon Dec 9 14:11:37 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 20:26:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=402400e3
app-i18n/fcitx: drop 4.2.9.8, 4.9999
Signed-off-by: Yongxiang Liang <tanekliang <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-i18n/fcitx/Manifest | 6 --
app-i18n/fcitx/fcitx-4.2.9.8.ebuild | 160 ------------------------------------
app-i18n/fcitx/fcitx-4.9999.ebuild | 159 -----------------------------------
app-i18n/fcitx/metadata.xml | 8 +-
4 files changed, 1 insertion(+), 332 deletions(-)
diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest
index 88729b66a7c6..9ce45682e7dd 100644
--- a/app-i18n/fcitx/Manifest
+++ b/app-i18n/fcitx/Manifest
@@ -1,8 +1,2 @@
-DIST fcitx-4.2.9.8_dict.tar.xz 8737888 BLAKE2B
2de3ccbf1b37a9bcf1a3cb257d7837669e946765722c3d6f442ad071d7d81a6e8178e47051fc3aa53b9b4771d3aca602c2e22fa7a3d117a9e1f2779497e02c52
SHA512
50a954c3178f53fd2d441cdaf81fb44a7fe8dfb263fa6d8dd4ee4884fc7ae8321880c726c9366d11e2a4ac8da2233268d06e5d0800d4527ba0bdb1a1430248ed
DIST fcitx-5.1.10.tar.zst 8309913 BLAKE2B
a63f5c747dd1d7a519873f00f234ae43d1ab5458e57b809f01e2b6cefc3e3921ecd7fff27cf4b21d59842f11e8d397760d90cf6572b42f65d226b21acc18fefc
SHA512
196bc26f7dd50596da90e6b4b0a8b4886b57ec928c182427fb8763507f1f4cb39a252bfddcbd6eccaa0cc920070b7b9fda03f18fd444f84154ddd925678ad7d4
DIST fcitx-5.1.11.tar.zst 8310353 BLAKE2B
b38daa03c40b19454cf8b82dc6c9d799730fb614bb606d86f0dfbadb6dd88f3a382f4c2b2a8f820bf4b01e27e27be82ed2624fb3f0a70843af5f72924e62e58b
SHA512
d2fee4b931175d67ed29058af5dc644c6918829ca336e88566781ffaf5ccbe942281e9a41459b5ad8ad37756bed24b999127f8b17d8925bb923a9eb10d1081fb
-DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B
2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d
SHA512
8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2
-DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B
3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1
SHA512
1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131
-DIST fcitx-data-py_stroke-20121124.tar.gz 445601 BLAKE2B
43b29b30da11b18196918e4df847406871eff75595b62608ad86b0ef6de83ec5e1b722645cabb809281075b393b5970e4d9580594caa73060c866c2d3cd988e7
SHA512
d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3
-DIST fcitx-data-py_table-20121124.tar.gz 186822 BLAKE2B
d696413f2e88f1ca87938d632e12997d14a31a66eaf011c6a7b3c0f607cf45f48e53644ea07d73dbbb0ad898dee6d5ff2d0e4fc2fdcae923acbc03d3d387aaeb
SHA512
0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486
-DIST fcitx-data-table.tar.gz 4144686 BLAKE2B
696845bb234915a364d614d47cc3baf8421a12ca1778611b0843e52e651da98b5ed9f3e0c9895a829b67f1bcceb1f982a7f6606c8a2d383af8c4573a150c71ef
SHA512
99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9
diff --git a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
deleted file mode 100644
index 2dd9ab5f65a6..000000000000
--- a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 2003-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit cmake gnome2-utils lua-single xdg-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/fcitx/fcitx";
-fi
-
-DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input
method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx";
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz ->
fcitx-data-pinyin.tar.gz
- https://download.fcitx-im.org/data/table.tar.gz ->
fcitx-data-table.tar.gz
- https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz ->
fcitx-data-py_stroke-20121124.tar.gz
- https://download.fcitx-im.org/data/py_table-20121124.tar.gz ->
fcitx-data-py_table-20121124.tar.gz
- https://download.fcitx-im.org/data/en_dict-20121020.tar.gz ->
fcitx-data-en_dict-20121020.tar.gz"
-else
- SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz";
-fi
-
-# LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT qt4? ( BSD )"
-LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
-SLOT="4"
-KEYWORDS="amd64 ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86"
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls
opencc +pango +table test +xkb"
-REQUIRED_USE="cairo? ( X )
- lua? ( ${LUA_REQUIRED_USE} )
- pango? ( cairo )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-util/glib-utils
- kde-frameworks/extra-cmake-modules:0
- virtual/pkgconfig
- introspection? ( dev-libs/gobject-introspection )
- nls? ( sys-devel/gettext )"
-DEPEND="!app-i18n/fcitx:5
- dev-libs/glib:2
- sys-apps/dbus
- sys-apps/util-linux
- virtual/libiconv
- virtual/libintl
- x11-libs/libxkbcommon
- X? (
- x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXrender
- xkb? (
- dev-libs/libxml2
- x11-libs/libxkbfile
- x11-misc/xkeyboard-config
- )
- )
- cairo? (
- x11-libs/cairo[X]
- x11-libs/libXext
- pango? ( x11-libs/pango )
- !pango? ( media-libs/fontconfig )
- )
- enchant? ( app-text/enchant:= )
- gtk2? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3 )
- lua? ( ${LUA_DEPS} )
- nls? ( sys-devel/gettext )
- opencc? ( app-i18n/opencc:0= )
- xkb? (
- app-text/iso-codes
- dev-libs/json-c:0=
- )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.2.9.8-enchant.patch"
- "${FILESDIR}/${PN}-4.2.9.8-xkb.patch"
-)
-
-DOCS=(AUTHORS ChangeLog THANKS)
-
-pkg_setup() {
- if use lua; then
- lua-single_pkg_setup
- fi
-}
-
-src_prepare() {
- if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz"
src/im/pinyin/data/pinyin.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-table.tar.gz"
src/im/table/data/table.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz"
src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz"
src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz"
src/module/spell/dict/en_dict-20121020.tar.gz || die
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- -DSYSCONFDIR="${EPREFIX}/etc"
- -DENABLE_CAIRO=$(usex cairo ON OFF)
- -DENABLE_DEBUG=$(usex debug ON OFF)
- -DENABLE_ENCHANT=$(usex enchant ON OFF)
- -DENABLE_GETTEXT=$(usex nls ON OFF)
- -DENABLE_GIR=$(usex introspection ON OFF)
- -DENABLE_GTK2_IM_MODULE=$(usex gtk2 ON OFF)
- -DENABLE_GTK3_IM_MODULE=$(usex gtk3 ON OFF)
- -DENABLE_LUA=$(usex lua ON OFF)
- -DENABLE_OPENCC=$(usex opencc ON OFF)
- -DENABLE_PANGO=$(usex pango ON OFF)
- -DENABLE_QT=OFF
- -DENABLE_QT_GUI=OFF
- -DENABLE_QT_IM_MODULE=OFF
- -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else
echo OFF; fi)
- -DENABLE_TABLE=$(usex table ON OFF)
- -DENABLE_TEST=$(usex test ON OFF)
- -DENABLE_X11=$(usex X ON OFF)
- -DENABLE_XDGAUTOSTART=$(usex autostart ON OFF)
- -DENABLE_XKB=$(usex xkb ON OFF)
- )
- if use lua; then
- mycmakeargs+=(
- -DLUA_MODULE_NAME=lua
- )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- rm -r "${ED}/usr/share/doc/${PN}"
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- use gtk2 && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
-
- elog
- elog "Quick Phrase Editor is provided by:"
- elog " app-i18n/fcitx-qt5:4"
- elog
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- use gtk2 && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
-}
diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild
b/app-i18n/fcitx/fcitx-4.9999.ebuild
deleted file mode 100644
index 57d117c67567..000000000000
--- a/app-i18n/fcitx/fcitx-4.9999.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 2003-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-LUA_COMPAT=( lua5-{1..4} )
-
-inherit cmake gnome2-utils lua-single xdg-utils
-
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/fcitx/fcitx";
-fi
-
-DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input
method framework"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx";
-if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz ->
fcitx-data-pinyin.tar.gz
- https://download.fcitx-im.org/data/table.tar.gz ->
fcitx-data-table.tar.gz
- https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz ->
fcitx-data-py_stroke-20121124.tar.gz
- https://download.fcitx-im.org/data/py_table-20121124.tar.gz ->
fcitx-data-py_table-20121124.tar.gz
- https://download.fcitx-im.org/data/en_dict-20121020.tar.gz ->
fcitx-data-en_dict-20121020.tar.gz"
-else
- SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz";
-fi
-
-# LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT qt4? ( BSD )"
-LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT"
-SLOT="4"
-KEYWORDS=""
-IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls
opencc +pango +table test +xkb"
-REQUIRED_USE="cairo? ( X )
- lua? ( ${LUA_REQUIRED_USE} )
- pango? ( cairo )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-util/glib-utils
- kde-frameworks/extra-cmake-modules:0
- virtual/pkgconfig
- introspection? ( dev-libs/gobject-introspection )
- nls? ( sys-devel/gettext )"
-DEPEND="!app-i18n/fcitx:5
- dev-libs/glib:2
- sys-apps/dbus
- sys-apps/util-linux
- virtual/libiconv
- virtual/libintl
- x11-libs/libxkbcommon
- X? (
- x11-libs/libX11
- x11-libs/libXfixes
- x11-libs/libXinerama
- x11-libs/libXrender
- xkb? (
- dev-libs/libxml2
- x11-libs/libxkbfile
- x11-misc/xkeyboard-config
- )
- )
- cairo? (
- x11-libs/cairo[X]
- x11-libs/libXext
- pango? ( x11-libs/pango )
- !pango? ( media-libs/fontconfig )
- )
- enchant? ( app-text/enchant:= )
- gtk2? ( x11-libs/gtk+:2 )
- gtk3? ( x11-libs/gtk+:3 )
- lua? ( ${LUA_DEPS} )
- nls? ( sys-devel/gettext )
- opencc? ( app-i18n/opencc:0= )
- xkb? (
- app-text/iso-codes
- dev-libs/json-c:0=
- )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.2.9.8-xkb.patch"
-)
-
-DOCS=(AUTHORS ChangeLog THANKS)
-
-pkg_setup() {
- if use lua; then
- lua-single_pkg_setup
- fi
-}
-
-src_prepare() {
- if [[ "${PV}" =~ (^|\.)9999$ ]]; then
- ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz"
src/im/pinyin/data/pinyin.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-table.tar.gz"
src/im/table/data/table.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz"
src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz"
src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die
- ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz"
src/module/spell/dict/en_dict-20121020.tar.gz || die
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
- -DSYSCONFDIR="${EPREFIX}/etc"
- -DENABLE_CAIRO=$(usex cairo ON OFF)
- -DENABLE_DEBUG=$(usex debug ON OFF)
- -DENABLE_ENCHANT=$(usex enchant ON OFF)
- -DENABLE_GETTEXT=$(usex nls ON OFF)
- -DENABLE_GIR=$(usex introspection ON OFF)
- -DENABLE_GTK2_IM_MODULE=$(usex gtk2 ON OFF)
- -DENABLE_GTK3_IM_MODULE=$(usex gtk3 ON OFF)
- -DENABLE_LUA=$(usex lua ON OFF)
- -DENABLE_OPENCC=$(usex opencc ON OFF)
- -DENABLE_PANGO=$(usex pango ON OFF)
- -DENABLE_QT=OFF
- -DENABLE_QT_GUI=OFF
- -DENABLE_QT_IM_MODULE=OFF
- -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else
echo OFF; fi)
- -DENABLE_TABLE=$(usex table ON OFF)
- -DENABLE_TEST=$(usex test ON OFF)
- -DENABLE_X11=$(usex X ON OFF)
- -DENABLE_XDGAUTOSTART=$(usex autostart ON OFF)
- -DENABLE_XKB=$(usex xkb ON OFF)
- )
- if use lua; then
- mycmakeargs+=(
- -DLUA_MODULE_NAME=lua
- )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- rm -r "${ED}/usr/share/doc/${PN}"
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- use gtk2 && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
-
- elog
- elog "Quick Phrase Editor is provided by:"
- elog " app-i18n/fcitx-qt5:4"
- elog
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
- xdg_mimeinfo_database_update
- use gtk2 && gnome2_query_immodules_gtk2
- use gtk3 && gnome2_query_immodules_gtk3
-}
diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index 0640c77fdbfe..e9a6b648e735 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -17,17 +17,11 @@
<flag name="autostart">Enable XDG-compatible autostart of
Fcitx</flag>
<flag name="emoji">Enable emoji loading for CLDR</flag>
<flag name="enchant">Enable Enchant backend (using
<pkg>app-text/enchant</pkg>) for spelling hinting</flag>
- <flag name="gtk2">Install input method module for GTK+ 2</flag>
- <flag name="gtk3">Install input method module for GTK+ 3</flag>
<flag name="keyboard">Enable key event translation with XKB and
build keyboard engine</flag>
- <flag name="opencc">Enable OpenCC engine (using
<pkg>app-i18n/opencc</pkg>) for converter between Simplified Chinese and
Traditional Chinese</flag>
- <flag name="pango">Enable support for
<pkg>x11-libs/pango</pkg></flag>
<flag name="presage">Enable presage for word predication (not
stable)</flag>
<flag name="server">Build a fcitx as server, disable this
option if you want to use fcitx as an embedded library</flag>
- <flag name="table">Install table input methods for Simplified
Chinese</flag>
- <flag name="xkb">Enable support for XKB (required for
fcitx-xkb, fcitx-xkbdbus, part of fcitx-keyboard)</flag>
</use>
<upstream>
- <remote-id type="github">fcitx/fcitx</remote-id>
+ <remote-id type="github">fcitx/fcitx5</remote-id>
</upstream>
</pkgmetadata>
