From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 72E0713835A for ; Thu, 25 Mar 2021 23:52:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7FEB0E07FE; Thu, 25 Mar 2021 23:52:16 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5BA20E07FE for ; Thu, 25 Mar 2021 23:52:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1FD0A33BF34 for ; Thu, 25 Mar 2021 23:52:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7BBBB631 for ; Thu, 25 Mar 2021 23:52:13 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1616716322.49e4c5c774a1b64f5231e155e976eac069cb6e92.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/fcitx/Manifest app-i18n/fcitx/fcitx-4.2.9.6.ebuild app-i18n/fcitx/fcitx-4.2.9.7.ebuild X-VCS-Directories: app-i18n/fcitx/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 49e4c5c774a1b64f5231e155e976eac069cb6e92 X-VCS-Branch: master Date: Thu, 25 Mar 2021 23:52:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fdaad260-af3e-4d8f-bdee-f04725dd2a8a X-Archives-Hash: e2399cd5cd07ad76a6344e30352a8379 commit: 49e4c5c774a1b64f5231e155e976eac069cb6e92 Author: Conrad Kostecki gentoo org> AuthorDate: Thu Mar 25 23:45:56 2021 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Thu Mar 25 23:52:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e4c5c7 app-i18n/fcitx: drop old version Dropping all old versions, as no slotted lua is supported. Current stable does support it. Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Conrad Kostecki gentoo.org> app-i18n/fcitx/Manifest | 2 - app-i18n/fcitx/fcitx-4.2.9.6.ebuild | 147 ------------------------------------ app-i18n/fcitx/fcitx-4.2.9.7.ebuild | 143 ----------------------------------- 3 files changed, 292 deletions(-) diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest index c4a7352eed0..5ca71d557d9 100644 --- a/app-i18n/fcitx/Manifest +++ b/app-i18n/fcitx/Manifest @@ -1,5 +1,3 @@ -DIST fcitx-4.2.9.6_dict.tar.xz 8738408 BLAKE2B 812256657ef8f6648a8a3de4bef4e423288ee3d91d493783eae2cb55b5b5964a791f3317af1aea0d877e01ea06491c34f6c594038d27713be3a6b35c93bc5545 SHA512 dc8308d1a4e9b7595da285ca6521f33027f5b8e6968bc28f751bd4f40116166cabbe1c05e29072afbe88473d2a9d6999124476260785e07f62a243df6e896bb0 -DIST fcitx-4.2.9.7_dict.tar.xz 8734508 BLAKE2B e8770a3afe902fab11325f345a128156a9e6e8c4f5e712c68a03a12282c0bc6a279968bacdb2129a243967c8fdfc6b7145f5ad13daea5bf0c5fb28332e79437e SHA512 b940478c648e30b2ea55903465ed02c8a0c3ae3539e4bd5b77be46a9e4d0c13ceff074ddd7532f86893111eb96308e1740db621a83fb809e4fd02256d75ebe7b DIST fcitx-4.2.9.8_dict.tar.xz 8737888 BLAKE2B 2de3ccbf1b37a9bcf1a3cb257d7837669e946765722c3d6f442ad071d7d81a6e8178e47051fc3aa53b9b4771d3aca602c2e22fa7a3d117a9e1f2779497e02c52 SHA512 50a954c3178f53fd2d441cdaf81fb44a7fe8dfb263fa6d8dd4ee4884fc7ae8321880c726c9366d11e2a4ac8da2233268d06e5d0800d4527ba0bdb1a1430248ed DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131 diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild deleted file mode 100644 index acdbda6b6d9..00000000000 --- a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 2003-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake gnome2-utils 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" -SLOT="4" -KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86" -IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xkb" -REQUIRED_USE="cairo? ( X ) pango? ( cairo )" -RESTRICT="!test? ( test )" - -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 - virtual/libintl - x11-libs/libxkbcommon - X? ( - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXinerama - x11-libs/libXrender - xkb? ( - 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:0= ) - gtk2? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) - lua? ( dev-lang/lua:0= ) - nls? ( sys-devel/gettext ) - opencc? ( app-i18n/opencc:0= ) - xkb? ( - app-text/iso-codes - dev-libs/libxml2 - )" -RDEPEND="${DEPEND}" - -DOCS=(AUTHORS ChangeLog THANKS) - -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 - - # https://github.com/fcitx/fcitx/issues/250 - sed \ - -e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \ - -e "/find_package(XkbFile REQUIRED)/s/^/ /" \ - -e "/find_package(XkbFile REQUIRED)/a\\ find_package(XKeyboardConfig REQUIRED)\n endif(ENABLE_X11)" \ - -e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \ - -i CMakeLists.txt - - 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_LIBXML2=$(usex xkb 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_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_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.2.9.7.ebuild b/app-i18n/fcitx/fcitx-4.2.9.7.ebuild deleted file mode 100644 index f46b88fecef..00000000000 --- a/app-i18n/fcitx/fcitx-4.2.9.7.ebuild +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright 2003-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake gnome2-utils 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" -SLOT="4" -KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86" -IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango +table test +xkb" -REQUIRED_USE="cairo? ( X ) pango? ( cairo )" -RESTRICT="!test? ( test )" - -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 - 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:0= ) - gtk2? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) - lua? ( dev-lang/lua:0= ) - 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) - -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) - ) - - 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 -}