From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- app-i18n/fcitx/Manifest | 6 +-- app-i18n/fcitx/fcitx-4.2.9.6.ebuild | 78 ++++++++++++++++++------------------- app-i18n/fcitx/fcitx-4.9999.ebuild | 76 ++++++++++++++++++------------------ app-i18n/fcitx/metadata.xml | 2 +- 4 files changed, 81 insertions(+), 81 deletions(-) (limited to 'app-i18n/fcitx') diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest index 85d7fcfd082c..eb3a2923c3ff 100644 --- a/app-i18n/fcitx/Manifest +++ b/app-i18n/fcitx/Manifest @@ -4,6 +4,6 @@ DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df1 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 -EBUILD fcitx-4.2.9.6.ebuild 4438 BLAKE2B ac64d8564d13d4f7e32207e05091853130a4abe2cf8bf06af6422e12e1af6b29bda0eb7617dd7eada237092e301d2d25bafe59a68e74285214462729e65a0f5a SHA512 9ad236e9718805b8b13be0a034bb57f06809e16b79d20fb2c1b63fb9facfea032c11fe384cda9b6878dfea6630d3baf9319cda21dbb8076c852a38e459cde9d3 -EBUILD fcitx-4.9999.ebuild 4413 BLAKE2B b273b0bc793dfd4f0d630fc0658f9b95bb55f2ea5a6188b5d56517e1b185103d40ca276e7fc7faabcb34066fb83c71c82b12beb491bebf95ed3ef91776f62cc3 SHA512 f3c324ebe212113342e2cede99d8a5a74dbe3e91dd0f14634febfe4118361690128dd9e5a46945489f58a7351cb5f557b9b448ba267222d9609470e7757847f4 -MISC metadata.xml 1076 BLAKE2B c4c0558a1e4b836fbf1e78ea1c4f8d60167fb07de270322133e9fa5479b7da4acd0bb5e7169e4759bbd0f8c1638aa271f6e82b2150c785ab5c54416b36a495ef SHA512 47382c905538cef508f9ca639a184dc767cd6ff063047da4ab4200c27631e833137a736899b45fcf5f0c9e4d59da93a6d1dd61873d6ad70a93ceb6cf4391da70 +EBUILD fcitx-4.2.9.6.ebuild 4538 BLAKE2B 24885bb784c46556f4ae323cb1773131d41742b16dc6dca784583a285aabcd34751d69fe6cf6f99a3f455f64813fcdbf79f60a7a7eab517826f098847ac6b145 SHA512 d5275a9d6d0c5bd134a29721995e09389640954fd966b2ff9de2d205ba6642c191d50ff37dfd92da7f5ac009979740f8776a871ba570f99428aeb2bff8cc424f +EBUILD fcitx-4.9999.ebuild 4506 BLAKE2B c4e02d1bb61fdcaf57468d354c2d04b6797ae9e9b120f106ac853c818351700740323ae1c03b72a3f18ef6fc7b3864a414e923f8064f88a1879331d1695a32f0 SHA512 ae757929c401888ddb76b1f0244c53415180c95e2679a8d23282b41831d478ef87ff1a7f1086feecdba1678d89b4c057be4f4e4537bb210fed1c97976c45bc54 +MISC metadata.xml 1076 BLAKE2B 26683fedf129c5a12418a498aab7dbeee3b309b9f88a91e1038ba4f8babea80a8e1847b2b2e3d3e942fd9d3de32a97c6d7229fb97d5d91131c6a0093119d0de7 SHA512 dd819898fe67f8d746f43f02606d7a38360be1f66e6c6d33f0f81aff389018c7a988bb27304344a4107287b753a5acda3c20ad10d37f9ca859d1e948acdb2224 diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild index 0681078c51a6..abf4e1cbdb6a 100644 --- a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild +++ b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild @@ -1,18 +1,18 @@ -# Copyright 2003-2019 Gentoo Authors +# Copyright 2003-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit cmake-utils gnome2-utils xdg-utils +inherit cmake gnome2-utils xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx.git" + 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://gitlab.com/fcitx/fcitx" +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 @@ -25,12 +25,17 @@ fi LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT" SLOT="4" -KEYWORDS="amd64 ~hppa ppc ppc64 x86" +KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86" IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xml" -RESTRICT="!test? ( test )" REQUIRED_USE="cairo? ( X ) pango? ( cairo )" +RESTRICT="!test? ( test )" -RDEPEND="dev-libs/glib:2 +BDEPEND="dev-util/glib-utils + kde-frameworks/extra-cmake-modules:5 + virtual/pkgconfig + introspection? ( dev-libs/gobject-introspection ) + nls? ( sys-devel/gettext )" +DEPEND="dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv @@ -55,18 +60,14 @@ RDEPEND="dev-libs/glib:2 enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) - introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) - opencc? ( app-i18n/opencc:= ) + opencc? ( app-i18n/opencc:0= ) xml? ( app-text/iso-codes dev-libs/libxml2 )" -DEPEND="${RDEPEND} - dev-util/glib-utils - kde-frameworks/extra-cmake-modules:5 - virtual/pkgconfig" +RDEPEND="${DEPEND}" DOCS=(AUTHORS ChangeLog THANKS) @@ -79,7 +80,7 @@ src_prepare() { ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die fi - # https://gitlab.com/fcitx/fcitx/issues/250 + # https://github.com/fcitx/fcitx/issues/250 sed \ -e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \ -e "/find_package(XkbFile REQUIRED)/s/^/ /" \ @@ -87,47 +88,46 @@ src_prepare() { -e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \ -i CMakeLists.txt - cmake-utils_src_prepare - xdg_environment_reset + cmake_src_prepare } src_configure() { local mycmakeargs=( -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" -DSYSCONFDIR="${EPREFIX}/etc" - -DENABLE_CAIRO=$(usex cairo) - -DENABLE_DEBUG=$(usex debug) - -DENABLE_ENCHANT=$(usex enchant) - -DENABLE_GETTEXT=$(usex nls) - -DENABLE_GIR=$(usex introspection) - -DENABLE_GTK2_IM_MODULE=$(usex gtk2) - -DENABLE_GTK3_IM_MODULE=$(usex gtk3) - -DENABLE_LIBXML2=$(usex xml) - -DENABLE_LUA=$(usex lua) - -DENABLE_OPENCC=$(usex opencc) - -DENABLE_PANGO=$(usex pango) + -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_LIBXML2=$(usex xml 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 yes; else echo no; fi) - -DENABLE_STATIC=$(usex static-libs) - -DENABLE_TABLE=$(usex table) - -DENABLE_TEST=$(usex test) - -DENABLE_X11=$(usex X) - -DENABLE_XDGAUTOSTART=$(usex autostart) + -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else echo OFF; fi) + -DENABLE_STATIC=$(usex static-libs ON OFF) + -DENABLE_TABLE=$(usex table ON OFF) + -DENABLE_TEST=$(usex test ON OFF) + -DENABLE_X11=$(usex X ON OFF) + -DENABLE_XDGAUTOSTART=$(usex autostart ON OFF) ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install - rm -r "${ED}usr/share/doc/${PN}" + cmake_src_install + rm -r "${ED}/usr/share/doc/${PN}" } pkg_postinst() { - gnome2_icon_cache_update xdg_desktop_database_update + xdg_icon_cache_update xdg_mimeinfo_database_update use gtk2 && gnome2_query_immodules_gtk2 use gtk3 && gnome2_query_immodules_gtk3 @@ -139,8 +139,8 @@ pkg_postinst() { } pkg_postrm() { - gnome2_icon_cache_update 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 index 813284c841dc..53d5b963fa21 100644 --- a/app-i18n/fcitx/fcitx-4.9999.ebuild +++ b/app-i18n/fcitx/fcitx-4.9999.ebuild @@ -1,18 +1,18 @@ -# Copyright 2003-2019 Gentoo Authors +# Copyright 2003-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit cmake-utils gnome2-utils xdg-utils +inherit cmake gnome2-utils xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 - EGIT_REPO_URI="https://gitlab.com/fcitx/fcitx.git" + 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://gitlab.com/fcitx/fcitx" +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 @@ -27,10 +27,15 @@ LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT" SLOT="4" KEYWORDS="" IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xml" -RESTRICT="!test? ( test )" REQUIRED_USE="cairo? ( X ) pango? ( cairo )" +RESTRICT="!test? ( test )" -RDEPEND="dev-libs/glib:2 +BDEPEND="dev-util/glib-utils + kde-frameworks/extra-cmake-modules:5 + virtual/pkgconfig + introspection? ( dev-libs/gobject-introspection ) + nls? ( sys-devel/gettext )" +DEPEND="dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv @@ -55,18 +60,14 @@ RDEPEND="dev-libs/glib:2 enchant? ( app-text/enchant:0= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) - introspection? ( dev-libs/gobject-introspection ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) - opencc? ( app-i18n/opencc:= ) + opencc? ( app-i18n/opencc:0= ) xml? ( app-text/iso-codes dev-libs/libxml2 )" -DEPEND="${RDEPEND} - dev-util/glib-utils - kde-frameworks/extra-cmake-modules:5 - virtual/pkgconfig" +RDEPEND="${DEPEND}" DOCS=(AUTHORS ChangeLog THANKS) @@ -79,7 +80,7 @@ src_prepare() { ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die fi - # https://gitlab.com/fcitx/fcitx/issues/250 + # https://github.com/fcitx/fcitx/issues/250 sed \ -e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \ -e "/find_package(XkbFile REQUIRED)/s/^/ /" \ @@ -87,47 +88,46 @@ src_prepare() { -e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \ -i CMakeLists.txt - cmake-utils_src_prepare - xdg_environment_reset + cmake_src_prepare } src_configure() { local mycmakeargs=( -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" -DSYSCONFDIR="${EPREFIX}/etc" - -DENABLE_CAIRO=$(usex cairo) - -DENABLE_DEBUG=$(usex debug) - -DENABLE_ENCHANT=$(usex enchant) - -DENABLE_GETTEXT=$(usex nls) - -DENABLE_GIR=$(usex introspection) - -DENABLE_GTK2_IM_MODULE=$(usex gtk2) - -DENABLE_GTK3_IM_MODULE=$(usex gtk3) - -DENABLE_LIBXML2=$(usex xml) - -DENABLE_LUA=$(usex lua) - -DENABLE_OPENCC=$(usex opencc) - -DENABLE_PANGO=$(usex pango) + -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_LIBXML2=$(usex xml 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 yes; else echo no; fi) - -DENABLE_STATIC=$(usex static-libs) - -DENABLE_TABLE=$(usex table) - -DENABLE_TEST=$(usex test) - -DENABLE_X11=$(usex X) - -DENABLE_XDGAUTOSTART=$(usex autostart) + -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else echo OFF; fi) + -DENABLE_STATIC=$(usex static-libs ON OFF) + -DENABLE_TABLE=$(usex table ON OFF) + -DENABLE_TEST=$(usex test ON OFF) + -DENABLE_X11=$(usex X ON OFF) + -DENABLE_XDGAUTOSTART=$(usex autostart ON OFF) ) - cmake-utils_src_configure + cmake_src_configure } src_install() { - cmake-utils_src_install - rm -r "${ED}usr/share/doc/${PN}" + cmake_src_install + rm -r "${ED}/usr/share/doc/${PN}" } pkg_postinst() { - gnome2_icon_cache_update xdg_desktop_database_update + xdg_icon_cache_update xdg_mimeinfo_database_update use gtk2 && gnome2_query_immodules_gtk2 use gtk3 && gnome2_query_immodules_gtk3 @@ -139,8 +139,8 @@ pkg_postinst() { } pkg_postrm() { - gnome2_icon_cache_update 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 e9e77497feec..d364159f7497 100644 --- a/app-i18n/fcitx/metadata.xml +++ b/app-i18n/fcitx/metadata.xml @@ -19,6 +19,6 @@ Install table input methods for Simplified Chinese - fcitx/fcitx + fcitx/fcitx -- cgit v1.2.3