diff options
Diffstat (limited to 'app-i18n')
475 files changed, 5505 insertions, 10260 deletions
diff --git a/app-i18n/anthy/anthy-9100h-r3.ebuild b/app-i18n/anthy/anthy-9100h-r3.ebuild index 0a4beeca472b..f8f5aaa2418c 100644 --- a/app-i18n/anthy/anthy-9100h-r3.ebuild +++ b/app-i18n/anthy/anthy-9100h-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2003-2021 Gentoo Authors +# Copyright 2003-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/37536/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="emacs static-libs" BDEPEND="emacs? ( >=app-editors/emacs-23.1:* )" diff --git a/app-i18n/anthy/metadata.xml b/app-i18n/anthy/metadata.xml index 794feb3174cc..e7f1a0480e6a 100644 --- a/app-i18n/anthy/metadata.xml +++ b/app-i18n/anthy/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>hattya@gentoo.org</email> @@ -16,6 +16,6 @@ this package with emacs USE flag). </longdescription> <upstream> - <remote-id type="sourceforge-jp">anthy</remote-id> + <remote-id type="osdn">anthy</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/bidiv/metadata.xml b/app-i18n/bidiv/metadata.xml index c921b96adf6c..1d892a124fa3 100644 --- a/app-i18n/bidiv/metadata.xml +++ b/app-i18n/bidiv/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/cstools/Manifest b/app-i18n/cstools/Manifest index 6eef0d40f8ce..bc4aa1695110 100644 --- a/app-i18n/cstools/Manifest +++ b/app-i18n/cstools/Manifest @@ -1 +1 @@ -DIST Cstools-3.42.tar.gz 30650 BLAKE2B bf67d60b2373bed444086a8866695ee861f473fde5a623b7813659fda5dc905bffc968fefb479bd76e8345a1d9f47d3094c55a683a939a45e9a5fffd402ad33c SHA512 78f2f95b5cfde77d23249550085a895abc35965b02ff26382b248d4e713c90c113ad7909b916713dff55c9ee210f13672d609d794b3caf9985fcb207a071f19f +DIST Cstools-3.44.tar.gz 31924 BLAKE2B 193d1d85746bf028833416bdb3e6c3b220498affb0162bd688fcc7ac4c406c618c53c2d2e7a4cb2fc799469246e1366f8c3f43f6f834220d2719b753c1511630 SHA512 9843eefb5f9a4edb33767162cb4beb24709d61903ccda8552cc9d914ef27ca6705a14e98cfb52a00c37f0428d937237044f96c0ba1673e6e67ad98f027032922 diff --git a/app-i18n/cstools/cstools-3.42-r1.ebuild b/app-i18n/cstools/cstools-3.44.ebuild index 5a1eb09a1a07..5c7df5908924 100644 --- a/app-i18n/cstools/cstools-3.42-r1.ebuild +++ b/app-i18n/cstools/cstools-3.44.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 +# Fails in parallel +# bug #707888 +DIST_TEST="do" inherit perl-module MY_P="Cstools-${PV}" DESCRIPTION="A charset conversion tool cstocs and two Perl modules for Czech language" SRC_URI="https://www.adelton.com/perl/Cstools/${MY_P}.tar.gz" HOMEPAGE="https://www.adelton.com/perl/Cstools/" -SLOT="0" +S="${WORKDIR}/${MY_P}" + LICENSE="Artistic" +SLOT="0" KEYWORDS="amd64 x86" -IUSE="" RDEPEND="dev-perl/MIME-tools" BDEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker -" - -S="${WORKDIR}/${MY_P}" + virtual/perl-ExtUtils-MakeMaker" diff --git a/app-i18n/cstools/metadata.xml b/app-i18n/cstools/metadata.xml index cef9b13e3ce9..ec4d1b2a409a 100644 --- a/app-i18n/cstools/metadata.xml +++ b/app-i18n/cstools/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <longdescription lang="en"> diff --git a/app-i18n/dbskkd-cdb/Manifest b/app-i18n/dbskkd-cdb/Manifest index 446761ac9fc9..c28ec64d73e3 100644 --- a/app-i18n/dbskkd-cdb/Manifest +++ b/app-i18n/dbskkd-cdb/Manifest @@ -1,2 +1 @@ -DIST dbskkd-cdb-2.00.tar.gz 9296 BLAKE2B d863e2a05cdcf9c8c030c2e3cc2a46a22f5bb01d844ee5120d686a672952ff2609f994fe8a4915daa5b293357f3da87cc9f702f7307dc162a20ffd0a7d47f804 SHA512 3582728d2a1917c00437b273208fa150a5a32dcd462752c6751ddbd574ca7f1476b2aca0d2613471a800bd17f80e2c4b60846f9056ae621996f8f5a5592fa22a DIST dbskkd-cdb-3.00.tar.gz 9380 BLAKE2B 81b167485a0ac287c01a5cab2fc638d4303bb8e1529dfc14b89ba8242915de38165acba5d0df00714bf8b1c5b190b3cf655e654e96bae5081bd3fba1f71e7a6a SHA512 a3fe5a0f2e96828d22a75e4daf36eecaa8d903efe8c8a5f6972178f52dc01cac5df5f3e1d8a2cf684d6b78a9c10c207b655a296ceb456dec9f0e502142de094b diff --git a/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00-r1.ebuild b/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00-r1.ebuild deleted file mode 100644 index f63e8826adc0..000000000000 --- a/app-i18n/dbskkd-cdb/dbskkd-cdb-2.00-r1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="SKK dictionary server based on cdb" -HOMEPAGE="https://github.com/jj1bdx/dbskkd-cdb" -SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" - -DEPEND="|| ( - dev-db/tinycdb - dev-db/cdb - ) -" - -RDEPEND=" - acct-group/dbskkd - acct-user/dbskkd - app-i18n/skk-jisyo[cdb] - sys-apps/xinetd -" - -PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch ) - -src_prepare() { - default - - local cdblib=() - if has_version dev-db/cdb; then - append-cflags -I"${EPREFIX}"/usr/include/cdb - local a - for a in cdb.a alloc.a buffer.a byte.a unix.a; do - cdblib+=( "${EPREFIX}"/usr/$(get_libdir)/${a} ) - done - else - cdblib+=( -lcdb ) - fi - - sed -i "/^CDBLIB/s|=.*$|= ${cdblib[*]}|" Makefile -} - -src_compile() { - emake \ - CC="$(tc-getCC)" \ - COMPAT="-DJISYO_FILE=\\\"${EPREFIX}/usr/share/skk/SKK-JISYO.L.cdb\\\"" -} - -src_install() { - exeinto /usr/libexec - doexe dbskkd-cdb - dodoc *.txt - einstalldocs - - insinto /etc/xinetd.d - newins "${FILESDIR}"/dbskkd-cdb.xinetd dbskkd-cdb -} diff --git a/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00-r1.ebuild b/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00-r1.ebuild index 6280316c12af..71c55dbae3fb 100644 --- a/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00-r1.ebuild +++ b/app-i18n/dbskkd-cdb/dbskkd-cdb-3.00-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/jj1bdx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" DEPEND=" || ( diff --git a/app-i18n/dbskkd-cdb/metadata.xml b/app-i18n/dbskkd-cdb/metadata.xml index e6d1445169e6..58a976275664 100644 --- a/app-i18n/dbskkd-cdb/metadata.xml +++ b/app-i18n/dbskkd-cdb/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/enca/enca-1.19-r3.ebuild b/app-i18n/enca/enca-1.19-r3.ebuild index 94cbc29fa4b1..eb3626d6c4f5 100644 --- a/app-i18n/enca/enca-1.19-r3.ebuild +++ b/app-i18n/enca/enca-1.19-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="doc +iconv recode" BDEPEND="doc? ( dev-util/gtk-doc )" diff --git a/app-i18n/enca/metadata.xml b/app-i18n/enca/metadata.xml index 11eb65ff9bbb..00750b4dfb25 100644 --- a/app-i18n/enca/metadata.xml +++ b/app-i18n/enca/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> <upstream> diff --git a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild index c6271dc437cd..fa95d577d192 100644 --- a/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild +++ b/app-i18n/fbterm/fbterm-1.7_p20190503.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -13,16 +13,18 @@ SRC_URI="https://github.com/gjedeer/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}. LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="gpm video_cards_vesa" -BDEPEND="virtual/pkgconfig" -DEPEND="media-libs/fontconfig +RDEPEND="media-libs/fontconfig media-libs/freetype:2 >=sys-libs/ncurses-6.1 gpm? ( sys-libs/gpm ) video_cards_vesa? ( dev-libs/libx86 )" -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-autoconf-2.68.patch ) FILECAPS=( cap_sys_tty_config+ep usr/bin/${PN} diff --git a/app-i18n/fbterm/files/fbterm-autoconf-2.68.patch b/app-i18n/fbterm/files/fbterm-autoconf-2.68.patch new file mode 100644 index 000000000000..826f3cd3c6bc --- /dev/null +++ b/app-i18n/fbterm/files/fbterm-autoconf-2.68.patch @@ -0,0 +1,24 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -85,16 +85,16 @@ + + if test x"$EPOLL" = xauto -a x"$cross_compiling" = xno; then + AC_RUN_IFELSE( +- AC_LANG_PROGRAM([[#include <sys/epoll.h>]], +- [[if (epoll_create(10) >= 0) return 0; return 1;]]), ++ [AC_LANG_PROGRAM([[#include <sys/epoll.h>]], ++ [[if (epoll_create(10) >= 0) return 0; return 1;]])], + [EPOLL=yes] + ) + fi + + if test x"$SIGNALFD" = xauto -a x"$cross_compiling" = xno; then + AC_RUN_IFELSE( +- AC_LANG_PROGRAM([[#include <sys/signalfd.h>]], +- [[sigset_t mask; if (signalfd(-1, &mask, 0) >= 0) return 0; return 1;]]), ++ [AC_LANG_PROGRAM([[#include <sys/signalfd.h>]], ++ [[sigset_t mask; if (signalfd(-1, &mask, 0) >= 0) return 0; return 1;]])], + [SIGNALFD=yes] + ) + fi +install-data-local: diff --git a/app-i18n/fbterm/metadata.xml b/app-i18n/fbterm/metadata.xml index d76dd2993d24..4a6d3fc25aad 100644 --- a/app-i18n/fbterm/metadata.xml +++ b/app-i18n/fbterm/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/fcitx-anthy/Manifest b/app-i18n/fcitx-anthy/Manifest index 814cb3b6b049..e67ac21a00b8 100644 --- a/app-i18n/fcitx-anthy/Manifest +++ b/app-i18n/fcitx-anthy/Manifest @@ -1 +1,2 @@ DIST fcitx-anthy-0.2.3.tar.xz 78020 BLAKE2B ae054f753dd7d10a0dafd80d67413c29806b6c3b08de9eac3d7eae1d540f01b7bafd22bd9c722a7fc517f1752d90c1c3d82e75aaf58a807daa60b7e9a047d152 SHA512 2769871059053fb370ba84af7cdf0c461d64724a240d58a5a8889cfd9bfb5d145998f79ed2d06a1ae1ab907f9db04fc122bfaf6957ef572fc833e400ffefc642 +DIST fcitx5-anthy-5.1.3.tar.xz 84388 BLAKE2B ddc07bdc721b3e108d758aaa5cbb0c71a9d9d9c55b91c50c4766c3bac45d501f9c9846c10aad5966f547da0f9510d32c5e679327c8672546418ed050381dbdf7 SHA512 389570108c120e3f1691f94907aecf74cef418510a1eb602ec7c7f79ae02ebd0df757a68632f4d355723961eb1f24bd66c36f52ec0c42b2c678e0f9d9f01f2a1 diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild index fc844ebde29e..a07614fa3037 100644 --- a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild +++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2013-2020 Gentoo Authors +# Copyright 2013-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -21,7 +21,7 @@ fi LICENSE="GPL-2+" SLOT="4" -KEYWORDS="amd64 ppc ppc64 x86" +KEYWORDS="amd64 ppc ppc64 ~riscv x86" IUSE="" BDEPEND="virtual/pkgconfig" diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-5.1.3.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-5.1.3.ebuild new file mode 100644 index 000000000000..0c92f331693c --- /dev/null +++ b/app-i18n/fcitx-anthy/fcitx-anthy-5.1.3.ebuild @@ -0,0 +1,32 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5-anthy" + +inherit cmake xdg + +DESCRIPTION="Japanese Anthy input methods for Fcitx5" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-anthy" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + !app-i18n/fcitx-anthy:4 + app-i18n/anthy + >=app-i18n/fcitx-5.1.6:5 +" +DEPEND="${RDEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_PN}-${PV}" +DOCS=( AUTHORS ) diff --git a/app-i18n/fcitx-anthy/metadata.xml b/app-i18n/fcitx-anthy/metadata.xml index b01927f26e03..bfd3609f4dcf 100644 --- a/app-i18n/fcitx-anthy/metadata.xml +++ b/app-i18n/fcitx-anthy/metadata.xml @@ -1,15 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> <name>Arfrever Frehtes Taifersar Arahesis</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <maintainer type="project"> <email>cjk@gentoo.org</email> <name>Cjk</name> </maintainer> <upstream> <remote-id type="github">fcitx/fcitx-anthy</remote-id> + <remote-id type="github">fcitx/fcitx5-anthy</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/fcitx-chewing/Manifest b/app-i18n/fcitx-chewing/Manifest index 3e3b71ef4333..2c5750184098 100644 --- a/app-i18n/fcitx-chewing/Manifest +++ b/app-i18n/fcitx-chewing/Manifest @@ -1 +1,2 @@ DIST fcitx-chewing-0.2.3.tar.xz 19804 BLAKE2B 0a83ae9a17eb74898e41471450a9054bb05e504a60d05bda91fa53f90cb4328b0db4bd5e1d662c81c9322268660e57a7f2cb9c547593913206a00394883341b1 SHA512 3492ad6ecaf00bb1ea07b76c9c23da075615597c1a68434a2da003cbe410d12172510d4306379777a1d04a359b017c49d278c002a7230b030693b668b6030bfd +DIST fcitx-chewing-5.1.1.tar.xz 23948 BLAKE2B 1894de696d735b469431c5fa0689c88948d34091f0a396b05a076cce4201cf605e00b45e864a65d9c40d42091842ca0efdf55bef2c66ebe65ed40367d7fd7f12 SHA512 48aeb1755c917fe931165f3f41cc175a22a76cf8a6d4be05e7eb6bbb0908225b2f6a99529943f773e7d0ed674dcdbf138e56e7b5962566a0f1219c3919039553 diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild index 62f9a48cb0ac..e160732f8a5b 100644 --- a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild +++ b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 2013-2020 Gentoo Authors +# Copyright 2013-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -21,7 +21,7 @@ fi LICENSE="GPL-2+" SLOT="4" -KEYWORDS="amd64 ppc ppc64 x86" +KEYWORDS="amd64 ppc ppc64 ~riscv x86" IUSE="" BDEPEND="virtual/pkgconfig" diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-5.1.1.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-5.1.1.ebuild new file mode 100644 index 000000000000..7a2ba6c6a106 --- /dev/null +++ b/app-i18n/fcitx-chewing/fcitx-chewing-5.1.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5-chewing" + +inherit cmake xdg + +DESCRIPTION="Chewing Wrapper for Fcitx." +HOMEPAGE="https://github.com/fcitx/fcitx5-chewing" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz" + +LICENSE="LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" + +RDEPEND=" + !app-i18n/fcitx-chewing:4 + >=app-i18n/fcitx-5.1.6:5 + >=app-i18n/libchewing-0.5.0 +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/app-i18n/fcitx-chewing/metadata.xml b/app-i18n/fcitx-chewing/metadata.xml index a12906357886..2502d08cdd19 100644 --- a/app-i18n/fcitx-chewing/metadata.xml +++ b/app-i18n/fcitx-chewing/metadata.xml @@ -1,15 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> <name>Arfrever Frehtes Taifersar Arahesis</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <maintainer type="project"> <email>cjk@gentoo.org</email> <name>Cjk</name> </maintainer> <upstream> <remote-id type="github">fcitx/fcitx-chewing</remote-id> + <remote-id type="github">fcitx/fcitx5-chewing</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/fcitx-chinese-addons/Manifest b/app-i18n/fcitx-chinese-addons/Manifest new file mode 100644 index 000000000000..69995159defa --- /dev/null +++ b/app-i18n/fcitx-chinese-addons/Manifest @@ -0,0 +1,2 @@ +DIST fcitx5-chinese-addons-5.1.4_dict.tar.xz 885456 BLAKE2B 239b2092d9b4ca77d7c0373a85e7a0e5b03e223c477b8704e36657349cf3ba006791e77a064826cd452eb6e5e81d33831feceabb9a51a8d26275f70deb04658a SHA512 99f3cc101532879c126e2699d338528a25531b782a5c1f1e93cd363437567c1ba7b0173aca56f887089d4379e86aecf7977139b5b5c44d54e0bd9a416b01e976 +DIST fcitx5-chinese-addons-5.1.5_dict.tar.zst 1007840 BLAKE2B dc7cfe09789a6d7ed5d820ebdae133648748478746b3da7ec93a7e1bf31db34d212459dd64e1887bb7cb4ab15f2846fab1d97cf4a17082129c9f4a6cbf819e76 SHA512 50559f1f2ffa89eb24ce58a14c3ca21f3c1092961ce90b925fcf89a029d65c0aee3601d89003be5e92f9f1697e72d5eb2dade06863256a9a615f8be9ec2b2fe5 diff --git a/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.4.ebuild b/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.4.ebuild new file mode 100644 index 000000000000..009b5efe7416 --- /dev/null +++ b/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.4.ebuild @@ -0,0 +1,63 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5-chinese-addons" + +inherit cmake xdg + +DESCRIPTION="Addons related to Chinese, including IME previous bundled inside fcitx4." +HOMEPAGE="https://github.com/fcitx/fcitx5-chinese-addons" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}_dict.tar.xz" + +LICENSE="GPL-2+ LGPL-2+" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +SLOT="5" +IUSE="+data +gui webengine +cloudpinyin +qt5 qt6 lua +opencc test" +REQUIRED_USE=" + webengine? ( gui ) +" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-i18n/fcitx-5.1.6:5 + >=app-i18n/libime-1.1.3:5[data?] + >=dev-libs/boost-1.61:= + cloudpinyin? ( net-misc/curl ) + lua? ( app-i18n/fcitx-lua:5 ) + opencc? ( app-i18n/opencc:= ) + gui? ( + qt5? ( + dev-qt/qtconcurrent:5 + app-i18n/fcitx-qt:5[qt5,-onlyplugin] + webengine? ( dev-qt/qtwebengine:5[widgets] ) + ) + qt6? ( + dev-qt/qtbase:6[concurrent] + app-i18n/fcitx-qt:5[qt6,-onlyplugin] + webengine? ( dev-qt/qtwebengine:6[widgets] ) + ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_configure() { + local mycmakeargs=( + -DENABLE_BROWSER=$(usex webengine) + -DENABLE_CLOUDPINYIN=$(usex cloudpinyin) + -DENABLE_DATA=$(usex data) + -DENABLE_GUI=$(usex gui) + -DENABLE_OPENCC=$(usex opencc) + -DENABLE_TEST=$(usex test) + -DUSE_WEBKIT=no + -DUSE_QT6=$(usex qt6) + ) + cmake_src_configure +} diff --git a/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.5.ebuild b/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.5.ebuild new file mode 100644 index 000000000000..22638f079ea1 --- /dev/null +++ b/app-i18n/fcitx-chinese-addons/fcitx-chinese-addons-5.1.5.ebuild @@ -0,0 +1,62 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5-chinese-addons" + +inherit cmake unpacker xdg + +DESCRIPTION="Addons related to Chinese, including IME previous bundled inside fcitx4." +HOMEPAGE="https://github.com/fcitx/fcitx5-chinese-addons" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}_dict.tar.zst" + +S="${WORKDIR}/${MY_PN}-${PV}" +LICENSE="GPL-2+ LGPL-2+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="+data +gui webengine +cloudpinyin +qt5 qt6 lua +opencc test" +REQUIRED_USE=" + webengine? ( gui ) +" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-i18n/fcitx-5.1.9:5 + >=app-i18n/libime-1.1.7:5[data?] + >=dev-libs/boost-1.61:= + cloudpinyin? ( net-misc/curl ) + lua? ( app-i18n/fcitx-lua:5 ) + opencc? ( app-i18n/opencc:= ) + gui? ( + qt5? ( + dev-qt/qtconcurrent:5 + app-i18n/fcitx-qt:5[qt5,-onlyplugin] + webengine? ( dev-qt/qtwebengine:5[widgets] ) + ) + qt6? ( + dev-qt/qtbase:6[concurrent] + app-i18n/fcitx-qt:5[qt6,-onlyplugin] + webengine? ( dev-qt/qtwebengine:6[widgets] ) + ) + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig +" + +src_configure() { + local mycmakeargs=( + -DENABLE_BROWSER=$(usex webengine) + -DENABLE_CLOUDPINYIN=$(usex cloudpinyin) + -DENABLE_DATA=$(usex data) + -DENABLE_GUI=$(usex gui) + -DENABLE_OPENCC=$(usex opencc) + -DENABLE_TEST=$(usex test) + -DUSE_WEBKIT=no + -DUSE_QT6=$(usex qt6) + ) + cmake_src_configure +} diff --git a/app-i18n/fcitx-chinese-addons/metadata.xml b/app-i18n/fcitx-chinese-addons/metadata.xml new file mode 100644 index 000000000000..2b09f33c853c --- /dev/null +++ b/app-i18n/fcitx-chinese-addons/metadata.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <use> + <flag name="cloudpinyin">Build cloud pinyin addon</flag> + <flag name="data">Build data</flag> + <flag name="gui">Enable GUI support (qt5 or qt6)</flag> + <flag name="opencc">Enable support for conversion between Traditional and Simplified Chinese</flag> + <flag name="qt5">Enable configure qt5</flag> + <flag name="webengine">Enable built-in browser using <pkg>dev-qt/qtwebengine</pkg></flag> + </use> +<upstream> +<remote-id type="github">fcitx/fcitx5-chinese-addons</remote-id> +</upstream> +</pkgmetadata> diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild index 23e8cb103602..4888a98e0b57 100644 --- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild +++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild @@ -21,7 +21,7 @@ fi LICENSE="GPL-2+" SLOT="4" -KEYWORDS="amd64 ppc ppc64 x86" +KEYWORDS="amd64 ppc ppc64 ~riscv x86" IUSE="" BDEPEND="virtual/pkgconfig" diff --git a/app-i18n/fcitx-cloudpinyin/metadata.xml b/app-i18n/fcitx-cloudpinyin/metadata.xml index bf9e3c5eb19c..0712aa59b608 100644 --- a/app-i18n/fcitx-cloudpinyin/metadata.xml +++ b/app-i18n/fcitx-cloudpinyin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest index 1cf6ca87802c..e3e55d41c0ed 100644 --- a/app-i18n/fcitx-configtool/Manifest +++ b/app-i18n/fcitx-configtool/Manifest @@ -1 +1,3 @@ DIST fcitx-configtool-0.4.10.tar.xz 50440 BLAKE2B f2f2241d3ea139f6f3de9b8c6ffcc71c789dfa291efe4c551596eebc8a04f13f9fe698cc25d8349a174399044d15ddca2aeab952ac2bc7f0f4e9e47d453329ca SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f +DIST fcitx-configtool-5.1.4.tar.xz 110356 BLAKE2B 942cd0b68d689f865bb46796543cea7746a0409bead0cb0d79f30ca23b988f93ac81ed862855f521c5e36541d210d12f898d45f195dc2afb2181198c846a8b27 SHA512 95ac4a8b8c261ae990d30d34ffa02f14f00916197f8f9f81ca4dd8a33c609124b1cfb25ce3ff8ccb653409879606f7f97dc0fd01e8e1d7f2ddba8bdfc51ac6eb +DIST fcitx-configtool-5.1.5.tar.zst 148724 BLAKE2B 5bb8c819e0bbf7f962b4e7e91b9e4ba39f0637b478fb7d0d386e6f807c6f46be5ef1e4b52fd4c006dcfee944e33fd928119efb6b332fe16f1bfe17c31d751b11 SHA512 da418ad709dd5074bb413e8a042a53c055d151d27e487933481276980bbb1a971f4d1909f43b7cb5bb3983c190cba4a3fc12d6f1a1984dd9babf4607bec7334f diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild index 940ea21df73d..965a595ecd0b 100644 --- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild +++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild @@ -21,7 +21,7 @@ fi LICENSE="GPL-2+ LGPL-2.1+" SLOT="4" -KEYWORDS="amd64 ~arm64 ppc ppc64 x86" +KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86" IUSE="" BDEPEND="dev-libs/glib:2 diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.4.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.4.ebuild new file mode 100644 index 000000000000..f58d2433cd8f --- /dev/null +++ b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.4.ebuild @@ -0,0 +1,72 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5-configtool" + +inherit cmake + +DESCRIPTION="Configuration module for Fcitx" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-configtool" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="kcm +config-qt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-i18n/fcitx-5.1.6:5 + >=app-i18n/fcitx-qt-5.1.4:5[qt5,-onlyplugin] + app-text/iso-codes + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + kde-frameworks/kwidgetsaddons:5 + sys-devel/gettext + virtual/libintl + x11-libs/libX11 + x11-libs/libxkbfile + x11-misc/xkeyboard-config + config-qt? ( + kde-frameworks/kitemviews:5 + ) + kcm? ( + x11-libs/libxkbcommon + dev-qt/qtquickcontrols2:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/kdeclarative:5 + kde-frameworks/ki18n:5 + kde-frameworks/kiconthemes:5 + kde-frameworks/kirigami:5 + kde-frameworks/kpackage:5 + kde-plasma/libplasma:5 + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + sys-devel/gettext + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_configure() { + local mycmakeargs=( + -DKDE_INSTALL_USE_QT_SYS_PATHS=yes + -DENABLE_KCM=$(usex kcm) + -DENABLE_CONFIG_QT=$(usex config-qt) + -DENABLE_TEST=$(usex test) + # kde-frameworks/kitemviews:6 is not ready. + -DUSE_QT6=no + ) + + cmake_src_configure +} diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.5.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.5.ebuild new file mode 100644 index 000000000000..da44e902b68a --- /dev/null +++ b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.5.ebuild @@ -0,0 +1,71 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5-configtool" + +inherit cmake unpacker + +DESCRIPTION="Configuration module for Fcitx" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-configtool" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst" + +S="${WORKDIR}/${MY_PN}-${PV}" +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="kcm +config-qt test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-i18n/fcitx-5.1.6:5 + >=app-i18n/fcitx-qt-5.1.4:5[qt5,-onlyplugin] + app-text/iso-codes + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + kde-frameworks/kwidgetsaddons:5 + sys-devel/gettext + virtual/libintl + x11-libs/libX11 + x11-libs/libxkbfile + x11-misc/xkeyboard-config + config-qt? ( + kde-frameworks/kitemviews:5 + ) + kcm? ( + x11-libs/libxkbcommon + dev-qt/qtquickcontrols2:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/kdeclarative:5 + kde-frameworks/ki18n:5 + kde-frameworks/kiconthemes:5 + kde-frameworks/kirigami:5 + kde-frameworks/kpackage:5 + kde-plasma/libplasma:5 + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + sys-devel/gettext + virtual/pkgconfig +" + +src_configure() { + local mycmakeargs=( + -DKDE_INSTALL_USE_QT_SYS_PATHS=yes + -DENABLE_KCM=$(usex kcm) + -DENABLE_CONFIG_QT=$(usex config-qt) + -DENABLE_TEST=$(usex test) + # kde-frameworks/kitemviews:6 is not ready. + -DUSE_QT6=no + ) + + cmake_src_configure +} diff --git a/app-i18n/fcitx-configtool/metadata.xml b/app-i18n/fcitx-configtool/metadata.xml index e775c90f0cbf..4ca0ab7fbf64 100644 --- a/app-i18n/fcitx-configtool/metadata.xml +++ b/app-i18n/fcitx-configtool/metadata.xml @@ -1,15 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> <name>Arfrever Frehtes Taifersar Arahesis</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <maintainer type="project"> <email>cjk@gentoo.org</email> <name>Cjk</name> </maintainer> + <use> + <flag name="config-qt">Enable fcitx5-config-qt</flag> + <flag name="kcm">Enable KDE KCM support</flag> + <flag name="test">Enable Test</flag> + </use> <upstream> <remote-id type="github">fcitx/fcitx-configtool</remote-id> + <remote-id type="github">fcitx/fcitx5-configtool</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/fcitx-gtk/Manifest b/app-i18n/fcitx-gtk/Manifest new file mode 100644 index 000000000000..15652a598139 --- /dev/null +++ b/app-i18n/fcitx-gtk/Manifest @@ -0,0 +1,2 @@ +DIST fcitx-gtk-5.1.2.tar.xz 53760 BLAKE2B 25eb0151bbc5a1277a593c2b07dce21f97f29d7d1bf4846a0edff7de0798e5bc33592ee00ddfffa8183a0e8d0bf1aaf1217b9f7e6cfde70c33b456740661e8bc SHA512 585a64b81caef55391e352a5efc2efcded1220c8be378be93e4fc6abc6b70132b3bb3211271d5ed02b1623a6ffcf7ce784de026969025b5efb3497f82676fefa +DIST fcitx-gtk-5.1.3.tar.zst 67927 BLAKE2B 0019500e2dc8beb716b16c4a37461e45c4b14fbd1485afd1367a6dad56f2f6d363b3415b3923aceeebe576e47f93680d806a74750ef730fc0046f5eb815d4f94 SHA512 e19ba77e9e3d37947871b2c90ecec9089840a5639c2f0dc1a2b11efeda8291c2ee28809a2b4dd69d12f1e5988a13fbd7826cf15c88ce595fa287c81b3efc7f0e diff --git a/app-i18n/fcitx-gtk/fcitx-gtk-5.1.2.ebuild b/app-i18n/fcitx-gtk/fcitx-gtk-5.1.2.ebuild new file mode 100644 index 000000000000..22819d3b08b2 --- /dev/null +++ b/app-i18n/fcitx-gtk/fcitx-gtk-5.1.2.ebuild @@ -0,0 +1,60 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5-gtk" + +inherit cmake gnome2-utils xdg + +DESCRIPTION="Gtk im module for fcitx5 and glib based dbus client library" +HOMEPAGE="https://github.com/fcitx/fcitx5-gtk" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz" + +LICENSE="LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="gtk2 +gtk3 +gtk4 +introspection +snooper onlyplugin wayland +X" +REQUIRED_USE="|| ( gtk2 gtk3 gtk4 )" + +RDEPEND=" + app-i18n/fcitx:5 + >=dev-libs/glib-2.56 + x11-libs/libxkbcommon + gtk2? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3[wayland?,X?] ) + gtk4? ( gui-libs/gtk:4[wayland?,X?] ) + introspection? ( dev-libs/gobject-introspection ) + X? ( x11-libs/libX11 ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + kde-frameworks/extra-cmake-modules:0 +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_configure() { + local mycmakeargs=( + -DENABLE_GTK2_IM_MODULE=$(usex gtk2) + -DENABLE_GTK3_IM_MODULE=$(usex gtk3) + -DENABLE_GTK4_IM_MODULE=$(usex gtk4) + -DENABLE_SNOOPER=$(usex snooper) + -DENABLE_GIR=$(usex introspection) + -DBUILD_ONLY_PLUGIN=$(usex onlyplugin) + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 +} + +pkg_postrm() { + xdg_pkg_postrm + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 +} diff --git a/app-i18n/fcitx-gtk/fcitx-gtk-5.1.3.ebuild b/app-i18n/fcitx-gtk/fcitx-gtk-5.1.3.ebuild new file mode 100644 index 000000000000..10e8a94f5aa7 --- /dev/null +++ b/app-i18n/fcitx-gtk/fcitx-gtk-5.1.3.ebuild @@ -0,0 +1,59 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5-gtk" + +inherit cmake gnome2-utils unpacker xdg + +DESCRIPTION="Gtk im module for fcitx5 and glib based dbus client library" +HOMEPAGE="https://github.com/fcitx/fcitx5-gtk" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst" + +S="${WORKDIR}/${MY_PN}-${PV}" +LICENSE="LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="gtk2 +gtk3 +gtk4 +introspection +snooper onlyplugin wayland +X" +REQUIRED_USE="|| ( gtk2 gtk3 gtk4 )" + +RDEPEND=" + app-i18n/fcitx:5 + >=dev-libs/glib-2.56 + x11-libs/libxkbcommon + gtk2? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3[wayland?,X?] ) + gtk4? ( gui-libs/gtk:4[wayland?,X?] ) + introspection? ( dev-libs/gobject-introspection ) + X? ( x11-libs/libX11 ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + kde-frameworks/extra-cmake-modules:0 +" + +src_configure() { + local mycmakeargs=( + -DENABLE_GTK2_IM_MODULE=$(usex gtk2) + -DENABLE_GTK3_IM_MODULE=$(usex gtk3) + -DENABLE_GTK4_IM_MODULE=$(usex gtk4) + -DENABLE_SNOOPER=$(usex snooper) + -DENABLE_GIR=$(usex introspection) + -DBUILD_ONLY_PLUGIN=$(usex onlyplugin) + ) + cmake_src_configure +} + +pkg_postinst() { + xdg_pkg_postinst + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 +} + +pkg_postrm() { + xdg_pkg_postrm + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 +} diff --git a/app-i18n/fcitx-gtk/metadata.xml b/app-i18n/fcitx-gtk/metadata.xml new file mode 100644 index 000000000000..f92aad4b3725 --- /dev/null +++ b/app-i18n/fcitx-gtk/metadata.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <use> + <flag name="gtk2">Install input method module for GTK+ 2</flag> + <flag name="gtk3">Enable support for GTK+3</flag> + <flag name="gtk4">Enable support for GTK 4</flag> + <flag name="onlyplugin">Build only plugin</flag> + <flag name="snooper">Enable key snooper for gtk app</flag> + </use> + <upstream> + <remote-id type="github">fcitx/fcitx5-gtk</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-i18n/fcitx-hangul/Manifest b/app-i18n/fcitx-hangul/Manifest index 2f7704ee57ff..5187fdc194d2 100644 --- a/app-i18n/fcitx-hangul/Manifest +++ b/app-i18n/fcitx-hangul/Manifest @@ -1 +1,2 @@ DIST fcitx-hangul-0.3.1.tar.xz 26612 BLAKE2B 59770762ecbd5027d9010d99037881c576f638d30cf22234e5b110e9264637c3ff2049fbf8c7e44ca27acebff5668b2eefee5aeff78622ccb338ff68abc42490 SHA512 6ad2e34644c9246490a91342a11b186d40702f7e587beeb056ad98538da50dbf9fdc9f298e5b379bef50f63ad5be5da79ba84e60a22b57c330d0a68dd5bf5ca6 +DIST fcitx5-hangul-5.1.1.tar.xz 39296 BLAKE2B 4fadc20e5b312e4e40f592c24d7e724d3d6adb0cef2539a27e624758c5d7d79490ac3dcf960b37e3c2ab451098b1ff9424aea77cf2d9eeaca9b9ba5eaee538bf SHA512 7b16a81cee1448de2428a96f89ce0a4e41f51e8c3f9beb930b068147ef7d93e227081f65ede0d799d1e15692e4742da3ab864fb652fa1812bd5de24da7e3a2f7 diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild index e203a031e17f..30622826e963 100644 --- a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild +++ b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2013-2020 Gentoo Authors +# Copyright 2013-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -21,7 +21,7 @@ fi LICENSE="BSD GPL-2+" SLOT="4" -KEYWORDS="amd64 ppc ppc64 x86" +KEYWORDS="amd64 ppc ppc64 ~riscv x86" IUSE="" BDEPEND="sys-devel/gettext diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-5.1.1.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-5.1.1.ebuild new file mode 100644 index 000000000000..e59e67deae69 --- /dev/null +++ b/app-i18n/fcitx-hangul/fcitx-hangul-5.1.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5-hangul" + +inherit cmake xdg + +DESCRIPTION="Korean Hangul input method for Fcitx" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-hangul" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz" + +LICENSE="LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" + +DEPEND=" + !app-i18n/fcitx-hangul:4 + >=app-i18n/fcitx-5.1.6:5 + >=app-i18n/libhangul-0.0.12 + virtual/libiconv +" +RDEPEND="${DEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_PN}-${PV}" +DOCS=( AUTHORS ) diff --git a/app-i18n/fcitx-hangul/metadata.xml b/app-i18n/fcitx-hangul/metadata.xml index 482302a42a04..12391c75083d 100644 --- a/app-i18n/fcitx-hangul/metadata.xml +++ b/app-i18n/fcitx-hangul/metadata.xml @@ -1,15 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> <name>Arfrever Frehtes Taifersar Arahesis</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <maintainer type="project"> <email>cjk@gentoo.org</email> <name>Cjk</name> </maintainer> <upstream> <remote-id type="github">fcitx/fcitx-hangul</remote-id> + <remote-id type="github">fcitx/fcitx5-hangul</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/fcitx-libpinyin/Manifest b/app-i18n/fcitx-libpinyin/Manifest index c20e8286086a..6c2928452c73 100644 --- a/app-i18n/fcitx-libpinyin/Manifest +++ b/app-i18n/fcitx-libpinyin/Manifest @@ -1,2 +1,3 @@ DIST fcitx-data-model.text.20161206.tar.gz 15099931 BLAKE2B 80e6a6fe5109011d6ea8683658d3fa89fc00e9dacfd140da3e993afc7db088c445da636797fbdac416e70119d37d47bdb0cb18d3865cebb397dbaa8a3055d703 SHA512 26450e347b7a211e5abd94acbb9befc8cee7d8fc20e5161ef11b8b9b1ad47cde4f1add5c41484d9af04e4dde2aa748090e297e799ee7f6d2f9fcec3873eee429 DIST fcitx-libpinyin-0.5.3_dict.tar.xz 15149856 BLAKE2B 35297477b3a4df9152162b8ad57d536333c5007510f387323d03e862901f17bb337504f20e6edc8d48e338916a6c4543900974027b60f7e87b0005f836677d29 SHA512 d132e0c007bd62286cfa89f6605a5315b6f5ae94a75bdd389fff1061e1547ad64c615fb0b75189d8cf35fa289a53e5d485911e06e368b2bf3af7b5a996fcd08a +DIST fcitx-libpinyin-0.5.4_dict.tar.xz 15148952 BLAKE2B 1f6d3d4d334eafd24799b2bd6df9ad42318b819b8989600f0b89992640e45cd660e3b2c4e5c857c5ddccd7893182c41d6f7599a48a70129807922812e6ee9d7d SHA512 e91dbcb42bbaa74320ad593918c3c86cc6f6bc209f3f0fee2f8870c4fb86ecbf3c9f17618b8c8b29db67771fe54ffcffc79c62545299037dc623146e6073b2e1 diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.4.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.4.ebuild new file mode 100644 index 000000000000..728ff9efb5d8 --- /dev/null +++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.4.ebuild @@ -0,0 +1,74 @@ +# Copyright 2012-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit cmake xdg-utils + +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/fcitx/fcitx-libpinyin" +fi + +DESCRIPTION="Chinese LibPinyin input methods for Fcitx" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-libpinyin" +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + SRC_URI="https://download.fcitx-im.org/data/model.text.20161206.tar.gz -> fcitx-data-model.text.20161206.tar.gz" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz" +fi + +LICENSE="GPL-2+ GPL-3+" +SLOT="4" +KEYWORDS="amd64 ppc ppc64 ~riscv x86" +IUSE="dictionary-manager" + +BDEPEND=">=app-i18n/fcitx-4.2.9:4 + >=app-i18n/libpinyin-2.1.0 + virtual/pkgconfig + dictionary-manager? ( + >=dev-qt/qtcore-5.7:5 + >=dev-qt/qtwidgets-5.7:5 + )" +DEPEND=">=app-i18n/fcitx-4.2.9:4 + >=app-i18n/libpinyin-2.1.0:= + dev-libs/glib:2 + sys-apps/dbus + virtual/libintl + dictionary-manager? ( + >=app-i18n/fcitx-qt5-1.1:4 + >=dev-qt/qtcore-5.7:5 + >=dev-qt/qtdbus-5.7:5 + >=dev-qt/qtgui-5.7:5 + >=dev-qt/qtnetwork-5.7:5 + >=dev-qt/qtwebengine-5.7:5[widgets] + >=dev-qt/qtwidgets-5.7:5 + )" +RDEPEND="${DEPEND}" + +DOCS=(AUTHORS) + +src_prepare() { + if [[ "${PV}" =~ (^|\.)9999$ ]]; then + ln -s "${DISTDIR}/fcitx-data-model.text.20161206.tar.gz" data/model.text.20161206.tar.gz || die + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DENABLE_QT=$(usex dictionary-manager) + ) + + cmake_src_configure +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/app-i18n/fcitx-libpinyin/metadata.xml b/app-i18n/fcitx-libpinyin/metadata.xml index 551336cb14cd..36a007bd88b3 100644 --- a/app-i18n/fcitx-libpinyin/metadata.xml +++ b/app-i18n/fcitx-libpinyin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> diff --git a/app-i18n/fcitx-lua/Manifest b/app-i18n/fcitx-lua/Manifest new file mode 100644 index 000000000000..2c7d6604f3e6 --- /dev/null +++ b/app-i18n/fcitx-lua/Manifest @@ -0,0 +1,2 @@ +DIST fcitx-lua-5.0.12.tar.xz 33576 BLAKE2B 2aa2d526e42270a14efc3f163baf775012afb917bdb4aa7f52b2bf420265095100dfc84b61c34e892403b89bc96f3e258fa8030a735f234b820644bb8e443122 SHA512 1f6273ff8b9c0c3ef12dfcf508535b7865b33b102a8e158e82853c25717351339ba055012288d857f0aea5596398dd65ab9ed0c822a533b715dafcea3ec44798 +DIST fcitx-lua-5.0.13.tar.zst 40578 BLAKE2B 05defed55711d26c2fabf41e5474f7f90224a11cd8a758b5f7afc4ed6096560ab6c220745968bb0ca28367004cdf665856d04c3b52830092e3633188cd41c394 SHA512 40855f65537c2e56e1a00d7ea160d6aae9d360ff27def7f95b2f08de16c656db7a178a676f49d817b9d16eac80f73ad12f84b966eeed4a3f38f119519d288805 diff --git a/app-i18n/fcitx-lua/fcitx-lua-5.0.12.ebuild b/app-i18n/fcitx-lua/fcitx-lua-5.0.12.ebuild new file mode 100644 index 000000000000..d5b83103e4ef --- /dev/null +++ b/app-i18n/fcitx-lua/fcitx-lua-5.0.12.ebuild @@ -0,0 +1,46 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{3,4} ) + +MY_PN="fcitx5-lua" + +inherit cmake lua-single xdg + +DESCRIPTION="Lua support for fcitx" +HOMEPAGE="https://github.com/fcitx/fcitx5-lua" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz" + +LICENSE="LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="+dlopen test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + ${LUA_DEPS} + app-i18n/fcitx:5 +" +DEPEND="${RDEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + sys-devel/gettext + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +pkg_setup() { + lua-single_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DUSE_DLOPEN=$(usex dlopen) + -DENABLE_TEST=$(usex test) + ) + cmake_src_configure +} diff --git a/app-i18n/fcitx-lua/fcitx-lua-5.0.13.ebuild b/app-i18n/fcitx-lua/fcitx-lua-5.0.13.ebuild new file mode 100644 index 000000000000..7a101a7c365d --- /dev/null +++ b/app-i18n/fcitx-lua/fcitx-lua-5.0.13.ebuild @@ -0,0 +1,45 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{3,4} ) + +MY_PN="fcitx5-lua" + +inherit cmake lua-single xdg unpacker + +DESCRIPTION="Lua support for fcitx" +HOMEPAGE="https://github.com/fcitx/fcitx5-lua" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst" + +S="${WORKDIR}/${MY_PN}-${PV}" +LICENSE="LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="+dlopen test" +REQUIRED_USE="${LUA_REQUIRED_USE}" +RESTRICT="!test? ( test )" + +RDEPEND=" + ${LUA_DEPS} + app-i18n/fcitx:5 +" +DEPEND="${RDEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + sys-devel/gettext + virtual/pkgconfig +" + +pkg_setup() { + lua-single_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DUSE_DLOPEN=$(usex dlopen) + -DENABLE_TEST=$(usex test) + ) + cmake_src_configure +} diff --git a/app-i18n/fcitx-lua/metadata.xml b/app-i18n/fcitx-lua/metadata.xml new file mode 100644 index 000000000000..152073f668d9 --- /dev/null +++ b/app-i18n/fcitx-lua/metadata.xml @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <upstream> + <remote-id type="github">fcitx/fcitx5-lua</remote-id> + </upstream> + <longdescription lang="en"> + Lua support for fcitx. + It tries to support lua in fcitx in two ways. + 1. An addon loader for lua, which supports Type=Lua addon. + 2. The googlepinyin api, which is provided by imeapi addon. + You may put your lua file under + $HOME/.local/share/fcitx5/lua/imeapi/extensions + to make the addon find your scripts. + </longdescription> + <use> + <flag name="dlopen">Use dlopen to load lua library</flag> + </use> +</pkgmetadata> diff --git a/app-i18n/fcitx-m17n/Manifest b/app-i18n/fcitx-m17n/Manifest index 1f3a9db32060..10fc856a4f4b 100644 --- a/app-i18n/fcitx-m17n/Manifest +++ b/app-i18n/fcitx-m17n/Manifest @@ -1 +1,2 @@ DIST fcitx-m17n-0.2.4.tar.xz 35076 BLAKE2B c53c8ee8156b49607cd5bd951eb031e2dccb6a18bcdafcbfd17ebf07506c750414abac3f2dd5965fdd8b154df9c16820850f61d07cd38745db0af89ccf2acfff SHA512 b7c483e9c88e58a47ead294c36ed182558f09b41996e97faaba9fd3a96612f6a0fc240fdcb95db9a08c1546abe5fc97337957e2124844bd011363b7468f6e112 +DIST fcitx-m17n-5.1.0.tar.xz 23996 BLAKE2B 94802b1584cde13d0f613e5506a05ce101cfd0ecf245be980e608f8c6dd509540a877edb1d14ee376da8834f6fcf947a0d88ad1ed7019e47fa4d8bf5d04c3900 SHA512 a28a170ba62edc9b6e225f5ff6d76c8d7333006429a6d496abd2b7b49a9f82e01a2ebfdd670609c96529bbee36a01fb1937abfab745f1d3f3a4f196f3b9fc3df diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild index f282e295308e..d3d153b67ae4 100644 --- a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild +++ b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2020 Gentoo Authors +# Copyright 2016-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -21,7 +21,7 @@ fi LICENSE="LGPL-2.1+" SLOT="4" -KEYWORDS="amd64 ~hppa ppc ppc64 x86" +KEYWORDS="amd64 ~hppa ppc ppc64 ~riscv x86" IUSE="" BDEPEND=">=app-i18n/fcitx-4.2.9:4 diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-5.1.0.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-5.1.0.ebuild new file mode 100644 index 000000000000..176e587c16af --- /dev/null +++ b/app-i18n/fcitx-m17n/fcitx-m17n-5.1.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5-m17n" + +inherit cmake + +DESCRIPTION="m17n-provided input methods for Fcitx5" +HOMEPAGE="https://github.com/fcitx/fcitx5-m17n" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz" + +LICENSE="LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="test" +RESTRICT="!test? ( test )" + +# m17n-gui>=1.6.3 +RDEPEND=" + >=app-i18n/fcitx-5.1.6:5 + dev-db/m17n-db + dev-libs/libfmt + >=dev-libs/m17n-lib-1.6.3[X] +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + kde-frameworks/extra-cmake-modules:0 +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_configure() { + local mycmakeargs=( + -DENABLE_TEST=$(usex test) + ) + cmake_src_configure +} diff --git a/app-i18n/fcitx-m17n/metadata.xml b/app-i18n/fcitx-m17n/metadata.xml index e7e76c5011ab..48cc0c361cf4 100644 --- a/app-i18n/fcitx-m17n/metadata.xml +++ b/app-i18n/fcitx-m17n/metadata.xml @@ -1,15 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> <name>Arfrever Frehtes Taifersar Arahesis</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <maintainer type="project"> <email>cjk@gentoo.org</email> <name>Cjk</name> </maintainer> <upstream> <remote-id type="github">fcitx/fcitx-m17n</remote-id> + <remote-id type="github">fcitx/fcitx5-m17n</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/fcitx-qt/Manifest b/app-i18n/fcitx-qt/Manifest new file mode 100644 index 000000000000..cd9e904371c3 --- /dev/null +++ b/app-i18n/fcitx-qt/Manifest @@ -0,0 +1 @@ +DIST fcitx-qt-5.1.5.tar.xz 93980 BLAKE2B b119cbf886a6c7d37c3d959897dea38ad2c1112811ed776ed53ee715f441798b300d54023b34980f625ef2cf3235be4f6c64f7e8c2c65568c8487306714bdb1f SHA512 736677a268d345a962e8c44af81870d2cfc62db72c7a089e2c11151f7f682659ec83307a3397d1feb2dda7e9419847d5e365f7a20ca9b7d6216b690cb9c515c7 diff --git a/app-i18n/fcitx-qt/fcitx-qt-5.1.5-r2.ebuild b/app-i18n/fcitx-qt/fcitx-qt-5.1.5-r2.ebuild new file mode 100644 index 000000000000..d942ecaa99a6 --- /dev/null +++ b/app-i18n/fcitx-qt/fcitx-qt-5.1.5-r2.ebuild @@ -0,0 +1,65 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5-qt" + +inherit cmake + +DESCRIPTION="Qt library and IM module for fcitx5" +HOMEPAGE="https://github.com/fcitx/fcitx5-qt" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz" + +S="${WORKDIR}/${MY_PN}-${PV}" +LICENSE="BSD LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="+qt5 onlyplugin staticplugin qt6 +X wayland" +REQUIRED_USE=" + || ( qt5 qt6 ) + qt5? ( X ) + staticplugin? ( onlyplugin ) +" + +RDEPEND=" + !onlyplugin? ( + >=app-i18n/fcitx-5.1.5:5 + qt5? ( dev-qt/qtconcurrent:5 ) + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5= + dev-qt/qtwidgets:5 + wayland? ( dev-qt/qtwayland:5 ) + ) + qt6? ( + dev-qt/qtbase:6=[dbus,gui,widgets,wayland?] + wayland? ( dev-qt/qtwayland:6 ) + ) + X? ( + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libxkbcommon + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig + !onlyplugin? ( sys-devel/gettext ) +" + +src_configure() { + local mycmakeargs=( + -DENABLE_QT4=no + -DENABLE_QT5=$(usex qt5) + -DENABLE_QT6=$(usex qt6) + -DENABLE_QT6_WAYLAND_WORKAROUND=$(usex qt6 $(usex wayland)) + -DENABLE_X11=$(usex X) + -DBUILD_ONLY_PLUGIN=$(usex onlyplugin) + -DBUILD_STATIC_PLUGIN=$(usex staticplugin) + ) + cmake_src_configure +} diff --git a/app-i18n/fcitx-qt/metadata.xml b/app-i18n/fcitx-qt/metadata.xml new file mode 100644 index 000000000000..446ffdc2c7c1 --- /dev/null +++ b/app-i18n/fcitx-qt/metadata.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <use> + <flag name="onlyplugin">Build only plugin</flag> + <flag name="qt6">Build support for QT6</flag> + <flag name="staticplugin">Build plugin as static</flag> + </use> + <upstream> + <remote-id type="github">fcitx/fcitx5-qt</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild index ab3c7cd48900..4dc0c8089588 100644 --- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild +++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild @@ -21,14 +21,14 @@ fi LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+" SLOT="4" -KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86" +KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 ~riscv x86" IUSE="" BDEPEND=">=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules:0 virtual/pkgconfig" # Private headers of dev-qt/qtgui:5 used. RDEPEND=">=app-i18n/fcitx-4.2.9:4 diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild index 25daf4bb5236..827553c28d48 100644 --- a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild +++ b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild @@ -28,7 +28,7 @@ BDEPEND=">=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules:0 virtual/pkgconfig" # Private headers of dev-qt/qtgui:5 used. RDEPEND=">=app-i18n/fcitx-4.2.9:4 diff --git a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch index f3e31991b53d..385abd8495ad 100644 --- a/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch +++ b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch @@ -1,7 +1,7 @@ https://github.com/fcitx/fcitx-qt5/commit/6f2033c497fe0da1fd197bc3be35695b11eafd93 ---- /platforminputcontext/qfcitxplatforminputcontext.cpp -+++ /platforminputcontext/qfcitxplatforminputcontext.cpp +--- a/platforminputcontext/qfcitxplatforminputcontext.cpp ++++ b/platforminputcontext/qfcitxplatforminputcontext.cpp @@ -291,8 +291,21 @@ return; } diff --git a/app-i18n/fcitx-qt5/metadata.xml b/app-i18n/fcitx-qt5/metadata.xml index 3bc22939d420..c2cb271102c5 100644 --- a/app-i18n/fcitx-qt5/metadata.xml +++ b/app-i18n/fcitx-qt5/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> diff --git a/app-i18n/fcitx-rime/Manifest b/app-i18n/fcitx-rime/Manifest index 860bfc692215..0d2759186722 100644 --- a/app-i18n/fcitx-rime/Manifest +++ b/app-i18n/fcitx-rime/Manifest @@ -1 +1,2 @@ DIST fcitx-rime-0.3.2.tar.xz 40960 BLAKE2B 1c9185dd9d2912e74b9916916fed09a01c30e0867d93fe94e04d5324883783dddbdca0f553d80aa19e2e59d2ec8fd2a50a7f89118c22cb09310296292a566760 SHA512 8c6d845b0899d9b8b9b41b895abd5c1b8916856b71f529aabd08d1c27a2b09bb5a9343912d088da460c2e22da0a3ce759a34fd13099a149bb8cd1ff4eafe29f1 +DIST fcitx-rime-5.1.4.tar.xz 49508 BLAKE2B e9846a0217b741d21c45ad4d6bd216f7d6afaec23ca71af3ab1dfffeeeba62eb85836592d53e70d0ce07217442164ccdecaa94eb36458d70778eb3d7e3bd1ada SHA512 1dc20c801e1ce4fa5e63f06554340af4616b044964d4235995e51dc6074223e30e66da74f354b2b05f77d2e0041af1e720bf2f2b214492ae4516d30761b2e092 diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2-r1.ebuild index 18b40399bbf0..b9da1cbd7122 100644 --- a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild +++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2020 Gentoo Authors +# Copyright 2012-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -13,21 +13,18 @@ fi DESCRIPTION="Chinese RIME input methods for Fcitx" HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-rime" -if [[ "${PV}" =~ (^|\.)9999$ ]]; then - SRC_URI="" -else +if [[ ! "${PV}" =~ (^|\.)9999$ ]]; then SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" fi LICENSE="GPL-2" SLOT="4" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" +KEYWORDS="amd64 ppc ppc64 ~riscv x86" BDEPEND=">=app-i18n/fcitx-4.2.9:4 virtual/pkgconfig" DEPEND=">=app-i18n/fcitx-4.2.9:4 - >=app-i18n/librime-1.0.0:= + <app-i18n/librime-1.9.0:= virtual/libintl" RDEPEND="${DEPEND} app-i18n/rime-data" diff --git a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild index 49fb4753f008..c40551dffd5e 100644 --- a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild +++ b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2020 Gentoo Authors +# Copyright 2012-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -13,15 +13,12 @@ fi DESCRIPTION="Chinese RIME input methods for Fcitx" HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-rime" -if [[ "${PV}" =~ (^|\.)9999$ ]]; then - SRC_URI="" -else +if [[ ! "${PV}" =~ (^|\.)9999$ ]]; then SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" fi LICENSE="GPL-2" SLOT="4" -KEYWORDS="" IUSE="+configuration_tool" BDEPEND=">=app-i18n/fcitx-4.2.9:4 @@ -31,7 +28,7 @@ BDEPEND=">=app-i18n/fcitx-4.2.9:4 dev-qt/qtwidgets:5 )" DEPEND=">=app-i18n/fcitx-4.2.9:4 - >=app-i18n/librime-1.0.0:= + <app-i18n/librime-1.9.0:= virtual/libintl configuration_tool? ( >=app-i18n/fcitx-qt5-1.1:4 diff --git a/app-i18n/fcitx-rime/fcitx-rime-5.1.4.ebuild b/app-i18n/fcitx-rime/fcitx-rime-5.1.4.ebuild new file mode 100644 index 000000000000..dd6e94808af2 --- /dev/null +++ b/app-i18n/fcitx-rime/fcitx-rime-5.1.4.ebuild @@ -0,0 +1,31 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +MY_PN="fcitx5-rime" +DESCRIPTION="Chinese RIME input methods for Fcitx" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-rime" +SRC_URI="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${PV}.tar.xz -> ${P}.tar.xz" + +LICENSE="LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" + +DEPEND=" + !app-i18n/fcitx-rime:4 + >=app-i18n/fcitx-5.1.2:5 + app-i18n/librime + app-i18n/rime-data + virtual/libintl +" +RDEPEND="${DEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules + sys-devel/gettext + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/app-i18n/fcitx-rime/metadata.xml b/app-i18n/fcitx-rime/metadata.xml index c50c5ed628ce..30d736fc8eac 100644 --- a/app-i18n/fcitx-rime/metadata.xml +++ b/app-i18n/fcitx-rime/metadata.xml @@ -1,7 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>i@bitbili.net</email> + <name>Ryan Qian</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> <name>Arfrever Frehtes Taifersar Arahesis</name> </maintainer> @@ -17,6 +29,7 @@ <flag name="configuration_tool">Install configuration tool</flag> </use> <upstream> + <remote-id type="github">fcitx/fcitx5-rime</remote-id> <remote-id type="github">fcitx/fcitx-rime</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild index 69fb1d323273..ff59fdb17065 100644 --- a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild +++ b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2016-2020 Gentoo Authors +# Copyright 2016-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -21,7 +21,7 @@ fi LICENSE="GPL-2+" SLOT="4" -KEYWORDS="amd64 ~hppa ppc ppc64 x86" +KEYWORDS="amd64 ~hppa ppc ppc64 ~riscv x86" IUSE="" BDEPEND="virtual/pkgconfig" diff --git a/app-i18n/fcitx-sayura/metadata.xml b/app-i18n/fcitx-sayura/metadata.xml index 530a4f134a6a..37682de33b92 100644 --- a/app-i18n/fcitx-sayura/metadata.xml +++ b/app-i18n/fcitx-sayura/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> diff --git a/app-i18n/fcitx-sunpinyin/Manifest b/app-i18n/fcitx-sunpinyin/Manifest deleted file mode 100644 index 1b6c4fb3a442..000000000000 --- a/app-i18n/fcitx-sunpinyin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST fcitx-sunpinyin-0.4.2.tar.xz 42984 BLAKE2B 1f64d96d35c6f455be15a56eb065d97a988f671d40392a3ea3e96fc53b22cf048cff61f406d0e001cc7cfe531a8dc5508ef7862c17253b409330ac2d0af52f7c SHA512 8ade5d94e5227c0b72d2844c09c2699e4b8c66cecbd4107791168d27e15f68b28a4445bf42df7bd6fb44119ec42c5b574293bb417dcde8998578f0debd656a2a diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild deleted file mode 100644 index 9d24259252a4..000000000000 --- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-0.4.2.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2010-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake xdg-utils - -if [[ "${PV}" =~ (^|\.)9999$ ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/fcitx/fcitx-sunpinyin" -fi - -DESCRIPTION="Chinese SunPinyin input method for Fcitx" -HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin" -if [[ "${PV}" =~ (^|\.)9999$ ]]; then - SRC_URI="" -else - SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" -fi - -LICENSE="GPL-2+" -SLOT="4" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -BDEPEND="virtual/pkgconfig" -DEPEND=">=app-i18n/fcitx-4.2.9:4 - >=app-i18n/sunpinyin-2.0.4_alpha:= - virtual/libintl" -RDEPEND="${DEPEND} - app-i18n/sunpinyin-data" - -DOCS=(AUTHORS) - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild b/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild deleted file mode 100644 index 3a652f5a19c5..000000000000 --- a/app-i18n/fcitx-sunpinyin/fcitx-sunpinyin-4.9999.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2010-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake xdg-utils - -if [[ "${PV}" =~ (^|\.)9999$ ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/fcitx/fcitx-sunpinyin" -fi - -DESCRIPTION="Chinese SunPinyin input method for Fcitx" -HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-sunpinyin" -if [[ "${PV}" =~ (^|\.)9999$ ]]; then - SRC_URI="" -else - SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" -fi - -LICENSE="GPL-2+" -SLOT="4" -KEYWORDS="" -IUSE="" - -BDEPEND="virtual/pkgconfig" -DEPEND=">=app-i18n/fcitx-4.2.9:4 - >=app-i18n/sunpinyin-2.0.4_alpha:= - virtual/libintl" -RDEPEND="${DEPEND} - app-i18n/sunpinyin-data" - -DOCS=(AUTHORS) - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/app-i18n/fcitx-sunpinyin/metadata.xml b/app-i18n/fcitx-sunpinyin/metadata.xml deleted file mode 100644 index ead0ec38bae5..000000000000 --- a/app-i18n/fcitx-sunpinyin/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arfrever.fta@gmail.com</email> - <name>Arfrever Frehtes Taifersar Arahesis</name> - </maintainer> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <upstream> - <remote-id type="github">fcitx/fcitx-sunpinyin</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-i18n/fcitx-table-extra/Manifest b/app-i18n/fcitx-table-extra/Manifest index 377237df5d17..ca229f6d5eb3 100644 --- a/app-i18n/fcitx-table-extra/Manifest +++ b/app-i18n/fcitx-table-extra/Manifest @@ -1 +1,3 @@ DIST fcitx-table-extra-0.3.8.tar.xz 3700736 BLAKE2B b8ce4b3aa04eba8b594b86958bb83e348758c30688828a4834643cf7bdd62852c2ca89bc4f75f0cb1b16ce969b0454c58e3abadff9c78318dc0953e0905c75fa SHA512 454798e9bd25c630ce98e2daf7296e82ba5fbc98027171038a5a7b9ac3169c153302a6703d9416718ec3a0b76db6d732caf3f03c6e6005841c9d7798702542df +DIST fcitx-table-extra-5.1.4.tar.xz 7506768 BLAKE2B 62082946e5e399eda6d4d44e3aaac7e96975da9ec39031735d775f526e7879718dae0fb8020364c65ca684bb186affcd1956a1fb87da9971d0135d9acd025da2 SHA512 c26007209706263d29f189a6bb8088d5bde81c322649b6dba21df76fda3dc1a6926066c950bdbd09f3392216bbf61aec8657f8182844b5656e4111554b5025bb +DIST fcitx-table-extra-5.1.5.tar.zst 13837962 BLAKE2B 52d546636fb0520826d9b4e8df3a68a163edd71a57ac7cc720916ebdd7141d6a4ce194ecb3aa205a568b10a99ae611e607325c652ed293ba16bb783bfd64bfd3 SHA512 19cc8f45c26f4841b3c8a4724375f8926741a153757626d4f5a598abc9ea0e12133b0ef13c3a1893675360102f69dd91b8c9861849d8f1677242339f11f475fc diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild index 473763dfd10b..20ec866a0cef 100644 --- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild +++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2020 Gentoo Authors +# Copyright 2012-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -21,7 +21,7 @@ fi LICENSE="GPL-2+" SLOT="4" -KEYWORDS="amd64 ppc ppc64 x86" +KEYWORDS="amd64 ppc ppc64 ~riscv x86" IUSE="" BDEPEND=">=app-i18n/fcitx-4.2.9:4 diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-5.1.4.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-5.1.4.ebuild new file mode 100644 index 000000000000..13ba0b2957b7 --- /dev/null +++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-5.1.4.ebuild @@ -0,0 +1,29 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=fcitx5-table-extra + +inherit cmake xdg + +DESCRIPTION="Provides extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick" +HOMEPAGE="https://github.com/fcitx/fcitx5-table-extra" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz" + +LICENSE="GPL-3+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" + +DEPEND=" + !app-i18n/fcitx-table-extra:4 + app-i18n/fcitx:5 + app-i18n/libime +" +RDEPEND="${DEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-5.1.5.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-5.1.5.ebuild new file mode 100644 index 000000000000..9a28c8eae2d4 --- /dev/null +++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-5.1.5.ebuild @@ -0,0 +1,28 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=fcitx5-table-extra + +inherit cmake unpacker xdg + +DESCRIPTION="Provides extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick" +HOMEPAGE="https://github.com/fcitx/fcitx5-table-extra" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst" + +S="${WORKDIR}/${MY_PN}-${PV}" +LICENSE="GPL-3+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" + +DEPEND=" + !app-i18n/fcitx-table-extra:4 + app-i18n/fcitx:5 + app-i18n/libime +" +RDEPEND="${DEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig +" diff --git a/app-i18n/fcitx-table-extra/metadata.xml b/app-i18n/fcitx-table-extra/metadata.xml index 9af9c45aa41b..161da38c5b8d 100644 --- a/app-i18n/fcitx-table-extra/metadata.xml +++ b/app-i18n/fcitx-table-extra/metadata.xml @@ -1,15 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> <name>Arfrever Frehtes Taifersar Arahesis</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <maintainer type="project"> <email>cjk@gentoo.org</email> <name>Cjk</name> </maintainer> <upstream> <remote-id type="github">fcitx/fcitx-table-extra</remote-id> + <remote-id type="github">fcitx/fcitx5-table-extra</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/fcitx-table-other/Manifest b/app-i18n/fcitx-table-other/Manifest new file mode 100644 index 000000000000..2076838b5fe3 --- /dev/null +++ b/app-i18n/fcitx-table-other/Manifest @@ -0,0 +1,2 @@ +DIST fcitx-table-other-5.1.1.tar.xz 284308 BLAKE2B 7dee4d9ba5debe19568ff3fea7ce025f6b27d0641fd5207fc67e726b61621975d5553478de4136b72ccc930675df4c5096ec340da16471351ef00f107ce94e1a SHA512 13e4139a0ed320f7bae1d9e6ac68eae624235fb00446dc3db7b01913f130324cc1353115c1d8c9b34e04507b9956ef5875ec59a398eec6dfdbda281b67dafdc7 +DIST fcitx-table-other-5.1.2.tar.zst 532035 BLAKE2B de699a15b50eadd4a4693b38ca4ba44ae98ff8c31373305a7d8f83c5ea7c24c811c718f217831bebc3e5fe126d010b866d53929b20b2e7e401ed1bf3252b815a SHA512 d09bba6c60f625a9a9c2aad3599305438809c0bc5b7d5354502cdfb928822cb670f391a14b150637050322021c379b8e07e634bc9a016751755759e0dbd97596 diff --git a/app-i18n/fcitx-table-other/fcitx-table-other-5.1.1.ebuild b/app-i18n/fcitx-table-other/fcitx-table-other-5.1.1.ebuild new file mode 100644 index 000000000000..a0137688d848 --- /dev/null +++ b/app-i18n/fcitx-table-other/fcitx-table-other-5.1.1.ebuild @@ -0,0 +1,28 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=fcitx5-table-other + +inherit cmake xdg + +DESCRIPTION="Provides some other tables for Fcitx, fork from ibus-table-others, scim-tables" +HOMEPAGE="https://github.com/fcitx/fcitx5-table-other" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" + +DEPEND=" + app-i18n/fcitx:5 + app-i18n/libime +" +RDEPEND="${DEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig +" + +S="${WORKDIR}/${MY_PN}-${PV}" diff --git a/app-i18n/fcitx-table-other/fcitx-table-other-5.1.2.ebuild b/app-i18n/fcitx-table-other/fcitx-table-other-5.1.2.ebuild new file mode 100644 index 000000000000..f057fd74ebac --- /dev/null +++ b/app-i18n/fcitx-table-other/fcitx-table-other-5.1.2.ebuild @@ -0,0 +1,27 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN=fcitx5-table-other + +inherit cmake unpacker xdg + +DESCRIPTION="Provides some other tables for Fcitx, fork from ibus-table-others, scim-tables" +HOMEPAGE="https://github.com/fcitx/fcitx5-table-other" +SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst" + +S="${WORKDIR}/${MY_PN}-${PV}" +LICENSE="GPL-3" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" + +DEPEND=" + app-i18n/fcitx:5 + app-i18n/libime +" +RDEPEND="${DEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig +" diff --git a/app-i18n/fcitx-table-other/metadata.xml b/app-i18n/fcitx-table-other/metadata.xml new file mode 100644 index 000000000000..f31494e90ff6 --- /dev/null +++ b/app-i18n/fcitx-table-other/metadata.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <upstream> + <remote-id type="github">fcitx/fcitx5-table-other</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild index 778af9552b8b..f977418e9bc9 100644 --- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild +++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 2013-2020 Gentoo Authors +# Copyright 2013-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -21,7 +21,7 @@ fi LICENSE="GPL-2+ GPL-3+ LGPL-2+" SLOT="4" -KEYWORDS="amd64 ppc ppc64 x86" +KEYWORDS="amd64 ppc ppc64 ~riscv x86" IUSE="+macro-editor" BDEPEND=">=app-i18n/fcitx-4.2.9:4 diff --git a/app-i18n/fcitx-unikey/metadata.xml b/app-i18n/fcitx-unikey/metadata.xml index a0ed74ed5bad..3e887a3bdf4c 100644 --- a/app-i18n/fcitx-unikey/metadata.xml +++ b/app-i18n/fcitx-unikey/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest index 5ca71d557d96..885a4df39cc1 100644 --- a/app-i18n/fcitx/Manifest +++ b/app-i18n/fcitx/Manifest @@ -1,4 +1,6 @@ DIST fcitx-4.2.9.8_dict.tar.xz 8737888 BLAKE2B 2de3ccbf1b37a9bcf1a3cb257d7837669e946765722c3d6f442ad071d7d81a6e8178e47051fc3aa53b9b4771d3aca602c2e22fa7a3d117a9e1f2779497e02c52 SHA512 50a954c3178f53fd2d441cdaf81fb44a7fe8dfb263fa6d8dd4ee4884fc7ae8321880c726c9366d11e2a4ac8da2233268d06e5d0800d4527ba0bdb1a1430248ed +DIST fcitx-5.1.8.tar.xz 7498828 BLAKE2B 48aa2d6f81cbba17b2614c9f50491391ab5c55bf9e4e0915f2e34a120f158260b2719cb46f11436b58a5345655ef9d7067523b27cc1b02a1a90bd1b5d8491433 SHA512 4472b49cbc3fd20f066bbec4e107eafb5444fffd22feee7b4f5b637d324b03a16e82c950e95624629b984f72a5a62fca73087a032946c4eedb86d8a528c52a43 +DIST fcitx-5.1.9.tar.zst 8307560 BLAKE2B 4dcaabdf155f11297cec0cab2353b3e6ce9bcdd76bc31d8efeafe8653e9f06f0ed7bf16ecad19fe298ceb59daae98437214f0c0f5736326ac56fe6eab53f7e9c SHA512 b4964eb48acf224f5bda66a5d81c673983e8e20822b28a37afae00c9319fff9bf5f684e417b799afd92ee51f3d44822d9954640f63ce75d846dbb4868c4a4a22 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 diff --git a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild index b7b077a9ed9d..2dd9ab5f65a6 100644 --- a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild +++ b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild @@ -1,8 +1,8 @@ -# Copyright 2003-2021 Gentoo Authors +# Copyright 2003-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -LUA_COMPAT=(lua{5-1,5-2,5-3,5-4}) +LUA_COMPAT=( lua5-{1..4} ) inherit cmake gnome2-utils lua-single xdg-utils @@ -27,7 +27,7 @@ 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 ppc ppc64 ~riscv x86" +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} ) @@ -35,11 +35,12 @@ REQUIRED_USE="cairo? ( X ) RESTRICT="!test? ( test )" BDEPEND="dev-util/glib-utils - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules:0 virtual/pkgconfig introspection? ( dev-libs/gobject-introspection ) nls? ( sys-devel/gettext )" -DEPEND="dev-libs/glib:2 +DEPEND="!app-i18n/fcitx:5 + dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild index 76f6bdd6c634..57d117c67567 100644 --- a/app-i18n/fcitx/fcitx-4.9999.ebuild +++ b/app-i18n/fcitx/fcitx-4.9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 2003-2020 Gentoo Authors +# Copyright 2003-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -LUA_COMPAT=(lua{5-1,5-2,5-3,5-4}) +LUA_COMPAT=( lua5-{1..4} ) inherit cmake gnome2-utils lua-single xdg-utils @@ -35,11 +35,12 @@ REQUIRED_USE="cairo? ( X ) RESTRICT="!test? ( test )" BDEPEND="dev-util/glib-utils - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules:0 virtual/pkgconfig introspection? ( dev-libs/gobject-introspection ) nls? ( sys-devel/gettext )" -DEPEND="dev-libs/glib:2 +DEPEND="!app-i18n/fcitx:5 + dev-libs/glib:2 sys-apps/dbus sys-apps/util-linux virtual/libiconv diff --git a/app-i18n/fcitx/fcitx-5.1.8.ebuild b/app-i18n/fcitx/fcitx-5.1.8.ebuild new file mode 100644 index 000000000000..3e0b4a144558 --- /dev/null +++ b/app-i18n/fcitx/fcitx-5.1.8.ebuild @@ -0,0 +1,123 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5" + +inherit cmake xdg + +DESCRIPTION="Fcitx 5 is a generic input method framework" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5" +SRC_URI="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${PV}_dict.tar.xz -> ${P}.tar.xz" + +LICENSE="LGPL-2+ Unicode-DFS-2016" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="+autostart doc +emoji +enchant +keyboard presage +server systemd test wayland +X" +REQUIRED_USE=" + || ( wayland X ) + X? ( keyboard ) + wayland? ( keyboard ) +" +RESTRICT="!test? ( test )" + +RDEPEND=" + !app-i18n/fcitx:4 + dev-libs/libfmt + sys-devel/gettext + virtual/libintl + x11-libs/cairo[X?] + x11-libs/gdk-pixbuf:2 + x11-libs/pango[X?] + doc? ( + app-text/doxygen + dev-texlive/texlive-fontutils + ) + emoji? ( sys-libs/zlib ) + enchant? ( app-text/enchant:2 ) + keyboard? ( + app-text/iso-codes + dev-libs/expat + dev-libs/json-c:= + x11-misc/xkeyboard-config + x11-libs/libxkbcommon[X?,wayland?] + ) + systemd? ( + sys-apps/systemd + ) + !systemd? ( + dev-libs/libuv + sys-apps/dbus + ) + wayland? ( + dev-libs/glib:2 + dev-libs/wayland + dev-libs/wayland-protocols + dev-util/wayland-scanner + ) + X? ( + dev-libs/glib:2 + >=x11-libs/xcb-imdkit-1.0.3:5 + x11-libs/libX11 + x11-libs/libxkbfile + x11-libs/xcb-util + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-wm + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + kde-frameworks/extra-cmake-modules:0 +" + +S="${WORKDIR}/${MY_PN}-${PV}" + +src_configure() { + local mycmakeargs=( + -DENABLE_DBUS=on + -DENABLE_XDGAUTOSTART=$(usex autostart) + -DENABLE_SERVER=$(usex server) + -DENABLE_KEYBOARD=$(usex keyboard) + -DENABLE_TEST=$(usex test) + -DENABLE_ENCHANT=$(usex enchant) + -DENABLE_EMOJI=$(usex emoji) + -DENABLE_PRESAGE=$(usex presage) + -DENABLE_WAYLAND=$(usex wayland) + -DENABLE_X11=$(usex X) + -DENABLE_DOC=$(usex doc) + -DUSE_SYSTEMD=$(usex systemd) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_src_compile doc +} + +src_install() { + cmake_src_install + use doc && dodoc -r "${BUILD_DIR}"/doc/* +} + +src_test() { + # break by sandbox + local CMAKE_SKIP_TESTS=( + testdbus + testservicewatcher + ) + cmake_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + + elog + elog "Follow the instrcutions on:" + elog "https://wiki.gentoo.org/wiki/Fcitx#Using_Fcitx" + elog "https://fcitx-im.org/wiki/Setup_Fcitx_5" + elog "https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" + elog +} diff --git a/app-i18n/fcitx/fcitx-5.1.9.ebuild b/app-i18n/fcitx/fcitx-5.1.9.ebuild new file mode 100644 index 000000000000..5d1c1f236db9 --- /dev/null +++ b/app-i18n/fcitx/fcitx-5.1.9.ebuild @@ -0,0 +1,123 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="fcitx5" + +inherit cmake unpacker xdg + +DESCRIPTION="Fcitx 5 is a generic input method framework" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5" +SRC_URI="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${PV}_dict.tar.zst -> ${P}.tar.zst" + +S="${WORKDIR}/${MY_PN}-${PV}" +LICENSE="LGPL-2+ Unicode-DFS-2016" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="+autostart doc +emoji +enchant +keyboard presage +server systemd test wayland +X" +REQUIRED_USE=" + || ( wayland X ) + X? ( keyboard ) + wayland? ( keyboard ) +" + +RESTRICT="!test? ( test )" + +RDEPEND=" + !app-i18n/fcitx:4 + dev-libs/libfmt + sys-devel/gettext + virtual/libintl + x11-libs/cairo[X?] + x11-libs/gdk-pixbuf:2 + x11-libs/pango[X?] + doc? ( + app-text/doxygen + dev-texlive/texlive-fontutils + ) + emoji? ( sys-libs/zlib ) + enchant? ( app-text/enchant:2 ) + keyboard? ( + app-text/iso-codes + dev-libs/expat + dev-libs/json-c:= + x11-misc/xkeyboard-config + x11-libs/libxkbcommon[X?,wayland?] + ) + systemd? ( + sys-apps/systemd + ) + !systemd? ( + dev-libs/libuv + sys-apps/dbus + ) + wayland? ( + dev-libs/glib:2 + dev-libs/wayland + dev-libs/wayland-protocols + dev-util/wayland-scanner + ) + X? ( + dev-libs/glib:2 + >=x11-libs/xcb-imdkit-1.0.3:5 + x11-libs/libX11 + x11-libs/libxkbfile + x11-libs/xcb-util + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-wm + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + kde-frameworks/extra-cmake-modules:0 +" + +src_configure() { + local mycmakeargs=( + -DENABLE_DBUS=on + -DENABLE_XDGAUTOSTART=$(usex autostart) + -DENABLE_SERVER=$(usex server) + -DENABLE_KEYBOARD=$(usex keyboard) + -DENABLE_TEST=$(usex test) + -DENABLE_ENCHANT=$(usex enchant) + -DENABLE_EMOJI=$(usex emoji) + -DENABLE_PRESAGE=$(usex presage) + -DENABLE_WAYLAND=$(usex wayland) + -DENABLE_X11=$(usex X) + -DENABLE_DOC=$(usex doc) + -DUSE_SYSTEMD=$(usex systemd) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_src_compile doc +} + +src_install() { + cmake_src_install + use doc && dodoc -r "${BUILD_DIR}"/doc/* +} + +src_test() { + # break by sandbox + local CMAKE_SKIP_TESTS=( + testdbus + testservicewatcher + ) + cmake_src_test +} + +pkg_postinst() { + xdg_pkg_postinst + + elog + elog "Follow the instrcutions on:" + elog "https://wiki.gentoo.org/wiki/Fcitx#Using_Fcitx" + elog "https://fcitx-im.org/wiki/Setup_Fcitx_5" + elog "https://fcitx-im.org/wiki/Using_Fcitx_5_on_Wayland" + elog +} diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch b/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch index f152f1dc6e5a..25b4fc1d12ac 100644 --- a/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch +++ b/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch @@ -1,7 +1,7 @@ https://github.com/fcitx/fcitx/issues/475 ---- /cmake/FindEnchant.cmake -+++ /cmake/FindEnchant.cmake +--- a/cmake/FindEnchant.cmake ++++ b/cmake/FindEnchant.cmake @@ -16,15 +16,15 @@ endif(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) diff --git a/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch b/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch index e21c3a1db7e8..dbb82afa7443 100644 --- a/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch +++ b/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch @@ -1,7 +1,7 @@ https://github.com/fcitx/fcitx/issues/250 ---- /CMakeLists.txt -+++ /CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -96,12 +96,15 @@ endif() endif() diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml index 322e79a5884c..fe51f3e337e0 100644 --- a/app-i18n/fcitx/metadata.xml +++ b/app-i18n/fcitx/metadata.xml @@ -1,21 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> <name>Arfrever Frehtes Taifersar Arahesis</name> </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> <maintainer type="project"> <email>cjk@gentoo.org</email> <name>Cjk</name> </maintainer> <use> <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> diff --git a/app-i18n/freewnn/Manifest b/app-i18n/freewnn/Manifest index 18dfbad99840..56f6cf87b5dd 100644 --- a/app-i18n/freewnn/Manifest +++ b/app-i18n/freewnn/Manifest @@ -1,2 +1 @@ -DIST FreeWnn-1.1.1-a022.tar.bz2 3137954 BLAKE2B 1f3a920ef7ddb4cddaa95de4d60bccf20c8e6d207216e406cb7dc503411e932b4578ed1c3c302249a94e0ede1d948aa62f5ced804d0d142ed5e04dbbd6789277 SHA512 938c8bff69e2f43cce265a6a84822ae08b89725837f808addb66ba202dadafa60c213638f298d9efe1257fd96f7193fd711a3dacecd803289d925d8f6ea6eaf3 DIST FreeWnn-1.1.1-a023.tar.bz2 3147378 BLAKE2B 63f3fbf37b53e5e6f32f83513d45aaf4915cbd33789ab8edfc93b22de1fbbe242e52e7bd40ce7ef22e24ae1f4ee151261c2041af9c78720875303b5d2b6c18a8 SHA512 f0b8c657f0441463c752314b7d2fd603b4df056b049d247ecd77ff8b2f2f837fed7e75ce89deabca7061d3126afd51bf301bcdd3ac429056f43bfc8e0c7c8385 diff --git a/app-i18n/freewnn/files/freewnn-1.1.1_alpha22-parallel-build.patch b/app-i18n/freewnn/files/freewnn-1.1.1_alpha22-parallel-build.patch deleted file mode 100644 index 058225c36ee5..000000000000 --- a/app-i18n/freewnn/files/freewnn-1.1.1_alpha22-parallel-build.patch +++ /dev/null @@ -1,318 +0,0 @@ -Description: Fix potential race condition when building in parallel mode -Origin: upstream, http://cvs.sourceforge.jp/cvs/view/freewnn/FreeWnn/Wnn/pubdicplus/Makefile.in?r1=1.7&r2=1.8&view=patch -Bug-Debian: http://bugs.debian.org/724058 - ---- a/Wnn/pubdicplus/Makefile.in 2010/02/22 17:06:54 1.7 -+++ b/Wnn/pubdicplus/Makefile.in 2013/11/08 18:54:44 1.8 -@@ -1,5 +1,5 @@ - # --# $Id: Makefile.in,v 1.7 2010/02/22 17:06:54 aonoto Exp $ -+# $Id: Makefile.in,v 1.8 2013/11/08 18:54:44 aonoto Exp $ - # - - # -@@ -10,7 +10,7 @@ - # 1987, 1988, 1989, 1990, 1991, 1992 - # Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 1999 - # Copyright ASTEC, Inc. 1987, 1988, 1989, 1990, 1991, 1992 --# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2004, 2010 -+# Copyright FreeWnn Project 1999, 2000, 2001, 2002, 2004, 2010, 2013 - # - # Maintainer: FreeWnn Project - # -@@ -42,13 +42,12 @@ - ATOF = $(WNNJUTILOBJ)/atof - WNNTOUCH = $(WNNJUTILOBJ)/wnntouch - HINSI = @HINSI_DATA@ -- FZK_FLAG = - - LINKS = Version bio.hd chimei.hd computer.hd fzk.attr fzk.con fzk.fzkattr fzk.jirattr fzk.jircon fzk.master fzk.shuutan jinmei.hd kihon.hd koyuu.hd setsuji.hd special.hd special.u symbol.hd tankan.hd - - WNNDICS = bio.u chimei.u computer.u jinmei.u kihon.u koyuu.u setsuji.u symbol.u tankan.u - --FZK_SRC= fzk.master fzk.attr fzk.jirattr fzk.fzkattr fzk.jircon fzk.con fzk.shuutan -+FZK_SRC= fzk.master-.c fzk.attr fzk.jirattr fzk.fzkattr fzk.jircon fzk.con fzk.shuutan - - DIC= bio.dic chimei.dic computer.dic jinmei.dic kihon.dic koyuu.dic setsuji.dic special.dic symbol.dic tankan.dic - -@@ -68,24 +67,14 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: Version -- - depend:: Version - --clean:: -- $(RM) Version -- - bio.hd: $(PUBDICPLUSSRC)/bio.hd - $(RM) $@ - $(LN) $? $@ - --includes:: bio.hd -- - depend:: bio.hd - --clean:: -- $(RM) bio.hd -- - # bio.u: $(PUBDICPLUSSRC)/bio.u - # $(RM) $@ - # $(LN) $? $@ -@@ -101,13 +90,8 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: chimei.hd -- - depend:: chimei.hd - --clean:: -- $(RM) chimei.hd -- - # chimei.u: $(PUBDICPLUSSRC)/chimei.u - # $(RM) $@ - # $(LN) $? $@ -@@ -123,13 +107,8 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: computer.hd -- - depend:: computer.hd - --clean:: -- $(RM) computer.hd -- - # computer.u: $(PUBDICPLUSSRC)/computer.u - # $(RM) $@ - # $(LN) $? $@ -@@ -145,90 +124,50 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: fzk.attr -- - depend:: fzk.attr - --clean:: -- $(RM) fzk.attr -- - fzk.con: $(PUBDICPLUSSRC)/fzk.con - $(RM) $@ - $(LN) $? $@ - --includes:: fzk.con -- - depend:: fzk.con - --clean:: -- $(RM) fzk.con -- - fzk.fzkattr: $(PUBDICPLUSSRC)/fzk.fzkattr - $(RM) $@ - $(LN) $? $@ - --includes:: fzk.fzkattr -- - depend:: fzk.fzkattr - --clean:: -- $(RM) fzk.fzkattr -- - fzk.jirattr: $(PUBDICPLUSSRC)/fzk.jirattr - $(RM) $@ - $(LN) $? $@ - --includes:: fzk.jirattr -- - depend:: fzk.jirattr - --clean:: -- $(RM) fzk.jirattr -- - fzk.jircon: $(PUBDICPLUSSRC)/fzk.jircon - $(RM) $@ - $(LN) $? $@ - --includes:: fzk.jircon -- - depend:: fzk.jircon - --clean:: -- $(RM) fzk.jircon -- - fzk.master: $(PUBDICPLUSSRC)/fzk.master - $(RM) $@ - $(LN) $? $@ - --includes:: fzk.master -- - depend:: fzk.master - --clean:: -- $(RM) fzk.master -- - fzk.shuutan: $(PUBDICPLUSSRC)/fzk.shuutan - $(RM) $@ - $(LN) $? $@ - --includes:: fzk.shuutan -- - depend:: fzk.shuutan - --clean:: -- $(RM) fzk.shuutan -- - jinmei.hd: $(PUBDICPLUSSRC)/jinmei.hd - $(RM) $@ - $(LN) $? $@ - --includes:: jinmei.hd -- - depend:: jinmei.hd - --clean:: -- $(RM) jinmei.hd -- - # jinmei.u: $(PUBDICPLUSSRC)/jinmei.u - # $(RM) $@ - # $(LN) $? $@ -@@ -244,13 +183,8 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: kihon.hd -- - depend:: kihon.hd - --clean:: -- $(RM) kihon.hd -- - # kihon.u: $(PUBDICPLUSSRC)/kihon.u - # $(RM) $@ - # $(LN) $? $@ -@@ -266,13 +200,8 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: koyuu.hd -- - depend:: koyuu.hd - --clean:: -- $(RM) koyuu.hd -- - # koyuu.u: $(PUBDICPLUSSRC)/koyuu.u - # $(RM) $@ - # $(LN) $? $@ -@@ -288,13 +217,8 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: setsuji.hd -- - depend:: setsuji.hd - --clean:: -- $(RM) setsuji.hd -- - # setsuji.u: $(PUBDICPLUSSRC)/setsuji.u - # $(RM) $@ - # $(LN) $? $@ -@@ -310,35 +234,20 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: special.hd -- - depend:: special.hd - --clean:: -- $(RM) special.hd -- - special.u: $(PUBDICPLUSSRC)/special.u - $(RM) $@ - $(LN) $? $@ - --includes:: special.u -- - depend:: special.u - --clean:: -- $(RM) special.u -- - symbol.hd: $(PUBDICPLUSSRC)/symbol.hd - $(RM) $@ - $(LN) $? $@ - --includes:: symbol.hd -- - depend:: symbol.hd - --clean:: -- $(RM) symbol.hd -- - # symbol.u: $(PUBDICPLUSSRC)/symbol.u - # $(RM) $@ - # $(LN) $? $@ -@@ -354,13 +263,8 @@ - $(RM) $@ - $(LN) $? $@ - --includes:: tankan.hd -- - depend:: tankan.hd - --clean:: -- $(RM) tankan.hd -- - # tankan.u: $(PUBDICPLUSSRC)/tankan.u - # $(RM) $@ - # $(LN) $? $@ -@@ -421,16 +325,14 @@ - $(RM) $@ - $(LN) $? $@ - --std.fzk: fzk.master-.c $(FZK_SRC) -- $(FZK_PP) $(FZK_FLAG) fzk.master-.c | egrep -v '^(# |#line |#pragma |$$)' | $(ATOF) -h $(HINSI) $@ -+std.fsrc: $(FZK_SRC) -+ $(FZK_PP) fzk.master-.c > $@ -+ -+full.fsrc: $(FZK_SRC) -+ $(FZK_PP) -DKANSAI fzk.master-.c > $@ - --full.fzk: $(FZK_SRC) -- $(MAKE) FZK_FLAG=-DKANSAI std.fzk -- $(MV) std.fzk $@ -- --kougo.fzk: $(FZK_SRC) -- $(MAKE) FZK_FLAG=-DKOUGO std.fzk -- $(MV) std.fzk $@ -+kougo.fsrc: $(FZK_SRC) -+ $(FZK_PP) -DKOUGO fzk.master-.c > $@ - - # additional rule from PubdicPlus/Makefile.in : by aono - pod.o: $(PUBDICPLUSSRC)/pod.c -@@ -442,7 +344,7 @@ - $(WNNDICS): pod $(PUBDICPLUSSRC)/pubdic.p - ./pod $(PUBDICPLUSSRC)/pubdic.p -w -1 -k `basename $@ .u` > $@ - --.SUFFIXES: .hd .u .dic .more -+.SUFFIXES: .hd .u .dic .more .fsrc .fzk - - .u.dic: - cat $*.hd $< | $(ATOD) -p $(VERSION) -P $(VERSION) -h $(HINSI) $@ -@@ -450,7 +352,10 @@ - .hd.more: - $(ATOD) -h $(HINSI) $@ < $< - -+.fsrc.fzk: -+ egrep -v '^(# |#line |#pragma |$$)' $< | $(ATOF) -h $(HINSI) $@ -+ - $(DIC): $(HINSI) - - clean:: -- $(RM) -f *.fzk *.dic *.more fzk.master-.c pod $(LINKS) -+ $(RM) -f *.fsrc *.dic *.more fzk.master-.c pod $(LINKS) $(FZKDATA) diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha22-r1.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha22-r1.ebuild deleted file mode 100644 index b076cfe87a80..000000000000 --- a/app-i18n/freewnn/freewnn-1.1.1_alpha22-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MY_P="FreeWnn-${PV/_alpha/-a0}" - -DESCRIPTION="Network-Extensible Kana-to-Kanji Conversion System" -HOMEPAGE="http://freewnn.sourceforge.jp/ http://www.freewnn.org/" -SRC_URI="mirror://sourceforge.jp/${PN}/59257/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="ipv6" - -DEPEND="virtual/libcrypt:=" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}"/${P}-parallel-build.patch - "${FILESDIR}"/${PN}-Wformat-security.patch -) -DOCS="ChangeLog* CONTRIBUTORS" - -src_prepare() { - default - - sed -i \ - -e "s/WNNOWNER = wnn/WNNOWNER = root/" \ - -e "s/@INSTPGMFLAGS@//" \ - makerule.mk.in - - # bug #542534 - sed -i \ - -e "s/egrep -v/egrep -av/" \ - PubdicPlus/Makefile.in \ - Wnn/pubdicplus/Makefile.in \ - cWnn/[ct]dic/Makefile.in \ - kWnn/kdic/Makefile.in -} - -src_configure() { - econf \ - $(use_with ipv6) \ - --disable-cWnn \ - --disable-kWnn -} - -src_install() { - emake DESTDIR="${D}" install install.man - einstalldocs - - newinitd "${FILESDIR}"/${PN}.initd ${PN} -} diff --git a/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild b/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild index eb63b8b14092..9aa3cdbb9b15 100644 --- a/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild +++ b/app-i18n/freewnn/freewnn-1.1.1_alpha23-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/63271/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" IUSE="ipv6 uum" RDEPEND="virtual/libcrypt:= diff --git a/app-i18n/freewnn/metadata.xml b/app-i18n/freewnn/metadata.xml index 00f1f852743c..f51feef0fab6 100644 --- a/app-i18n/freewnn/metadata.xml +++ b/app-i18n/freewnn/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> @@ -9,6 +9,6 @@ <flag name="uum">Build uum</flag> </use> <upstream> - <remote-id type="sourceforge-jp">freewnn</remote-id> + <remote-id type="osdn">freewnn</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest index cccf13fccfe0..6a4536908999 100644 --- a/app-i18n/ibus-anthy/Manifest +++ b/app-i18n/ibus-anthy/Manifest @@ -1,2 +1 @@ -DIST ibus-anthy-1.5.10.tar.gz 758528 BLAKE2B 39496f5c3a5f2038f3f81e09504e472a32da85f27701741cbe77b576afcd8685c4f2209aaf24ef84420cbeec1614b251d2903c1ea4e7175a1014f92615399847 SHA512 963b1dfba18259aad2296c10de35f9f321b0169d6f85afa058ed57b6894fe4e1d44514ffadeee3c3108aac77f54aa645096ddf4bdb353fafaedb83d27d8c5d47 -DIST ibus-anthy-1.5.11.tar.gz 809725 BLAKE2B b12139e208c401e3fdda0d3a184b0246d039e077b827d1aeb2da20470deeb62551026c68ba39c289e7876467147a6ba93d318d0582a9b45866c2f5a4f52e85aa SHA512 2ac85bf4ddba56e3f84c3732082b3b63a07175ea712aad2865de4f87b8c0967da303ee1edccbed0890095e8ddab10e58307a47b72ee11b51de3927fdb9e72418 +DIST ibus-anthy-1.5.16.tar.gz 278846 BLAKE2B 9e6f297dc563eff88195008858694d737b88979117e95540fc9cfc8288df9f6a10027e19860dcaa97271aee82e112ac49cfd0cad834d22005689bd4816b1df08 SHA512 af782509c3a098864fc0327f0f1226b2f1b9890b36bf69c208ffe977fb07c1f71dea946e8ad4dc9b2cdd6c84252d34a8c8b17f855c6fa7320e3a58b7719e86c5 diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild deleted file mode 100644 index 26c60f321884..000000000000 --- a/app-i18n/ibus-anthy/ibus-anthy-1.5.11-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{8,9} ) -inherit gnome2-utils python-single-r1 xdg - -DESCRIPTION="Japanese Anthy engine for IBus" -HOMEPAGE="https://github.com/ibus/ibus/wiki" -SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="nls" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - app-i18n/anthy - $(python_gen_cond_dep ' - app-i18n/ibus[python(+),${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') - nls? ( virtual/libintl )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - sys-devel/gettext" - -src_prepare() { - default - gnome2_environment_reset -} - -src_configure() { - econf \ - $(use_enable nls) \ - --enable-private-png \ - --with-layout=default \ - --with-python=${EPYTHON} -} - -src_test() { - : -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - - python_optimize -} - -pkg_preinst() { - xdg_pkg_preinst - gnome2_schemas_savelist -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update - - if ! has_version app-dicts/kasumi; then - elog "app-dicts/kasumi is not required but probably useful for you." - fi -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.16.ebuild index 211a9f814861..a16085e5cfdc 100644 --- a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r2.ebuild +++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.16.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" +PYTHON_COMPAT=( python3_{9..12} ) -PYTHON_COMPAT=( python3_{8,9} ) -inherit gnome2-utils python-single-r1 xdg +inherit autotools gnome2-utils python-single-r1 xdg DESCRIPTION="Japanese Anthy engine for IBus" HOMEPAGE="https://github.com/ibus/ibus/wiki" -SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz" +SRC_URI="https://github.com/ibus/${PN}/archive/${PV}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -24,12 +24,12 @@ RDEPEND="${PYTHON_DEPS} ') nls? ( virtual/libintl )" DEPEND="${RDEPEND}" -BDEPEND="dev-util/intltool - virtual/pkgconfig - sys-devel/gettext" +BDEPEND="sys-devel/gettext + virtual/pkgconfig" src_prepare() { default + eautoreconf gnome2_environment_reset } diff --git a/app-i18n/ibus-anthy/metadata.xml b/app-i18n/ibus-anthy/metadata.xml index d3b3cfaef39e..cfa2a843f73d 100644 --- a/app-i18n/ibus-anthy/metadata.xml +++ b/app-i18n/ibus-anthy/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild index b6fa5e00fca8..d43d9941a13c 100644 --- a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild +++ b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools gnome2-utils python-r1 xdg DESCRIPTION="Chinese Cangjie and Quick engines for IBus" diff --git a/app-i18n/ibus-cangjie/metadata.xml b/app-i18n/ibus-cangjie/metadata.xml index 83985854d52a..1c9a4efd91c2 100644 --- a/app-i18n/ibus-cangjie/metadata.xml +++ b/app-i18n/ibus-cangjie/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/ibus-chewing/Manifest b/app-i18n/ibus-chewing/Manifest index e2aae822c1f9..a6efae009b6d 100644 --- a/app-i18n/ibus-chewing/Manifest +++ b/app-i18n/ibus-chewing/Manifest @@ -1,2 +1,2 @@ -DIST ibus-chewing-1.5.1-Source.tar.gz 177044 BLAKE2B b188c7ea2c12fd1ccf64a70355da0a6f8a47976f141c8a0a7edcc7a5ccd6b959f73cad2cd1137874f965967780691fe920b44b3141cc6fa4e631921f4c4a2582 SHA512 2db6def1fe8ca3bd71419a001909d285ee48ef84c2f65e14bacff9cd114676bed594f0c90217e1fdab67c995a7b05d675812e90e281371d8464722c31649c633 -DIST ibus-chewing-1.6.1.tar.gz 111103 BLAKE2B c9b22b0fe4b164d02a1782479e139e04e3113299fb3ccebdba24eaa9d15964eca34d381f45f0c313bb53bc0b8c7f7b649ff4c0179c712f6d880e3d92a9d02692 SHA512 b093db79c656433614b9f72719a2b0768a30c2fb6fa066eda1e79cc9932ce1836f7f1e5611612fb44f260fe80a9baa9e18fdc9754b285e8a5f12a87c376cbd39 +DIST ibus-chewing-1.6.1_p20210117.tar.gz 112715 BLAKE2B 80279a40c8733fc8e9f43b09cf825bea53442a6572d7863bf7d8faf06765fcb3609c71b9087551c6b2d35b268b2585f6e4c019f15ccc08c8f91bc3a14427ad57 SHA512 979f58d3b32ec22051d32c7425867761eea8e13eb9dc900975e3986bb7b3064883474267731c32f79c96d2029da0415dba8d5ed7ae3645f04c3fed44dbe25bd6 +DIST ibus-chewing-gob2.patch.xz 11760 BLAKE2B 929c6f09ddc22efa47eb53fd9bd5833a5a5105e9e8c6251009699548b4b3a1bf124f335f9d963c42efe00a9f9276f4df303a087632d894237ee3f69f5c08b74e SHA512 4317f5e807d6114f9d1057421db9c032670578ca83898c7495a27bf76aaa0fee88649a5df9f16df74e7961129cfe2029eda66dcea9407263344add7670de088c diff --git a/app-i18n/ibus-chewing/files/ibus-chewing-test.patch b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch index abed91d377d3..0d4ddc7a7838 100644 --- a/app-i18n/ibus-chewing/files/ibus-chewing-test.patch +++ b/app-i18n/ibus-chewing/files/ibus-chewing-test.patch @@ -1,6 +1,26 @@ +--- a/test/IBusChewingPreEdit-test.c ++++ b/test/IBusChewingPreEdit-test.c +@@ -514,7 +514,7 @@ void process_key_down_arrow_test() + key_press_from_key_sym(IBUS_KEY_Down, 0); + key_press_from_key_sym(IBUS_KEY_Down, 0); + key_press_from_string("4"); +- assert_pre_edit_substring("世", 1, 1); ++ assert_pre_edit_substring("å‹¢", 1, 1); + + ibus_chewing_pre_edit_clear(self); + assert_outgoing_pre_edit("", ""); +@@ -752,7 +752,7 @@ void test_arrow_keys_buffer_empty() + key_press_from_key_sym(IBUS_KEY_Page_Up, 0); + g_assert(chewing_cand_CurrentPage(self->context) == 0); + key_press_from_key_sym(IBUS_KEY_Up, 0); +- g_assert(!ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW)); ++ g_assert(ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW)); + + key_press_from_string("`"); + g_assert(ibus_chewing_pre_edit_has_flag(self, FLAG_TABLE_SHOW)); --- a/test/MakerDialogBackend-test.c +++ b/test/MakerDialogBackend-test.c -@@ -126,7 +126,7 @@ +@@ -132,7 +132,7 @@ gboolean mkdg_g_value_is_equal(GValue * value1, GValue * value2) void backup_key_to_g_value(const gchar * key, GType gType, GValue * value) { g_value_init(value, gType); @@ -8,8 +28,8 @@ + mkdg_backend_read(backend, value, QUOTE_ME(PROJECT_SCHEMA_SECTION), key, NULL); } - void change_new_value_from_orig_value(GValue * newValue, -@@ -169,7 +169,7 @@ + void change_new_value_from_orig_value(GValue * newValue, GValue * origValue) +@@ -175,7 +175,7 @@ void assert_new_value_is_written(const gchar * key, GValue * newValue) { GValue storedGValue = { 0 }; g_value_init(&storedGValue, G_VALUE_TYPE(newValue)); @@ -18,7 +38,7 @@ g_assert(mkdg_g_value_is_equal(newValue, &storedGValue)); g_value_unset(&storedGValue); } -@@ -219,7 +219,7 @@ +@@ -225,7 +225,7 @@ void int_w_test() #define GCONF_KEY "max-chi-symbol-len" GValue origValue = { 0 }; g_value_init(&origValue, G_TYPE_BOOLEAN); @@ -27,7 +47,7 @@ GValue newValue = { 0 }; g_value_init(&newValue, G_TYPE_BOOLEAN); -@@ -229,13 +229,13 @@ +@@ -235,13 +235,13 @@ void int_w_test() GValue storedValue = { 0 }; g_value_init(&storedValue, G_TYPE_BOOLEAN); diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild deleted file mode 100644 index c1924f9c8119..000000000000 --- a/app-i18n/ibus-chewing/ibus-chewing-1.5.1-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake-utils gnome2-utils virtualx - -MY_P="${P}-Source" - -DESCRIPTION="Chinese Chewing engine for IBus" -HOMEPAGE="https://github.com/ibus/ibus/wiki" -SRC_URI="https://github.com/definite/${PN}/releases/download/${PV}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gconf nls" - -RDEPEND="app-i18n/ibus - app-i18n/libchewing - dev-libs/glib:2 - dev-util/gob:2 - x11-libs/gtk+:2 - x11-libs/libX11 - gconf? ( gnome-base/gconf ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}"/${PN}-test.patch ) -DOCS=( AUTHORS ChangeLog README RELEASE-NOTES.txt USER-GUIDE ) - -src_configure() { - local mycmakeargs=( - -DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false - -DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF} - ) - use nls || mycmakeargs+=( -DMANAGE_GETTEXT_SUPPORT=0 ) - cmake-utils_src_configure -} - -src_test() { - "${EPREFIX%/}/"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die - - export GSETTINGS_BACKEND="memory" - export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin" - virtx cmake-utils_src_test -} - -pkg_preinst() { - use gconf && gnome2_gconf_savelist - gnome2_schemas_savelist -} - -pkg_postinst() { - use gconf && gnome2_gconf_install - gnome2_schemas_update -} - -pkg_postrm() { - gnome2_schemas_update -} diff --git a/app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117-r1.ebuild index 94525afb3ed4..d6c35d025bc9 100644 --- a/app-i18n/ibus-chewing/ibus-chewing-1.6.1.ebuild +++ b/app-i18n/ibus-chewing/ibus-chewing-1.6.1_p20210117-r1.ebuild @@ -1,60 +1,64 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" CMAKE_MAKEFILE_GENERATOR="emake" -inherit cmake-utils gnome2-utils virtualx +inherit cmake gnome2-utils vcs-snapshot virtualx + +EGIT_COMMIT="8e17848d3fe3bd7de052a1c26b4161092ba1df9f" DESCRIPTION="Chinese Chewing engine for IBus" HOMEPAGE="https://github.com/ibus/ibus/wiki" -SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/definite/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~hattya/distfiles/${PN}-gob2.patch.xz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="gconf nls" +IUSE="nls" RDEPEND="app-i18n/ibus app-i18n/libchewing dev-libs/glib:2 - dev-util/gob:2 - x11-libs/gtk+:2 + x11-libs/gtk+:3 x11-libs/libX11 - gconf? ( gnome-base/gconf ) nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - dev-util/cmake-fedora +DEPEND="${RDEPEND}" +BDEPEND="dev-build/cmake-fedora virtual/pkgconfig nls? ( sys-devel/gettext )" -PATCHES=( "${FILESDIR}"/${PN}-test.patch ) +PATCHES=( + "${WORKDIR}"/${PN}-gob2.patch + "${FILESDIR}"/${PN}-test.patch +) DOCS=( AUTHORS ChangeLog README.md RELEASE-NOTES.txt USER-GUIDE ) src_configure() { local mycmakeargs=( + -DGCONF2_SUPPORT=OFF + -DGSETTINGS_SUPPORT=ON -DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false -DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF} ) use nls || mycmakeargs+=( -DMANAGE_GETTEXT_SUPPORT=0 ) - cmake-utils_src_configure + cmake_src_configure } src_test() { - "${EPREFIX%/}/"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die + "${BROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${BUILD_DIR}"/bin || die export GSETTINGS_BACKEND="memory" export GSETTINGS_SCHEMA_DIR="${BUILD_DIR}/bin" - virtx cmake-utils_src_test + virtx cmake_src_test -j1 } pkg_preinst() { - use gconf && gnome2_gconf_savelist gnome2_schemas_savelist } pkg_postinst() { - use gconf && gnome2_gconf_install gnome2_schemas_update } diff --git a/app-i18n/ibus-chewing/metadata.xml b/app-i18n/ibus-chewing/metadata.xml index d41c94261402..2fc61b76269f 100644 --- a/app-i18n/ibus-chewing/metadata.xml +++ b/app-i18n/ibus-chewing/metadata.xml @@ -1,14 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <use> - <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag> - </use> - <upstream> - <remote-id type="github">definite/ibus-chewing</remote-id> - </upstream> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <upstream> + <remote-id type="github">definite/ibus-chewing</remote-id> + </upstream> </pkgmetadata> diff --git a/app-i18n/ibus-fbterm/files/ibus-fbterm-clang.patch b/app-i18n/ibus-fbterm/files/ibus-fbterm-clang.patch new file mode 100644 index 000000000000..797592c3240b --- /dev/null +++ b/app-i18n/ibus-fbterm/files/ibus-fbterm-clang.patch @@ -0,0 +1,48 @@ +--- a/backend/fbio.c ++++ b/backend/fbio.c +@@ -204,7 +204,7 @@ + int + fb_io_get_fd (FbIo *io) + { +- g_return_if_fail (FB_IS_IO (io)); ++ g_return_val_if_fail (FB_IS_IO (io), -1); + return io->priv->fd; + } + +--- a/backend/fbshell.c ++++ b/backend/fbshell.c +@@ -17,11 +17,11 @@ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +-#include <glib.h> +- +-#define _XOPEN_SOURCE ++#define _XOPEN_SOURCE 600 + #define __USE_XOPEN + ++#include <glib.h> ++ + #include <errno.h> + #include <fcntl.h> + #include <pty.h> +--- a/backend/fbshellman.c ++++ b/backend/fbshellman.c +@@ -81,7 +81,7 @@ + FbShellManagerPrivate *priv; + int index, temp, i; + +- g_return_if_fail (FB_IS_SHELL_MANAGER (shell_manager)); ++ g_return_val_if_fail (FB_IS_SHELL_MANAGER (shell_manager), NR_SHELLS); + + #define STEP() do { \ + if (forward) temp++; \ +@@ -267,7 +267,7 @@ + FbShell * + fb_shell_manager_active_shell (FbShellManager *shell_manager) + { +- g_return_if_fail (FB_IS_SHELL_MANAGER (shell_manager)); ++ g_return_val_if_fail (FB_IS_SHELL_MANAGER (shell_manager), NULL); + + return shell_manager->priv->active_shell; + } diff --git a/app-i18n/ibus-fbterm/files/ibus-fbterm-man.patch b/app-i18n/ibus-fbterm/files/ibus-fbterm-man.patch new file mode 100644 index 000000000000..f3da1dd4ac6d --- /dev/null +++ b/app-i18n/ibus-fbterm/files/ibus-fbterm-man.patch @@ -0,0 +1,18 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,14 +4,12 @@ + + man_one_in_files = ibus-fbterm.1.in + man_one_files = $(man_one_in_files:.1.in=.1) +-man_one_DATA =$(man_one_files:.1=.1.gz) ++man_one_DATA =$(man_one_files) + man_onedir = $(mandir)/man1 + %.1: %.1.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.1.gz: %.1 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + dist-hook: + if test -d .git ; then \ diff --git a/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild b/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild index 81fd871b7bf2..148fb8ed4756 100644 --- a/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild +++ b/app-i18n/ibus-fbterm/ibus-fbterm-1.0.1.ebuild @@ -1,13 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" + +inherit autotools DESCRIPTION="IBus client for FbTerm" HOMEPAGE="https://github.com/fujiwarat/ibus-fbterm" SRC_URI="https://github.com/fujiwarat/${PN}/releases/download/${PV}/${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" @@ -15,5 +17,17 @@ IUSE="" RDEPEND="app-i18n/ibus app-i18n/fbterm dev-libs/glib:2" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-clang.patch + "${FILESDIR}"/${PN}-man.patch +) + +AT_M4DIR="m4" + +src_prepare() { + default + eautoreconf +} diff --git a/app-i18n/ibus-fbterm/metadata.xml b/app-i18n/ibus-fbterm/metadata.xml index 884cfd6920fc..4264869adc85 100644 --- a/app-i18n/ibus-fbterm/metadata.xml +++ b/app-i18n/ibus-fbterm/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/ibus-handwrite/files/ibus-handwrite-blink.patch b/app-i18n/ibus-handwrite/files/ibus-handwrite-blink.patch new file mode 100644 index 000000000000..7954f2018c2e --- /dev/null +++ b/app-i18n/ibus-handwrite/files/ibus-handwrite-blink.patch @@ -0,0 +1,23 @@ +From fcffa8f1ed798db3c2c4db0dbfc953f3147d37ba Mon Sep 17 00:00:00 2001 +From: Peng Wu <pwu@redhat.com> +Date: Mon, 31 Aug 2020 15:32:48 +0800 +Subject: [PATCH] Fix focus in/out issue + +--- + src/engine.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/engine.c b/src/engine.c +index da01f06..d3d924e 100644 +--- a/src/engine.c ++++ b/src/engine.c +@@ -155,9 +155,7 @@ static void ibus_handwrite_engine_focus_in(IBusHandwriteEngine *engine) + + static void ibus_handwrite_engine_focus_out(IBusHandwriteEngine *engine) + { +- UI_hide_ui(engine); + printf("%s \n", __func__); +- + } + + static void ibus_handwrite_engine_reset(IBusHandwriteEngine *engine) diff --git a/app-i18n/ibus-handwrite/files/ibus-handwrite-nested-function.patch b/app-i18n/ibus-handwrite/files/ibus-handwrite-nested-function.patch new file mode 100644 index 000000000000..96cbc118fa4f --- /dev/null +++ b/app-i18n/ibus-handwrite/files/ibus-handwrite-nested-function.patch @@ -0,0 +1,26 @@ +--- a/src/UI_gtk.c ++++ b/src/UI_gtk.c +@@ -74,6 +74,11 @@ + return TRUE; + } + ++static void clicked(GtkButton *button, IBusHandwriteEngine *engine) ++{ ++ ibus_handwrite_engine_commit_text(engine,GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"order"))); ++} ++ + static void regen_loopuptable(GtkWidget * widget, IBusHandwriteEngine * engine) + { + int i; +@@ -98,11 +103,6 @@ + + gtk_widget_show(bt); + +- void clicked(GtkButton *button, IBusHandwriteEngine *engine) +- { +- ibus_handwrite_engine_commit_text(engine,GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button),"order"))); +- } +- + g_object_set_data(G_OBJECT(bt),"order",GINT_TO_POINTER(i)); + g_signal_connect(bt,"clicked",G_CALLBACK(clicked),engine); + diff --git a/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r1.ebuild index cbabf59f6792..ffbab3234760 100644 --- a/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0.ebuild +++ b/app-i18n/ibus-handwrite/ibus-handwrite-3.0.0-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" DESCRIPTION="Hand write recognition/input for IBus" HOMEPAGE="https://github.com/microcai/ibus-handwrite" SRC_URI="https://github.com/microcai/${PN}/releases/download/${PV%.0}/${P}.tar.bz2" -LICENSE="GPL-3" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 x86" IUSE="nls +zinnia" @@ -19,11 +19,15 @@ RDEPEND="app-i18n/ibus app-i18n/zinnia app-i18n/zinnia-tomoe )" -DEPEND="${RDEPEND} - virtual/pkgconfig +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig nls? ( sys-devel/gettext )" -PATCHES=( "${FILESDIR}"/${PN}-headers.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-blink.patch + "${FILESDIR}"/${PN}-headers.patch + "${FILESDIR}"/${PN}-nested-function.patch +) src_configure() { econf \ diff --git a/app-i18n/ibus-handwrite/metadata.xml b/app-i18n/ibus-handwrite/metadata.xml index 23f5c6be388a..06f6070908fc 100644 --- a/app-i18n/ibus-handwrite/metadata.xml +++ b/app-i18n/ibus-handwrite/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest index 105124d7af34..45b735f1b8ce 100644 --- a/app-i18n/ibus-hangul/Manifest +++ b/app-i18n/ibus-hangul/Manifest @@ -1,2 +1 @@ -DIST ibus-hangul-1.5.3.tar.gz 525834 BLAKE2B 6c92dbbde39bc42b7df974dbb23c9ef62088c8d3f63a500bd3c7e9c90b3d80d16dc1d76616620e1d7590fee549979a03585ac635761687dc11737d65fdf09e08 SHA512 ba21a8afb750e33744042c5e4f9d88891764921a37c4dbe1f4efa9883fd3c889789854af57adcd24bc1ca365ee49d2e01073c54d72cd025558b41788fb6213b4 DIST ibus-hangul-1.5.4.tar.gz 542612 BLAKE2B 46495c04a37888a3ed21831b5bbca5b788f4d3a831fb3ce4eb13d95f302877fadddf831016f1d29aa2c1a6ba73fc0d585f2be57c10267a51a1a2186642632918 SHA512 dc4c755349424605de3832496a8a0cf7e8da577cbeff85d2b03da187fd5fdc9de5475eb523c69310e4f7edbb9a513f6f218de082ba32a25a477cdf5eb6f65513 diff --git a/app-i18n/ibus-hangul/files/ibus-hangul-test.patch b/app-i18n/ibus-hangul/files/ibus-hangul-test.patch new file mode 100644 index 000000000000..7a6ef479f0ee --- /dev/null +++ b/app-i18n/ibus-hangul/files/ibus-hangul-test.patch @@ -0,0 +1,20 @@ +--- a/tests/ibus-hangul.c ++++ b/tests/ibus-hangul.c +@@ -261,6 +261,7 @@ + G_CALLBACK (window_inserted_text_cb), entry); + gtk_container_add (GTK_CONTAINER (window), entry); + gtk_widget_show_all (window); ++ gtk_window_present (window); + } + + static void +--- a/tests/runtest ++++ b/tests/runtest +@@ -7,7 +7,6 @@ + : ${DISABLE_GUI_TESTS:=''} + + ibus-daemon --xim --panel disable --config disable & +-sleep 30 + + tst=$1 + diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild deleted file mode 100644 index 8c38721ea651..000000000000 --- a/app-i18n/ibus-hangul/ibus-hangul-1.5.3-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{8,9} ) -inherit gnome2-utils python-single-r1 xdg - -DESCRIPTION="Korean Hangul engine for IBus" -HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki" -SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="nls" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - app-i18n/ibus[python(+),${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') - >=app-i18n/libhangul-0.1 - nls? ( virtual/libintl )" -DEPEND="${RDEPEND}" -BDEPEND="sys-devel/gettext - virtual/pkgconfig" - -src_configure() { - econf \ - $(use_enable nls) \ - --with-python=${EPYTHON} -} - -pkg_preinst() { - xdg_pkg_preinst - gnome2_schemas_savelist -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild index 4d13e3d9b116..d93d65dad6a2 100644 --- a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild +++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild @@ -1,10 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) -inherit gnome2-utils python-single-r1 xdg +PYTHON_COMPAT=( python3_{9..11} ) + +inherit gnome2-utils python-single-r1 xdg virtualx DESCRIPTION="Korean Hangul engine for IBus" HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki" @@ -12,7 +13,7 @@ SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="nls" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -27,12 +28,22 @@ DEPEND="${RDEPEND}" BDEPEND="sys-devel/gettext virtual/pkgconfig" +PATCHES=( "${FILESDIR}"/${PN}-test.patch ) + src_configure() { econf \ $(use_enable nls) \ --with-python=${EPYTHON} } +src_test() { + "${BROOT}"${GLIB_COMPILE_SCHEMAS} --allow-any-name "${S}"/data || die + + export GSETTINGS_BACKEND="memory" + export GSETTINGS_SCHEMA_DIR="${S}/data" + virtx default +} + pkg_preinst() { xdg_pkg_preinst gnome2_schemas_savelist diff --git a/app-i18n/ibus-hangul/metadata.xml b/app-i18n/ibus-hangul/metadata.xml index 23e099644a68..1b693a0e7f7c 100644 --- a/app-i18n/ibus-hangul/metadata.xml +++ b/app-i18n/ibus-hangul/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/ibus-input-pad/metadata.xml b/app-i18n/ibus-input-pad/metadata.xml index d4f9a8e15a0b..88c4a9fc2a14 100644 --- a/app-i18n/ibus-input-pad/metadata.xml +++ b/app-i18n/ibus-input-pad/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/ibus-kkc/Manifest b/app-i18n/ibus-kkc/Manifest deleted file mode 100644 index 12c5b9206494..000000000000 --- a/app-i18n/ibus-kkc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST ibus-kkc-1.5.22.tar.gz 518844 BLAKE2B eb3d562960729ff4967781ca3cc2797915c4c3e3b60281ca05483da3180575500fd5688c1481d03a909e8a108082159197e23b3a6c4df672b7d57ccc774783b3 SHA512 767a995cb97ca7cf5434f64094351c4fcf1d3de9f31da6f6642ccec2d199ddfb58e27f281b4dd3c63f44dc29cd46b36808ecd1aacfe0b1320d0688d567eb6fd4 diff --git a/app-i18n/ibus-kkc/ibus-kkc-1.5.22.ebuild b/app-i18n/ibus-kkc/ibus-kkc-1.5.22.ebuild deleted file mode 100644 index a2b21852753a..000000000000 --- a/app-i18n/ibus-kkc/ibus-kkc-1.5.22.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit vala - -DESCRIPTION="Japanese Kana Kanji conversion engine for IBus" -HOMEPAGE="https://github.com/ueno/ibus-kkc" -SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls" - -CDEPEND="app-i18n/ibus - app-i18n/libkkc - x11-libs/gtk+:3 - nls? ( virtual/libintl )" -RDEPEND="${CDEPEND} - app-i18n/skk-jisyo" -DEPEND="${CDEPEND} - $(vala_depend) - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -src_prepare() { - vala_src_prepare - default -} - -src_configure() { - econf $(use_enable nls) -} diff --git a/app-i18n/ibus-kkc/metadata.xml b/app-i18n/ibus-kkc/metadata.xml deleted file mode 100644 index c52521a4a3b0..000000000000 --- a/app-i18n/ibus-kkc/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <upstream> - <remote-id type="github">ueno/ibus-kkc</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest index 4e4bf9ae6f8d..373863321eaa 100644 --- a/app-i18n/ibus-libpinyin/Manifest +++ b/app-i18n/ibus-libpinyin/Manifest @@ -1 +1,2 @@ -DIST ibus-libpinyin-1.11.92.tar.gz 1730065 BLAKE2B 376bec6fa7616364c8ed4dc5b269edabda892ba4759ff03e93b4099c99440925126800ea3bf11eef91ea62c558fa7dbf05f3d68be5e25e701aaaeb37618b90a8 SHA512 b875b2fed6875806971b91e2abc62cdab1f70baef78840915f89466a7bcf3d1dfc70438ba85e7580bba92dec0ade50a2b05955fe6cd148bffd3888fa69f1c851 +DIST ibus-libpinyin-1.13.1.tar.gz 1726900 BLAKE2B 2540b5ca6657fe421f6f2986f32fba1b8840cafcc37b3ec5402705cb0edc0aac6b12d972b5da0326339a04c875dbd8f8cce902f613558f3f9d21b4a0cace31a3 SHA512 ee3a8c95e091992acb0558ff297743eb49bd8c73fbb9cd1f2b56db75137573dda2c677b1b25eb213fbd8779be004b06f95cded04273d7a469cf49f45cc27813a +DIST ibus-libpinyin-1.15.2.tar.gz 1728300 BLAKE2B a7699fe7f4d7360d09b8c311919630c87fcf2250929f42be2adf1b29a16e60bef2df46539e0fb75ee27700ec7262eb175e6a4d56bedeb895a6272e097a636d00 SHA512 be7525221c4a95df885d1c8c60716c32ad0cfa0a13ca5f9034d06efebf18ab1c207383b30c017da28c1078724b4d9943fc82def68c94bb4e2a0a1e6273c7ad7f diff --git a/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch b/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch new file mode 100644 index 000000000000..e3f001d42002 --- /dev/null +++ b/app-i18n/ibus-libpinyin/files/ibus-libpinyin-1.13.1_sqlite3.41_fix_quotes.patch @@ -0,0 +1,43 @@ +Fix quotes for compatibilty with sqlite3.41+ +https://bugs.gentoo.org/898478 + +From b7f58280a3f1e20e01471fa53509007c0e96ad02 Mon Sep 17 00:00:00 2001 +From: graham <graham@ulsterit.com> +Date: Sat, 4 Mar 2023 15:55:03 +0000 +Subject: [PATCH] change double quotes to single quotes to meet SQL standard + for strings, compatible with sqlite 3.41 + +--- + data/english.awk | 2 +- + data/table.awk | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/english.awk b/data/english.awk +index c5dc0aa..bed156d 100644 +--- a/data/english.awk ++++ b/data/english.awk +@@ -16,7 +16,7 @@ BEGIN { + } + + # Insert data into english table +- { printf "INSERT INTO english (word, freq) VALUES (\"%s\", %f);\n", $1, $2} ++ { printf "INSERT INTO english (word, freq) VALUES ('%s', %f);\n", $1, $2} + + #quit sqlite3 + END { +diff --git a/data/table.awk b/data/table.awk +index 700529c..c097ec2 100644 +--- a/data/table.awk ++++ b/data/table.awk +@@ -21,7 +21,7 @@ BEGIN { + + # Insert data into phrases table + NF == 4 { +- printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, \"%s\", \"%s\");\n", id, $3, $1; ++ printf "INSERT INTO phrases (id, tabkeys, phrase) VALUES (%d, '%s', '%s');\n", id, $3, $1; + id++; + } + +-- +2.39.2 + diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild new file mode 100644 index 000000000000..ad164200f31f --- /dev/null +++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.13.1-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 2015-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +LUA_COMPAT=( lua5-{1..3} ) +PYTHON_COMPAT=( python3_{9..11} ) + +inherit autotools gnome2-utils lua-single python-single-r1 + +DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus" +HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/" +SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="boost lua opencc" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + lua? ( ${LUA_REQUIRED_USE} )" + +BDEPEND="dev-db/sqlite:3 + virtual/pkgconfig" + +DEPEND="${PYTHON_DEPS} + >=app-i18n/libpinyin-2.2.1:= + dev-db/sqlite:3 + dev-libs/glib:2 + virtual/libintl + $(python_gen_cond_dep ' + app-i18n/ibus[python(+),${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + boost? ( dev-libs/boost:= ) + lua? ( ${LUA_DEPS} ) + opencc? ( app-i18n/opencc:= )" + +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}_sqlite3.41_fix_quotes.patch +) + +pkg_setup() { + python-single-r1_pkg_setup + + if use lua; then + lua-single_pkg_setup + fi +} + +src_prepare() { + sed -i \ + -e "/^appdatadir/s:/appdata:/metainfo:" \ + data/Makefile.am || die + default + eautoreconf +} + +src_configure() { + econf \ + --enable-english-input-mode \ + $(use_enable boost) \ + $(use_enable lua lua-extension) \ + $(use_enable opencc) +} + +pkg_postinst() { + gnome2_schemas_update +} + +pkg_postrm() { + gnome2_schemas_update +} diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.15.2.ebuild index e60f8ad835a4..72f7dbaf075c 100644 --- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.11.92-r1.ebuild +++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.15.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 2015-2021 Gentoo Authors +# Copyright 2015-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -LUA_COMPAT=(lua{5-1,5-2,5-3}) -PYTHON_COMPAT=(python{3_8,3_9}) +EAPI=8 +LUA_COMPAT=( lua5-{1..3} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools gnome2-utils lua-single python-single-r1 @@ -11,7 +11,7 @@ DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin fo HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/" SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 x86" IUSE="boost lua opencc" @@ -19,10 +19,11 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} lua? ( ${LUA_REQUIRED_USE} )" BDEPEND="dev-db/sqlite:3 + sys-devel/gettext virtual/pkgconfig" DEPEND="${PYTHON_DEPS} - >=app-i18n/libpinyin-2.1.0:= + >=app-i18n/libpinyin-2.7.91:= dev-db/sqlite:3 dev-libs/glib:2 virtual/libintl diff --git a/app-i18n/ibus-libpinyin/metadata.xml b/app-i18n/ibus-libpinyin/metadata.xml index 103d4a0cb43b..e8dfe300fdd3 100644 --- a/app-i18n/ibus-libpinyin/metadata.xml +++ b/app-i18n/ibus-libpinyin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>graham@ulsterit.com</email> diff --git a/app-i18n/ibus-m17n/Manifest b/app-i18n/ibus-m17n/Manifest index aaff757784b4..1977efc7c393 100644 --- a/app-i18n/ibus-m17n/Manifest +++ b/app-i18n/ibus-m17n/Manifest @@ -1,2 +1,2 @@ -DIST ibus-m17n-1.4.5.tar.gz 493250 BLAKE2B a5fd4de169997dea78acf6273a7e44cefbc9ab4499cbee92c30f394ef7267c15fb1af42d45d227bc160150f35195477f9ec3d2534f9764bab4fa86c0fae046eb SHA512 64bed564d59b0992ebc8a931e0845f687c176e5336d7c7fbc1d575433eb276714615f8fee412a532ec2c8870e46d8d6c41636c984b666c92427dadbdc84838b5 -DIST ibus-m17n-1.4.6.tar.gz 493592 BLAKE2B 1b9978277a008a4e72ffe03306d409532da7757d53cdb8bae9d6b5776b417e3b731fe432cb5f5c50f7f52d83ed9a2dd572a866111f9186ac42f5ce8afe511ad4 SHA512 d33c89735e5e6c93301a3c3985f46708e41d44b66e580b282e484a7497c0b9d2615c66931cdd7260b4a63d9e9af4d9ebbad5e23d4a3f8a7773dcab61a7600c57 +DIST ibus-m17n-1.4.28.tar.gz 646718 BLAKE2B 6e424d7d10e7758e7b0bfc7c679447366b564bc9fe97bf9cbab66d177f8a33ec93e35007d8ff18d473dbc74793ceff5fb4b448445f450fec38175f1e5bfe7238 SHA512 b96dea6a46f50529aeb0b828f8846b1e856e0fc0bb3dbf14ea384283156741653ff396e1647a835c505292cfea78f788ec0a391a57622b8f4c3e13fb35f191fc +DIST ibus-m17n-1.4.29.tar.gz 648370 BLAKE2B c3c65439167bbca9bbef8734f4f95282c3c8476a51654325b517bd22350ae98e5194bcf20cd3311d14e4938f66d98a40419145e7d5ffb6d33398ddbde4212702 SHA512 bb3b3f44fa5a79e7e15c71b30760f7b29454a47b167f12cc4bde52ee03151f794795fd0d9bb6a2a7877a0afc909f81342d50461da3d49a905255c76288023edb diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.28.ebuild index 8ec1183befae..25014678be43 100644 --- a/app-i18n/ibus-m17n/ibus-m17n-1.4.5.ebuild +++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.28.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" inherit gnome2-utils xdg diff --git a/app-i18n/ibus-m17n/ibus-m17n-1.4.6.ebuild b/app-i18n/ibus-m17n/ibus-m17n-1.4.29.ebuild index 1fabfb506072..d17cb13bd689 100644 --- a/app-i18n/ibus-m17n/ibus-m17n-1.4.6.ebuild +++ b/app-i18n/ibus-m17n/ibus-m17n-1.4.29.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" inherit gnome2-utils xdg diff --git a/app-i18n/ibus-m17n/metadata.xml b/app-i18n/ibus-m17n/metadata.xml index b120c362d923..c2feaa149eb0 100644 --- a/app-i18n/ibus-m17n/metadata.xml +++ b/app-i18n/ibus-m17n/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-gettext.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-gettext.patch new file mode 100644 index 000000000000..2014bad9820a --- /dev/null +++ b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-gettext.patch @@ -0,0 +1,16 @@ +--- a/setup/main.py ++++ b/setup/main.py +@@ -45,7 +45,12 @@ class PreferencesDialog: + locale.setlocale(locale.LC_ALL, "") + localedir = os.getenv("IBUS_LOCALEDIR") + gettext.bindtextdomain("ibus-pinyin", localedir) +- gettext.bind_textdomain_codeset("ibus-pinyin", "UTF-8") ++ # Python's gettext module doesn't provide all methods in ++ # new Python version since Python 3.10 ++ try: ++ gettext.bind_textdomain_codeset("ibus-pinyin", "UTF-8") ++ except AttributeError: ++ pass + + self.__bus = IBus.Bus() + self.__config = self.__bus.get_config() diff --git a/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch new file mode 100644 index 000000000000..0faa622e3230 --- /dev/null +++ b/app-i18n/ibus-pinyin/files/ibus-pinyin-1.5.0-sqlite-3.41.0.patch @@ -0,0 +1,23 @@ +UPSTREAM: https://github.com/ibus/ibus-pinyin/pull/12 +BUG: https://bugs.gentoo.org/896366 +AUTHOR: jinqiang zhang <peeweep@0x0.ee> + +As sqlite 3.41.0 release note say: + + The double-quoted string misfeature is now disabled by default for CLI + builds. Legacy use cases can reenable the misfeature at run-time using + the ".dbconfig dqs_dml on" and ".dbconfig dqs_ddl on" commands. + +We should change this double quote to single quote + +--- a/data/db/english/english.awk ++++ b/data/db/english/english.awk +@@ -16,7 +16,7 @@ BEGIN { + } + + # Insert data into english table +- { printf "INSERT INTO english (word, freq) VALUES (\"%s\", \"%f\");\n", $1, $2} ++ { printf "INSERT INTO english (word, freq) VALUES (\'%s\', %f);\n", $1, $2} + + #quit sqlite3 + END { diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild index e41e4c2243f0..1084f11c4105 100644 --- a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r4.ebuild +++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r5.ebuild @@ -1,9 +1,9 @@ -# Copyright 2008-2021 Gentoo Authors +# Copyright 2008-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -LUA_COMPAT=(lua5-1) -PYTHON_COMPAT=(python3_{8,9}) +LUA_COMPAT=( lua5-1 ) +PYTHON_COMPAT=( python3_{10..11} ) inherit autotools lua-single python-single-r1 @@ -31,7 +31,7 @@ RDEPEND="${PYTHON_DEPS} DEPEND="${RDEPEND}" BDEPEND=" dev-util/intltool - sys-devel/autoconf-archive + dev-build/autoconf-archive virtual/pkgconfig nls? ( sys-devel/gettext )" @@ -39,6 +39,7 @@ PATCHES=( "${FILESDIR}"/${PN}-boost.patch "${FILESDIR}"/${P}-content-type-method.patch "${FILESDIR}"/${P}-python3.patch + "${FILESDIR}"/${P}-sqlite-3.41.0.patch ) pkg_setup() { diff --git a/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r6.ebuild b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r6.ebuild new file mode 100644 index 000000000000..17c7102262c0 --- /dev/null +++ b/app-i18n/ibus-pinyin/ibus-pinyin-1.5.0-r6.ebuild @@ -0,0 +1,64 @@ +# Copyright 2008-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +LUA_COMPAT=( lua5-1 ) +PYTHON_COMPAT=( python3_{10..11} ) + +inherit autotools lua-single python-single-r1 + +DESCRIPTION="Chinese Pinyin and Bopomofo engines for IBus" +HOMEPAGE="https://github.com/ibus/ibus-pinyin" +SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ibus/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="boost lua nls" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + lua? ( ${LUA_REQUIRED_USE} )" + +RDEPEND="${PYTHON_DEPS} + app-i18n/pyzy + dev-db/sqlite:3 + $(python_gen_cond_dep ' + app-i18n/ibus[python(+),${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + ') + boost? ( dev-libs/boost ) + lua? ( ${LUA_DEPS} ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/intltool + dev-build/autoconf-archive + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}"/${PN}-boost.patch + "${FILESDIR}"/${P}-content-type-method.patch + "${FILESDIR}"/${P}-python3.patch + "${FILESDIR}"/${P}-sqlite-3.41.0.patch + "${FILESDIR}"/${P}-gettext.patch #905906 +) + +pkg_setup() { + python-single-r1_pkg_setup + + if use lua; then + lua-single_pkg_setup + fi +} + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable boost) \ + $(use_enable lua lua-extension) \ + $(use_enable nls) +} diff --git a/app-i18n/ibus-pinyin/metadata.xml b/app-i18n/ibus-pinyin/metadata.xml index c80f82c2f173..71fb0d525cee 100644 --- a/app-i18n/ibus-pinyin/metadata.xml +++ b/app-i18n/ibus-pinyin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>dlan@gentoo.org</email> diff --git a/app-i18n/ibus-rime/Manifest b/app-i18n/ibus-rime/Manifest index a82f6d108aa0..16cefd8c8726 100644 --- a/app-i18n/ibus-rime/Manifest +++ b/app-i18n/ibus-rime/Manifest @@ -1,2 +1 @@ -DIST ibus-rime-1.4.0.tar.gz 34176 BLAKE2B 69d0392adc78b2b8935f2239c4567d001d3636d0e8ff59aca0b04b3189751a3edd0350eea9e2262b3ae3e639dbd9715c157e44727cc48ba9521801161a1508f4 SHA512 3fc24f4ce390e27d37e41775e4c075c7465cd3e90a9ab61d13ec47c2ca1c2afaafb322f327e18be573aa254a43b8cf6426415500a5d817b835bf4e0615ab9145 DIST ibus-rime-1.5.0.tar.gz 35170 BLAKE2B 30cba341c3ae29438bf94fd93f030d6aa4fde3988d11b1b5e92aa4190ceac7e0776e07248cb1930819f455b378e01e3305fbf687efc997e675f23ff3120037ad SHA512 59b05efe7d5c7dd6dd88a213f05967b19f4946ad0685e29c6c87fbc47ffb3059cc16c88403cfbb945bcbf8637b20d34dcfd91d442c23bb6a9a18d60febbaf27b diff --git a/app-i18n/ibus-rime/files/ibus-rime-1.4.0-fno-common.patch b/app-i18n/ibus-rime/files/ibus-rime-1.4.0-fno-common.patch deleted file mode 100644 index f935a18ef8c3..000000000000 --- a/app-i18n/ibus-rime/files/ibus-rime-1.4.0-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/rime_settings.h -+++ b/rime_settings.h -@@ -20,7 +20,7 @@ struct IBusRimeSettings { - struct ColorSchemeDefinition* color_scheme; - }; - --struct IBusRimeSettings g_ibus_rime_settings; -+extern struct IBusRimeSettings g_ibus_rime_settings; - - void - ibus_rime_load_settings(); diff --git a/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild b/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild deleted file mode 100644 index 1a7bb058a4c0..000000000000 --- a/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Chinese Rime Input Method Engine for IBus" -HOMEPAGE="https://rime.im/ https://github.com/rime/ibus-rime" -SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" - -RDEPEND=" - app-i18n/ibus - app-i18n/librime - app-i18n/rime-data - x11-libs/libnotify" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/cmake - virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) - -src_prepare() { - sed -i \ - -e "/^libexecdir/s:/lib:/libexec:" \ - -e "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" \ - -e "s/ make/ \$(MAKE)/" Makefile || die - sed -i -e "/exec>/s:/usr/lib:${EPREFIX}/usr/libexec:" rime.xml || die - - default -} diff --git a/app-i18n/ibus-rime/ibus-rime-1.5.0.ebuild b/app-i18n/ibus-rime/ibus-rime-1.5.0.ebuild index 5de798801e46..4f8d7fb41dd3 100644 --- a/app-i18n/ibus-rime/ibus-rime-1.5.0.ebuild +++ b/app-i18n/ibus-rime/ibus-rime-1.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" RDEPEND=" app-i18n/ibus @@ -18,7 +18,7 @@ RDEPEND=" x11-libs/libnotify" DEPEND="${RDEPEND}" BDEPEND=" - dev-util/cmake + dev-build/cmake virtual/pkgconfig" src_prepare() { diff --git a/app-i18n/ibus-rime/metadata.xml b/app-i18n/ibus-rime/metadata.xml index def212007923..95149058e578 100644 --- a/app-i18n/ibus-rime/metadata.xml +++ b/app-i18n/ibus-rime/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>dlan@gentoo.org</email> diff --git a/app-i18n/ibus-skk/Manifest b/app-i18n/ibus-skk/Manifest index a9224221ad7d..a6bbd4582ab9 100644 --- a/app-i18n/ibus-skk/Manifest +++ b/app-i18n/ibus-skk/Manifest @@ -1,2 +1 @@ -DIST ibus-skk-1.4.2.tar.gz 491882 BLAKE2B 999eb9f1b36406a8d665b2c929fcdef5e57bef5c6206075333435f46774445497d6d953bc695c22f6afa5700283c32a20c2d4e9227fd30e5552f5688cd524aab SHA512 cec7fbffaa78c406f3b9502bc64e2290fec579102a37ce61cb6424c3e06d159653f165b48e09f1256f38491bce6819460c6d226cd765ab150a8dfa80e2707fe1 DIST ibus-skk-1.4.3.tar.xz 321344 BLAKE2B f761cf7c97ecf5830715a7bbae657c72d437e0be69a0867780ee574f9ea17f3d612dc5a76e3b4499fd203878702abdd2e37fdc980123a80daf5f03db7645b1f4 SHA512 c05302878f9c4b0a59daa1d285ab44501f63c0f7890149412137d3f6124fc4a7ebfe16172de311cbb5f2b9035255b5784a715a7832e6734d76e11bf19e2c9d3b diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild deleted file mode 100644 index 4717ee5c4370..000000000000 --- a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit vala - -DESCRIPTION="Japanese SKK engine for IBus" -HOMEPAGE="https://github.com/ueno/ibus-skk" -SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="nls" - -CDEPEND="app-i18n/ibus - >=app-i18n/libskk-1.0.2 - x11-libs/gtk+:3 - nls? ( virtual/libintl )" -RDEPEND="${CDEPEND} - app-i18n/skk-jisyo" -DEPEND="${CDEPEND} - $(vala_depend) - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -src_prepare() { - vala_src_prepare - default -} - -src_configure() { - econf $(use_enable nls) -} diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild index 60f705da342e..08bcec689cf0 100644 --- a/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild +++ b/app-i18n/ibus-skk/ibus-skk-1.4.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,17 +11,16 @@ SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="nls" -CDEPEND="app-i18n/ibus +DEPEND="app-i18n/ibus >=app-i18n/libskk-1.0.2 x11-libs/gtk+:3 nls? ( virtual/libintl )" -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} app-i18n/skk-jisyo" -DEPEND="${CDEPEND} - $(vala_depend) +BDEPEND="$(vala_depend) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext )" diff --git a/app-i18n/ibus-skk/metadata.xml b/app-i18n/ibus-skk/metadata.xml index 43368dedb0fe..fd9010ae1315 100644 --- a/app-i18n/ibus-skk/metadata.xml +++ b/app-i18n/ibus-skk/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest deleted file mode 100644 index ab2a2125633b..000000000000 --- a/app-i18n/ibus-sunpinyin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33 diff --git a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch deleted file mode 100644 index 25b11f0a8009..000000000000 --- a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch +++ /dev/null @@ -1,85 +0,0 @@ -https://github.com/sunpinyin/sunpinyin/issues/111 - ---- /wrapper/ibus/setup/main.py -+++ /wrapper/ibus/setup/main.py -@@ -63,7 +63,7 @@ - class Logger: - @staticmethod - def pr(message): -- print >> sys.stderr, message -+ print(message, file=sys.stderr) - - - class Option(object): -@@ -73,10 +73,10 @@ - """ - config = ibus.Bus().get_config() - __wrappers = { -- type(True): glib.Variant.new_boolean, -- type(1): glib.Variant.new_int32, -- type('str'): glib.Variant.new_string, -- type([]): glib.Variant.new_strv, -+ bool: glib.Variant.new_boolean, -+ int: glib.Variant.new_int32, -+ str: glib.Variant.new_string, -+ list: glib.Variant.new_strv, - } - - def __init__(self, name, default): -@@ -258,7 +258,7 @@ - def read_config(self): - if not self.saved_pairs: - self.saved_pairs = self.read() -- keys = set([pair.split(':')[0] for pair in self.saved_pairs]) -+ keys = {pair.split(':')[0] for pair in self.saved_pairs} - for opt in self.options: - opt.is_enabled = (opt.key() in keys) - # throw away unknown pair -@@ -445,28 +445,28 @@ - # TODO: the UI should looks like a virtual keyboard, - # user are allowed to choose the mappings to all punctuation keys. - def __init__(self): -- mappings = [MappingInfo('togglebutton1', [('`',None), ('~',u'～')]), -+ mappings = [MappingInfo('togglebutton1', [('`', None), ('~', '～')]), - MappingInfo('togglebutton2', []), -- MappingInfo('togglebutton3', [('2',None), ('@',u'ï¼ ')]), -- MappingInfo('togglebutton4', [('3',None), ('#',u'＃')]), -- MappingInfo('togglebutton5', [('4',None), ('$',u'Â¥' )]), -- MappingInfo('togglebutton6', [('5',None), ('%',u'ï¼…')]), -- MappingInfo('togglebutton7', [('6',None), ('^',u'…')]), -- MappingInfo('togglebutton8', [('7',None), ('&',u'＆')]), -- MappingInfo('togglebutton9', [('8',None), ('*',u'＊')]), -- MappingInfo('togglebutton10', [('9',None), ('*',u'（')]), -- MappingInfo('togglebutton11', [('0',None), ('*',u'）')]), -- MappingInfo('togglebutton12', [('-',u'ï¼'), ('_',u'——')]), -- MappingInfo('togglebutton13', [('=',u'ï¼'), ('+',u'＋')]), -- MappingInfo('togglebutton14', [('\\',None), ('|',u'‖')]), -- MappingInfo('togglebutton27', [('[',u'〔'), ('{',u'ï½›')]), -- MappingInfo('togglebutton28', [(']',u'〕'), ('}',u'ï½')]), -+ MappingInfo('togglebutton3', [('2', None), ('@', 'ï¼ ')]), -+ MappingInfo('togglebutton4', [('3', None), ('#', '＃')]), -+ MappingInfo('togglebutton5', [('4', None), ('$', 'Â¥' )]), -+ MappingInfo('togglebutton6', [('5', None), ('%', 'ï¼…')]), -+ MappingInfo('togglebutton7', [('6', None), ('^', '…')]), -+ MappingInfo('togglebutton8', [('7', None), ('&', '＆')]), -+ MappingInfo('togglebutton9', [('8', None), ('*', '＊')]), -+ MappingInfo('togglebutton10', [('9', None), ('*', '（')]), -+ MappingInfo('togglebutton11', [('0', None), ('*', '）')]), -+ MappingInfo('togglebutton12', [('-', 'ï¼'), ('_', '——')]), -+ MappingInfo('togglebutton13', [('=', 'ï¼'), ('+', '＋')]), -+ MappingInfo('togglebutton14', [('\\', None), ('|', '‖')]), -+ MappingInfo('togglebutton27', [('[', '〔'), ('{', 'ï½›')]), -+ MappingInfo('togglebutton28', [(']', '〕'), ('}', 'ï½')]), - MappingInfo('togglebutton39', []), - MappingInfo('togglebutton40', []), -- MappingInfo('togglebutton50', [(',',None), ('<',u'〈')]), -- MappingInfo('togglebutton51', [('.',u'·'), ('>',u'〉')]), -- MappingInfo('togglebutton52', [('/',u'ï¼'), ('?',None)])] -- #'\'',(u'‘',u'’'), -+ MappingInfo('togglebutton50', [(',', None), ('<', '〈')]), -+ MappingInfo('togglebutton51', [('.', '·'), ('>', '〉')]), -+ MappingInfo('togglebutton52', [('/', 'ï¼'), ('?', None)])] -+ #'\'', ('‘', '’'), - MultiCheckDialog.__init__(self, ui_name="punctmapping", - config_name="General/PunctMapping/Mappings", - mappings=mappings, diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild deleted file mode 100644 index 119bebaa5ab6..000000000000 --- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 2009-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=(python{3_8,3_9}) - -inherit python-single-r1 scons-utils toolchain-funcs - -MY_PN="sunpinyin" -MY_P="${MY_PN}-${PV}" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin" -elif [[ "${PV}" == *_pre* ]]; then - SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf" -fi - -DESCRIPTION="Chinese SunPinyin engine for IBus" -HOMEPAGE="https://github.com/sunpinyin/sunpinyin" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -elif [[ "${PV}" == *_pre* ]]; then - SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${MY_P}.tar.gz" -else - SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/v${PV/_/-}.tar.gz -> ${MY_P}.tar.gz" -fi - -LICENSE="|| ( CDDL LGPL-2.1 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+gui" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND="sys-devel/gettext - virtual/pkgconfig" -DEPEND="app-i18n/ibus - ~app-i18n/sunpinyin-${PV} - dev-libs/glib:2 - virtual/libintl" -RDEPEND="${DEPEND} - app-i18n/sunpinyin-data - gui? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - app-i18n/ibus[introspection,python,${PYTHON_USEDEP}] - dev-python/pygobject[${PYTHON_USEDEP}] - ') - x11-libs/gtk+:3[introspection] - )" - -if [[ "${PV}" == *_pre* ]]; then - S="${WORKDIR}/${MY_PN}-${SUNPINYIN_GIT_REVISION}" -elif [[ "${PV}" != "9999" ]]; then - S="${WORKDIR}/${MY_PN}-${PV/_/-}" -fi - -PATCHES=( - "${FILESDIR}/${PN}-2.0.4_pre20200306162733-python-3.patch" -) - -src_prepare() { - default - sed -e "/^exec python /s/python/${EPYTHON}/" -i wrapper/ibus/setup/ibus-setup-sunpinyin.in || die - - if ! use gui; then - sed \ - -e "s:'setup/ibus-setup-sunpinyin'::" \ - -e "/env\.Alias('install-libexec'/s:, setup_target::" \ - -i wrapper/ibus/SConstruct || die - fi -} - -src_configure() { - tc-export CXX -} - -src_compile() { - escons -C wrapper/ibus \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --libexecdir="${EPREFIX}/usr/libexec" \ - --datadir="${EPREFIX}/usr/share" -} - -src_install() { - escons -C wrapper/ibus --install-sandbox="${D}" install -} diff --git a/app-i18n/ibus-sunpinyin/metadata.xml b/app-i18n/ibus-sunpinyin/metadata.xml deleted file mode 100644 index db1b8135a9fd..000000000000 --- a/app-i18n/ibus-sunpinyin/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <use> - <flag name="gui">Install graphical user interface tool (ibus-setup-sunpinyin)</flag> - </use> - <upstream> - <remote-id type="github">sunpinyin/sunpinyin</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-i18n/ibus-table-chinese/Manifest b/app-i18n/ibus-table-chinese/Manifest index 6b391e744de3..bc0febf88c56 100644 --- a/app-i18n/ibus-table-chinese/Manifest +++ b/app-i18n/ibus-table-chinese/Manifest @@ -1,2 +1 @@ -DIST ibus-table-chinese-1.8.2.tar.gz 10576111 BLAKE2B a80fa9c4780207efefba1118ee9dacc33dba4136b916a24971198b3325bf1b26f86cd4586db994db6dfaa85fffe087b021673d056b10df61c5f95ede4e967cd6 SHA512 30fd1c7ee8416cd62d8e26bc2646a667ac45c4579a7cb191c77e80fecccbc576c34f33ec0b5c55669c073a633298cfda1711e4b9d89a9ef8f6146acdc0167c1a DIST ibus-table-chinese-1.8.3.tar.gz 10824912 BLAKE2B e9f4e377a794827196e04e197044b3fdcd81d84ed89067e17745879495df69cc6e95814863f856cc0a7b7db0aba3cbd93d1c1d172f607fdd410dbed02dc4ad54 SHA512 610455343d9c9bf6577c7fd7aef9435c339c2f23c4d5f7ae2cbbc2366a9eb6a8a124e86621387497cc624e3276bf739b55602355ad41c4127f45f6d85cc5b4dc diff --git a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild deleted file mode 100644 index 193cb2396567..000000000000 --- a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -CMAKE_IN_SOURCE_BUILD="1" -CMAKE_MAKEFILE_GENERATOR="emake" - -inherit cmake - -DESCRIPTION="Chinese tables for IBus-Table" -HOMEPAGE="https://github.com/definite/ibus-table-chinese" -SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="app-i18n/ibus-table" -DEPEND="${RDEPEND} - dev-util/cmake-fedora" - -src_configure() { - local mycmakeargs=( - -DCMAKE_FEDORA_TMP_DIR="${T}" - -DDATA_DIR="${EPREFIX}"/usr/share - -DMANAGE_DEPENDENCY_PACKAGE_EXISTS_CMD=false - -DPRJ_DOC_DIR="${EPREFIX}"/usr/share/doc/${PF} - ) - cmake_src_configure -} diff --git a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild index a34f0e609639..fbc06ebdafa4 100644 --- a/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild +++ b/app-i18n/ibus-table-chinese/ibus-table-chinese-1.8.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -13,12 +13,12 @@ SRC_URI="https://github.com/definite/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RDEPEND="app-i18n/ibus-table" DEPEND="${RDEPEND} - dev-util/cmake-fedora" + dev-build/cmake-fedora" src_configure() { local mycmakeargs=( diff --git a/app-i18n/ibus-table-chinese/metadata.xml b/app-i18n/ibus-table-chinese/metadata.xml index e5db64701f35..fd5e2e31d9e2 100644 --- a/app-i18n/ibus-table-chinese/metadata.xml +++ b/app-i18n/ibus-table-chinese/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/ibus-table-extraphrase/metadata.xml b/app-i18n/ibus-table-extraphrase/metadata.xml index 13ee2c91ec75..6b9c941c189f 100644 --- a/app-i18n/ibus-table-extraphrase/metadata.xml +++ b/app-i18n/ibus-table-extraphrase/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/ibus-table-latin/metadata.xml b/app-i18n/ibus-table-latin/metadata.xml index 13ee2c91ec75..6b9c941c189f 100644 --- a/app-i18n/ibus-table-latin/metadata.xml +++ b/app-i18n/ibus-table-latin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/ibus-table-others/Manifest b/app-i18n/ibus-table-others/Manifest index 966697138213..37492fc52ea6 100644 --- a/app-i18n/ibus-table-others/Manifest +++ b/app-i18n/ibus-table-others/Manifest @@ -1,2 +1 @@ -DIST ibus-table-others-1.3.11.tar.gz 662398 BLAKE2B a600535b51b731c482eeecb78b8bff6ca14795e411348ed0e2cd4207ad1a89aed7d338c6b706695dd734f405ee5203e23dfffa370cae12ad763eabf6bbdfe848 SHA512 bfa17338e3a6a3e392bb3e5e5736af9bfa5584a897aea4ca72aec0df2c84dc94a0737f8fb87ced382e6acac3f8169ed2aef93a2f94330a4829048d009cb96ee0 -DIST ibus-table-others-1.3.9.tar.gz 627253 BLAKE2B b4c72ead9364945a3f15a348aa14e0886ebc7c7fd35448d573540ffd9510139630ac22228229ee1a37687e01179a0ec880ce170e84a196b0defe5c059b662583 SHA512 4557ba981a00035226b6cbe0d97ae14df275d3e7c5c453097b85e433a524e00efeebe508621495e63d6ff9cdd590f9d54b51a143147b83e1e3748f05b03d2019 +DIST ibus-table-others-1.3.17.tar.gz 679127 BLAKE2B 314003ff7f58fe7e265da32ba0aa1e9004d9029c6bf73f9c7570eb5a96775d9c7c5cae0d9d2b9261998d960695b09fe13b34bcee0291d6f3c04cea437ae1cf1b SHA512 6b1c58693954fa7ebee941f674b24c0c25e3146cbdf0539816b2348c4c2e316cdc4aa173fa2f56a928b052f42d7ca2212dc8c849e49146c0b7b4758a15470ec3 diff --git a/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild b/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild deleted file mode 100644 index 9a293c70f8c3..000000000000 --- a/app-i18n/ibus-table-others/ibus-table-others-1.3.11.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="Various tables for IBus-Table" -HOMEPAGE="https://github.com/moebiuscurve/ibus-table-others" -SRC_URI="https://github.com/moebiuscurve/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="app-i18n/ibus-table - !app-i18n/ibus-table-code - !app-i18n/ibus-table-cyrillic - !app-i18n/ibus-table-latin - !app-i18n/ibus-table-tv" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" diff --git a/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild b/app-i18n/ibus-table-others/ibus-table-others-1.3.17.ebuild index c2f63c11cdbc..02c15aee3b1d 100644 --- a/app-i18n/ibus-table-others/ibus-table-others-1.3.9.ebuild +++ b/app-i18n/ibus-table-others/ibus-table-others-1.3.17.ebuild @@ -1,7 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" + +inherit autotools DESCRIPTION="Various tables for IBus-Table" HOMEPAGE="https://github.com/moebiuscurve/ibus-table-others" @@ -19,3 +21,10 @@ RDEPEND="app-i18n/ibus-table !app-i18n/ibus-table-tv" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" + +src_prepare() { + sed -i '/AM_PATH_PYTHON/d' configure.ac + + default + eautoreconf +} diff --git a/app-i18n/ibus-table-others/metadata.xml b/app-i18n/ibus-table-others/metadata.xml index 1c7ec141883e..5fa4487f4e2d 100644 --- a/app-i18n/ibus-table-others/metadata.xml +++ b/app-i18n/ibus-table-others/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest index 6d56bd2cca98..3bccb11c2448 100644 --- a/app-i18n/ibus-table/Manifest +++ b/app-i18n/ibus-table/Manifest @@ -1,2 +1 @@ -DIST ibus-table-1.13.3.tar.gz 1408143 BLAKE2B fda380e284a996d34053f6bae543ebc2c072ffbd870a9421b76f18a3fa5e45ca6e687818f40bd1335791f1b92dc7ffa1ccc35c7cb55d1a6ade26bc958a2bf8d4 SHA512 2959b2f96c9a490032dafbce2b4164fcc07797ab73e735f26003156a891e1e3760e6a4f42713084b5ce1e408cbe21c3060d99615d898fe50b8d51405dcd42a3b -DIST ibus-table-1.14.0.tar.gz 1450310 BLAKE2B 72a655e378b39324ff849e6941dc28920760d030d748a5b4b0899e14b94874a52581d03ccbef2d72c5eaae51d20a0e19690bde5a1411960347fe49cf3137d21b SHA512 60e570b82c4f05200410e9e4e155089223a20ebcf66d1c039a783108005f63699e75bc528fc30cd370c1400b65e765ade0d069184bd2ab81e2eda9bade2e8ac9 +DIST ibus-table-1.17.4.tar.gz 1559267 BLAKE2B c3c48dcebc345e658a2e6a10b13f1a0312c2e906de0bd78ee0fcbe97379663b21c6f0dbe45d029343faea340f2d031937c6f41c2a113009b60e75d108b884244 SHA512 fde595635cf50e40657b394f61173360cd9f67aa212459f14d96e08805deb164931dddd564201653a85a2973b2e6429bd2683af96974c7cee5dae3067833efd3 diff --git a/app-i18n/ibus-table/ibus-table-1.14.0.ebuild b/app-i18n/ibus-table/ibus-table-1.14.0.ebuild deleted file mode 100644 index ff60ef200c5d..000000000000 --- a/app-i18n/ibus-table/ibus-table-1.14.0.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{8,9} ) -PYTHON_REQ_USE="sqlite(+)" - -inherit gnome2-utils python-single-r1 xdg - -DESCRIPTION="Tables engines for IBus" -HOMEPAGE="https://github.com/ibus/ibus/wiki" -SRC_URI="https://github.com/kaio/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls" -RESTRICT="test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - app-i18n/ibus[python(+),${PYTHON_USEDEP}] - dev-python/pygobject:3[${PYTHON_USEDEP}] - ') - virtual/libiconv - nls? ( virtual/libintl )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig - nls? ( sys-devel/gettext )" - -src_prepare() { - python_fix_shebang . - - default -} - -src_configure() { - econf $(use_enable nls) -} - -pkg_preinst() { - xdg_pkg_preinst - gnome2_schemas_savelist -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/app-i18n/ibus-table/ibus-table-1.13.3.ebuild b/app-i18n/ibus-table/ibus-table-1.17.4.ebuild index 98017235346d..65ace9b39f9b 100644 --- a/app-i18n/ibus-table/ibus-table-1.13.3.ebuild +++ b/app-i18n/ibus-table/ibus-table-1.17.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=( python3_{8,9} ) +EAPI="8" +PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="sqlite(+)" inherit gnome2-utils python-single-r1 xdg diff --git a/app-i18n/ibus-table/metadata.xml b/app-i18n/ibus-table/metadata.xml index 2d1e1c6bebf7..0b2f8235909f 100644 --- a/app-i18n/ibus-table/metadata.xml +++ b/app-i18n/ibus-table/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest index d96e7b1ba974..5224b804f609 100644 --- a/app-i18n/ibus-typing-booster/Manifest +++ b/app-i18n/ibus-typing-booster/Manifest @@ -1,2 +1,4 @@ -DIST ibus-typing-booster-2.10.5.tar.gz 9448121 BLAKE2B 32e332df5e68a81c4f86df298389bb1fd9daf97b1f281bdc150183bd939a97021540aa81db5fa94ee3890c9b9a031a8eb75241da3716763ed6262fc5d5b3fb9d SHA512 f3bc5536874227b5482e46a097ac634a522651b3d200b33207705f5b1d87b8894dd962e19c389281fa5f32c1edbf3186dbfba12d718cbc6fa159d648bc622bf6 -DIST ibus-typing-booster-2.11.5.tar.gz 9485824 BLAKE2B 41d9aa2ba310e2db725e7809a67988fa69fee117b560d945a3cd935e7b2bbc372f448a531ed4ebd2a131dc1ffe3cb7d86b7d10fdbce56a2e241157f08a84ca69 SHA512 a30c81903b3d99f23a606f7f083615283ba64a0e62ac54183327447c33f6f7212472742036634522d36776a45ac72ce7874bcada624361f930785e2823652f0c +DIST ibus-typing-booster-2.25.3.tar.gz 12388617 BLAKE2B 44cbaa162ac76fb36f37117ebf0aa49b390dde89214ecac423e55a1a16b41df30ffd02039534e9873d54616ca68cca363c238429beb08cab1cc2955748a0b96c SHA512 df1ff9cd939c7fb72c616b239a5526060ab6840bae2c01c9e6ce338ac28cea0d4f525632f138e226b12ff6389574996fc523fe1722917db9f73d395927db9a4c +DIST ibus-typing-booster-2.25.4.tar.gz 12388721 BLAKE2B 3cce75d2524d2b1467d3feb7a0b2067309b88a6b070238f7e7524e426d9556e7624b15c3ff775280abb332ab899ef81fcdc0764e6a61e519947139a5aefc66b4 SHA512 f84111db28d84aa9888b2085ef1351e86c330479c65cf4ff64d87d36001093125c864460a3cb9084ecb430561556f2cf339ee0965a5025c8177a54fec67f4982 +DIST ibus-typing-booster-2.25.6.tar.gz 12390887 BLAKE2B 5c0813e16829073e1066117fdf03c2fb713854572e5905f71cb98d51b1f172c8fbd7054fa38c08db7c1e82e1c779258b2934d95508db4914d9e15ade25f61b64 SHA512 212acfc9dcb9d9f3f4405dcfd5e35cf0fec48e41d74539a2a7f9a2b8eb2a1fa6b62919c12b7bbedb9f5ae4904fe463aee2c9801d59eec1389706489e485c54f9 +DIST ibus-typing-booster-2.25.7.tar.gz 12389694 BLAKE2B 192618e366b53849e94281ea4d9b98356f820ed6594dcd9ec1c4ddbfacf06d161fe44b4f37c19b3d007515c858b100a2f8b8fd6beb51088a668f269c86feadc6 SHA512 9603b99293e596c958aa2d21e8f0d78b06c6873769b2206c8f5bc225993d53e6af51d493d664d51b8632550e996f714a9ebf0c4ff8f914cd11b4119ac7570203 diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.5.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.3.ebuild index 60292db609e9..0cb560b41e30 100644 --- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.5.ebuild +++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=( python3_{8,9} ) +EAPI="8" +PYTHON_COMPAT=( python3_{9..12} ) PYTHON_REQ_USE="sqlite(+)" inherit gnome2-utils python-single-r1 xdg @@ -32,6 +32,12 @@ RDEPEND="${DEPEND} BDEPEND="sys-devel/gettext virtual/pkgconfig" +src_prepare() { + default + + sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in +} + pkg_preinst() { xdg_pkg_preinst gnome2_schemas_savelist diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.11.5.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.4.ebuild index 4e8cb0ffc7f7..95f8e650235b 100644 --- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.11.5.ebuild +++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=( python3_{8,9} ) +EAPI="8" +PYTHON_COMPAT=( python3_{9..12} ) PYTHON_REQ_USE="sqlite(+)" inherit gnome2-utils python-single-r1 xdg @@ -32,6 +32,12 @@ RDEPEND="${DEPEND} BDEPEND="sys-devel/gettext virtual/pkgconfig" +src_prepare() { + default + + sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in +} + pkg_preinst() { xdg_pkg_preinst gnome2_schemas_savelist diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.6.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.6.ebuild new file mode 100644 index 000000000000..95f8e650235b --- /dev/null +++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.6.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_REQ_USE="sqlite(+)" + +inherit gnome2-utils python-single-r1 xdg + +DESCRIPTION="Completion input method for IBus" +HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster" +SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +RESTRICT="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + dev-libs/m17n-lib + $(python_gen_cond_dep ' + app-i18n/ibus[python(+),${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pyenchant[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + ')" +RDEPEND="${DEPEND} + >=dev-db/m17n-db-1.7" +BDEPEND="sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + default + + sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in +} + +pkg_preinst() { + xdg_pkg_preinst + gnome2_schemas_savelist +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.7.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.7.ebuild new file mode 100644 index 000000000000..95f8e650235b --- /dev/null +++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.25.7.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" +PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_REQ_USE="sqlite(+)" + +inherit gnome2-utils python-single-r1 xdg + +DESCRIPTION="Completion input method for IBus" +HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster" +SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +RESTRICT="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS} + dev-libs/m17n-lib + $(python_gen_cond_dep ' + app-i18n/ibus[python(+),${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-python/pyenchant[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pyxdg[${PYTHON_USEDEP}] + ')" +RDEPEND="${DEPEND} + >=dev-db/m17n-db-1.7" +BDEPEND="sys-devel/gettext + virtual/pkgconfig" + +src_prepare() { + default + + sed -i "s|/usr\(/bin/sh\)|\1|" {engine,setup}/*.in +} + +pkg_preinst() { + xdg_pkg_preinst + gnome2_schemas_savelist +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update +} diff --git a/app-i18n/ibus-typing-booster/metadata.xml b/app-i18n/ibus-typing-booster/metadata.xml index e1a49f498885..293189c63481 100644 --- a/app-i18n/ibus-typing-booster/metadata.xml +++ b/app-i18n/ibus-typing-booster/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <upstream> + <remote-id type="github">mike-fabian/ibus-typing-booster</remote-id> + </upstream> </pkgmetadata> diff --git a/app-i18n/ibus-unikey/Manifest b/app-i18n/ibus-unikey/Manifest index 9c7ca4b1f1ea..3cff7a2ea577 100644 --- a/app-i18n/ibus-unikey/Manifest +++ b/app-i18n/ibus-unikey/Manifest @@ -1,2 +1 @@ -DIST ibus-unikey-0.6.1-gcc6.patch 31686 BLAKE2B 5d04ba5e66b1a128a04d23e73e20a8e6a269240a07604e71f3e232e0087f0a47d9a4ff6aeaa10a001c5be9b113d8cdc2a917ecc5084d576d6f918b4c699f2ab3 SHA512 9e1b172a904076ba817c7bab80cbbf7d736c078d3ea285cb946be23552ff0f571ca8e0187cac4e5bfecc2b0032512d6f09af4435056d6b653a3648d07356d9b2 -DIST ibus-unikey-0.6.1.tar.gz 516250 BLAKE2B edb5e46df983fe54ce84f778a23814ae946c6ace772d262a06f473013b84d87d3b1293e7faa62f070763ea837eccc08dfde51cf4b23353e84ac1ceca79a44d80 SHA512 f8d519802d9b304cdaebfcee3f9fef5f17756cde48aa48b9dd357d714e2eaaba0df8f91218b658fdd1d85343804e054b7987caff2734913b29dc76263c30d4e6 +DIST ibus-unikey-0.7.0_beta1.tar.gz 90086 BLAKE2B 450968ce10d5a455a9014cbd2cd9e6cbfbf559ae354dca8ca02b3a010edba4ff56caef7d79d5d80becbc51436e2192a8f9be5e936b606bae8ac65d003431188f SHA512 5e0bc188fe720014071c1c563c7bd3e92bc9e00d063c5c0647a9277fe3e05cb6c00a0aabb33e44ac5d31274f0fb03f495107195432bd7b0a89948ed3ba43d363 diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild deleted file mode 100644 index 63c9b7f58158..000000000000 --- a/app-i18n/ibus-unikey/ibus-unikey-0.6.1-r2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Vietnamese UniKey engine for IBus" -HOMEPAGE="https://github.com/mrlequoctuan/ibus-unikey" -SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz - https://dev.gentoo.org/~dlan/distfiles/${P}-gcc6.patch" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+gtk gtk2 nls" -REQUIRED_USE="gtk2? ( gtk )" - -RDEPEND="app-i18n/ibus - x11-libs/libX11 - gtk? ( - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3 ) - ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/intltool - nls? ( sys-devel/gettext )" - -PATCHES=( "${DISTDIR}"/${P}-gcc6.patch ) - -src_configure() { - econf \ - $(use_enable nls) \ - --with-gtk-version=$(usex gtk2 3 2) -} diff --git a/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild b/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild new file mode 100644 index 000000000000..7a1e8a57f140 --- /dev/null +++ b/app-i18n/ibus-unikey/ibus-unikey-0.7.0_beta1.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit cmake gnome2-utils + +DESCRIPTION="Vietnamese UniKey engine for IBus" +HOMEPAGE="https://github.com/vn-input/ibus-unikey" +SRC_URI="https://github.com/vn-input/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND="app-i18n/ibus + x11-libs/gtk+:3 + virtual/libintl" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + sys-devel/gettext" +S="${WORKDIR}/${P/_/-}" + +src_configure() { + local mycmakeargs=( + -DGSETTINGS_COMPILE=OFF + ) + cmake_src_configure +} + +pkg_preinst() { + gnome2_schemas_savelist +} + +pkg_postinst() { + gnome2_schemas_update +} + +pkg_postrm() { + gnome2_schemas_update +} diff --git a/app-i18n/ibus-unikey/metadata.xml b/app-i18n/ibus-unikey/metadata.xml index 880cfde265eb..f0eec6b726a9 100644 --- a/app-i18n/ibus-unikey/metadata.xml +++ b/app-i18n/ibus-unikey/metadata.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <longdescription lang="en"> - The UniKey engine for IBus. It provides a Vietnamese input method using - UniKey. Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85 - </longdescription> - <use> - <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag> - </use> - <upstream> - <remote-id type="github">mrlequoctuan/ibus-unikey</remote-id> - </upstream> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <longdescription lang="en"> + The UniKey engine for IBus. It provides a Vietnamese input method using + UniKey. Support via forum at: http://forum.ubuntu-vn.com/viewforum.php?f=85 + </longdescription> + <upstream> + <remote-id type="github">vn-input/ibus-unikey</remote-id> + </upstream> </pkgmetadata> diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest index d855d77a1a0d..3fd054db1f2c 100644 --- a/app-i18n/ibus/Manifest +++ b/app-i18n/ibus/Manifest @@ -1,4 +1,3 @@ -DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2 SHA512 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d -DIST ibus-1.5.23-gentoo-patches-1.tar.xz 1596 BLAKE2B 5a2c084cb25cb35d16eba8e6953c1ffc249875ab11485a675497f04a4366ea3fe216bab3407f390a0330f4f17cf5a70a43547160cc9c29a6b14890fcb7867456 SHA512 a1c2a77dbc4185c3658c36b998c9d925fff2bbeb9bc5fde5c74c62081056f134875d557ba0b4af7b06d56f004975889f453adea623541d3bfff2c391912efa05 -DIST ibus-1.5.23.tar.gz 3557661 BLAKE2B 4cfb3287c80d46e55090d4f361dd977f4be5988a8b7ffc24755954090dc25021ea6cbb6798769494e6cd70267aac6daa238fdc7cf4156296d93f79f325a18ac4 SHA512 4ea66d0a7203d665fb5c90e59ddf294614feeafc4f06b10e35989671a9bf39d5977e9061b9be224cd5a9439ac2f697a4326ff221ae868f5ebed46cbb09e9a205 -DIST ibus-1.5.24.tar.gz 3614372 BLAKE2B 4b851ed9dc8283bf58957adfd5dd4bf7da8b019f95055dbbf7fa157502b3dcc11d561881ff6afa5db0b83b4e7d82f3bd228cd0e21ff77cb81b1eaca246deb135 SHA512 25f34a51a5c85352e61699ca36bf7ddb9b486b28d71e15ce3a52b78bc9db2f8cb558049e0652fdc5431215a5f826fcb5a7d5e44f0de9a2ff746aaf60672e2f22 +DIST ibus-1.5.27.tar.gz 3779541 BLAKE2B e98f775cd62036ae02dafd984933343e99390a6a1e77b672feb4bc00dd1d423126227bded2d22b8bc9fa214e572ea906c407658de8ee20e036f8753836d68f46 SHA512 b5f3ae555d19eb780a416383e6351ed2cd8834fcc2bc4ebe4f4a194fc934dd055c5e782f9ec382fb21e1e2103c5409804174a79d192b5494a9018ce9081305e4 +DIST ibus-1.5.29-rc1.tar.gz 3989492 BLAKE2B c99f42fcd18bed240bf5e9f5b406bc879b05b12f3d0c14713e21b8c99fbcde32cd880dead1374731914289c022b1f160d9961bdbd9e9a0a3ced86949c5beb811 SHA512 776a01bcfd730be67e0f7d730f7b4b0a586d39744deb605359330a1786542acae52efbc085c39b8417b20164e45c259b40b29725f53fb1b69e2b340778ff28dc +DIST ibus-1.5.29-rc2.tar.gz 3991416 BLAKE2B c185c0cf8af79a80ee04f414e13c4b58bd2f18891851d2f018713848b3bc0fe0516c8c0cf8f64204040f10b6b4a5304c8be6305449d7290b5d08412246d3af40 SHA512 47dd39c9615783b6c157a25e8a2506dc2e1f440d56aa649ee8cb95a390cb4efab9c95e72ac84b5d042c25e350599b4d352ddc66f1385af6660d4a7a296e44ca7 diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild deleted file mode 100644 index 27e19d610f9f..000000000000 --- a/app-i18n/ibus/ibus-1.5.22.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) -VALA_MIN_API_VERSION="0.34" -VALA_MAX_API_VERSION="0.48" -VALA_USE_DEPEND="vapigen" - -inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils - -DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" -HOMEPAGE="https://github.com/ibus/ibus/wiki" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" -IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE="emoji? ( gtk ) - gtk2? ( gtk ) - kde? ( gtk ) - python? ( - ${PYTHON_REQUIRED_USE} - introspection - ) - test? ( gtk ) - vala? ( introspection )" - -CDEPEND="app-text/iso-codes - dev-libs/glib:2 - gnome-base/dconf - gnome-base/librsvg:2 - sys-apps/dbus[X?] - X? ( - x11-libs/libX11 - !gtk? ( x11-libs/gtk+:2 ) - ) - gtk? ( - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXi - gtk2? ( x11-libs/gtk+:2 ) - ) - introspection? ( dev-libs/gobject-introspection ) - kde? ( dev-qt/qtgui:5 ) - nls? ( virtual/libintl ) - python? ( - ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] - ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - )" -RDEPEND="${CDEPEND} - python? ( - gtk? ( - x11-libs/gtk+:3[introspection] - ) - )" -DEPEND="${CDEPEND} - $(vala_depend) - dev-util/glib-utils - virtual/pkgconfig - emoji? ( - app-i18n/unicode-cldr - app-i18n/unicode-emoji - ) - nls? ( sys-devel/gettext ) - unicode? ( app-i18n/unicode-data )" - -src_prepare() { - vala_src_prepare --ignore-use - sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac - if ! has_version 'x11-libs/gtk+:3[wayland]'; then - touch ui/gtk3/panelbinding.vala - fi - if ! use emoji; then - touch \ - tools/main.vala \ - ui/gtk3/panel.vala - fi - if ! use kde; then - touch ui/gtk3/panel.vala - fi - - # for multiple Python implementations - sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am - # fix for parallel install - sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am - # require user interaction - sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am - - sed -i "/^bash_completion/d" tools/Makefile.am - - default - eautoreconf - xdg_environment_reset -} - -src_configure() { - local unicodedir="${EPREFIX}"/usr/share/unicode - local python_conf=() - if use python; then - python_setup - python_conf+=( - $(use_enable gtk setup) - --with-python=${EPYTHON} - ) - else - python_conf+=( --disable-setup ) - fi - - econf \ - $(use_enable X xim) \ - $(use_enable emoji emoji-dict) \ - $(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \ - $(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \ - $(use_enable gtk gtk3) \ - $(use_enable gtk ui) \ - $(use_enable gtk2) \ - $(use_enable introspection) \ - $(use_enable kde appindicator) \ - $(use_enable nls) \ - $(use_enable test tests) \ - $(use_enable unicode unicode-dict) \ - $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \ - $(use_enable vala) \ - $(use_enable wayland) \ - "${python_conf[@]}" -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - virtx emake -j1 check -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - - if use python; then - python_install() { - emake -C bindings/pygobject \ - pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \ - DESTDIR="${D}" \ - install - - python_optimize - } - python_foreach_impl python_install - fi - - keepdir /usr/share/ibus/engine - - newbashcomp tools/${PN}.bash ${PN} - - insinto /etc/X11/xinit/xinput.d - newins xinput-${PN} ${PN}.conf - - # Undo compression of man page - find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die -} - -pkg_postinst() { - use gtk && gnome2_query_immodules_gtk3 - use gtk2 && gnome2_query_immodules_gtk2 - xdg_icon_cache_update - gnome2_schemas_update - dconf update -} - -pkg_postrm() { - use gtk && gnome2_query_immodules_gtk3 - use gtk2 && gnome2_query_immodules_gtk2 - xdg_icon_cache_update - gnome2_schemas_update -} diff --git a/app-i18n/ibus/ibus-1.5.23.ebuild b/app-i18n/ibus/ibus-1.5.23.ebuild deleted file mode 100644 index d53729503b59..000000000000 --- a/app-i18n/ibus/ibus-1.5.23.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) -VALA_MIN_API_VERSION="0.34" -VALA_MAX_API_VERSION="0.50" -VALA_USE_DEPEND="vapigen" - -inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils - -GENTOO_VER=1 -DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" -HOMEPAGE="https://github.com/ibus/ibus/wiki" - -[[ -n ${GENTOO_VER} ]] && \ - GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz - ${GENTOO_PATCHSET_URI}" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE="emoji? ( gtk ) - gtk2? ( gtk ) - kde? ( gtk ) - python? ( - ${PYTHON_REQUIRED_USE} - introspection - ) - test? ( gtk ) - vala? ( introspection )" - -CDEPEND="app-text/iso-codes - dev-libs/glib:2 - gnome-base/dconf - gnome-base/librsvg:2 - sys-apps/dbus[X?] - X? ( - x11-libs/libX11 - !gtk? ( x11-libs/gtk+:2 ) - ) - gtk? ( - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/libXi - gtk2? ( x11-libs/gtk+:2 ) - ) - introspection? ( dev-libs/gobject-introspection ) - kde? ( dev-qt/qtgui:5 ) - nls? ( virtual/libintl ) - python? ( - ${PYTHON_DEPS} - dev-python/pygobject:3[${PYTHON_USEDEP}] - ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - )" -RDEPEND="${CDEPEND} - python? ( - gtk? ( - x11-libs/gtk+:3[introspection] - ) - )" -DEPEND="${CDEPEND} - $(vala_depend) - dev-util/glib-utils - virtual/pkgconfig - emoji? ( - app-i18n/unicode-cldr - app-i18n/unicode-emoji - ) - nls? ( sys-devel/gettext ) - unicode? ( app-i18n/unicode-data )" - -src_prepare() { - vala_src_prepare --ignore-use - sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac - if ! has_version 'x11-libs/gtk+:3[wayland]'; then - touch ui/gtk3/panelbinding.vala - fi - if ! use emoji; then - touch \ - tools/main.vala \ - ui/gtk3/panel.vala - fi - if ! use kde; then - touch ui/gtk3/panel.vala - fi - if [[ -n ${GENTOO_VER} ]]; then - einfo "Try to apply Gentoo specific patch set" - eapply "${WORKDIR}"/patches-gentoo/*.patch - fi - - # for multiple Python implementations - sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am - # fix for parallel install - sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am - # require user interaction - sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am - - sed -i "/^bash_completion/d" tools/Makefile.am - - default - eautoreconf - xdg_environment_reset -} - -src_configure() { - local unicodedir="${EPREFIX}"/usr/share/unicode - local python_conf=() - if use python; then - python_setup - python_conf+=( - $(use_enable gtk setup) - --with-python=${EPYTHON} - ) - else - python_conf+=( --disable-setup ) - fi - - econf \ - $(use_enable X xim) \ - $(use_enable emoji emoji-dict) \ - $(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \ - $(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \ - $(use_enable gtk gtk3) \ - $(use_enable gtk ui) \ - $(use_enable gtk2) \ - $(use_enable introspection) \ - $(use_enable kde appindicator) \ - $(use_enable nls) \ - $(use_enable test tests) \ - $(use_enable unicode unicode-dict) \ - $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \ - $(use_enable vala) \ - $(use_enable wayland) \ - "${python_conf[@]}" -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - virtx emake -j1 check -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - - if use python; then - python_install() { - emake -C bindings/pygobject \ - pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \ - DESTDIR="${D}" \ - install - - python_optimize - } - python_foreach_impl python_install - fi - - keepdir /usr/share/ibus/engine - - newbashcomp tools/${PN}.bash ${PN} - - insinto /etc/X11/xinit/xinput.d - newins xinput-${PN} ${PN}.conf - - # Undo compression of man page - find "${ED}"/usr/share/man -type f -name '*.gz' -exec gzip -d {} \; || die -} - -pkg_postinst() { - use gtk && gnome2_query_immodules_gtk3 - use gtk2 && gnome2_query_immodules_gtk2 - xdg_icon_cache_update - gnome2_schemas_update - dconf update -} - -pkg_postrm() { - use gtk && gnome2_query_immodules_gtk3 - use gtk2 && gnome2_query_immodules_gtk2 - xdg_icon_cache_update - gnome2_schemas_update -} diff --git a/app-i18n/ibus/ibus-1.5.24.ebuild b/app-i18n/ibus/ibus-1.5.27.ebuild index ec02e75cce09..22c0f865df55 100644 --- a/app-i18n/ibus/ibus-1.5.24.ebuild +++ b/app-i18n/ibus/ibus-1.5.27.ebuild @@ -1,13 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python{3_7,3_8,3_9} ) -VALA_MIN_API_VERSION="0.34" -VALA_MAX_API_VERSION="0.50" -VALA_USE_DEPEND="vapigen" -inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils +PYTHON_COMPAT=( python3_{9..11} ) + +inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx xdg-utils GENTOO_VER= DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" @@ -20,36 +18,38 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="+X +emoji +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland" +KEYWORDS="amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland" RESTRICT="!test? ( test )" -REQUIRED_USE="emoji? ( gtk ) - gtk2? ( gtk ) - kde? ( gtk ) +REQUIRED_USE=" + appindicator? ( gtk3 ) python? ( ${PYTHON_REQUIRED_USE} introspection ) - test? ( gtk ) - vala? ( introspection )" - -CDEPEND="app-text/iso-codes - dev-libs/glib:2 + test? ( gtk3 ) + vala? ( introspection ) + X? ( gtk3 ) +" +DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.65.0:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 - !gtk? ( x11-libs/gtk+:2 ) + >=x11-libs/libXfixes-6.0.0 ) - gtk? ( - x11-libs/gtk+:3 + gtk2? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + gtk4? ( gui-libs/gtk:4 ) + gui? ( x11-libs/libX11 x11-libs/libXi - gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) - kde? ( dev-qt/qtgui:5 ) + libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) python? ( ${PYTHON_DEPS} @@ -59,14 +59,15 @@ CDEPEND="app-text/iso-codes dev-libs/wayland x11-libs/libxkbcommon )" -RDEPEND="${CDEPEND} +RDEPEND="${DEPEND} python? ( - gtk? ( + gui? ( x11-libs/gtk+:3[introspection] ) )" -DEPEND="${CDEPEND} +BDEPEND=" $(vala_depend) + dev-libs/glib:2 dev-util/glib-utils virtual/pkgconfig x11-misc/xkeyboard-config @@ -75,21 +76,23 @@ DEPEND="${CDEPEND} app-i18n/unicode-emoji ) nls? ( sys-devel/gettext ) + test? ( x11-apps/setxkbmap ) unicode? ( app-i18n/unicode-data )" src_prepare() { vala_src_prepare --ignore-use - sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac if ! has_version 'x11-libs/gtk+:3[wayland]'; then - touch ui/gtk3/panelbinding.vala + touch ui/gtk3/panelbinding.vala \ + ui/gtk3/panel.vala \ + ui/gtk3/emojierapp.vala || die fi if ! use emoji; then touch \ tools/main.vala \ - ui/gtk3/panel.vala + ui/gtk3/panel.vala || die fi - if ! use kde; then - touch ui/gtk3/panel.vala + if ! use appindicator; then + touch ui/gtk3/panel.vala || die fi if [[ -n ${GENTOO_VER} ]]; then einfo "Try to apply Gentoo specific patch set" @@ -97,13 +100,13 @@ src_prepare() { fi # for multiple Python implementations - sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am + sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die # fix for parallel install - sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am + sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die # require user interaction - sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am + sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die - sed -i "/^bash_completion/d" tools/Makefile.am + sed -i "/^bash_completion/d" tools/Makefile.am || die default eautoreconf @@ -116,30 +119,63 @@ src_configure() { if use python; then python_setup python_conf+=( - $(use_enable gtk setup) + $(use_enable gui setup) --with-python=${EPYTHON} ) else python_conf+=( --disable-setup ) fi - econf \ - $(use_enable X xim) \ - $(use_enable emoji emoji-dict) \ - $(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \ - $(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \ - $(use_enable gtk gtk3) \ - $(use_enable gtk ui) \ - $(use_enable gtk2) \ - $(use_enable introspection) \ - $(use_enable kde appindicator) \ - $(use_enable nls) \ - $(use_enable test tests) \ - $(use_enable unicode unicode-dict) \ - $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \ - $(use_enable vala) \ - $(use_enable wayland) \ + if tc-is-cross-compiler && { use emoji || use unicode; }; then + mkdir -p "${S}-build" + pushd "${S}-build" >/dev/null 2>&1 || die + ECONF_SOURCE=${S} econf_build --enable-static \ + --disable-{dconf,gtk{2,3},python-library,shared,xim} \ + ISOCODES_{CFLAG,LIB}S=-DSKIP \ + $(use_enable emoji emoji-dict) \ + $(use_enable unicode unicode-dict) \ + $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") + popd >/dev/null 2>&1 || die + fi + + local myconf=( + $(use_enable X xim) + $(use_enable appindicator) + $(use_enable emoji emoji-dict) + $(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) + $(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) + $(use_enable gtk2) + $(use_enable gtk3) + $(use_enable gtk4) + $(use_enable gui ui) + $(use_enable introspection) + $(use_enable libnotify) + $(use_enable nls) + $(use_enable systemd systemd-services) + $(use_enable test tests) + $(use_enable unicode unicode-dict) + $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") + $(use_enable vala) + $(use_enable wayland) "${python_conf[@]}" + ) + econf "${myconf[@]}" +} + +src_compile() { + if tc-is-cross-compiler && { use emoji || use unicode; }; then + emake -C "${S}-build/src" \ + $(usex emoji emoji-parser '') \ + $(usex unicode unicode-parser '') + emake -C src \ + $(usex emoji emoji-parser '') \ + $(usex unicode unicode-parser '') + cp \ + $(usex emoji "${S}-build/src/emoji-parser" '') \ + $(usex unicode "${S}-build/src/unicode-parser" '') \ + src || die + fi + emake } src_test() { @@ -149,8 +185,13 @@ src_test() { src_install() { default + # Remove la files find "${ED}" -name '*.la' -delete || die + # Remove stray python files generated by the build system + find "${ED}" -name '*.pyc' -exec rm -f {} \; || die + find "${ED}" -name '*.pyo' -exec rm -f {} \; || die + if use python; then python_install() { emake -C bindings/pygobject \ @@ -175,16 +216,16 @@ src_install() { } pkg_postinst() { - use gtk && gnome2_query_immodules_gtk3 use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 xdg_icon_cache_update gnome2_schemas_update dconf update } pkg_postrm() { - use gtk && gnome2_query_immodules_gtk3 use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 xdg_icon_cache_update gnome2_schemas_update } diff --git a/app-i18n/ibus/ibus-1.5.29.ebuild b/app-i18n/ibus/ibus-1.5.29.ebuild new file mode 100644 index 000000000000..59113f00aaf8 --- /dev/null +++ b/app-i18n/ibus/ibus-1.5.29.ebuild @@ -0,0 +1,234 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx + +DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" +HOMEPAGE="https://github.com/ibus/ibus/wiki" + +MY_PV=$(ver_rs 3 '-') +MY_PV_DERP="${MY_PV}-rc2" # Upstream retagged rc2 as the final release +GENTOO_VER= +[[ -n ${GENTOO_VER} ]] && \ + GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV_DERP}.tar.gz + ${GENTOO_PATCHSET_URI}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" +IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + appindicator? ( gtk3 ) + python? ( + ${PYTHON_REQUIRED_USE} + introspection + ) + test? ( gtk3 ) + vala? ( introspection ) + X? ( gtk3 ) +" +REQUIRED_USE+=" gtk3? ( wayland? ( introspection ) )" # bug 915359 +DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.65.0:2 + gnome-base/dconf + gnome-base/librsvg:2 + sys-apps/dbus[X?] + X? ( + x11-libs/libX11 + >=x11-libs/libXfixes-6.0.0 + ) + appindicator? ( dev-libs/libdbusmenu[gtk3?] ) + gtk2? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + gtk4? ( gui-libs/gtk:4 ) + gui? ( + x11-libs/libX11 + x11-libs/libXi + ) + introspection? ( dev-libs/gobject-introspection ) + libnotify? ( x11-libs/libnotify ) + nls? ( virtual/libintl ) + python? ( + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + ) + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + )" +RDEPEND="${DEPEND} + python? ( + gui? ( + x11-libs/gtk+:3[introspection] + ) + )" +BDEPEND=" + $(vala_depend) + dev-libs/glib:2 + dev-util/glib-utils + virtual/pkgconfig + x11-misc/xkeyboard-config + emoji? ( + app-i18n/unicode-cldr + app-i18n/unicode-emoji + ) + nls? ( sys-devel/gettext ) + test? ( x11-apps/setxkbmap ) + unicode? ( app-i18n/unicode-data )" + +S=${WORKDIR}/${PN}-${MY_PV_DERP} + +src_prepare() { + vala_setup --ignore-use + if ! has_version 'x11-libs/gtk+:3[wayland]'; then + touch ui/gtk3/panelbinding.vala \ + ui/gtk3/panel.vala \ + ui/gtk3/emojierapp.vala || die + fi + if ! use emoji; then + touch \ + tools/main.vala \ + ui/gtk3/panel.vala || die + fi + if ! use appindicator; then + touch ui/gtk3/panel.vala || die + fi + if [[ -n ${GENTOO_VER} ]]; then + einfo "Try to apply Gentoo specific patch set" + eapply "${WORKDIR}"/patches-gentoo/*.patch + fi + + # for multiple Python implementations + sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die + # fix for parallel install + sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die + # require user interaction + sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die + + sed -i "/^bash_completion/d" tools/Makefile.am || die + + default + eautoreconf + xdg_environment_reset +} + +src_configure() { + local unicodedir="${EPREFIX}"/usr/share/unicode + local python_conf=() + if use python; then + python_setup + python_conf+=( + $(use_enable gui setup) + --with-python=${EPYTHON} + ) + else + python_conf+=( --disable-setup ) + fi + + if tc-is-cross-compiler && { use emoji || use unicode; }; then + mkdir -p "${S}-build" + pushd "${S}-build" >/dev/null 2>&1 || die + ECONF_SOURCE=${S} econf_build --enable-static \ + --disable-{dconf,gtk{2,3},python-library,shared,xim} \ + ISOCODES_{CFLAG,LIB}S=-DSKIP \ + $(use_enable emoji emoji-dict) \ + $(use_enable unicode unicode-dict) \ + $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") + popd >/dev/null 2>&1 || die + fi + + local myconf=( + $(use_enable X xim) + $(use_enable appindicator) + $(use_enable emoji emoji-dict) + $(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) + $(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) + $(use_enable gtk2) + $(use_enable gtk3) + $(use_enable gtk4) + $(use_enable gui ui) + $(use_enable introspection) + $(use_enable libnotify) + $(use_enable nls) + $(use_enable systemd systemd-services) + $(use_enable test tests) + $(use_enable unicode unicode-dict) + $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") + $(use_enable vala) + $(use_enable wayland) + "${python_conf[@]}" + ) + econf "${myconf[@]}" +} + +src_compile() { + if tc-is-cross-compiler && { use emoji || use unicode; }; then + emake -C "${S}-build/src" \ + $(usex emoji emoji-parser '') \ + $(usex unicode unicode-parser '') + emake -C src \ + $(usex emoji emoji-parser '') \ + $(usex unicode unicode-parser '') + cp \ + $(usex emoji "${S}-build/src/emoji-parser" '') \ + $(usex unicode "${S}-build/src/unicode-parser" '') \ + src || die + fi + emake +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + virtx dbus-run-session emake check +} + +src_install() { + default + # Remove la files + find "${ED}" -name '*.la' -delete || die + + # Remove stray python files generated by the build system + find "${ED}" -name '*.pyc' -exec rm -f {} \; || die + find "${ED}" -name '*.pyo' -exec rm -f {} \; || die + + if use python; then + python_install() { + emake -C bindings/pygobject \ + pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \ + DESTDIR="${D}" \ + install + + python_optimize + } + python_foreach_impl python_install + fi + + keepdir /usr/share/ibus/engine + + newbashcomp tools/${PN}.bash ${PN} + + insinto /etc/X11/xinit/xinput.d + newins xinput-${PN} ${PN}.conf +} + +pkg_postinst() { + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + xdg_icon_cache_update + gnome2_schemas_update + dconf update +} + +pkg_postrm() { + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + xdg_icon_cache_update + gnome2_schemas_update +} diff --git a/app-i18n/ibus/ibus-1.5.29_rc1.ebuild b/app-i18n/ibus/ibus-1.5.29_rc1.ebuild new file mode 100644 index 000000000000..10fdab116676 --- /dev/null +++ b/app-i18n/ibus/ibus-1.5.29_rc1.ebuild @@ -0,0 +1,232 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools bash-completion-r1 gnome2-utils python-r1 toolchain-funcs vala virtualx + +DESCRIPTION="Intelligent Input Bus for Linux / Unix OS" +HOMEPAGE="https://github.com/ibus/ibus/wiki" + +MY_PV=$(ver_rs 3 '-') +GENTOO_VER= +[[ -n ${GENTOO_VER} ]] && \ + GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-gentoo-patches-${GENTOO_VER}.tar.xz" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/${MY_PV}/${PN}-${MY_PV}.tar.gz + ${GENTOO_PATCHSET_URI}" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="X appindicator +emoji gtk2 +gtk3 +gtk4 +gui +introspection libnotify nls +python systemd test +unicode vala wayland" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + appindicator? ( gtk3 ) + python? ( + ${PYTHON_REQUIRED_USE} + introspection + ) + test? ( gtk3 ) + vala? ( introspection ) + X? ( gtk3 ) +" +DEPEND=" + app-text/iso-codes + >=dev-libs/glib-2.65.0:2 + gnome-base/dconf + gnome-base/librsvg:2 + sys-apps/dbus[X?] + X? ( + x11-libs/libX11 + >=x11-libs/libXfixes-6.0.0 + ) + appindicator? ( dev-libs/libdbusmenu[gtk3?] ) + gtk2? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + gtk4? ( gui-libs/gtk:4 ) + gui? ( + x11-libs/libX11 + x11-libs/libXi + ) + introspection? ( dev-libs/gobject-introspection ) + libnotify? ( x11-libs/libnotify ) + nls? ( virtual/libintl ) + python? ( + ${PYTHON_DEPS} + dev-python/pygobject:3[${PYTHON_USEDEP}] + ) + wayland? ( + dev-libs/wayland + x11-libs/libxkbcommon + )" +RDEPEND="${DEPEND} + python? ( + gui? ( + x11-libs/gtk+:3[introspection] + ) + )" +BDEPEND=" + $(vala_depend) + dev-libs/glib:2 + dev-util/glib-utils + virtual/pkgconfig + x11-misc/xkeyboard-config + emoji? ( + app-i18n/unicode-cldr + app-i18n/unicode-emoji + ) + nls? ( sys-devel/gettext ) + test? ( x11-apps/setxkbmap ) + unicode? ( app-i18n/unicode-data )" + +S=${WORKDIR}/${PN}-${MY_PV} + +src_prepare() { + vala_setup --ignore-use + if ! has_version 'x11-libs/gtk+:3[wayland]'; then + touch ui/gtk3/panelbinding.vala \ + ui/gtk3/panel.vala \ + ui/gtk3/emojierapp.vala || die + fi + if ! use emoji; then + touch \ + tools/main.vala \ + ui/gtk3/panel.vala || die + fi + if ! use appindicator; then + touch ui/gtk3/panel.vala || die + fi + if [[ -n ${GENTOO_VER} ]]; then + einfo "Try to apply Gentoo specific patch set" + eapply "${WORKDIR}"/patches-gentoo/*.patch + fi + + # for multiple Python implementations + sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am || die + # fix for parallel install + sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am || die + # require user interaction + sed -i "/^TESTS_C += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am || die + + sed -i "/^bash_completion/d" tools/Makefile.am || die + + default + eautoreconf + xdg_environment_reset +} + +src_configure() { + local unicodedir="${EPREFIX}"/usr/share/unicode + local python_conf=() + if use python; then + python_setup + python_conf+=( + $(use_enable gui setup) + --with-python=${EPYTHON} + ) + else + python_conf+=( --disable-setup ) + fi + + if tc-is-cross-compiler && { use emoji || use unicode; }; then + mkdir -p "${S}-build" + pushd "${S}-build" >/dev/null 2>&1 || die + ECONF_SOURCE=${S} econf_build --enable-static \ + --disable-{dconf,gtk{2,3},python-library,shared,xim} \ + ISOCODES_{CFLAG,LIB}S=-DSKIP \ + $(use_enable emoji emoji-dict) \ + $(use_enable unicode unicode-dict) \ + $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") + popd >/dev/null 2>&1 || die + fi + + local myconf=( + $(use_enable X xim) + $(use_enable appindicator) + $(use_enable emoji emoji-dict) + $(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) + $(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) + $(use_enable gtk2) + $(use_enable gtk3) + $(use_enable gtk4) + $(use_enable gui ui) + $(use_enable introspection) + $(use_enable libnotify) + $(use_enable nls) + $(use_enable systemd systemd-services) + $(use_enable test tests) + $(use_enable unicode unicode-dict) + $(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") + $(use_enable vala) + $(use_enable wayland) + "${python_conf[@]}" + ) + econf "${myconf[@]}" +} + +src_compile() { + if tc-is-cross-compiler && { use emoji || use unicode; }; then + emake -C "${S}-build/src" \ + $(usex emoji emoji-parser '') \ + $(usex unicode unicode-parser '') + emake -C src \ + $(usex emoji emoji-parser '') \ + $(usex unicode unicode-parser '') + cp \ + $(usex emoji "${S}-build/src/emoji-parser" '') \ + $(usex unicode "${S}-build/src/unicode-parser" '') \ + src || die + fi + emake +} + +src_test() { + unset DBUS_SESSION_BUS_ADDRESS + virtx dbus-run-session emake check +} + +src_install() { + default + # Remove la files + find "${ED}" -name '*.la' -delete || die + + # Remove stray python files generated by the build system + find "${ED}" -name '*.pyc' -exec rm -f {} \; || die + find "${ED}" -name '*.pyo' -exec rm -f {} \; || die + + if use python; then + python_install() { + emake -C bindings/pygobject \ + pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \ + DESTDIR="${D}" \ + install + + python_optimize + } + python_foreach_impl python_install + fi + + keepdir /usr/share/ibus/engine + + newbashcomp tools/${PN}.bash ${PN} + + insinto /etc/X11/xinit/xinput.d + newins xinput-${PN} ${PN}.conf +} + +pkg_postinst() { + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + xdg_icon_cache_update + gnome2_schemas_update + dconf update +} + +pkg_postrm() { + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + xdg_icon_cache_update + gnome2_schemas_update +} diff --git a/app-i18n/ibus/metadata.xml b/app-i18n/ibus/metadata.xml index 0a198f3d1609..b94c839a675b 100644 --- a/app-i18n/ibus/metadata.xml +++ b/app-i18n/ibus/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> @@ -12,7 +12,9 @@ </longdescription> <use> <flag name="emoji">Enable support for Emoji</flag> - <flag name="gtk2">Enable support for <pkg>x11-libs/gtk+</pkg>:2</flag> + <flag name="gtk2">Enable the GTK-2 input method module</flag> + <flag name="gtk3">Enable the GTK-3 input method module</flag> + <flag name="gtk4">Enable the GTK-4 input method module</flag> <flag name="unicode">Enable support for Unicode choice</flag> </use> <upstream> diff --git a/app-i18n/im-chooser/Manifest b/app-i18n/im-chooser/Manifest index d46062a7d227..9dd759961ccf 100644 --- a/app-i18n/im-chooser/Manifest +++ b/app-i18n/im-chooser/Manifest @@ -1 +1 @@ -DIST im-chooser-1.7.0.tar.bz2 509630 BLAKE2B 4a7706509ceb19c7292a5c8cf80c8fa0b571819403f30f1fa3002927c69a83522b4de627b1d453db0ada8e662da3624edcb5f85eaf01dfa0187978f2a9b2095c SHA512 2a01488062b5a4dc1e4cd0815dda5a6bcef205dc50ed75d58836c5b46e3f86be79aac70eb5d6753e5f569ccc05015dd6d8de59029e94dc407cc613160d3ac61c +DIST im-chooser-1.7.3.tar.bz2 602217 BLAKE2B d61ad631ff40a25bffef17779b01073062bd70221b7e4ca435b896fc989f9a71036b84a5eb774abd2f42cee218932ccc7511a6056d3aa14d2cb7c262c4b45fe3 SHA512 d43088909e7ba3ad84166965877c4052aad195e360c0583dbc612b46cccd703217b57f149fa584f2f0d3fb706a8bcd6d129c5f9ca407b0a11bb6d304d4a06ef7 diff --git a/app-i18n/im-chooser/im-chooser-1.7.0.ebuild b/app-i18n/im-chooser/im-chooser-1.7.3.ebuild index cff570a150e8..41a06925b0a9 100644 --- a/app-i18n/im-chooser/im-chooser-1.7.0.ebuild +++ b/app-i18n/im-chooser/im-chooser-1.7.3.ebuild @@ -1,38 +1,36 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="8" -inherit autotools +inherit autotools xdg DESCRIPTION="Desktop Input Method configuration tool" HOMEPAGE="https://pagure.io/im-chooser" SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2" -LICENSE="GPL-2" +LICENSE="GPL-2+ LGPL-2+" SLOT="0" KEYWORDS="amd64 ~x86" -IUSE="gtk2 xfce" +IUSE="xfce" -RDEPEND="app-i18n/imsettings +RDEPEND=">=app-i18n/imsettings-1.8 virtual/libintl + x11-libs/gtk+:3 x11-libs/libSM - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3 ) xfce? ( xfce-base/libxfce4util )" -DEPEND="${RDEPEND} - dev-util/intltool - sys-devel/autoconf-archive +DEPEND="${RDEPEND}" +BDEPEND="dev-build/autoconf-archive sys-devel/gettext virtual/pkgconfig" src_prepare() { sed -i \ - -e "/PKG_CHECK_MODULES/s/\(gtk+-3\.0\)/$(usex !gtk2 '\1' _)/" \ -e "/PKG_CHECK_MODULES/s/\(libxfce4util-1\.0\)/$(usex xfce '\1' _)/" \ -e "/^GNOME_/d" \ -e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \ configure.ac + sed -i "s/Applications;//" src/app/${PN}.desktop.in.in default eautoreconf diff --git a/app-i18n/im-chooser/metadata.xml b/app-i18n/im-chooser/metadata.xml index 434bdd89ac27..1e89d4e6c916 100644 --- a/app-i18n/im-chooser/metadata.xml +++ b/app-i18n/im-chooser/metadata.xml @@ -1,18 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <longdescription lang="en"> - IM Chooser is a GUI configuration tool for IMSettings to choose Input - Method you want to use or disable it entirely on the desktop. - </longdescription> - <use> - <flag name="gtk2"> - Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3 - </flag> - <flag name="xfce">Enable support for XFCE panel</flag> - </use> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <longdescription lang="en"> + IM Chooser is a GUI configuration tool for IMSettings to choose Input + Method you want to use or disable it entirely on the desktop. + </longdescription> + <use> + <flag name="xfce">Enable support for XFCE panel</flag> + </use> </pkgmetadata> diff --git a/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch b/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch deleted file mode 100644 index 859ea779817a..000000000000 --- a/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- im-freewnn-0.0.2.orig/Makefile.am 2004-08-04 07:05:06.000000000 +0200 -+++ im-freewnn-0.0.2/Makefile.am 2009-12-29 20:34:54.420539767 +0100 -@@ -10,8 +10,6 @@ - - DEPS = - --LDADDS = @GTK_DEP_LIBS@ -lcrypt -- - EXTRA_DIST= \ - im-freewnn.spec - -@@ -38,7 +36,7 @@ - candwin.h \ - candwin.c - --im_freewnn_la_LIBADD = $(LDADDS) -lcrypt -+im_freewnn_la_LIBADD = @LIBS@ @GTK_DEP_LIBS@ -lcrypt - - module_LTLIBRARIES = \ - im-freewnn.la ---- im-freewnn-0.0.2.orig/configure.in 2004-08-05 08:04:36.000000000 +0200 -+++ im-freewnn-0.0.2/configure.in 2009-12-29 20:36:31.562539161 +0100 -@@ -48,11 +48,8 @@ - AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes") - - dnl FreeWnn check --ldflags_backup="$LDFLAGS" --LDFLAGS="$LDFLAGS -lcrypt" - AC_CHECK_HEADER(wnn/jlib.h,,) --AC_CHECK_LIB(wnn, jl_open_lang,,) --LDFLAGS="$ldflags_backup" -+AC_CHECK_LIB([wnn], [jl_open_lang], , ,[-lcrypt]) - - AC_OUTPUT([ - Makefile diff --git a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild b/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild deleted file mode 100644 index 5c5f22692a71..000000000000 --- a/app-i18n/im-freewnn/im-freewnn-0.0.2-r2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools gnome2-utils prefix - -DESCRIPTION="Japanese FreeWnn input method module for GTK+2" -HOMEPAGE="http://bonobo.gnome.gr.jp/~nakai/immodule/" -SRC_URI="http://bonobo.gnome.gr.jp/~nakai/immodule/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -RDEPEND="app-i18n/freewnn - x11-libs/gtk+:2" -DEPEND="${RDEPEND} - sys-devel/gettext - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-as-needed.patch - "${FILESDIR}"/${PN}-headers.patch - "${FILESDIR}"/${PN}-wnnenvrc.patch -) - -src_prepare() { - default - eprefixify ${PN}.c - - mv configure.{in,ac} || die - eautoreconf -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - gnome2_query_immodules_gtk2 -} - -pkg_postrm() { - gnome2_query_immodules_gtk2 -} diff --git a/app-i18n/im-freewnn/metadata.xml b/app-i18n/im-freewnn/metadata.xml index e1a49f498885..491c88b3a31f 100644 --- a/app-i18n/im-freewnn/metadata.xml +++ b/app-i18n/im-freewnn/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/imhangul/Manifest b/app-i18n/imhangul/Manifest index 5c0f7d60981f..e4f303874786 100644 --- a/app-i18n/imhangul/Manifest +++ b/app-i18n/imhangul/Manifest @@ -1,3 +1,2 @@ -DIST imhangul-2.1.0.tar.bz2 268205 BLAKE2B c45cc3e0919c695466f7d09c20c3ee5ae827865b6c3093746f8435bfb3f18da0cf94bc4225829dbafb2f13fcd1da0ec4a696adb966bff90285c769eb36232c4b SHA512 ea4621c4e0e5ed1786e644b577bc0c9f3dbbf296f938ddb2ab04923d8147e01123e10e09a61484e30c3ab0ff51d86da80a93bce583eceee207eab90c27df5f8e DIST imhangul-2.1.1.tar.bz2 288452 BLAKE2B 14aba1fb582edd735d1469b2fc1c4b576c64f073f525b30a3c5dd681b82d07f7b2960a63c388dae47d93855f25abbfbb2a48b032e5509239325db1cd05ff6b5e SHA512 5db3843aec698bd6315e4c76f3d8ea374b5d985ff7ae8a3d05861afb1d564ffe274d56fa27e8f669884016c50d5fc1850984050d93fdee944c6f7c3c963c96f1 DIST imhangul-3.1.1.tar.bz2 288236 BLAKE2B bb762481c98d8e4d3e1f32629802320fbdd6ec2388e9d7e9f1838fbbcb05f247549dc2baa68e6f4ec626f32b1911b5dfa89810e64c9e826cb1887400bbe11e71 SHA512 a27fb34a826ceccb16e4c8a422f5571c7c6a4c253cd2a55c1025b0c22500a380a35a8703e9f0f6300fdc92544e1d7b59e33f11e059b85754b1619698e0f74d89 diff --git a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild b/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild deleted file mode 100644 index 22f7c57fe635..000000000000 --- a/app-i18n/imhangul/imhangul-2.1.0-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit gnome2-utils toolchain-funcs - -DESCRIPTION="GTK+ 2 Hangul Input Modules" -HOMEPAGE="https://github.com/libhangul/imhangul" -SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.bz2" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -RDEPEND="app-i18n/libhangul - x11-libs/gtk+:2 - virtual/libintl" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/gettext" - -src_prepare() { - default - gnome2_environment_reset - gnome2_disable_deprecation_warning -} - -src_configure() { - econf --with-gtk-im-module-dir="${EPREFIX}"/usr/$(get_libdir)/gtk-2.0/$($(tc-getPKG_CONFIG) gtk+-2.0 --variable=gtk_binary_version)/immodules -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die - dodoc ${PN}.conf - - local s - insinto /etc/X11/xinit/xinput.d - for s in 2{,y} 3{2,9,f,s,y} ahn ro; do - newins "${FILESDIR}"/xinput-${PN}${s} ${PN}${s}.conf - done -} - -pkg_postinst() { - gnome2_query_immodules_gtk2 - elog - elog "If you want to use one of the module as a default input method, " - elog - elog "export GTK_IM_MODULE=hangul2 # 2 input type" - elog "export GTK_IM_MODULE=hangul3f # 3 input type" - elog -} - -pkg_postrm() { - gnome2_query_immodules_gtk2 -} diff --git a/app-i18n/imhangul/imhangul-2.1.1.ebuild b/app-i18n/imhangul/imhangul-2.1.1.ebuild index bce95ecb2cd7..7c57a544fa3b 100644 --- a/app-i18n/imhangul/imhangul-2.1.1.ebuild +++ b/app-i18n/imhangul/imhangul-2.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="" RDEPEND="app-i18n/libhangul diff --git a/app-i18n/imhangul/imhangul-3.1.1.ebuild b/app-i18n/imhangul/imhangul-3.1.1.ebuild index 27ef02936dd6..ff9b578fc3a2 100644 --- a/app-i18n/imhangul/imhangul-3.1.1.ebuild +++ b/app-i18n/imhangul/imhangul-3.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.go LICENSE="LGPL-2.1" SLOT="3" -KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="amd64 ppc x86" IUSE="" RDEPEND="app-i18n/libhangul diff --git a/app-i18n/imhangul/metadata.xml b/app-i18n/imhangul/metadata.xml index 20c10eff6410..af2530e8fdda 100644 --- a/app-i18n/imhangul/metadata.xml +++ b/app-i18n/imhangul/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/imsettings/Manifest b/app-i18n/imsettings/Manifest index 97bc272eeb72..56baff4b52f2 100644 --- a/app-i18n/imsettings/Manifest +++ b/app-i18n/imsettings/Manifest @@ -1 +1 @@ -DIST imsettings-1.7.2.tar.bz2 595754 BLAKE2B 9964ab7ca842a7e1b9e9c61434275b55d6a58e271dd12058195573aa65c623d5152a04bc893b3ac4d983c4798bd6f4e8cdb486577be45ec43db6600f72c8cc3b SHA512 b28d67705d3d6a0ec95babaca616f750b73cdac5e01ed61e25a6527fd7f816a14654cd7233eca56d7427b9395e7ad75757b95cd7bd55c56bbdc145a3f8bfe1f0 +DIST imsettings-1.8.2.tar.bz2 705391 BLAKE2B 3b7f3e2ca2c08bc149be95fb97889ab58fc22be828b9801f4c342c1514a7be35644548d6a920fe657e1d85a9d35d8c2a40766f25d6420bb3da8a8f4e7a7ba739 SHA512 600315a20fd61eaa77a0add1e587861ad3ce70175d87639e43105d804cec59bfbc0219f2177c4d9e07d337231eb85514cbfd8af614a113b688ead372075b9ff4 diff --git a/app-i18n/imsettings/files/imsettings-1.7.2-fno-common.patch b/app-i18n/imsettings/files/imsettings-fno-common.patch index 0845bd31820a..0845bd31820a 100644 --- a/app-i18n/imsettings/files/imsettings-1.7.2-fno-common.patch +++ b/app-i18n/imsettings/files/imsettings-fno-common.patch diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.8.2-r1.ebuild index 789cc72bb3e2..010094f5a19b 100644 --- a/app-i18n/imsettings/imsettings-1.7.2.ebuild +++ b/app-i18n/imsettings/imsettings-1.8.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="8" inherit autotools @@ -9,40 +9,35 @@ DESCRIPTION="Delivery framework for general Input Method configuration" HOMEPAGE="https://tagoh.bitbucket.io/imsettings" SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="amd64 ~x86" -IUSE="gconf gtk2 qt5 +introspection xfconf" +IUSE="qt5 +introspection xfconf" RESTRICT="test" RDEPEND="dev-libs/glib:2 sys-apps/dbus virtual/libintl + x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libgxim x11-libs/libnotify - gconf? ( gnome-base/gconf ) - gtk2? ( x11-libs/gtk+:2 ) - !gtk2? ( x11-libs/gtk+:3 ) introspection? ( dev-libs/gobject-introspection ) xfconf? ( xfce-base/xfconf )" DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/glib-utils - dev-util/intltool - sys-devel/autoconf-archive +BDEPEND="dev-util/glib-utils + dev-build/autoconf-archive sys-devel/gettext virtual/pkgconfig" -MY_XINPUTSH="90-xinput" +PATCHES=( "${FILESDIR}"/${PN}-fno-common.patch ) -PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) +MY_XINPUTSH="90-xinput" src_prepare() { sed -i \ - -e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \ - -e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/$(usex gtk2 '\1' _)/" \ - -e "/PKG_CHECK_MODULES/s/\(gtk+-3\.0\)/$(usex !gtk2 '\1' _)/" \ + -e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/_/" \ + -e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/_/" \ -e "/PKG_CHECK_MODULES/s/\(check\)/_/" \ -e "/PKG_CHECK_MODULES/s/\(libxfconf-0\)/$(usex xfconf '\1' _)/" \ -e "s/use_qt=\"yes\"/use_qt=\"$(usex qt5)\"/" \ diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml index 094115428fb1..7593ee8f578e 100644 --- a/app-i18n/imsettings/metadata.xml +++ b/app-i18n/imsettings/metadata.xml @@ -1,18 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <use> - <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag> - <flag name="gtk2"> - Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3 - </flag> - <flag name="xfconf">Enable support for <pkg>xfce-base/xfconf</pkg></flag> - </use> - <upstream> - <remote-id type="bitbucket">tagoh/imsettings</remote-id> - </upstream> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <use> + <flag name="xfconf">Enable support for <pkg>xfce-base/xfconf</pkg></flag> + </use> + <upstream> + <remote-id type="bitbucket">tagoh/imsettings</remote-id> + </upstream> </pkgmetadata> diff --git a/app-i18n/jfbterm/files/jfbterm-automake-1.13.patch b/app-i18n/jfbterm/files/jfbterm-automake-1.13.patch new file mode 100644 index 000000000000..e20f068a8387 --- /dev/null +++ b/app-i18n/jfbterm/files/jfbterm-automake-1.13.patch @@ -0,0 +1,14 @@ +--- a/configure.in ++++ b/configure.in +@@ -1,7 +1,8 @@ + dnl Process this file with autoconf to produce a configure script. +-AC_INIT(fbcommon.c) +-AM_CONFIG_HEADER(config.h) +-AM_INIT_AUTOMAKE(jfbterm, 0.4.7) ++AC_INIT([jfbterm], [0.4.7]) ++AC_CONFIG_SRCDIR([fbcommon.c]) ++AC_CONFIG_HEADERS([config.h]) ++AM_INIT_AUTOMAKE + + dnl Checks for programs. + AC_PROG_CC diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch b/app-i18n/jfbterm/files/jfbterm-gentoo.patch index 8dc8bc097b05..48286aa8b227 100644 --- a/app-i18n/jfbterm/files/jfbterm-0.4.7-gentoo.patch +++ b/app-i18n/jfbterm/files/jfbterm-gentoo.patch @@ -1,6 +1,5 @@ -diff -Naur jfbterm-0.4.7.orig/fbcommon.c jfbterm-0.4.7/fbcommon.c ---- jfbterm-0.4.7.orig/fbcommon.c 2003-09-03 00:23:17.000000000 +0900 -+++ jfbterm-0.4.7/fbcommon.c 2007-08-18 10:55:30.000000000 +0900 +--- a/fbcommon.c ++++ b/fbcommon.c @@ -46,7 +46,6 @@ #endif #include <linux/vt.h> @@ -19,9 +18,8 @@ diff -Naur jfbterm-0.4.7.orig/fbcommon.c jfbterm-0.4.7/fbcommon.c close(fd); snprintf(fbdn, 15, "/dev/fb%d", c2m.framebuffer); } -diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample jfbterm-0.4.7/jfbterm.conf.sample ---- jfbterm-0.4.7.orig/jfbterm.conf.sample 2003-09-16 00:16:35.000000000 +0900 -+++ jfbterm-0.4.7/jfbterm.conf.sample 2007-08-18 10:19:00.000000000 +0900 +--- a/jfbterm.conf.sample ++++ b/jfbterm.conf.sample @@ -19,29 +19,29 @@ # Absolute path or relative path to PWD # @@ -71,9 +69,8 @@ diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample jfbterm-0.4.7/jfbterm.conf.sam ############################################################################### -diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample.ja jfbterm-0.4.7/jfbterm.conf.sample.ja ---- jfbterm-0.4.7.orig/jfbterm.conf.sample.ja 2003-09-16 00:16:35.000000000 +0900 -+++ jfbterm-0.4.7/jfbterm.conf.sample.ja 2007-08-18 10:19:11.000000000 +0900 +--- a/jfbterm.conf.sample.ja ++++ b/jfbterm.conf.sample.ja @@ -25,29 +25,29 @@ # ÀäÂХѥ¹ or PWD¤«¤é¤ÎÁêÂХѥ¹ # @@ -123,9 +120,8 @@ diff -Naur jfbterm-0.4.7.orig/jfbterm.conf.sample.ja jfbterm-0.4.7/jfbterm.conf. ################################################################################ # -diff -Naur jfbterm-0.4.7.orig/util.h jfbterm-0.4.7/util.h ---- jfbterm-0.4.7.orig/util.h 2003-09-16 00:45:31.000000000 +0900 -+++ jfbterm-0.4.7/util.h 2007-08-18 08:48:49.000000000 +0900 +--- a/util.h ++++ b/util.h @@ -31,6 +31,7 @@ #include <sys/types.h> diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch b/app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch index 06c6e6033488..aa0b39ed269f 100644 --- a/app-i18n/jfbterm/files/jfbterm-0.4.7-no-kernel-headers.patch +++ b/app-i18n/jfbterm/files/jfbterm-no-kernel-headers.patch @@ -3,8 +3,8 @@ Patch by Shunichi Fuji <palgowr@gmail.com>. See bug #156306 ---- jfbterm-0.4.7.orig/fbdpsp.c 2003-08-30 03:48:16.000000000 +0900 -+++ jfbterm-0.4.7/fbdpsp.c 2006-11-27 01:22:20.000000000 +0900 +--- a/fbdpsp.c ++++ b/fbdpsp.c @@ -827,8 +827,7 @@ #ifdef JFB_VGA16FB diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch b/app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch index 2e8036400770..60deee49422e 100644 --- a/app-i18n/jfbterm/files/jfbterm-0.4.7-sigchld-debian.patch +++ b/app-i18n/jfbterm/files/jfbterm-sigchld-debian.patch @@ -1,5 +1,5 @@ ---- jfbterm-0.4.7.orig/main.c -+++ jfbterm-0.4.7/main.c +--- a/main.c ++++ b/main.c @@ -184,7 +184,7 @@ p->gExecShellArgv = NULL; p->gConfFile = FILE_JFBTERM_CONF; @@ -9,8 +9,8 @@ atexit(tapp_final_at_exit); } ---- jfbterm-0.4.7.orig/term.h -+++ jfbterm-0.4.7/term.h +--- a/term.h ++++ b/term.h @@ -44,7 +44,7 @@ } TTerm; diff --git a/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch b/app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch index 974ccbc41307..aa41d5e02ce7 100644 --- a/app-i18n/jfbterm/files/jfbterm-0.4.7-wrong-inline-gcc5.patch +++ b/app-i18n/jfbterm/files/jfbterm-wrong-inline-gcc5.patch @@ -1,7 +1,7 @@ -Source: http://pkgs.fedoraproject.org/cgit/rpms/jfbterm.git/plain/jfbterm-0.4.7-wrong-inline-gcc5.patch +https://src.fedoraproject.org/rpms/jfbterm/blob/rawhide/f/jfbterm-0.4.7-wrong-inline-gcc5.patch ---- jfbterm-0.4.7/pen.c.inline_gcc5 2003-08-30 03:48:16.000000000 +0900 -+++ jfbterm-0.4.7/pen.c 2015-02-09 10:36:47.182751545 +0900 +--- a/pen.c ++++ b/pen.c @@ -62,7 +62,7 @@ p->attr = q->attr; } @@ -11,8 +11,8 @@ Source: http://pkgs.fedoraproject.org/cgit/rpms/jfbterm.git/plain/jfbterm-0.4.7- { p->bcol = 0; p->fcol = 7; ---- jfbterm-0.4.7/pen.h.inline_gcc5 2002-07-17 01:21:23.000000000 +0900 -+++ jfbterm-0.4.7/pen.h 2015-02-09 10:36:52.058705503 +0900 +--- a/pen.h ++++ b/pen.h @@ -58,7 +58,7 @@ void tpen_init(TPen* p); void tpen_final(TPen* p); diff --git a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild index 93989a66a5ad..3fb31512982d 100644 --- a/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild +++ b/app-i18n/jfbterm/jfbterm-0.4.7-r4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" inherit autotools flag-o-matic @@ -15,16 +15,16 @@ KEYWORDS="amd64 ppc ppc64 sparc x86" IUSE="debug" DEPEND="sys-libs/ncurses:0" -RDEPEND=" - media-fonts/unifont - media-fonts/font-misc-misc - media-fonts/intlfonts" +RDEPEND="media-fonts/font-misc-misc + media-fonts/intlfonts + media-fonts/unifont" PATCHES=( - "${FILESDIR}"/${P}-sigchld-debian.patch - "${FILESDIR}"/${P}-no-kernel-headers.patch - "${FILESDIR}"/${P}-gentoo.patch - "${FILESDIR}"/${P}-wrong-inline-gcc5.patch + "${FILESDIR}"/${PN}-sigchld-debian.patch + "${FILESDIR}"/${PN}-no-kernel-headers.patch + "${FILESDIR}"/${PN}-gentoo.patch + "${FILESDIR}"/${PN}-wrong-inline-gcc5.patch + "${FILESDIR}"/${PN}-automake-1.13.patch ) src_prepare() { @@ -38,15 +38,15 @@ src_configure() { } src_install() { - dodir /etc /usr/share/fonts/jfbterm + dodir /etc /usr/share/fonts/${PN} default - mv "${ED%/}"/etc/jfbterm.conf{.sample,} || die + mv "${ED}"/etc/${PN}.conf{.sample,} || die - doman jfbterm.1 jfbterm.conf.5 + doman ${PN}.{1,conf.5} # install example config files docinto examples - dodoc jfbterm.conf.sample* + dodoc ${PN}.conf.sample* docompress -x /usr/share/doc/${PF}/examples } diff --git a/app-i18n/jfbterm/metadata.xml b/app-i18n/jfbterm/metadata.xml index 5393e0d29361..69fdce88d486 100644 --- a/app-i18n/jfbterm/metadata.xml +++ b/app-i18n/jfbterm/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> @@ -13,6 +13,6 @@ linux/ppc. </longdescription> <upstream> - <remote-id type="sourceforge-jp">jfbterm</remote-id> + <remote-id type="osdn">jfbterm</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/kakasi/Manifest b/app-i18n/kakasi/Manifest index 6f3943e5ebe5..02f609f9a724 100644 --- a/app-i18n/kakasi/Manifest +++ b/app-i18n/kakasi/Manifest @@ -1,2 +1 @@ -DIST kakasi-2.3.4.tar.gz 1099258 BLAKE2B e3644e8688082df393ab3b1dc356b682b3ea4a66c46d33c3e3c65ffd882a357600ec99f017e72bea491ad7779cbbaa044479101322a14baccc5385edc20a7b22 SHA512 33fa17251ba00163f6d9df208f18c88ff2dfa9891320f1d00fc0c72686bbcc59cf3ccbfb76fa66dfb135a6e942ef4d5d907edc3f1ca9d380c5b7a7d4df090a66 -DIST kakasi-2.3.6.tar.gz 1352154 BLAKE2B 2e23c5e83aefc040567d0a945b98c52a1123fe41383ded90a2e2a0cea5a9ee0e8d1f4560cb1d5959df5253702eaa958d3522791ef16235aa07dcc2beb2fe008c SHA512 212dbf4125db343b5d8ab5849fd85cbc1060c259eb1a37593817a990104ce53c146e0ba8e79c7f7427d1eb59b0d7d6c3d7f9e2cb8e303cff3088a030f1b0327a +DIST kakasi-2.3.6.tar.xz 991840 BLAKE2B 9465b5c80080141d9bf36154825e0e7ac8903ae24369cdd37d3ebc11642a43dd563893966121911eca44cdcba0a981a4e1e1807fb3ff8918714f9952e62036b1 SHA512 5fb8b9c1909f9cb0d1239a22277138563010dc96e0e5747646fa0cda4e6b70f6c9e7393b77132952ef0bd67b57d104e3a254ef376e91f4bcf6a160822cdb370a diff --git a/app-i18n/kakasi/files/kakasi-2.3.6-configure-clang16.patch b/app-i18n/kakasi/files/kakasi-2.3.6-configure-clang16.patch new file mode 100644 index 000000000000..7c6dd035f57c --- /dev/null +++ b/app-i18n/kakasi/files/kakasi-2.3.6-configure-clang16.patch @@ -0,0 +1,19 @@ +https://src.fedoraproject.org/rpms/kakasi/raw/4756771349822d4ccd4d74a6ce70040ca57084cb/f/kakasi-configure-c99.patch +https://bugs.gentoo.org/874654 + +Avoid an implicit declaration of exit and build failures with future +compilers which do not support implicit function declarations by +default. + +--- a/configure.in ++++ b/configure.in +@@ -85,7 +85,7 @@ AS_VAR_IF(utf8, "yes",[ + LIBS="$LIBICONV $LIBS" + AC_DEFINE(KAKASI_SUPPORT_UTF8, 1, [KAKASI_SUPPORT_UTF8]) + AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <iconv.h>], +- [if (iconv_open("EUC-JP", "UTF-8") == -1) exit(1);])], ++ [if (iconv_open("EUC-JP", "UTF-8") == -1) return 1;])], + [], + [AC_MSG_ERROR([can not use EUC-JP or UTF-8 encoding on iconv])]) + ]) + diff --git a/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild b/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild deleted file mode 100644 index b69e70b53497..000000000000 --- a/app-i18n/kakasi/kakasi-2.3.4-r2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit toolchain-funcs - -DESCRIPTION="Converts Japanese text between kanji, kana, and romaji" -HOMEPAGE="http://kakasi.namazu.org/" -SRC_URI="http://${PN}.namazu.org/stable/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" -IUSE="static-libs" - -DOCS=( AUTHORS ChangeLog {,O}NEWS README{,-ja} THANKS TODO doc/{ChangeLog.lib,JISYO,README.lib} ) - -src_compile() { - emake CC="$(tc-getCC)" -} - -src_install() { - default - einstalldocs - find "${ED}" -name '*.la' -delete || die - use static-libs || find "${ED}" -name '*.a' -delete || die - - iconv -f EUC-JP -t UTF-8 doc/${PN}.1 > doc/${PN}.ja.1 - doman doc/${PN}.ja.1 -} diff --git a/app-i18n/kakasi/kakasi-2.3.6.ebuild b/app-i18n/kakasi/kakasi-2.3.6-r1.ebuild index 60aabcccbed4..03e723fed5c4 100644 --- a/app-i18n/kakasi/kakasi-2.3.6.ebuild +++ b/app-i18n/kakasi/kakasi-2.3.6-r1.ebuild @@ -1,19 +1,32 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" +inherit autotools + DESCRIPTION="Converts Japanese text between kanji, kana, and romaji" HOMEPAGE="http://kakasi.namazu.org/" -SRC_URI="http://${PN}.namazu.org/stable/${P}.tar.gz" +SRC_URI="http://${PN}.namazu.org/stable/${P}.tar.xz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="l10n_ja static-libs" DOCS=( AUTHORS ChangeLog {,O}NEWS README{,-ja} THANKS TODO doc/{ChangeLog.lib,JISYO,README.lib} ) +PATCHES=( + "${FILESDIR}"/${PN}-2.3.6-configure-clang16.patch +) + +src_prepare() { + default + + # Clang 16 patch + eautoreconf +} + src_install() { default einstalldocs diff --git a/app-i18n/kakasi/metadata.xml b/app-i18n/kakasi/metadata.xml index 6f2ca22da233..a94766977fa6 100644 --- a/app-i18n/kakasi/metadata.xml +++ b/app-i18n/kakasi/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/kanjipad/kanjipad-2.0.0-r1.ebuild b/app-i18n/kanjipad/kanjipad-2.0.0-r1.ebuild new file mode 100644 index 000000000000..2f20eacc9b1c --- /dev/null +++ b/app-i18n/kanjipad/kanjipad-2.0.0-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="Japanese handwriting recognition tool" +HOMEPAGE="https://fishsoup.net/software/kanjipad/" +SRC_URI="https://fishsoup.net/software/kanjipad/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" + +RDEPEND=" + app-accessibility/at-spi2-core:2 + x11-libs/gtk+:2 + dev-libs/glib:2 + media-libs/fontconfig + media-libs/freetype + media-libs/harfbuzz:= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/pango +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}/${P}-cflags.patch" + "${FILESDIR}/${P}-underlinking.patch" +) + +src_prepare() { + default + sed -i -e "s|PREFIX=/usr/local|PREFIX=/usr|" \ + -e "s|-DG.*DISABLE_DEPRECATED||g" Makefile || die "Fixing Makefile failed" +} + +src_configure() { + tc-export CC +} + +src_install() { + dobin kanjipad kpengine + insinto /usr/share/kanjipad + doins jdata.dat + + local DOCS=( ChangeLog README TODO jstroke/README-kanjipad ) + einstalldocs +} diff --git a/app-i18n/kanjipad/metadata.xml b/app-i18n/kanjipad/metadata.xml index c921b96adf6c..1d892a124fa3 100644 --- a/app-i18n/kanjipad/metadata.xml +++ b/app-i18n/kanjipad/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/kcc/files/kcc-1.0-clang16.patch b/app-i18n/kcc/files/kcc-1.0-clang16.patch new file mode 100644 index 000000000000..a813a9ceb759 --- /dev/null +++ b/app-i18n/kcc/files/kcc-1.0-clang16.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/871399 +--- a/kcc.c ++++ b/kcc.c +@@ -33,2 +33,3 @@ + #include <sys/stat.h> ++#include <unistd.h> + +@@ -138,4 +139,6 @@ + #ifdef __STDC__ ++int getstr(char *str, register int n, FILE *fp); + void error(char *format, ...); + #else ++int getstr(); + void error(); +@@ -152,3 +155,3 @@ + ---------------------------------------------------------------------*/ +-main(c, v) ++int main(c, v) + register int c; diff --git a/app-i18n/kcc/kcc-1.0.ebuild b/app-i18n/kcc/kcc-1.0.ebuild index 79b890dd7eb6..0aa425112c84 100644 --- a/app-i18n/kcc/kcc-1.0.ebuild +++ b/app-i18n/kcc/kcc-1.0.ebuild @@ -1,33 +1,35 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit toolchain-funcs +inherit flag-o-matic toolchain-funcs -DESCRIPTION="A Kanji code converter" +DESCRIPTION="Kanji code converter" HOMEPAGE="http://www2s.biglobe.ne.jp/~Nori/ruby/" SRC_URI="mirror://gentoo/${P}.tar.gz" +S="${WORKDIR}/${PN}" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" KEYWORDS="~amd64 x86" -S="${WORKDIR}/${PN}" PATCHES=( "${FILESDIR}"/${PN}-gcc3-gentoo.diff "${FILESDIR}"/${PN}-exit.diff - "${FILESDIR}"/${PN}-1.0-fix-build-system.patch + "${FILESDIR}"/${P}-fix-build-system.patch + "${FILESDIR}"/${P}-clang16.patch ) src_configure() { tc-export CC + append-cflags -std=gnu89 # old codebase, incompatible with c2x } src_install() { dobin kcc einstalldocs - cp -f kcc.jman kcc.1 || die + cp kcc.jman kcc.1 || die doman -i18n=ja kcc.1 } diff --git a/app-i18n/kcc/metadata.xml b/app-i18n/kcc/metadata.xml index e1a49f498885..491c88b3a31f 100644 --- a/app-i18n/kcc/metadata.xml +++ b/app-i18n/kcc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild index 0c4e4986e58f..af40cf4a01d7 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild @@ -27,7 +27,7 @@ IUSE="" BDEPEND=">=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtwidgets:5 - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules:0 sys-devel/gettext virtual/pkgconfig" DEPEND=">=app-i18n/fcitx-4.2.9:4 diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild index 753485c93790..baa3c247daf3 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild @@ -27,7 +27,7 @@ IUSE="" BDEPEND=">=app-i18n/fcitx-4.2.9:4 dev-qt/qtcore:5 dev-qt/qtwidgets:5 - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules:0 sys-devel/gettext virtual/pkgconfig" DEPEND=">=app-i18n/fcitx-4.2.9:4 diff --git a/app-i18n/kcm-fcitx/metadata.xml b/app-i18n/kcm-fcitx/metadata.xml index f8dafcfefc2d..a7d9a659adf0 100644 --- a/app-i18n/kcm-fcitx/metadata.xml +++ b/app-i18n/kcm-fcitx/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> diff --git a/app-i18n/kinput2/kinput2-3.1-r3.ebuild b/app-i18n/kinput2/kinput2-3.1-r3.ebuild index 98694463da46..2420751e6974 100644 --- a/app-i18n/kinput2/kinput2-3.1-r3.ebuild +++ b/app-i18n/kinput2/kinput2-3.1-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="8" inherit toolchain-funcs @@ -10,14 +10,13 @@ MY_P="${PN}-v${PV}" DESCRIPTION="A Japanese input server which supports the XIM protocol" HOMEPAGE="http://www.nec.co.jp/canna" SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" LICENSE="HPND" SLOT="0" KEYWORDS="amd64 ppc ppc64 sparc x86" +IUSE="" -RDEPEND=" - app-i18n/freewnn +RDEPEND="app-i18n/freewnn x11-libs/libICE x11-libs/libSM x11-libs/libX11 @@ -28,8 +27,10 @@ RDEPEND=" x11-libs/libXt" DEPEND="${RDEPEND}" BDEPEND=" + sys-devel/gcc x11-misc/gccmakedep >=x11-misc/imake-1.0.8-r1" +S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch @@ -38,6 +39,7 @@ PATCHES=( "${FILESDIR}"/${PN}-segfault.patch "${FILESDIR}"/${PN}-wnn.patch ) +DOCS=( README NEWS doc/. ) src_prepare() { default @@ -46,7 +48,7 @@ src_prepare() { src_configure() { CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf -a || die } src_compile() { @@ -64,17 +66,15 @@ src_install() { XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \ DESTDIR="${D}" \ install - einstalldocs - dodoc -r doc/. newman cmd/${PN}.man ${PN}.1 - rm -rf "${ED}"/usr/$(get_libdir)/X11 || die + rm -rf "${ED}"/usr/$(get_libdir)/X11 insinto /etc/X11/xinit/xinput.d sed \ -e "s:@EPREFIX@:${EPREFIX}:g" \ -e "s:@SERVER@:wnn:g" \ - "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf || die + "${FILESDIR}"/xinput-${PN} >"${T}"/${PN}.conf || die doins "${T}"/${PN}.conf } diff --git a/app-i18n/kinput2/metadata.xml b/app-i18n/kinput2/metadata.xml index e1a49f498885..a94766977fa6 100644 --- a/app-i18n/kinput2/metadata.xml +++ b/app-i18n/kinput2/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> </pkgmetadata> diff --git a/app-i18n/libcangjie/metadata.xml b/app-i18n/libcangjie/metadata.xml index f6b9bba14e92..f08720eca1fa 100644 --- a/app-i18n/libcangjie/metadata.xml +++ b/app-i18n/libcangjie/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/libchewing/libchewing-0.5.1-r1.ebuild b/app-i18n/libchewing/libchewing-0.5.1-r1.ebuild index e29bd0411fd8..3e944bbb8395 100644 --- a/app-i18n/libchewing/libchewing-0.5.1-r1.ebuild +++ b/app-i18n/libchewing/libchewing-0.5.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2004-2021 Gentoo Authors +# Copyright 2004-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -23,7 +23,7 @@ fi LICENSE="LGPL-2.1" SLOT="0/3" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86" IUSE="static-libs test" RESTRICT="!test? ( test )" diff --git a/app-i18n/libchewing/metadata.xml b/app-i18n/libchewing/metadata.xml index 384eafa99780..4fa19434a1eb 100644 --- a/app-i18n/libchewing/metadata.xml +++ b/app-i18n/libchewing/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> diff --git a/app-i18n/libhangul/libhangul-0.1.0-r1.ebuild b/app-i18n/libhangul/libhangul-0.1.0-r1.ebuild new file mode 100644 index 000000000000..5e8906a50a01 --- /dev/null +++ b/app-i18n/libhangul/libhangul-0.1.0-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 2006-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit libtool + +DESCRIPTION="Library for hangul input method logic, hanja dictionary" +HOMEPAGE="https://github.com/libhangul/libhangul" +SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0/1" +KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" +IUSE="nls static-libs test" +RESTRICT="!test? ( test )" + +BDEPEND="virtual/pkgconfig + nls? ( sys-devel/gettext )" +RDEPEND="virtual/libiconv + nls? ( virtual/libintl )" +DEPEND="${RDEPEND} + test? ( dev-libs/check )" + +src_prepare() { + default + elibtoolize +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable static-libs static) +} + +src_test() { + emake -C test check +} + +src_install() { + default + find "${ED}" -name "*.la" -delete || die +} diff --git a/app-i18n/libhangul/libhangul-0.1.0.ebuild b/app-i18n/libhangul/libhangul-0.1.0.ebuild index 2d05ccfaf080..8f6b101fa56f 100644 --- a/app-i18n/libhangul/libhangul-0.1.0.ebuild +++ b/app-i18n/libhangul/libhangul-0.1.0.ebuild @@ -1,15 +1,17 @@ -# Copyright 2006-2020 Gentoo Authors +# Copyright 2006-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" +inherit libtool + DESCRIPTION="Library for hangul input method logic, hanja dictionary" HOMEPAGE="https://github.com/libhangul/libhangul" SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0/1" -KEYWORDS="amd64 ppc ppc64 x86" +KEYWORDS="amd64 ~arm64 ~loong ppc ppc64 ~riscv x86" IUSE="nls static-libs test" RESTRICT="!test? ( test )" @@ -20,6 +22,11 @@ RDEPEND="virtual/libiconv DEPEND="${RDEPEND} test? ( dev-libs/check )" +src_prepare() { + default + elibtoolize +} + src_configure() { econf \ $(use_enable nls) \ diff --git a/app-i18n/libhangul/metadata.xml b/app-i18n/libhangul/metadata.xml index 3d31c8bdc09a..f1979cc30a06 100644 --- a/app-i18n/libhangul/metadata.xml +++ b/app-i18n/libhangul/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> diff --git a/app-i18n/libime/Manifest b/app-i18n/libime/Manifest new file mode 100644 index 000000000000..8bf1ca97166f --- /dev/null +++ b/app-i18n/libime/Manifest @@ -0,0 +1,2 @@ +DIST libime-1.1.6_dict.tar.xz 36441068 BLAKE2B b10fff3c145fe96be0537c9934ffbbe2f0cea70df0bd4a3d517cfb74cbc976202846b14396c4f04097ebd24d268b3df7208113dbcd4dc0cd39fee7918381ec2d SHA512 adb7570c4d62ea94c8c38ab79a2a26700882088b518b6b7d6e16b0808d30ec751ee78d5084270adcacdeb4f3bace60332c4d67388eebfbf73627d22b30651bc4 +DIST libime-1.1.7_dict.tar.zst 37060247 BLAKE2B 1d81110e40844ad4e8b78445afbea7c7310150e75723e011bbc67e6cf75993197569f17192e4b4134e5bd99b0e5947d49fd6a622f02cd6df17cb176b23d31510 SHA512 67b69fe33e2a55cf9f82c668f3c97929fe8a0531e1540fa593ef15535ba66e079171928a54b268638a1d5fd14901f47500d1a6f79ad0e28f7f81e426f1384b42 diff --git a/app-i18n/libime/libime-1.1.6.ebuild b/app-i18n/libime/libime-1.1.6.ebuild new file mode 100644 index 000000000000..93be98f71519 --- /dev/null +++ b/app-i18n/libime/libime-1.1.6.ebuild @@ -0,0 +1,50 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +DESCRIPTION="Fcitx5 Next generation of fcitx " +HOMEPAGE="https://fcitx-im.org/" +SRC_URI="https://download.fcitx-im.org/fcitx5/libime/libime-${PV}_dict.tar.xz" + +LICENSE="LGPL-2+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="+data doc test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-i18n/fcitx-5.1.5:5 + app-arch/zstd:= + dev-libs/boost:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig + doc? ( + app-text/doxygen + dev-texlive/texlive-fontutils + ) +" + +src_configure() { + local mycmakeargs=( + -DENABLE_DATA=$(usex data) + -DENABLE_DOC=$(usex doc) + -DENABLE_TEST=$(usex test) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_src_compile doc +} + +src_install() { + cmake_src_install + use doc && dodoc -r "${BUILD_DIR}"/doc/* +} diff --git a/app-i18n/libime/libime-1.1.7.ebuild b/app-i18n/libime/libime-1.1.7.ebuild new file mode 100644 index 000000000000..fd371c42c371 --- /dev/null +++ b/app-i18n/libime/libime-1.1.7.ebuild @@ -0,0 +1,50 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake unpacker + +DESCRIPTION="Fcitx5 Next generation of fcitx " +HOMEPAGE="https://fcitx-im.org/" +SRC_URI="https://download.fcitx-im.org/fcitx5/libime/libime-${PV}_dict.tar.zst" + +LICENSE="LGPL-2+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86" +IUSE="+data doc test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=app-i18n/fcitx-5.1.5:5 + app-arch/zstd:= + dev-libs/boost:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + kde-frameworks/extra-cmake-modules:0 + virtual/pkgconfig + doc? ( + app-text/doxygen + dev-texlive/texlive-fontutils + ) +" + +src_configure() { + local mycmakeargs=( + -DENABLE_DATA=$(usex data) + -DENABLE_DOC=$(usex doc) + -DENABLE_TEST=$(usex test) + ) + cmake_src_configure +} + +src_compile() { + cmake_src_compile + use doc && cmake_src_compile doc +} + +src_install() { + cmake_src_install + use doc && dodoc -r "${BUILD_DIR}"/doc/* +} diff --git a/app-i18n/libime/metadata.xml b/app-i18n/libime/metadata.xml new file mode 100644 index 000000000000..e060f0b0724d --- /dev/null +++ b/app-i18n/libime/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person" proxied="yes"> + <email>tanekliang@gmail.com</email> + <name>Yongxiang Liang</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <use> + <flag name="data">Build data</flag> + </use> + <upstream> + <remote-id type="github">fcitx/libime</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-i18n/libkkc/Manifest b/app-i18n/libkkc/Manifest deleted file mode 100644 index 46aec7d3c2dc..000000000000 --- a/app-i18n/libkkc/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libkkc-0.3.6_pre20190809104047.tar.gz 389976 BLAKE2B 03c43384f4f1f0e48a3eec2afb9f90a39e42469439a7dbc06692e020d83b8362f19c41ea8960cd5147edca04dcf67be5e74315f494dd017a6ce018f217b6a5a7 SHA512 87c5294900b29e4b2225c24ee744c619691a5f25edc453c2ece44133695a8d0e1a1a07bb5a00d615cc95057ae5b451c845c7ce476df555e025097c38aff87a69 diff --git a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild deleted file mode 100644 index d563af26c2cd..000000000000 --- a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2013-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) - -inherit autotools python-any-r1 vala - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/ueno/libkkc" -elif [[ "${PV}" == *_pre* ]]; then - LIBKKC_GIT_REVISION="b2e5a152980ee627c39ca8a49082e6df7694b8fc" -fi - -DESCRIPTION="Japanese Kana Kanji conversion input method library" -HOMEPAGE="https://github.com/ueno/libkkc" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -elif [[ "${PV}" == *_pre* ]]; then - SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz" -else - SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz" -fi - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="nls static-libs" - -BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') - $(vala_depend) - dev-libs/gobject-introspection - virtual/pkgconfig - nls? ( sys-devel/gettext )" -DEPEND="dev-libs/glib:2 - dev-libs/json-glib - dev-libs/libgee:0.8 - dev-libs/marisa - nls? ( virtual/libintl )" -RDEPEND="${DEPEND}" - -if [[ "${PV}" == *_pre* ]]; then - S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}" -fi - -python_check_deps() { - has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]" -} - -src_prepare() { - default - eautoreconf - vala_src_prepare -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name "*.la" -delete || die -} diff --git a/app-i18n/libkkc/libkkc-9999.ebuild b/app-i18n/libkkc/libkkc-9999.ebuild deleted file mode 100644 index 1743990197eb..000000000000 --- a/app-i18n/libkkc/libkkc-9999.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 2013-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) - -inherit autotools python-any-r1 vala - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/ueno/libkkc" -elif [[ "${PV}" == *_pre* ]]; then - LIBKKC_GIT_REVISION="" -fi - -DESCRIPTION="Japanese Kana Kanji conversion input method library" -HOMEPAGE="https://github.com/ueno/libkkc" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -elif [[ "${PV}" == *_pre* ]]; then - SRC_URI="https://github.com/ueno/${PN}/archive/${LIBKKC_GIT_REVISION}.tar.gz -> ${P}.tar.gz" -else - SRC_URI="https://github.com/ueno/${PN}/releases/download/v${PV}/${P}.tar.gz" -fi - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="" -IUSE="nls static-libs" - -BDEPEND="$(python_gen_any_dep 'dev-libs/marisa[python,${PYTHON_USEDEP}]') - $(vala_depend) - dev-libs/gobject-introspection - virtual/pkgconfig - nls? ( sys-devel/gettext )" -DEPEND="dev-libs/glib:2 - dev-libs/json-glib - dev-libs/libgee:0.8 - dev-libs/marisa - nls? ( virtual/libintl )" -RDEPEND="${DEPEND}" - -if [[ "${PV}" == *_pre* ]]; then - S="${WORKDIR}/libkkc-${LIBKKC_GIT_REVISION}" -fi - -python_check_deps() { - has_version -b "dev-libs/marisa[python,${PYTHON_USEDEP}]" -} - -src_prepare() { - default - eautoreconf - vala_src_prepare -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name "*.la" -delete || die -} diff --git a/app-i18n/libkkc/metadata.xml b/app-i18n/libkkc/metadata.xml deleted file mode 100644 index 060c243a1bac..000000000000 --- a/app-i18n/libkkc/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arfrever.fta@gmail.com</email> - <name>Arfrever Frehtes Taifersar Arahesis</name> - </maintainer> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <upstream> - <remote-id type="github">ueno/libkkc</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest index a254d6b1f598..d8643b1cfa27 100644 --- a/app-i18n/libpinyin/Manifest +++ b/app-i18n/libpinyin/Manifest @@ -1,3 +1,3 @@ -DIST libpinyin-2.3.0.tar.gz 256549 BLAKE2B 621176ab14dfe8fb3c32e3ae0b727b8070b5fdcc3a79f8f3c646538151601c7fefe0b2778a54c50faabaf3026d9c029eaa52a0e04144d37f347ca571fd532908 SHA512 5cfe2d70c15dc532fa970a28b70da403f2d848747501bdbdf43c481f8165d6290cb1de086d2ef7af653edfe3fb164d4e8d9cf655302e2aa759709e6031b117b2 -DIST libpinyin-model17.text.tar.gz 20278815 BLAKE2B d02a587ab29e1115843d8c2318ef70cf7c2318d5c60ef8135860c611935285fa0f061a21d7e85dd87f6efe957742e21e34a77a7b245b58945cdd478759b0e19f SHA512 d0bf8d476a63e33e292046754161316f00bfea71ebd06fca85b3845fe535431f01458282f505380cae018050aa6a08b14a7bc0684ba372dc79ee14391f47e8a1 +DIST libpinyin-2.6.2.tar.gz 260101 BLAKE2B 7ba61c5bfe68991866112bbb63383bd7062164f92d63150b42c30f39d383f62a339a13eafa1596d1988d8e308c93ccc0f45cceeb557ce329788da507eed3e2ab SHA512 839907bed9bc796185fbe7d7b30ab84bc9bd45212797c75081475791aa62ad3465509ecc5fabe6ea27d02be9d2ca61764a472684b011b0c211bd5f4f26a0f9ca +DIST libpinyin-2.8.1.tar.gz 264751 BLAKE2B a05236513ebb39ec309a045f76582fd872db3b1a5a539fce1eec7e18cecb75b2a6228d0685d4a3069fea9855c52e1ede7d735645a2f61bd567401ea32685e6cb SHA512 b9b4f183ab8351bbbb0d9582a65d62b22c049261d21098df8ee3bf9f78b6b67e511221d4590692c137d20a334db5eaee12586a83b2d317c75be196107b28595f DIST libpinyin-model19.text.tar.gz 20279012 BLAKE2B d8721d106235ef6fb99ad8dd4f4911bb23bf66f0259b01c39fd8ee829f0a63f326894802d62e51531a10f453dff1f4bb6e3e1648cf4aeac8213dccd10fc8ca4d SHA512 93c70423ba14faa3402bce775f82769dd4ee3a49083beddc540825f88facbd847328e9d01d99473adb7cf26de0f853e2b2e14fe849b1c49531134d1ca4ed2ef2 diff --git a/app-i18n/libpinyin/libpinyin-2.3.0.ebuild b/app-i18n/libpinyin/libpinyin-2.6.2.ebuild index b3d35eeb3f25..a09759f85b85 100644 --- a/app-i18n/libpinyin/libpinyin-2.3.0.ebuild +++ b/app-i18n/libpinyin/libpinyin-2.6.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 2012-2019 Gentoo Authors +# Copyright 2012-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 inherit autotools @@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/libpinyin/libpinyin" fi -LIBPINYIN_MODEL_VERSION="17" +LIBPINYIN_MODEL_VERSION="19" DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao" HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/" @@ -20,11 +20,11 @@ if [[ "${PV}" == "9999" ]]; then else SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" fi -SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" +SRC_URI+=" https://downloads.sourceforge.net/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" LICENSE="GPL-3+" SLOT="0/13" -KEYWORDS="amd64 ~arm64 ppc ppc64 x86" +KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86" IUSE="" BDEPEND="virtual/pkgconfig" diff --git a/app-i18n/libpinyin/libpinyin-2.8.1.ebuild b/app-i18n/libpinyin/libpinyin-2.8.1.ebuild new file mode 100644 index 000000000000..a09759f85b85 --- /dev/null +++ b/app-i18n/libpinyin/libpinyin-2.8.1.ebuild @@ -0,0 +1,61 @@ +# Copyright 2012-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/libpinyin/libpinyin" +fi + +LIBPINYIN_MODEL_VERSION="19" + +DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao" +HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +fi +SRC_URI+=" https://downloads.sourceforge.net/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" + +LICENSE="GPL-3+" +SLOT="0/13" +KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86" +IUSE="" + +BDEPEND="virtual/pkgconfig" +DEPEND="dev-libs/glib:2 + sys-libs/db:=" +RDEPEND="${DEPEND}" + +src_unpack() { + if [[ "${PV}" == "9999" ]]; then + git-r3_src_unpack + else + unpack ${P}.tar.gz + fi +} + +src_prepare() { + default + + sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die + ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die + + eautoreconf +} + +src_configure() { + econf \ + --enable-libzhuyin \ + --disable-static +} + +src_install() { + default + find "${D}" -name "*.la" -delete || die +} diff --git a/app-i18n/libpinyin/libpinyin-9999.ebuild b/app-i18n/libpinyin/libpinyin-9999.ebuild index 5c0606058de5..dc5e734fdd7e 100644 --- a/app-i18n/libpinyin/libpinyin-9999.ebuild +++ b/app-i18n/libpinyin/libpinyin-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 2012-2020 Gentoo Authors +# Copyright 2012-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 inherit autotools @@ -20,7 +20,7 @@ if [[ "${PV}" == "9999" ]]; then else SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" fi -SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" +SRC_URI+=" https://downloads.sourceforge.net/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" LICENSE="GPL-3+" SLOT="0/13" @@ -57,5 +57,5 @@ src_configure() { src_install() { default - find "${ED}" -name "*.la" -delete || die + find "${D}" -name "*.la" -delete || die } diff --git a/app-i18n/libpinyin/metadata.xml b/app-i18n/libpinyin/metadata.xml index 5b6b1843aef9..1fa6baa055e2 100644 --- a/app-i18n/libpinyin/metadata.xml +++ b/app-i18n/libpinyin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> diff --git a/app-i18n/librime-lua/Manifest b/app-i18n/librime-lua/Manifest index 63cef86cfde2..00d57a498cb6 100644 --- a/app-i18n/librime-lua/Manifest +++ b/app-i18n/librime-lua/Manifest @@ -1 +1 @@ -DIST librime-lua-20201011103348.tar.gz 21600 BLAKE2B f7046d1eb23391ca70543aa64c52092081cef51a69ac3a282f2f1392eaf760515186f063e9d469c5c41ac9f495ace814ab741a0821d1a635b9ad1f4faa7a3912 SHA512 2a3d3b49d53066fe96dd008e8064718082225e6bf185574a25b8e98175d9936abcfa1fdc56e48f9c72a2deb46f8157d6132fd119ff8e0a3d52fbe9e2ea21386c +DIST librime-lua-20211030072627.tar.gz 27894 BLAKE2B a527e865a9945aa7d56cce3905bc80156b60ebf6323828ca40999cb73ebe8d8f66ddf6b0a1d6d5904f2bc754b5f8fe6ac1f5ecdc56351c2222a21429a0c2b701 SHA512 b15f85b0a18e5e05fa691a84aef7cf3689b4a5271a1d5b6f78ea42488f6dbe4dfc56a91fa547ca3636269b9c898d646d24d3a160096ace9927901f9fdba06e9c diff --git a/app-i18n/librime-lua/librime-lua-20201011103348.ebuild b/app-i18n/librime-lua/librime-lua-20211030072627.ebuild index 5abed7223b09..64263dc37b78 100644 --- a/app-i18n/librime-lua/librime-lua-20201011103348.ebuild +++ b/app-i18n/librime-lua/librime-lua-20211030072627.ebuild @@ -1,8 +1,8 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -LUA_COMPAT=(lua{5-1,5-2,5-3,5-4}) +LUA_COMPAT=( lua5-{3..4} ) inherit cmake lua-single @@ -11,10 +11,10 @@ if [[ "${PV}" == "99999999999999" ]]; then EGIT_REPO_URI="https://github.com/hchunhui/librime-lua" else - LIBRIME_LUA_GIT_REVISION="d45a41af2f9d731e3c1516a191cc3160e3cb8377" + LIBRIME_LUA_GIT_REVISION="67ef681a9fd03262c49cc7f850cc92fc791b1e85" fi -DESCRIPTION="Lua support for RIME" +DESCRIPTION="Lua module for RIME" HOMEPAGE="https://github.com/hchunhui/librime-lua" if [[ "${PV}" == "99999999999999" ]]; then SRC_URI="" @@ -24,7 +24,7 @@ fi LICENSE="BSD MIT" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" IUSE="" REQUIRED_USE="${LUA_REQUIRED_USE}" diff --git a/app-i18n/librime-lua/librime-lua-99999999999999.ebuild b/app-i18n/librime-lua/librime-lua-99999999999999.ebuild index fcf9189fe7df..2211e7aea769 100644 --- a/app-i18n/librime-lua/librime-lua-99999999999999.ebuild +++ b/app-i18n/librime-lua/librime-lua-99999999999999.ebuild @@ -1,8 +1,8 @@ -# Copyright 2020 Gentoo Authors +# Copyright 2020-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -LUA_COMPAT=(lua{5-1,5-2,5-3,5-4}) +LUA_COMPAT=( lua5-{3..4} ) inherit cmake lua-single @@ -11,10 +11,10 @@ if [[ "${PV}" == "99999999999999" ]]; then EGIT_REPO_URI="https://github.com/hchunhui/librime-lua" else - LIBRIME_LUA_GIT_REVISION="d45a41af2f9d731e3c1516a191cc3160e3cb8377" + LIBRIME_LUA_GIT_REVISION="" fi -DESCRIPTION="Lua support for RIME" +DESCRIPTION="Lua module for RIME" HOMEPAGE="https://github.com/hchunhui/librime-lua" if [[ "${PV}" == "99999999999999" ]]; then SRC_URI="" diff --git a/app-i18n/librime-lua/metadata.xml b/app-i18n/librime-lua/metadata.xml index d46ae4c46ad8..91961556816f 100644 --- a/app-i18n/librime-lua/metadata.xml +++ b/app-i18n/librime-lua/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest index f2e2c6fc1359..a34fcf54e86f 100644 --- a/app-i18n/librime/Manifest +++ b/app-i18n/librime/Manifest @@ -1,4 +1,2 @@ -DIST librime-1.5.3.tar.gz 2847083 BLAKE2B 4ffb2c5ddaf52f9c9227fa4ea019ef2965e61139f678798c08ef37dc52b863763651b63ed820caad0de1b06f48ab5c1a7a2682653340d2ae7f5f9eec3cec80b2 SHA512 4d7f6ec43bd5728f59f0b3581bcd8a46128651430b6873017d80659942b8f6aa1a2f25f439ba8fba461fe22acbf701c2da7a786104a2e4852a70a89cdc0452d3 -DIST librime-1.6.0.tar.gz 2856645 BLAKE2B de6d843a5028f6b0308c3432ada7dd00c08a71e73fe799b157fd71a4054c757a00d3b0fdc7743d94d6e87b03f256e822ee29c16c86f96f5d24c7d864266c4f78 SHA512 4aeace0f1628293d4b607483ab976841093a1ff03df8bf63d545715af00254d1f0b1bdcd120795ea688d152287069881e0740372f40e2174a14ae6f53b7f950b -DIST librime-1.6.1.tar.gz 2856751 BLAKE2B c6b01342dcc9e8ee571cb14a36b851a50bf7b191211197421647ab05e6fa64c676f8936920870dcc335d06c635e354fed706832e41192bccd0a17aff02df1a43 SHA512 944361e9459662bb97b97ce9e2651acf0beb368b3769d1b9576cf4e5c2779302cae470fa39f5bc262cabb6a0e8590bcb77d32ffc87d7385b9465869fe7d5bcb3 DIST librime-1.7.3.tar.gz 2859513 BLAKE2B 834622860cdc3038d1b983f476bca70f211dfbc3bc2b565a998163e22688841ee3a0c7f9a64bce285e2f3f5b5a9a802bd5506f17904ccb3291babf80d4748fb5 SHA512 8767d17c3d14a5a1bbb8269fab1627b907de72c288b362fdbc6191223937da21e8b18471b4ae8f83ce5afc0ec5c3ab12fbcb49930eb9969c1764c7390d9ee4b0 +DIST librime-1.9.0.tar.gz 2628091 BLAKE2B 5026fbe537520679b60b7f39cab65e97e175d574ad709e2b09bb5d71f6655f48f9f046d2caeaad73dcd839f58cd76796eded4deb775d6817a99ab7de107187a1 SHA512 7f432bbfeedc0949391fca82ebf080d113089ec9f0ab40f4bc63cf3037052a27b4ef44e55e7fc43b1217cf6635c62be0fb7520c3cc1492ec169fe5ee864e61ea diff --git a/app-i18n/librime/files/librime-1.5.3-log_files_mode.patch b/app-i18n/librime/files/librime-1.5.3-log_files_mode.patch deleted file mode 100644 index 7a36dea64d24..000000000000 --- a/app-i18n/librime/files/librime-1.5.3-log_files_mode.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://github.com/rime/librime/issues/316 -https://github.com/rime/librime/commit/90839b0b3d47cbfef715ea5f061c7505666ff75d - ---- /src/rime/setup.cc -+++ /src/rime/setup.cc -@@ -35,6 +35,8 @@ - - RIME_API void SetupLogging(const char* app_name) { - #ifdef RIME_ENABLE_LOGGING -+ // Do not allow other users to read/write log files created by current process. -+ FLAGS_logfile_mode = 0600; - google::InitGoogleLogging(app_name); - #endif // RIME_ENABLE_LOGGING - } diff --git a/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch b/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch index 5ed1447359d6..31eff9268bfc 100644 --- a/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch +++ b/app-i18n/librime/files/librime-1.6.0-boost-1.76.patch @@ -2,8 +2,8 @@ https://github.com/rime/librime/issues/462 https://github.com/rime/librime/pull/463 https://github.com/rime/librime/commit/57cffcd02ac70148e21ce982be834876b3df87db ---- /src/rime/gear/script_translator.cc -+++ /src/rime/gear/script_translator.cc +--- a/src/rime/gear/script_translator.cc ++++ b/src/rime/gear/script_translator.cc @@ -8,6 +8,7 @@ // #include <algorithm> @@ -12,8 +12,8 @@ https://github.com/rime/librime/commit/57cffcd02ac70148e21ce982be834876b3df87db #include <boost/algorithm/string/join.hpp> #include <boost/range/adaptor/reversed.hpp> #include <rime/composition.h> ---- /src/rime/gear/table_translator.cc -+++ /src/rime/gear/table_translator.cc +--- a/src/rime/gear/table_translator.cc ++++ b/src/rime/gear/table_translator.cc @@ -6,6 +6,7 @@ // #include <boost/algorithm/string.hpp> diff --git a/app-i18n/librime/files/librime-1.6.0-plugins.patch b/app-i18n/librime/files/librime-1.6.0-plugins.patch deleted file mode 100644 index c79072f31cbb..000000000000 --- a/app-i18n/librime/files/librime-1.6.0-plugins.patch +++ /dev/null @@ -1,247 +0,0 @@ -https://github.com/rime/librime/issues/431 - ---- /CMakeLists.txt -+++ /CMakeLists.txt -@@ -11,6 +11,14 @@ - - include(GNUInstallDirs) - -+if(NOT DEFINED BIN_INSTALL_DIR) -+ set(BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}) -+endif() -+ -+if(NOT DEFINED LIB_INSTALL_DIR) -+ set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) -+endif() -+ - option(BUILD_SHARED_LIBS "Build Rime as shared library" ON) - option(BUILD_MERGED_PLUGINS "Merge plugins into one Rime library" ON) - option(BUILD_STATIC "Build with dependencies as static libraries" OFF) -@@ -22,8 +30,11 @@ - option(BOOST_USE_CXX11 "Boost has been built with C++11 support" OFF) - option(BOOST_USE_SIGNALS2 "Boost use signals2 instead of signals" ON) - option(ENABLE_ASAN "Enable Address Sanitizer (Unix Only)" OFF) -+option(INSTALL_PRIVATE_HEADERS "Install private headers (usually needed for externally built Rime plugins)" OFF) -+option(ENABLE_EXTERNAL_PLUGINS "Enable loading of externally built Rime plugins (from directory set by RIME_PLUGINS_DIR variable)" OFF) - --set(rime_data_dir "/share/rime-data" CACHE STRING "Target directory for Rime data") -+set(RIME_DATA_DIR "share/rime-data" CACHE STRING "Target directory for Rime data") -+set(RIME_PLUGINS_DIR "${LIB_INSTALL_DIR}/rime-plugins" CACHE STRING "Target directory for externally built Rime plugins") - - if(WIN32) - set(ext ".exe") -@@ -61,7 +72,7 @@ - set(BOOST_COMPONENTS filesystem regex system) - - if(BOOST_USE_SIGNALS2) -- add_definitions("-DBOOST_SIGNALS2") -+ set(RIME_BOOST_SIGNALS2 1) - else() - set(BOOST_COMPONENTS ${BOOST_COMPONENTS} signals) - endif() -@@ -89,7 +100,7 @@ - add_definitions(-DGOOGLE_GLOG_DLL_DECL=) - endif() - -- add_definitions(-DRIME_ENABLE_LOGGING) -+ set(RIME_ENABLE_LOGGING 1) - - endif() - -@@ -134,6 +145,11 @@ - message(WARNING "X11/keysym.h not found.") - endif() - -+configure_file( -+ "${PROJECT_SOURCE_DIR}/src/rime/build_config.h.in" -+ "${PROJECT_BINARY_DIR}/src/rime/build_config.h") -+ -+include_directories(${PROJECT_BINARY_DIR}/src) - include_directories(${PROJECT_SOURCE_DIR}/src) - include_directories(${PROJECT_SOURCE_DIR}/thirdparty/include) - link_directories(${PROJECT_SOURCE_DIR}/thirdparty/lib) -@@ -154,14 +170,6 @@ - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") - endif() - --if(NOT DEFINED LIB_INSTALL_DIR) -- set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) --endif() -- --if(NOT DEFINED BIN_INSTALL_DIR) -- set(BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}) --endif() -- - # uninstall target - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" -@@ -175,7 +183,8 @@ - set(exec_prefix "${CMAKE_INSTALL_PREFIX}") - set(bindir "${exec_prefix}/${BIN_INSTALL_DIR}") - set(libdir "${exec_prefix}/${LIB_INSTALL_DIR}") -- set(pkgdatadir "${prefix}${rime_data_dir}") -+ set(pkgdatadir "${prefix}/${RIME_DATA_DIR}") -+ set(pluginsdir "${exec_prefix}/${RIME_PLUGINS_DIR}") - set(includedir "${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") - configure_file( - ${PROJECT_SOURCE_DIR}/rime.pc.in -@@ -189,11 +198,19 @@ - - file(GLOB rime_public_header_files ${PROJECT_SOURCE_DIR}/src/*.h) - install(FILES ${rime_public_header_files} DESTINATION include) -+if(INSTALL_PRIVATE_HEADERS) -+ file(GLOB rime_private_header_files ${PROJECT_SOURCE_DIR}/src/rime/*.h ${PROJECT_BINARY_DIR}/src/rime/*.h) -+ install(FILES ${rime_private_header_files} DESTINATION include/rime) -+ foreach(rime_private_header_files_dir algo config dict gear lever) -+ file(GLOB rime_private_header_files ${PROJECT_SOURCE_DIR}/src/rime/${rime_private_header_files_dir}/*.h) -+ install(FILES ${rime_private_header_files} DESTINATION include/rime/${rime_private_header_files_dir}) -+ endforeach() -+endif() - - if(BUILD_DATA) - file(GLOB rime_preset_data_files ${PROJECT_SOURCE_DIR}/data/preset/*.yaml) - install(FILES ${rime_preset_data_files} -- DESTINATION ${CMAKE_INSTALL_PREFIX}${rime_data_dir}) -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/${RIME_DATA_DIR}) - endif() - - if(BUILD_SHARED_LIBS) -@@ -223,6 +240,11 @@ - set(rime_plugins_library rime-plugins) - endif() - -+add_definitions("-DRIME_PLUGINS_DIR=\"${CMAKE_INSTALL_PREFIX}/${RIME_PLUGINS_DIR}\"") -+if(ENABLE_EXTERNAL_PLUGINS) -+ add_definitions(-DRIME_ENABLE_EXTERNAL_PLUGINS) -+endif() -+ - add_subdirectory(src) - - if(BUILD_SHARED_LIBS) ---- /rime.pc.in -+++ /rime.pc.in -@@ -2,6 +2,8 @@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ -+pkgdatadir=@pkgdatadir@ -+pluginsdir=@pluginsdir@ - - Name: Rime - Description: Rime Input Method Engine ---- /src/CMakeLists.txt -+++ /src/CMakeLists.txt -@@ -36,6 +36,9 @@ - if(Gflags_FOUND) - set(rime_optional_deps ${rime_optional_deps} ${Gflags_LIBRARY}) - endif() -+if(ENABLE_EXTERNAL_PLUGINS) -+ set(rime_optional_deps ${rime_optional_deps} dl) -+endif() - - set(rime_core_deps - ${Boost_LIBRARIES} ---- /src/rime/build_config.h.in -+++ /src/rime/build_config.h.in -@@ -0,0 +1,11 @@ -+// -+// Copyright RIME Developers -+// Distributed under the BSD License -+// -+#ifndef RIME_BUILD_CONFIG_H_ -+#define RIME_BUILD_CONFIG_H_ -+ -+#cmakedefine RIME_BOOST_SIGNALS2 -+#cmakedefine RIME_ENABLE_LOGGING -+ -+#endif // RIME_BUILD_CONFIG_H_ ---- /src/rime/common.h -+++ /src/rime/common.h -@@ -7,6 +7,8 @@ - #ifndef RIME_COMMON_H_ - #define RIME_COMMON_H_ - -+#include <rime/build_config.h> -+ - #include <functional> - #include <list> - #include <map> -@@ -20,7 +22,7 @@ - #include <vector> - #include <boost/optional.hpp> - #define BOOST_BIND_NO_PLACEHOLDERS --#ifdef BOOST_SIGNALS2 -+#ifdef RIME_BOOST_SIGNALS2 - #include <boost/signals2/connection.hpp> - #include <boost/signals2/signal.hpp> - #else -@@ -79,7 +81,7 @@ - return std::make_shared<T>(std::forward<Args>(args)...); - } - --#ifdef BOOST_SIGNALS2 -+#ifdef RIME_BOOST_SIGNALS2 - using boost::signals2::connection; - using boost::signals2::signal; - #else ---- /src/rime/lever/deployment_tasks.cc -+++ /src/rime/lever/deployment_tasks.cc -@@ -4,6 +4,9 @@ - // - // 2011-12-10 GONG Chen <chen.sst@gmail.com> - // -+ -+#include <rime/build_config.h> -+ - #include <algorithm> - #include <boost/algorithm/string.hpp> - #include <boost/filesystem.hpp> ---- /src/rime/setup.cc -+++ /src/rime/setup.cc -@@ -5,6 +5,13 @@ - // 2011-10-02 GONG Chen <chen.sst@gmail.com> - // - -+#include <rime/build_config.h> -+ -+#ifdef RIME_ENABLE_EXTERNAL_PLUGINS -+#include <dlfcn.h> -+#include <glob.h> -+#endif // RIME_ENABLE_EXTERNAL_PLUGINS -+ - #ifdef RIME_ENABLE_LOGGING - #include <glog/logging.h> - #endif // RIME_ENABLE_LOGGING -@@ -33,6 +40,32 @@ - mm.LoadModule(module); - } - } -+ -+#ifdef RIME_ENABLE_EXTERNAL_PLUGINS -+ fs::path plugins_dir = fs::path(RIME_PLUGINS_DIR); -+ fs::path plugins_files = plugins_dir / "*.so"; -+ glob_t glob_buffer; -+ if (glob(plugins_files.string().c_str(), 0, NULL, &glob_buffer) == 0) { -+ for (size_t i = 0; i < glob_buffer.gl_pathc; i++) { -+ fs::path plugin_file(glob_buffer.gl_pathv[i]); -+ fs::path plugin_name = plugin_file.stem(); -+ fs::file_status plugin_file_status = fs::status(plugin_file); -+ if (fs::is_regular_file(plugin_file) && -+ plugin_file_status.permissions() & (fs::owner_exe | fs::group_exe | fs::others_exe)) { -+ void* handle = dlopen(plugin_file.string().c_str(), RTLD_LAZY); -+ if (handle) { -+ if (RimeModule* module = mm.Find(plugin_name.string())) { -+ mm.LoadModule(module); -+ } -+ } -+ else { -+ LOG(ERROR) << "dlopen error: " << dlerror(); -+ } -+ } -+ } -+ globfree(&glob_buffer); -+ } -+#endif - } - - // assume member is a non-null pointer in struct *p. diff --git a/app-i18n/librime/files/librime-1.6.1-plugins.patch b/app-i18n/librime/files/librime-1.6.1-plugins.patch deleted file mode 100644 index 68099d618693..000000000000 --- a/app-i18n/librime/files/librime-1.6.1-plugins.patch +++ /dev/null @@ -1,247 +0,0 @@ -https://github.com/rime/librime/issues/431 - ---- /CMakeLists.txt -+++ /CMakeLists.txt -@@ -11,6 +11,14 @@ - - include(GNUInstallDirs) - -+if(NOT DEFINED BIN_INSTALL_DIR) -+ set(BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}) -+endif() -+ -+if(NOT DEFINED LIB_INSTALL_DIR) -+ set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) -+endif() -+ - option(BUILD_SHARED_LIBS "Build Rime as shared library" ON) - option(BUILD_MERGED_PLUGINS "Merge plugins into one Rime library" ON) - option(BUILD_STATIC "Build with dependencies as static libraries" OFF) -@@ -22,8 +30,11 @@ - option(BOOST_USE_CXX11 "Boost has been built with C++11 support" OFF) - option(BOOST_USE_SIGNALS2 "Boost use signals2 instead of signals" ON) - option(ENABLE_ASAN "Enable Address Sanitizer (Unix Only)" OFF) -+option(INSTALL_PRIVATE_HEADERS "Install private headers (usually needed for externally built Rime plugins)" OFF) -+option(ENABLE_EXTERNAL_PLUGINS "Enable loading of externally built Rime plugins (from directory set by RIME_PLUGINS_DIR variable)" OFF) - --set(rime_data_dir "/share/rime-data" CACHE STRING "Target directory for Rime data") -+set(RIME_DATA_DIR "share/rime-data" CACHE STRING "Target directory for Rime data") -+set(RIME_PLUGINS_DIR "${LIB_INSTALL_DIR}/rime-plugins" CACHE STRING "Target directory for externally built Rime plugins") - - if(WIN32) - set(ext ".exe") -@@ -61,7 +72,7 @@ - set(BOOST_COMPONENTS filesystem regex system) - - if(BOOST_USE_SIGNALS2) -- add_definitions("-DBOOST_SIGNALS2") -+ set(RIME_BOOST_SIGNALS2 1) - else() - set(BOOST_COMPONENTS ${BOOST_COMPONENTS} signals) - endif() -@@ -89,7 +100,7 @@ - add_definitions(-DGOOGLE_GLOG_DLL_DECL=) - endif() - -- add_definitions(-DRIME_ENABLE_LOGGING) -+ set(RIME_ENABLE_LOGGING 1) - - endif() - -@@ -134,6 +145,11 @@ - message(WARNING "X11/keysym.h not found.") - endif() - -+configure_file( -+ "${PROJECT_SOURCE_DIR}/src/rime/build_config.h.in" -+ "${PROJECT_BINARY_DIR}/src/rime/build_config.h") -+ -+include_directories(${PROJECT_BINARY_DIR}/src) - include_directories(${PROJECT_SOURCE_DIR}/src) - include_directories(${PROJECT_SOURCE_DIR}/thirdparty/include) - link_directories(${PROJECT_SOURCE_DIR}/thirdparty/lib) -@@ -154,14 +170,6 @@ - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") - endif() - --if(NOT DEFINED LIB_INSTALL_DIR) -- set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) --endif() -- --if(NOT DEFINED BIN_INSTALL_DIR) -- set(BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}) --endif() -- - # uninstall target - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in" -@@ -175,7 +183,8 @@ - set(exec_prefix "${CMAKE_INSTALL_PREFIX}") - set(bindir "${exec_prefix}/${BIN_INSTALL_DIR}") - set(libdir "${exec_prefix}/${LIB_INSTALL_DIR}") -- set(pkgdatadir "${prefix}${rime_data_dir}") -+ set(pkgdatadir "${prefix}/${RIME_DATA_DIR}") -+ set(pluginsdir "${exec_prefix}/${RIME_PLUGINS_DIR}") - set(includedir "${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") - configure_file( - ${PROJECT_SOURCE_DIR}/rime.pc.in -@@ -189,11 +198,19 @@ - - file(GLOB rime_public_header_files ${PROJECT_SOURCE_DIR}/src/*.h) - install(FILES ${rime_public_header_files} DESTINATION include) -+if(INSTALL_PRIVATE_HEADERS) -+ file(GLOB rime_private_header_files ${PROJECT_SOURCE_DIR}/src/rime/*.h ${PROJECT_BINARY_DIR}/src/rime/*.h) -+ install(FILES ${rime_private_header_files} DESTINATION include/rime) -+ foreach(rime_private_header_files_dir algo config dict gear lever) -+ file(GLOB rime_private_header_files ${PROJECT_SOURCE_DIR}/src/rime/${rime_private_header_files_dir}/*.h) -+ install(FILES ${rime_private_header_files} DESTINATION include/rime/${rime_private_header_files_dir}) -+ endforeach() -+endif() - - if(BUILD_DATA) - file(GLOB rime_preset_data_files ${PROJECT_SOURCE_DIR}/data/preset/*.yaml) - install(FILES ${rime_preset_data_files} -- DESTINATION ${CMAKE_INSTALL_PREFIX}${rime_data_dir}) -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/${RIME_DATA_DIR}) - endif() - - if(BUILD_SHARED_LIBS) -@@ -223,6 +240,11 @@ - set(rime_plugins_library rime-plugins) - endif() - -+add_definitions("-DRIME_PLUGINS_DIR=\"${CMAKE_INSTALL_PREFIX}/${RIME_PLUGINS_DIR}\"") -+if(ENABLE_EXTERNAL_PLUGINS) -+ add_definitions(-DRIME_ENABLE_EXTERNAL_PLUGINS) -+endif() -+ - add_subdirectory(src) - - if(BUILD_SHARED_LIBS) ---- /rime.pc.in -+++ /rime.pc.in -@@ -2,6 +2,8 @@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ -+pkgdatadir=@pkgdatadir@ -+pluginsdir=@pluginsdir@ - - Name: Rime - Description: Rime Input Method Engine ---- /src/CMakeLists.txt -+++ /src/CMakeLists.txt -@@ -36,6 +36,9 @@ - if(Gflags_FOUND) - set(rime_optional_deps ${rime_optional_deps} ${Gflags_LIBRARY}) - endif() -+if(ENABLE_EXTERNAL_PLUGINS) -+ set(rime_optional_deps ${rime_optional_deps} dl) -+endif() - - set(rime_core_deps - ${Boost_LIBRARIES} ---- /src/rime/build_config.h.in -+++ /src/rime/build_config.h.in -@@ -0,0 +1,11 @@ -+// -+// Copyright RIME Developers -+// Distributed under the BSD License -+// -+#ifndef RIME_BUILD_CONFIG_H_ -+#define RIME_BUILD_CONFIG_H_ -+ -+#cmakedefine RIME_BOOST_SIGNALS2 -+#cmakedefine RIME_ENABLE_LOGGING -+ -+#endif // RIME_BUILD_CONFIG_H_ ---- /src/rime/common.h -+++ /src/rime/common.h -@@ -7,6 +7,8 @@ - #ifndef RIME_COMMON_H_ - #define RIME_COMMON_H_ - -+#include <rime/build_config.h> -+ - #include <functional> - #include <list> - #include <map> -@@ -20,7 +22,7 @@ - #include <vector> - #include <boost/optional.hpp> - #define BOOST_BIND_NO_PLACEHOLDERS --#ifdef BOOST_SIGNALS2 -+#ifdef RIME_BOOST_SIGNALS2 - #include <boost/signals2/connection.hpp> - #include <boost/signals2/signal.hpp> - #else -@@ -79,7 +81,7 @@ - return std::make_shared<T>(std::forward<Args>(args)...); - } - --#ifdef BOOST_SIGNALS2 -+#ifdef RIME_BOOST_SIGNALS2 - using boost::signals2::connection; - using boost::signals2::signal; - #else ---- /src/rime/lever/deployment_tasks.cc -+++ /src/rime/lever/deployment_tasks.cc -@@ -4,6 +4,9 @@ - // - // 2011-12-10 GONG Chen <chen.sst@gmail.com> - // -+ -+#include <rime/build_config.h> -+ - #include <algorithm> - #include <boost/algorithm/string.hpp> - #include <boost/filesystem.hpp> ---- /src/rime/setup.cc -+++ /src/rime/setup.cc -@@ -5,6 +5,13 @@ - // 2011-10-02 GONG Chen <chen.sst@gmail.com> - // - -+#include <rime/build_config.h> -+ -+#ifdef RIME_ENABLE_EXTERNAL_PLUGINS -+#include <dlfcn.h> -+#include <glob.h> -+#endif // RIME_ENABLE_EXTERNAL_PLUGINS -+ - #ifdef RIME_ENABLE_LOGGING - #include <glog/logging.h> - #endif // RIME_ENABLE_LOGGING -@@ -36,6 +43,32 @@ - mm.LoadModule(module); - } - } -+ -+#ifdef RIME_ENABLE_EXTERNAL_PLUGINS -+ fs::path plugins_dir = fs::path(RIME_PLUGINS_DIR); -+ fs::path plugins_files = plugins_dir / "*.so"; -+ glob_t glob_buffer; -+ if (glob(plugins_files.string().c_str(), 0, NULL, &glob_buffer) == 0) { -+ for (size_t i = 0; i < glob_buffer.gl_pathc; i++) { -+ fs::path plugin_file(glob_buffer.gl_pathv[i]); -+ fs::path plugin_name = plugin_file.stem(); -+ fs::file_status plugin_file_status = fs::status(plugin_file); -+ if (fs::is_regular_file(plugin_file) && -+ plugin_file_status.permissions() & (fs::owner_exe | fs::group_exe | fs::others_exe)) { -+ void* handle = dlopen(plugin_file.string().c_str(), RTLD_LAZY); -+ if (handle) { -+ if (RimeModule* module = mm.Find(plugin_name.string())) { -+ mm.LoadModule(module); -+ } -+ } -+ else { -+ LOG(ERROR) << "dlopen error: " << dlerror(); -+ } -+ } -+ } -+ globfree(&glob_buffer); -+ } -+#endif - } - - // assume member is a non-null pointer in struct *p. diff --git a/app-i18n/librime/librime-1.5.3-r2.ebuild b/app-i18n/librime/librime-1.5.3-r2.ebuild deleted file mode 100644 index bec00f1025a0..000000000000 --- a/app-i18n/librime/librime-1.5.3-r2.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 2012-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake-utils - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/rime/librime" - EGIT_SUBMODULES=() -fi - -DESCRIPTION="RIME (Rime Input Method Engine) core library" -HOMEPAGE="https://rime.im/ https://github.com/rime/librime" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="BSD" -SLOT="0/1" -KEYWORDS="amd64 arm64 ppc ppc64 x86" -IUSE="debug test" -RESTRICT="!test? ( test )" - -BDEPEND="" -RDEPEND="app-i18n/opencc:0= - >=dev-cpp/glog-0.3.5:0= - dev-cpp/yaml-cpp:0= - dev-libs/boost:0=[nls,threads(+)] - dev-libs/leveldb:0= - dev-libs/marisa:0=" -DEPEND="${RDEPEND} - dev-libs/darts - dev-libs/utfcpp - x11-base/xorg-proto - test? ( dev-cpp/gtest )" - -PATCHES=( - "${FILESDIR}/${P}-log_files_mode.patch" -) - -DOCS=(CHANGELOG.md README.md) - -src_prepare() { - # Use headers of dev-libs/darts, dev-libs/utfcpp and x11-base/xorg-proto. - sed -e "/\${PROJECT_SOURCE_DIR}\/thirdparty/d" -i CMakeLists.txt || die - rm -r thirdparty || die - - cmake-utils_src_prepare -} - -src_configure() { - local -x CXXFLAGS="${CXXFLAGS} -I${ESYSROOT}/usr/include/utf8cpp" - - if use debug; then - CXXFLAGS+=" -DDCHECK_ALWAYS_ON" - else - CXXFLAGS+=" -DNDEBUG" - fi - - local mycmakeargs=( - -DBOOST_USE_CXX11=ON - -DBUILD_TEST=$(usex test ON OFF) - -DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Iconv=ON - -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" - ) - - cmake-utils_src_configure -} diff --git a/app-i18n/librime/librime-1.6.0-r1.ebuild b/app-i18n/librime/librime-1.6.0-r1.ebuild deleted file mode 100644 index 77cc61ea01a8..000000000000 --- a/app-i18n/librime/librime-1.6.0-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 2012-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/rime/librime" - EGIT_SUBMODULES=() -fi - -DESCRIPTION="RIME (Rime Input Method Engine) core library" -HOMEPAGE="https://rime.im/ https://github.com/rime/librime" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="BSD" -SLOT="0/1-${PV}" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="debug test" -RESTRICT="!test? ( test )" - -BDEPEND="dev-libs/capnproto:0" -RDEPEND="app-i18n/opencc:0= - >=dev-cpp/glog-0.3.5:0= - dev-cpp/yaml-cpp:0= - dev-libs/boost:0=[threads(+)] - dev-libs/capnproto:0= - dev-libs/leveldb:0= - dev-libs/marisa:0=" -DEPEND="${RDEPEND} - dev-libs/darts - dev-libs/utfcpp - x11-base/xorg-proto - test? ( dev-cpp/gtest )" - -DOCS=(CHANGELOG.md README.md) - -src_prepare() { - eapply "${FILESDIR}/${PN}-1.6.0-boost-1.76.patch" - eapply "${FILESDIR}/${PN}-1.6.0-plugins.patch" - - # Use headers of dev-libs/darts, dev-libs/utfcpp and x11-base/xorg-proto. - sed -e "/\${PROJECT_SOURCE_DIR}\/thirdparty/d" -i CMakeLists.txt || die - rm -r thirdparty || die - - cmake_src_prepare -} - -src_configure() { - local -x CXXFLAGS="${CXXFLAGS} -I${ESYSROOT}/usr/include/utf8cpp" - - if use debug; then - CXXFLAGS+=" -DDCHECK_ALWAYS_ON" - else - CXXFLAGS+=" -DNDEBUG" - fi - - local mycmakeargs=( - -DBOOST_USE_CXX11=ON - -DBUILD_TEST=$(usex test ON OFF) - -DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON - -DENABLE_EXTERNAL_PLUGINS=ON - -DINSTALL_PRIVATE_HEADERS=ON - ) - - cmake_src_configure -} diff --git a/app-i18n/librime/librime-1.6.1-r1.ebuild b/app-i18n/librime/librime-1.6.1-r1.ebuild deleted file mode 100644 index 0f2a5d3dbec4..000000000000 --- a/app-i18n/librime/librime-1.6.1-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 2012-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/rime/librime" - EGIT_SUBMODULES=() -fi - -DESCRIPTION="RIME (Rime Input Method Engine) core library" -HOMEPAGE="https://rime.im/ https://github.com/rime/librime" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="BSD" -SLOT="0/1-${PV}" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="debug test" -RESTRICT="!test? ( test )" - -BDEPEND="dev-libs/capnproto:0" -RDEPEND="app-i18n/opencc:0= - >=dev-cpp/glog-0.3.5:0= - dev-cpp/yaml-cpp:0= - dev-libs/boost:0=[threads(+)] - dev-libs/capnproto:0= - dev-libs/leveldb:0= - dev-libs/marisa:0=" -DEPEND="${RDEPEND} - dev-libs/darts - dev-libs/utfcpp - x11-base/xorg-proto - test? ( dev-cpp/gtest )" - -DOCS=(CHANGELOG.md README.md) - -src_prepare() { - eapply "${FILESDIR}/${PN}-1.6.0-boost-1.76.patch" - eapply "${FILESDIR}/${PN}-1.6.1-plugins.patch" - - # Use headers of dev-libs/darts, dev-libs/utfcpp and x11-base/xorg-proto. - sed -e "/\${PROJECT_SOURCE_DIR}\/thirdparty/d" -i CMakeLists.txt || die - rm -r thirdparty || die - - cmake_src_prepare -} - -src_configure() { - local -x CXXFLAGS="${CXXFLAGS} -I${ESYSROOT}/usr/include/utf8cpp" - - if use debug; then - CXXFLAGS+=" -DDCHECK_ALWAYS_ON" - else - CXXFLAGS+=" -DNDEBUG" - fi - - local mycmakeargs=( - -DBOOST_USE_CXX11=ON - -DBUILD_TEST=$(usex test ON OFF) - -DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON - -DENABLE_EXTERNAL_PLUGINS=ON - -DINSTALL_PRIVATE_HEADERS=ON - ) - - cmake_src_configure -} diff --git a/app-i18n/librime/librime-1.7.3-r1.ebuild b/app-i18n/librime/librime-1.7.3-r1.ebuild index 568aa94ae707..5976ce7ac04b 100644 --- a/app-i18n/librime/librime-1.7.3-r1.ebuild +++ b/app-i18n/librime/librime-1.7.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2021 Gentoo Authors +# Copyright 2012-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -22,7 +22,7 @@ fi LICENSE="BSD" SLOT="0/1-${PV}" -KEYWORDS="amd64 ~arm64 x86" +KEYWORDS="amd64 arm64 ~loong ppc ppc64 ~riscv x86" IUSE="debug test" RESTRICT="!test? ( test )" @@ -30,7 +30,7 @@ BDEPEND="dev-libs/capnproto:0" RDEPEND="app-i18n/opencc:0= >=dev-cpp/glog-0.3.5:0= dev-cpp/yaml-cpp:0= - dev-libs/boost:0=[threads(+)] + dev-libs/boost:= dev-libs/capnproto:0= dev-libs/leveldb:0= dev-libs/marisa:0=" diff --git a/app-i18n/librime/librime-1.9.0.ebuild b/app-i18n/librime/librime-1.9.0.ebuild new file mode 100644 index 000000000000..1c2d933f72f8 --- /dev/null +++ b/app-i18n/librime/librime-1.9.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 2012-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit cmake multiprocessing + +DESCRIPTION="RIME (Rime Input Method Engine) core library" +HOMEPAGE="https://rime.im/ https://github.com/rime/librime" +SRC_URI="https://github.com/rime/librime/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD BSD-2 Boost-1.0 MIT" +SLOT="0/1-${PV}" +KEYWORDS="~amd64 ~loong ~x86" +IUSE="debug test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-cpp/glog:= + >=dev-libs/boost-1.74:= + app-i18n/opencc:0= + dev-cpp/yaml-cpp:0= + dev-libs/leveldb:0= + dev-libs/marisa:0= +" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest ) +" + +DOCS=(CHANGELOG.md README.md) + +src_configure() { + local -x CXXFLAGS="${CXXFLAGS}" + + # for glog + if use debug; then + CXXFLAGS+=" -DDCHECK_ALWAYS_ON" + CMAKE_BUILD_TYPE=Debug + else + CXXFLAGS+=" -DNDEBUG" + fi + + local mycmakeargs=( + -DBUILD_TEST=$(usex test ON OFF) + -DCMAKE_BUILD_PARALLEL_LEVEL=$(makeopts_jobs) + -DENABLE_EXTERNAL_PLUGINS=ON + -DINSTALL_PRIVATE_HEADERS=ON + ) + + cmake_src_configure +} diff --git a/app-i18n/librime/metadata.xml b/app-i18n/librime/metadata.xml index 5ec8c66c846b..45f4d0335154 100644 --- a/app-i18n/librime/metadata.xml +++ b/app-i18n/librime/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> diff --git a/app-i18n/libskk/Manifest b/app-i18n/libskk/Manifest index df8b78b85415..e6aa93a8e4bd 100644 --- a/app-i18n/libskk/Manifest +++ b/app-i18n/libskk/Manifest @@ -1,2 +1 @@ -DIST libskk-1.0.2.tar.gz 867572 BLAKE2B 32f599e83bf7ced796d2f37f6f4bf5e45f47c90e144784b7b3e082866cc619a26e3aca4f16051685baa4d8ac54b0462930193f978bc1e8220b378679269c5833 SHA512 f8fff94b216c18f66bf1004ee068f8d737177f1b70ac36d054d9a68ce02ba9b8d1b7b4127d9a330f64054b2fe06f352070c750a3562d4be36fecf20cb854e6c0 -DIST libskk-1.0.5.tar.xz 564488 BLAKE2B e7108bd2f44e5a0a0756cd25da4b07376b36604d6d2159b283e8a5f4ef76006210ff993d58b653cbce01ae4c9e003acf4acbd93ebc40711fec2600e514c49e9f SHA512 6db675edba89b83da0c29afb42644c39bcb0ccfc47f067a18e0eda817df4f58a86c86e8747080018c132d8734754a6fd8a30fe6578050eb93ff636edeed534ab +DIST libskk-1.0.5_p20210830.tar.gz 190676 BLAKE2B 6b9f058669929efb292692b5047084e2e95e2003a9ecd093205b198bf201249811f672d74e8ee283e6b1f5a94b6a72c79dddb12c950ffe6958ca6aef3aaea5d9 SHA512 2a34111627a43de2d854e2236fd69ec5577b162b097b6e964b891cf09eafaed0d9c3f657bcb1f78ec985a3e2adbed079d37e5e873d1ec35e5f7c66960135ee2b diff --git a/app-i18n/libskk/libskk-1.0.2.ebuild b/app-i18n/libskk/libskk-1.0.2.ebuild deleted file mode 100644 index 593469dc3036..000000000000 --- a/app-i18n/libskk/libskk-1.0.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit vala virtualx - -DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method" -HOMEPAGE="https://github.com/ueno/libskk" -SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+introspection nls static-libs" - -RDEPEND="dev-libs/glib:2 - dev-libs/json-glib - dev-libs/libgee:0.8 - introspection? ( dev-libs/gobject-introspection ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - $(vala_depend) - dev-util/intltool - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -src_prepare() { - vala_src_prepare - default -} - -src_configure() { - econf \ - $(use_enable introspection) \ - $(use_enable nls) \ - $(use_enable static-libs static) -} - -src_test() { - export GSETTINGS_BACKEND="memory" - virtx emake check -} - -src_install() { - default - use static-libs || find "${ED}" -name '*.la' -delete || die -} diff --git a/app-i18n/libskk/libskk-1.0.5.ebuild b/app-i18n/libskk/libskk-1.0.5_p20210830.ebuild index eab92a1f7f0c..ba96b7514156 100644 --- a/app-i18n/libskk/libskk-1.0.5.ebuild +++ b/app-i18n/libskk/libskk-1.0.5_p20210830.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -inherit vala virtualx +inherit autotools vala vcs-snapshot virtualx + +EGIT_COMMIT="5f5e5c2d3facfec9f577fb66032e6f1994ed5d44" DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method" HOMEPAGE="https://github.com/ueno/libskk" -SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.xz" +SRC_URI="https://github.com/ueno/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="+introspection nls static-libs" RDEPEND="dev-libs/glib:2 @@ -20,14 +22,15 @@ RDEPEND="dev-libs/glib:2 x11-libs/libxkbcommon introspection? ( dev-libs/gobject-introspection ) nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - $(vala_depend) +DEPEND="${RDEPEND}" +BDEPEND="$(vala_depend) virtual/pkgconfig nls? ( sys-devel/gettext )" src_prepare() { vala_src_prepare default + eautoreconf } src_configure() { diff --git a/app-i18n/libskk/metadata.xml b/app-i18n/libskk/metadata.xml index 8d9f83d4f2e9..8fa0fa3b5c70 100644 --- a/app-i18n/libskk/metadata.xml +++ b/app-i18n/libskk/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/libtabe/Manifest b/app-i18n/libtabe/Manifest deleted file mode 100644 index ef4285baf21b..000000000000 --- a/app-i18n/libtabe/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST libtabe_0.2.6-1.2.diff.gz 74362 BLAKE2B d09e91bad9e9e3240cdc261140012977f318436af420564692152a8b7a99cd7c427433a6180c1f9490995b43cd95200318ffb5dab68fc18561d7ced58fd00bd6 SHA512 011a76f3c8a1c13a6cfd0e96eb41557a8bfbf1aca8cb79daee0f0941b920d25614df5e0479368bf7075cb511851cab4c9113b30656d55b4d29128eb7312d0ef1 -DIST libtabe_0.2.6.orig.tar.gz 1792199 BLAKE2B fec2259678a57b144eccf49ba459d2930f89f871873b3547040fd570a0f8510bc84e27609b1ca2d82596d5a025f0bd7251870655f4a83758be806f75db5abb48 SHA512 88f1cb279ccf487de5d0f8a1e9eede8d5ca16e4507b59db0b66241d0cdae609ed0b04093a82eabe0569f885aa397c1d5fa3f0ae3c3270a348ce045d73e01fbc7 diff --git a/app-i18n/libtabe/files/libtabe-0.2.6-fabs.patch b/app-i18n/libtabe/files/libtabe-0.2.6-fabs.patch deleted file mode 100644 index 79964602e754..000000000000 --- a/app-i18n/libtabe/files/libtabe-0.2.6-fabs.patch +++ /dev/null @@ -1,24 +0,0 @@ - * QA Notice: Package has poor programming practices which may compile - * fine but exhibit random runtime failures. - * tabe_tsi.c:385: warning: incompatible implicit declaration of built-in function ‘fabs’ - * tabe_tsi.c:437: warning: incompatible implicit declaration of built-in function ‘fabs’ - * tabe_tsi.c:496: warning: incompatible implicit declaration of built-in function ‘fabs’ - * Please do not file a Gentoo bug and instead report the above QA - * issues directly to the upstream developers of this software. - * Homepage: https://packages.qa.debian.org/libt/libtabe.html - -diff -NrU5 libtabe-0.2.6.orig.really/src/tabe_tsi.c libtabe-0.2.6.orig/src/tabe_tsi.c ---- libtabe-0.2.6.orig.really/src/tabe_tsi.c 2008-04-20 01:35:56.000000000 +0200 -+++ libtabe-0.2.6.orig/src/tabe_tsi.c 2008-04-20 01:36:46.000000000 +0200 -@@ -12,10 +12,11 @@ - #endif - - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <math.h> - - #include "tabe.h" - - struct TsiInfo * - tabeTsiInfoNew(char *str) diff --git a/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch b/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch deleted file mode 100644 index 0f51b19b71f2..000000000000 --- a/app-i18n/libtabe/files/libtabe-0.2.6-ldflags.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/src/Makefile.in b/src/Makefile.in -index ada3dca..6acd71c 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -10,7 +10,7 @@ CPPFLAGS = @CPPFLAGS@ - DEFS = @DEFS@ - RANLIB = @RANLIB@ - LN_S = @LN_S@ --LDFLAGS = @with_db_lib@ -+LDFLAGS = @with_db_lib@ @LDFLAGS@ - INC = @with_db_inc@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -55,7 +55,7 @@ all: $(LIBNAME) @build_supports@ - - $(LIBNAME): $(LIBOBJS) - $(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \ -- -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) -+ -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) $(LDFLAGS) - - bims: - (cd supports/bims; $(MAKE)) -diff --git a/src/supports/bims/Makefile.in b/src/supports/bims/Makefile.in -index dc2534d..0e3041b 100644 ---- a/src/supports/bims/Makefile.in -+++ b/src/supports/bims/Makefile.in -@@ -10,7 +10,7 @@ CPPFLAGS = @CPPFLAGS@ - DEFS = @DEFS@ - RANLIB = @RANLIB@ - LN_S = @LN_S@ --LDFLAGS = @with_db_lib@ -+LDFLAGS = @with_db_lib@ @LDFLAGS@ - INC = -I../.. - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -45,7 +45,7 @@ all: $(LIBNAME) - - $(LIBNAME): $(LIBOBJS) - $(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \ -- -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) -+ -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) $(LDFLAGS) - - bims.lo: bims.c bims.h - $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(DEFS) $(INC) -o $@ bims.c -diff --git a/util/Makefile.in b/util/Makefile.in -index cb82736..16425d1 100644 ---- a/util/Makefile.in -+++ b/util/Makefile.in -@@ -10,7 +10,7 @@ CPPFLAGS = @CPPFLAGS@ - DEFS = @DEFS@ - RANLIB = @RANLIB@ - LN_S = @LN_S@ --LDFLAGS = ../src/libtabe.la @with_db_lib@ -+LDFLAGS = ../src/libtabe.la @with_db_lib@ @LDFLAGS@ - INC = -I../src @with_db_inc@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff --git a/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild b/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild deleted file mode 100644 index 62e347d8caf9..000000000000 --- a/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -WANT_AUTOMAKE=1.11 - -inherit autotools - -DEBIAN_PV=$(ver_rs 3 '-') -DEBIAN_PATCH=${PN}_${DEBIAN_PV}.diff -ORIG_PV=${DEBIAN_PV%-*} -ORIG_P=${PN}-${ORIG_PV} - -DESCRIPTION="Libtabe provides bimsphone support for xcin-2.5+" -HOMEPAGE="https://packages.qa.debian.org/libt/libtabe.html" -SRC_URI=" - mirror://debian/pool/main/${PN:0:4}/${PN}/${PN}_${ORIG_PV}.orig.tar.gz - mirror://debian/pool/main/${PN:0:4}/libtabe/${DEBIAN_PATCH}.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="debug" - -RDEPEND=">=sys-libs/db-4.5:=" -DEPEND=" - ${RDEPEND} - x11-libs/libX11" - -S=${WORKDIR}/${ORIG_P}.orig - -PATCHES=( - "${WORKDIR}"/${DEBIAN_PATCH} - "${FILESDIR}"/${ORIG_P}-fabs.patch - "${FILESDIR}"/${ORIG_P}-ldflags.patch -) - -src_prepare() { - default - - ln -s script/configure.in configure.ac || die - eautoreconf -} - -src_configure() { - econf \ - --with-db-inc="${EPREFIX}"/usr/include \ - --with-db-lib="${EPREFIX}"/usr/$(get_libdir) \ - --with-db-bin="${EPREFIX}"/usr/bin \ - --with-db-name=db \ - --enable-shared \ - --disable-static \ - $(use_enable debug) -} - -src_compile() { - # We execute this serially because the Makefiles don't handle - # proper cross-directory references. - emake -C src - emake -C util - emake -C tsi-src -} - -src_install() { - default - dodoc -r doc/. - - # no static archives - find "${D}" -name '*.la' -delete || die -} diff --git a/app-i18n/libtabe/metadata.xml b/app-i18n/libtabe/metadata.xml deleted file mode 100644 index c921b96adf6c..000000000000 --- a/app-i18n/libtabe/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> -</maintainer> -</pkgmetadata> diff --git a/app-i18n/man-pages-it/Manifest b/app-i18n/man-pages-it/Manifest deleted file mode 100644 index b442c578791e..000000000000 --- a/app-i18n/man-pages-it/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST man-pages-it-5.06.tar.xz 363716 BLAKE2B 57ac90d11a76217ead0f201ed4f8cfd0bc5f08b97662023a540f1150fc8fb6804980e6770cc7d707097d732645ebc9b3b85feb15736d7e925df2711a3f32ba6e SHA512 d4d89bba004265c70b6f0220b0172798677174e8034ece4a15c21432423ec904d0a3b7614987a165950c4f28af02c1b9374f536982771307b78617479139f900 diff --git a/app-i18n/man-pages-it/man-pages-it-5.06-r1.ebuild b/app-i18n/man-pages-it/man-pages-it-5.06-r1.ebuild deleted file mode 100644 index f64599a295c1..000000000000 --- a/app-i18n/man-pages-it/man-pages-it-5.06-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="A somewhat comprehensive collection of Italian Linux man pages" -HOMEPAGE="http://it.tldp.org/man/" -SRC_URI="ftp://ftp.pluto.it/pub/pluto/ildp/man/${P}.tar.xz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="" - -RDEPEND="virtual/man" - -src_prepare() { - default - # Remove man page provided by sys-apps/shadow - rm man-pages/man5/passwd.5 || die -} - -src_compile() { :; } # emake does bad things here - -src_install() { - doman -i18n=it man-pages/man[1-9]/* binutils/man[1-9]/* inetutils/man[1-9]/* \ - util-linux/man[1-9]/* misc/man[1-9]/* - - dodoc description README CHANGELOG -} diff --git a/app-i18n/man-pages-it/metadata.xml b/app-i18n/man-pages-it/metadata.xml deleted file mode 100644 index 65484e7dc6cb..000000000000 --- a/app-i18n/man-pages-it/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <maintainer status="active"> - <email>giulio@pluto.it</email> - <name>Giulio Daprelà </name> - </maintainer> - </upstream> -</pkgmetadata> diff --git a/app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild b/app-i18n/man-pages-ja/man-pages-ja-20180315-r2.ebuild index c47b047c074e..ba2f16849e9e 100644 --- a/app-i18n/man-pages-ja/man-pages-ja-20180315-r1.ebuild +++ b/app-i18n/man-pages-ja/man-pages-ja-20180315-r2.ebuild @@ -1,23 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 + GENTOO_MAN_P="portage-${PN}-20060415" -DESCRIPTION="A collection of manual pages translated into Japanese" +DESCRIPTION="Collection of manual pages translated into Japanese" HOMEPAGE="http://linuxjm.osdn.jp/ https://github.com/hattya/portage-man-pages-ja" SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz https://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz" LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" RDEPEND="virtual/man" src_prepare() { - sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die # remove man pages that are provided by other packages. @@ -41,24 +40,21 @@ src_compile() { } src_install() { - local x y z pkg - for x in $(tac script/pkgs.list | grep -v '^[#].*'); do - if [[ -z "$pkg" ]]; then - pkg=$x + if [[ -z ${pkg} ]]; then + pkg=${x} continue fi - if [[ "$x" == "N" ]]; then + if [[ ${x} == "N" ]]; then pkg= continue fi - einfo "install $pkg" - - for y in $(ls -d manual/$pkg/man* 2>/dev/null); do - doman -i18n=ja $y/* + einfo "install ${pkg}" + for y in $(ls -d manual/${pkg}/man* 2>/dev/null); do + doman -i18n=ja ${y}/* done pkg= @@ -69,21 +65,19 @@ src_install() { cd "${WORKDIR}"/${GENTOO_MAN_P} for x in *; do - if [ -d "$x" ]; then - einfo "install $x" + if [[ -d ${x} ]]; then + einfo "install ${x}" - for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do - doman -i18n=ja $x/*.$z + for z in $(for y in ${x}/*.[1-9]; do echo ${y##*.}; done | sort -u); do + doman -i18n=ja ${x}/*.${z} done fi done newdoc ChangeLog ChangeLog.GentooJP - } pkg_postinst() { - echo elog "JM (Japanese Manual) project has used utf8 encoding" elog "since 2012/04." @@ -93,5 +87,4 @@ pkg_postinst() { elog "\tLANG=\"ja_JP.utf8\"" elog "\texport LANG" echo - } diff --git a/app-i18n/man-pages-ja/metadata.xml b/app-i18n/man-pages-ja/metadata.xml index 763d89885235..f65126ea5b95 100644 --- a/app-i18n/man-pages-ja/metadata.xml +++ b/app-i18n/man-pages-ja/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> @@ -14,6 +14,7 @@ </longdescription> <stabilize-allarches/> <upstream> - <remote-id type="sourceforge-jp">linuxjm</remote-id> + <remote-id type="osdn">linuxjm</remote-id> + <remote-id type="github">hattya/portage-man-pages-ja</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/man-pages-l10n/Manifest b/app-i18n/man-pages-l10n/Manifest index 79bf0d247c45..18c9fee18b40 100644 --- a/app-i18n/man-pages-l10n/Manifest +++ b/app-i18n/man-pages-l10n/Manifest @@ -1,2 +1,2 @@ -DIST manpages-l10n-v4.10.0.tar.bz2 64760050 BLAKE2B b70d8b0a48050538f7af90c248f3132dadd69e9eca0e3f438aeb6b8086aed8f70ee4d54af3608c602910fcfac68d1283971a9a1869b3854d1802794c56837b58 SHA512 59f5daa7acf29252af2c733d7084bfe9bccbbec19f5e8cf1855df420835fd934e072479149d679a90ae4e52330763599a20fbb5bc8459b8a44e5bcc1628ab501 -DIST manpages-l10n-v4.2.0.tar.bz2 51747352 BLAKE2B 97c3e3fdb11b47753c9c179751fb001af0a9f79324d594d297981735f82b3917bd31fc5c100462d6093e621a98773f23543548efb957113ade39e9c315cd4d72 SHA512 b2de542fdb97868b5fa96f24947c7a37216dc6a6a5ee66142023dd1036017f7128ca26ac8367b0edbd76cfa049174892749efafef9dbf4221e90dd9166b82652 +DIST manpages-l10n-4.18.1.tar.bz2 110701567 BLAKE2B 107529345eabf24a2c63ef859504ff5b0d0a44fbb521f82053e03ab7c6e8ca7d1c147d36554a488f5b99d25b1aa326c50b2d61d2c1d2b7f0de959447647a372a SHA512 7975aa7118eaefee3dceba5f60be5a413abb9a48d1ec51c536bda9a742ece897196df17633349b55aac37b76319d0360f7dadbe9191514551cb7d0496710a690 +DIST manpages-l10n-4.19.0.tar.bz2 112228176 BLAKE2B fd00f3b2881814ac80cb3da07202b5d7a9842b197b1313f70780e33af6b6a10981497fb1d75fb0d8d9d84e99533ce9702cf2bc6191d8dd9f1d11ac3209bea629 SHA512 036f9dd647504c168b0a9aaed757dbb583c2a3ca5431cddb370b1c8bac220228037a699420d6c2e184b046784d3eea2e96b439649e2617b6160e485d4d358011 diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild deleted file mode 100644 index cc7410ba4530..000000000000 --- a/app-i18n/man-pages-l10n/man-pages-l10n-4.10.0.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="${PN/-}-v${PV}" -DESCRIPTION="A somewhat comprehensive collection of man page translations" -HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/" -SRC_URI="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v${PV}/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -MY_L10N=(de es fr it nl pl pt-BR ro) -IUSE="${MY_L10N[@]/#/l10n_}" -REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )" - -RDEPEND="virtual/man - l10n_de? ( !app-i18n/man-pages-de ) - l10n_fr? ( !app-i18n/man-pages-fr ) - l10n_it? ( !app-i18n/man-pages-it ) - l10n_nl? ( !app-i18n/man-pages-nl ) - l10n_pl? ( !app-i18n/man-pages-pl )" - -BDEPEND="app-text/po4a - dev-lang/perl" - -DOCS=(AUTHORS.md CHANGES.md README.md) - -src_prepare() { - default - sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die - - # some packages have their own translations - local noinst_manpages=( - # app-arch/xz-utils - de/xz.1 - de/xzdec.1 - de/xzdiff.1 - de/xzgrep.1 - de/xzless.1 - de/xzmore.1 - # sys-apps/shadow - {de,es,nl,pl}/groups.1 - de/su.1 - # sys-process/procps - {de,fr,pl}/free.1 - {de,fr}/pgrep.1 - {de,fr}/pmap.1 - {de,fr,pl}/ps.1 - {de,fr}/pwdx.1 - {de,fr}/tload.1 - {de,fr,pl}/uptime.1 - {de,fr}/sysctl.conf.5 - {de,fr}/sysctl.8 - {de,fr}/vmstat.8 - # sys-process/psmisc - {de,nl,pl}/fuser.1 - {de,pl}/killall.1 - de/peekfd.1 - de/prtstat.1 - de/pslog.1 - {de,pl}/pstree.1 - ) - printf '%s\n' "${noinst_manpages[@]}" \ - | sed 's%^\(.*\)/\(.*\)\.\(.*\)$%po/\1/man\3/\2.\3.po%' | xargs rm - assert -} - -src_configure() { - econf --enable-compression=none -} diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.18.1-r1.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.18.1-r1.ebuild new file mode 100644 index 000000000000..1e9cb8b4dd2f --- /dev/null +++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.18.1-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A somewhat comprehensive collection of man page translations" +HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/" +SRC_URI="https://salsa.debian.org/manpages-l10n-team/${PN/-}/-/archive/${PV}/${P/-}.tar.bz2" +S="${WORKDIR}/${P/-}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +# fa and ko omitted because of build failures (patches are welcome!) +MY_L10N=(cs da de el es fi fr hu id it mk nb nl pl pt-BR ro ru sr sv uk vi) +IUSE="${MY_L10N[@]/#/l10n_}" +REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )" + +RDEPEND="virtual/man + l10n_it? ( !app-i18n/man-pages-it ) + l10n_ru? ( !app-i18n/man-pages-ru )" + +BDEPEND="app-text/po4a + dev-lang/perl" + +DOCS=(AUTHORS.md CHANGES.md CONTRIBUTING.md COPYRIGHT.md README.md) + +src_prepare() { + default + sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die + + # some packages have their own translations + local f noinst_manpages=( + # app-arch/xz-utils + xz.1 + xzdec.1 + xzdiff.1 + xzgrep.1 + xzless.1 + xzmore.1 + # sys-apps/shadow + groups.1 + su.1 + # sys-apps/sysvinit + last.1 + mesg.1 + mountpoint.1 + utmpdump.1 + wall.1 + halt.8 + killall5.8 + runlevel.8 + shutdown.8 + sulogin.8 + # sys-process/procps + free.1 + pgrep.1 + pmap.1 + ps.1 + pwdx.1 + tload.1 + uptime.1 + sysctl.conf.5 + sysctl.8 + vmstat.8 + # sys-process/psmisc + fuser.1 + killall.1 + peekfd.1 + prtstat.1 + pslog.1 + pstree.1 + ) + + for f in "${noinst_manpages[@]}"; do + rm po/*/"man${f##*.}/${f}.po" || die + done +} + +src_configure() { + econf --enable-compression=none +} diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.19.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.19.0.ebuild new file mode 100644 index 000000000000..09afcbdd3df6 --- /dev/null +++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.19.0.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A somewhat comprehensive collection of man page translations" +HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/" +SRC_URI="https://salsa.debian.org/manpages-l10n-team/${PN/-}/-/archive/${PV}/${P/-}.tar.bz2" +S="${WORKDIR}/${P/-}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +# fa and ko omitted because of build failures (patches are welcome!) +MY_L10N=(cs da de el es fi fr hu id it mk nb nl pl pt-BR ro ru sr sv uk vi) +IUSE="${MY_L10N[@]/#/l10n_}" +# require at least one language lest we install an empty package +# pkgcheck warning: RequiredUseDefaults +REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )" + +RDEPEND="virtual/man + l10n_it? ( !app-i18n/man-pages-it ) + l10n_ru? ( !app-i18n/man-pages-ru )" + +BDEPEND="app-text/po4a + dev-lang/perl" + +DOCS=(AUTHORS.md CHANGES.md CONTRIBUTING.md COPYRIGHT.md README.md) + +src_prepare() { + default + sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die + + # some packages have their own translations + local f noinst_manpages=( + # app-arch/xz-utils + xz.1 + xzdec.1 + xzdiff.1 + xzgrep.1 + xzless.1 + xzmore.1 + # sys-apps/shadow + groups.1 + su.1 + # sys-apps/sysvinit + last.1 + mesg.1 + mountpoint.1 + utmpdump.1 + wall.1 + halt.8 + killall5.8 + runlevel.8 + shutdown.8 + sulogin.8 + # sys-process/procps + free.1 + pgrep.1 + pmap.1 + ps.1 + pwdx.1 + tload.1 + uptime.1 + sysctl.conf.5 + sysctl.8 + vmstat.8 + # sys-process/psmisc + fuser.1 + killall.1 + peekfd.1 + prtstat.1 + pslog.1 + pstree.1 + ) + + for f in "${noinst_manpages[@]}"; do + rm po/*/"man${f##*.}/${f}.po" || die + done +} + +src_configure() { + econf --enable-compression=none +} diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild deleted file mode 100644 index 5d58f5e413a2..000000000000 --- a/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="${PN/-}-v${PV}" -DESCRIPTION="A somewhat comprehensive collection of man page translations" -HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/" -SRC_URI="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v${PV}/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -# build failure for es and it, so omit them for now #769314 -MY_L10N=(de fr nl pl pt-BR ro) -IUSE="${MY_L10N[@]/#/l10n_}" -REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )" - -RDEPEND="virtual/man - l10n_de? ( !app-i18n/man-pages-de ) - l10n_fr? ( !app-i18n/man-pages-fr ) - l10n_nl? ( !app-i18n/man-pages-nl ) - l10n_pl? ( !app-i18n/man-pages-pl )" - -BDEPEND="app-text/po4a - dev-lang/perl" - -DOCS=(AUTHORS.md CHANGES.md README.md) - -src_prepare() { - default - sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die - - # some packages have their own translations - local noinst_manpages=( - # app-arch/xz-utils - de/xz.1 - de/xzdec.1 - de/xzdiff.1 - de/xzgrep.1 - de/xzless.1 - de/xzmore.1 - # sys-apps/shadow - {de,nl,pl}/groups.1 - de/su.1 - # sys-process/procps - {de,fr,pl}/free.1 - {de,fr}/pgrep.1 - {de,fr}/pmap.1 - {de,fr,pl}/ps.1 - {de,fr}/pwdx.1 - {de,fr}/tload.1 - {de,fr,pl}/uptime.1 - {de,fr}/sysctl.conf.5 - {de,fr}/sysctl.8 - {de,fr}/vmstat.8 - # sys-process/psmisc - {de,nl,pl}/fuser.1 - {de,pl}/killall.1 - de/peekfd.1 - de/prtstat.1 - de/pslog.1 - {de,pl}/pstree.1 - ) - printf '%s\n' "${noinst_manpages[@]}" \ - | sed 's%^\(.*\)/\(.*\)\.\(.*\)$%po/\1/man\3/\2.\3.po%' | xargs rm - assert -} - -src_configure() { - econf --enable-compression=none -} diff --git a/app-i18n/man-pages-l10n/metadata.xml b/app-i18n/man-pages-l10n/metadata.xml index 7fccbc10bd18..07376844207e 100644 --- a/app-i18n/man-pages-l10n/metadata.xml +++ b/app-i18n/man-pages-l10n/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>ulm@gentoo.org</email> diff --git a/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild b/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild index c22c58267e9a..5a2de3d11ef1 100644 --- a/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild +++ b/app-i18n/man-pages-ru/man-pages-ru-5.03.2390.2390.20191017-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/${PN}/source-tar/${PN}_${MY_PV}.tar.bz LICENSE="FDL-1.3" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" RDEPEND="virtual/man" diff --git a/app-i18n/man-pages-ru/metadata.xml b/app-i18n/man-pages-ru/metadata.xml index d38c2811a3aa..13f597b1bf7c 100644 --- a/app-i18n/man-pages-ru/metadata.xml +++ b/app-i18n/man-pages-ru/metadata.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>pinkbyte@gentoo.org</email> <name>Sergey Popov</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="sourceforge">man-pages-ru</remote-id> <maintainer> diff --git a/app-i18n/man-pages-zh_CN/Manifest b/app-i18n/man-pages-zh_CN/Manifest index 6ade4c0f0bf3..0f785c2638a7 100644 --- a/app-i18n/man-pages-zh_CN/Manifest +++ b/app-i18n/man-pages-zh_CN/Manifest @@ -1 +1,2 @@ -DIST man-pages-zh_CN-1.6.3.2.tar.gz 1845997 BLAKE2B 3af6859593e4b2a52ef3ce93f2d18fe0f102e63cee3c7035de04ab4d8b8ac491ceff284b1a2f01a5e4dcdc4869c2a9768ff7dfde48b9e89813a2e558bf7b259e SHA512 61171406482a24c3dfd1b6303af3d7fb086466d5f05d5799f50488beb78c91c5d1bcf574aab669b71fa0f027691a0be1a1d254d08f823ff4bd8bf976e0c83dff +DIST man-pages-zh_CN-1.6.3.6.tar.gz 1861327 BLAKE2B 59a806aadd0ab6584a51efec8cf8e0e3ff88f589db48dd01d586534f81a06cbdc86efc7541bd9ced778b8ecc915e0f1baded882951fb60138e197f7b6b259d60 SHA512 dc9ecd461eba41fc30658e028f853e3664fc6ce27c5b48c3159c5c8a452ad6d71730e0e5f551efa7b4c358baf010ba27a855457ae69b21e9637af326044dcca8 +DIST man-pages-zh_CN-1.6.4.0.tar.gz 1859827 BLAKE2B a97ca00bec60aa5a272310ac8e3a31bcb84e9a43a0a70a863e54a663671a4f6a2471364b468b93502777ed38f980ea559e782c109385fcfc33182aac76f7fbb3 SHA512 35f928cbc084b830db7a7e89213d706bad216f79f6937452e35abf577631c0d575cbd5cf8f51cd3e9547a163f64f4afd914251f4a26daa48e256c6076edfb133 diff --git a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.6.ebuild index 506aaac3a01f..bf0b42db9fd3 100644 --- a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild +++ b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.6.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 DESCRIPTION="A somewhat comprehensive collection of Chinese Linux man pages" HOMEPAGE="https://github.com/man-pages-zh/manpages-zh" @@ -12,18 +12,11 @@ S="${WORKDIR}/${MY_P}" LICENSE="FDL-1.2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="" RDEPEND="virtual/man" -src_prepare() { - # remove man pages that are provided by other packages. - rm src/man1/groups.1 || die - - eapply_user -} - src_configure() { : } @@ -33,6 +26,10 @@ src_compile() { } src_install() { + # groups' zh_CN manpage is alrealy provided by sys-apps/shadow + # to avoid file collision, we have to remove it + rm src/man1/groups.1 || die + doman -i18n=zh_CN src/man?/*.[1-9]* dodoc README.md AUTHORS ChangeLog NEWS } diff --git a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.4.0.ebuild b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.4.0.ebuild new file mode 100644 index 000000000000..6e447ff9be0a --- /dev/null +++ b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.4.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A somewhat comprehensive collection of Chinese Linux man pages" +HOMEPAGE="https://github.com/man-pages-zh/manpages-zh" +MY_PN="manpages-zh" +MY_P="${MY_PN}-${PV}" +SRC_URI="https://github.com/man-pages-zh/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="FDL-1.2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="" + +RDEPEND="virtual/man" + +src_configure() { + : +} + +src_compile() { + : +} + +src_install() { + # groups' zh_CN manpage is alrealy provided by sys-apps/shadow + # to avoid file collision, we have to remove it + rm src/man1/groups.1 || die + + doman -i18n=zh_CN src/man?/*.[1-9]* + dodoc README.md AUTHORS ChangeLog NEWS +} diff --git a/app-i18n/man-pages-zh_CN/metadata.xml b/app-i18n/man-pages-zh_CN/metadata.xml index 6f49eba8f496..c1d5fff9b9ab 100644 --- a/app-i18n/man-pages-zh_CN/metadata.xml +++ b/app-i18n/man-pages-zh_CN/metadata.xml @@ -1,5 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>petrus.zy.07@gmail.com</email> + <name>Petrus Zhao</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <stabilize-allarches/> + <upstream> + <remote-id type="github">man-pages-zh/manpages-zh</remote-id> + </upstream> </pkgmetadata> diff --git a/app-i18n/mecab-skkserv/files/mecab-skkserv-missing-strcmp-clang16.patch b/app-i18n/mecab-skkserv/files/mecab-skkserv-missing-strcmp-clang16.patch new file mode 100644 index 000000000000..dee8284c8d8e --- /dev/null +++ b/app-i18n/mecab-skkserv/files/mecab-skkserv-missing-strcmp-clang16.patch @@ -0,0 +1,11 @@ +Closes: https://bugs.gentoo.org/894518 +--- a/getopt.c ++++ b/getopt.c +@@ -40,6 +40,7 @@ + #endif + + #include <stdio.h> ++#include <string.h> + + /* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C diff --git a/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild b/app-i18n/mecab-skkserv/mecab-skkserv-0.03-r1.ebuild index 3f49e98dfc96..7bb86ee64ec9 100644 --- a/app-i18n/mecab-skkserv/mecab-skkserv-0.03.ebuild +++ b/app-i18n/mecab-skkserv/mecab-skkserv-0.03-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="8" inherit autotools @@ -22,6 +22,7 @@ PATCHES=( "${FILESDIR}"/${PN}-cflags.patch "${FILESDIR}"/${PN}-dicrc.patch "${FILESDIR}"/${PN}-getopt.patch + "${FILESDIR}"/${PN}-missing-strcmp-clang16.patch ) HTML_DOCS=( index.html ${PN}.css ) diff --git a/app-i18n/mecab-skkserv/metadata.xml b/app-i18n/mecab-skkserv/metadata.xml index e1a49f498885..491c88b3a31f 100644 --- a/app-i18n/mecab-skkserv/metadata.xml +++ b/app-i18n/mecab-skkserv/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/metadata.xml b/app-i18n/metadata.xml index 9129ba2a84bf..cd63023e4ca9 100644 --- a/app-i18n/metadata.xml +++ b/app-i18n/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The app-i18n category contains internationalisation-related packages. diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest index c9793aee241a..29bb052622e7 100644 --- a/app-i18n/mozc/Manifest +++ b/app-i18n/mozc/Manifest @@ -1,7 +1,4 @@ -DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B 709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3 SHA512 e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0 -DIST fcitx-mozc-2.26.4220-20201219202429.tar.gz 37174759 BLAKE2B 3f320523103ee7a35a763f6613889e282e8a654db8ef11b5a1168db12611387e300621f015977875ffec3c10c055e36b3cb525a1e8559013f3ac42bc5b0cc296 SHA512 823e64267aa69e4d30dd7408f946a54072994f9a2d68691a3d393b216a15e70fd28bcb24705f9d9f483a2291517c48c5a1aeda893d2315f9a1d9cd352fb3feb2 -DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7 +DIST fcitx-mozc-2.28.5029.102-2.28.5029.102.tar.gz 37246575 BLAKE2B 54381968e33870f2d9f769184cf49428548d04de66e767140c8f053fad7873f1b2e3b02be81ce54e51b824d2c9cd971da37bff8b60efe60c9e2c748ff298afbd SHA512 4962e9505b79d4680a260c257719ba2486a6fe127018298758728faa9535504bc2dd6b1bfb430ac2982cb377cda52c145430531afd0968f49f91d366fdd43d92 DIST japanese-usage-dictionary-20180701040110.tar.gz 71285 BLAKE2B dfad056a1d5061b6764f583da15b9ad60a3c4421cee0430c4665d1c2779a64f9b31473c1746a3e2b9bda5167349432e51dcf7d4d48f75fde9543e9c16ff74c0d SHA512 68b4d3f52dd6cd4f00a8012a870b4f5929519cd69815b1729f3881d1f964802308f4aa101e236824b4c0f832183a9e8097437ed620403f2a652f126e7cdc1eb3 -DIST mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch 40296 BLAKE2B 982f43fa68031eb0f779ec4d034fef838a4fce7834291db889c9edffba3df4acd5bfdf187dd4a52ee8fd0714de943f9d5112070cd69502e1449dab4dbf8543b2 SHA512 6e05b2f22663ddbfb24a8344928ec24c0b4cf523728c1623367970b8f263142af95c056c82d0827414833d5b9f26c3a024a04a688851021601a5cbcc1474e754 -DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f -DIST mozc-2.26.4220-20201212102434.tar.gz 37106063 BLAKE2B 7d3c236809c8feb017f35e3f7a9b024ac34204f483c69913a2d1ae6b771054548f7f81afde35ed3a6887c9f7503584cee0fc646653fc7cde6fd015158de9c3d3 SHA512 9d87947b9b9256a3cc66cb23ab6caf4b6974142090b0d315c101bdc700fd289c259d09cb7f02f5f9e7462f48d652cd2d5b4822a645751fdcaed88b939520c429 +DIST mozc-2.28.5029.102-2.28.5029.102.tar.gz 37247099 BLAKE2B 4bb528991102d34a26321e6fa00a73cc83cb103e0b765f1ebb837dd6894387288b13ed75cc255003d07d6f0c4a82f963684fa4f2bd9b5043cfaddb57a5f5cef0 SHA512 b20aa45757db92f66d1c135eacf907b4cec937226a8d09e5f9f6768ae22a6b8464e3b75276773ce55413f2002ffcc3d8cae136e7fd3acfc0733e48bccf848d5b +DIST mozc-2.28.5029.102-patches.tar.xz 224380 BLAKE2B 377d2cac6ec8a9c90661f10c0b105d8347ca8080ec43cee3dfd4660feadfe2d9b204d6e4b9e22bd11a5fdbbf26e7f6f298b703b88fb1621ea1847741408c1953 SHA512 5836a19ea68de271475b3ca1efce928b0ad012c96ff7ecdc4474b05daf8b8df022203eb46ec839b76e7d50be7a75b8f278d534d762fac0e612a8f09ae13c7c16 diff --git a/app-i18n/mozc/files/mozc-2.20.2673.102-tests_build.patch b/app-i18n/mozc/files/mozc-2.20.2673.102-tests_build.patch deleted file mode 100644 index b8b4477437f8..000000000000 --- a/app-i18n/mozc/files/mozc-2.20.2673.102-tests_build.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- /src/net/json_util_test.cc -+++ /src/net/json_util_test.cc -@@ -784,13 +784,13 @@ - for (size_t i = 0; i < arraysize(kNumS32ValueKeys); ++i) { - { - Json::Value json_value; -- json_value[kNumS32ValueKeys[i]] = -2147483649ll; -+ json_value[kNumS32ValueKeys[i]] = static_cast<Json::Value::Int64>(-2147483649ll); - TestMsg msg; - EXPECT_FALSE(JsonUtil::JsonValueToProtobufMessage(json_value, &msg)); - } - { - Json::Value json_value; -- json_value[kNumS32ValueKeys[i]] = 2147483648ull; -+ json_value[kNumS32ValueKeys[i]] = static_cast<Json::Value::UInt64>(2147483648ull); - TestMsg msg; - EXPECT_FALSE(JsonUtil::JsonValueToProtobufMessage(json_value, &msg)); - } -@@ -805,7 +805,7 @@ - } - { - Json::Value json_value; -- json_value[kNumU32ValueKeys[i]] = 4294967296ull; -+ json_value[kNumU32ValueKeys[i]] = static_cast<Json::Value::UInt64>(4294967296ull); - TestMsg msg; - EXPECT_FALSE(JsonUtil::JsonValueToProtobufMessage(json_value, &msg)); - } diff --git a/app-i18n/mozc/files/mozc-2.20.2673.102-tests_skipping.patch b/app-i18n/mozc/files/mozc-2.20.2673.102-tests_skipping.patch deleted file mode 100644 index 28c5486de50d..000000000000 --- a/app-i18n/mozc/files/mozc-2.20.2673.102-tests_skipping.patch +++ /dev/null @@ -1,70 +0,0 @@ -Disable test leaving mozc_server orphan process. - ---- /src/unix/ibus/mozc_engine_test.cc -+++ /src/unix/ibus/mozc_engine_test.cc -@@ -41,65 +41,5 @@ - namespace mozc { - namespace ibus { - --class LaunchToolTest : public testing::Test { -- public: -- LaunchToolTest() { -- g_type_init(); -- } -- -- protected: -- virtual void SetUp() { -- mozc_engine_.reset(new MozcEngine()); -- -- mock_ = new client::ClientMock(); -- mock_->ClearFunctionCounter(); -- mozc_engine_->client_.reset(mock_); -- } -- -- virtual void TearDown() { -- mozc_engine_.reset(); -- } -- -- client::ClientMock* mock_; -- unique_ptr<MozcEngine> mozc_engine_; -- -- private: -- DISALLOW_COPY_AND_ASSIGN(LaunchToolTest); --}; -- --TEST_F(LaunchToolTest, LaunchToolTest) { -- commands::Output output; -- -- // Launch config dialog -- mock_->ClearFunctionCounter(); -- mock_->SetBoolFunctionReturn("LaunchToolWithProtoBuf", true); -- output.set_launch_tool_mode(commands::Output::CONFIG_DIALOG); -- EXPECT_TRUE(mozc_engine_->LaunchTool(output)); -- -- // Launch dictionary tool -- mock_->ClearFunctionCounter(); -- mock_->SetBoolFunctionReturn("LaunchToolWithProtoBuf", true); -- output.set_launch_tool_mode(commands::Output::DICTIONARY_TOOL); -- EXPECT_TRUE(mozc_engine_->LaunchTool(output)); -- -- // Launch word register dialog -- mock_->ClearFunctionCounter(); -- mock_->SetBoolFunctionReturn("LaunchToolWithProtoBuf", true); -- output.set_launch_tool_mode(commands::Output::WORD_REGISTER_DIALOG); -- EXPECT_TRUE(mozc_engine_->LaunchTool(output)); -- -- // Launch no tool(means do nothing) -- mock_->ClearFunctionCounter(); -- mock_->SetBoolFunctionReturn("LaunchToolWithProtoBuf", false); -- output.set_launch_tool_mode(commands::Output::NO_TOOL); -- EXPECT_FALSE(mozc_engine_->LaunchTool(output)); -- -- // Something occurring in client::Client::LaunchTool -- mock_->ClearFunctionCounter(); -- mock_->SetBoolFunctionReturn("LaunchToolWithProtoBuf", false); -- output.set_launch_tool_mode(commands::Output::CONFIG_DIALOG); -- EXPECT_FALSE(mozc_engine_->LaunchTool(output)); --} -- - } // namespace ibus - } // namespace mozc diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-environmental_variables.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-environmental_variables.patch deleted file mode 100644 index 02e522a32e9e..000000000000 --- a/app-i18n/mozc/files/mozc-2.23.2815.102-environmental_variables.patch +++ /dev/null @@ -1,132 +0,0 @@ -https://github.com/google/mozc/issues/470 - ---- /src/base/system_util.cc -+++ /src/base/system_util.cc -@@ -208,28 +208,39 @@ - dir_ = "/"; - return; - #else // MOZC_USE_PEPPER_FILE_IO -+ const char *configuration_directory_env; - string dir; - - #ifdef OS_WIN -- DCHECK(SUCCEEDED(Singleton<LocalAppDataDirectoryCache>::get()->result())); -- dir = Singleton<LocalAppDataDirectoryCache>::get()->path(); -+ configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY"); -+ if (configuration_directory_env) { -+ dir = configuration_directory_env; -+ } else { -+ DCHECK(SUCCEEDED(Singleton<LocalAppDataDirectoryCache>::get()->result())); -+ dir = Singleton<LocalAppDataDirectoryCache>::get()->path(); - #ifdef GOOGLE_JAPANESE_INPUT_BUILD -- dir = FileUtil::JoinPath(dir, kCompanyNameInEnglish); -- FileUtil::CreateDirectory(dir); -+ dir = FileUtil::JoinPath(dir, kCompanyNameInEnglish); -+ FileUtil::CreateDirectory(dir); - #endif // GOOGLE_JAPANESE_INPUT_BUILD -- dir = FileUtil::JoinPath(dir, kProductNameInEnglish); -+ dir = FileUtil::JoinPath(dir, kProductNameInEnglish); -+ } - - #elif defined(OS_MACOSX) -- dir = MacUtil::GetApplicationSupportDirectory(); -+ configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY"); -+ if (configuration_directory_env) { -+ dir = configuration_directory_env; -+ } else { -+ dir = MacUtil::GetApplicationSupportDirectory(); - #ifdef GOOGLE_JAPANESE_INPUT_BUILD -- dir = FileUtil::JoinPath(dir, "Google"); -- // The permission of ~/Library/Application Support/Google seems to be 0755. -- // TODO(komatsu): nice to make a wrapper function. -- ::mkdir(dir.c_str(), 0755); -- dir = FileUtil::JoinPath(dir, "JapaneseInput"); -+ dir = FileUtil::JoinPath(dir, "Google"); -+ // The permission of ~/Library/Application Support/Google seems to be 0755. -+ // TODO(komatsu): nice to make a wrapper function. -+ ::mkdir(dir.c_str(), 0755); -+ dir = FileUtil::JoinPath(dir, "JapaneseInput"); - #else // GOOGLE_JAPANESE_INPUT_BUILD -- dir = FileUtil::JoinPath(dir, "Mozc"); -+ dir = FileUtil::JoinPath(dir, "Mozc"); - #endif // GOOGLE_JAPANESE_INPUT_BUILD -+ } - - #elif defined(OS_ANDROID) - // For android, we do nothing here because user profile directory, -@@ -237,14 +248,24 @@ - // is injected from Java layer. - - #else // !OS_WIN && !OS_MACOSX && !OS_ANDROID -- char buf[1024]; -- struct passwd pw, *ppw; -- const uid_t uid = geteuid(); -- CHECK_EQ(0, getpwuid_r(uid, &pw, buf, sizeof(buf), &ppw)) -- << "Can't get passwd entry for uid " << uid << "."; -- CHECK_LT(0, strlen(pw.pw_dir)) -- << "Home directory for uid " << uid << " is not set."; -- dir = FileUtil::JoinPath(pw.pw_dir, ".mozc"); -+ configuration_directory_env = ::getenv("MOZC_CONFIGURATION_DIRECTORY"); -+ if (configuration_directory_env) { -+ dir = configuration_directory_env; -+ } else { -+ const char *home_env = ::getenv("HOME"); -+ if (home_env) { -+ dir = FileUtil::JoinPath(home_env, ".mozc"); -+ } else { -+ char buf[1024]; -+ struct passwd pw, *ppw; -+ const uid_t uid = geteuid(); -+ CHECK_EQ(0, getpwuid_r(uid, &pw, buf, sizeof(buf), &ppw)) -+ << "Can't get passwd entry for uid " << uid << "."; -+ CHECK_LT(0, strlen(pw.pw_dir)) -+ << "Home directory for uid " << uid << " is not set."; -+ dir = FileUtil::JoinPath(pw.pw_dir, ".mozc"); -+ } -+ } - #endif // !OS_WIN && !OS_MACOSX && !OS_ANDROID - - FileUtil::CreateDirectory(dir); -@@ -356,6 +377,10 @@ - #endif // OS_WIN - - string SystemUtil::GetServerDirectory() { -+ const char *server_directory_env = ::getenv("MOZC_SERVER_DIRECTORY"); -+ if (server_directory_env) { -+ return server_directory_env; -+ } - #ifdef OS_WIN - DCHECK(SUCCEEDED(Singleton<ProgramFilesX86Cache>::get()->result())); - #if defined(GOOGLE_JAPANESE_INPUT_BUILD) -@@ -409,6 +434,10 @@ - } - - string SystemUtil::GetDocumentDirectory() { -+ const char *documents_directory_env = ::getenv("MOZC_DOCUMENTS_DIRECTORY"); -+ if (documents_directory_env) { -+ return documents_directory_env; -+ } - #if defined(OS_MACOSX) - return GetServerDirectory(); - #elif defined(MOZC_DOCUMENT_DIRECTORY) ---- /src/handwriting/zinnia_handwriting.cc -+++ /src/handwriting/zinnia_handwriting.cc -@@ -31,6 +31,7 @@ - - #include "handwriting/zinnia_handwriting.h" - -+#include <cstdlib> - #include <memory> - #include <string> - -@@ -48,6 +49,10 @@ - - // static - string ZinniaHandwriting::GetModelFileName() { -+ const char *zinnia_model_file_env = ::getenv("MOZC_ZINNIA_MODEL_FILE"); -+ if (zinnia_model_file_env) { -+ return zinnia_model_file_env; -+ } - #if defined(MOZC_BUILD) - return MOZC_ZINNIA_MODEL_FILE; - #else diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch deleted file mode 100644 index 07514048e7a4..000000000000 --- a/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/google/mozc/issues/441 - ---- /src/prediction/zero_query_dict.h -+++ /src/prediction/zero_query_dict.h -@@ -147,6 +147,17 @@ - return iter; - } - -+ iterator &operator--() { -+ ptr_ -= kTokenByteSize; -+ return *this; -+ } -+ -+ iterator operator--(int) { -+ const iterator tmp(ptr_, string_array_); -+ ptr_ -= kTokenByteSize; -+ return tmp; -+ } -+ - iterator &operator-=(ptrdiff_t n) { - ptr_ -= n * kTokenByteSize; - return *this; diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_1.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_1.patch deleted file mode 100644 index 2b9bbd720cde..000000000000 --- a/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_1.patch +++ /dev/null @@ -1,621 +0,0 @@ -https://github.com/google/mozc/issues/462 - ---- /src/base/gen_character_set.py -+++ /src/base/gen_character_set.py -@@ -33,7 +33,6 @@ - import itertools - import optparse - import re --import string - import sys - - -@@ -89,7 +88,8 @@ - @staticmethod - def _LoadTable(filename, column_index, pattern, validater): - result = set() -- for line in open(filename): -+ fh = open(filename) -+ for line in fh: - if line.startswith('#'): - # Skip a comment line. - continue -@@ -100,6 +100,7 @@ - ucs = int(match.group(1), 16) - if validater(ucs): - result.add(ucs) -+ fh.close() - - return result - -@@ -250,7 +251,7 @@ - # (at most) four code points. - bit_list = [] - for _, group in itertools.groupby(enumerate(category_list), -- lambda (codepoint, _): codepoint / 4): -+ lambda x: x[0] // 4): - # Fill bits from LSB to MSB for each group. - bits = 0 - for index, (_, category) in enumerate(group): -@@ -263,7 +264,7 @@ - - # Output the content. Each line would have (at most) 16 bytes. - for _, group in itertools.groupby(enumerate(bit_list), -- lambda (index, _): index / 16): -+ lambda x: x[0] // 16): - line = [' \"'] - for _, bits in group: - line.append('\\x%02X' % bits) -@@ -386,7 +387,7 @@ - # Bitmap lookup. - # TODO(hidehiko): the bitmap has two huge 0-bits ranges. Reduce them. - category_map = [ -- (bits, category) for category, bits in CATEGORY_BITMAP.iteritems()] -+ (bits, category) for category, bits in CATEGORY_BITMAP.items()] - category_map.sort() - - lines.extend([ -@@ -451,7 +452,7 @@ - options.jisx0213file) - category_list = [ - categorizer.GetCategory(codepoint) -- for codepoint in xrange(categorizer.MaxCodePoint() + 1)] -+ for codepoint in range(categorizer.MaxCodePoint() + 1)] - generated_character_set_header = GenerateCharacterSetHeader(category_list) - - # Write the result. ---- /src/base/gen_config_file_stream_data.py -+++ /src/base/gen_config_file_stream_data.py -@@ -58,7 +58,7 @@ - result = [] - result.append(' { "%s", "' % os.path.basename(path)) - with open(path, 'rb') as stream: -- result.extend(r'\x%02X' % ord(byte) for byte in stream.read()) -+ result.extend(r'\x%02X' % byte for byte in stream.read()) - result.append('", %d }' % os.path.getsize(path)) - - return ''.join(result) -@@ -93,8 +93,8 @@ - def main(): - (options, args) = ParseOptions() - if not options.output: -- print >>sys.stderr, ( -- 'usage: gen_config_file_stream_data.py --output=filepath input ...') -+ print('usage: gen_config_file_stream_data.py --output=filepath input ...', -+ file=sys.stderr) - sys.exit(2) - - with open(options.output, 'w') as output: ---- /src/build_mozc.py -+++ /src/build_mozc.py -@@ -943,7 +943,7 @@ - logging.info('running %s...', binary) - try: - test_function(binary, gtest_report_dir, options) -- except RunOrDieError, e: -+ except RunOrDieError as e: - logging.error(e) - failed_tests.append(binary) - else: -@@ -1082,7 +1082,7 @@ - # and '-c' and 'Release' are build options. - targets = [] - build_options = [] -- for i in xrange(len(args)): -+ for i in range(len(args)): - if args[i].startswith('-'): - # starting with build options - build_options = args[i:] -@@ -1190,14 +1190,14 @@ - - def ShowHelpAndExit(): - """Shows the help message.""" -- print 'Usage: build_mozc.py COMMAND [ARGS]' -- print 'Commands: ' -- print ' gyp Generate project files.' -- print ' build Build the specified target.' -- print ' runtests Build all tests and run them.' -- print ' clean Clean all the build files and directories.' -- print '' -- print 'See also the comment in the script for typical usage.' -+ print('Usage: build_mozc.py COMMAND [ARGS]') -+ print('Commands: ') -+ print(' gyp Generate project files.') -+ print(' build Build the specified target.') -+ print(' runtests Build all tests and run them.') -+ print(' clean Clean all the build files and directories.') -+ print('') -+ print('See also the comment in the script for typical usage.') - sys.exit(1) - - ---- /src/build_tools/android_util.py -+++ /src/build_tools/android_util.py -@@ -548,7 +548,7 @@ - (devices_result, _) = process.communicate() - used_ports = set(int(port) for port - in re.findall(r'emulator-(\d+)', devices_result)) -- return [port for port in xrange(5554, 5586, 2) if port not in used_ports] -+ return [port for port in range(5554, 5586, 2) if port not in used_ports] - - - def SetUpTestingSdkHomeDirectory(dest_android_sdk_home, -@@ -575,7 +575,7 @@ - 'create', 'avd', - '--force', - '--sdcard', '512M',] -- for key, value in options.iteritems(): -+ for key, value in options.items(): - args.extend([key, value]) - env = {'ANDROID_SDK_HOME': os.path.abspath(dest_android_sdk_home)} - logging.info('Creating AVD: %s', args) -@@ -615,7 +615,7 @@ - def main(): - for arg in sys.argv[1:]: - for item in sorted(GetApkProperties(arg).items()): -- print '%s: %s' % item -+ print('%s: %s' % item) - - - if __name__ == '__main__': ---- /src/build_tools/binary_size_checker.py -+++ /src/build_tools/binary_size_checker.py -@@ -70,12 +70,12 @@ - actual_size = os.stat(filename).st_size - expected_size = EXPECTED_MAXIMUM_SIZES[basename] - if actual_size < expected_size * 1024 * 1024: -- print 'Pass: %s (size: %d) is smaller than expected (%d MB)' % ( -- filename, actual_size, expected_size) -+ print('Pass: %s (size: %d) is smaller than expected (%d MB)' % ( -+ filename, actual_size, expected_size)) - return True - else: -- print 'WARNING: %s (size: %d) is larger than expected (%d MB)' % ( -- filename, actual_size, expected_size) -+ print('WARNING: %s (size: %d) is larger than expected (%d MB)' % ( -+ filename, actual_size, expected_size)) - return False - - ---- /src/build_tools/build_and_sign_pkg_mac.py -+++ /src/build_tools/build_and_sign_pkg_mac.py -@@ -44,8 +44,8 @@ - import shutil - import sys - --from util import PrintErrorAndExit --from util import RunOrDie -+from .util import PrintErrorAndExit -+from .util import RunOrDie - - - def ParseOption(): ---- /src/build_tools/build_breakpad.py -+++ /src/build_tools/build_breakpad.py -@@ -54,9 +54,9 @@ - try: - subprocess.check_output(command) - except subprocess.CalledProcessError as e: -- print e.output -+ print(e.output) - sys.exit(e.returncode) -- print 'Done: %s' % ' '.join(command) -+ print('Done: %s' % ' '.join(command)) - - - def Xcodebuild(projdir, target, arch, sdk, outdir): ---- /src/build_tools/build_diskimage_mac.py -+++ /src/build_tools/build_diskimage_mac.py -@@ -90,7 +90,7 @@ - # setup volume directory - temp_dir = tempfile.mkdtemp() - CopyFile(path.join(build_dir, ".keystone_install"), temp_dir) -- os.chmod(path.join(temp_dir, ".keystone_install"), 0755) # rwxr-xr-x -+ os.chmod(path.join(temp_dir, ".keystone_install"), 0o755) # rwxr-xr-x - for a in args: - CopyFile(path.join(build_dir, a), temp_dir) - ---- /src/build_tools/change_reference_mac.py -+++ /src/build_tools/change_reference_mac.py -@@ -41,8 +41,8 @@ - import optparse - import os - --from util import PrintErrorAndExit --from util import RunOrDie -+from .util import PrintErrorAndExit -+from .util import RunOrDie - - - def ParseOption(): ---- /src/build_tools/code_generator_util.py -+++ /src/build_tools/code_generator_util.py -@@ -33,27 +33,26 @@ - __author__ = "hidehiko" - - import struct --import types - - - def ToCppStringLiteral(s): - """Returns C-style string literal, or NULL if given s is None.""" - if s is None: -- return 'NULL' -+ return b'NULL' - -- if all(0x20 <= ord(c) <= 0x7E for c in s): -+ if all(0x20 <= c <= 0x7E for c in s): - # All characters are in ascii code. -- return '"%s"' % s.replace('\\', r'\\').replace('"', r'\"') -+ return b'"%b"' % s.replace(b'\\', br'\\').replace(b'"', br'\"') - else: - # One or more characters are non-ascii. -- return '"%s"' % ''.join(r'\x%02X' % ord(c) for c in s) -+ return b'"%b"' % b''.join(br'\x%02X' % c for c in s) - - - def FormatWithCppEscape(format_text, *args): - """Returns a string filling format with args.""" - literal_list = [] - for arg in args: -- if isinstance(arg, (types.StringType, types.NoneType)): -+ if isinstance(arg, (bytes, type(None))): - arg = ToCppStringLiteral(arg) - literal_list.append(arg) - -@@ -95,7 +94,7 @@ - if target_compiler and target_compiler.startswith('msvs'): - stream.write('const uint64 k%s_data_wordtype[] = {\n' % variable_name) - -- for word_index in xrange(0, len(data), 8): -+ for word_index in range(0, len(data), 8): - word_chunk = data[word_index:word_index + 8].ljust(8, '\x00') - stream.write('0x%016X, ' % struct.unpack('<Q', word_chunk)) - if (word_index / 8) % 4 == 3: -@@ -111,7 +110,7 @@ - stream.write('const char k%s_data[] =\n' % variable_name) - # Output 16bytes per line. - chunk_size = 16 -- for index in xrange(0, len(data), chunk_size): -+ for index in range(0, len(data), chunk_size): - chunk = data[index:index + chunk_size] - stream.write('"') - stream.writelines(r'\x%02X' % ord(c) for c in chunk) -@@ -126,36 +125,50 @@ - if type(codepoint_list) is int: - codepoint_list = (codepoint_list,) - if codepoint_list is None or len(codepoint_list) == 0: -- return 'null' -- result = r'"' -+ return b'null' -+ result = b'"' - for codepoint in codepoint_list: -- utf16_string = unichr(codepoint).encode('utf-16be') -+ utf16_string = chr(codepoint).encode('utf-16be') - if len(utf16_string) == 2: - (u0, l0) = utf16_string -- result += r'\u%02X%02X' % (ord(u0), ord(l0)) -+ result += br'\u%02X%02X' % (u0, l0) - else: - (u0, l0, u1, l1) = utf16_string -- result += r'\u%02X%02X\u%02X%02X' % (ord(u0), ord(l0), ord(u1), ord(l1)) -- result += r'"' -+ result += br'\u%02X%02X\u%02X%02X' % (u0, l0, u1, l1) -+ result += b'"' - return result - - - def SkipLineComment(stream, comment_prefix='#'): - """Skips line comments from stream.""" - for line in stream: -+ if isinstance(line, bytes): -+ if isinstance(comment_prefix, str): -+ comment_prefix = comment_prefix.encode('utf-8') -+ line_ending = b'\n' -+ else: -+ line_ending = '\n' - stripped_line = line.strip() - if stripped_line and not stripped_line.startswith(comment_prefix): -- yield line.rstrip('\n') -+ yield line.rstrip(line_ending) - - - def ParseColumnStream(stream, num_column=None, delimiter=None): - """Returns parsed columns read from stream.""" - if num_column is None: - for line in stream: -- yield line.rstrip('\n').split(delimiter) -+ if isinstance(line, bytes): -+ line_ending = b'\n' -+ else: -+ line_ending = '\n' -+ yield line.rstrip(line_ending).split(delimiter) - else: - for line in stream: -- yield line.rstrip('\n').split(delimiter)[:num_column] -+ if isinstance(line, bytes): -+ line_ending = b'\n' -+ else: -+ line_ending = '\n' -+ yield line.rstrip(line_ending).split(delimiter)[:num_column] - - - def SelectColumn(stream, column_index): -@@ -172,5 +185,5 @@ - grouper extends the last chunk to make it an n-element chunk by adding - appropriate value, but this returns truncated chunk. - """ -- for index in xrange(0, len(iterable), n): -+ for index in range(0, len(iterable), n): - yield iterable[index:index + n] ---- /src/build_tools/codesign_mac.py -+++ /src/build_tools/codesign_mac.py -@@ -46,17 +46,17 @@ - - def RunOrDie(command): - """Run the command, or die if it failed.""" -- print "Running: " + command -+ print("Running: " + command) - try: - output = subprocess.check_output(command, shell=True) -- print >> sys.stderr, "==========" -- print >> sys.stderr, "COMMAND: " + command -- print >> sys.stderr, output -+ print("==========", file=sys.stderr) -+ print("COMMAND: " + command, file=sys.stderr) -+ print(output, file=sys.stderr) - except subprocess.CalledProcessError as e: -- print >> sys.stderr, "==========" -- print >> sys.stderr, "ERROR: " + command -- print >> sys.stderr, e.output -- print >> sys.stderr, "==========" -+ print("==========", file=sys.stderr) -+ print("ERROR: " + command, file=sys.stderr) -+ print(e.output, file=sys.stderr) -+ print("==========", file=sys.stderr) - sys.exit(1) - - -@@ -119,18 +119,18 @@ - (options, unused_args) = parser.parse_args() - - if not options.target: -- print "Error: --target should be specified." -- print parser.print_help() -+ print("Error: --target should be specified.") -+ print(parser.print_help()) - sys.exit(1) - - return options - - - def DumpEnviron(): -- print "=== os.environ ===" -+ print("=== os.environ ===") - for key in sorted(os.environ): -- print "%s = %s" % (key, os.getenv(key)) -- print "==================" -+ print("%s = %s" % (key, os.getenv(key))) -+ print("==================") - - - def main(): ---- /src/build_tools/copy_dll_and_symbol.py -+++ /src/build_tools/copy_dll_and_symbol.py -@@ -38,7 +38,7 @@ - import os - import shutil - --from util import PrintErrorAndExit -+from .util import PrintErrorAndExit - - def ParseOption(): - """Parse command line options.""" -@@ -98,7 +98,7 @@ - if _GetLastModifiedTime(src) <= target_file_mtime: - # Older file found. Ignore. - continue -- print 'Copying %s to %s' % (src, target_file_abspath) -+ print('Copying %s to %s' % (src, target_file_abspath)) - shutil.copy2(src, target_file_abspath) - break - ---- /src/build_tools/copy_file.py -+++ /src/build_tools/copy_file.py -@@ -52,7 +52,7 @@ - Args: - message: The error message to be printed to stderr. - """ -- print >>sys.stderr, message -+ print(message, file=sys.stderr) - sys.exit(1) - - ---- /src/build_tools/copy_qt_frameworks_mac.py -+++ /src/build_tools/copy_qt_frameworks_mac.py -@@ -41,9 +41,9 @@ - import optparse - import os - --from copy_file import CopyFiles --from util import PrintErrorAndExit --from util import RunOrDie -+from .copy_file import CopyFiles -+from .util import PrintErrorAndExit -+from .util import RunOrDie - - - def ParseOption(): ---- /src/build_tools/embed_file.py -+++ /src/build_tools/embed_file.py -@@ -46,10 +46,10 @@ - - def _FormatAsUint64LittleEndian(s): - """Formats a string as uint64 value in little endian order.""" -- for _ in xrange(len(s), 8): -- s += '\0' -+ for _ in range(len(s), 8): -+ s += b'\0' - s = s[::-1] # Reverse the string -- return '0x%s' % binascii.b2a_hex(s) -+ return b'0x%b' % binascii.b2a_hex(s) - - - def main(): -@@ -57,30 +57,30 @@ - with open(opts.input, 'rb') as infile: - with open(opts.output, 'wb') as outfile: - outfile.write( -- '#ifdef MOZC_EMBEDDED_FILE_%(name)s\n' -- '#error "%(name)s was already included or defined elsewhere"\n' -- '#else\n' -- '#define MOZC_EMBEDDED_FILE_%(name)s\n' -- 'const uint64 %(name)s_data[] = {\n' -- % {'name': opts.name}) -+ b'#ifdef MOZC_EMBEDDED_FILE_%(name)b\n' -+ b'#error "%(name)b was already included or defined elsewhere"\n' -+ b'#else\n' -+ b'#define MOZC_EMBEDDED_FILE_%(name)b\n' -+ b'const uint64 %(name)b_data[] = {\n' -+ % {b'name': opts.name.encode('utf-8')}) - - while True: - chunk = infile.read(8) - if not chunk: - break -- outfile.write(' ') -+ outfile.write(b' ') - outfile.write(_FormatAsUint64LittleEndian(chunk)) -- outfile.write(',\n') -+ outfile.write(b',\n') - - outfile.write( -- '};\n' -- 'const EmbeddedFile %(name)s = {\n' -- ' %(name)s_data,\n' -- ' %(size)d,\n' -- '};\n' -- '#endif // MOZC_EMBEDDED_FILE_%(name)s\n' -- % {'name': opts.name, -- 'size': os.stat(opts.input).st_size}) -+ b'};\n' -+ b'const EmbeddedFile %(name)b = {\n' -+ b' %(name)b_data,\n' -+ b' %(size)d,\n' -+ b'};\n' -+ b'#endif // MOZC_EMBEDDED_FILE_%(name)b\n' -+ % {b'name': opts.name.encode('utf-8'), -+ b'size': os.stat(opts.input).st_size}) - - - if __name__ == '__main__': ---- /src/build_tools/embed_pathname.py -+++ /src/build_tools/embed_pathname.py -@@ -28,7 +28,7 @@ - # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --"""A script to embed the given (relative) path name to C/C++ characters array. -+r"""A script to embed the given (relative) path name to C/C++ characters array. - - Example: - ./embed_pathname.py --path_to_be_embedded=d:\data\mozc -@@ -53,7 +53,7 @@ - - (options, unused_args) = parser.parse_args() - if not all(vars(options).values()): -- print parser.print_help() -+ print(parser.print_help()) - sys.exit(1) - - return options -@@ -63,7 +63,7 @@ - opt = ParseOption() - path = os.path.abspath(opt.path_to_be_embedded) - # TODO(yukawa): Consider the case of non-ASCII characters. -- escaped_path = path.encode('string-escape') -+ escaped_path = path.replace('\\', '\\\\') - with open(opt.output, 'w') as output_file: - output_file.write( - 'const char %s[] = "%s";\n' % (opt.constant_name, escaped_path)) ---- /src/build_tools/ensure_gyp_module_path.py -+++ /src/build_tools/ensure_gyp_module_path.py -@@ -48,7 +48,7 @@ - - (options, _) = parser.parse_args() - if not options.expected: -- print parser.print_help() -+ print(parser.print_help()) - sys.exit(1) - - return options -@@ -59,20 +59,20 @@ - opt = ParseOption() - expected_path = os.path.abspath(opt.expected) - if not os.path.exists(expected_path): -- print '%s does not exist.' % expected_path -+ print('%s does not exist.' % expected_path) - sys.exit(1) - - try: - import gyp # NOLINT - except ImportError as e: -- print 'import gyp failed: %s' % e -+ print('import gyp failed: %s' % e) - sys.exit(1) - - actual_path = os.path.abspath(gyp.__path__[0]) - if expected_path != actual_path: -- print 'Unexpected gyp module is loaded on this environment.' -- print ' expected: %s' % expected_path -- print ' actual : %s' % actual_path -+ print('Unexpected gyp module is loaded on this environment.') -+ print(' expected: %s' % expected_path) -+ print(' actual : %s' % actual_path) - sys.exit(1) - - if __name__ == '__main__': ---- /src/build_tools/gen_win32_resource_header.py -+++ /src/build_tools/gen_win32_resource_header.py -@@ -39,7 +39,7 @@ - __author__ = "yukawa" - - import logging --import mozc_version -+from . import mozc_version - import optparse - import os - import sys ---- /src/build_tools/mozc_version.py -+++ /src/build_tools/mozc_version.py -@@ -94,7 +94,7 @@ - last_digit = TARGET_PLATFORM_TO_DIGIT.get(target_platform, None) - if last_digit is None: - logging.critical('target_platform %s is invalid. Accetable ones are %s', -- target_platform, TARGET_PLATFORM_TO_DIGIT.keys()) -+ target_platform, list(TARGET_PLATFORM_TO_DIGIT.keys())) - sys.exit(1) - - if not revision: -@@ -314,13 +314,14 @@ - self._properties = {} - if not os.path.isfile(path): - return -- for line in open(path): -- matchobj = re.match(r'(\w+)=(.*)', line.strip()) -- if matchobj: -- var = matchobj.group(1) -- val = matchobj.group(2) -- if var not in self._properties: -- self._properties[var] = val -+ with open(path) as file: -+ for line in file: -+ matchobj = re.match(r'(\w+)=(.*)', line.strip()) -+ if matchobj: -+ var = matchobj.group(1) -+ val = matchobj.group(2) -+ if var not in self._properties: -+ self._properties[var] = val - - # Check mandatory properties. - for key in VERSION_PROPERTIES: diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_2.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_2.patch deleted file mode 100644 index 456e8368049a..000000000000 --- a/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_2.patch +++ /dev/null @@ -1,600 +0,0 @@ -https://github.com/google/mozc/issues/462 - ---- /src/build_tools/redirect.py -+++ /src/build_tools/redirect.py -@@ -58,14 +58,15 @@ - process = subprocess.Popen(sys.argv, stdout=subprocess.PIPE, - universal_newlines=True) - except: -- print '==========' -- print ' ERROR: %s' % ' '.join(sys.argv) -- print '==========' -+ print('==========') -+ print(' ERROR: %s' % ' '.join(sys.argv)) -+ print('==========') - raise - (stdout_content, _) = process.communicate() - # Write the stdout content to the output file. - output_file = open(output_file_name, 'w') - output_file.write(stdout_content) -+ output_file.close() - return process.wait() - - if __name__ == '__main__': ---- /src/build_tools/run_after_chdir.py -+++ /src/build_tools/run_after_chdir.py -@@ -57,7 +57,7 @@ - sys.argv.insert(0, sys.executable) # Inject the python interpreter path. - # We don't capture stdout and stderr from Popen. The output will just - # be emitted to a terminal or console. -- print sys.argv -+ print(sys.argv) - sys.exit(subprocess.call(sys.argv)) - - if __name__ == '__main__': ---- /src/build_tools/serialized_string_array_builder.py -+++ /src/build_tools/serialized_string_array_builder.py -@@ -58,11 +58,11 @@ - f.write(struct.pack('<I', array_size)) - - # Offset and length array of (4 + 4) * array_size bytes. -- for i in xrange(array_size): -+ for i in range(array_size): - f.write(struct.pack('<I', offsets[i])) - f.write(struct.pack('<I', lengths[i])) - - # Strings chunk. -- for i in xrange(array_size): -+ for i in range(array_size): - f.write(strings[i]) -- f.write('\0') -+ f.write(b'\0') ---- /src/build_tools/test_tools/gtest_report.py -+++ /src/build_tools/test_tools/gtest_report.py -@@ -36,9 +36,9 @@ - - __author__ = "nona" - --import cStringIO as StringIO -+import io - import logging --from xml.etree import cElementTree as ElementTree -+from xml.etree import ElementTree - - - class Failure(object): -@@ -87,13 +87,13 @@ - """Returns summarized error report text.""" - if self.fail_num == 0: - return '' -- output = StringIO.StringIO() -+ output = io.StringIO() - for testcase in self.testcases: - if not testcase.failures: - continue -- print >>output, '%s.%s:' % (self.name, testcase.name) -+ print('%s.%s:' % (self.name, testcase.name), file=output) - for failure in testcase.failures: -- print >>output, failure.contents.encode('utf-8') -+ print(failure.contents.encode('utf-8'), file=output) - return output.getvalue() - - @classmethod ---- /src/build_tools/test_tools/test_launcher.py -+++ /src/build_tools/test_tools/test_launcher.py -@@ -101,11 +101,11 @@ - time.sleep(1) - try: - shutil.rmtree(self._path) -- except OSError, e: -+ except OSError as e: - logging.error('Failed to remove %s. error: %s', self._path, e) - - --def _ExecuteTest((command, gtest_report_dir)): -+def _ExecuteTest(args): - """Executes tests with specified Test command. - - Args: -@@ -122,6 +122,7 @@ - module, which is used in multiprocessing module. - (http://docs.python.org/library/pickle.html) - """ -+ (command, gtest_report_dir) = args - binary = command[0] - binary_filename = os.path.basename(binary) - tmp_dir = tempfile.mkdtemp() ---- /src/build_tools/tweak_data.py -+++ /src/build_tools/tweak_data.py -@@ -55,7 +55,7 @@ - The value for the variable if the variable is defined in the - environment. Otherwise original string is returned. - """ -- if environment.has_key(matchobj.group(1)): -+ if matchobj.group(1) in environment: - return environment[matchobj.group(1)] - return matchobj.group(0) - ---- /src/build_tools/tweak_info_plist.py -+++ /src/build_tools/tweak_info_plist.py -@@ -42,8 +42,8 @@ - import logging - import optparse - import sys --import mozc_version --import tweak_data -+from . import mozc_version -+from . import tweak_data - - _COPYRIGHT_YEAR = datetime.date.today().year - -@@ -81,7 +81,7 @@ - - version = mozc_version.MozcVersion(options.version_file) - -- copyright_message = (u'© %d Google Inc.' % _COPYRIGHT_YEAR).encode('utf-8') -+ copyright_message = ('© %d Google Inc.' % _COPYRIGHT_YEAR).encode('utf-8') - long_version = version.GetVersionString() - short_version = version.GetVersionInFormat('@MAJOR@.@MINOR@.@BUILD@') - ---- /src/build_tools/tweak_info_plist_strings.py -+++ /src/build_tools/tweak_info_plist_strings.py -@@ -40,7 +40,7 @@ - import logging - import optparse - import sys --import tweak_data -+from . import tweak_data - - _COPYRIGHT_YEAR = datetime.date.today().year - -@@ -77,7 +77,7 @@ - if options.branding == 'GoogleJapaneseInput': - variables = { - 'CF_BUNDLE_NAME_EN': 'Google Japanese Input', -- 'CF_BUNDLE_NAME_JA': u'Google 日本語入力'.encode('utf-8'), -+ 'CF_BUNDLE_NAME_JA': 'Google 日本語入力'.encode('utf-8'), - 'NS_HUMAN_READABLE_COPYRIGHT': copyright_message, - 'INPUT_MODE_ANNOTATION': 'Google', - } ---- /src/build_tools/tweak_macinstaller_script.py -+++ /src/build_tools/tweak_macinstaller_script.py -@@ -39,7 +39,7 @@ - import logging - import optparse - --import mozc_version -+from . import mozc_version - - - def _ReplaceVariables(data, environment): ---- /src/build_tools/tweak_pkgproj.py -+++ /src/build_tools/tweak_pkgproj.py -@@ -45,7 +45,7 @@ - import os - import plistlib - import re --import mozc_version -+from . import mozc_version - - from os import path - -@@ -71,7 +71,7 @@ - The value for the variable if the variable is defined in the - environment. Otherwise original string is returned. - """ -- if environment.has_key(matchobj.group(1)): -+ if matchobj.group(1) in environment: - return environment[matchobj.group(1)] - return matchobj.group(0) - ---- /src/build_tools/util.py -+++ /src/build_tools/util.py -@@ -73,11 +73,11 @@ - return 1 - - --class RunOrDieError(StandardError): -+class RunOrDieError(Exception): - """The exception class for RunOrDie.""" - - def __init__(self, message): -- StandardError.__init__(self, message) -+ Exception.__init__(self, message) - - - def RunOrDie(argv): -@@ -105,7 +105,7 @@ - return # Do nothing if not exist. - if IsWindows(): - # Read-only files cannot be deleted on Windows. -- os.chmod(file_name, 0700) -+ os.chmod(file_name, 0o700) - logging.debug('Removing file: %s', file_name) - os.unlink(file_name) - ---- /src/build_tools/zlib_util.py -+++ /src/build_tools/zlib_util.py -@@ -58,7 +58,7 @@ - - def main(): - if len(sys.argv) != 4: -- print >>sys.stderr, 'Invalid arguments' -+ print('Invalid arguments', file=sys.stderr) - return - if sys.argv[1] == 'compress': - Compress(sys.argv[2], sys.argv[3]) -@@ -66,7 +66,7 @@ - if sys.argv[1] == 'decompress': - Decompress(sys.argv[2], sys.argv[3]) - return -- print >>sys.stderr, 'Unknown command:', sys.argv[1] -+ print('Unknown command:', sys.argv[1], file=sys.stderr) - - - if __name__ == '__main__': ---- /src/composer/internal/gen_typing_model.py -+++ /src/composer/internal/gen_typing_model.py -@@ -54,14 +54,13 @@ - __author__ = "noriyukit" - - import bisect --import codecs - import collections - import optparse - import struct - - UNDEFINED_COST = -1 --MAX_UINT16 = struct.unpack('H', '\xFF\xFF')[0] --MAX_UINT8 = struct.unpack('B', '\xFF')[0] -+MAX_UINT16 = struct.unpack('H', b'\xFF\xFF')[0] -+MAX_UINT8 = struct.unpack('B', b'\xFF')[0] - - - def ParseArgs(): -@@ -113,7 +112,7 @@ - sorted_values = list(sorted(set(values))) - mapping_table = sorted_values[0] - mapping_table_size_without_special_value = mapping_table_size - 1 -- span = len(sorted_values) / (mapping_table_size_without_special_value - 1) -+ span = len(sorted_values) // (mapping_table_size_without_special_value - 1) - mapping_table = [sorted_values[i * span] - for i - in range(0, mapping_table_size_without_special_value - 1)] -@@ -150,7 +149,7 @@ - - def GetValueTable(unique_characters, mapping_table, dictionary): - result = [] -- for key, value in dictionary.iteritems(): -+ for key, value in dictionary.items(): - index = GetIndexFromKey(unique_characters, key) - while len(result) <= index: - result.append(len(mapping_table) - 1) -@@ -167,13 +166,13 @@ - romaji_transition_cost) - with open(output_path, 'wb') as f: - f.write(struct.pack('<I', len(unique_characters))) -- f.write(''.join(unique_characters)) -+ f.write(''.join(unique_characters).encode('utf-8')) - offset = 4 + len(unique_characters) - - # Add padding to place value list size at 4-byte boundary. - if offset % 4: - padding_size = 4 - offset % 4 -- f.write('\x00' * padding_size) -+ f.write(b'\x00' * padding_size) - offset += padding_size - - f.write(struct.pack('<I', len(value_list))) -@@ -184,7 +183,7 @@ - # Add padding to place mapping_table at 4-byte boundary. - if offset % 4: - padding_size = 4 - offset % 4 -- f.write('\x00' * padding_size) -+ f.write(b'\x00' * padding_size) - offset += padding_size - - for v in mapping_table: -@@ -198,7 +197,8 @@ - # - trigram['vw']['x'] = -500 * log(P(x | 'vw')) - unigram = {} - trigram = collections.defaultdict(dict) -- for line in codecs.open(options.input_path, 'r', encoding='utf-8'): -+ input_file = open(options.input_path, 'r', encoding='utf-8') -+ for line in input_file: - line = line.rstrip() - ngram, cost = line.split('\t') - cost = int(cost) -@@ -206,6 +206,7 @@ - unigram[ngram] = cost - else: - trigram[ngram[:-1]][ngram[-1]] = cost -+ input_file.close() - - # Calculate ngram-related cost for each 'vw' and 'x': - # -500 * log( P('x' | 'vw') / P('x') ) ---- /src/converter/gen_boundary_data.py -+++ /src/converter/gen_boundary_data.py -@@ -70,7 +70,8 @@ - def LoadPatterns(file): - prefix = [] - suffix = [] -- for line in open(file, 'r'): -+ fh = open(file, 'r') -+ for line in fh: - if len(line) <= 1 or line[0] == '#': - continue - fields = line.split() -@@ -84,8 +85,9 @@ - elif label == 'SUFFIX': - suffix.append([re.compile(PatternToRegexp(feature)), cost]) - else: -- print 'format error %s' % (line) -+ print('format error %s' % (line)) - sys.exit(0) -+ fh.close() - return (prefix, suffix) - - -@@ -100,19 +102,23 @@ - - def LoadFeatures(filename): - features = [] -- for line in open(filename, 'r'): -+ fh = open(filename, 'r') -+ for line in fh: - fields = line.split() - features.append(fields[1]) -+ fh.close() - return features - - - def CountSpecialPos(filename): - count = 0 -- for line in open(filename, 'r'): -+ fh = open(filename, 'r') -+ for line in fh: - line = line.rstrip() - if not line or line[0] == '#': - continue - count += 1 -+ fh.close() - return count - - -@@ -141,7 +147,7 @@ - f.write(struct.pack('<H', GetCost(prefix, feature))) - f.write(struct.pack('<H', GetCost(suffix, feature))) - -- for _ in xrange(num_special_pos): -+ for _ in range(num_special_pos): - f.write(struct.pack('<H', 0)) - f.write(struct.pack('<H', 0)) - ---- /src/converter/gen_quality_regression_test_data.py -+++ /src/converter/gen_quality_regression_test_data.py -@@ -84,7 +84,7 @@ - else _ENABLED) - id = issue.attributes['id'].value - target = GetText(issue.getElementsByTagName('target')) -- for detail in issue.getElementsByTagName(u'detail'): -+ for detail in issue.getElementsByTagName('detail'): - fields = [] - fields.append('mozcsu_%s' % id) - for key in ('reading', 'output', 'actionStatus', 'rank', 'accuracy'): -@@ -104,19 +104,19 @@ - - def GenerateHeader(files): - try: -- print 'namespace mozc{' -- print 'struct TestCase {' -- print ' const bool enabled;' -- print ' const char *tsv;' -- print '} kTestData[] = {' -+ print('namespace mozc{') -+ print('struct TestCase {') -+ print(' const bool enabled;') -+ print(' const char *tsv;') -+ print('} kTestData[] = {') - for file in files: - for enabled, line in ParseFile(file): -- print ' {%s, "%s"},' % (enabled, EscapeString(line)) -- print ' {false, nullptr},' -- print '};' -- print '} // namespace mozc' -+ print(' {%s, "%s"},' % (enabled, EscapeString(line))) -+ print(' {false, nullptr},') -+ print('};') -+ print('} // namespace mozc') - except: -- print 'cannot open %s' % (file) -+ print('cannot open %s' % (file)) - sys.exit(1) - - ---- /src/converter/gen_segmenter_code.py -+++ /src/converter/gen_segmenter_code.py -@@ -54,18 +54,22 @@ - pos = {} - max_id = 0 - -- for line in open(id_file, "r"): -+ fh = open(id_file, "r") -+ for line in fh: - fields = line.split() - pos[fields[1]] = fields[0] - max_id = max(int(fields[0]), max_id) -+ fh.close() - - max_id = max_id + 1 -- for line in open(special_pos_file, "r"): -+ fh = open(special_pos_file, "r") -+ for line in fh: - if len(line) <= 1 or line[0] == '#': - continue - fields = line.split() - pos[fields[0]] = ("%d" % max_id) - max_id = max_id + 1 -+ fh.close() - - return pos - -@@ -79,8 +83,7 @@ - pat = re.compile(PatternToRegexp(pattern)) - min = -1; - max = -1; -- keys = pos.keys() -- keys.sort() -+ keys = sorted(pos.keys()) - - range = [] - -@@ -107,7 +110,7 @@ - tmp.append("(%s >= %s && %s <= %s)" % (name, r[0], name, r[1])) - - if len(tmp) == 0: -- print "FATAL: No rule fiind %s" % (pattern) -+ print("FATAL: No rule fiind %s" % (pattern)) - sys.exit(-1) - - return " || ".join(tmp) -@@ -115,19 +118,21 @@ - def main(): - pos = ReadPOSID(sys.argv[1], sys.argv[2]) - -- print HEADER % (len(pos.keys()), len(pos.keys())) -+ print(HEADER % (len(pos.keys()), len(pos.keys()))) - -- for line in open(sys.argv[3], "r"): -+ fh = open(sys.argv[3], "r") -+ for line in fh: - if len(line) <= 1 or line[0] == '#': - continue - (l, r, result) = line.split() - result = result.lower() - lcond = GetRange(pos, l, "rid") or "true"; - rcond = GetRange(pos, r, "lid") or "true"; -- print " // %s %s %s" % (l, r, result) -- print " if ((%s) && (%s)) { return %s; }" % (lcond, rcond, result) -+ print(" // %s %s %s" % (l, r, result)) -+ print(" if ((%s) && (%s)) { return %s; }" % (lcond, rcond, result)) -+ fh.close() - -- print FOOTER -+ print(FOOTER) - - if __name__ == "__main__": - main() ---- /src/data_manager/gen_connection_data.py -+++ /src/data_manager/gen_connection_data.py -@@ -32,8 +32,7 @@ - - __author__ = "hidehiko" - --import cStringIO as StringIO --import itertools -+import io - import logging - import optparse - import os -@@ -45,7 +44,7 @@ - INVALID_COST = 30000 - INVALID_1BYTE_COST = 255 - RESOLUTION_FOR_1BYTE = 64 --FILE_MAGIC = '\xAB\xCD' -+FILE_MAGIC = b'\xAB\xCD' - - FALSE_VALUES = ['f', 'false', '0'] - TRUE_VALUES = ['t', 'true', '1'] -@@ -79,28 +78,28 @@ - # The result is a square matrix. - mat_size = pos_size + special_pos_size - -- matrix = [[0] * mat_size for _ in xrange(mat_size)] -+ matrix = [[0] * mat_size for _ in range(mat_size)] - with open(text_connection_file) as stream: - stream = code_generator_util.SkipLineComment(stream) - # The first line contains the matrix column/row size. -- size = stream.next().rstrip() -+ size = next(stream).rstrip() - assert (int(size) == pos_size), '%s != %d' % (size, pos_size) - - for array_index, cost in enumerate(stream): - cost = int(cost.rstrip()) -- rid = array_index / pos_size -+ rid = array_index // pos_size - lid = array_index % pos_size - if rid == 0 and lid == 0: - cost = 0 - matrix[rid][lid] = cost - - # Fill INVALID_COST in matrix elements for special POS. -- for rid in xrange(pos_size, mat_size): -- for lid in xrange(1, mat_size): # Skip EOS -+ for rid in range(pos_size, mat_size): -+ for lid in range(1, mat_size): # Skip EOS - matrix[rid][lid] = INVALID_COST - -- for lid in xrange(pos_size, mat_size): -- for rid in xrange(1, mat_size): # Skip BOS -+ for lid in range(pos_size, mat_size): -+ for rid in range(1, mat_size): # Skip BOS - matrix[rid][lid] = INVALID_COST - - return matrix -@@ -116,7 +115,7 @@ - # Heuristically, we do not compress INVALID_COST. - continue - m[cost] = m.get(cost, 0) + 1 -- mode_value = max(m.iteritems(), key=lambda (_, count): count)[0] -+ mode_value = max(m.items(), key=lambda x: x[1])[0] - result.append(mode_value) - return result - -@@ -126,8 +125,8 @@ - # list, and fill None into the matrix if it equals to the corresponding - # mode value. - assert len(matrix) == len(mode_value_list) -- for row, mode_value in itertools.izip(matrix, mode_value_list): -- for index in xrange(len(row)): -+ for row, mode_value in zip(matrix, mode_value_list): -+ for index in range(len(row)): - if row[index] == mode_value: - row[index] = None - -@@ -179,7 +178,7 @@ - resolution = RESOLUTION_FOR_1BYTE - else: - resolution = 1 -- stream = StringIO.StringIO() -+ stream = io.BytesIO() - - # Output header. - stream.write(FILE_MAGIC) -@@ -194,7 +193,7 @@ - - # 4 bytes alignment. - if len(mode_value_list) % 2: -- stream.write('\x00\x00') -+ stream.write(b'\x00\x00') - - # Process each row: - for row in matrix: -@@ -218,7 +217,7 @@ - if cost == INVALID_COST: - cost = INVALID_1BYTE_COST - else: -- cost /= resolution -+ cost //= resolution - assert cost != INVALID_1BYTE_COST - values.append(cost) - -@@ -237,7 +236,7 @@ - values_size = len(values) * 2 - - # Output the bits for a row. -- stream.write(struct.pack('<HH', len(compact_bits) / 8, values_size)) -+ stream.write(struct.pack('<HH', len(compact_bits) // 8, values_size)) - OutputBitList(chunk_bits, stream) - OutputBitList(compact_bits, stream) - if use_1byte_cost: diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_3.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_3.patch deleted file mode 100644 index a5c5a2dc8038..000000000000 --- a/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_3.patch +++ /dev/null @@ -1,583 +0,0 @@ -https://github.com/google/mozc/issues/462 - ---- /src/dictionary/gen_pos_map.py -+++ /src/dictionary/gen_pos_map.py -@@ -39,7 +39,7 @@ - from build_tools import code_generator_util - - --HEADER = """// Copyright 2009 Google Inc. All Rights Reserved. -+HEADER = b"""// Copyright 2009 Google Inc. All Rights Reserved. - // Author: keni - - #ifndef MOZC_DICTIONARY_POS_MAP_H_ -@@ -48,13 +48,13 @@ - // POS conversion rules - const POSMap kPOSMap[] = { - """ --FOOTER = """}; -+FOOTER = b"""}; - - #endif // MOZC_DICTIONARY_POS_MAP_H_ - """ - - def ParseUserPos(user_pos_file): -- with open(user_pos_file, 'r') as stream: -+ with open(user_pos_file, 'rb') as stream: - stream = code_generator_util.SkipLineComment(stream) - stream = code_generator_util.ParseColumnStream(stream, num_column=2) - return dict((key, enum_value) for key, enum_value in stream) -@@ -64,7 +64,7 @@ - user_pos_map = ParseUserPos(user_pos_file) - - result = {} -- with open(third_party_pos_map_file, 'r') as stream: -+ with open(third_party_pos_map_file, 'rb') as stream: - stream = code_generator_util.SkipLineComment(stream) - for columns in code_generator_util.ParseColumnStream(stream, num_column=2): - third_party_pos_name, mozc_pos = (columns + [None])[:2] -@@ -78,7 +78,7 @@ - result[third_party_pos_name] = mozc_pos - - # Create mozc_pos to mozc_pos map. -- for key, value in user_pos_map.iteritems(): -+ for key, value in user_pos_map.items(): - if key in result: - assert (result[key] == value) - continue -@@ -94,10 +94,10 @@ - if value is None: - # Invalid PosType. - value = ( -- 'static_cast< ::mozc::user_dictionary::UserDictionary::PosType>(-1)') -+ b'static_cast< ::mozc::user_dictionary::UserDictionary::PosType>(-1)') - else: -- value = '::mozc::user_dictionary::UserDictionary::' + value -- output.write(' { %s, %s },\n' % (key, value)) -+ value = b'::mozc::user_dictionary::UserDictionary::' + value -+ output.write(b' { %s, %s },\n' % (key, value)) - output.write(FOOTER) - - -@@ -121,7 +121,7 @@ - pos_map = GeneratePosMap(options.third_party_pos_map_file, - options.user_pos_file) - -- with open(options.output, 'w') as stream: -+ with open(options.output, 'wb') as stream: - OutputPosMap(pos_map, stream) - - ---- /src/dictionary/gen_pos_rewrite_rule.py -+++ /src/dictionary/gen_pos_rewrite_rule.py -@@ -46,29 +46,34 @@ - - - def LoadRewriteMapRule(filename): -- fh = open(filename) -+ fh = open(filename, 'rb') - rule = [] - for line in fh: -- line = line.rstrip('\n') -- if not line or line.startswith('#'): -+ line = line.rstrip(b'\n') -+ if not line or line.startswith(b'#'): - continue - fields = line.split() - rule.append([fields[0], fields[1]]) -+ fh.close() - return rule - - - def ReadPOSID(id_file, special_pos_file): - pos_list = [] - -- for line in open(id_file, 'r'): -+ fh = open(id_file, 'rb') -+ for line in fh: - fields = line.split() - pos_list.append(fields[1]) -+ fh.close() - -- for line in open(special_pos_file, 'r'): -- if len(line) <= 1 or line[0] == '#': -+ fh = open(special_pos_file, 'rb') -+ for line in fh: -+ if len(line) <= 1 or line[0:1] == b'#': - continue - fields = line.split() - pos_list.append(fields[0]) -+ fh.close() - - return pos_list - -@@ -112,7 +117,7 @@ - ids.append(id) - - with open(opts.output, 'wb') as f: -- f.write(''.join(chr(id) for id in ids)) -+ f.write(''.join(chr(id) for id in ids).encode('utf-8')) - - - if __name__ == '__main__': ---- /src/dictionary/gen_suffix_data.py -+++ /src/dictionary/gen_suffix_data.py -@@ -52,10 +52,10 @@ - opts = _ParseOptions() - - result = [] -- with open(opts.input, 'r') as stream: -+ with open(opts.input, 'rb') as stream: - for line in stream: -- line = line.rstrip('\r\n') -- fields = line.split('\t') -+ line = line.rstrip(b'\r\n') -+ fields = line.split(b'\t') - key = fields[0] - lid = int(fields[1]) - rid = int(fields[2]) -@@ -63,7 +63,7 @@ - value = fields[4] - - if key == value: -- value = '' -+ value = b'' - - result.append((key, value, lid, rid, cost)) - ---- /src/dictionary/gen_user_pos_data.py -+++ /src/dictionary/gen_user_pos_data.py -@@ -64,7 +64,7 @@ - f.write(struct.pack('<H', conjugation_id)) - - serialized_string_array_builder.SerializeToFile( -- sorted(string_index.iterkeys()), output_string_array) -+ sorted(x.encode('utf-8') for x in string_index.keys()), output_string_array) - - - def ParseOptions(): -@@ -100,7 +100,7 @@ - - if options.output_pos_list: - serialized_string_array_builder.SerializeToFile( -- [pos for (pos, _) in user_pos.data], options.output_pos_list) -+ [pos.encode('utf-8') for (pos, _) in user_pos.data], options.output_pos_list) - - - if __name__ == '__main__': ---- /src/dictionary/gen_zip_code_seed.py -+++ /src/dictionary/gen_zip_code_seed.py -@@ -83,7 +83,7 @@ - address = unicodedata.normalize('NFKC', self.address) - line = '\t'.join([zip_code, '0', '0', str(ZIP_CODE_COST), - address, ZIP_CODE_LABEL]) -- print line.encode('utf-8') -+ print(line.encode('utf-8')) - - - def ProcessZipCodeCSV(file_name): -@@ -105,26 +105,26 @@ - - def ReadZipCodeEntries(zip_code, level1, level2, level3): - """Read zip code entries.""" -- return [ZipEntry(zip_code, u''.join([level1, level2, town])) -+ return [ZipEntry(zip_code, ''.join([level1, level2, town])) - for town in ParseTownName(level3)] - - - def ReadJigyosyoEntry(zip_code, level1, level2, level3, name): - """Read jigyosyo entry.""" - return ZipEntry(zip_code, -- u''.join([level1, level2, level3, u' ', name])) -+ ''.join([level1, level2, level3, ' ', name])) - - - def ParseTownName(level3): - """Parse town name.""" -- if level3.find(u'以下ã«æŽ²è¼‰ãŒãªã„å ´åˆ') != -1: -+ if level3.find('以下ã«æŽ²è¼‰ãŒãªã„å ´åˆ') != -1: - return [''] - - assert CanParseAddress(level3), ('failed to be merged %s' - % level3.encode('utf-8')) - - # We ignore additional information here. -- level3 = re.sub(u'（.*）', u'', level3, re.U) -+ level3 = re.sub('（.*）', '', level3, re.U) - - # For 地割, we have these cases. - # XX1地割 -@@ -134,7 +134,7 @@ - # XX第1地割ã€XX第2地割〠- # XX第1地割〜XX第2地割〠- # We simply use XX for them. -- chiwari_match = re.match(u'(\D*?)第?\d+地割.*', level3, re.U) -+ chiwari_match = re.match('(\D*?)第?\d+地割.*', level3, re.U) - if chiwari_match: - town = chiwari_match.group(1) - return [town] -@@ -144,21 +144,21 @@ - # -> XX町YY and (XX町)ZZ - # YYã€ZZ - # -> YY and ZZ -- chou_match = re.match(u'(.*町)?(.*)', level3, re.U) -+ chou_match = re.match('(.*町)?(.*)', level3, re.U) - if chou_match: -- chou = u'' -+ chou = '' - if chou_match.group(1): - chou = chou_match.group(1) - rests = chou_match.group(2) -- return [chou + rest for rest in rests.split(u'ã€')] -+ return [chou + rest for rest in rests.split('ã€')] - - return [level3] - - - def CanParseAddress(address): - """Return true for valid address.""" -- return (address.find(u'（') == -1 or -- address.find(u'）') != -1) -+ return (address.find('（') == -1 or -+ address.find('）') != -1) - - - def ParseOptions(): ---- /src/dictionary/zip_code_util.py -+++ /src/dictionary/zip_code_util.py -@@ -86,11 +86,11 @@ - - - _SPECIAL_CASES = [ -- SpecialMergeZip(u'5900111', u'大阪府', u'å ºå¸‚ä¸åŒº', [u'三原å°']), -- SpecialMergeZip(u'8710046', u'大分県', u'ä¸æ´¥å¸‚', -- [u'金谷', u'è¥¿å €ç«¯', u'æ±å €ç«¯', u'å¤é‡‘è°·']), -- SpecialMergeZip(u'9218046', u'石å·çœŒ', u'金沢市', -- [u'大桑町', u'三å°ç‰›ç”º']), -+ SpecialMergeZip('5900111', '大阪府', 'å ºå¸‚ä¸åŒº', ['三原å°']), -+ SpecialMergeZip('8710046', '大分県', 'ä¸æ´¥å¸‚', -+ ['金谷', 'è¥¿å €ç«¯', 'æ±å €ç«¯', 'å¤é‡‘è°·']), -+ SpecialMergeZip('9218046', '石å·çœŒ', '金沢市', -+ ['大桑町', '三å°ç‰›ç”º']), - ] - - ---- /src/gui/character_pad/data/gen_cp932_map.py -+++ /src/gui/character_pad/data/gen_cp932_map.py -@@ -32,7 +32,6 @@ - - import re - import sys --import string - - kUnicodePat = re.compile(r'0x[0-9A-Fa-f]{2,4}') - def IsValidUnicode(n): -@@ -42,28 +41,29 @@ - fh = open(sys.argv[1]) - result = {} - for line in fh.readlines(): -- if line[0] is '#': -+ if line[0] == '#': - continue -- array = string.split(line) -+ array = line.split() - sjis = array[0] - ucs2 = array[1] - if eval(sjis) < 32 or not IsValidUnicode(ucs2): - continue - result.setdefault(ucs2, sjis) -+ fh.close() - - keys = sorted(result.keys()) - -- print "struct CP932MapData {" -- print " unsigned int ucs4;" -- print " unsigned short int sjis;" -- print "};" -- print "" -- print "static const size_t kCP932MapDataSize = %d;" % (len(keys)) -- print "static const CP932MapData kCP932MapData[] = {" -+ print("struct CP932MapData {") -+ print(" unsigned int ucs4;") -+ print(" unsigned short int sjis;") -+ print("};") -+ print("") -+ print("static const size_t kCP932MapDataSize = %d;" % (len(keys))) -+ print("static const CP932MapData kCP932MapData[] = {") - for n in keys: -- print " { %s, %s }," % (n ,result[n]) -- print " { 0, 0 }"; -- print "};" -+ print(" { %s, %s }," % (n ,result[n])) -+ print(" { 0, 0 }"); -+ print("};") - - if __name__ == "__main__": - main() ---- /src/gui/character_pad/data/gen_local_character_map.py -+++ /src/gui/character_pad/data/gen_local_character_map.py -@@ -30,7 +30,6 @@ - - __author__ = "taku" - --import string - import re - import sys - -@@ -43,9 +42,9 @@ - fh = open(filename) - result = [] - for line in fh.readlines(): -- if line[0] is '#': -+ if line[0] == '#': - continue -- array = string.split(line) -+ array = line.split() - jis = array[0].replace('0x', '') - ucs2 = array[1].replace('0x', '') - if len(jis) == 2: -@@ -53,6 +52,7 @@ - - if IsValidUnicode(ucs2): - result.append([jis, ucs2]) -+ fh.close() - - return ["JISX0201", result] - -@@ -60,13 +60,14 @@ - fh = open(filename) - result = [] - for line in fh.readlines(): -- if line[0] is '#': -+ if line[0] == '#': - continue - array = line.split() - jis = array[1].replace('0x', '') - ucs2 = array[2].replace('0x', '') - if IsValidUnicode(ucs2): - result.append([jis, ucs2]) -+ fh.close() - - return ["JISX0208", result] - -@@ -74,13 +75,14 @@ - fh = open(filename) - result = [] - for line in fh.readlines(): -- if line[0] is '#': -+ if line[0] == '#': - continue - array = line.split() - jis = array[0].replace('0x', '') - ucs2 = array[1].replace('0x', '') - if IsValidUnicode(ucs2): - result.append([jis, ucs2]) -+ fh.close() - - return ["JISX0212", result] - -@@ -88,7 +90,7 @@ - fh = open(filename) - result = [] - for line in fh.readlines(): -- if line[0] is '#': -+ if line[0] == '#': - continue - array = line.split() - sjis = array[0].replace('0x', '') -@@ -100,19 +102,20 @@ - - if IsValidUnicode(ucs2): - result.append([sjis, ucs2]) -+ fh.close() - - return ["CP932", result] - - def Output(arg): - name = arg[0] - result = arg[1] -- print "static const size_t k%sMapSize = %d;" % (name, len(result)) -- print "static const mozc::gui::CharacterPalette::LocalCharacterMap k%sMap[] = {" % (name) -+ print("static const size_t k%sMapSize = %d;" % (name, len(result))) -+ print("static const mozc::gui::CharacterPalette::LocalCharacterMap k%sMap[] = {" % (name)) - for n in result: -- print " { 0x%s, 0x%s }," % (n[0] ,n[1]) -- print " { 0, 0 }"; -- print "};" -- print "" -+ print(" { 0x%s, 0x%s }," % (n[0] ,n[1])) -+ print(" { 0, 0 }"); -+ print("};") -+ print("") - - if __name__ == "__main__": - Output(LoadJISX0201(sys.argv[1])) ---- /src/gui/character_pad/data/gen_unicode_blocks.py -+++ /src/gui/character_pad/data/gen_unicode_blocks.py -@@ -33,13 +33,13 @@ - import sys - import re - --re = re.compile('^(.....?)\.\.(.....?); (.+)') -+re = re.compile(r'^(.....?)\.\.(.....?); (.+)') - - def main(): -- print "static const mozc::gui::CharacterPalette::UnicodeBlock kUnicodeBlockTable[] = {" -+ print("static const mozc::gui::CharacterPalette::UnicodeBlock kUnicodeBlockTable[] = {") - fh = open(sys.argv[1]) - for line in fh.readlines(): -- if line[0] is '#': -+ if line[0] == '#': - continue - m = re.match(line) - if m is not None: -@@ -47,11 +47,12 @@ - end = int(m.group(2), 16) - name = m.group(3) - if start <= 0x2FFFF and end <= 0x2FFFF: -- print " { \"%s\", { %d, %d } }," % (name, start, end) -+ print(" { \"%s\", { %d, %d } }," % (name, start, end)) -+ fh.close() - -- print " { NULL, { 0, 0 } }" -- print "};" -- print "" -+ print(" { NULL, { 0, 0 } }") -+ print("};") -+ print("") - - if __name__ == "__main__": - main() ---- /src/gui/character_pad/data/gen_unicode_data.py -+++ /src/gui/character_pad/data/gen_unicode_data.py -@@ -46,18 +46,19 @@ - code = int(code, 16) - if code < 0x2FFFF: - results.append(" { %d, \"%s\" }," % (code, desc)) -+ fh.close() - -- print "struct UnicodeData {"; -- print " char32 ucs4;"; -- print " const char *description;"; -- print "};"; -- print "" -- print "static const size_t kUnicodeDataSize = %d;" % (len(results)) -- print "static const UnicodeData kUnicodeData[] = {"; -+ print("struct UnicodeData {"); -+ print(" char32 ucs4;"); -+ print(" const char *description;"); -+ print("};"); -+ print("") -+ print("static const size_t kUnicodeDataSize = %d;" % (len(results))) -+ print("static const UnicodeData kUnicodeData[] = {"); - for line in results: -- print line; -- print " { 0, NULL }"; -- print "};"; -+ print(line); -+ print(" { 0, NULL }"); -+ print("};"); - - if __name__ == "__main__": - main() ---- /src/gui/character_pad/data/gen_unihan_data.py -+++ /src/gui/character_pad/data/gen_unihan_data.py -@@ -31,35 +31,34 @@ - __author__ = "taku" - - import re --import string - import sys - rs = {} - - def Escape(n): -- if n is not "NULL": -+ if n != "NULL": - return "\"%s\"" % (n) - else: - return "NULL" - - def GetCode(n): -- if n is not "NULL": -- n = string.replace(n, '0-', 'JIS X 0208: 0x') -- n = string.replace(n, '1-', 'JIS X 0212: 0x') -- n = string.replace(n, '3-', 'JIS X 0213: 0x') -- n = string.replace(n, '4-', 'JIS X 0213: 0x') -- n = string.replace(n, 'A-', 'Vendors Ideographs: 0x') -- n = string.replace(n, '3A', 'JIS X 0213 2000: 0x') -+ if n != "NULL": -+ n = n.replace('0-', 'JIS X 0208: 0x') -+ n = n.replace('1-', 'JIS X 0212: 0x') -+ n = n.replace('3-', 'JIS X 0213: 0x') -+ n = n.replace('4-', 'JIS X 0213: 0x') -+ n = n.replace('A-', 'Vendors Ideographs: 0x') -+ n = n.replace('3A', 'JIS X 0213 2000: 0x') - return "\"%s\"" % n - else: - return "NULL" - - def GetRadical(n): - pat = re.compile(r'^(\d+)\.') -- if n is not "NULL": -+ if n != "NULL": - m = pat.match(n) - if m: - result = rs[m.group(1)] -- return "\"%s\"" % (result.encode('string_escape')) -+ return "\"%s\"" % result - else: - return "NULL" - else: -@@ -73,6 +72,7 @@ - id = array[1] - radical = array[2] - rs[id] = radical -+ fh.close() - - dic = {} - pat = re.compile(r'^U\+(\S+)\s+(kTotalStrokes|kJapaneseKun|kJapaneseOn|kRSUnicode|kIRG_JSource)\t(.+)') -@@ -86,23 +86,24 @@ - n = int(m.group(1), 16) - if n <= 65536: - dic.setdefault(key, {}).setdefault(field, value) -+ fh.close() - - keys = sorted(dic.keys()) - -- print "struct UnihanData {"; -- print " unsigned int ucs4;"; -+ print("struct UnihanData {"); -+ print(" unsigned int ucs4;"); - # Since the total strokes defined in Unihan data is Chinese-based - # number, we can't use it. - # print " unsigned char total_strokes;"; -- print " const char *japanese_kun;"; -- print " const char *japanese_on;"; -+ print(" const char *japanese_kun;"); -+ print(" const char *japanese_on;"); - # Since the radical information defined in Unihan data is Chinese-based - # number, we can't use it. - # print " const char *radical;"; -- print " const char *IRG_jsource;"; -- print "};" -- print "static const size_t kUnihanDataSize = %d;" % (len(keys)) -- print "static const UnihanData kUnihanData[] = {" -+ print(" const char *IRG_jsource;"); -+ print("};") -+ print("static const size_t kUnihanDataSize = %d;" % (len(keys))) -+ print("static const UnihanData kUnihanData[] = {") - - for key in keys: - total_strokes = dic[key].get("kTotalStrokes", "0") -@@ -111,9 +112,9 @@ - rad = GetRadical(dic[key].get("kRSUnicode", "NULL")) - code = GetCode(dic[key].get("kIRG_JSource", "NULL")) - # print " { 0x%s, %s, %s, %s, %s, %s }," % (key, total_strokes, kun, on, rad, code) -- print " { 0x%s, %s, %s, %s }," % (key, kun, on, code) -+ print(" { 0x%s, %s, %s, %s }," % (key, kun, on, code)) - -- print "};" -+ print("};") - - if __name__ == "__main__": - main() diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_4.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_4.patch deleted file mode 100644 index 41d2bf9eeb90..000000000000 --- a/app-i18n/mozc/files/mozc-2.23.2815.102-python-3_4.patch +++ /dev/null @@ -1,537 +0,0 @@ -https://github.com/google/mozc/issues/462 - ---- /src/prediction/gen_zero_query_data.py -+++ /src/prediction/gen_zero_query_data.py -@@ -59,20 +59,20 @@ - Returns: - A integer indicating parsed pua. - """ -- if not s or s[0] == '>': -+ if not s or s[0:1] == b'>': - return 0 - return int(s, 16) - - - def NormalizeString(string): - return unicodedata.normalize( -- 'NFKC', string.decode('utf-8')).encode('utf-8').replace('~', '〜') -+ 'NFKC', string.decode('utf-8')).replace('~', '〜').encode('utf-8') - - - def RemoveTrailingNumber(string): - if not string: -- return '' -- return re.sub(r'^([^0-9]+)[0-9]+$', r'\1', string) -+ return b'' -+ return re.sub(br'^([^0-9]+)[0-9]+$', r'\1', string) - - - def GetReadingsFromDescription(description): -@@ -84,19 +84,19 @@ - # - ビル・建物 - # \xE3\x83\xBB : "・" - return [RemoveTrailingNumber(token) for token -- in re.split(r'(?:\(|\)|/|\xE3\x83\xBB)+', normalized)] -+ in re.split(br'(?:\(|\)|/|\xE3\x83\xBB)+', normalized)] - - - def ReadEmojiTsv(stream): - """Reads emoji data from stream and returns zero query data.""" - zero_query_dict = defaultdict(list) - stream = code_generator_util.SkipLineComment(stream) -- for columns in code_generator_util.ParseColumnStream(stream, delimiter='\t'): -+ for columns in code_generator_util.ParseColumnStream(stream, delimiter=b'\t'): - if len(columns) != 13: -- logging.critical('format error: %s', '\t'.join(columns)) -+ logging.critical('format error: %s', b'\t'.join(columns)) - sys.exit(1) - -- code_points = columns[0].split(' ') -+ code_points = columns[0].split(b' ') - - # Emoji code point. - emoji = columns[1] -@@ -114,12 +114,12 @@ - # - Composite emoji which has multiple code point. - # NOTE: Some Unicode 6.0 emoji don't have PUA, and it is also omitted. - # TODO(hsumita): Check the availability of such emoji and enable it. -- logging.info('Skip %s', ' '.join(code_points)) -+ logging.info('Skip %s', b' '.join(code_points)) - continue - - reading_list = [] - # \xe3\x80\x80 is a full-width space -- for reading in re.split(r'(?: |\xe3\x80\x80)+', NormalizeString(readings)): -+ for reading in re.split(br'(?: |\xe3\x80\x80)+', NormalizeString(readings)): - if not reading: - continue - reading_list.append(reading) -@@ -158,15 +158,15 @@ - zero_query_dict = defaultdict(list) - - for line in input_stream: -- if line.startswith('#'): -+ if line.startswith(b'#'): - continue -- line = line.rstrip('\r\n') -+ line = line.rstrip(b'\r\n') - if not line: - continue - -- tokens = line.split('\t') -+ tokens = line.split(b'\t') - key = tokens[0] -- values = tokens[1].split(',') -+ values = tokens[1].split(b',') - - for value in values: - zero_query_dict[key].append( -@@ -179,16 +179,16 @@ - """Reads emoticon data from stream and returns zero query data.""" - zero_query_dict = defaultdict(list) - stream = code_generator_util.SkipLineComment(stream) -- for columns in code_generator_util.ParseColumnStream(stream, delimiter='\t'): -+ for columns in code_generator_util.ParseColumnStream(stream, delimiter=b'\t'): - if len(columns) != 3: -- logging.critical('format error: %s', '\t'.join(columns)) -+ logging.critical('format error: %s', b'\t'.join(columns)) - sys.exit(1) - - emoticon = columns[0] - readings = columns[2] - - # \xe3\x80\x80 is a full-width space -- for reading in re.split(r'(?: |\xe3\x80\x80)+', readings.strip()): -+ for reading in re.split(br'(?: |\xe3\x80\x80)+', readings.strip()): - if not reading: - continue - zero_query_dict[reading].append( -@@ -202,9 +202,9 @@ - """Reads emoji data from stream and returns zero query data.""" - zero_query_dict = defaultdict(list) - stream = code_generator_util.SkipLineComment(stream) -- for columns in code_generator_util.ParseColumnStream(stream, delimiter='\t'): -+ for columns in code_generator_util.ParseColumnStream(stream, delimiter=b'\t'): - if len(columns) < 3: -- logging.warning('format error: %s', '\t'.join(columns)) -+ logging.warning('format error: %s', b'\t'.join(columns)) - continue - - symbol = columns[1] -@@ -222,7 +222,7 @@ - continue - - # \xe3\x80\x80 is a full-width space -- for reading in re.split(r'(?: |\xe3\x80\x80)+', readings.strip()): -+ for reading in re.split(br'(?: |\xe3\x80\x80)+', readings.strip()): - if not reading: - continue - zero_query_dict[reading].append( -@@ -247,7 +247,7 @@ - - def IsValidKeyForZeroQuery(key): - """Returns if the key is valid for zero query trigger.""" -- is_ascii = all(ord(char) < 128 for char in key) -+ is_ascii = all(char < 128 for char in key) - return not is_ascii - - -@@ -301,13 +301,13 @@ - - def main(): - options = ParseOptions() -- with open(options.input_rule, 'r') as input_stream: -+ with open(options.input_rule, 'rb') as input_stream: - zero_query_rule_dict = ReadZeroQueryRuleData(input_stream) -- with open(options.input_symbol, 'r') as input_stream: -+ with open(options.input_symbol, 'rb') as input_stream: - zero_query_symbol_dict = ReadSymbolTsv(input_stream) -- with open(options.input_emoji, 'r') as input_stream: -+ with open(options.input_emoji, 'rb') as input_stream: - zero_query_emoji_dict = ReadEmojiTsv(input_stream) -- with open(options.input_emoticon, 'r') as input_stream: -+ with open(options.input_emoticon, 'rb') as input_stream: - zero_query_emoticon_dict = ReadEmoticonTsv(input_stream) - - merged_zero_query_dict = MergeZeroQueryData( ---- /src/prediction/gen_zero_query_number_data.py -+++ /src/prediction/gen_zero_query_number_data.py -@@ -41,15 +41,15 @@ - zero_query_dict = defaultdict(list) - - for line in input_stream: -- if line.startswith('#'): -+ if line.startswith(b'#'): - continue -- line = line.rstrip('\r\n') -+ line = line.rstrip(b'\r\n') - if not line: - continue - -- tokens = line.split('\t') -+ tokens = line.split(b'\t') - key = tokens[0] -- values = tokens[1].split(',') -+ values = tokens[1].split(b',') - - for value in values: - zero_query_dict[key].append( -@@ -71,7 +71,7 @@ - - def main(): - options = ParseOption() -- with open(options.input, 'r') as input_stream: -+ with open(options.input, 'rb') as input_stream: - zero_query_dict = ReadZeroQueryNumberData(input_stream) - util.WriteZeroQueryData(zero_query_dict, - options.output_token_array, ---- /src/prediction/gen_zero_query_util.py -+++ /src/prediction/gen_zero_query_util.py -@@ -69,7 +69,7 @@ - output_string_array): - # Collect all the strings and assing index in ascending order - string_index = {} -- for key, entry_list in zero_query_dict.iteritems(): -+ for key, entry_list in zero_query_dict.items(): - string_index[key] = 0 - for entry in entry_list: - string_index[entry.value] = 0 ---- /src/rewriter/gen_counter_suffix_array.py -+++ /src/rewriter/gen_counter_suffix_array.py -@@ -43,7 +43,7 @@ - with codecs.open(id_file, 'r', encoding='utf-8') as stream: - stream = code_generator_util.ParseColumnStream(stream, num_column=2) - for pos_id, pos_name in stream: -- if pos_name.startswith(u'åè©ž,接尾,助数詞'): -+ if pos_name.startswith('åè©ž,接尾,助数詞'): - pos_ids.add(pos_id) - return pos_ids - ---- /src/rewriter/gen_emoji_rewriter_data.py -+++ /src/rewriter/gen_emoji_rewriter_data.py -@@ -74,19 +74,19 @@ - the glyph (in other words, it has alternative (primary) code point, which - doesn't lead '>' and that's why we'll ignore it). - """ -- if not s or s[0] == '>': -+ if not s or s[0:1] == b'>': - return None - return int(s, 16) - - --_FULLWIDTH_RE = re.compile(ur'[ï¼-～]') # U+FF01 - U+FF5E -+_FULLWIDTH_RE = re.compile(r'[ï¼-～]') # U+FF01 - U+FF5E - - - def NormalizeString(string): - """Normalize full width ascii characters to half width characters.""" -- offset = ord(u'Ａ') - ord(u'A') -- return _FULLWIDTH_RE.sub(lambda x: unichr(ord(x.group(0)) - offset), -- unicode(string, 'utf-8')).encode('utf-8') -+ offset = ord('Ａ') - ord('A') -+ return _FULLWIDTH_RE.sub(lambda x: chr(ord(x.group(0)) - offset), -+ string.decode('utf-8')).encode('utf-8') - - - def ReadEmojiTsv(stream): -@@ -96,14 +96,14 @@ - token_dict = defaultdict(list) - - stream = code_generator_util.SkipLineComment(stream) -- for columns in code_generator_util.ParseColumnStream(stream, delimiter='\t'): -+ for columns in code_generator_util.ParseColumnStream(stream, delimiter=b'\t'): - if len(columns) != 13: -- logging.critical('format error: %s', '\t'.join(columns)) -+ logging.critical('format error: %s', b'\t'.join(columns)) - sys.exit(1) - -- code_points = columns[0].split(' ') -+ code_points = columns[0].split(b' ') - # Emoji code point. -- emoji = columns[1] if columns[1] else '' -+ emoji = columns[1] if columns[1] else b'' - android_pua = ParseCodePoint(columns[2]) - docomo_pua = ParseCodePoint(columns[3]) - softbank_pua = ParseCodePoint(columns[4]) -@@ -112,10 +112,10 @@ - readings = columns[6] - - # [7]: Name defined in Unicode. It is ignored in current implementation. -- utf8_description = columns[8] if columns[8] else '' -- docomo_description = columns[9] if columns[9] else '' -- softbank_description = columns[10] if columns[10] else '' -- kddi_description = columns[11] if columns[11] else '' -+ utf8_description = columns[8] if columns[8] else b'' -+ docomo_description = columns[9] if columns[9] else b'' -+ softbank_description = columns[10] if columns[10] else b'' -+ kddi_description = columns[11] if columns[11] else b'' - - if not android_pua or len(code_points) > 1: - # Skip some emoji, which is not supported on old devices. -@@ -123,7 +123,7 @@ - # - Composite emoji which has multiple code point. - # NOTE: Some Unicode 6.0 emoji don't have PUA, and it is also omitted. - # TODO(hsumita): Check the availability of such emoji and enable it. -- logging.info('Skip %s', ' '.join(code_points)) -+ logging.info('Skip %s', b' '.join(code_points)) - continue - - # Check consistency between carrier PUA codes and descriptions for Android -@@ -132,7 +132,7 @@ - (bool(softbank_pua) != bool(softbank_description)) or - (bool(kddi_pua) != bool(kddi_description))): - logging.warning('carrier PUA and description conflict: %s', -- '\t'.join(columns)) -+ b'\t'.join(columns)) - continue - - # Check if the character is usable on Android. -@@ -140,7 +140,7 @@ - android_pua = 0 # Replace None with 0. - - if not emoji and not android_pua: -- logging.info('Skip: %s', '\t'.join(columns)) -+ logging.info('Skip: %s', b'\t'.join(columns)) - continue - - index = len(emoji_data_list) -@@ -149,7 +149,7 @@ - kddi_description)) - - # \xe3\x80\x80 is a full-width space -- for reading in re.split(r'(?: |\xe3\x80\x80)+', readings.strip()): -+ for reading in re.split(br'(?: |\xe3\x80\x80)+', readings.strip()): - if reading: - token_dict[NormalizeString(reading)].append(index) - -@@ -159,7 +159,7 @@ - def OutputData(emoji_data_list, token_dict, - token_array_file, string_array_file): - """Output token and string arrays to files.""" -- sorted_token_dict = sorted(token_dict.iteritems()) -+ sorted_token_dict = sorted(token_dict.items()) - - strings = {} - for reading, _ in sorted_token_dict: -@@ -171,7 +171,7 @@ - strings[docomo_description] = 0 - strings[softbank_description] = 0 - strings[kddi_description] = 0 -- sorted_strings = sorted(strings.iterkeys()) -+ sorted_strings = sorted(strings.keys()) - for index, s in enumerate(sorted_strings): - strings[s] = index - -@@ -205,7 +205,7 @@ - - def main(): - options = ParseOptions() -- with open(options.input, 'r') as input_stream: -+ with open(options.input, 'rb') as input_stream: - (emoji_data_list, token_dict) = ReadEmojiTsv(input_stream) - - OutputData(emoji_data_list, token_dict, ---- /src/rewriter/gen_reading_correction_data.py -+++ /src/rewriter/gen_reading_correction_data.py -@@ -63,7 +63,7 @@ - def WriteData(input_path, output_value_array_path, output_error_array_path, - output_correction_array_path): - outputs = [] -- with open(input_path) as input_stream: -+ with open(input_path, 'rb') as input_stream: - input_stream = code_generator_util.SkipLineComment(input_stream) - input_stream = code_generator_util.ParseColumnStream(input_stream, - num_column=3) -@@ -73,7 +73,7 @@ - - # In order to lookup the entries via |error| with binary search, - # sort outputs here. -- outputs.sort(lambda x, y: cmp(x[1], y[1]) or cmp(x[0], y[0])) -+ outputs.sort(key=lambda x: (x[1], x[0])) - - serialized_string_array_builder.SerializeToFile( - [value for (value, _, _) in outputs], output_value_array_path) ---- /src/rewriter/gen_single_kanji_rewriter_data.py -+++ /src/rewriter/gen_single_kanji_rewriter_data.py -@@ -52,7 +52,7 @@ - stream = code_generator_util.ParseColumnStream(stream, num_column=2) - outputs = list(stream) - # For binary search by |key|, sort outputs here. -- outputs.sort(lambda x, y: cmp(x[0], y[0])) -+ outputs.sort(key=lambda x: x[0]) - - return outputs - -@@ -72,7 +72,7 @@ - variant_items.append([target, original, len(variant_types) - 1]) - - # For binary search by |target|, sort variant items here. -- variant_items.sort(lambda x, y: cmp(x[0], y[0])) -+ variant_items.sort(key=lambda x: x[0]) - - return (variant_types, variant_items) - -@@ -151,10 +151,10 @@ - def main(): - options = _ParseOptions() - -- with open(options.single_kanji_file, 'r') as single_kanji_stream: -+ with open(options.single_kanji_file, 'rb') as single_kanji_stream: - single_kanji = ReadSingleKanji(single_kanji_stream) - -- with open(options.variant_file, 'r') as variant_stream: -+ with open(options.variant_file, 'rb') as variant_stream: - variant_info = ReadVariant(variant_stream) - - WriteSingleKanji(single_kanji, ---- /src/session/gen_session_stress_test_data.py -+++ /src/session/gen_session_stress_test_data.py -@@ -50,24 +50,26 @@ - """ - result = '' - for c in s: -- hexstr = hex(ord(c)) -+ hexstr = hex(c) - # because hexstr contains '0x', remove the prefix and add our prefix - result += '\\x' + hexstr[2:] - return result - - def GenerateHeader(file): - try: -- print "const char *kTestSentences[] = {" -- for line in open(file, "r"): -- if line.startswith('#'): -+ print("const char *kTestSentences[] = {") -+ fh = open(file, "rb") -+ for line in fh: -+ if line.startswith(b'#'): - continue -- line = line.rstrip('\r\n') -+ line = line.rstrip(b'\r\n') - if not line: - continue -- print " \"%s\"," % escape_string(line) -- print "};" -+ print(" \"%s\"," % escape_string(line)) -+ fh.close() -+ print("};") - except: -- print "cannot open %s" % (file) -+ print("cannot open %s" % (file)) - sys.exit(1) - - def main(): ---- /src/unix/ibus/gen_mozc_xml.py -+++ /src/unix/ibus/gen_mozc_xml.py -@@ -74,7 +74,7 @@ - - - def OutputXmlElement(param_dict, element_name, value): -- print ' <%s>%s</%s>' % (element_name, (value % param_dict), element_name) -+ print(' <%s>%s</%s>' % (element_name, (value % param_dict), element_name)) - - - def OutputXml(param_dict, component, engine_common, engines, setup_arg): -@@ -90,26 +90,26 @@ - engines: A dictionary from a property name to a list of property values of - engines. For example, {'name': ['mozc-jp', 'mozc', 'mozc-dv']}. - """ -- print '<component>' -- for key in component: -+ print('<component>') -+ for key in sorted(component): - OutputXmlElement(param_dict, key, component[key]) -- print '<engines>' -+ print('<engines>') - for i in range(len(engines['name'])): -- print '<engine>' -- for key in engine_common: -+ print('<engine>') -+ for key in sorted(engine_common): - OutputXmlElement(param_dict, key, engine_common[key]) - if setup_arg: - OutputXmlElement(param_dict, 'setup', ' '.join(setup_arg)) -- for key in engines: -+ for key in sorted(engines): - OutputXmlElement(param_dict, key, engines[key][i]) -- print '</engine>' -- print '</engines>' -- print '</component>' -+ print('</engine>') -+ print('</engines>') -+ print('</component>') - - - def OutputCppVariable(param_dict, prefix, variable_name, value): -- print 'const char k%s%s[] = "%s";' % (prefix, variable_name.capitalize(), -- (value % param_dict)) -+ print('const char k%s%s[] = "%s";' % (prefix, variable_name.capitalize(), -+ (value % param_dict))) - - - def OutputCpp(param_dict, component, engine_common, engines): -@@ -122,18 +122,18 @@ - engines: ditto. - """ - guard_name = 'MOZC_UNIX_IBUS_MAIN_H_' -- print CPP_HEADER % (guard_name, guard_name) -- for key in component: -+ print(CPP_HEADER % (guard_name, guard_name)) -+ for key in sorted(component): - OutputCppVariable(param_dict, 'Component', key, component[key]) -- for key in engine_common: -+ for key in sorted(engine_common): - OutputCppVariable(param_dict, 'Engine', key, engine_common[key]) -- for key in engines: -- print 'const char* kEngine%sArray[] = {' % key.capitalize() -+ for key in sorted(engines): -+ print('const char* kEngine%sArray[] = {' % key.capitalize()) - for i in range(len(engines[key])): -- print '"%s",' % (engines[key][i] % param_dict) -- print '};' -- print 'const size_t kEngineArrayLen = %s;' % len(engines['name']) -- print CPP_FOOTER % guard_name -+ print('"%s",' % (engines[key][i] % param_dict)) -+ print('};') -+ print('const size_t kEngineArrayLen = %s;' % len(engines['name'])) -+ print(CPP_FOOTER % guard_name) - - - def CheckIBusVersion(options, minimum_version): ---- /src/usage_stats/gen_stats_list.py -+++ /src/usage_stats/gen_stats_list.py -@@ -37,23 +37,24 @@ - - def GetStatsNameList(filename): - stats = [] -- for line in open(filename, 'r'): -- stat = line.strip() -- if not stat or stat[0] == '#': -- continue -- stats.append(stat) -+ with open(filename, 'r') as file: -+ for line in file: -+ stat = line.strip() -+ if not stat or stat[0] == '#': -+ continue -+ stats.append(stat) - return stats - - - def main(): - stats_list = GetStatsNameList(sys.argv[1]) -- print '// This header file is generated by gen_stats_list.py' -+ print('// This header file is generated by gen_stats_list.py') - for stats in stats_list: -- print 'const char k%s[] = "%s";' % (stats, stats) -- print 'const char *kStatsList[] = {' -+ print('const char k%s[] = "%s";' % (stats, stats)) -+ print('const char *kStatsList[] = {') - for stats in stats_list: -- print ' k%s,' % (stats) -- print '};' -+ print(' k%s,' % (stats)) -+ print('};') - - - if __name__ == '__main__': diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-reiwa.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-reiwa.patch deleted file mode 100644 index 561a989a41d3..000000000000 --- a/app-i18n/mozc/files/mozc-2.23.2815.102-reiwa.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://github.com/google/mozc/issues/461 - ---- /src/data/symbol/categorized.tsv -+++ /src/data/symbol/categorized.tsv -@@ -405,6 +405,7 @@ - ã½ MATH ãŸã„ã—ょㆠãã‚“ã”ㆠ- ã¼ MATH ã—ょã†ã‚ ãã‚“ã”ㆠ- ã» MATH ã¸ã„ã›ã„ ãã‚“ã”ㆠ-+ã‹¿ MATH ã‚Œã„ã‚ ãã‚“ã”ㆠ- - ㌣ MATH ã›ã‚“㨠ãŸã‚“ã„ - ㌦ MATH ã©ã‚‹ ãŸã‚“ã„ ---- /src/data/symbol/symbol.tsv -+++ /src/data/symbol/symbol.tsv -@@ -528,6 +528,7 @@ - è¨˜å· ãŠ¦ ã—㟠㒠丸下 - è¨˜å· ãŠ§ ã²ã ã‚Š 丸左 - è¨˜å· ãŠ¨ ã¿ãŽ ä¸¸å³ -+è¨˜å· ã‹¿ ã‚Œã„ã‚ ãã‚“ã”ã† å¹´å· OTHER - è¨˜å· ã» ã¸ã„ã›ã„ ãã‚“ã”ã† å¹´å· OTHER - è¨˜å· ã¼ ã—ょã†ã‚ ãã‚“ã”ã† å¹´å· OTHER - è¨˜å· ã½ ãŸã„ã—ょㆠãã‚“ã”ã† å¹´å· OTHER ---- /src/rewriter/date_rewriter.cc -+++ /src/rewriter/date_rewriter.cc -@@ -1239,6 +1239,10 @@ - 1989, - "å¹³æˆ", - "ã¸ã„ã›ã„", -+ }, { -+ 2019, -+ "令和", -+ "ã‚Œã„ã‚", - } - }; - diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch deleted file mode 100644 index dd606e27fb56..000000000000 --- a/app-i18n/mozc/files/mozc-2.23.2815.102-server_path_check.patch +++ /dev/null @@ -1,95 +0,0 @@ -https://github.com/google/mozc/issues/471 - ---- /src/ipc/ipc_path_manager.cc -+++ /src/ipc/ipc_path_manager.cc -@@ -332,9 +332,21 @@ - return false; - } - -+ // Expand symbolic links in the expected server path to avoid false negatives -+ // during comparisons of the expected server path and the actual server path. -+ string real_server_path = server_path; -+#ifndef OS_WIN -+ char real_server_path_[PATH_MAX]; -+ if (realpath(server_path.c_str(), real_server_path_) == NULL) { -+ LOG(ERROR) << "realpath failed: " << strerror(errno); -+ return false; -+ } -+ real_server_path = real_server_path_; -+#endif -+ - // compare path name - if (pid == server_pid_) { -- return (server_path == server_path_); -+ return (real_server_path == server_path_); - } - - server_pid_ = 0; -@@ -344,17 +356,17 @@ - { - std::wstring expected_server_ntpath; - const std::map<string, std::wstring>::const_iterator it = -- expected_server_ntpath_cache_.find(server_path); -+ expected_server_ntpath_cache_.find(real_server_path); - if (it != expected_server_ntpath_cache_.end()) { - expected_server_ntpath = it->second; - } else { - std::wstring wide_server_path; -- Util::UTF8ToWide(server_path, &wide_server_path); -+ Util::UTF8ToWide(real_server_path, &wide_server_path); - if (WinUtil::GetNtPath(wide_server_path, &expected_server_ntpath)) { -- // Caches the relationship from |server_path| to -- // |expected_server_ntpath| in case |server_path| is renamed later. -+ // Caches the relationship from |real_server_path| to -+ // |expected_server_ntpath| in case |real_server_path| is renamed later. - // (This can happen during the updating). -- expected_server_ntpath_cache_[server_path] = expected_server_ntpath; -+ expected_server_ntpath_cache_[real_server_path] = expected_server_ntpath; - } - } - -@@ -371,9 +383,9 @@ - return false; - } - -- // Here we can safely assume that |server_path| (expected one) should be -+ // Here we can safely assume that |real_server_path| (expected one) should be - // the same to |server_path_| (actual one). -- server_path_ = server_path; -+ server_path_ = real_server_path; - server_pid_ = pid; - } - #endif // OS_WIN -@@ -399,7 +411,7 @@ - #ifdef OS_LINUX - // load from /proc/<pid>/exe - char proc[128]; -- char filename[512]; -+ char filename[PATH_MAX]; - snprintf(proc, sizeof(proc) - 1, "/proc/%u/exe", pid); - const ssize_t size = readlink(proc, filename, sizeof(filename) - 1); - if (size == -1) { -@@ -412,18 +424,18 @@ - server_pid_ = pid; - #endif // OS_LINUX - -- VLOG(1) << "server path: " << server_path << " " << server_path_; -- if (server_path == server_path_) { -+ VLOG(1) << "server path: " << real_server_path << " " << server_path_; -+ if (real_server_path == server_path_) { - return true; - } - - #ifdef OS_LINUX -- if ((server_path + " (deleted)") == server_path_) { -- LOG(WARNING) << server_path << " on disk is modified"; -+ if ((real_server_path + " (deleted)") == server_path_) { -+ LOG(WARNING) << real_server_path << " on disk is modified"; - // If a user updates the server binary on disk during the server is running, - // "readlink /proc/<pid>/exe" returns a path with the " (deleted)" suffix. - // We allow the special case. -- server_path_ = server_path; -+ server_path_ = real_server_path; - return true; - } - #endif // OS_LINUX diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-system_libraries.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-system_libraries.patch deleted file mode 100644 index 064b910c7026..000000000000 --- a/app-i18n/mozc/files/mozc-2.23.2815.102-system_libraries.patch +++ /dev/null @@ -1,274 +0,0 @@ ---- /src/gyp/defines.gypi -+++ /src/gyp/defines.gypi -@@ -71,6 +71,12 @@ - # use_libibus represents if ibus library is used or not. - # This option is only for Linux. - 'use_libibus%': '0', -+ -+ # use_libgtest represents if gtest library is used or not. -+ 'use_libgtest%': '0', -+ -+ # use_libjsoncpp represents if jsoncpp library is used or not. -+ 'use_libjsoncpp%': '0', - }, - 'target_defaults': { - 'defines': [ ---- /src/net/jsoncpp.gyp -+++ /src/net/jsoncpp.gyp -@@ -31,32 +31,57 @@ - 'targets': [ - { - 'target_name': 'jsoncpp', -- 'type': 'static_library', -- 'variables': { -- 'jsoncpp_root': '<(third_party_dir)/jsoncpp', -- 'jsoncpp_srcs': [ -- '<(jsoncpp_root)/src/lib_json/json_reader.cpp', -- '<(jsoncpp_root)/src/lib_json/json_value.cpp', -- '<(jsoncpp_root)/src/lib_json/json_writer.cpp', -- ], -- 'jsoncpp_include_dirs': ['<(jsoncpp_root)/include'], -- 'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'], -- }, -- 'defines': [ -- '<@(jsoncpp_additional_macros)', -+ 'conditions': [ -+ ['use_libjsoncpp==1', { -+ 'type': 'none', -+ 'variables': { -+ 'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'], -+ }, -+ 'all_dependent_settings': { -+ 'defines': [ -+ '<@(jsoncpp_additional_macros)', -+ ], -+ 'cflags': [ -+ '<!@(pkg-config --cflags jsoncpp)', -+ ], -+ 'link_settings': { -+ 'libraries': [ -+ '<!@(pkg-config --libs-only-l jsoncpp)', -+ ], -+ 'ldflags': [ -+ '<!@(pkg-config --libs-only-L jsoncpp)', -+ ], -+ } -+ }, -+ }, { -+ 'type': 'static_library', -+ 'variables': { -+ 'jsoncpp_root': '<(third_party_dir)/jsoncpp', -+ 'jsoncpp_srcs': [ -+ '<(jsoncpp_root)/src/lib_json/json_reader.cpp', -+ '<(jsoncpp_root)/src/lib_json/json_value.cpp', -+ '<(jsoncpp_root)/src/lib_json/json_writer.cpp', -+ ], -+ 'jsoncpp_include_dirs': ['<(jsoncpp_root)/include'], -+ 'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'], -+ }, -+ 'defines': [ -+ '<@(jsoncpp_additional_macros)', -+ ], -+ 'sources': [ -+ '<@(jsoncpp_srcs)', -+ 'jsoncpp.h', -+ ], -+ 'include_dirs': [ -+ '<@(jsoncpp_include_dirs)', -+ ], -+ 'all_dependent_settings': { -+ 'defines': [ -+ '<@(jsoncpp_additional_macros)', -+ ], -+ }, -+ }], - ], -- 'sources': [ -- '<@(jsoncpp_srcs)', -- 'jsoncpp.h', -- ], -- 'include_dirs': [ -- '<@(jsoncpp_include_dirs)', -- ], -- 'all_dependent_settings': { -- 'defines': [ -- '<@(jsoncpp_additional_macros)', -- ], -- }, - }, - ], - } ---- /src/net/jsoncpp.h -+++ /src/net/jsoncpp.h -@@ -35,7 +35,7 @@ - // Mozc basically disables C++ exception. - #define JSON_USE_EXCEPTION 0 - #endif // !JSON_USE_EXCEPTION --#include "third_party/jsoncpp/include/json/json.h" -+#include <json/json.h> - #define MOZC_JSONCPP_JSON_H_INCLUDED - #endif // !MOZC_JSONCPP_JSON_H_INCLUDED - ---- /src/testing/testing.gyp -+++ /src/testing/testing.gyp -@@ -53,66 +53,101 @@ - 'targets': [ - { - 'target_name': 'testing', -- 'type': 'static_library', -- 'variables': { -- 'gtest_defines': [ -- 'GTEST_LANG_CXX11=1', -- 'GTEST_HAS_TR1_TUPLE=0', # disable tr1 tuple in favor of C++11 tuple. -- ], -- 'gtest_dir': '<(third_party_dir)/gtest/googletest', -- 'gmock_dir': '<(third_party_dir)/gtest/googlemock', -- 'conditions': [ -- ['_toolset=="target" and target_platform=="Android"', { -- 'gtest_defines': [ -- 'GTEST_HAS_RTTI=0', # Android NDKr7 requires this. -- 'GTEST_HAS_CLONE=0', -- 'GTEST_HAS_GLOBAL_WSTRING=0', -- 'GTEST_HAS_POSIX_RE=0', -- 'GTEST_HAS_STD_WSTRING=0', -- 'GTEST_OS_LINUX=1', -- 'GTEST_OS_LINUX_ANDROID=1', -- ], -- }], -- ], -- }, -- 'sources': [ -- '<(gmock_dir)/src/gmock-cardinalities.cc', -- '<(gmock_dir)/src/gmock-internal-utils.cc', -- '<(gmock_dir)/src/gmock-matchers.cc', -- '<(gmock_dir)/src/gmock-spec-builders.cc', -- '<(gmock_dir)/src/gmock.cc', -- '<(gtest_dir)/src/gtest-death-test.cc', -- '<(gtest_dir)/src/gtest-filepath.cc', -- '<(gtest_dir)/src/gtest-port.cc', -- '<(gtest_dir)/src/gtest-printers.cc', -- '<(gtest_dir)/src/gtest-test-part.cc', -- '<(gtest_dir)/src/gtest-typed-test.cc', -- '<(gtest_dir)/src/gtest.cc', -- ], -- 'include_dirs': [ -- '<(gmock_dir)', -- '<(gmock_dir)/include', -- '<(gtest_dir)', -- '<(gtest_dir)/include', -- ], -- 'defines': [ -- '<@(gtest_defines)', -- ], -- 'all_dependent_settings': { -- 'defines': [ -- '<@(gtest_defines)', -- ], -- 'include_dirs': [ -- '<(gmock_dir)/include', -- '<(gtest_dir)/include', -- ], -- }, - 'conditions': [ -- ['(_toolset=="target" and compiler_target=="clang") or ' -- '(_toolset=="host" and compiler_host=="clang")', { -- 'cflags': [ -- '-Wno-missing-field-initializers', -- '-Wno-unused-private-field', -+ ['use_libgtest==1', { -+ 'type': 'none', -+ 'variables': { -+ 'gtest_defines': [ -+ 'GTEST_LANG_CXX11=1', -+ 'GTEST_HAS_TR1_TUPLE=0', # disable tr1 tuple in favor of C++11 tuple. -+ ], -+ 'conditions': [ -+ ['_toolset=="target" and target_platform=="Android"', { -+ 'gtest_defines': [ -+ 'GTEST_HAS_RTTI=0', # Android NDKr7 requires this. -+ 'GTEST_HAS_CLONE=0', -+ 'GTEST_HAS_GLOBAL_WSTRING=0', -+ 'GTEST_HAS_POSIX_RE=0', -+ 'GTEST_HAS_STD_WSTRING=0', -+ 'GTEST_OS_LINUX=1', -+ 'GTEST_OS_LINUX_ANDROID=1', -+ ], -+ }], -+ ], -+ }, -+ 'all_dependent_settings': { -+ 'defines': [ -+ '<@(gtest_defines)', -+ ], -+ 'link_settings': { -+ 'libraries': [ -+ '-lgmock -lgtest', -+ ], -+ }, -+ }, -+ }, { -+ 'type': 'static_library', -+ 'variables': { -+ 'gtest_defines': [ -+ 'GTEST_LANG_CXX11=1', -+ 'GTEST_HAS_TR1_TUPLE=0', # disable tr1 tuple in favor of C++11 tuple. -+ ], -+ 'gtest_dir': '<(third_party_dir)/gtest/googletest', -+ 'gmock_dir': '<(third_party_dir)/gtest/googlemock', -+ 'conditions': [ -+ ['_toolset=="target" and target_platform=="Android"', { -+ 'gtest_defines': [ -+ 'GTEST_HAS_RTTI=0', # Android NDKr7 requires this. -+ 'GTEST_HAS_CLONE=0', -+ 'GTEST_HAS_GLOBAL_WSTRING=0', -+ 'GTEST_HAS_POSIX_RE=0', -+ 'GTEST_HAS_STD_WSTRING=0', -+ 'GTEST_OS_LINUX=1', -+ 'GTEST_OS_LINUX_ANDROID=1', -+ ], -+ }], -+ ], -+ }, -+ 'sources': [ -+ '<(gmock_dir)/src/gmock-cardinalities.cc', -+ '<(gmock_dir)/src/gmock-internal-utils.cc', -+ '<(gmock_dir)/src/gmock-matchers.cc', -+ '<(gmock_dir)/src/gmock-spec-builders.cc', -+ '<(gmock_dir)/src/gmock.cc', -+ '<(gtest_dir)/src/gtest-death-test.cc', -+ '<(gtest_dir)/src/gtest-filepath.cc', -+ '<(gtest_dir)/src/gtest-port.cc', -+ '<(gtest_dir)/src/gtest-printers.cc', -+ '<(gtest_dir)/src/gtest-test-part.cc', -+ '<(gtest_dir)/src/gtest-typed-test.cc', -+ '<(gtest_dir)/src/gtest.cc', -+ ], -+ 'include_dirs': [ -+ '<(gmock_dir)', -+ '<(gmock_dir)/include', -+ '<(gtest_dir)', -+ '<(gtest_dir)/include', -+ ], -+ 'defines': [ -+ '<@(gtest_defines)', -+ ], -+ 'all_dependent_settings': { -+ 'defines': [ -+ '<@(gtest_defines)', -+ ], -+ 'include_dirs': [ -+ '<(gmock_dir)/include', -+ '<(gtest_dir)/include', -+ ], -+ }, -+ 'conditions': [ -+ ['(_toolset=="target" and compiler_target=="clang") or ' -+ '(_toolset=="host" and compiler_host=="clang")', { -+ 'cflags': [ -+ '-Wno-missing-field-initializers', -+ '-Wno-unused-private-field', -+ ], -+ }], - ], - }], - ], diff --git a/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch b/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch deleted file mode 100644 index dccdff76f15d..000000000000 --- a/app-i18n/mozc/files/mozc-2.26.4220-environmental_variables.patch +++ /dev/null @@ -1,89 +0,0 @@ -https://github.com/google/mozc/issues/470 - ---- /src/base/system_util.cc -+++ /src/base/system_util.cc -@@ -226,6 +226,11 @@ - - std::string UserProfileDirectoryImpl::GetUserProfileDirectory() const { - #if defined(OS_CHROMEOS) -+ const char *configuration_directory_env = Environ::GetEnv("MOZC_CONFIGURATION_DIRECTORY"); -+ if (configuration_directory_env) { -+ return configuration_directory_env; -+ } -+ - // TODO(toka): Must use passed in user profile dir which passed in. If mojo - // platform the user profile is determined on runtime. - // It's hack, the user profile dir should be passed in. Although the value in -@@ -245,13 +250,23 @@ - #elif defined(OS_IOS) - // OS_IOS block must be placed before __APPLE__ because both macros are - // currently defined on iOS. -- // -+ -+ const char *configuration_directory_env = Environ::GetEnv("MOZC_CONFIGURATION_DIRECTORY"); -+ if (configuration_directory_env) { -+ return configuration_directory_env; -+ } -+ - // On iOS, use Caches directory instead of Application Spport directory - // because the support directory doesn't exist by default. Also, it is backed - // up by iTunes and iCloud. - return FileUtil::JoinPath({MacUtil::GetCachesDirectory(), kProductPrefix}); - - #elif defined(OS_WIN) -+ const char *configuration_directory_env = Environ::GetEnv("MOZC_CONFIGURATION_DIRECTORY"); -+ if (configuration_directory_env) { -+ return configuration_directory_env; -+ } -+ - DCHECK(SUCCEEDED(Singleton<LocalAppDataDirectoryCache>::get()->result())); - std::string dir = Singleton<LocalAppDataDirectoryCache>::get()->path(); - -@@ -263,6 +278,11 @@ - - - #elif defined(__APPLE__) -+ const char *configuration_directory_env = Environ::GetEnv("MOZC_CONFIGURATION_DIRECTORY"); -+ if (configuration_directory_env) { -+ return configuration_directory_env; -+ } -+ - std::string dir = MacUtil::GetApplicationSupportDirectory(); - # ifdef GOOGLE_JAPANESE_INPUT_BUILD - dir = FileUtil::JoinPath(dir, "Google"); -@@ -276,6 +296,11 @@ - - - #elif defined(OS_LINUX) -+ const char *configuration_directory_env = Environ::GetEnv("MOZC_CONFIGURATION_DIRECTORY"); -+ if (configuration_directory_env) { -+ return configuration_directory_env; -+ } -+ - // 1. If "$HOME/.mozc" already exists, - // use "$HOME/.mozc" for backward compatibility. - // 2. If $XDG_CONFIG_HOME is defined -@@ -395,6 +420,11 @@ - #endif // OS_WIN - - std::string SystemUtil::GetServerDirectory() { -+ const char *server_directory_env = Environ::GetEnv("MOZC_SERVER_DIRECTORY"); -+ if (server_directory_env) { -+ return server_directory_env; -+ } -+ - #ifdef OS_WIN - DCHECK(SUCCEEDED(Singleton<ProgramFilesX86Cache>::get()->result())); - # if defined(GOOGLE_JAPANESE_INPUT_BUILD) -@@ -453,6 +483,11 @@ - } - - std::string SystemUtil::GetDocumentDirectory() { -+ const char *documents_directory_env = Environ::GetEnv("MOZC_DOCUMENTS_DIRECTORY"); -+ if (documents_directory_env) { -+ return documents_directory_env; -+ } -+ - #if defined(__APPLE__) - return GetServerDirectory(); - #elif defined(MOZC_DOCUMENT_DIRECTORY) diff --git a/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch b/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch deleted file mode 100644 index 8dbabeac0038..000000000000 --- a/app-i18n/mozc/files/mozc-2.26.4220-server_path_check.patch +++ /dev/null @@ -1,95 +0,0 @@ -https://github.com/google/mozc/issues/471 - ---- /src/ipc/ipc_path_manager.cc -+++ /src/ipc/ipc_path_manager.cc -@@ -340,9 +340,21 @@ - return false; - } - -+ // Expand symbolic links in the expected server path to avoid false negatives -+ // during comparisons of the expected server path and the actual server path. -+ string real_server_path = server_path; -+#ifndef OS_WIN -+ char real_server_path_[PATH_MAX]; -+ if (realpath(server_path.c_str(), real_server_path_) == NULL) { -+ LOG(ERROR) << "realpath failed: " << strerror(errno); -+ return false; -+ } -+ real_server_path = real_server_path_; -+#endif -+ - // compare path name - if (pid == server_pid_) { -- return (server_path == server_path_); -+ return (real_server_path == server_path_); - } - - server_pid_ = 0; -@@ -352,17 +364,17 @@ - { - std::wstring expected_server_ntpath; - const std::map<string, std::wstring>::const_iterator it = -- expected_server_ntpath_cache_.find(server_path); -+ expected_server_ntpath_cache_.find(real_server_path); - if (it != expected_server_ntpath_cache_.end()) { - expected_server_ntpath = it->second; - } else { - std::wstring wide_server_path; -- Util::UTF8ToWide(server_path, &wide_server_path); -+ Util::UTF8ToWide(real_server_path, &wide_server_path); - if (WinUtil::GetNtPath(wide_server_path, &expected_server_ntpath)) { -- // Caches the relationship from |server_path| to -- // |expected_server_ntpath| in case |server_path| is renamed later. -+ // Caches the relationship from |real_server_path| to -+ // |expected_server_ntpath| in case |real_server_path| is renamed later. - // (This can happen during the updating). -- expected_server_ntpath_cache_[server_path] = expected_server_ntpath; -+ expected_server_ntpath_cache_[real_server_path] = expected_server_ntpath; - } - } - -@@ -379,9 +391,9 @@ - return false; - } - -- // Here we can safely assume that |server_path| (expected one) should be -+ // Here we can safely assume that |real_server_path| (expected one) should be - // the same to |server_path_| (actual one). -- server_path_ = server_path; -+ server_path_ = real_server_path; - server_pid_ = pid; - } - #endif // OS_WIN -@@ -406,7 +418,7 @@ - #ifdef OS_LINUX - // load from /proc/<pid>/exe - char proc[128]; -- char filename[512]; -+ char filename[PATH_MAX]; - absl::SNPrintF(proc, sizeof(proc) - 1, "/proc/%u/exe", pid); - const ssize_t size = readlink(proc, filename, sizeof(filename) - 1); - if (size == -1) { -@@ -419,18 +431,18 @@ - server_pid_ = pid; - #endif // OS_LINUX - -- VLOG(1) << "server path: " << server_path << " " << server_path_; -- if (server_path == server_path_) { -+ VLOG(1) << "server path: " << real_server_path << " " << server_path_; -+ if (real_server_path == server_path_) { - return true; - } - - #ifdef OS_LINUX -- if ((server_path + " (deleted)") == server_path_) { -- LOG(WARNING) << server_path << " on disk is modified"; -+ if ((real_server_path + " (deleted)") == server_path_) { -+ LOG(WARNING) << real_server_path << " on disk is modified"; - // If a user updates the server binary on disk during the server is running, - // "readlink /proc/<pid>/exe" returns a path with the " (deleted)" suffix. - // We allow the special case. -- server_path_ = server_path; -+ server_path_ = real_server_path; - return true; - } - #endif // OS_LINUX diff --git a/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch b/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch deleted file mode 100644 index 33f72b8f7a63..000000000000 --- a/app-i18n/mozc/files/mozc-2.26.4220-system_abseil-cpp.patch +++ /dev/null @@ -1,407 +0,0 @@ -https://github.com/google/mozc/issues/490 - ---- /src/base/absl.gyp -+++ /src/base/absl.gyp -@@ -28,119 +28,209 @@ - # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - { -- 'variables': { -- 'absl_srcdir': '<(DEPTH)/third_party/abseil-cpp/absl', -- 'gen_absl_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/abseil-cpp/absl', -- }, -+ 'conditions': [ -+ ['use_system_abseil_cpp==0', { -+ 'variables': { -+ 'absl_srcdir': '<(DEPTH)/third_party/abseil-cpp/absl', -+ 'gen_absl_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/abseil-cpp/absl', -+ }, -+ }], -+ ], - 'targets': [ - { - 'target_name': 'absl_base', -- 'type': 'static_library', - 'toolsets': ['host', 'target'], -- 'sources': [ -- '<(absl_srcdir)/base/internal/cycleclock.cc', -- '<(absl_srcdir)/base/internal/low_level_alloc.cc', -- '<(absl_srcdir)/base/internal/raw_logging.cc', -- '<(absl_srcdir)/base/internal/spinlock.cc', -- '<(absl_srcdir)/base/internal/spinlock_wait.cc', -- '<(absl_srcdir)/base/internal/sysinfo.cc', -- '<(absl_srcdir)/base/internal/thread_identity.cc', -- '<(absl_srcdir)/base/internal/throw_delegate.cc', -- '<(absl_srcdir)/base/internal/unscaledcycleclock.cc', -- '<(absl_srcdir)/container/internal/raw_hash_set.cc', -- '<(absl_srcdir)/hash/internal/city.cc', -- '<(absl_srcdir)/hash/internal/hash.cc', -- ], -- 'msvs_disabled_warnings': [ -- # 'type' : forcing value to bool 'true' or 'false' -- # (performance warning) -- # http://msdn.microsoft.com/en-us/library/b6801kcy.aspx -- '4800', -+ 'conditions': [ -+ ['use_system_abseil_cpp==1', { -+ 'type': 'none', -+ 'all_dependent_settings': { -+ 'link_settings': { -+ 'libraries': [ -+ '-labsl_base -labsl_city -labsl_hash -labsl_malloc_internal -labsl_raw_hash_set -labsl_raw_logging_internal -labsl_spinlock_wait -labsl_throw_delegate', -+ ], -+ }, -+ }, -+ }, { -+ 'type': 'static_library', -+ 'sources': [ -+ # libabsl_base -+ '<(absl_srcdir)/base/internal/cycleclock.cc', -+ # libabsl_malloc_internal -+ '<(absl_srcdir)/base/internal/low_level_alloc.cc', -+ # libabsl_raw_logging_internal -+ '<(absl_srcdir)/base/internal/raw_logging.cc', -+ # libabsl_base -+ '<(absl_srcdir)/base/internal/spinlock.cc', -+ # libabsl_spinlock_wait -+ '<(absl_srcdir)/base/internal/spinlock_wait.cc', -+ # libabsl_base -+ '<(absl_srcdir)/base/internal/sysinfo.cc', -+ '<(absl_srcdir)/base/internal/thread_identity.cc', -+ # libabsl_throw_delegate -+ '<(absl_srcdir)/base/internal/throw_delegate.cc', -+ # libabsl_base -+ '<(absl_srcdir)/base/internal/unscaledcycleclock.cc', -+ # libabsl_raw_hash_set -+ '<(absl_srcdir)/container/internal/raw_hash_set.cc', -+ # libabsl_city -+ '<(absl_srcdir)/hash/internal/city.cc', -+ # libabsl_hash -+ '<(absl_srcdir)/hash/internal/hash.cc', -+ ], -+ 'msvs_disabled_warnings': [ -+ # 'type' : forcing value to bool 'true' or 'false' -+ # (performance warning) -+ # http://msdn.microsoft.com/en-us/library/b6801kcy.aspx -+ '4800', -+ ], -+ }], - ], - }, - { - 'target_name': 'absl_numeric', -- 'type': 'static_library', - 'toolsets': ['host', 'target'], -- 'sources': [ -- '<(absl_srcdir)/numeric/int128.cc', -- ], -- 'dependencies': [ -- 'absl_base', -+ 'conditions': [ -+ ['use_system_abseil_cpp==1', { -+ 'type': 'none', -+ 'all_dependent_settings': { -+ 'link_settings': { -+ 'libraries': [ -+ '-labsl_int128', -+ ], -+ }, -+ }, -+ }, { -+ 'type': 'static_library', -+ 'sources': [ -+ # libabsl_int128 -+ '<(absl_srcdir)/numeric/int128.cc', -+ ], -+ 'dependencies': [ -+ 'absl_base', -+ ], -+ }], - ], - }, - { - 'target_name': 'absl_strings_internal', -- 'type': 'static_library', - 'toolsets': ['host', 'target'], -- 'sources': [ -- '<(absl_srcdir)/strings/internal/charconv_bigint.cc', -- '<(absl_srcdir)/strings/internal/charconv_parse.cc', -- '<(absl_srcdir)/strings/internal/escaping.cc', -- '<(absl_srcdir)/strings/internal/memutil.cc', -- '<(absl_srcdir)/strings/internal/str_format/arg.cc', -- '<(absl_srcdir)/strings/internal/str_format/bind.cc', -- '<(absl_srcdir)/strings/internal/str_format/extension.cc', -- '<(absl_srcdir)/strings/internal/str_format/float_conversion.cc', -- '<(absl_srcdir)/strings/internal/str_format/output.cc', -- '<(absl_srcdir)/strings/internal/str_format/parser.cc', -- '<(absl_srcdir)/strings/internal/utf8.cc', -- ], -- 'dependencies': [ -- 'absl_base', -- 'absl_numeric', -+ 'conditions': [ -+ ['use_system_abseil_cpp==1', { -+ 'type': 'none', -+ 'all_dependent_settings': { -+ 'link_settings': { -+ 'libraries': [ -+ '-labsl_strings_internal', -+ ], -+ }, -+ }, -+ }, { -+ 'type': 'static_library', -+ 'sources': [ -+ # libabsl_strings -+ '<(absl_srcdir)/strings/internal/charconv_bigint.cc', -+ '<(absl_srcdir)/strings/internal/charconv_parse.cc', -+ # libabsl_strings_internal -+ '<(absl_srcdir)/strings/internal/escaping.cc', -+ # libabsl_strings -+ '<(absl_srcdir)/strings/internal/memutil.cc', -+ # libabsl_str_format_internal -+ '<(absl_srcdir)/strings/internal/str_format/arg.cc', -+ '<(absl_srcdir)/strings/internal/str_format/bind.cc', -+ '<(absl_srcdir)/strings/internal/str_format/extension.cc', -+ '<(absl_srcdir)/strings/internal/str_format/float_conversion.cc', -+ '<(absl_srcdir)/strings/internal/str_format/output.cc', -+ '<(absl_srcdir)/strings/internal/str_format/parser.cc', -+ # libabsl_strings_internal -+ '<(absl_srcdir)/strings/internal/utf8.cc', -+ ], -+ 'dependencies': [ -+ 'absl_base', -+ 'absl_numeric', -+ ], -+ }], - ], - }, - { - 'target_name': 'absl_strings', -- 'type': 'static_library', - 'toolsets': ['host', 'target'], -- 'sources': [ -- '<(absl_srcdir)/strings/ascii.cc', -- '<(absl_srcdir)/strings/charconv.cc', -- '<(absl_srcdir)/strings/escaping.cc', -- '<(absl_srcdir)/strings/match.cc', -- '<(absl_srcdir)/strings/numbers.cc', -- '<(absl_srcdir)/strings/str_cat.cc', -- '<(absl_srcdir)/strings/str_replace.cc', -- '<(absl_srcdir)/strings/str_split.cc', -- '<(absl_srcdir)/strings/string_view.cc', -- '<(absl_srcdir)/strings/substitute.cc', -- ], -- 'dependencies': [ -- 'absl_base', -- 'absl_numeric', -- 'absl_strings_internal', -+ 'conditions': [ -+ ['use_system_abseil_cpp==1', { -+ 'type': 'none', -+ 'all_dependent_settings': { -+ 'link_settings': { -+ 'libraries': [ -+ '-labsl_str_format_internal -labsl_strings -labsl_strings_internal', -+ ], -+ }, -+ }, -+ }, { -+ 'type': 'static_library', -+ 'sources': [ -+ # libabsl_strings -+ '<(absl_srcdir)/strings/ascii.cc', -+ '<(absl_srcdir)/strings/charconv.cc', -+ '<(absl_srcdir)/strings/escaping.cc', -+ '<(absl_srcdir)/strings/match.cc', -+ '<(absl_srcdir)/strings/numbers.cc', -+ '<(absl_srcdir)/strings/str_cat.cc', -+ '<(absl_srcdir)/strings/str_replace.cc', -+ '<(absl_srcdir)/strings/str_split.cc', -+ '<(absl_srcdir)/strings/string_view.cc', -+ '<(absl_srcdir)/strings/substitute.cc', -+ ], -+ 'dependencies': [ -+ 'absl_base', -+ 'absl_numeric', -+ 'absl_strings_internal', -+ ], -+ }], - ], - }, - { - 'target_name': 'absl_time', -- 'type': 'static_library', - 'toolsets': ['host', 'target'], -- 'sources': [ -- '<(absl_srcdir)/time/civil_time.cc', -- '<(absl_srcdir)/time/clock.cc', -- '<(absl_srcdir)/time/duration.cc', -- '<(absl_srcdir)/time/format.cc', -- '<(absl_srcdir)/time/time.cc', -- '<(absl_srcdir)/time/internal/cctz/src/civil_time_detail.cc', -- '<(absl_srcdir)/time/internal/cctz/src/time_zone_fixed.cc', -- '<(absl_srcdir)/time/internal/cctz/src/time_zone_format.cc', -- '<(absl_srcdir)/time/internal/cctz/src/time_zone_if.cc', -- '<(absl_srcdir)/time/internal/cctz/src/time_zone_impl.cc', -- '<(absl_srcdir)/time/internal/cctz/src/time_zone_info.cc', -- '<(absl_srcdir)/time/internal/cctz/src/time_zone_libc.cc', -- '<(absl_srcdir)/time/internal/cctz/src/time_zone_lookup.cc', -- '<(absl_srcdir)/time/internal/cctz/src/time_zone_posix.cc', -- '<(absl_srcdir)/time/internal/cctz/src/zone_info_source.cc', -- ], -- 'cflags': [ -- '-Wno-error', -- ], -- 'dependencies': [ -- 'absl_base', -- 'absl_numeric', -- 'absl_strings_internal', -+ 'conditions': [ -+ ['use_system_abseil_cpp==1', { -+ 'type': 'none', -+ 'all_dependent_settings': { -+ 'link_settings': { -+ 'libraries': [ -+ '-labsl_civil_time -labsl_time -labsl_time_zone', -+ ], -+ }, -+ }, -+ }, { -+ 'type': 'static_library', -+ 'sources': [ -+ # libabsl_time -+ '<(absl_srcdir)/time/civil_time.cc', -+ '<(absl_srcdir)/time/clock.cc', -+ '<(absl_srcdir)/time/duration.cc', -+ '<(absl_srcdir)/time/format.cc', -+ '<(absl_srcdir)/time/time.cc', -+ # libabsl_civil_time -+ '<(absl_srcdir)/time/internal/cctz/src/civil_time_detail.cc', -+ # libabsl_time_zone -+ '<(absl_srcdir)/time/internal/cctz/src/time_zone_fixed.cc', -+ '<(absl_srcdir)/time/internal/cctz/src/time_zone_format.cc', -+ '<(absl_srcdir)/time/internal/cctz/src/time_zone_if.cc', -+ '<(absl_srcdir)/time/internal/cctz/src/time_zone_impl.cc', -+ '<(absl_srcdir)/time/internal/cctz/src/time_zone_info.cc', -+ '<(absl_srcdir)/time/internal/cctz/src/time_zone_libc.cc', -+ '<(absl_srcdir)/time/internal/cctz/src/time_zone_lookup.cc', -+ '<(absl_srcdir)/time/internal/cctz/src/time_zone_posix.cc', -+ '<(absl_srcdir)/time/internal/cctz/src/zone_info_source.cc', -+ ], -+ 'cflags': [ -+ '-Wno-error', -+ ], -+ 'dependencies': [ -+ 'absl_base', -+ 'absl_numeric', -+ 'absl_strings_internal', -+ ], -+ }], - ], - }, - ], ---- /src/config/config_test.gyp -+++ /src/config/config_test.gyp -@@ -36,6 +36,7 @@ - 'config_handler_test.cc', - ], - 'dependencies': [ -+ '../base/absl.gyp:absl_base', - '../testing/testing.gyp:gtest_main', - '../testing/testing.gyp:mozctest', - 'config.gyp:config_handler', -@@ -80,6 +81,7 @@ - 'character_form_manager_test.cc', - ], - 'dependencies': [ -+ '../base/absl.gyp:absl_base', - '../testing/testing.gyp:gtest_main', - 'config.gyp:character_form_manager', - ], ---- /src/gyp/common.gypi -+++ /src/gyp/common.gypi -@@ -194,7 +194,13 @@ - 'include_dirs': [ - '<(abs_depth)', - '<(SHARED_INTERMEDIATE_DIR)', -- '<(absl_dir)', -+ ], -+ 'conditions': [ -+ ['use_system_abseil_cpp==0', { -+ 'include_dirs': [ -+ '<(absl_dir)', -+ ], -+ }], - ], - 'mac_framework_headers': [], - 'target_conditions': [ ---- /src/gyp/common_win.gypi -+++ /src/gyp/common_win.gypi -@@ -307,10 +307,16 @@ - 'include_dirs': [ - '<(abs_depth)', - '<(SHARED_INTERMEDIATE_DIR)', -- '<(absl_dir)', - '<@(msvs_includes)', - '<(wtl_dir)/include', - ], -+ 'conditions': [ -+ ['use_system_abseil_cpp==0', { -+ 'include_dirs': [ -+ '<(absl_dir)', -+ ], -+ }], -+ ], - 'msvs_configuration_attributes': { - 'CharacterSet': '<(win_char_set_unicode)', - }, ---- /src/gyp/defines.gypi -+++ /src/gyp/defines.gypi -@@ -63,6 +63,10 @@ - # use_libibus represents if ibus library is used or not. - # This option is only for Linux. - 'use_libibus%': '0', -+ -+ # use_system_abseil_cpp represents if system version or bundled version -+ # of abseil-cpp library is used. -+ 'use_system_abseil_cpp%': '0', - }, - 'target_defaults': { - 'defines': [ ---- /src/gyp/directories.gypi -+++ /src/gyp/directories.gypi -@@ -31,7 +31,12 @@ - 'variables': { - # Top directory of third party libraries. - 'third_party_dir': '<(DEPTH)/third_party', -- 'absl_dir': '<(DEPTH)/third_party/abseil-cpp', -+ -+ 'conditions': [ -+ ['use_system_abseil_cpp==0', { -+ 'absl_dir': '<(DEPTH)/third_party/abseil-cpp', -+ }], -+ ], - - # Top directory of additional third party libraries. - 'ext_third_party_dir%': '<(abs_depth)/third_party', ---- /src/session/session_test.gyp -+++ /src/session/session_test.gyp -@@ -221,6 +221,7 @@ - 'internal/key_event_transformer_test.cc', - ], - 'dependencies': [ -+ '../base/absl.gyp:absl_base', - '../base/base.gyp:base', - '../converter/converter_base.gyp:converter_mock', - '../engine/engine.gyp:mock_converter_engine', ---- /src/storage/storage_test.gyp -+++ /src/storage/storage_test.gyp -@@ -41,6 +41,7 @@ - 'tiny_storage_test.cc', - ], - 'dependencies': [ -+ '../base/absl.gyp:absl_base', - '../testing/testing.gyp:gtest_main', - 'storage.gyp:storage', - ], diff --git a/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch b/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch deleted file mode 100644 index 47891fab9b47..000000000000 --- a/app-i18n/mozc/files/mozc-2.26.4220-system_gtest.patch +++ /dev/null @@ -1,141 +0,0 @@ -https://github.com/google/mozc/issues/490 - ---- /src/gyp/defines.gypi -+++ /src/gyp/defines.gypi -@@ -67,6 +67,10 @@ - # use_system_abseil_cpp represents if system version or bundled version - # of abseil-cpp library is used. - 'use_system_abseil_cpp%': '0', -+ -+ # use_system_gtest represents if system version or bundled version -+ # of gtest library is used. -+ 'use_system_gtest%': '0', - }, - 'target_defaults': { - 'defines': [ ---- /src/testing/testing.gyp -+++ /src/testing/testing.gyp -@@ -59,54 +59,76 @@ - 'targets': [ - { - 'target_name': 'testing', -- 'type': 'static_library', -- 'variables': { -- 'gtest_defines': [ -- 'GTEST_LANG_CXX11=1', -- 'GTEST_HAS_TR1_TUPLE=0', # disable tr1 tuple in favor of C++11 tuple. -- ], -- 'gtest_dir': '<(third_party_dir)/gtest/googletest', -- 'gmock_dir': '<(third_party_dir)/gtest/googlemock', -- }, -- 'sources': [ -- '<(gmock_dir)/src/gmock-cardinalities.cc', -- '<(gmock_dir)/src/gmock-internal-utils.cc', -- '<(gmock_dir)/src/gmock-matchers.cc', -- '<(gmock_dir)/src/gmock-spec-builders.cc', -- '<(gmock_dir)/src/gmock.cc', -- '<(gtest_dir)/src/gtest-death-test.cc', -- '<(gtest_dir)/src/gtest-filepath.cc', -- '<(gtest_dir)/src/gtest-matchers.cc', -- '<(gtest_dir)/src/gtest-port.cc', -- '<(gtest_dir)/src/gtest-printers.cc', -- '<(gtest_dir)/src/gtest-test-part.cc', -- '<(gtest_dir)/src/gtest-typed-test.cc', -- '<(gtest_dir)/src/gtest.cc', -- ], -- 'include_dirs': [ -- '<(gmock_dir)', -- '<(gmock_dir)/include', -- '<(gtest_dir)', -- '<(gtest_dir)/include', -- ], -- 'defines': [ -- '<@(gtest_defines)', -- ], -- 'all_dependent_settings': { -- 'defines': [ -- '<@(gtest_defines)', -- ], -- 'include_dirs': [ -- '<(gmock_dir)/include', -- '<(gtest_dir)/include', -- ], -- }, - 'conditions': [ -- ['(_toolset=="target" and compiler_target=="clang") or ' -- '(_toolset=="host" and compiler_host=="clang")', { -- 'cflags': [ -- '-Wno-missing-field-initializers', -- '-Wno-unused-private-field', -+ ['use_system_gtest==1', { -+ 'type': 'none', -+ 'variables': { -+ 'gtest_defines': [ -+ 'GTEST_LANG_CXX11=1', -+ 'GTEST_HAS_TR1_TUPLE=0', # disable tr1 tuple in favor of C++11 tuple. -+ ], -+ }, -+ 'all_dependent_settings': { -+ 'defines': [ -+ '<@(gtest_defines)', -+ ], -+ 'link_settings': { -+ 'libraries': [ -+ '-lgmock -lgtest', -+ ], -+ }, -+ }, -+ }, { -+ 'type': 'static_library', -+ 'variables': { -+ 'gtest_defines': [ -+ 'GTEST_LANG_CXX11=1', -+ 'GTEST_HAS_TR1_TUPLE=0', # disable tr1 tuple in favor of C++11 tuple. -+ ], -+ 'gtest_dir': '<(third_party_dir)/gtest/googletest', -+ 'gmock_dir': '<(third_party_dir)/gtest/googlemock', -+ }, -+ 'sources': [ -+ '<(gmock_dir)/src/gmock-cardinalities.cc', -+ '<(gmock_dir)/src/gmock-internal-utils.cc', -+ '<(gmock_dir)/src/gmock-matchers.cc', -+ '<(gmock_dir)/src/gmock-spec-builders.cc', -+ '<(gmock_dir)/src/gmock.cc', -+ '<(gtest_dir)/src/gtest-death-test.cc', -+ '<(gtest_dir)/src/gtest-filepath.cc', -+ '<(gtest_dir)/src/gtest-matchers.cc', -+ '<(gtest_dir)/src/gtest-port.cc', -+ '<(gtest_dir)/src/gtest-printers.cc', -+ '<(gtest_dir)/src/gtest-test-part.cc', -+ '<(gtest_dir)/src/gtest-typed-test.cc', -+ '<(gtest_dir)/src/gtest.cc', -+ ], -+ 'include_dirs': [ -+ '<(gmock_dir)', -+ '<(gmock_dir)/include', -+ '<(gtest_dir)', -+ '<(gtest_dir)/include', -+ ], -+ 'defines': [ -+ '<@(gtest_defines)', -+ ], -+ 'all_dependent_settings': { -+ 'defines': [ -+ '<@(gtest_defines)', -+ ], -+ 'include_dirs': [ -+ '<(gmock_dir)/include', -+ '<(gtest_dir)/include', -+ ], -+ }, -+ 'conditions': [ -+ ['(_toolset=="target" and compiler_target=="clang") or ' -+ '(_toolset=="host" and compiler_host=="clang")', { -+ 'cflags': [ -+ '-Wno-missing-field-initializers', -+ '-Wno-unused-private-field', -+ ], -+ }], - ], - }], - ], diff --git a/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch b/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch deleted file mode 100644 index 7ff132eaa591..000000000000 --- a/app-i18n/mozc/files/mozc-2.26.4220-system_jsoncpp.patch +++ /dev/null @@ -1,117 +0,0 @@ -https://github.com/google/mozc/issues/490 - ---- /src/gyp/defines.gypi -+++ /src/gyp/defines.gypi -@@ -71,6 +71,10 @@ - # use_system_gtest represents if system version or bundled version - # of gtest library is used. - 'use_system_gtest%': '0', -+ -+ # use_system_jsoncpp represents if system version or bundled version -+ # of jsoncpp library is used. -+ 'use_system_jsoncpp%': '0', - }, - 'target_defaults': { - 'defines': [ ---- /src/net/jsoncpp.gyp -+++ /src/net/jsoncpp.gyp -@@ -31,32 +31,60 @@ - 'targets': [ - { - 'target_name': 'jsoncpp', -- 'type': 'static_library', -- 'variables': { -- 'jsoncpp_root': '<(third_party_dir)/jsoncpp', -- 'jsoncpp_srcs': [ -- '<(jsoncpp_root)/src/lib_json/json_reader.cpp', -- '<(jsoncpp_root)/src/lib_json/json_value.cpp', -- '<(jsoncpp_root)/src/lib_json/json_writer.cpp', -- ], -- 'jsoncpp_include_dirs': ['<(jsoncpp_root)/include'], -- 'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'], -- }, -- 'defines': [ -- '<@(jsoncpp_additional_macros)', -+ 'conditions': [ -+ ['use_system_jsoncpp==1', { -+ 'type': 'none', -+ 'variables': { -+ 'jsoncpp_additional_macros': [ -+ 'JSON_USE_EXCEPTION=0', -+ 'MOZC_USE_SYSTEM_JSONCPP', -+ ], -+ }, -+ 'all_dependent_settings': { -+ 'defines': [ -+ '<@(jsoncpp_additional_macros)', -+ ], -+ 'cflags': [ -+ '<!@(pkg-config --cflags jsoncpp)', -+ ], -+ 'link_settings': { -+ 'libraries': [ -+ '<!@(pkg-config --libs-only-l jsoncpp)', -+ ], -+ 'ldflags': [ -+ '<!@(pkg-config --libs-only-L jsoncpp)', -+ ], -+ } -+ }, -+ }, { -+ 'type': 'static_library', -+ 'variables': { -+ 'jsoncpp_root': '<(third_party_dir)/jsoncpp', -+ 'jsoncpp_srcs': [ -+ '<(jsoncpp_root)/src/lib_json/json_reader.cpp', -+ '<(jsoncpp_root)/src/lib_json/json_value.cpp', -+ '<(jsoncpp_root)/src/lib_json/json_writer.cpp', -+ ], -+ 'jsoncpp_include_dirs': ['<(jsoncpp_root)/include'], -+ 'jsoncpp_additional_macros': ['JSON_USE_EXCEPTION=0'], -+ }, -+ 'defines': [ -+ '<@(jsoncpp_additional_macros)', -+ ], -+ 'sources': [ -+ '<@(jsoncpp_srcs)', -+ 'jsoncpp.h', -+ ], -+ 'include_dirs': [ -+ '<@(jsoncpp_include_dirs)', -+ ], -+ 'all_dependent_settings': { -+ 'defines': [ -+ '<@(jsoncpp_additional_macros)', -+ ], -+ }, -+ }], - ], -- 'sources': [ -- '<@(jsoncpp_srcs)', -- 'jsoncpp.h', -- ], -- 'include_dirs': [ -- '<@(jsoncpp_include_dirs)', -- ], -- 'all_dependent_settings': { -- 'defines': [ -- '<@(jsoncpp_additional_macros)', -- ], -- }, - }, - ], - } ---- /src/net/jsoncpp.h -+++ /src/net/jsoncpp.h -@@ -35,7 +35,11 @@ - // Mozc basically disables C++ exception. - #define JSON_USE_EXCEPTION 0 - #endif // !JSON_USE_EXCEPTION -+#ifdef MOZC_USE_SYSTEM_JSONCPP -+#include <json/json.h> -+#else - #include "third_party/jsoncpp/include/json/json.h" -+#endif - #define MOZC_JSONCPP_JSON_H_INCLUDED - #endif // !MOZC_JSONCPP_JSON_H_INCLUDED - diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch new file mode 100644 index 000000000000..b7ebce42348e --- /dev/null +++ b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch @@ -0,0 +1,29 @@ +diff --git a/src/unix/fcitx/surrounding_text_util.cc b/src/unix/fcitx/surrounding_text_util.cc +index b2d533c..76357cd 100644 +--- a/src/unix/fcitx/surrounding_text_util.cc ++++ b/src/unix/fcitx/surrounding_text_util.cc +@@ -233,9 +233,9 @@ bool GetSurroundingText(FcitxInstance* instance, + + const size_t selection_start = std::min(cursor_pos, anchor_pos); + const size_t selection_length = std::abs(info->relative_selected_length); +- info->preceding_text = Util::Utf8SubString(surrounding_text, 0, selection_start); +- info->selection_text = Util::Utf8SubString(surrounding_text, selection_start, selection_length); +- info->following_text = Util::Utf8SubString(surrounding_text, selection_start + selection_length); ++ info->preceding_text = std::string(Util::Utf8SubString(surrounding_text, 0, selection_start)); ++ info->selection_text = std::string(Util::Utf8SubString(surrounding_text, selection_start, selection_length)); ++ info->following_text = std::string(Util::Utf8SubString(surrounding_text, selection_start + selection_length)); + return true; + } + +diff --git a/src/unix/fcitx/eim.cc b/src/unix/fcitx/eim.cc +index 4da2e80..fc7a9ff 100644 +--- a/src/unix/fcitx/eim.cc ++++ b/src/unix/fcitx/eim.cc +@@ -33,6 +33,7 @@ + #include <fcitx/module.h> + #include <fcitx/keys.h> + #include <fcitx-config/xdg.h> ++#undef InvokeFunction + #include "fcitx_mozc.h" + #include "mozc_connection.h" + #include "mozc_response_parser.h diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx5.patch b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx5.patch new file mode 100644 index 000000000000..3ad06cf0e3a5 --- /dev/null +++ b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0-fcitx5.patch @@ -0,0 +1,19 @@ +Adapted fcitx5 path from https://github.com/fcitx/mozc/commit/748ddfb45b7615283f1d40e03c23940750031ac1 + +--- a/src/unix/fcitx5/surrounding_text_util.cc ++++ b/src/unix/fcitx5/surrounding_text_util.cc +@@ -211,11 +211,11 @@ + const size_t selection_start = std::min(cursor_pos, anchor_pos); + const size_t selection_length = std::abs(info->relative_selected_length); + info->preceding_text = +- Util::Utf8SubString(surrounding_text, 0, selection_start); ++ std::string(Util::Utf8SubString(surrounding_text, 0, selection_start)); + info->selection_text = +- Util::Utf8SubString(surrounding_text, selection_start, selection_length); ++ std::string(Util::Utf8SubString(surrounding_text, selection_start, selection_length)); + info->following_text = +- Util::Utf8SubString(surrounding_text, selection_start + selection_length); ++ std::string(Util::Utf8SubString(surrounding_text, selection_start + selection_length)); + return true; + } + diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch new file mode 100644 index 000000000000..5e134bd1f003 --- /dev/null +++ b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil-20230802.0.patch @@ -0,0 +1,13 @@ +diff --git a/src/base/absl.gyp b/src/base/absl.gyp +index 932f6ac..35e5a22 100644 +--- a/src/base/absl.gyp ++++ b/src/base/absl.gyp +@@ -398,7 +398,7 @@ + 'all_dependent_settings': { + 'link_settings': { + 'libraries': [ +- '-labsl_synchronization -labsl_flags -labsl_graphcycles_internal', ++ '-labsl_synchronization -labsl_flags -labsl_graphcycles_internal -labsl_string_view', + ], + }, + }, diff --git a/app-i18n/mozc/files/mozc-2.28.5029.102-abseil.patch b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil.patch new file mode 100644 index 000000000000..08421910d098 --- /dev/null +++ b/app-i18n/mozc/files/mozc-2.28.5029.102-abseil.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/912776 +Adapted from https://src.fedoraproject.org/rpms/mozc/raw/aa3cba136c9a28e176d246f450465d3a8a4e8533/f/mozc-build-new-abseil.patch +--- a/src/base/init_mozc.cc ++++ b/src/base/init_mozc.cc +@@ -87,7 +87,10 @@ std::string GetLogFilePathFromProgramName(const std::string &program_name) { + void ParseCommandLineFlags(int argc, char **argv) { + absl::flags_internal::ParseCommandLineImpl( + argc, argv, ++ #if defined(ABSL_LTS_RELEASE_VERSION) && ABSL_LTS_RELEASE_VERSION < 20230802 ++ // Abseil 20230802.0 does not use ArgvListAction + absl::flags_internal::ArgvListAction::kRemoveParsedArgs, ++ #endif + // Suppress help messages invoked by --help and others. + // Use UsageFlagsAction::kHandleUsage to enable it. + absl::flags_internal::UsageFlagsAction::kIgnoreUsage, diff --git a/app-i18n/mozc/metadata.xml b/app-i18n/mozc/metadata.xml index 8cc0ab6bbf36..7c3e52638ca1 100644 --- a/app-i18n/mozc/metadata.xml +++ b/app-i18n/mozc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> @@ -11,9 +11,8 @@ </maintainer> <use> <flag name="fcitx4">Enable support for <pkg>app-i18n/fcitx</pkg> 4</flag> + <flag name="fcitx5">Enable support for <pkg>app-i18n/fcitx</pkg> 5</flag> <flag name="gui">Install graphical user interface tool (mozc_tool)</flag> - <flag name="handwriting-tegaki">Use handwriting recognition model from <pkg>app-i18n/tegaki-zinnia-japanese</pkg> by default</flag> - <flag name="handwriting-tomoe">Use handwriting recognition model from <pkg>app-i18n/zinnia-tomoe</pkg> by default</flag> <flag name="ibus">Enable support for <pkg>app-i18n/ibus</pkg></flag> <flag name="renderer">Enable native candidate window</flag> </use> diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild index 020c3b037550..357167817970 100644 --- a/app-i18n/mozc/mozc-9999.ebuild +++ b/app-i18n/mozc/mozc-2.28.5029.102-r1.ebuild @@ -1,10 +1,11 @@ -# Copyright 2010-2020 Gentoo Authors +# Copyright 2010-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) +EAPI="8" -inherit elisp-common multiprocessing python-any-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{10..11} ) + +inherit desktop edo elisp-common multiprocessing python-any-r1 savedconfig toolchain-funcs xdg if [[ "${PV}" == "9999" ]]; then inherit git-r3 @@ -12,17 +13,17 @@ if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/google/mozc" EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary) else - MOZC_GIT_REVISION="" + MOZC_GIT_REVISION="305e9a7374254148474d067c46d55a4ee6081837" MOZC_DATE="${PV#*_p}" MOZC_DATE="${MOZC_DATE%%_p*}" - FCITX_MOZC_GIT_REVISION="" + FCITX_MOZC_GIT_REVISION="242b4f703cba27d4ff4dc123c713a478f964e001" FCITX_MOZC_DATE="${PV#*_p}" FCITX_MOZC_DATE="${FCITX_MOZC_DATE#*_p}" FCITX_MOZC_DATE="${FCITX_MOZC_DATE%%_p*}" - JAPANESE_USAGE_DICTIONARY_GIT_REVISION="" - JAPANESE_USAGE_DICTIONARY_DATE="" + JAPANESE_USAGE_DICTIONARY_GIT_REVISION="a4a66772e33746b91e99caceecced9a28507e925" + JAPANESE_USAGE_DICTIONARY_DATE="20180701040110" fi DESCRIPTION="Mozc - Japanese input method editor" @@ -30,9 +31,12 @@ HOMEPAGE="https://github.com/google/mozc" if [[ "${PV}" == "9999" ]]; then SRC_URI="" else - SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz + SRC_URI=" + https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz - fcitx4? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )" + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.28.5029.102-patches.tar.xz + fcitx4? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz ) + " fi # Mozc: BSD @@ -41,19 +45,22 @@ fi # japanese-usage-dictionary: BSD-2 LICENSE="BSD BSD-2 ipadic public-domain unicode" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="debug emacs fcitx4 +gui ibus renderer test" REQUIRED_USE="|| ( emacs fcitx4 ibus )" RESTRICT="!test? ( test )" -BDEPEND="$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]') +BDEPEND=" + dev-build/gyp + $(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]') >=dev-libs/protobuf-3.0.0 - dev-util/gyp - dev-util/ninja + app-alternatives/ninja virtual/pkgconfig emacs? ( app-editors/emacs:* ) - fcitx4? ( sys-devel/gettext )" -DEPEND=">=dev-cpp/abseil-cpp-20200923[cxx17(+)] + fcitx4? ( sys-devel/gettext ) +" +DEPEND=" + >=dev-cpp/abseil-cpp-20230802.0:=[cxx17(+)] >=dev-libs/protobuf-3.0.0:= fcitx4? ( app-i18n/fcitx:4 @@ -79,7 +86,8 @@ DEPEND=">=dev-cpp/abseil-cpp-20200923[cxx17(+)] >=dev-cpp/gtest-1.8.0 dev-libs/jsoncpp )" -RDEPEND=">=dev-cpp/abseil-cpp-20200923[cxx17(+)] +RDEPEND=" + >=dev-cpp/abseil-cpp-20230802.0:=[cxx17(+)] >=dev-libs/protobuf-3.0.0:= emacs? ( app-editors/emacs:* ) fcitx4? ( @@ -101,19 +109,21 @@ RDEPEND=">=dev-cpp/abseil-cpp-20200923[cxx17(+)] x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango - )" + ) +" S="${WORKDIR}/${P}/src" SITEFILE="50${PN}-gentoo.el" -execute() { - einfo "$@" - "$@" -} +PATCHES=( + "${WORKDIR}"/mozc-2.28.5029.102-patches + "${FILESDIR}"/mozc-2.28.5029.102-abseil.patch + "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0.patch +) python_check_deps() { - has_version -b "dev-python/six[${PYTHON_USEDEP}]" + python_has_version "dev-python/six[${PYTHON_USEDEP}]" } src_unpack() { @@ -129,12 +139,14 @@ src_unpack() { unpack ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz mv mozc-${MOZC_GIT_REVISION} ${P} || die + unpack ${PN}-2.28.5029.102-patches.tar.xz + unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die if use fcitx4; then unpack fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz - mv mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN} + mv mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN} || die fi fi } @@ -142,24 +154,17 @@ src_unpack() { src_prepare() { if use fcitx4; then cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die + PATCHES+=( "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch ) fi pushd "${WORKDIR}/${P}" > /dev/null || die - - eapply "${FILESDIR}/${PN}-2.26.4220-system_abseil-cpp.patch" - eapply "${FILESDIR}/${PN}-2.26.4220-system_gtest.patch" - eapply "${FILESDIR}/${PN}-2.26.4220-system_jsoncpp.patch" - eapply "${FILESDIR}/${PN}-2.26.4220-environmental_variables.patch" - eapply "${FILESDIR}/${PN}-2.26.4220-server_path_check.patch" - - eapply_user - + default popd > /dev/null || die sed \ -e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \ -e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \ - -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \ + -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs "${MAKEOPTS}" 999)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \ -i build_mozc.py || die local ar=($(tc-getAR)) @@ -191,6 +196,13 @@ src_prepare() { -e "/'-lc++'/d" \ -e "/'-stdlib=libc++'/d" \ -i gyp/common.gypi || die + + # bug #877765 + restore_config mozcdic-ut.txt + if [[ -f /mozcdic-ut.txt && -s mozcdic-ut.txt ]]; then + einfo "mozcdic-ut.txt found. Adding to mozc dictionary..." + cat mozcdic-ut.txt >> "${WORKDIR}/${P}/src/data/dictionary_oss/dictionary00.txt" || die + fi } src_configure() { @@ -231,12 +243,12 @@ src_configure() { unset AR CC CXX LD NM READELF - execute "${PYTHON}" build_mozc.py gyp \ + edo "${PYTHON}" build_mozc.py gyp \ --gypdir="${EPREFIX}/usr/bin" \ --server_dir="${EPREFIX}/usr/libexec/mozc" \ --verbose \ $(usex gui "" --noqt) \ - -- "${gyp_arguments[@]}" || die "Configuration failed" + -- "${gyp_arguments[@]}" } src_compile() { @@ -260,7 +272,11 @@ src_compile() { targets+=(gyp/tests.gyp:unittests) fi - execute "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} -v "${targets[@]}" || die "Building failed" + if use ibus; then + GYP_IBUS_FLAG="--use_gyp_for_ibus_build" + fi + + edo "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} ${GYP_IBUS_FLAG} -v "${targets[@]}" if use emacs; then elisp-compile unix/emacs/*.el @@ -268,13 +284,15 @@ src_compile() { } src_test() { - execute "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 || die "Testing failed" + edo "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 } src_install() { exeinto /usr/libexec/mozc doexe out_linux/${BUILD_TYPE}/mozc_server + [[ -s mozcdic-ut.txt ]] && save_config mozcdic-ut.txt + if use gui; then doexe out_linux/${BUILD_TYPE}/mozc_tool fi @@ -371,10 +389,12 @@ pkg_postinst() { elisp-site-regen fi + xdg_pkg_postinst } pkg_postrm() { if use emacs; then elisp-site-regen fi + xdg_pkg_postrm } diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild index 08be8f8c45aa..01ef457b4e61 100644 --- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild +++ b/app-i18n/mozc/mozc-2.28.5029.102-r2.ebuild @@ -1,10 +1,11 @@ -# Copyright 2010-2020 Gentoo Authors +# Copyright 2010-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) +EAPI="8" -inherit elisp-common multiprocessing python-any-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{10..11} ) + +inherit desktop edo elisp-common multiprocessing python-any-r1 savedconfig toolchain-funcs xdg if [[ "${PV}" == "9999" ]]; then inherit git-r3 @@ -12,10 +13,17 @@ if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/google/mozc" EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary) else - MOZC_GIT_REVISION="afb03ddfe72dde4cf2409863a3bfea160f7a66d8" - JAPANESE_USAGE_DICTIONARY_GIT_REVISION="e5b3425575734c323e1d947009dd74709437b684" - JAPANESE_USAGE_DICTIONARY_DATE="20120416091336" - FCITX_PATCH_VERSION="2.23.2815.102.1" + MOZC_GIT_REVISION="305e9a7374254148474d067c46d55a4ee6081837" + MOZC_DATE="${PV#*_p}" + MOZC_DATE="${MOZC_DATE%%_p*}" + + FCITX_MOZC_GIT_REVISION="242b4f703cba27d4ff4dc123c713a478f964e001" + FCITX_MOZC_DATE="${PV#*_p}" + FCITX_MOZC_DATE="${FCITX_MOZC_DATE#*_p}" + FCITX_MOZC_DATE="${FCITX_MOZC_DATE%%_p*}" + + JAPANESE_USAGE_DICTIONARY_GIT_REVISION="a4a66772e33746b91e99caceecced9a28507e925" + JAPANESE_USAGE_DICTIONARY_DATE="20180701040110" fi DESCRIPTION="Mozc - Japanese input method editor" @@ -23,10 +31,13 @@ HOMEPAGE="https://github.com/google/mozc" if [[ "${PV}" == "9999" ]]; then SRC_URI="" else - SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${P}.tar.gz + SRC_URI=" + https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz - https://dev.gentoo.org/~juippis/distfiles/tmp/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch - fcitx4? ( https://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )" + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.28.5029.102-patches.tar.xz + fcitx4? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz ) + fcitx5? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz ) + " fi # Mozc: BSD @@ -35,31 +46,38 @@ fi # japanese-usage-dictionary: BSD-2 LICENSE="BSD BSD-2 ipadic public-domain unicode" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" -IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test" -REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )" +KEYWORDS="~amd64 ~x86" +IUSE="debug emacs fcitx4 fcitx5 +gui ibus renderer test" +REQUIRED_USE="|| ( emacs fcitx4 fcitx5 ibus )" RESTRICT="!test? ( test )" -BDEPEND="${PYTHON_DEPS} +BDEPEND=" + dev-build/gyp + $(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]') >=dev-libs/protobuf-3.0.0 - dev-util/gyp - dev-util/ninja + app-alternatives/ninja virtual/pkgconfig emacs? ( app-editors/emacs:* ) - fcitx4? ( sys-devel/gettext )" -RDEPEND=">=dev-libs/protobuf-3.0.0:= - emacs? ( app-editors/emacs:* ) + fcitx4? ( sys-devel/gettext ) + fcitx5? ( sys-devel/gettext ) +" +DEPEND=" + >=dev-cpp/abseil-cpp-20230802.0:=[cxx17(+)] + >=dev-libs/protobuf-3.0.0:= fcitx4? ( app-i18n/fcitx:4 virtual/libintl ) + fcitx5? ( + app-i18n/fcitx:5 + app-i18n/libime + sys-devel/gettext + virtual/libintl + ) gui? ( - app-i18n/zinnia dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - handwriting-tegaki? ( app-i18n/tegaki-zinnia-japanese ) - handwriting-tomoe? ( app-i18n/zinnia-tomoe ) ) ibus? ( >=app-i18n/ibus-1.4.1 @@ -71,81 +89,117 @@ RDEPEND=">=dev-libs/protobuf-3.0.0:= x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango - )" -DEPEND="${RDEPEND} + ) test? ( >=dev-cpp/gtest-1.8.0 dev-libs/jsoncpp )" +RDEPEND=" + >=dev-cpp/abseil-cpp-20230802.0:=[cxx17(+)] + >=dev-libs/protobuf-3.0.0:= + emacs? ( app-editors/emacs:* ) + fcitx4? ( + app-i18n/fcitx:4 + virtual/libintl + ) + fcitx5? ( + app-i18n/fcitx:5 + app-i18n/libime + sys-devel/gettext + virtual/libintl + ) + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) + ibus? ( + >=app-i18n/ibus-1.4.1 + dev-libs/glib:2 + x11-libs/libxcb + ) + renderer? ( + dev-libs/glib:2 + x11-libs/cairo + x11-libs/gtk+:2 + x11-libs/pango + ) +" S="${WORKDIR}/${P}/src" SITEFILE="50${PN}-gentoo.el" -execute() { - einfo "$@" - "$@" +PATCHES=( + "${WORKDIR}"/mozc-2.28.5029.102-patches + "${FILESDIR}"/mozc-2.28.5029.102-abseil.patch + "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0.patch +) + +python_check_deps() { + python_has_version "dev-python/six[${PYTHON_USEDEP}]" } src_unpack() { if [[ "${PV}" == "9999" ]]; then git-r3_src_unpack - if use fcitx4; then + if use fcitx4 || use fcitx5; then local EGIT_SUBMODULES=() git-r3_fetch https://github.com/fcitx/mozc refs/heads/fcitx git-r3_checkout https://github.com/fcitx/mozc "${WORKDIR}/fcitx-mozc" fi + if use fcitx5; then + cp -pr "${WORKDIR}"/fcitx{,5}-mozc || die + fi else - unpack ${P}.tar.gz + unpack ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz mv mozc-${MOZC_GIT_REVISION} ${P} || die + unpack ${PN}-2.28.5029.102-patches.tar.xz + unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die + + if use fcitx4 || use fcitx5; then + unpack fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz + if use fcitx4; then + cp -pr mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN} || die + fi + if use fcitx5; then + cp -pr mozc-${FCITX_MOZC_GIT_REVISION} fcitx5-${PN} || die + fi + rm -r mozc-${FCITX_MOZC_GIT_REVISION} || die + fi fi } src_prepare() { - eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-python-3_1.patch" - eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-python-3_2.patch" - eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-python-3_3.patch" - eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-python-3_4.patch" - eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch" - eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch" - eapply -p2 "${DISTDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch" - eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-environmental_variables.patch" - eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch" - eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-server_path_check.patch" - eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch" - eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch" - if use fcitx4; then - if [[ "${PV}" == "9999" ]]; then - cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die - else - eapply -p2 "${DISTDIR}/fcitx-mozc-${FCITX_PATCH_VERSION}.patch" - fi + cp -pr "${WORKDIR}/fcitx-mozc/src/unix/fcitx" unix || die + PATCHES+=( "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0-fcitx4.patch ) + fi + if use fcitx5; then + cp -pr "${WORKDIR}/fcitx5-mozc/src/unix/fcitx5" unix || die + PATCHES+=( "${FILESDIR}"/mozc-2.28.5029.102-abseil-20230802.0-fcitx5.patch ) fi - eapply_user + pushd "${WORKDIR}/${P}" > /dev/null || die + default + popd > /dev/null || die sed \ -e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \ -e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \ - -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \ + -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs "${MAKEOPTS}" 999)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \ -i build_mozc.py || die - sed \ - -e "s/'release_extra_cflags%': \['-O2'\]/'release_extra_cflags%': []/" \ - -e "s/'debug_extra_cflags%': \['-O0', '-g'\]/'debug_extra_cflags%': []/" \ - -i gyp/common.gypi || die - local ar=($(tc-getAR)) local cc=($(tc-getCC)) local cxx=($(tc-getCXX)) local ld=($(tc-getLD)) local nm=($(tc-getNM)) - local readelf=($(tc-getPROG READELF readelf)) + local readelf=($(tc-getREADELF)) # Use absolute paths. Non-absolute paths are mishandled by GYP. ar[0]=$(type -P ${ar[0]}) @@ -163,6 +217,19 @@ src_prepare() { -e "s:<!(which nm):${nm[@]}:" \ -e "s:<!(which readelf):${readelf[@]}:" \ -i gyp/common.gypi || die + + # https://github.com/google/mozc/issues/489 + sed \ + -e "/'-lc++'/d" \ + -e "/'-stdlib=libc++'/d" \ + -i gyp/common.gypi || die + + # bug #877765 + restore_config mozcdic-ut.txt + if [[ -f /mozcdic-ut.txt && -s mozcdic-ut.txt ]]; then + einfo "mozcdic-ut.txt found. Adding to mozc dictionary..." + cat mozcdic-ut.txt >> "${WORKDIR}/${P}/src/data/dictionary_oss/dictionary00.txt" || die + fi } src_configure() { @@ -182,24 +249,21 @@ src_configure() { gyp_arguments+=(-D compiler_host=unknown -D compiler_target=unknown) fi + gyp_arguments+=(-D debug_extra_cflags=) + gyp_arguments+=(-D release_extra_cflags=) + gyp_arguments+=(-D use_fcitx=$(usex fcitx4 YES NO)) - gyp_arguments+=(-D use_fcitx5=NO) - gyp_arguments+=(-D use_libgtest=$(usex test 1 0)) + gyp_arguments+=(-D use_fcitx5=$(usex fcitx5 YES NO)) gyp_arguments+=(-D use_libibus=$(usex ibus 1 0)) - gyp_arguments+=(-D use_libjsoncpp=$(usex test 1 0)) gyp_arguments+=(-D use_libprotobuf=1) - gyp_arguments+=(-D use_libzinnia=$(usex gui 1 0)) + gyp_arguments+=(-D use_system_abseil_cpp=1) + gyp_arguments+=(-D use_system_gtest=$(usex test 1 0)) + gyp_arguments+=(-D use_system_jsoncpp=$(usex test 1 0)) gyp_arguments+=(-D enable_gtk_renderer=$(usex renderer 1 0)) gyp_arguments+=(-D server_dir="${EPREFIX}/usr/libexec/mozc") gyp_arguments+=(-D document_dir="${EPREFIX}/usr/libexec/mozc/documents") - if use handwriting-tegaki; then - gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model") - elif use handwriting-tomoe; then - gyp_arguments+=(-D zinnia_model_file="${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model") - fi - if use ibus; then gyp_arguments+=(-D ibus_mozc_path="${EPREFIX}/usr/libexec/ibus-engine-mozc") gyp_arguments+=(-D ibus_mozc_icon_path="${EPREFIX}/usr/share/ibus-mozc/product_icon.png") @@ -207,12 +271,12 @@ src_configure() { unset AR CC CXX LD NM READELF - execute "${PYTHON}" build_mozc.py gyp \ + edo "${PYTHON}" build_mozc.py gyp \ --gypdir="${EPREFIX}/usr/bin" \ --server_dir="${EPREFIX}/usr/libexec/mozc" \ --verbose \ $(usex gui "" --noqt) \ - -- "${gyp_arguments[@]}" || die "Configuration failed" + -- "${gyp_arguments[@]}" } src_compile() { @@ -223,6 +287,9 @@ src_compile() { if use fcitx4; then targets+=(unix/fcitx/fcitx.gyp:fcitx-mozc) fi + if use fcitx5; then + targets+=(unix/fcitx5/fcitx5.gyp:fcitx5-mozc) + fi if use gui; then targets+=(gui/gui.gyp:mozc_tool) fi @@ -236,7 +303,11 @@ src_compile() { targets+=(gyp/tests.gyp:unittests) fi - execute "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} -v "${targets[@]}" || die "Building failed" + if use ibus; then + GYP_IBUS_FLAG="--use_gyp_for_ibus_build" + fi + + edo "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} ${GYP_IBUS_FLAG} -v "${targets[@]}" if use emacs; then elisp-compile unix/emacs/*.el @@ -244,13 +315,15 @@ src_compile() { } src_test() { - execute "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 || die "Testing failed" + edo "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 } src_install() { exeinto /usr/libexec/mozc doexe out_linux/${BUILD_TYPE}/mozc_server + [[ -s mozcdic-ut.txt ]] && save_config mozcdic-ut.txt + if use gui; then doexe out_linux/${BUILD_TYPE}/mozc_tool fi @@ -281,8 +354,8 @@ src_install() { insinto /usr/share/fcitx/mozc/icon newins data/images/product_icon_32bpp-128.png mozc.png local image - for image in data/images/unix/ui-*.png; do - newins "${image}" "mozc-${image#data/images/unix/ui-}" + for image in ../../fcitx-${PN}/src/data/images/unix/ui-*.png; do + newins "${image}" "mozc-${image#../../fcitx-${PN}/src/data/images/unix/ui-}" done local locale mo_file @@ -294,6 +367,41 @@ src_install() { done fi + if use fcitx5; then + exeinto /usr/$(get_libdir)/fcitx5 + doexe out_linux/${BUILD_TYPE}/fcitx5-mozc.so + + insinto /usr/share/fcitx5/addon + newins unix/fcitx5/mozc-addon.conf mozc.conf + + insinto /usr/share/fcitx5/inputmethod + doins unix/fcitx5/mozc.conf + + local orgfcitx5="org.fcitx.Fcitx5.fcitx-mozc" + newicon -s 128 data/images/product_icon_32bpp-128.png ${orgfcitx5}.png + newicon -s 128 data/images/product_icon_32bpp-128.png fcitx-mozc.png + newicon -s 32 data/images/unix/ime_product_icon_opensource-32.png ${orgfcitx5}.png + newicon -s 32 data/images/unix/ime_product_icon_opensource-32.png fcitx-mozc.png + for uiimg in ../../fcitx5-mozc/scripts/icons/ui-*.png; do + dimg=${uiimg#*ui-} + newicon -s 48 ${uiimg} ${orgfcitx5}-${dimg/_/-} + newicon -s 48 ${uiimg} fcitx-mozc-${dimg/_/-} + done + + local locale mo_file + for mo_file in unix/fcitx5/po/*.po; do + locale="${mo_file##*/}" + locale="${locale%.po}" + msgfmt ${mo_file} -o ${mo_file/.po/.mo} || die + insinto /usr/share/locale/${locale}/LC_MESSAGES + newins "${mo_file/.po/.mo}" fcitx5-mozc.mo + done + msgfmt --xml -d unix/fcitx5/po/ --template unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml.in -o \ + unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml || die + insinto /usr/share/metainfo + doins unix/fcitx5/org.fcitx.Fcitx5.Addon.Mozc.metainfo.xml + fi + if use ibus; then exeinto /usr/libexec newexe out_linux/${BUILD_TYPE}/ibus_mozc ibus-engine-mozc @@ -323,18 +431,6 @@ pkg_postinst() { elog "MOZC_CONFIGURATION_DIRECTORY" elog " Mozc configuration directory" elog " Value used by default: \"~/.mozc\"" - if use gui; then - elog "MOZC_ZINNIA_MODEL_FILE" - elog " Zinnia handwriting recognition model file" - if use handwriting-tegaki; then - elog " Value used by default: \"${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model\"" - elif use handwriting-tomoe; then - elog " Value used by default: \"${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model\"" - fi - elog " Potential values:" - elog " \"${EPREFIX}/usr/share/tegaki/models/zinnia/handwriting-ja.model\"" - elog " \"${EPREFIX}/usr/$(get_libdir)/zinnia/model/tomoe/handwriting-ja.model\"" - fi elog if use emacs; then elog @@ -359,10 +455,12 @@ pkg_postinst() { elisp-site-regen fi + xdg_pkg_postinst } pkg_postrm() { if use emacs; then elisp-site-regen fi + xdg_pkg_postrm } diff --git a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild b/app-i18n/mozc/mozc-2.28.5029.102.ebuild index d840eb56323a..3346d832183d 100644 --- a/app-i18n/mozc/mozc-2.26.4220_p20201212102434_p20201219202429.ebuild +++ b/app-i18n/mozc/mozc-2.28.5029.102.ebuild @@ -1,10 +1,11 @@ -# Copyright 2010-2021 Gentoo Authors +# Copyright 2010-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) +EAPI="8" -inherit elisp-common multiprocessing python-any-r1 toolchain-funcs +PYTHON_COMPAT=( python3_{10..11} ) + +inherit desktop edo elisp-common multiprocessing python-any-r1 savedconfig toolchain-funcs xdg if [[ "${PV}" == "9999" ]]; then inherit git-r3 @@ -12,11 +13,11 @@ if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/google/mozc" EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary) else - MOZC_GIT_REVISION="9ba59b64d53365c1fe93c1c245b4ec3e35bdadf0" + MOZC_GIT_REVISION="305e9a7374254148474d067c46d55a4ee6081837" MOZC_DATE="${PV#*_p}" MOZC_DATE="${MOZC_DATE%%_p*}" - FCITX_MOZC_GIT_REVISION="1ea089debc31ff216473369ad71c08318384ee06" + FCITX_MOZC_GIT_REVISION="242b4f703cba27d4ff4dc123c713a478f964e001" FCITX_MOZC_DATE="${PV#*_p}" FCITX_MOZC_DATE="${FCITX_MOZC_DATE#*_p}" FCITX_MOZC_DATE="${FCITX_MOZC_DATE%%_p*}" @@ -30,9 +31,12 @@ HOMEPAGE="https://github.com/google/mozc" if [[ "${PV}" == "9999" ]]; then SRC_URI="" else - SRC_URI="https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz + SRC_URI=" + https://github.com/google/${PN}/archive/${MOZC_GIT_REVISION}.tar.gz -> ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}.tar.gz -> japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz - fcitx4? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz )" + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-2.28.5029.102-patches.tar.xz + fcitx4? ( https://github.com/fcitx/${PN}/archive/${FCITX_MOZC_GIT_REVISION}.tar.gz -> fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz ) + " fi # Mozc: BSD @@ -41,19 +45,22 @@ fi # japanese-usage-dictionary: BSD-2 LICENSE="BSD BSD-2 ipadic public-domain unicode" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" +KEYWORDS="amd64 ~arm64 ppc64 x86" IUSE="debug emacs fcitx4 +gui ibus renderer test" REQUIRED_USE="|| ( emacs fcitx4 ibus )" RESTRICT="!test? ( test )" -BDEPEND="$(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]') +BDEPEND=" + dev-build/gyp + $(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]') >=dev-libs/protobuf-3.0.0 - dev-util/gyp - dev-util/ninja + app-alternatives/ninja virtual/pkgconfig emacs? ( app-editors/emacs:* ) - fcitx4? ( sys-devel/gettext )" -DEPEND="=dev-cpp/abseil-cpp-20200923*[cxx17(+)] + fcitx4? ( sys-devel/gettext ) +" +DEPEND=" + >=dev-cpp/abseil-cpp-20211102.0-r2:=[cxx17(+)] >=dev-libs/protobuf-3.0.0:= fcitx4? ( app-i18n/fcitx:4 @@ -79,7 +86,8 @@ DEPEND="=dev-cpp/abseil-cpp-20200923*[cxx17(+)] >=dev-cpp/gtest-1.8.0 dev-libs/jsoncpp )" -RDEPEND="=dev-cpp/abseil-cpp-20200923*[cxx17(+)] +RDEPEND=" + >=dev-cpp/abseil-cpp-20211102.0-r2:=[cxx17(+)] >=dev-libs/protobuf-3.0.0:= emacs? ( app-editors/emacs:* ) fcitx4? ( @@ -101,19 +109,20 @@ RDEPEND="=dev-cpp/abseil-cpp-20200923*[cxx17(+)] x11-libs/cairo x11-libs/gtk+:2 x11-libs/pango - )" + ) +" S="${WORKDIR}/${P}/src" SITEFILE="50${PN}-gentoo.el" -execute() { - einfo "$@" - "$@" -} +PATCHES=( + "${WORKDIR}"/mozc-2.28.5029.102-patches + "${FILESDIR}"/mozc-2.28.5029.102-abseil.patch +) python_check_deps() { - has_version -b "dev-python/six[${PYTHON_USEDEP}]" + python_has_version "dev-python/six[${PYTHON_USEDEP}]" } src_unpack() { @@ -129,12 +138,14 @@ src_unpack() { unpack ${PN}-${PV%%_p*}-${MOZC_DATE}.tar.gz mv mozc-${MOZC_GIT_REVISION} ${P} || die + unpack ${PN}-2.28.5029.102-patches.tar.xz + unpack japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_DATE}.tar.gz cp -p japanese-usage-dictionary-${JAPANESE_USAGE_DICTIONARY_GIT_REVISION}/usage_dict.txt ${P}/src/third_party/japanese_usage_dictionary || die if use fcitx4; then unpack fcitx-${PN}-${PV%%_p*}-${FCITX_MOZC_DATE}.tar.gz - mv mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN} + mv mozc-${FCITX_MOZC_GIT_REVISION} fcitx-${PN} || die fi fi } @@ -145,21 +156,13 @@ src_prepare() { fi pushd "${WORKDIR}/${P}" > /dev/null || die - - eapply "${FILESDIR}/${PN}-2.26.4220-system_abseil-cpp.patch" - eapply "${FILESDIR}/${PN}-2.26.4220-system_gtest.patch" - eapply "${FILESDIR}/${PN}-2.26.4220-system_jsoncpp.patch" - eapply "${FILESDIR}/${PN}-2.26.4220-environmental_variables.patch" - eapply "${FILESDIR}/${PN}-2.26.4220-server_path_check.patch" - - eapply_user - + default popd > /dev/null || die sed \ -e "s/def GypMain(options, unused_args):/def GypMain(options, gyp_args):/" \ -e "s/RunOrDie(gyp_command + gyp_options)/RunOrDie(gyp_command + gyp_options + gyp_args)/" \ - -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \ + -e "s/RunOrDie(\[ninja/&, '-j$(makeopts_jobs "${MAKEOPTS}" 999)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \ -i build_mozc.py || die local ar=($(tc-getAR)) @@ -191,6 +194,13 @@ src_prepare() { -e "/'-lc++'/d" \ -e "/'-stdlib=libc++'/d" \ -i gyp/common.gypi || die + + # bug #877765 + restore_config mozcdic-ut.txt + if [[ -f /mozcdic-ut.txt && -s mozcdic-ut.txt ]]; then + einfo "mozcdic-ut.txt found. Adding to mozc dictionary..." + cat mozcdic-ut.txt >> "${WORKDIR}/${P}/src/data/dictionary_oss/dictionary00.txt" || die + fi } src_configure() { @@ -231,12 +241,12 @@ src_configure() { unset AR CC CXX LD NM READELF - execute "${PYTHON}" build_mozc.py gyp \ + edo "${PYTHON}" build_mozc.py gyp \ --gypdir="${EPREFIX}/usr/bin" \ --server_dir="${EPREFIX}/usr/libexec/mozc" \ --verbose \ $(usex gui "" --noqt) \ - -- "${gyp_arguments[@]}" || die "Configuration failed" + -- "${gyp_arguments[@]}" } src_compile() { @@ -260,7 +270,11 @@ src_compile() { targets+=(gyp/tests.gyp:unittests) fi - execute "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} -v "${targets[@]}" || die "Building failed" + if use ibus; then + GYP_IBUS_FLAG="--use_gyp_for_ibus_build" + fi + + edo "${PYTHON}" build_mozc.py build -c ${BUILD_TYPE} ${GYP_IBUS_FLAG} -v "${targets[@]}" if use emacs; then elisp-compile unix/emacs/*.el @@ -268,13 +282,15 @@ src_compile() { } src_test() { - execute "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 || die "Testing failed" + edo "${PYTHON}" build_mozc.py runtests -c ${BUILD_TYPE} --test_jobs 1 } src_install() { exeinto /usr/libexec/mozc doexe out_linux/${BUILD_TYPE}/mozc_server + [[ -s mozcdic-ut.txt ]] && save_config mozcdic-ut.txt + if use gui; then doexe out_linux/${BUILD_TYPE}/mozc_tool fi @@ -371,10 +387,12 @@ pkg_postinst() { elisp-site-regen fi + xdg_pkg_postinst } pkg_postrm() { if use emacs; then elisp-site-regen fi + xdg_pkg_postrm } diff --git a/app-i18n/multiskkserv/files/multiskkserv-cdb.patch b/app-i18n/multiskkserv/files/multiskkserv-cdb.patch index c6f0da50309e..401e8d1cf78f 100644 --- a/app-i18n/multiskkserv/files/multiskkserv-cdb.patch +++ b/app-i18n/multiskkserv/files/multiskkserv-cdb.patch @@ -1,6 +1,6 @@ --- a/configure.in +++ b/configure.in -@@ -126,19 +126,38 @@ +@@ -126,19 +126,39 @@ fi done else @@ -18,6 +18,7 @@ + available_cdb="yes" + if test -f "$with_cdb/$i/uint32.h"; then + for l in lib64 lib32 lib; do ++ available_cdb="yes" + for a in cdb.a alloc.a buffer.a byte.a unix.a; do + if test -f "$with_cdb/$l/$a"; then + LIBADD_CDB="$LIBADD_CDB $with_cdb/$l/$a" diff --git a/app-i18n/multiskkserv/files/multiskkserv-slibtool.patch b/app-i18n/multiskkserv/files/multiskkserv-slibtool.patch new file mode 100644 index 000000000000..99024e093392 --- /dev/null +++ b/app-i18n/multiskkserv/files/multiskkserv-slibtool.patch @@ -0,0 +1,70 @@ +https://github.com/sina-ht/multiskkserv/pull/1 +https://github.com/sina-ht/multiskkserv/commit/20983c7ea43e4a0c12df123e17901fa40ed2f914 + +From aa0f1cca52eb95ce859aa8a4f20fad9c12757080 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Wed, 21 Feb 2024 09:16:47 -0800 +Subject: [PATCH] build: avoid killall(1) for 'make check' + +When building the multiskkserv tests with slibtool instead of GNU +libtool it fails when 'killall src/multiskkserv' fails to find any +processes. This is because with slibtool it is a shell wrapper script +for 'src/.libs/multiskkserv'. + +To avoid this issue a more robust 'check.sh' script was added to run the +tests and correctly kill the multiskkserv process with both GNU libtool +and slibtool. + +This was reported for Gentoo: https://bugs.gentoo.org/924142 +--- + Makefile.am | 11 +---------- + check.sh | 18 ++++++++++++++++++ + 2 files changed, 19 insertions(+), 10 deletions(-) + create mode 100755 check.sh + +diff --git a/Makefile.am b/Makefile.am +index b98060a..940d61c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,16 +6,7 @@ EXTRA_DIST = COPYING.j README.j common.h compat.h test/SKK-JISYO.S test/henkan-e + + check: + @mkdir -p $(top_builddir)/test +- $(top_builddir)/tools/skkdic-p2cdb $(top_builddir)/test/SKK-JISYO.S.cdb < $(top_srcdir)/test/SKK-JISYO.S +- $(top_builddir)/src/multiskkserv -s 127.0.0.1 -p 12347 $(top_builddir)/test/SKK-JISYO.S.cdb & +- @sleep 1 +- @$(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 stat +- $(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/kan-euc.txt` tran > $(top_builddir)/test/kan-euc-tran.txt +- $(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/ka-euc.txt` tran > $(top_builddir)/test/ka-euc-tran.txt +- $(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/kanji-euc.txt` tran > $(top_builddir)/test/kanji-euc-tran.txt +- $(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/henkan-euc.txt` tran > $(top_builddir)/test/henkan-euc-tran.txt +- $(top_builddir)/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat $(top_srcdir)/test/henkandekinai-euc.txt` tran > $(top_builddir)/test/henkandekinai-euc-tran.txt +- killall src/multiskkserv ++ $(top_srcdir)/check.sh "$(top_builddir)" "$(top_srcdir)" + @nkf -w $(top_srcdir)/test/kan-euc.txt + @nkf -w $(top_builddir)/test/kan-euc-tran.txt + @nkf -w $(top_srcdir)/test/ka-euc.txt +diff --git a/check.sh b/check.sh +new file mode 100755 +index 0000000..64705bf +--- /dev/null ++++ b/check.sh +@@ -0,0 +1,18 @@ ++#!/bin/sh ++ ++set -euvx ++ ++builddir="${1:?}" ++srcdir="${2:?}" ++ ++"$builddir"/tools/skkdic-p2cdb "$builddir"/test/SKK-JISYO.S.cdb < "$srcdir"/test/SKK-JISYO.S ++"$builddir"/src/multiskkserv -s 127.0.0.1 -p 12347 "$builddir"/test/SKK-JISYO.S.cdb & ++multiskkserv_pid=$! ++sleep 1 ++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 stat ++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/kan-euc.txt` tran > "$builddir"/test/kan-euc-tran.txt ++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/ka-euc.txt` tran > "$builddir"/test/ka-euc-tran.txt ++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/kanji-euc.txt` tran > "$builddir"/test/kanji-euc-tran.txt ++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/henkan-euc.txt` tran > "$builddir"/test/henkan-euc-tran.txt ++"$builddir"/src/multiskkserv-ctl -s 127.0.0.1 -p 12347 -y `cat "$srcdir"/test/henkandekinai-euc.txt` tran > "$builddir"/test/henkandekinai-euc-tran.txt ++kill -15 "$multiskkserv_pid" diff --git a/app-i18n/multiskkserv/metadata.xml b/app-i18n/multiskkserv/metadata.xml index e1a49f498885..491c88b3a31f 100644 --- a/app-i18n/multiskkserv/metadata.xml +++ b/app-i18n/multiskkserv/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild index df16872a3f2b..ff88aaa52024 100644 --- a/app-i18n/multiskkserv/multiskkserv-20100128.ebuild +++ b/app-i18n/multiskkserv/multiskkserv-20100128.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="8" inherit autotools DESCRIPTION="SKK server that handles multiple dictionaries" -HOMEPAGE="http://www3.big.or.jp/~sian/linux/products/" -SRC_URI="http://www3.big.or.jp/~sian/linux/products/${P}.tar.xz" +HOMEPAGE="https://www3.big.or.jp/~sian/linux/products/" +SRC_URI="https://www3.big.or.jp/~sian/linux/products/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" @@ -15,14 +15,18 @@ KEYWORDS="amd64 ppc x86" IUSE="test" RESTRICT="!test? ( test )" -DEPEND="|| ( +RDEPEND="app-i18n/skk-jisyo[cdb] + || ( dev-db/tinycdb dev-db/cdb - ) + )" +DEPEND="${RDEPEND} test? ( app-i18n/nkf )" -RDEPEND="app-i18n/skk-jisyo[cdb]" -PATCHES=( "${FILESDIR}"/${PN}-cdb.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-cdb.patch + "${FILESDIR}"/${PN}-slibtool.patch #924142 +) src_prepare() { default diff --git a/app-i18n/nabi/Manifest b/app-i18n/nabi/Manifest index e8804ae80f77..a1a4b3b2f966 100644 --- a/app-i18n/nabi/Manifest +++ b/app-i18n/nabi/Manifest @@ -1 +1 @@ -DIST nabi-1.0.0.tar.gz 868761 BLAKE2B 125028a4a3a6c51edfeee45de42868c5c0397d8545fdaaffc8a305282ea7d8af102487ad86016e1d6e7275cf7e8a5cd0111bd7f8b9c38470021b94585c1cbf1d SHA512 cd093fc54fc4a40eaa85f9973999b9fe2e37344c1004b56fe9a2102bb0747294ba2af76aca2be234ce4fe07a5e8175d1bab7423dd2cee92ab88af865cd856005 +DIST nabi-1.0.1.tar.gz 927009 BLAKE2B b53e3131e2998499f4004c07272bd1715905fbf26c8e524299bc1a4a80d8cada6d6368f372619893f5edec3b5c1595afe4c25756f171df88a2b805644c9d115b SHA512 8113b31df792ff1b31b1e063671a30e21c312e27627c0e15d9de872bb644eeaea4ebb65ef399dea2d75563d81941990f59adbe1e4c584026e02dcdafe389e9c1 diff --git a/app-i18n/nabi/metadata.xml b/app-i18n/nabi/metadata.xml index 41500dcdee88..64fe93509dc5 100644 --- a/app-i18n/nabi/metadata.xml +++ b/app-i18n/nabi/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/nabi/nabi-1.0.0.ebuild b/app-i18n/nabi/nabi-1.0.1.ebuild index 25b5d86829ac..d7bfd2dc3d9c 100644 --- a/app-i18n/nabi/nabi-1.0.0.ebuild +++ b/app-i18n/nabi/nabi-1.0.1.ebuild @@ -1,32 +1,46 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 + +inherit autotools DESCRIPTION="Simple Hanguk X Input Method" HOMEPAGE="https://github.com/libhangul/nabi" -SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz" +SRC_URI="https://github.com/libhangul/nabi/archive/refs/tags/${P}.tar.gz" +S="${WORKDIR}"/${PN}-${P} LICENSE="GPL-2" SLOT="0" IUSE="debug nls" KEYWORDS="~amd64 ~ppc ~x86" -RDEPEND=">=app-i18n/libhangul-0.1 +RDEPEND=" + >=app-i18n/libhangul-0.1 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 - virtual/libintl" -DEPEND="${RDEPEND} + virtual/libintl +" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/gettext virtual/pkgconfig - sys-devel/gettext" +" DOCS=( AUTHORS ChangeLog.0 NEWS README TODO ) +src_prepare() { + default + + eautoreconf +} + src_configure() { local myconf=() + # Broken configure: --disable-debug also enables debug use debug && myconf+=( --enable-debug ) diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest index eeec965bb7b6..498f30cb2ae1 100644 --- a/app-i18n/nkf/Manifest +++ b/app-i18n/nkf/Manifest @@ -1,4 +1,2 @@ -DIST nkf-2.1.4.tar.gz 232479 BLAKE2B 81887b8b0422e92b2fa2be285c1d9fa4da16d572ca50e1fbeef7be4f50af9ba9b64ef140163e325e57c351dd384ee8b09849bad7c37b03d48a9cb4b88f2ee199 SHA512 8667c20a6c5e9c0c6df7ebe2571bcf24090f04dafd306d32f07312acd659ea026a91d31521b4b213f77aba8218159effd73607d0b7236b7287e4a4cde8cc62b9 DIST nkf-2.1.5.tar.gz 215879 BLAKE2B b5ae8f51b0ed97261f9e82ad469adbc9e469e709dc5acb64bfba48881555931eade5fcb772e7956a7401399008ec33bd57c8d6d8b5790eefe4d69d4e1dabed7c SHA512 fa5b683184481b25249872e7902033a72b6a6219b4c63d508a738710029430733e78cfa13b3d69dc281676762765e0452c92244a3855d3acbb5e23aa63214847 -DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00 SHA512 5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71 DIST python-nkf-0.2.0_p20191121.tar.gz 188496 BLAKE2B f7c9baaff8129956b7981011634f7ee5ece97e1b6650551a5cc2b50ff51a0c96a454f39e888c80120242a12b202c0422c0ecfc21858b1822a4959ff4c108b10d SHA512 ae1494ebdd488dc40802178a1b7b05c9a9b0bcf9cf9fa5017c6bc9f153c01b475c00f993489a21f643acc4ad61595c38c5afe28f3512a4d24f36eda7abd33958 diff --git a/app-i18n/nkf/files/nkf-2.1.4-test.patch b/app-i18n/nkf/files/nkf-2.1.4-test.patch deleted file mode 100644 index 26964ef4d64b..000000000000 --- a/app-i18n/nkf/files/nkf-2.1.4-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/test.pl -+++ b/test.pl -@@ -120,7 +120,7 @@ - return; - } - --do "nkf_test.pl"; -+do "./nkf_test.pl"; - unlink "nkf.in"; - unlink "nkf.out"; - diff --git a/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t-deux.patch b/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t-deux.patch new file mode 100644 index 000000000000..355951cab319 --- /dev/null +++ b/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t-deux.patch @@ -0,0 +1,45 @@ +https://github.com/fumiyas/python-nkf/pull/7 + +From abdebb9d49619d9b9cafa172d2ad7c171f3977d4 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 4 Oct 2022 05:56:12 +0100 +Subject: [PATCH] Use designated initialiser syntax for PyModuleDef + +Fixes build with Clang. Switch to the more readable designated +initialiser syntax to avoid having to lookup member order. + +Before, Clang would complain: +``` +nkf.c:205:3: error: incompatible pointer to integer conversion initializing 'Py_ssize_t' (aka 'long') with an expression of type 'void *' [-Wint-conversion] + NULL, + ^~~~ +/usr/lib/llvm/16/bin/../../../../lib/clang/16.0.0/include/stddef.h:89:16: note: expanded from macro 'NULL' + ^~~~~~~~~~ +2 warnings and 1 error generated. +``` + +This is because some of PyModuleDef's members are actually +Py_ssize_t so chucking a NULL in looks like a codesmell to Clang. + +Bug: https://bugs.gentoo.org/874303 +Signed-off-by: Sam James <sam@gentoo.org> +--- a/NKF.python/nkf.c ++++ b/NKF.python/nkf.c +@@ -200,14 +200,8 @@ nkfmethods[] = { + static struct PyModuleDef + moduledef = { + PyModuleDef_HEAD_INIT, +- "nkf", +- NULL, +- NULL, +- nkfmethods, +- NULL, +- NULL, +- NULL, +- NULL ++ .m_name = "nkf", ++ .m_methods = nkfmethods + }; + + /* Module initialization function */ + diff --git a/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t.patch b/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t.patch new file mode 100644 index 000000000000..6aa986866e0d --- /dev/null +++ b/app-i18n/nkf/files/nkf-2.1.5-python-ssize_t.patch @@ -0,0 +1,71 @@ +https://github.com/nurse/nkf/commit/8246108073f739d45a21ef42ad2d9342fa3c6c28 + +From 8246108073f739d45a21ef42ad2d9342fa3c6c28 Mon Sep 17 00:00:00 2001 +From: slic <slic-io@users.noreply.github.com> +Date: Sun, 6 Mar 2022 18:05:54 +0900 +Subject: [PATCH] fix: python3 extention ABI # variant when parsing warning + +--- a/NKF.python3/NKF_python.c ++++ b/NKF.python3/NKF_python.c +@@ -20,6 +20,8 @@ Changes. + ** THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE. + ***************************************************************************/ + ++#define PY_SSIZE_T_CLEAN ++ + #include "Python.h" + #include <setjmp.h> + +@@ -33,7 +35,7 @@ Changes. + #undef FALSE + #define putchar(c) pynkf_putchar(c) + +-static int pynkf_ibufsize, pynkf_obufsize; ++static Py_ssize_t pynkf_ibufsize, pynkf_obufsize; + static unsigned char *pynkf_inbuf, *pynkf_outbuf; + static int pynkf_icount,pynkf_ocount; + static unsigned char *pynkf_iptr, *pynkf_optr; +@@ -62,7 +64,7 @@ pynkf_ungetc(int c, FILE *f) + static void + pynkf_putchar(int c) + { +- size_t size; ++ Py_ssize_t size; + unsigned char *p; + + if (pynkf_guess_flag) { +@@ -89,7 +91,7 @@ pynkf_putchar(int c) + #include "../nkf.c" + + static PyObject * +-pynkf_convert(unsigned char* str, int strlen, char* opts, int optslen) ++pynkf_convert(unsigned char* str, Py_ssize_t strlen, char* opts, Py_ssize_t optslen) + { + PyObject * res; + +@@ -157,12 +159,12 @@ static + PyObject *pynkf_nkf(PyObject *self, PyObject *args) + { + unsigned char *str; +- int strlen; ++ Py_ssize_t strlen; + char *opts; +- int optslen; ++ Py_ssize_t optslen; + PyObject* res; + +- if (!PyArg_ParseTuple(args, "s#y#", &opts, &optslen, &str, &strlen)) { ++ if (!PyArg_ParseTuple(args, "s#s#", &opts, &optslen, &str, &strlen)) { + return NULL; + } + res = pynkf_convert(str, strlen, opts, optslen); +@@ -178,7 +180,7 @@ PyObject *pynkf_guess(PyObject *self, PyObject *args) + int strlen; + PyObject* res; + +- if (!PyArg_ParseTuple(args, "y#", &str, &strlen)) { ++ if (!PyArg_ParseTuple(args, "s#", &str, &strlen)) { + return NULL; + } + res = pynkf_convert_guess(str, strlen); + diff --git a/app-i18n/nkf/metadata.xml b/app-i18n/nkf/metadata.xml index a74bb9c23ebc..414beff9a719 100644 --- a/app-i18n/nkf/metadata.xml +++ b/app-i18n/nkf/metadata.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> <name>Cjk</name> </maintainer> <upstream> - <remote-id type="sourceforge-jp">nkf</remote-id> + <remote-id type="osdn">nkf</remote-id> + <remote-id type="github">nurse/nkf</remote-id> + <remote-id type="github">fumiyas/python-nkf</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild deleted file mode 100644 index 6e5c65352486..000000000000 --- a/app-i18n/nkf/nkf-2.1.4.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{7,8} ) -DISTUTILS_OPTIONAL="1" -DISTUTILS_USE_SETUPTOOLS="no" - -inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot - -PY_P="python-${PN}-0.2.0_p20141211" -PY_COMMIT="000915e115acac57a1fdbceb1e6361788af83a3d" - -DESCRIPTION="Network Kanji code conversion Filter with UTF-8/16 support" -HOMEPAGE="https://osdn.net/projects/nkf/" -SRC_URI="mirror://sourceforge.jp/${PN}/64158/${P}.tar.gz - python? ( https://github.com/fumiyas/python-${PN}/archive/${PY_COMMIT}.tar.gz -> ${PY_P}.tar.gz )" - -LICENSE="ZLIB python? ( BSD )" -SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" -IUSE="perl python l10n_ja" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - )" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${P}-test.patch ) - -src_unpack() { - use python && vcs-snapshot_src_unpack || default -} - -src_prepare() { - sed -i \ - -e "/^CFLAGS/{ s/-g -O2//; s/=/+=/; }" \ - -e "/ -o ${PN}/s/\(-o \)/\$(LDFLAGS) \1/" \ - Makefile - if use python; then - mv "${WORKDIR}"/${PY_P} NKF.python || die - eapply "${FILESDIR}"/${PN}-python.patch - cd NKF.python - distutils-r1_src_prepare - cd - >/dev/null - fi - - default -} - -src_configure() { - default - if use perl; then - cd NKF.mod - perl-module_src_configure - cd - >/dev/null - fi - if use python; then - cd NKF.python - distutils-r1_src_configure - cd - >/dev/null - fi -} - -src_compile() { - emake CC="$(tc-getCC)" - if use perl; then - cd NKF.mod - perl-module_src_compile - cd - >/dev/null - fi - if use python; then - cd NKF.python - distutils-r1_src_compile - cd - >/dev/null - fi -} - -src_test() { - default - if use perl; then - cd NKF.mod - perl-module_src_test - cd - >/dev/null - fi -} - -src_install() { - dobin ${PN} - doman ${PN}.1 - - if use l10n_ja; then - iconv -f ISO-2022-JP-3 -t UTF-8 ${PN}.1j > ${PN}.ja.1 || die - doman ${PN}.ja.1 - fi - dodoc ${PN}.doc - - if use perl; then - cd NKF.mod - docinto perl - perl-module_src_install - cd - >/dev/null - fi - if use python; then - cd NKF.python - docinto python - DOCS= distutils-r1_src_install - dodoc CHANGES README.md - cd - >/dev/null - fi -} diff --git a/app-i18n/nkf/nkf-2.1.5.ebuild b/app-i18n/nkf/nkf-2.1.5-r1.ebuild index e937e5a5aebe..5c009ec1ef8a 100644 --- a/app-i18n/nkf/nkf-2.1.5.ebuild +++ b/app-i18n/nkf/nkf-2.1.5-r1.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=( python3_{7,8} ) +EAPI="8" + +PYTHON_COMPAT=( python3_{9..12} ) +DISTUTILS_USE_PEP517="setuptools" DISTUTILS_OPTIONAL="1" -DISTUTILS_USE_SETUPTOOLS="no" +DISTUTILS_EXT="1" inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot @@ -18,17 +20,16 @@ SRC_URI="mirror://sourceforge.jp/${PN}/70406/${P}.tar.gz LICENSE="ZLIB python? ( BSD )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" IUSE="perl python l10n_ja" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RDEPEND="python? ( +RDEPEND="python? ( ${PYTHON_DEPS} )" +DEPEND="${RDEPEND}" +BDEPEND="python? ( ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') + ${DISTUTILS_DEPS} )" -DEPEND="${RDEPEND}" src_unpack() { use python && vcs-snapshot_src_unpack || default @@ -41,10 +42,15 @@ src_prepare() { Makefile if use python; then mv "${WORKDIR}"/${PY_P} NKF.python || die + sed -i "s/-/_/g" NKF.python/setup.cfg + eapply "${FILESDIR}"/${PN}-python.patch - cd NKF.python + eapply "${FILESDIR}"/${P}-python-ssize_t.patch + eapply "${FILESDIR}"/${P}-python-ssize_t-deux.patch + + cd NKF.python || die distutils-r1_src_prepare - cd - >/dev/null + cd - >/dev/null || die fi default @@ -53,37 +59,37 @@ src_prepare() { src_configure() { default if use perl; then - cd NKF.mod + cd NKF.mod || die perl-module_src_configure - cd - >/dev/null + cd - >/dev/null || die fi if use python; then - cd NKF.python + cd NKF.python || die distutils-r1_src_configure - cd - >/dev/null + cd - >/dev/null || die fi } src_compile() { emake CC="$(tc-getCC)" if use perl; then - cd NKF.mod + cd NKF.mod || die perl-module_src_compile - cd - >/dev/null + cd - >/dev/null || die fi if use python; then - cd NKF.python + cd NKF.python || die distutils-r1_src_compile - cd - >/dev/null + cd - >/dev/null || die fi } src_test() { default if use perl; then - cd NKF.mod + cd NKF.mod || die perl-module_src_test - cd - >/dev/null + cd - >/dev/null || die fi } @@ -98,16 +104,16 @@ src_install() { dodoc ${PN}.doc if use perl; then - cd NKF.mod + cd NKF.mod || die docinto perl perl-module_src_install - cd - >/dev/null + cd - >/dev/null || die fi if use python; then - cd NKF.python + cd NKF.python || die docinto python DOCS= distutils-r1_src_install dodoc CHANGES README.md - cd - >/dev/null + cd - >/dev/null || die fi } diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest index 57f3d3e55d1a..41add6d499f7 100644 --- a/app-i18n/opencc/Manifest +++ b/app-i18n/opencc/Manifest @@ -1,5 +1 @@ -DIST opencc-1.0.5.tar.gz 1598354 BLAKE2B a66b32b96dab543d8401960ff0548a4e3f9414606513941426eacf105bca0755a7b364c68b7eb996ef82444e52f849d2f8151353a14fb97a358ad1463fbea2d3 SHA512 3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1 -DIST opencc-1.0.6.tar.gz 1621561 BLAKE2B d58ee0e04e133fbf6a7632788bcaf0f7891bb74051a970075f6d94b048adfec7bbe4438913933d7dfdd4d58ec2c1a5ec47685415c26532ddd8c13e8abd52cab6 SHA512 67c7bb7432483c1781701dc64ff28e4d5750898ed3d2d41f97d3782918b5f9aa1a49baa1e3a58e4b24cfbd2adcf9ea166a05ad934221fb1cb7afb35e909749e7 -DIST opencc-1.1.0.tar.gz 2209140 BLAKE2B 71cc659976cf30ac0d7dd52cdfa644a85e4e38fed081176bb2f2da2702203c0faeddf76818c8cc89a5fe2a2cfe3eee85fcb27010766db461817b204403cc9b46 SHA512 c5d95e84e0c8edf600f441b79431f721e721b1028619170e27fbc762da32c9ef99c9d28c2c5eaf34226d23a24e2fe5e494cedb28f1182acb06f94b72d7cbb52c -DIST opencc-1.1.1.tar.gz 2212256 BLAKE2B 0299023f4c950ebedc0a7bc4ca142fbf737c612aca5c8cba8787bebcf2ac8afcacb056b015fbc151136166f679a4551fc5d6bbc0481b930331228ea7484fbe68 SHA512 48ccf61f63cf0a1c0fc484a52ae1d406a28949a52be7d7d1595e6aaf87f40ac47ea4697308441a9381f0cd6f404ee5a28b85a2fa2f288c4b3933be36f4a41363 -DIST opencc-1.1.2.tar.gz 2804665 BLAKE2B 9b8be92cfdc2f565c9dc27745724c739e674239f2e3925a1ccdfcbf83e0d1857430d72e91a064c09456e69c00d79e47179801b21a4c7c6fd5dc6d0d16f1bcb98 SHA512 56c84bc472b39eb0b23bac6df5aada2c2ed5fd2fbe653c1ae89d392ec0b74741a15de93c748883ec3c0779396e790a1197f6e3b267b524f111459d45daeb5d4b +DIST opencc-1.1.4.tar.gz 2806887 BLAKE2B 150fd83818616de42e535f349b2574ff3319e41618e522583a57a00ab08b7f28db6e8f4fa4a0d4dbe027753b5be87065b2015542251986c6301ad441c4bf4c98 SHA512 ab8e7e6a0cc71106cf09eb32899fa8620b946a406f042d75a2444096e0b383cb1993d6c2d12cd7862e71854da4cd5893442bce51df84c32ed09fdfb4a2846f46 diff --git a/app-i18n/opencc/files/opencc-1.1.0-parallel_build.patch b/app-i18n/opencc/files/opencc-1.1.0-parallel_build.patch deleted file mode 100644 index 3163aa0a16e3..000000000000 --- a/app-i18n/opencc/files/opencc-1.1.0-parallel_build.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/BYVoid/OpenCC/issues/322 - ---- /data/CMakeLists.txt -+++ /data/CMakeLists.txt -@@ -116,6 +116,19 @@ - ) - endforeach(DICT) - -+add_custom_target( -+ copy_libopencc_to_dir_of_opencc_dict -+ COMMENT -+ "Copying libopencc to directory of opencc_dict" -+ COMMAND -+ ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>" -+) -+if (WIN32) -+ set(DICT_WIN32_DEPENDS copy_libopencc_to_dir_of_opencc_dict) -+else() -+ set(DICT_WIN32_DEPENDS) -+endif() -+ - foreach(DICT ${DICTS}) - add_custom_command( - OUTPUT -@@ -123,14 +136,13 @@ - COMMENT - "Building ${DICT}.ocd2" - COMMAND -- ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>" -- COMMAND - ${OPENCC_DICT_BIN} - --input ${DICT_${DICT}_INPUT} - --output ${DICT}.ocd2 - --from text - --to ocd2 - DEPENDS -+ ${DICT_WIN32_DEPENDS} - ${OPENCC_DICT_BIN} - ${DICT_${DICT}_INPUT} - ) diff --git a/app-i18n/opencc/files/opencc-1.1.1-system_libraries.patch b/app-i18n/opencc/files/opencc-1.1.1-system_libraries.patch deleted file mode 100644 index ee0527f22356..000000000000 --- a/app-i18n/opencc/files/opencc-1.1.1-system_libraries.patch +++ /dev/null @@ -1,94 +0,0 @@ -https://github.com/BYVoid/OpenCC/issues/547 - ---- /CMakeLists.txt -+++ /CMakeLists.txt -@@ -28,7 +28,12 @@ - option(ENABLE_GTEST "Build all tests." OFF) - option(ENABLE_BENCHMARK "Build benchmark tests." OFF) - option(ENABLE_DARTS "Build DartsDict (ocd format)." ON) --option(BUILD_BUNDLED_LIBMARISA "" ON) -+option(USE_SYSTEM_DARTS "Use system version of Darts" OFF) -+option(USE_SYSTEM_GOOGLE_BENCHMARK "Use system version of Google Benchmark" OFF) -+option(USE_SYSTEM_GTEST "Use system version of GoogleTest" OFF) -+option(USE_SYSTEM_MARISA "Use system version of Marisa" OFF) -+option(USE_SYSTEM_RAPIDJSON "Use system version of RapidJSON" OFF) -+option(USE_SYSTEM_TCLAP "Use system version of TCLAP" OFF) - - ######## Package information - set (PACKAGE_URL https://github.com/BYVoid/Opencc) -@@ -172,7 +177,7 @@ - - ######## Dependencies - --if(BUILD_BUNDLED_LIBMARISA) -+if(NOT USE_SYSTEM_MARISA) - message(STATUS "Use bundled marisa library.") - add_subdirectory(deps/marisa-0.2.5) - else() -@@ -194,12 +199,16 @@ - ######## Testing - - if (ENABLE_GTEST) -- add_subdirectory(deps/gtest-1.11.0) -+ if(NOT USE_SYSTEM_GTEST) -+ add_subdirectory(deps/gtest-1.11.0) -+ endif() - enable_testing() - endif() - - if (ENABLE_BENCHMARK) - set(BENCHMARK_ENABLE_TESTING OFF) -- add_subdirectory(deps/google-benchmark) -+ if(NOT USE_SYSTEM_GOOGLE_BENCHMARK) -+ add_subdirectory(deps/google-benchmark) -+ endif() - enable_testing() - endif() ---- /src/CMakeLists.txt -+++ /src/CMakeLists.txt -@@ -1,7 +1,13 @@ - include (GenerateExportHeader) --include_directories(../deps/marisa-0.2.5/include) --include_directories(../deps/rapidjson-1.1.0) --include_directories(../deps/tclap-1.2.2) -+if(NOT USE_SYSTEM_MARISA) -+ include_directories(../deps/marisa-0.2.5/include) -+endif() -+if(NOT USE_SYSTEM_RAPIDJSON) -+ include_directories(../deps/rapidjson-1.1.0) -+endif() -+if(NOT USE_SYSTEM_TCLAP) -+ include_directories(../deps/tclap-1.2.2) -+endif() - - # Library - -@@ -72,7 +78,9 @@ - ) - - if (ENABLE_DARTS) -- include_directories(../deps/darts-clone) -+ if(NOT USE_SYSTEM_DARTS) -+ include_directories(../deps/darts-clone) -+ endif() - set( - LIBOPENCC_HEADERS - ${LIBOPENCC_HEADERS} ---- /test/CMakeLists.txt -+++ /test/CMakeLists.txt -@@ -1,4 +1,3 @@ --include_directories(../deps/libdarts/src) - include_directories(../src) - - set(CONFIG_TEST -@@ -27,7 +26,9 @@ - ) - endif() - -- include_directories(../deps/gtest-1.7.0/include) -+ if(NOT USE_SYSTEM_GTEST) -+ include_directories(../deps/gtest-1.7.0/include) -+ endif() - set(UNITTESTS - CommandLineConvertTest - ) diff --git a/app-i18n/opencc/files/opencc-stop-copy.patch b/app-i18n/opencc/files/opencc-stop-copy.patch deleted file mode 100644 index 4793951dd251..000000000000 --- a/app-i18n/opencc/files/opencc-stop-copy.patch +++ /dev/null @@ -1,18 +0,0 @@ -We don't need this copy command on Linux (or other than Visual Studio -build). Since it is colliding each other on parallel build, drop the -command for now. - -See https://bugs.gentoo.org/666904 -diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt -index 1516775..2deb764 100644 ---- a/data/CMakeLists.txt -+++ b/data/CMakeLists.txt -@@ -109,8 +109,6 @@ foreach(DICT ${DICTS}) - ${DICT}.ocd - COMMENT - "Building ${DICT}.ocd" -- COMMAND -- ${CMAKE_COMMAND} -E copy "$<TARGET_FILE:libopencc>" "$<TARGET_FILE_DIR:${OPENCC_DICT_BIN}>" - COMMAND - ${OPENCC_DICT_BIN} - --input ${DICT_${DICT}_INPUT} diff --git a/app-i18n/opencc/files/opencc-test.patch b/app-i18n/opencc/files/opencc-test.patch deleted file mode 100644 index dd6e91b984d2..000000000000 --- a/app-i18n/opencc/files/opencc-test.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/PhraseExtractTest.cpp -+++ b/src/PhraseExtractTest.cpp -@@ -16,6 +16,8 @@ - * limitations under the License. - */ - -+#include <cmath> -+ - #include "PhraseExtract.hpp" - #include "TestUtils.hpp" - diff --git a/app-i18n/opencc/metadata.xml b/app-i18n/opencc/metadata.xml index bfcc2f62831b..713fbd592ff4 100644 --- a/app-i18n/opencc/metadata.xml +++ b/app-i18n/opencc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild deleted file mode 100644 index f512433eb485..000000000000 --- a/app-i18n/opencc/opencc-1.0.5.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2010-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) - -inherit cmake python-any-r1 - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/BYVoid/OpenCC" -fi - -DESCRIPTION="Library for conversion between Traditional and Simplified Chinese characters" -HOMEPAGE="https://github.com/BYVoid/OpenCC" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz" -fi - -# OpenCC: Apache-2.0 -# deps/darts-clone: BSD-2 -# deps/gtest-1.7.0: BSD -# deps/rapidjson-0.11: MIT -# deps/tclap-1.2.1: MIT -LICENSE="Apache-2.0 BSD-2 MIT test? ( BSD )" -SLOT="0/2" -KEYWORDS="amd64 arm64 ~hppa ppc ppc64 sparc x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND="${PYTHON_DEPS} - doc? ( app-doc/doxygen )" -DEPEND="" -RDEPEND="" - -if [[ "${PV}" != "9999" ]]; then - S="${WORKDIR}/OpenCC-ver.${PV}" -fi - -PATCHES=( - "${FILESDIR}/${PN}-test.patch" - "${FILESDIR}/${PN}-stop-copy.patch" -) - -DOCS=(AUTHORS NEWS.md README.md) - -src_prepare() { - cmake_src_prepare - - sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i doc/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DOCUMENTATION=$(usex doc ON OFF) - -DBUILD_SHARED_LIBS=ON - -DENABLE_GTEST=$(usex test ON OFF) - ) - - cmake_src_configure -} diff --git a/app-i18n/opencc/opencc-1.0.6.ebuild b/app-i18n/opencc/opencc-1.0.6.ebuild deleted file mode 100644 index 70b4f7a65c7b..000000000000 --- a/app-i18n/opencc/opencc-1.0.6.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 2010-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) - -inherit cmake python-any-r1 - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/BYVoid/OpenCC" -fi - -DESCRIPTION="Library for conversion between Traditional and Simplified Chinese characters" -HOMEPAGE="https://github.com/BYVoid/OpenCC" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz" -fi - -# OpenCC: Apache-2.0 -# deps/darts-clone: BSD-2 -# deps/gtest-1.7.0: BSD -# deps/rapidjson-0.11: MIT -# deps/tclap-1.2.1: MIT -LICENSE="Apache-2.0 BSD-2 MIT test? ( BSD )" -SLOT="0/2" -KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND="${PYTHON_DEPS} - doc? ( app-doc/doxygen )" -DEPEND="" -RDEPEND="" - -if [[ "${PV}" != "9999" ]]; then - S="${WORKDIR}/OpenCC-ver.${PV}" -fi - -PATCHES=( - "${FILESDIR}/${PN}-stop-copy.patch" -) - -DOCS=(AUTHORS NEWS.md README.md) - -src_prepare() { - cmake_src_prepare - - sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i doc/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DOCUMENTATION=$(usex doc ON OFF) - -DBUILD_SHARED_LIBS=ON - -DENABLE_GTEST=$(usex test ON OFF) - ) - - cmake_src_configure -} diff --git a/app-i18n/opencc/opencc-1.1.0.ebuild b/app-i18n/opencc/opencc-1.1.0.ebuild deleted file mode 100644 index 0870f67310e8..000000000000 --- a/app-i18n/opencc/opencc-1.1.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2010-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) - -inherit cmake python-any-r1 - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/BYVoid/OpenCC" -fi - -DESCRIPTION="Library for conversion between Traditional and Simplified Chinese characters" -HOMEPAGE="https://github.com/BYVoid/OpenCC" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz" -fi - -# OpenCC: Apache-2.0 -# deps/darts-clone: BSD-2 -# deps/gtest-1.11.0: BSD -# deps/marisa-0.2.5: || ( BSD-2 LGPL-2.1+ ) -# deps/rapidjson-1.1.0: MIT -# deps/tclap-1.2.2: MIT -LICENSE="Apache-2.0 BSD-2 MIT || ( BSD-2 LGPL-2.1+ ) test? ( BSD )" -SLOT="0/2" -KEYWORDS="~amd64 ~x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND="${PYTHON_DEPS} - doc? ( app-doc/doxygen )" -DEPEND="" -RDEPEND="" - -if [[ "${PV}" != "9999" ]]; then - S="${WORKDIR}/OpenCC-ver.${PV}" -fi - -PATCHES=( - "${FILESDIR}/${PN}-1.1.0-parallel_build.patch" -) - -DOCS=(AUTHORS NEWS.md README.md) - -src_prepare() { - cmake_src_prepare - - sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i doc/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DOCUMENTATION=$(usex doc ON OFF) - -DBUILD_SHARED_LIBS=ON - -DENABLE_GTEST=$(usex test ON OFF) - ) - - cmake_src_configure -} diff --git a/app-i18n/opencc/opencc-1.1.2.ebuild b/app-i18n/opencc/opencc-1.1.2.ebuild deleted file mode 100644 index 936472477cda..000000000000 --- a/app-i18n/opencc/opencc-1.1.2.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2010-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=( python3_{8,9} ) - -inherit cmake python-any-r1 - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/BYVoid/OpenCC" -fi - -DESCRIPTION="Library for conversion between Traditional and Simplified Chinese characters" -HOMEPAGE="https://github.com/BYVoid/OpenCC" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -else - SRC_URI="https://github.com/BYVoid/OpenCC/archive/ver.${PV}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="Apache-2.0" -SLOT="0/1.1" -KEYWORDS="~amd64 ~arm64 ~riscv ~sparc ~x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -BDEPEND="${PYTHON_DEPS} - doc? ( app-doc/doxygen )" -DEPEND="dev-cpp/tclap - dev-libs/darts - dev-libs/marisa:0= - dev-libs/rapidjson - test? ( - dev-cpp/gtest - !hppa? ( !sparc? ( dev-cpp/benchmark ) ) - )" -RDEPEND="dev-libs/marisa:0=" - -if [[ "${PV}" != "9999" ]]; then - S="${WORKDIR}/OpenCC-ver.${PV}" -fi - -DOCS=(AUTHORS NEWS.md README.md) - -src_prepare() { - rm -r deps || die - - cmake_src_prepare - - sed -e "s:\${DIR_SHARE_OPENCC}/doc:share/doc/${PF}:" -i doc/CMakeLists.txt || die - - # https://github.com/BYVoid/OpenCC/issues/550 - # https://github.com/BYVoid/OpenCC/commit/736b93d3d16fdf0548bdaae2922569199615e919 - sed -e "s:#ifdef ENABLE_DARTS:#if 1:" -i src/Common.hpp || die -} - -src_configure() { - local mycmakeargs=( - -DBUILD_DOCUMENTATION=$(usex doc ON OFF) - -DENABLE_BENCHMARK=$(if use test && has_version -d dev-cpp/benchmark; then echo ON; else echo OFF; fi) - -DENABLE_GTEST=$(usex test ON OFF) - -DUSE_SYSTEM_DARTS=ON - -DUSE_SYSTEM_GOOGLE_BENCHMARK=ON - -DUSE_SYSTEM_GTEST=ON - -DUSE_SYSTEM_MARISA=ON - -DUSE_SYSTEM_RAPIDJSON=ON - -DUSE_SYSTEM_TCLAP=ON - ) - - cmake_src_configure -} diff --git a/app-i18n/opencc/opencc-1.1.1.ebuild b/app-i18n/opencc/opencc-1.1.4.ebuild index 049871a65815..9c8761e44dc2 100644 --- a/app-i18n/opencc/opencc-1.1.1.ebuild +++ b/app-i18n/opencc/opencc-1.1.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 2010-2021 Gentoo Authors +# Copyright 2010-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) +EAPI="8" +PYTHON_COMPAT=( python3_{9..11} ) inherit cmake python-any-r1 @@ -22,12 +22,12 @@ fi LICENSE="Apache-2.0" SLOT="0/1.1" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86" IUSE="doc test" RESTRICT="!test? ( test )" BDEPEND="${PYTHON_DEPS} - doc? ( app-doc/doxygen )" + doc? ( app-text/doxygen )" DEPEND="dev-cpp/tclap dev-libs/darts dev-libs/marisa:0= @@ -42,11 +42,6 @@ if [[ "${PV}" != "9999" ]]; then S="${WORKDIR}/OpenCC-ver.${PV}" fi -PATCHES=( - "${FILESDIR}/${PN}-1.1.0-parallel_build.patch" - "${FILESDIR}/${PN}-1.1.1-system_libraries.patch" -) - DOCS=(AUTHORS NEWS.md README.md) src_prepare() { @@ -58,8 +53,6 @@ src_prepare() { } src_configure() { - local -x CXXFLAGS="${CXXFLAGS} -I${ESYSROOT}/usr/include/rapidjson" - local mycmakeargs=( -DBUILD_DOCUMENTATION=$(usex doc ON OFF) -DENABLE_BENCHMARK=$(if use test && has_version -d dev-cpp/benchmark; then echo ON; else echo OFF; fi) diff --git a/app-i18n/opencc/opencc-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild index 2bcf333bd7cf..0841243ff549 100644 --- a/app-i18n/opencc/opencc-9999.ebuild +++ b/app-i18n/opencc/opencc-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 2010-2021 Gentoo Authors +# Copyright 2010-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) +EAPI="8" +PYTHON_COMPAT=( python3_{9..10} ) inherit cmake python-any-r1 @@ -27,7 +27,7 @@ IUSE="doc test" RESTRICT="!test? ( test )" BDEPEND="${PYTHON_DEPS} - doc? ( app-doc/doxygen )" + doc? ( app-text/doxygen )" DEPEND="dev-cpp/tclap dev-libs/darts dev-libs/marisa:0= diff --git a/app-i18n/poedit/metadata.xml b/app-i18n/poedit/metadata.xml index 59291cd93ece..7a0523de49fe 100644 --- a/app-i18n/poedit/metadata.xml +++ b/app-i18n/poedit/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>wxwidgets@gentoo.org</email> diff --git a/app-i18n/pyzy/metadata.xml b/app-i18n/pyzy/metadata.xml index f6afd400fc25..1edad7d250d1 100644 --- a/app-i18n/pyzy/metadata.xml +++ b/app-i18n/pyzy/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>dlan@gentoo.org</email> diff --git a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild index 6bd7a06a0091..95bc5ece8e26 100644 --- a/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild +++ b/app-i18n/pyzy/pyzy-0.1.0-r3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit autotools python-any-r1 @@ -27,8 +27,8 @@ RDEPEND="dev-db/sqlite:3 DEPEND="${RDEPEND}" BDEPEND=" ${PYTHON_DEPS} - sys-devel/autoconf-archive - doc? ( app-doc/doxygen )" + dev-build/autoconf-archive + doc? ( app-text/doxygen )" src_prepare() { mv "${WORKDIR}"/db data/db/open-phrase || die diff --git a/app-i18n/qkc/metadata.xml b/app-i18n/qkc/metadata.xml index e1a49f498885..491c88b3a31f 100644 --- a/app-i18n/qkc/metadata.xml +++ b/app-i18n/qkc/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/rime-data/Manifest b/app-i18n/rime-data/Manifest index 83a370bf3dbb..cc3e3a9220b6 100644 --- a/app-i18n/rime-data/Manifest +++ b/app-i18n/rime-data/Manifest @@ -1,2 +1 @@ -DIST brise-0.35.tar.gz 6707277 BLAKE2B 610ea2e58800676b88bc79ce7075ed5fa8ec041f2ee34e3dfbcbfa642f84413d8b188af8e49de56d815eac2e5188d18287749976aa4e28ba5c7c7dfc6dece30a SHA512 1a2a3ddba9be7089a1b82ce446a3e5dc93a13fff121f861aa1acbdea950f490c9367866902a056296e17de5076a59a54741ceb3a59a9c0ec58b6b7c54f519f3d DIST brise-0.38.20180515.tar.gz 7116807 BLAKE2B abf73b5813b18f4cd3ef68b3f6e8ad2c54ac90a0969a57e7786b53b99c162efeea9e82d962b3e8d7b8b1742852beb5d0eb4b07de65bdc1881c43388de552ee4a SHA512 60b3d37486b6858114036664327c9be00d09d3f7d3f5aaf337c6bc5a46134e5785fc1732db5aad15e1e628241a70c9c34b03f982fb13cae6d91220731b451bb9 diff --git a/app-i18n/rime-data/metadata.xml b/app-i18n/rime-data/metadata.xml index 128bf3bdf636..09e5add9327d 100644 --- a/app-i18n/rime-data/metadata.xml +++ b/app-i18n/rime-data/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>arfrever.fta@gmail.com</email> diff --git a/app-i18n/rime-data/rime-data-0.35.ebuild b/app-i18n/rime-data/rime-data-0.35.ebuild deleted file mode 100644 index 4290b96b3631..000000000000 --- a/app-i18n/rime-data/rime-data-0.35.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MY_PN="brise" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Data resources for Rime Input Method Engine" -HOMEPAGE="https://rime.im/ https://github.com/rime/brise" -SRC_URI="https://dl.bintray.com/lotem/rime/${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -DEPEND="app-i18n/librime" -RDEPEND="${DEPEND}" -S="${WORKDIR}/${MY_PN}" - -src_prepare() { - sed -i "/^[[:space:]]*PREFIX/s:/usr:${EPREFIX}/usr:" Makefile - - default -} diff --git a/app-i18n/rime-data/rime-data-0.38.20180515.ebuild b/app-i18n/rime-data/rime-data-0.38.20180515.ebuild index 3fae7368012b..35fc2d8f9eaf 100644 --- a/app-i18n/rime-data/rime-data-0.38.20180515.ebuild +++ b/app-i18n/rime-data/rime-data-0.38.20180515.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/rime/${MY_PN}/releases/download/${MY_P%.*}/${MY_P}.t LICENSE="GPL-3 LGPL-3 extra? ( Apache-2.0 )" SLOT="0" -KEYWORDS="amd64 arm64 ppc ppc64 x86" +KEYWORDS="amd64 arm64 ~loong ppc ppc64 ~riscv x86" IUSE="extra" DEPEND="app-i18n/librime" diff --git a/app-i18n/scim-anthy/metadata.xml b/app-i18n/scim-anthy/metadata.xml index 410ff4768471..d7cb274d88ed 100644 --- a/app-i18n/scim-anthy/metadata.xml +++ b/app-i18n/scim-anthy/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> @@ -10,6 +10,6 @@ <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag> </use> <upstream> - <remote-id type="sourceforge-jp">scim-imengine</remote-id> + <remote-id type="osdn">scim-imengine</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16-fixes-send-function-call.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-fixes-send-function-call.patch new file mode 100644 index 000000000000..fd894441a5a7 --- /dev/null +++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-fixes-send-function-call.patch @@ -0,0 +1,15 @@ +From Fedora: +https://src.fedoraproject.org/rpms/scim-bridge/c/0532ab48617e02f5bfb1edaba17b22e88d9beaf4 +Index: scim-bridge-0.4.16/agent/scim-bridge-agent-signal-listener.cpp +=================================================================== +--- scim-bridge-0.4.16.orig/agent/scim-bridge-agent-signal-listener.cpp ++++ scim-bridge-0.4.16/agent/scim-bridge-agent-signal-listener.cpp +@@ -64,7 +64,7 @@ static void sig_quit (int sig) + { + if (!signal_occurred) { + signal_occurred = true; +- send (pipe_in, '\0', sizeof (char), MSG_NOSIGNAL); ++ send (pipe_in, "", sizeof (char), MSG_NOSIGNAL); + } + } + diff --git a/app-i18n/scim-bridge/files/scim-bridge-0.4.16-slibtool.patch b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-slibtool.patch new file mode 100644 index 000000000000..fdd5583d8ea6 --- /dev/null +++ b/app-i18n/scim-bridge/files/scim-bridge-0.4.16-slibtool.patch @@ -0,0 +1,58 @@ +From 9b46a64aea5adac5b992b4133065b52f527ec881 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Sun, 15 May 2022 10:46:17 -0700 +Subject: [PATCH] client-gtk: Fix X11 undefined references + +With slibtool the client-gtk build fails with undefined references for +-lx11. This happens because the build includes -no-undefined and then +fails to test for the libX11 pkgconfig file. + +GNU libtool silently ignores -no-undefined and hides this issue while +slibtool does not do this. +--- + client-gtk/Makefile.am | 7 ++++--- + configure.ac | 6 ++++++ + 2 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/client-gtk/Makefile.am b/client-gtk/Makefile.am +index 4318519..27728b8 100644 +--- a/client-gtk/Makefile.am ++++ b/client-gtk/Makefile.am +@@ -33,13 +33,14 @@ im_scim_bridge_la_SOURCES = im-scim-bridge-gtk.c \ + scim-bridge-client-imcontext-gtk.c \ + scim-bridge-client-key-event-utility-gtk.c + +-im_scim_bridge_la_CXXFLAGS=@GTK2_CFLAGS@ +-im_scim_bridge_la_CFLAGS =@GTK2_CFLAGS@ ++im_scim_bridge_la_CXXFLAGS=@GTK2_CFLAGS@ @X11_CFLAGS@ ++im_scim_bridge_la_CFLAGS =@GTK2_CFLAGS@ @X11_CFLAGS@ + + im_scim_bridge_la_LDFLAGS = -rpath $(moduledir) \ + -avoid-version -no-undefined \ + -module \ +- @GTK2_LIBS@ ++ @GTK2_LIBS@ \ ++ @X11_LIBS@ + + im_scim_bridge_la_LIBADD = $(top_srcdir)/common/libscimbridgecommon.la \ + $(top_srcdir)/client-common/libscimbridgeclientcommon.la +diff --git a/configure.ac b/configure.ac +index 4c4b1fb..8b2a7a8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -205,6 +205,12 @@ else + enable_qt4_immodule=no + fi + ++if test "$SCIM_BRIDGE_BUILD_IMMODULE" = "1"; then ++ PKG_CHECK_MODULES(X11, [x11]) ++ AC_SUBST(X11_LIBS) ++ AC_SUBST(X11_CFLAGS) ++fi ++ + AM_CONDITIONAL(SCIM_BRIDGE_BUILD_TESTS, + [test "$enable_tests" = "yes"]) + +-- +2.35.1 + diff --git a/app-i18n/scim-bridge/metadata.xml b/app-i18n/scim-bridge/metadata.xml index 01855eefe13f..8c8ccaa2a142 100644 --- a/app-i18n/scim-bridge/metadata.xml +++ b/app-i18n/scim-bridge/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild b/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild index 9272a14e231e..0d8b59fe239a 100644 --- a/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild +++ b/app-i18n/scim-bridge/scim-bridge-0.4.16-r3.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 -inherit autotools gnome2-utils multilib readme.gentoo-r1 +inherit autotools gnome2-utils readme.gentoo-r1 DESCRIPTION="Yet another IM-client of SCIM" HOMEPAGE="http://www.scim-im.org/projects/scim_bridge" -SRC_URI="mirror://sourceforge/scim/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/scim/${P}.tar.gz" LICENSE="GPL-2 LGPL-2.1" SLOT="0" @@ -26,7 +26,7 @@ RDEPEND=" DEPEND="${RDEPEND} virtual/pkgconfig dev-util/intltool - doc? ( app-doc/doxygen ) + doc? ( app-text/doxygen ) " DISABLE_AUTOFORMATTING="yes" @@ -42,6 +42,8 @@ PATCHES=( "${FILESDIR}/${P}+gcc-4.4.patch" "${FILESDIR}/${P}+gcc-4.7.patch" "${FILESDIR}/${P}-configure.ac.patch" #280887 + "${FILESDIR}/${P}-fixes-send-function-call.patch" # 645168 + "${FILESDIR}/${P}-slibtool.patch" # 779121 ) src_prepare() { diff --git a/app-i18n/scim-hangul/metadata.xml b/app-i18n/scim-hangul/metadata.xml index 01855eefe13f..8c8ccaa2a142 100644 --- a/app-i18n/scim-hangul/metadata.xml +++ b/app-i18n/scim-hangul/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild index aa37d7ea868e..501c933b5a95 100644 --- a/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild +++ b/app-i18n/scim-hangul/scim-hangul-0.4.0.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 DESCRIPTION="Hangul IMEngine for SCIM ported from imhangul" HOMEPAGE="http://www.scim-im.org/" -SRC_URI="mirror://sourceforge/scim/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/scim/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" diff --git a/app-i18n/scim-input-pad/Manifest b/app-i18n/scim-input-pad/Manifest index 13cf3235062a..4f1f4240a3d6 100644 --- a/app-i18n/scim-input-pad/Manifest +++ b/app-i18n/scim-input-pad/Manifest @@ -1,2 +1 @@ DIST scim-input-pad-0.1.3.1.tar.gz 591478 BLAKE2B a89a4d5717f89125e9ae3a9f360e8746cd5eb8a41646e886aa3f9c341f9dbd3e36453ea071896002ae182476cccfb8114323ec6e2b363f7d1ca151e697f510bb SHA512 864a254814c0afa04c10143a6b0de4a927ff8612e01bed3776d09a910cfb12899c17245a89a0386f4fac59ebdaae9e6fb9dc9ff5981f72dbec952a9da52a413d -DIST scim-input-pad-0.1.3.tar.gz 1362611 BLAKE2B a9defe7b70a11b39a405c8e490030bc31b8372b3a7636f7215d5d5a4e1920aff38a810ab5d02ce0d987cd8280b09483e7a77a670de6f26d305ee47d87c1c6c8d SHA512 2a7f52c92feb5f882827f8a7240da6dc347be0f34c5b378ee8c26aba39b925d56caff3145ef237c4e0604d65179b755124b8b40c507666b2f76d12715de1103c diff --git a/app-i18n/scim-input-pad/metadata.xml b/app-i18n/scim-input-pad/metadata.xml index cd1750246e4d..278e0202bae5 100644 --- a/app-i18n/scim-input-pad/metadata.xml +++ b/app-i18n/scim-input-pad/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild index d6613ab82f8b..f7b713f04445 100644 --- a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild +++ b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,11 +7,11 @@ inherit autotools DESCRIPTION="Input pad for SCIM used to input symbols and special characters" HOMEPAGE="http://www.scim-im.org/" -SRC_URI="mirror://sourceforge/scim/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/scim/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="nls" RDEPEND=" diff --git a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild b/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild deleted file mode 100644 index 0cbb2a9701e8..000000000000 --- a/app-i18n/scim-input-pad/scim-input-pad-0.1.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -DESCRIPTION="Input pad for SCIM used to input symbols and special characters" -HOMEPAGE="http://www.scim-im.org/" -SRC_URI="mirror://sourceforge/scim/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="nls" - -RDEPEND=" - >=app-i18n/scim-1.2.0 - >=x11-libs/gtk+-2.6.0:2" -DEPEND="${RDEPEND}" -BDEPEND=" - >=dev-util/intltool-0.33 - virtual/pkgconfig" - -src_prepare() { - default - - rm m4/intltool.m4 || die - eautoreconf -} - -src_configure() { - econf \ - --disable-static \ - $(use_enable nls) -} - -src_install() { - default - - # no static archives - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - elog - elog "The SCIM input pad should be startable from the SCIM (and Skim)" - elog "systray icon right click menu. You will have to restart SCIM" - elog "(or Skim) in order for the menu entry to appear (you may simply" - elog "restart your X server). If you want to use it immediately, just" - elog "start the SCIM input pad, using the 'scim-input-pad' command." - elog - elog "To use, select the text zone you wish to write in, and just" - elog "click on the wanted character in the right multilevel tabbed" - elog "table, from the SCIM Input Pad interface." - elog - elog "To add new characters to the tables, see the documentation" - elog "(README file in ${EROOT}/usr/share/doc/${PF})." - elog -} diff --git a/app-i18n/scim-m17n/metadata.xml b/app-i18n/scim-m17n/metadata.xml index 01855eefe13f..8c8ccaa2a142 100644 --- a/app-i18n/scim-m17n/metadata.xml +++ b/app-i18n/scim-m17n/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild b/app-i18n/scim-m17n/scim-m17n-0.2.3-r1.ebuild index 6fb3a51c366f..4136cf2db6ae 100644 --- a/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild +++ b/app-i18n/scim-m17n/scim-m17n-0.2.3-r1.ebuild @@ -1,21 +1,32 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools DESCRIPTION="An input module for Smart Common Input Method (SCIM) which uses m17n as backend" HOMEPAGE="http://www.scim-im.org/projects/imengines" -SRC_URI="mirror://sourceforge/scim/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/scim/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc ppc64 x86" IUSE="" -RDEPEND=">=app-i18n/scim-1.4 - >=dev-libs/m17n-lib-1.2.0" -DEPEND="${RDEPEND} - virtual/pkgconfig" +RDEPEND=" + >=app-i18n/scim-1.4 + >=dev-libs/m17n-lib-1.2.0 + dev-libs/libltdl +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + # update the 2009 era configure / libtool scripts, which fail with LTO + eautoreconf +} src_configure() { econf --disable-static diff --git a/app-i18n/scim-pinyin/Manifest b/app-i18n/scim-pinyin/Manifest index 21392e9dfae6..5e72570c14ae 100644 --- a/app-i18n/scim-pinyin/Manifest +++ b/app-i18n/scim-pinyin/Manifest @@ -1 +1 @@ -DIST scim-pinyin-0.5.92.tar.gz 4769203 BLAKE2B 413a196d175536a044bdf4922bf1f3de6051f7e3cb61131153cab6c15e2301e373bfdd037d3e70c2893f66c29f955696e94bb9c75d1e686ca549d26716de0c47 SHA512 6af20b925c45ca355e12eeb59285e3327c2195038078a0e1741870395dc5a8f7dae60b8c9cd77919fbad94c27e123b9e58439f7011277439f9914d1a543a805f +DIST scim-pinyin-0.5.92.tar.xz 3473312 BLAKE2B 436bdb9cf51a36a42fc1edbdf834e86743248830c8f3b1c73e1aebb6b213442802b930ac1969bd0c58050ff1c32b6ced5fb019be6159670ba57fd9e2042d8211 SHA512 7a957e8f02e817d1581ec96a5e0671affbd06841de52caa00525abec0ee5421acd92f30132eace315e23e945014a85b03c01864a11c77c82d80682fa8f02357e diff --git a/app-i18n/scim-pinyin/metadata.xml b/app-i18n/scim-pinyin/metadata.xml index 01855eefe13f..8c8ccaa2a142 100644 --- a/app-i18n/scim-pinyin/metadata.xml +++ b/app-i18n/scim-pinyin/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/scim-pinyin/scim-pinyin-0.5.92.ebuild b/app-i18n/scim-pinyin/scim-pinyin-0.5.92.ebuild index 48730fbcfdc4..5ccbdb0380af 100644 --- a/app-i18n/scim-pinyin/scim-pinyin-0.5.92.ebuild +++ b/app-i18n/scim-pinyin/scim-pinyin-0.5.92.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="Smart Common Input Method (SCIM) Smart Pinyin Input Method" HOMEPAGE="http://www.scim-im.org/" -SRC_URI="mirror://sourceforge/scim/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/scim/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" @@ -34,7 +34,6 @@ src_configure() { econf \ --disable-skim-support \ --disable-static \ - --without-arts \ $(use_enable nls) } diff --git a/app-i18n/scim-sayura/metadata.xml b/app-i18n/scim-sayura/metadata.xml index c921b96adf6c..1d892a124fa3 100644 --- a/app-i18n/scim-sayura/metadata.xml +++ b/app-i18n/scim-sayura/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/scim-sunpinyin/Manifest b/app-i18n/scim-sunpinyin/Manifest deleted file mode 100644 index 016fef2a7157..000000000000 --- a/app-i18n/scim-sunpinyin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e diff --git a/app-i18n/scim-sunpinyin/metadata.xml b/app-i18n/scim-sunpinyin/metadata.xml deleted file mode 100644 index 20533d05e2c3..000000000000 --- a/app-i18n/scim-sunpinyin/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <use> - <flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag> - </use> - <upstream> - <remote-id type="github">sunpinyin/sunpinyin</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild b/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild deleted file mode 100644 index ed668fa02f72..000000000000 --- a/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PYTHON_COMPAT=( python2_7 ) - -inherit python-any-r1 scons-utils toolchain-funcs vcs-snapshot - -MY_P="${P#*-}" - -DESCRIPTION="SunPinyin IMEngine for SCIM" -HOMEPAGE="https://github.com/sunpinyin/sunpinyin" -SRC_URI="https://github.com/${PN#*-}/${PN#*-}/archive/v${PV/_rc/-rc}.tar.gz -> ${MY_P}.tar.gz" - -LICENSE="LGPL-2.1 CDDL" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="gtk3" - -RDEPEND="app-i18n/scim[gtk3=] - ~app-i18n/sunpinyin-${PV}:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - tc-export CXX -} - -src_compile() { - escons -C wrapper/scim \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --libexecdir="${EPREFIX}"/usr/libexec -} - -src_install() { - escons -C wrapper/scim --install-sandbox="${D}" install - dodoc wrapper/scim/README -} diff --git a/app-i18n/scim-tables/Manifest b/app-i18n/scim-tables/Manifest index 686f108bfe9f..c100883d8d50 100644 --- a/app-i18n/scim-tables/Manifest +++ b/app-i18n/scim-tables/Manifest @@ -1 +1 @@ -DIST scim-tables-0.5.13.tar.gz 6716275 BLAKE2B 8b7932f38baab64d9e1db6e9f76e3d7425f3b1ff071c358b8f2a7d8b2602d3304248e97389f2423ebc12b37edf43c114f73e6bace3907547af44963e03317878 SHA512 400aa99acef83b82e6422398f41bf65e51b7e703adc3e87cdef03793d84983e600f9e6201fda6f9c54e97f35c44da72a657ce15caef09ef490c44ad19c3a9e33 +DIST scim-tables-0.5.13.tar.xz 4052072 BLAKE2B e85ca8a1266a6a640f5ec05d3c44f80aadbe94e7d8f83fa235b60e7d524fffca4ca7a35082b1a90f4994ea660b3c931849761d1abd5e6db225e8cf90296ff202 SHA512 500aed2807c1d6b1c26efd2a782c9134439e4874bd8ad14dd0e80f831b4b6fcb7a70ecb532b6bb1504063e547d4a6bde4b65ad731a8677ada638f2408bc2b980 diff --git a/app-i18n/scim-tables/metadata.xml b/app-i18n/scim-tables/metadata.xml index 01855eefe13f..8c8ccaa2a142 100644 --- a/app-i18n/scim-tables/metadata.xml +++ b/app-i18n/scim-tables/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/scim-tables/scim-tables-0.5.13.ebuild b/app-i18n/scim-tables/scim-tables-0.5.13.ebuild index 718a68ef66c5..2d481eafafa1 100644 --- a/app-i18n/scim-tables/scim-tables-0.5.13.ebuild +++ b/app-i18n/scim-tables/scim-tables-0.5.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,7 +7,7 @@ inherit autotools DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server" HOMEPAGE="http://www.scim-im.org/" -SRC_URI="mirror://sourceforge/scim/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/scim/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" diff --git a/app-i18n/scim-tomoe/metadata.xml b/app-i18n/scim-tomoe/metadata.xml index f01b1e07af44..82a1115e613a 100644 --- a/app-i18n/scim-tomoe/metadata.xml +++ b/app-i18n/scim-tomoe/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild b/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r4.ebuild index c6c427a16733..748c90f2b3f9 100644 --- a/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r3.ebuild +++ b/app-i18n/scim-tomoe/scim-tomoe-0.6.0-r4.ebuild @@ -1,11 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools DESCRIPTION="Japanese input method Tomoe IMEngine for SCIM" HOMEPAGE="http://tomoe.sourceforge.net/" -SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/tomoe/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" @@ -16,14 +18,22 @@ RDEPEND=" >=app-i18n/scim-1.2.0 >=app-i18n/tomoe-gtk-0.6.0 >=x11-libs/gtk+-2.4:2 + dev-libs/libltdl " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig >=dev-util/intltool-0.35.0 " PATCHES=( "${FILESDIR}"/${P}-gcc43.patch ) +src_prepare() { + default + # update the 2007 era configure / libtool scripts, which fail with LTO + eautoreconf +} + src_configure() { econf --disable-static } diff --git a/app-i18n/scim-uim/metadata.xml b/app-i18n/scim-uim/metadata.xml index 01855eefe13f..8c8ccaa2a142 100644 --- a/app-i18n/scim-uim/metadata.xml +++ b/app-i18n/scim-uim/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild b/app-i18n/scim-uim/scim-uim-0.2.0-r3.ebuild index 8b9fe22e0718..751d339b780a 100644 --- a/app-i18n/scim-uim/scim-uim-0.2.0-r2.ebuild +++ b/app-i18n/scim-uim/scim-uim-0.2.0-r3.ebuild @@ -1,11 +1,13 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 + +inherit autotools DESCRIPTION="An input module for Smart Common Input Method (SCIM) which uses uim as backend" HOMEPAGE="http://www.scim-im.org/" -SRC_URI="mirror://sourceforge/scim/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/scim/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" @@ -14,15 +16,23 @@ IUSE="" RDEPEND=" >=app-i18n/uim-1.5.0 - >=app-i18n/scim-1.4.0" -DEPEND="${RDEPEND} - virtual/pkgconfig" + >=app-i18n/scim-1.4.0 + dev-libs/libltdl +" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-gcc43.patch "${FILESDIR}"/${P}-uim-1.5.patch ) +src_prepare() { + default + # update the 2007 era configure / libtool scripts, which fail with LTO + eautoreconf +} + src_configure() { econf --disable-static } diff --git a/app-i18n/scim/metadata.xml b/app-i18n/scim/metadata.xml index 9115a5e98acc..05b68dc37080 100644 --- a/app-i18n/scim/metadata.xml +++ b/app-i18n/scim/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild index a072ff8c3e09..78a49c4912cf 100644 --- a/app-i18n/scim/scim-1.4.18.ebuild +++ b/app-i18n/scim/scim-1.4.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ SRC_URI="https://github.com/scim-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86" IUSE="doc gtk3" RDEPEND="x11-libs/libX11 @@ -21,12 +21,12 @@ RDEPEND="x11-libs/libX11 >=dev-libs/atk-1 >=x11-libs/pango-1" DEPEND="${RDEPEND} - doc? ( app-doc/doxygen + doc? ( app-text/doxygen >=app-text/docbook-xsl-stylesheets-1.73.1 ) dev-lang/perl virtual/pkgconfig >=dev-util/intltool-0.33 - sys-devel/libtool" + dev-build/libtool" DOCS=( README AUTHORS diff --git a/app-i18n/skk-jisyo/Manifest b/app-i18n/skk-jisyo/Manifest index 16a3249a04d2..dc988c2ffbdb 100644 --- a/app-i18n/skk-jisyo/Manifest +++ b/app-i18n/skk-jisyo/Manifest @@ -1,2 +1,2 @@ -DIST skk-jisyo-201905.tar.xz 6198572 BLAKE2B a26e0be0406699424b24a8d1b004317b5d274fc02ed50ef6c4c696de8e039a6cfd7b34b292b7b7ecbdc2fee1950f6cc2a122ef457ba12f96972584560d3ac355 SHA512 db32fab5d5bf232838a3d502d4f648dde556381df9f96acec13d011274dedf5443676ce36324430dbe8cacb6a037e7bf70e72ef46b94fc6b57b9448e76aab38b DIST skk-jisyo-202005.tar.xz 6836292 BLAKE2B 6d73e6d2e38de178c6683ae447b0ea79054036739b7a01fe386d677cc99556d37f47adf4156e1d571681195b85a2134cac710b12fa08df87e4fe5e5098289119 SHA512 7cc639b307d56d4cb5d04280a003ffa2cfb326f7821d70dddb619e117c1b8358417e44f8137de1b8027ec7f97df8bff8fba845019c015cf8c48ed5d91753155c +DIST skk-jisyo-202402.tar.xz 7009372 BLAKE2B 4db4be482e537c67861d1f855e34289ce4e7cd790850c012f1a16962196a683170541486468c42fb071a33a498801a2784807793bb49a4a5ca0fa4c805819798 SHA512 72957b207fd28017fc3fbbc43987aa6e7b46b011788036fe96c15172c7934011e3100a45d7e207ebb84cd15f1db667ba366b316f485fecad279f5bd5608920ed diff --git a/app-i18n/skk-jisyo/metadata.xml b/app-i18n/skk-jisyo/metadata.xml index 6f2ca22da233..18319445e66e 100644 --- a/app-i18n/skk-jisyo/metadata.xml +++ b/app-i18n/skk-jisyo/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> <name>Cjk</name> </maintainer> + <upstream> + <remote-id type="github">skk-dev/dict</remote-id> + </upstream> </pkgmetadata> diff --git a/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild b/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild index ab1e56cf1b19..ac92d76c7105 100644 --- a/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild +++ b/app-i18n/skk-jisyo/skk-jisyo-202005.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" MY_PN=${PN^^} DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software" -HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html" +HOMEPAGE="https://skk-dev.github.io/dict/" SRC_URI="mirror://gentoo/${P}.tar.xz https://dev.gentoo.org/~hattya/distfiles/${P}.tar.xz" LICENSE="CC-BY-SA-3.0 GPL-2+ public-domain unicode" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="amd64 arm ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="cdb" -DEPEND="virtual/awk +DEPEND="app-alternatives/awk cdb? ( || ( dev-db/tinycdb diff --git a/app-i18n/skk-jisyo/skk-jisyo-201905.ebuild b/app-i18n/skk-jisyo/skk-jisyo-202402.ebuild index 979958d073ca..6f9e6363e3c4 100644 --- a/app-i18n/skk-jisyo/skk-jisyo-201905.ebuild +++ b/app-i18n/skk-jisyo/skk-jisyo-202402.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" MY_PN=${PN^^} DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software" -HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html" +HOMEPAGE="https://skk-dev.github.io/dict/" SRC_URI="mirror://gentoo/${P}.tar.xz https://dev.gentoo.org/~hattya/distfiles/${P}.tar.xz" -LICENSE="GPL-2 freedist public-domain" +LICENSE="CC-BY-SA-3.0 GPL-2+ public-domain unicode" SLOT="0" -KEYWORDS="amd64 arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="cdb" -DEPEND="virtual/awk +DEPEND="app-alternatives/awk cdb? ( || ( dev-db/tinycdb @@ -24,10 +24,11 @@ DEPEND="virtual/awk )" RDEPEND="" -DOCS=( ChangeLog{,.{1..3}} committers.txt edict_doc.txt ) +DOCS=( ChangeLog{,.{1..3}} committers.md ) +HTML_DOCS=( edict_doc.html ) src_prepare() { - rm -f ${MY_PN}.{wrong*,noregist,not_wrong,hukugougo,notes,requested,pubdic+} + rm -f ${MY_PN}.{hukugougo,noregist,notes,pubdic+,requested,unannotated,*wrong*} default } diff --git a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild index b0a562228fc7..85a8a3c57df4 100644 --- a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild +++ b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" -USE_RUBY="ruby24 ruby25 ruby26" +EAPI="8" +USE_RUBY="ruby26 ruby27 ruby30 ruby31" inherit git-r3 ruby-single MY_PN=${PN^^} DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software" -HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html" +HOMEPAGE="https://skk-dev.github.io/dict/" EGIT_REPO_URI="https://github.com/skk-dev/dict" LICENSE="CC-BY-SA-3.0 GPL-2+ public-domain unicode" @@ -18,8 +18,8 @@ KEYWORDS="" IUSE="cdb ${USE_RUBY//ruby/ruby_targets_ruby}" DEPEND="${RUBY_DEPS} + app-alternatives/awk app-i18n/skktools - virtual/awk cdb? ( || ( dev-db/tinycdb diff --git a/app-i18n/skkfep/metadata.xml b/app-i18n/skkfep/metadata.xml index 6f2ca22da233..a94766977fa6 100644 --- a/app-i18n/skkfep/metadata.xml +++ b/app-i18n/skkfep/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/skkfep/skkfep-0.87-r1.ebuild b/app-i18n/skkfep/skkfep-0.87-r1.ebuild index dd9870453969..c852c315a657 100644 --- a/app-i18n/skkfep/skkfep-0.87-r1.ebuild +++ b/app-i18n/skkfep/skkfep-0.87-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -17,8 +17,8 @@ IUSE="" DEPEND="sys-libs/ncurses:=" RDEPEND="${DEPEND} app-i18n/skk-jisyo" -BDEPEND="sys-apps/sed - virtual/awk +BDEPEND=" + app-alternatives/awk virtual/pkgconfig" PATCHES=( diff --git a/app-i18n/skkserv/metadata.xml b/app-i18n/skkserv/metadata.xml index e1a49f498885..491c88b3a31f 100644 --- a/app-i18n/skkserv/metadata.xml +++ b/app-i18n/skkserv/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/skkserv/skkserv-9.6-r3.ebuild b/app-i18n/skkserv/skkserv-9.6-r3.ebuild index b5710e975fdd..ab99d10a9e69 100644 --- a/app-i18n/skkserv/skkserv-9.6-r3.ebuild +++ b/app-i18n/skkserv/skkserv-9.6-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ SRC_URI="http://openlab.ring.gr.jp/skk/maintrunk/museum/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="amd64 ppc ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="" DEPEND="app-i18n/skk-jisyo" diff --git a/app-i18n/skktools/Manifest b/app-i18n/skktools/Manifest index 499f81a9502b..88c58e1c8fb3 100644 --- a/app-i18n/skktools/Manifest +++ b/app-i18n/skktools/Manifest @@ -1,2 +1 @@ -DIST skktools-1.3.3_p20170305.tar.gz 483715 BLAKE2B 0de2cb906e8433f66e706f0aa4dd8c4900343b48bfb9bb24aee4927f583650f54132c2a3bb607c17cefb0f0e686bcf8a0f4bd6ac07b6a9a71c0bd870eda587a7 SHA512 f6e9041fecf8c28a84c3996ca120371528c034eeca3695cb224b4cf225e8dab9e69969d7fb955112cd1e9c1e80c2ba8e2aef4f0eb81f55374dd626402482c235 DIST skktools-1.3.4.tar.gz 482860 BLAKE2B f9e822531f8f715291e55ec6dec0eeb31683dc72efc7ba73621cfd0c29f0c5147cbef8256d44848792b8a1601c1878321b2dc0260df9d32d0e5e18eb65220987 SHA512 8749dfc4f18474db860d8b7cd85fadfc00327b199addb31a339aa78dd66cb98032429664bdad4b47176b5b64b156b7264bc35a284861f6b9ec8cc9979d4d5ce1 diff --git a/app-i18n/skktools/metadata.xml b/app-i18n/skktools/metadata.xml index 32b1de9c163c..bc9c0bf49ed2 100644 --- a/app-i18n/skktools/metadata.xml +++ b/app-i18n/skktools/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild b/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild deleted file mode 100644 index b7fa7d4f12d0..000000000000 --- a/app-i18n/skktools/skktools-1.3.3_p20170305.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit elisp-common vcs-snapshot - -EGIT_COMMIT="e14d98e734d2fdff611385c7df65826e94d929db" - -DESCRIPTION="SKK utilities to manage dictionaries" -HOMEPAGE="http://openlab.jp/skk/" -SRC_URI="https://github.com/skk-dev/skktools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="emacs" - -RDEPEND="dev-libs/glib:2 - sys-libs/gdbm - emacs? ( >=app-editors/emacs-23.1:* )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( ChangeLog README.md ) -SITEFILE="50${PN}-gentoo.el" - -src_configure() { - econf --with-gdbm -} - -src_compile() { - default - - if use emacs; then - elisp-compile *.el - fi -} - -src_install() { - default - dodoc READMEs/* - - local d - for d in convert2skk filters; do - newdoc ${d}/README.md README.${d} - rm -f ${d}/README.md - done - - insinto /usr/share/${PN} - doins *.awk *.scm - rm -rf convert2skk/obsolete - doins -r convert2skk filters - - if use emacs; then - elisp-install ${PN} *.el{,c} - elisp-site-file-install "${FILESDIR}"/${SITEFILE} - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/app-i18n/skktools/skktools-1.3.4.ebuild b/app-i18n/skktools/skktools-1.3.4-r1.ebuild index bebc1e789326..bc195d8c1cfd 100644 --- a/app-i18n/skktools/skktools-1.3.4.ebuild +++ b/app-i18n/skktools/skktools-1.3.4-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 inherit elisp-common vcs-snapshot @@ -9,16 +9,16 @@ DESCRIPTION="SKK utilities to manage dictionaries" HOMEPAGE="http://openlab.jp/skk/" SRC_URI="https://github.com/skk-dev/skktools/archive/${P//./_}.tar.gz -> ${P}.tar.gz" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm ~riscv x86" IUSE="emacs" RDEPEND="dev-libs/glib:2 sys-libs/gdbm emacs? ( >=app-editors/emacs-23.1:* )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" SITEFILE="50${PN}-gentoo.el" @@ -41,12 +41,12 @@ src_install() { local d for d in convert2skk filters; do newdoc ${d}/README.md README.${d} - rm -f ${d}/README.md + rm -f ${d}/README.md || die done insinto /usr/share/${PN} doins *.{awk,scm} - rm -rf convert2skk/obsolete + rm -rf convert2skk/obsolete || die doins -r convert2skk filters if use emacs; then diff --git a/app-i18n/sunpinyin-data/Manifest b/app-i18n/sunpinyin-data/Manifest deleted file mode 100644 index 51a37bcc860d..000000000000 --- a/app-i18n/sunpinyin-data/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -DIST dict.utf8-20130220.tar.bz2 652859 BLAKE2B 9e0cdefc0db519b0e12dd2cb2621ef500e0ed5a0ff9a0eea76d6f64eac1cdb455f2d3c8a806fe7aa8c50cbc369c0ef6d937fdf01fecbc349773b12375bb419f3 SHA512 d58ec106959a7713e452df2fe2fa5a5f66e82bd67eeeee8740cd3eeedf30af8d14a90dae224ed2931dffd85b0327c704927409bde0247452d79cf40c5bc7cff8 -DIST dict.utf8-20131214.tar.bz2 674512 BLAKE2B b5e1756b52e8b4fd7839d4a72004b7ddc789986899cc626341f13b702ee1e0b54780c992b2988289bdbe7ff979f3243efc1b5a5e04a0529b9a3f6b327a49faef SHA512 adaf52a27c6afdeb950912845f3fcb7a6799f997d50a2892ceecf76ed13e3644407338d734832c2ce4b09bce11fec4731774f1eb2dd4c30bea5490555915bd5b -DIST lm_sc.3gm.arpa-20140820.tar.bz2 36623028 BLAKE2B 9456c51dbba59e5d20a1bdd9b06f0ef863c77eb7651287b45f143e6919aedf46ea81ca4da5c037c4b9775c19e68849720cb0e1b3db4cc9dd8df84832ac2eba6a SHA512 ea3ede62eb993c4d21ca7cf339635f4686493a0cefd57df4a31f00a001e67502a13ff9612ff667b941b82b47de00be9f3c9689677d04195a7ef8716bac087519 -DIST lm_sc.t3g.arpa-20121025.tar.bz2 36262281 BLAKE2B 55d8820228986f9a7b3d567ebca7bf37079e3d05f9b062814116702957e4447c5283ac9034b6a9171a9696df01398bb29ea55a2a1ded3a952e48f14a697d8698 SHA512 3159dd3700382cfa617ba025ce542660580f3057e0dd6bbb92947902495db08e4454c1d09d01a55c90653444513d125dd034e944b060a9d8e009c3633b106d97 diff --git a/app-i18n/sunpinyin-data/metadata.xml b/app-i18n/sunpinyin-data/metadata.xml deleted file mode 100644 index 3ce0e2257d3e..000000000000 --- a/app-i18n/sunpinyin-data/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <upstream> - <remote-id type="github">sunpinyin/open-gram</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild deleted file mode 100644 index 81a424941c72..000000000000 --- a/app-i18n/sunpinyin-data/sunpinyin-data-20130220.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DICT_VERSION="${PV}" -LM_VERSION="20121025" - -DESCRIPTION="Data sets for Sunpinyin" -HOMEPAGE="https://github.com/sunpinyin/open-gram" -SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2 - mirror://sourceforge/open-gram/lm_sc.t3g.arpa-${LM_VERSION}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -DEPEND="=app-i18n/sunpinyin-2.0.4*" - -src_unpack() { - default - mkdir "${S}" || die - mv "${WORKDIR}"/dict.utf8 "${S}" || die - mv "${WORKDIR}"/lm_sc.t3g.arpa "${S}" || die -} - -src_compile() { - # lm_sc.t3g - echoit tslmpack lm_sc.t3g.arpa dict.utf8 lm_sc.t3g.orig - echoit tslmendian -i lm_sc.t3g.orig -o lm_sc.t3g - # lexicon3 - echoit genpyt -i dict.utf8 -s lm_sc.t3g.orig -l pydict_sc.log -o pydict_sc.bin -} - -echoit() { - echo "${@}" - "${@}" -} - -src_install() { - insinto /usr/share/${PN/-data} - doins lm_sc.t3g pydict_sc.bin -} diff --git a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild b/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild deleted file mode 100644 index 355015764c1a..000000000000 --- a/app-i18n/sunpinyin-data/sunpinyin-data-20140820.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2013-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DICT_VERSION="20131214" -LM_VERSION="${PV}" - -DESCRIPTION="Data sets for SunPinyin" -HOMEPAGE="https://github.com/sunpinyin/open-gram" -SRC_URI="mirror://sourceforge/open-gram/dict.utf8-${DICT_VERSION}.tar.bz2 - mirror://sourceforge/open-gram/lm_sc.3gm.arpa-${LM_VERSION}.tar.bz2" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" - -# https://github.com/sunpinyin/sunpinyin/commit/0fff1e78d9a409205e025736286838721a2ccbf8 -BDEPEND=">=app-i18n/sunpinyin-2.0.4_pre20140819192400" -DEPEND="" -RDEPEND="" - -src_unpack() { - default - mkdir "${S}" || die - mv "${WORKDIR}"/dict.utf8 "${S}" || die - mv "${WORKDIR}"/lm_sc.3gm.arpa "${S}" || die -} - -src_compile() { - # lm_sc.t3g - echoit slmpack lm_sc.3gm.arpa dict.utf8 lm_sc.3gm - echoit slmthread lm_sc.3gm lm_sc.t3g.orig - echoit tslmendian -i lm_sc.t3g.orig -o lm_sc.t3g - # lexicon3 - echoit genpyt -i dict.utf8 -s lm_sc.t3g.orig -l pydict_sc.log -o pydict_sc.bin -} - -echoit() { - echo "${@}" - "${@}" -} - -src_install() { - insinto /usr/share/${PN/-data} - doins lm_sc.t3g pydict_sc.bin -} diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest deleted file mode 100644 index ab2a2125633b..000000000000 --- a/app-i18n/sunpinyin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33 diff --git a/app-i18n/sunpinyin/metadata.xml b/app-i18n/sunpinyin/metadata.xml deleted file mode 100644 index da2c1e97edca..000000000000 --- a/app-i18n/sunpinyin/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <upstream> - <remote-id type="github">sunpinyin/sunpinyin</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild deleted file mode 100644 index 4ac6f810f10d..000000000000 --- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 2009-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) - -inherit python-any-r1 scons-utils toolchain-funcs - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin" -elif [[ "${PV}" == *_pre* ]]; then - SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf" -fi - -DESCRIPTION="Statistical Language Model (SLM) based Chinese input method library" -HOMEPAGE="https://github.com/sunpinyin/sunpinyin" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -elif [[ "${PV}" == *_pre* ]]; then - SRC_URI="https://github.com/sunpinyin/${PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${P}.tar.gz" -else - SRC_URI="https://github.com/sunpinyin/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz" -fi - -LICENSE="|| ( CDDL LGPL-2.1 )" -SLOT="0/3" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -BDEPEND="dev-lang/perl - virtual/pkgconfig" -DEPEND="dev-db/sqlite:3 - virtual/libiconv" -RDEPEND="${DEPEND}" - -if [[ "${PV}" == *_pre* ]]; then - S="${WORKDIR}/${PN}-${SUNPINYIN_GIT_REVISION}" -elif [[ "${PV}" != "9999" ]]; then - S="${WORKDIR}/${PN}-${PV/_/-}" -fi - -src_prepare() { - default - sed -e "/^docdir =/s:/sunpinyin:/${PF}:" -i SConstruct || die - - # https://github.com/sunpinyin/sunpinyin/issues/109 - sed -e "/^Requires: sqlite3$/s/^Requires:/Requires.private:/" -i sunpinyin-2.0.pc.in || die -} - -src_configure() { - tc-export CXX -} - -src_compile() { - escons \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" -} - -src_install() { - escons --install-sandbox="${D}" install -} diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest index d1f737deb5c4..9c8eb871d140 100644 --- a/app-i18n/tagainijisho/Manifest +++ b/app-i18n/tagainijisho/Manifest @@ -1,12 +1,6 @@ -DIST JMdict-2020-07-01.gz 19735470 BLAKE2B 06126c07516241af6789c3427ebe68ce6da3a5116414f8d1cd5248c18319a4b302ec241499c36b380e3a49f43cac2b381e4130d2bae4a7b100de76724786eadd SHA512 08c3feed364666dfbf87c73ac5da20a7eaa414e7fde274f314b058a6b268cc197b834225aed57cea74f6cdc95f374031c1a87ee9e3023f421ed9f3f1af4ca1d0 -DIST JMdict-2020-10-01.gz 19845877 BLAKE2B f75e9cb1096c1f35276606119d1f0e1cf2687f69d9afe2bced55a6b75aa8ada0c8f245e05e8f7246d73463ed895cd232f1ee30ccd639cb32801c51cbc9a56dcc SHA512 4e6490eda15928a48cbfff59bf73d21dea19d2e80dffce70f65a247b0a9393bea787c8378b06b7e7c807eeb9a296971efac9f3ec2d3ab6771c7a016e0e747113 -DIST JMdict-2021-04-01.gz 20023736 BLAKE2B 57c2114550882729022cc639606f4512f7670e906f1e362e2fa3e40adb3fd10734e198f6703a7c372fe42fd61d620534c13fb702706e57cc9f40bce061c8218f SHA512 8791b7a1fa2a1e43c07b73d51395de2f1b0e52dfa84463b9e451b79e54a3af676dc0b11a99526987476b1ad167b1ace4d75134484469a927a8f8386e5478f7ca DIST JMdict-2021-07-01.gz 20106907 BLAKE2B 0a56834241f4a908b05e99f21917149d161b40a190d271d4477ec18b3b4972648142ab6db3b45fd290caa9d99b1e0a946e16e165dbeabe8eda73a4c9f6d7d286 SHA512 b7217ca9d25601733b03bc0193c1fd3a206b11a20731c2b52650cd5de626d02a486f089464e7c85f3525bd392b64b5c2f5348d752a791df46c06805ee082a42b -DIST kanjidic2-2020-07-01.xml.gz 1483010 BLAKE2B 7adc1d09bcddccfa549de92ff996c4d1e4ee4283ad845b50f5a453dd7f4051249eeb8fb3bd574b8c95f92a93ce7197f40226fe9046f7ab871f43f086c753166f SHA512 078ea54da499967b03c6eee75d629c9aced8c48381e8b6d1adf2d6440c81a26da8bc532f8db8d388588a74cbdb851bcb92846d1532b882f5ab9d65d653deeb3e -DIST kanjidic2-2020-10-01.xml.gz 1483702 BLAKE2B 0a1aa65084f5d6e35ac188c77c4264449ffa0c07e39fb464760049740e70187252e56212e1b95a5be930f326b42f2ef8689dcf7d53dfcbcd9ef250e0e05e26f2 SHA512 f47f0f9b401e2f30f9669bc61417424ed4f423a542115d56b3b176f4c8253a7025c02ba4e28d1180effa558f6cd6fca7f07fcd47c716839cd48ac7f2c8b6ac78 -DIST kanjidic2-2021-04-01.xml.gz 1487178 BLAKE2B 81e05d3d80bea1eec64e4af80b195dce2f3396a3c70f359fb27e7db68ab6f5a177b732bfeef53d9ba6af8cfdf860f130d6077b853bfb6e7e3b7eeb4fe3028915 SHA512 c3e617878f1f9da46580a93e47a669ba90a84ebf25790fdc40ee56f6a39cd704941a6f068708bd106e81f63fb34ca5b5992c758cc3f898fbed038fd4181ac437 DIST kanjidic2-2021-07-01.xml.gz 1487197 BLAKE2B f2fc6cc033c4615cdc0699970f2fd022ea7dab0ec8358eb6baa031e54b8dab4d766410b136e96ce9fe2120b1e2a8362bf8c902bcc9037335745dac24e4cebba5 SHA512 f64d4f207a402b40f02c05a21ba4edb38b74277fecd11694643e2fc4a5857720583a9553e21c9502ff98cb8d17c606f4d24e29b9d939b36d65ae3538d0fa8063 DIST kanjivg-20160426.xml.gz 3587660 BLAKE2B c85291f3671f0980186e8deb296cfa743322df438d6f09fd69a4f5a30c3db6f097d6ff0a817b88c5c9a2c8d4a40c90b31c0a54cb71d681849b557ee364707c48 SHA512 1d35a8cc5d4947f6bedfc71a2f08e2d1fda832d7a02588c00953e1746812b0e51d4d1c39dff49999b4f65ec850788359f6e0d1465f0e688b1bf753c4c67b3c54 -DIST tagainijisho-1.2.0_pre20200118132551.tar.gz 3635265 BLAKE2B f8f831f698bf0ca56c57e8343adee92d3b42842c95fb971c9d8696eaf660ce458d8fd2108ab4568463bed6711c5295d27efc34f2fab512c3d0bc2a11a4f76c1b SHA512 14d6fc5ce891437159ca2b3db53c776420a6d4e305f6753c7ccf5ce773d43fa31f875ee9582c9db1fe05364b18772cec43dd046a6492b6eb45c12b62f7d60407 -DIST tagainijisho-1.2.0_pre20210313131524.tar.gz 3639618 BLAKE2B f2dbb376dddf76b27a01b9a06309ed048d8e6bae7022a027b3da3b93f39c9bce63d0e5e06dd04434d61742213e48930643c9a81ca9102ca4202f6261404179f1 SHA512 3775bbc34bf3bef0604b6b18fcee7d2698f567002e23707205d2ee256f518514ad16d27d5cdb1cc5e6d42063b1532ab4b59cdb49d2934973cb6557e77e9b7a07 +DIST kanjivg-20220427.xml.gz 3599920 BLAKE2B 01c5f523023433ef8ada843ff55347ad8bb5be07d094fe2a602c47442c77d863dd131e766c486c75541618b31ab4d6493e2a1c15b5f4f416e22c561c2a73aacb SHA512 204c372ec8fbd3deeb0a644eae8883c3eada4693539c232d3e04709eb59af58925d7e3d4eca576c03ebd74fc077633f1e4897d2bf82105d35edd92023ea832d5 DIST tagainijisho-1.2.0_pre20210627073130.tar.gz 3639873 BLAKE2B 5dfef3a9d9489b3f9a2dfda9a73700311a597f73eddca375608d62069c2e01e37f977ebf78416483f8f8de6347accbdcaebd4f5dca65ee0ec88d2c90a2f7715d SHA512 bb6ddd487bdb7f7e6b664ad1fe92067c136ddc6ed4a01f5882f0fa2c9ebe2b77605dc0f5202f824e2e5a4f1829dff3c43410c339e6bf853ce890ce39567aa43f +DIST tagainijisho-1.2.2.tar.gz 32366512 BLAKE2B bb5670e9cfcd38f21cd16f8f2977c8ae754291ceaa8b1933a50256201b0ad90871bf2440c481eb0ca08ee802956780c02b5e25e9454dd21237743a352304a82f SHA512 08ed99282bd95123dba008af40c5c214ed6434e4179b2f1ccb2b2e83461b55dc4125d431827a9e3e9ec91c6e3ad0b0e98bc02e15e81ae7ce51e9efb47e93f316 diff --git a/app-i18n/tagainijisho/metadata.xml b/app-i18n/tagainijisho/metadata.xml index 1df8cba85e23..e8c4ff0a57d0 100644 --- a/app-i18n/tagainijisho/metadata.xml +++ b/app-i18n/tagainijisho/metadata.xml @@ -1,27 +1,35 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>arfrever.fta@gmail.com</email> - <name>Arfrever Frehtes Taifersar Arahesis</name> - </maintainer> - <maintainer type="person" proxied="proxy"> - <email>floppym@gentoo.org</email> - <name>Mike Gilbert</name> - </maintainer> - <longdescription> -Tagaini Jisho is a free, open-source Japanese dictionary and kanji lookup tool -that is available for Windows, MacOS X and Linux and aims at becoming your -Japanese study assistant. It allows you to quickly search for entries and mark -those that you wish to study, along with tags and personal notes. It also let -you train entries you are studying and follows your progression in remembering -them. Finally, it makes it easy to review entries you did not remember by -listing them on screen or printing them on a small booklet. + <maintainer type="person" proxied="yes"> + <email>arfrever.fta@gmail.com</email> + <name>Arfrever Frehtes Taifersar Arahesis</name> + </maintainer> + <maintainer type="person" proxied="yes"> + <email>jake@crazylinuxnerd.net</email> + <name>Jake Shipton</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <longdescription> + Tagaini Jisho is a free, open-source Japanese dictionary and kanji lookup tool + that is available for Windows, MacOS X and Linux and aims at becoming your + Japanese study assistant. It allows you to quickly search for entries and mark + those that you wish to study, along with tags and personal notes. It also let + you train entries you are studying and follows your progression in remembering + them. Finally, it makes it easy to review entries you did not remember by + listing them on screen or printing them on a small booklet. -Tagaini Jisho also features complete stroke order animations for more than 6000 -kanji. -</longdescription> - <upstream> - <remote-id type="github">Gnurou/tagainijisho</remote-id> - </upstream> + Tagaini Jisho also features complete stroke order animations for more than 6000 + kanji. + </longdescription> + <upstream> + <remote-id type="github">Gnurou/tagainijisho</remote-id> + </upstream> </pkgmetadata> diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild deleted file mode 100644 index 3800b36bbc6b..000000000000 --- a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 2014-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake xdg-utils - -if [[ "${PV}" == 9999 ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/Gnurou/tagainijisho" -elif [[ "${PV}" == *_pre* ]]; then - inherit vcs-snapshot - - TAGAINIJISHO_GIT_REVISION="2d2a3182a70a22bf27b0be42a3e896283513761e" -fi -if [[ "${PV}" != 9999 ]]; then - TAGAINIJISHO_VERSION="${PV%_p*_p*}" - JMDICT_DATE="${PV#${TAGAINIJISHO_VERSION}_p}" - JMDICT_DATE="${JMDICT_DATE%_p*}" - JMDICT_DATE="${JMDICT_DATE:0:4}-${JMDICT_DATE:4:2}-${JMDICT_DATE:6}" - KANJIDIC2_DATE="${PV#${TAGAINIJISHO_VERSION}_p*_p}" - KANJIDIC2_DATE="${KANJIDIC2_DATE:0:4}-${KANJIDIC2_DATE:4:2}-${KANJIDIC2_DATE:6}" -fi -if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then - KANJIVG_VERSION="20160426" -fi - -DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool" -HOMEPAGE="https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho" -if [[ "${PV}" == 9999 ]]; then - SRC_URI="" -elif [[ "${PV}" == *_pre* ]]; then - SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${PN}-${TAGAINIJISHO_VERSION}.tar.gz" -else - SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${PN}-${TAGAINIJISHO_VERSION}.tar.gz" -fi -if [[ "${PV}" != 9999 ]]; then - # Upstream: http://ftp.monash.edu.au/pub/nihongo/JMdict.gz - SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz" - # Upstream: http://www.edrdg.org/kanjidic/kanjidic2.xml.gz - SRC_URI+=" https://home.apache.org/~arfrever/distfiles/kanjidic2-${KANJIDIC2_DATE}.xml.gz" -fi -if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then - SRC_URI+=" https://github.com/KanjiVG/kanjivg/releases/download/r${KANJIVG_VERSION}/kanjivg-${KANJIVG_VERSION}.xml.gz" -fi - -LICENSE="GPL-3+ public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -if [[ "${PV}" == 9999 ]]; then - # We wget dictionary files in addition to using git - PROPERTIES="live" -fi - -BDEPEND="dev-qt/linguist-tools:5" -DEPEND=">=dev-db/sqlite-3.12:3 - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5" -RDEPEND="${DEPEND}" - -pkg_langs=(ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr uk vi zh) -IUSE+=" ${pkg_langs[@]/#/l10n_}" -unset pkg_langs - -if [[ "${PV}" != 9999 ]]; then - S="${WORKDIR}/${PN}-${TAGAINIJISHO_VERSION}" -fi - -src_unpack() { - if [[ "${PV}" == 9999 ]]; then - git-r3_src_unpack - elif [[ "${PV}" == *_pre* ]]; then - unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz - mv ${PN}-${TAGAINIJISHO_GIT_REVISION} ${PN}-${TAGAINIJISHO_VERSION} || die - else - unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz - fi - - if [[ "${PV}" == 9999 ]]; then - # JMdict.gz and kanjidic2.xml.gz are updated once per day. - - local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" - local today="$(TZ="UTC" date --date=today "+%Y-%m-%d")" - local yesterday="$(TZ="UTC" date --date=yesterday "+%Y-%m-%d")" - - if [[ -f ${distdir}/JMdict-${today}.gz && -s ${distdir}/JMdict-${today}.gz ]]; then - # Use previously downloaded file from today. - JMDICT_DATE="${today}" - elif [[ -f ${distdir}/JMdict-${yesterday}.gz && -s ${distdir}/JMdict-${yesterday}.gz ]]; then - # Use previously downloaded file from yesterday. File from today may still be nonexistent. - JMDICT_DATE="${yesterday}" - else - # Download file from today or yesterday. - wget http://ftp.monash.edu.au/pub/nihongo/JMdict.gz -O JMdict.gz || die - JMDICT_DATE="$(gzip -cd JMdict.gz | grep -E "^<!-- JMdict created: [[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2} -->$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")" - if [[ ${JMDICT_DATE} != ${today} && ${JMDICT_DATE} != ${yesterday} ]]; then - die "Unexpected date in JMdict.gz: '${JMDICT_DATE}'" - fi - ( - addwrite "${distdir}" - mv JMdict.gz "${distdir}/JMdict-${JMDICT_DATE}.gz" || die - ) - fi - einfo "Date in JMdict.gz: '${JMDICT_DATE}'" - - if [[ -f ${distdir}/kanjidic2-${today}.xml.gz && -s ${distdir}/kanjidic2-${today}.xml.gz ]]; then - # Use previously downloaded file from today. - KANJIDIC2_DATE="${today}" - elif [[ -f ${distdir}/kanjidic2-${yesterday}.xml.gz && -s ${distdir}/kanjidic2-${yesterday}.xml.gz ]]; then - # Use previously downloaded file from yesterday. File from today may still be nonexistent. - KANJIDIC2_DATE="${yesterday}" - else - # Download file from today or yesterday. - wget http://www.edrdg.org/kanjidic/kanjidic2.xml.gz -O kanjidic2.xml.gz || die - KANJIDIC2_DATE="$(gzip -cd kanjidic2.xml.gz | grep -E "^<date_of_creation>[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}</date_of_creation>$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")" - if [[ ${KANJIDIC2_DATE} != ${today} && ${KANJIDIC2_DATE} != ${yesterday} ]]; then - die "Unexpected date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'" - fi - ( - addwrite "${distdir}" - mv kanjidic2.xml.gz "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" || die - ) - fi - einfo "Date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'" - - mkdir "${S}/3rdparty" || die - gzip -cd "${distdir}/JMdict-${JMDICT_DATE}.gz" > "${S}/3rdparty/JMdict" || die - gzip -cd "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" > "${S}/3rdparty/kanjidic2.xml" || die - else - mkdir "${S}/3rdparty" || die - pushd "${S}/3rdparty" > /dev/null || die - - unpack JMdict-${JMDICT_DATE}.gz - mv JMdict-${JMDICT_DATE} JMdict || die - - unpack kanjidic2-${KANJIDIC2_DATE}.xml.gz - mv kanjidic2-${KANJIDIC2_DATE}.xml kanjidic2.xml || die - - popd > /dev/null || die - fi - - if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then - pushd "${S}/3rdparty" > /dev/null || die - - unpack kanjivg-${KANJIVG_VERSION}.xml.gz - mv kanjivg-${KANJIVG_VERSION}.xml kanjivg.xml || die - - popd > /dev/null || die - fi -} - -src_configure() { - # GUI linguae - # en is not optional, and build fails if none other than en is set, so adding ja as non-optional too. - local lang use_lang - for lang in i18n/*.ts; do - lang=${lang#i18n/tagainijisho_} - lang=${lang%.ts} - case ${lang} in - fa_IR|fi_FI|pt_BR) - # Use generic tags. - use_lang=${lang%%_*} - ;; - *) - use_lang=${lang} - ;; - esac - - if [[ ${lang} != en && ${lang} != ja ]] && ! use l10n_${use_lang}; then - rm i18n/tagainijisho_${lang}.ts || die - fi - done - - # Dictionary linguae - # en is not optional here either, but nothing special needs to be done. - local dict_langs - for lang in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do - if use l10n_${lang}; then - dict_langs+="${dict_langs:+;}${lang}" - fi - done - - local mycmakeargs=( - -DDICT_LANG="${dict_langs:-;}" - -DEMBED_SQLITE=OFF - ) - - cmake_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild deleted file mode 100644 index 3800b36bbc6b..000000000000 --- a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 2014-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit cmake xdg-utils - -if [[ "${PV}" == 9999 ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/Gnurou/tagainijisho" -elif [[ "${PV}" == *_pre* ]]; then - inherit vcs-snapshot - - TAGAINIJISHO_GIT_REVISION="2d2a3182a70a22bf27b0be42a3e896283513761e" -fi -if [[ "${PV}" != 9999 ]]; then - TAGAINIJISHO_VERSION="${PV%_p*_p*}" - JMDICT_DATE="${PV#${TAGAINIJISHO_VERSION}_p}" - JMDICT_DATE="${JMDICT_DATE%_p*}" - JMDICT_DATE="${JMDICT_DATE:0:4}-${JMDICT_DATE:4:2}-${JMDICT_DATE:6}" - KANJIDIC2_DATE="${PV#${TAGAINIJISHO_VERSION}_p*_p}" - KANJIDIC2_DATE="${KANJIDIC2_DATE:0:4}-${KANJIDIC2_DATE:4:2}-${KANJIDIC2_DATE:6}" -fi -if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then - KANJIVG_VERSION="20160426" -fi - -DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool" -HOMEPAGE="https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho" -if [[ "${PV}" == 9999 ]]; then - SRC_URI="" -elif [[ "${PV}" == *_pre* ]]; then - SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${PN}-${TAGAINIJISHO_VERSION}.tar.gz" -else - SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${PN}-${TAGAINIJISHO_VERSION}.tar.gz" -fi -if [[ "${PV}" != 9999 ]]; then - # Upstream: http://ftp.monash.edu.au/pub/nihongo/JMdict.gz - SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz" - # Upstream: http://www.edrdg.org/kanjidic/kanjidic2.xml.gz - SRC_URI+=" https://home.apache.org/~arfrever/distfiles/kanjidic2-${KANJIDIC2_DATE}.xml.gz" -fi -if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then - SRC_URI+=" https://github.com/KanjiVG/kanjivg/releases/download/r${KANJIVG_VERSION}/kanjivg-${KANJIVG_VERSION}.xml.gz" -fi - -LICENSE="GPL-3+ public-domain" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -if [[ "${PV}" == 9999 ]]; then - # We wget dictionary files in addition to using git - PROPERTIES="live" -fi - -BDEPEND="dev-qt/linguist-tools:5" -DEPEND=">=dev-db/sqlite-3.12:3 - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5" -RDEPEND="${DEPEND}" - -pkg_langs=(ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr uk vi zh) -IUSE+=" ${pkg_langs[@]/#/l10n_}" -unset pkg_langs - -if [[ "${PV}" != 9999 ]]; then - S="${WORKDIR}/${PN}-${TAGAINIJISHO_VERSION}" -fi - -src_unpack() { - if [[ "${PV}" == 9999 ]]; then - git-r3_src_unpack - elif [[ "${PV}" == *_pre* ]]; then - unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz - mv ${PN}-${TAGAINIJISHO_GIT_REVISION} ${PN}-${TAGAINIJISHO_VERSION} || die - else - unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz - fi - - if [[ "${PV}" == 9999 ]]; then - # JMdict.gz and kanjidic2.xml.gz are updated once per day. - - local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}" - local today="$(TZ="UTC" date --date=today "+%Y-%m-%d")" - local yesterday="$(TZ="UTC" date --date=yesterday "+%Y-%m-%d")" - - if [[ -f ${distdir}/JMdict-${today}.gz && -s ${distdir}/JMdict-${today}.gz ]]; then - # Use previously downloaded file from today. - JMDICT_DATE="${today}" - elif [[ -f ${distdir}/JMdict-${yesterday}.gz && -s ${distdir}/JMdict-${yesterday}.gz ]]; then - # Use previously downloaded file from yesterday. File from today may still be nonexistent. - JMDICT_DATE="${yesterday}" - else - # Download file from today or yesterday. - wget http://ftp.monash.edu.au/pub/nihongo/JMdict.gz -O JMdict.gz || die - JMDICT_DATE="$(gzip -cd JMdict.gz | grep -E "^<!-- JMdict created: [[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2} -->$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")" - if [[ ${JMDICT_DATE} != ${today} && ${JMDICT_DATE} != ${yesterday} ]]; then - die "Unexpected date in JMdict.gz: '${JMDICT_DATE}'" - fi - ( - addwrite "${distdir}" - mv JMdict.gz "${distdir}/JMdict-${JMDICT_DATE}.gz" || die - ) - fi - einfo "Date in JMdict.gz: '${JMDICT_DATE}'" - - if [[ -f ${distdir}/kanjidic2-${today}.xml.gz && -s ${distdir}/kanjidic2-${today}.xml.gz ]]; then - # Use previously downloaded file from today. - KANJIDIC2_DATE="${today}" - elif [[ -f ${distdir}/kanjidic2-${yesterday}.xml.gz && -s ${distdir}/kanjidic2-${yesterday}.xml.gz ]]; then - # Use previously downloaded file from yesterday. File from today may still be nonexistent. - KANJIDIC2_DATE="${yesterday}" - else - # Download file from today or yesterday. - wget http://www.edrdg.org/kanjidic/kanjidic2.xml.gz -O kanjidic2.xml.gz || die - KANJIDIC2_DATE="$(gzip -cd kanjidic2.xml.gz | grep -E "^<date_of_creation>[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}</date_of_creation>$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")" - if [[ ${KANJIDIC2_DATE} != ${today} && ${KANJIDIC2_DATE} != ${yesterday} ]]; then - die "Unexpected date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'" - fi - ( - addwrite "${distdir}" - mv kanjidic2.xml.gz "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" || die - ) - fi - einfo "Date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'" - - mkdir "${S}/3rdparty" || die - gzip -cd "${distdir}/JMdict-${JMDICT_DATE}.gz" > "${S}/3rdparty/JMdict" || die - gzip -cd "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" > "${S}/3rdparty/kanjidic2.xml" || die - else - mkdir "${S}/3rdparty" || die - pushd "${S}/3rdparty" > /dev/null || die - - unpack JMdict-${JMDICT_DATE}.gz - mv JMdict-${JMDICT_DATE} JMdict || die - - unpack kanjidic2-${KANJIDIC2_DATE}.xml.gz - mv kanjidic2-${KANJIDIC2_DATE}.xml kanjidic2.xml || die - - popd > /dev/null || die - fi - - if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then - pushd "${S}/3rdparty" > /dev/null || die - - unpack kanjivg-${KANJIVG_VERSION}.xml.gz - mv kanjivg-${KANJIVG_VERSION}.xml kanjivg.xml || die - - popd > /dev/null || die - fi -} - -src_configure() { - # GUI linguae - # en is not optional, and build fails if none other than en is set, so adding ja as non-optional too. - local lang use_lang - for lang in i18n/*.ts; do - lang=${lang#i18n/tagainijisho_} - lang=${lang%.ts} - case ${lang} in - fa_IR|fi_FI|pt_BR) - # Use generic tags. - use_lang=${lang%%_*} - ;; - *) - use_lang=${lang} - ;; - esac - - if [[ ${lang} != en && ${lang} != ja ]] && ! use l10n_${use_lang}; then - rm i18n/tagainijisho_${lang}.ts || die - fi - done - - # Dictionary linguae - # en is not optional here either, but nothing special needs to be done. - local dict_langs - for lang in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do - if use l10n_${lang}; then - dict_langs+="${dict_langs:+;}${lang}" - fi - done - - local mycmakeargs=( - -DDICT_LANG="${dict_langs:-;}" - -DEMBED_SQLITE=OFF - ) - - cmake_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.2.ebuild index 4db725401cff..568f5e3ce5f3 100644 --- a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401.ebuild +++ b/app-i18n/tagainijisho/tagainijisho-1.2.2.ebuild @@ -1,8 +1,7 @@ -# Copyright 2014-2021 Gentoo Authors +# Copyright 2014-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" - +EAPI=8 inherit cmake xdg-utils if [[ "${PV}" == 9999 ]]; then @@ -12,9 +11,7 @@ if [[ "${PV}" == 9999 ]]; then elif [[ "${PV}" == *_pre* ]]; then inherit vcs-snapshot - TAGAINIJISHO_GIT_REVISION="54a7145903cadb0ebfa58c543553dc0931a36066" -fi -if [[ "${PV}" != 9999 ]]; then + TAGAINIJISHO_GIT_REVISION="a16d7b82002d95365b54b8cd07d4fd80e2b9cfeb" TAGAINIJISHO_VERSION="${PV%_p*_p*}" JMDICT_DATE="${PV#${TAGAINIJISHO_VERSION}_p}" JMDICT_DATE="${JMDICT_DATE%_p*}" @@ -22,25 +19,28 @@ if [[ "${PV}" != 9999 ]]; then KANJIDIC2_DATE="${PV#${TAGAINIJISHO_VERSION}_p*_p}" KANJIDIC2_DATE="${KANJIDIC2_DATE:0:4}-${KANJIDIC2_DATE:4:2}-${KANJIDIC2_DATE:6}" fi + if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then - KANJIVG_VERSION="20160426" + KANJIVG_VERSION="20220427" fi DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool" HOMEPAGE="https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho" if [[ "${PV}" == 9999 ]]; then + # A daily archive is fetched for both JMdict and kanjidic2 SRC_URI="" elif [[ "${PV}" == *_pre* ]]; then SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${PN}-${TAGAINIJISHO_VERSION}.tar.gz" -else - SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${PN}-${TAGAINIJISHO_VERSION}.tar.gz" -fi -if [[ "${PV}" != 9999 ]]; then + # Upstream: https://www.edrdg.org/pub/Nihongo/JMdict.gz SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz" # Upstream: https://www.edrdg.org/pub/Nihongo/kanjidic2.xml.gz SRC_URI+=" https://home.apache.org/~arfrever/distfiles/kanjidic2-${KANJIDIC2_DATE}.xml.gz" +else + # JMdict and kanjidic2 are already included in stable release archive. + SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${PN}-${PV}.tar.gz" fi + if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then SRC_URI+=" https://github.com/KanjiVG/kanjivg/releases/download/r${KANJIVG_VERSION}/kanjivg-${KANJIVG_VERSION}.xml.gz" fi @@ -49,23 +49,20 @@ LICENSE="GPL-3+ public-domain" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -if [[ "${PV}" == 9999 ]]; then - PROPERTIES="live" -fi BDEPEND="dev-qt/linguist-tools:5" -DEPEND=">=dev-db/sqlite-3.12:3 +DEPEND=">=dev-db/sqlite-3.40:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5" RDEPEND="${DEPEND}" -pkg_langs=(ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr uk vi zh) +pkg_langs=(ar cs de es fa fi fr hr hu id it nb nl no pl pt ru sv ta th tr uk vi zh) IUSE+=" ${pkg_langs[@]/#/l10n_}" unset pkg_langs -if [[ "${PV}" != 9999 ]]; then +if [[ "${PV}" == *_pre* ]]; then S="${WORKDIR}/${PN}-${TAGAINIJISHO_VERSION}" fi @@ -76,7 +73,7 @@ src_unpack() { unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz mv ${PN}-${TAGAINIJISHO_GIT_REVISION} ${PN}-${TAGAINIJISHO_VERSION} || die else - unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz + unpack ${PN}-${PV}.tar.gz fi if [[ "${PV}" == 9999 ]]; then @@ -129,7 +126,7 @@ src_unpack() { mkdir "${S}/3rdparty" || die gzip -cd "${distdir}/JMdict-${JMDICT_DATE}.gz" > "${S}/3rdparty/JMdict" || die gzip -cd "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" > "${S}/3rdparty/kanjidic2.xml" || die - else + elif [[ "${PV}" == *_pre* ]]; then mkdir "${S}/3rdparty" || die pushd "${S}/3rdparty" > /dev/null || die @@ -160,7 +157,7 @@ src_configure() { lang=${lang#i18n/tagainijisho_} lang=${lang%.ts} case ${lang} in - fa_IR|fi_FI|pt_BR) + es_AR|fa_IR|fi_FI|pt_BR|zh_TW) # Use generic tags. use_lang=${lang%%_*} ;; diff --git a/app-i18n/tagainijisho/tagainijisho-9999.ebuild b/app-i18n/tagainijisho/tagainijisho-9999.ebuild index 1ece4615a3cb..923deb0d27a1 100644 --- a/app-i18n/tagainijisho/tagainijisho-9999.ebuild +++ b/app-i18n/tagainijisho/tagainijisho-9999.ebuild @@ -1,8 +1,7 @@ -# Copyright 2014-2021 Gentoo Authors +# Copyright 2014-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" - +EAPI=8 inherit cmake xdg-utils if [[ "${PV}" == 9999 ]]; then @@ -12,9 +11,7 @@ if [[ "${PV}" == 9999 ]]; then elif [[ "${PV}" == *_pre* ]]; then inherit vcs-snapshot - TAGAINIJISHO_GIT_REVISION="" -fi -if [[ "${PV}" != 9999 ]]; then + TAGAINIJISHO_GIT_REVISION="a16d7b82002d95365b54b8cd07d4fd80e2b9cfeb" TAGAINIJISHO_VERSION="${PV%_p*_p*}" JMDICT_DATE="${PV#${TAGAINIJISHO_VERSION}_p}" JMDICT_DATE="${JMDICT_DATE%_p*}" @@ -22,25 +19,28 @@ if [[ "${PV}" != 9999 ]]; then KANJIDIC2_DATE="${PV#${TAGAINIJISHO_VERSION}_p*_p}" KANJIDIC2_DATE="${KANJIDIC2_DATE:0:4}-${KANJIDIC2_DATE:4:2}-${KANJIDIC2_DATE:6}" fi + if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then - KANJIVG_VERSION="20160426" + KANJIVG_VERSION="20220427" fi DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool" HOMEPAGE="https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho" if [[ "${PV}" == 9999 ]]; then + # A daily archive is fetched for both JMdict and kanjidic2 SRC_URI="" elif [[ "${PV}" == *_pre* ]]; then SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${PN}-${TAGAINIJISHO_VERSION}.tar.gz" -else - SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${PN}-${TAGAINIJISHO_VERSION}.tar.gz" -fi -if [[ "${PV}" != 9999 ]]; then + # Upstream: https://www.edrdg.org/pub/Nihongo/JMdict.gz SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz" # Upstream: https://www.edrdg.org/pub/Nihongo/kanjidic2.xml.gz SRC_URI+=" https://home.apache.org/~arfrever/distfiles/kanjidic2-${KANJIDIC2_DATE}.xml.gz" +else + # JMdict and kanjidic2 are already included in stable release archive. + SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${PN}-${PV}.tar.gz" fi + if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then SRC_URI+=" https://github.com/KanjiVG/kanjivg/releases/download/r${KANJIVG_VERSION}/kanjivg-${KANJIVG_VERSION}.xml.gz" fi @@ -49,23 +49,20 @@ LICENSE="GPL-3+ public-domain" SLOT="0" KEYWORDS="" IUSE="" -if [[ "${PV}" == 9999 ]]; then - PROPERTIES="live" -fi BDEPEND="dev-qt/linguist-tools:5" -DEPEND=">=dev-db/sqlite-3.12:3 +DEPEND=">=dev-db/sqlite-3.40:3 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5" RDEPEND="${DEPEND}" -pkg_langs=(ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr uk vi zh) +pkg_langs=(ar cs de es fa fi fr hr hu id it nb nl no pl pt ru sv ta th tr uk vi zh) IUSE+=" ${pkg_langs[@]/#/l10n_}" unset pkg_langs -if [[ "${PV}" != 9999 ]]; then +if [[ "${PV}" == *_pre* ]]; then S="${WORKDIR}/${PN}-${TAGAINIJISHO_VERSION}" fi @@ -76,7 +73,7 @@ src_unpack() { unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz mv ${PN}-${TAGAINIJISHO_GIT_REVISION} ${PN}-${TAGAINIJISHO_VERSION} || die else - unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz + unpack ${PN}-${PV}.tar.gz fi if [[ "${PV}" == 9999 ]]; then @@ -129,7 +126,7 @@ src_unpack() { mkdir "${S}/3rdparty" || die gzip -cd "${distdir}/JMdict-${JMDICT_DATE}.gz" > "${S}/3rdparty/JMdict" || die gzip -cd "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" > "${S}/3rdparty/kanjidic2.xml" || die - else + elif [[ "${PV}" == *_pre* ]]; then mkdir "${S}/3rdparty" || die pushd "${S}/3rdparty" > /dev/null || die @@ -160,7 +157,7 @@ src_configure() { lang=${lang#i18n/tagainijisho_} lang=${lang%.ts} case ${lang} in - fa_IR|fi_FI|pt_BR) + es_AR|fa_IR|fi_FI|pt_BR|zh_TW) # Use generic tags. use_lang=${lang%%_*} ;; diff --git a/app-i18n/tegaki-zinnia-japanese/metadata.xml b/app-i18n/tegaki-zinnia-japanese/metadata.xml index c921b96adf6c..e35768875127 100644 --- a/app-i18n/tegaki-zinnia-japanese/metadata.xml +++ b/app-i18n/tegaki-zinnia-japanese/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> -</maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <upstream> + <remote-id type="github">tegaki/tegaki</remote-id> + </upstream> </pkgmetadata> diff --git a/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild b/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild index b2edab87d288..98633580a6e4 100644 --- a/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild +++ b/app-i18n/tegaki-zinnia-japanese/tegaki-zinnia-japanese-0.3.ebuild @@ -1,23 +1,28 @@ -# Copyright 2013-2020 Gentoo Authors +# Copyright 2013-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI="8" DESCRIPTION="Handwriting model data of Japanese" -HOMEPAGE="http://tegaki.org/" -SRC_URI="http://www.tegaki.org/releases/${PV}/models/${P}.zip" +HOMEPAGE="https://tegaki.github.io/" +SRC_URI="https://github.com/tegaki/tegaki/releases/download/v${PV}/${P}.zip" -LICENSE="LGPL-2" +LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="amd64 ~arm64 ~ppc64 x86" IUSE="" -DEPEND="app-arch/unzip" RDEPEND="" +BDEPEND="app-arch/unzip" src_prepare() { - sed -i -e "/^installpath=/s:local/::" Makefile || die - sed -i -e "/^installpath=/s:installpath=:installpath=${ED}:" Makefile || die + default + + sed -i \ + -e "/^installpath=/s|local/||" \ + -e "/^installpath=/s|=|=${EPREFIX}|" \ + -e "s/\(\$(inst\)/\$(DESTDIR)\1/" \ + Makefile } src_compile() { diff --git a/app-i18n/tomoe-gtk/files/tomoe-gtk-math.patch b/app-i18n/tomoe-gtk/files/tomoe-gtk-math.patch new file mode 100644 index 000000000000..05fba04a194d --- /dev/null +++ b/app-i18n/tomoe-gtk/files/tomoe-gtk-math.patch @@ -0,0 +1,11 @@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -4,7 +4,7 @@ + -DTOMOEGTKDATADIR=\""$(datadir)"/$(PACKAGE)\" + + INCLUDES = $(GTK2_CFLAGS) $(TOMOE_CFLAGS) $(GUCHARMAP_CFLAGS) +-LIBS = $(GTK2_LIBS) $(TOMOE_LIBS) $(GUCHARMAP_LIBS) ++LIBS = $(GTK2_LIBS) $(TOMOE_LIBS) $(GUCHARMAP_LIBS) -lm + + lib_LTLIBRARIES = libtomoe-gtk.la + libtomoe_gtk_la_SOURCES = \ diff --git a/app-i18n/tomoe-gtk/metadata.xml b/app-i18n/tomoe-gtk/metadata.xml index bb5bed5adfa2..13df5d2378fe 100644 --- a/app-i18n/tomoe-gtk/metadata.xml +++ b/app-i18n/tomoe-gtk/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> @@ -7,6 +7,6 @@ </maintainer> <upstream> <remote-id type="sourceforge">tomoe</remote-id> - <remote-id type="sourceforge-jp">tomoe</remote-id> + <remote-id type="osdn">tomoe</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r7.ebuild index 24a7bebf2397..b9861cc5dacb 100644 --- a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild +++ b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r7.ebuild @@ -1,11 +1,13 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" +inherit autotools + DESCRIPTION="Tomoe GTK+ interface widget library" HOMEPAGE="http://tomoe.osdn.jp/" -SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/tomoe/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" @@ -16,10 +18,19 @@ RDEPEND="app-i18n/tomoe x11-libs/gtk+:2" DEPEND="${RDEPEND}" BDEPEND="dev-util/glib-utils - dev-util/gtk-doc-am + dev-build/gtk-doc-am sys-devel/gettext virtual/pkgconfig" +PATCHES=( "${FILESDIR}"/${PN}-math.patch ) + +AT_M4DIR="macros" + +src_prepare() { + default + eautoreconf +} + src_configure() { econf \ --disable-static \ diff --git a/app-i18n/tomoe/files/tomoe-glibc-2.32.patch b/app-i18n/tomoe/files/tomoe-glibc-2.32.patch index 5d296cdcdd39..2bade4ef7643 100644 --- a/app-i18n/tomoe/files/tomoe-glibc-2.32.patch +++ b/app-i18n/tomoe/files/tomoe-glibc-2.32.patch @@ -1,5 +1,5 @@ ---- /lib/tomoe-xml-parser.c -+++ /lib/tomoe-xml-parser.c +--- a/lib/tomoe-xml-parser.c ++++ b/lib/tomoe-xml-parser.c @@ -441,7 +441,7 @@ f = fopen (filename, "rb"); if (!f) { diff --git a/app-i18n/tomoe/metadata.xml b/app-i18n/tomoe/metadata.xml index 216815207e4e..e05b4305e127 100644 --- a/app-i18n/tomoe/metadata.xml +++ b/app-i18n/tomoe/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> @@ -10,6 +10,6 @@ </use> <upstream> <remote-id type="sourceforge">tomoe</remote-id> - <remote-id type="sourceforge-jp">tomoe</remote-id> + <remote-id type="osdn">tomoe</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r7.ebuild index ad6822db39c6..9c30888d458c 100644 --- a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild +++ b/app-i18n/tomoe/tomoe-0.6.0-r7.ebuild @@ -1,22 +1,22 @@ -# Copyright 2006-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=7 + +USE_RUBY="ruby30 ruby31 ruby32" -USE_RUBY="ruby25 ruby26 ruby27" inherit autotools ruby-utils DESCRIPTION="Japanese handwriting recognition engine" HOMEPAGE="http://tomoe.osdn.jp/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="amd64 x86" IUSE="hyperestraier mysql ruby ${USE_RUBY//ruby/ruby_targets_ruby} subversion" -REQUIRED_USE="ruby? ( ^^ ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )" - RESTRICT="test" +REQUIRED_USE="ruby? ( ^^ ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )" RDEPEND="dev-libs/glib:2 hyperestraier? ( app-text/hyperestraier ) @@ -25,14 +25,14 @@ RDEPEND="dev-libs/glib:2 $(for ruby in ${USE_RUBY}; do echo "ruby_targets_${ruby}? ( $(_ruby_implementation_depend "${ruby}") - dev-ruby/ruby-glib2[ruby_targets_${ruby}] + dev-ruby/ruby-glib2[ruby_targets_${ruby}(-)] )" done) ) subversion? ( dev-vcs/subversion )" -DEPEND="${RDEPEND} - dev-util/glib-utils - dev-util/gtk-doc-am +DEPEND="${RDEPEND}" +BDEPEND="dev-util/glib-utils + dev-build/gtk-doc-am dev-util/intltool virtual/pkgconfig" @@ -66,9 +66,9 @@ src_configure() { econf \ $(use_enable ruby dict-ruby) \ + $(use_with ruby ruby "$(type -P ${ruby})") \ --disable-static \ --without-python \ - $(use_with ruby ruby "$(type -P ${ruby})") \ --with-svn-include="${EPREFIX}"/usr/include \ --with-svn-lib="${EPREFIX}"/usr/$(get_libdir) } diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest index 6de5f4bc9710..5a58f2a2631b 100644 --- a/app-i18n/transifex-client/Manifest +++ b/app-i18n/transifex-client/Manifest @@ -1,2 +1,4 @@ -DIST transifex-client-0.14.2.tar.gz 211398 BLAKE2B 4210a06da9fd09e689d28ae77a90c65f96cbba7b44a2cc506c2e385dc2f34659bfbda25eb81cef850442f4b3da22a859e19761798ec123888564b0327f0c6503 SHA512 5d7f8241d61621197df95cb42b2a8fb8088e77543f076c2401db14f7e44d67e49478d0b04cb525fc6281b37e5026edc8121f90cb7332e669d63be6112264044d -DIST transifex-client-0.14.3.tar.gz 211428 BLAKE2B cab17d7103016a78b226df6ca9905a0ddfd1b8765fb7b161c7390911ac5693d97e7a872a00cbc86e9c8e7d84fbcd85904768f463885bb679e22ab052463db418 SHA512 9034111fa0253ce8799c5ba181d6d35e2addd14b8c2edb7822d8d572255c27f49e4cfce9d82e7e70e352c32e87f2e7bdc6bf09c2a591e689606b0831414dd863 +DIST transifex-client-1.6.11-deps.tar.bz 241694717 BLAKE2B e48f0612d0c5c0a423f6350f0bf4a99f7a253afe16eac49af938ff6b85ba7ea0899f47e51597f190d94c42272431e7d9d93c7e6c479e7ab455022a52a4fcc76f SHA512 6a8b50245ddf1f50cf02d366c10c8f9bf5b6c74a5d4426c46be4bd422734928c4560a34481a7a7d69b2e63e908f477280b23eb47b2ce20527b32e1c981254336 +DIST transifex-client-1.6.11.gh.tar.gz 96572 BLAKE2B 3f287c51c8cfe73e851e99462c04a11ee727d2cc1b53820b5375f974225e81c5b8a5f980b3c8aab8525dd3b62a185c3e86ae008bc4487bac8088fc5e3e2b701b SHA512 c4c054c60d51b41ab0c8f878d3e46895bed4dd04cb4c2ee8e3af9efd804d1a140a7835b5d441e8d10d93aaf4fbadf77bb960e1518e4ba75d21a854974a8d7d07 +DIST transifex-client-1.6.4-deps.tar.bz 241683180 BLAKE2B 395caf5b5db1ea93363a7f6efc4d2b8ff9e5e8040b04fd8e78ccfbc4b6239c809e348de9d4f8e494d34a2fc6564a70df448961d62a2949c9e2a326cb5f873fcf SHA512 0463cc7ead2c111f4d3889f3f29aa1c729554af0d0934a51aebd691e1f621f9bc61b5b3a90166ee0c947187aa5b489dc6b1bbd438193d6009afdc1a040db1270 +DIST transifex-client-1.6.4.tar.gz 94703 BLAKE2B b51e29aadab41c23b95efc86c334876094772e9d4f4f0cdaa41a5d016e710597da631953446d20689b0028e34bb4cc31ab0bdc1d3107dbc3a4abd6ba9279698e SHA512 d8e6b18d30b9d225c6ed84c9cc699743c289ccfc151c1aa74411989f965f554e651ece3e36a033dc8fc77bc3bb5502b02b2d04b1affe96811195b74edadf128c diff --git a/app-i18n/transifex-client/files/transifex-client-0.14.2-r1-timestamp.patch b/app-i18n/transifex-client/files/transifex-client-0.14.2-r1-timestamp.patch deleted file mode 100644 index 0943621243c0..000000000000 --- a/app-i18n/transifex-client/files/transifex-client-0.14.2-r1-timestamp.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://github.com/transifex/transifex-client/pull/316 -https://bugs.gentoo.org/771660 -Fix tests on 32-bit systems ---- a/tests/test_project.py -+++ b/tests/test_project.py -@@ -717,8 +717,8 @@ - ) - self.assertEqual(res, True) - -- # "Recent" timestamp (in the future - 2100) -- ts_mock.return_value = 4111417171 -+ # "Recent" timestamp (in the future - 2038) -+ ts_mock.return_value = 2147483000 - res = self.p._should_download( - 'pt', self.stats, os.path.abspath(__file__), False, - use_git_timestamps=True diff --git a/app-i18n/transifex-client/metadata.xml b/app-i18n/transifex-client/metadata.xml index 1aaba3b62f4c..80a01af3d785 100644 --- a/app-i18n/transifex-client/metadata.xml +++ b/app-i18n/transifex-client/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>gentoo.2019@r123.de</email> diff --git a/app-i18n/transifex-client/transifex-client-0.14.2-r1.ebuild b/app-i18n/transifex-client/transifex-client-0.14.2-r1.ebuild deleted file mode 100644 index 4cf3be326673..000000000000 --- a/app-i18n/transifex-client/transifex-client-0.14.2-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 - -DESCRIPTION="A command line interface for Transifex" -HOMEPAGE="https://pypi.org/project/transifex-client/ https://www.transifex.net/ https://github.com/transifex/transifex-client" -SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )" -RDEPEND="dev-python/GitPython[${PYTHON_USEDEP}] - <dev-python/python-slugify-5.0.0[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - <dev-python/six-2.0.0[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}/${PN}-0.14.2-r1-timestamp.patch" -) - -distutils_enable_tests setup.py - -src_prepare() { - default - - sed -i -e 's:test_fetch_timestamp_from_git_tree:_&:' \ - tests/test_utils.py || die - sed -i '/tests_require=\["mock>=3.0.5,<4.0"\]/d' setup.py || die -} diff --git a/app-i18n/transifex-client/transifex-client-0.14.3.ebuild b/app-i18n/transifex-client/transifex-client-0.14.3.ebuild deleted file mode 100644 index f8e5d92fb22b..000000000000 --- a/app-i18n/transifex-client/transifex-client-0.14.3.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit distutils-r1 - -DESCRIPTION="A command line interface for Transifex" -HOMEPAGE="https://pypi.org/project/transifex-client/ https://www.transifex.net/ https://github.com/transifex/transifex-client" -SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" -IUSE="test" -RESTRICT="!test? ( test )" - -BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )" -RDEPEND="dev-python/GitPython[${PYTHON_USEDEP}] - <dev-python/python-slugify-5.0.0[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - <dev-python/six-2.0.0[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}]" - -PATCHES=( - "${FILESDIR}/${PN}-0.14.2-r1-timestamp.patch" -) - -distutils_enable_tests setup.py - -src_prepare() { - default - - sed -i -e 's:test_fetch_timestamp_from_git_tree:_&:' \ - tests/test_utils.py || die - sed -i '/tests_require=\["mock>=3.0.5,<4.0"\]/d' setup.py || die -} diff --git a/app-i18n/transifex-client/transifex-client-1.6.11.ebuild b/app-i18n/transifex-client/transifex-client-1.6.11.ebuild new file mode 100644 index 000000000000..1849d1961464 --- /dev/null +++ b/app-i18n/transifex-client/transifex-client-1.6.11.ebuild @@ -0,0 +1,32 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="The Transifex command-line client" +HOMEPAGE="https://github.com/transifex/cli" + +SRC_URI="https://github.com/transifex/cli/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz + https://gitlab.com/api/v4/projects/35204985/packages/generic/${PN}/${PV}/${P}-deps.tar.bz" +S="${WORKDIR}"/cli-${PV} + +LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-3 MIT MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" + +src_compile() { + emake GOFLAGS="${GOFLAGS} -ldflags=-X="github.com/transifex/cli/internal/txlib.Version=${PV} +} + +src_test() { + # Skip tests depending on a network connection. Bug #831772 + rm internal/txlib/update_test.go || die + go test ./... || die +} + +src_install() { + dobin bin/tx + dodoc README.md +} diff --git a/app-i18n/transifex-client/transifex-client-1.6.4.ebuild b/app-i18n/transifex-client/transifex-client-1.6.4.ebuild new file mode 100644 index 000000000000..6ba19788bb45 --- /dev/null +++ b/app-i18n/transifex-client/transifex-client-1.6.4.ebuild @@ -0,0 +1,32 @@ +# Copyright 2021-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit go-module + +DESCRIPTION="The Transifex command-line client" +HOMEPAGE="https://github.com/transifex/cli" + +SRC_URI="https://github.com/transifex/cli/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz + https://gitlab.com/api/v4/projects/35204985/packages/generic/${PN}/${PV}/${P}-deps.tar.bz" +S="${WORKDIR}"/cli-${PV} + +LICENSE="Apache-2.0 BSD BSD-2 ISC LGPL-3 MIT MPL-2.0" +SLOT="0" +KEYWORDS="amd64 ~ppc64 x86" + +src_compile() { + emake GOFLAGS="${GOFLAGS} -ldflags=-X="github.com/transifex/cli/internal/txlib.Version=${PV} +} + +src_test() { + # Skip tests depending on a network connection. Bug #831772 + rm internal/txlib/update_test.go || die + go test ./... || die +} + +src_install() { + dobin bin/tx + dodoc README.md +} diff --git a/app-i18n/translate-shell/Manifest b/app-i18n/translate-shell/Manifest index c4dafb0f9629..d36ad4b207ef 100644 --- a/app-i18n/translate-shell/Manifest +++ b/app-i18n/translate-shell/Manifest @@ -1,2 +1 @@ -DIST translate-shell-0.9.6.11.tar.gz 76779 BLAKE2B 39748d0a2d7db504fd4c0bee516f703291dce93f19aa760fdae70b0551cb5f14ae5483314114f7e1141ae2231e0b128a79a9c05ec1fd08c970be886c4430e32d SHA512 d4d376b3750e43e3de5b95790fea7fc91e94140526ac15ee9f7818554f95d410772c8f8887433b6fd4547f569b3d6f510c1bc1497d8237223c344dbb8f0ae87f -DIST translate-shell-0.9.6.12.tar.gz 77580 BLAKE2B 78e8c694edc03fb03facd8c705c7e703a106fe9f2d7b46d464a681d52523817b4aeaf023fdedf46a9792270daf758fde457ba30ab1ffaa778f8db3eba3caa892 SHA512 6cbdfd14b7004d0e37a4abee01bec87409137f1bb7a14a964936bf0a2ad704ea1fc04dcd8ab10404a5c2df105bf7a6a8b33ed02c75c1035a6900082f6dfbb20d +DIST translate-shell-0.9.7.1.tar.gz 94865 BLAKE2B a64bf33d2c4e79889854c427cf5853b5a58ae0478ef51f2ca4b7eb481cc74a06ba33537bc9a557694e1b6a3c585328c73f4aec75d4e941a8d695bc18dd03b096 SHA512 d25a6177ee5b9d41715042b653ad345d1c76884423700f0fe53bc2ffddd6d3c14844fa4e768b87b055018794a8c4057c329810c65764e7f9aa425ceac35f0810 diff --git a/app-i18n/translate-shell/metadata.xml b/app-i18n/translate-shell/metadata.xml index 7ad4be9c8643..442932bbc25b 100644 --- a/app-i18n/translate-shell/metadata.xml +++ b/app-i18n/translate-shell/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>erkiferenc@gmail.com</email> diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild b/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild deleted file mode 100644 index 68425a1a688c..000000000000 --- a/app-i18n/translate-shell/translate-shell-0.9.6.12.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit optfeature - -DESCRIPTION="Online command-line translator" -HOMEPAGE="https://www.soimort.org/translate-shell/" -SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND="sys-apps/gawk" -DEPEND="${RDEPEND} - test? ( - app-editors/emacs - app-misc/rlwrap - )" - -src_test() { - emake NETWORK_ACCESS=no test -} - -src_install() { - emake PREFIX="${D}/usr" install -} - -pkg_postinst() { - optfeature "all built-in translators (e.g. Apertium, Yandex)" net-misc/curl[ssl] - optfeature "display text in right-to-left scripts" dev-libs/fribidi - optfeature "text-to-speech functionality" media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer - optfeature "interactive translation (REPL)" app-editors/emacs app-misc/rlwrap - optfeature "spell checking" app-text/aspell app-text/hunspell -} diff --git a/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild b/app-i18n/translate-shell/translate-shell-0.9.7.1.ebuild index 68425a1a688c..7ede6dafe025 100644 --- a/app-i18n/translate-shell/translate-shell-0.9.6.11.ebuild +++ b/app-i18n/translate-shell/translate-shell-0.9.7.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit optfeature @@ -11,7 +11,7 @@ SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="Unlicense" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="amd64 arm64 x86" IUSE="test" RESTRICT="!test? ( test )" @@ -33,7 +33,7 @@ src_install() { pkg_postinst() { optfeature "all built-in translators (e.g. Apertium, Yandex)" net-misc/curl[ssl] optfeature "display text in right-to-left scripts" dev-libs/fribidi - optfeature "text-to-speech functionality" media-sound/mpg123 app-accessibility/espeak media-video/mpv media-video/mplayer + optfeature "text-to-speech functionality" media-sound/mpg123 app-accessibility/espeak-ng media-video/mpv media-video/mplayer optfeature "interactive translation (REPL)" app-editors/emacs app-misc/rlwrap optfeature "spell checking" app-text/aspell app-text/hunspell } diff --git a/app-i18n/uchardet/metadata.xml b/app-i18n/uchardet/metadata.xml index 7a5ba7b3c342..44ce99064069 100644 --- a/app-i18n/uchardet/metadata.xml +++ b/app-i18n/uchardet/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>coppens.matthias.abc@gmail.com</email> diff --git a/app-i18n/uchardet/uchardet-0.0.7.ebuild b/app-i18n/uchardet/uchardet-0.0.7.ebuild index 5f8e8c095fc5..9580e2f2d728 100644 --- a/app-i18n/uchardet/uchardet-0.0.7.ebuild +++ b/app-i18n/uchardet/uchardet-0.0.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/uchardet/" LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="cpu_flags_x86_sse2 static-libs test" RESTRICT="!test? ( test )" diff --git a/app-i18n/uim-tomoe-gtk/metadata.xml b/app-i18n/uim-tomoe-gtk/metadata.xml index f01b1e07af44..82a1115e613a 100644 --- a/app-i18n/uim-tomoe-gtk/metadata.xml +++ b/app-i18n/uim-tomoe-gtk/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild b/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild index ff99b8ad6a2a..a944df114c2a 100644 --- a/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild +++ b/app-i18n/uim-tomoe-gtk/uim-tomoe-gtk-0.6.0.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" inherit autotools DESCRIPTION="Japanese input method Tomoe IMEngine for uim" HOMEPAGE="http://tomoe.sourceforge.net/" -SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/tomoe/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" @@ -16,8 +16,8 @@ IUSE="" RDEPEND="app-i18n/uim ~app-i18n/tomoe-gtk-0.6.0" -DEPEND="${RDEPEND} - virtual/pkgconfig" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest index 593def9c836a..19043db7b68a 100644 --- a/app-i18n/uim/Manifest +++ b/app-i18n/uim/Manifest @@ -1 +1 @@ -DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3 +DIST uim-1.8.9.tar.bz2 6233465 BLAKE2B 5fc57ffd43557cc685ca766d13e871a7b3ad3829fe3b3fcaa3ab76cba15350e82747952bcc77eda0093df0681ad5d3580cb30c96e2a707f0f3e2687a5bf96e19 SHA512 342bda32f27b9875bf1458adbfb3d3cdd92d98daf8068647e3cb01f9757fda6befbb44a7b9ba2b25b03e14b1de68c7e2d6b57362e84d6aae8bcff3959aaa12df diff --git a/app-i18n/uim/files/uim-1.8.8-fno-common.patch b/app-i18n/uim/files/uim-1.8.8-fno-common.patch deleted file mode 100644 index ff974bb5d5b2..000000000000 --- a/app-i18n/uim/files/uim-1.8.8-fno-common.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/sigscheme/libgcroots/include/private/gc_priv.h -+++ b/sigscheme/libgcroots/include/private/gc_priv.h -@@ -1979,7 +1979,7 @@ - /* the signal mask. */ - # define SETJMP(env) sigsetjmp(env, 1) - # define LONGJMP(env, val) siglongjmp(env, val) --# define JMP_BUF sigjmp_buf -+# define JMP_BUF extern sigjmp_buf - #else - # ifdef ECOS - # define SETJMP(env) hal_setjmp(env) diff --git a/app-i18n/uim/files/uim-Wconversion.patch b/app-i18n/uim/files/uim-Wconversion.patch new file mode 100644 index 000000000000..d90433b414bf --- /dev/null +++ b/app-i18n/uim/files/uim-Wconversion.patch @@ -0,0 +1,13 @@ +--- a/qt4/common.pro.in ++++ b/qt4/common.pro.in +@@ -20,10 +20,6 @@ + QMAKE_CXX = @CXX@ + QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@ @CPPFLAGS@ @X_CFLAGS@ + QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@ @CPPFLAGS@ @X_CFLAGS@ +-# Remove "-Wconversion" from CXXFLAGS to avoid lots of warnings +-# from Qt4 header files +-QMAKE_CXXFLAGS_DEBUG = $$replace(QMAKE_CXXFLAGS_DEBUG, "-Wconversion", "") +-QMAKE_CXXFLAGS_RELEASE = $$replace(QMAKE_CXXFLAGS_RELEASE, "-Wconversion", "") + QMAKE_LINK = @CXX@ + QMAKE_LFLAGS = @LDFLAGS@ + QMAKE_STRIP = diff --git a/app-i18n/uim/files/uim-clang-16.patch b/app-i18n/uim/files/uim-clang-16.patch new file mode 100644 index 000000000000..b8b32532881a --- /dev/null +++ b/app-i18n/uim/files/uim-clang-16.patch @@ -0,0 +1,44 @@ +Part of this went upstream as https://github.com/uim/uim/commit/99fd890fa601b81ff99e5e0f1977fe309f56b90e. + +The rest was done in https://github.com/uim/uim/pull/198. +--- a/configure.ac ++++ b/configure.ac +@@ -601,6 +601,7 @@ if test "x$ac_cv_func_snprintf" = xyes; then + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ + #include <stdio.h> ++#include <stdlib.h> + int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');} + ]])], + [AC_MSG_RESULT(yes)], +--- a/m4/openssl.m4 ++++ b/m4/openssl.m4 +@@ -76,6 +76,7 @@ AC_MSG_CHECKING([OpenSSL header version]) + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <openssl/opensslv.h> + #define DATA "conftest.sslincver" +@@ -156,7 +157,9 @@ AC_ARG_WITH(openssl-header-check, + AC_MSG_CHECKING([whether OpenSSL's headers match the library]) + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ ++#include <stdlib.h> + #include <string.h> ++#include <openssl/crypto.h> + #include <openssl/opensslv.h> + int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); } + ]])], +@@ -220,8 +223,8 @@ int main(void) { DTLSv1_method(); } + AC_MSG_CHECKING([if programs using OpenSSL functions will link]) + AC_LINK_IFELSE( + [AC_LANG_SOURCE([[ +-#include <openssl/evp.h> +-int main(void) { SSLeay_add_all_algorithms(); } ++#include <openssl/crypto.h> ++int main(void) { OpenSSL_version_num(); } + ]])], + [ + AC_MSG_RESULT(yes) diff --git a/app-i18n/uim/files/uim-gentoo.patch b/app-i18n/uim/files/uim-gentoo.patch index de498b754d86..649288932259 100644 --- a/app-i18n/uim/files/uim-gentoo.patch +++ b/app-i18n/uim/files/uim-gentoo.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -38,6 +38,7 @@ +@@ -56,6 +56,7 @@ AC_PATH_PROGS(SED, sed gsed) AX_PATH_QMAKE4 AX_PATH_QMAKE5 @@ -8,7 +8,19 @@ AM_MAINTAINER_MODE -@@ -1618,7 +1619,7 @@ +@@ -575,6 +576,11 @@ + AC_CHECK_FUNCS([waitpid]) + AC_CHECK_FUNCS([daemon]) + ++AC_CHECK_DECL([va_copy], ++ [AC_DEFINE(HAVE_VA_COPY, 1, [Define to 1 if you have the `va_copy' macro.])], ++ [AC_CHECK_DECL([__va_copy], ++ [AC_DEFINE(HAVE___VA_COPY, 1, [Define to 1 if you have the `__va_copy' macro.])])]) ++ + # IRIX has a const char return value for gai_strerror() + AC_CHECK_FUNCS(gai_strerror,[ + AC_DEFINE(HAVE_GAI_STRERROR) +@@ -1637,7 +1643,7 @@ fi AX_LANG_WNOERROR # end AC_LANG_WERROR @@ -17,7 +29,7 @@ else CFLAGS="$CFLAGS -DNDEBUG" CXXFLAGS="$CXXFLAGS -DNDEBUG" -@@ -1629,7 +1630,7 @@ +@@ -1648,7 +1654,7 @@ AX_CFLAGS_GCC_OPTION([-Wno-unused-function], [UIM_SCM_CFLAGS]) AX_LANG_WNOERROR # end AC_LANG_WERROR @@ -26,3 +38,13 @@ fi AC_ARG_ENABLE(warnings-into-error, +--- a/sigscheme/src/Makefile.am ++++ b/sigscheme/src/Makefile.am +@@ -51,7 +51,6 @@ + functable-srfi60.c + + if MAINTAINER_MODE +-$(FUNC_TABLES): $(top_builddir)/config.status + # Core + SSCM_CORE_SRCS = \ + $(srcdir)/error.c \ diff --git a/app-i18n/uim/files/uim-kde.patch b/app-i18n/uim/files/uim-kde.patch new file mode 100644 index 000000000000..dfac6b556435 --- /dev/null +++ b/app-i18n/uim/files/uim-kde.patch @@ -0,0 +1,80 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1449,6 +1449,28 @@ + + AM_CONDITIONAL(KDE4_APPLET, test "x$enable_kde4_applet" = xyes) + ++dnl **************************** ++dnl *** test for KDE5 applet *** ++dnl **************************** ++AC_ARG_ENABLE(kde5-applet, ++ AC_HELP_STRING([--disable-kde5-applet], ++ [do not build uim KDE Plasma 5 widget]), ++ [], ++ [enable_kde5_applet=yes]) ++ ++if test "x$enable_kde5_applet" != xno; then ++ if test "x$with_qt5" != xyes; then ++ enable_kde5_applet=no ++ fi ++fi ++ ++if test "x$enable_kde5_applet" = xyes && test "x$CMAKE" = xno; then ++ AC_MSG_WARN([no CMake found]) ++ enable_kde5_applet=no ++fi ++ ++AM_CONDITIONAL(KDE5_APPLET, test "x$enable_kde5_applet" = xyes) ++ + AC_ARG_ENABLE(pref, + AC_HELP_STRING([--disable-pref], + [do not build graphical utility to edit user settings]), +@@ -1883,7 +1905,6 @@ + cmake_option="-DCMAKE_BUILD_TYPE=${cmake_build_type}" + cmake_option="${cmake_option} -DCMAKE_INSTALL_PREFIX=${prefix}" + cmake_option="${cmake_option} -DCMAKE_SKIP_RPATH=true" +- cmake_option="${cmake_option} -DKDE4_USE_ALWAYS_FULL_RPATH=false" + fi + + if test "x$with_qt4" = xyes; then +@@ -1948,12 +1969,15 @@ + qt5_immodule_option="DEFINES+=QT5_IMMODULE" + fi + set -e +- # FIXME: move CMAKE_CXX_FLAGS into cmake_option +- ${CMAKE} \ +- -B ${ac_abs_top_builddir}/qt5/applet.cmake \ +- -S ${ac_abs_top_srcdir}/qt5/applet \ +- -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \ +- ${cmake_option} ++ # Generate a Makefile for KDE5 applet by cmake ++ if test "x$enable_kde5_applet" = xyes; then ++ # FIXME: move CMAKE_CXX_FLAGS into cmake_option ++ ${CMAKE} \ ++ -B ${ac_abs_top_builddir}/qt5/applet.cmake \ ++ -S ${ac_abs_top_srcdir}/qt5/applet \ ++ -DCMAKE_CXX_FLAGS="${CXXFLAGS} ${X_CFLAGS}" \ ++ ${cmake_option} ++ fi + ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/candwin/Makefile.qmake \ + ${ac_abs_top_builddir}/qt5/candwin/uim-candwin-qt5.pro + ${QMAKE5} -o ${ac_abs_top_builddir}/qt5/chardict/Makefile.qmake \ +@@ -2007,6 +2031,7 @@ + Qt5 immodule : ${with_qt5_immodule} + KDE3 Applet : ${enable_kde_applet} + KDE4 Applet : ${enable_kde4_applet} ++ KDE5 Applet : ${enable_kde5_applet} + FEP : ${enable_fep} + Emacs : ${enable_emacs} + XIM : ${use_xim} +--- a/qt5/applet/Makefile.am ++++ b/qt5/applet/Makefile.am +@@ -6,6 +6,8 @@ + plasmoid + + if QT5 ++if KDE5_APPLET + all clean install uninstall: + $(MAKE) $(AM_MAKEFLAGS) -C ../applet.cmake $@ + endif ++endif diff --git a/app-i18n/uim/files/uim-slibtool.patch b/app-i18n/uim/files/uim-slibtool.patch new file mode 100644 index 000000000000..2efec471c2cc --- /dev/null +++ b/app-i18n/uim/files/uim-slibtool.patch @@ -0,0 +1,14 @@ +--- a/qt4/common.pro.in ++++ b/qt4/common.pro.in +@@ -4,8 +4,9 @@ + @abs_top_srcdir@ @abs_top_srcdir@/uim \ + @abs_top_srcdir@/replace + QMAKE_LIBDIR += @abs_top_builddir@/uim @abs_top_builddir@/replace \ +- @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs +-LIBS += -lreplace -luim -luim-scm ++ @abs_top_builddir@/replace/.libs @abs_top_builddir@/uim/.libs \ ++ @abs_top_builddir@/sigscheme/libgcroots/.libs ++LIBS += -lreplace -luim -luim-scm -lgcroots + !win32:!embedded:!mac { + LIBS += -luim-x-util + } diff --git a/app-i18n/uim/files/uim-zh-TW.patch b/app-i18n/uim/files/uim-zh-TW.patch index f73850013178..dce86724a27a 100644 --- a/app-i18n/uim/files/uim-zh-TW.patch +++ b/app-i18n/uim/files/uim-zh-TW.patch @@ -1,11 +1,11 @@ ---- a/xim/convdisp.cpp -+++ b/xim/convdisp.cpp -@@ -69,7 +69,7 @@ - #endif - - const char *fontset_zhCN = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -isas-fangsong ti-medium-r-normal--16-160-72-72-c-160-gb2312.1980-0"; --const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0"; -+const char *fontset_zhTW = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0"; - const char *fontset_ja = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -jis-fixed-medium-r-normal--16-*-75-75-c-160-jisx0208.1983-0, -sony-fixed-medium-r-normal--16-*-*-*-c-80-jisx0201.1976-0"; - const char *fontset_ko = "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1, -daewoo-gothic-medium-r-normal--16-120-100-100-c-160-ksc5601.1987-0"; - +--- a/scm/im-custom.scm ++++ b/scm/im-custom.scm +@@ -679,7 +679,7 @@ + (define-custom 'uim-xim-fontset-zh-tw + (string-join '( + "-sony-fixed-medium-r-normal--16-*-*-*-c-80-iso8859-1" +- "-taipei-fixed-medium-r-normal--16-150-75-75-c-160-big5-0" ++ "-eten-fixed-medium-r-normal--16-150-75-75-c-160-big5.eten-0" + ) ",") + '(xim xim-preedit) + '(string ".*") diff --git a/app-i18n/uim/metadata.xml b/app-i18n/uim/metadata.xml index 5954a1c59d13..a493ebd2e592 100644 --- a/app-i18n/uim/metadata.xml +++ b/app-i18n/uim/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/uim/uim-1.8.8-r1.ebuild b/app-i18n/uim/uim-1.8.9-r1.ebuild index 1c032e933dce..ff48ee2259e3 100644 --- a/app-i18n/uim/uim-1.8.8-r1.ebuild +++ b/app-i18n/uim/uim-1.8.9-r1.ebuild @@ -1,25 +1,35 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI="8" inherit autotools elisp-common flag-o-matic gnome2-utils qmake-utils +EGIT_COMMIT="d1ac9d9315ff8c57c713b502544fef9b3a83b3e5" + DESCRIPTION="A multilingual input method framework" HOMEPAGE="https://github.com/uim/uim" SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2" LICENSE="BSD GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86" -IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft" +KEYWORDS="amd64 ~arm ~hppa ppc ppc64 ~riscv x86" +IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 kde l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft" RESTRICT="test" REQUIRED_USE="gtk? ( X ) gtk2? ( X ) qt5? ( X ) xft? ( X )" -COMMON_DEPEND=" +CDEPEND="X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXft + x11-libs/libXrender + x11-libs/libXt + ) anthy? ( app-i18n/anthy ) curl? ( net-misc/curl ) eb? ( dev-libs/eb ) @@ -27,32 +37,23 @@ COMMON_DEPEND=" expat? ( dev-libs/expat ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) + kde? ( kde-plasma/libplasma:5 ) libedit? ( dev-libs/libedit ) libffi? ( dev-libs/libffi:= ) libnotify? ( x11-libs/libnotify ) m17n-lib? ( dev-libs/m17n-lib ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) - qt5? ( dev-qt/qtx11extras:5 ) + qt5? ( + dev-qt/qtx11extras:5 + dev-qt/qtwidgets:5 + ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) - ssl? ( - dev-libs/openssl:0= - ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXft - x11-libs/libXrender - x11-libs/libXt - ) -" -DEPEND="${COMMON_DEPEND} - X? ( x11-base/xorg-proto ) -" -RDEPEND="${COMMON_DEPEND} + ssl? ( dev-libs/openssl:0= )" +DEPEND="${CDEPEND} + X? ( x11-base/xorg-proto )" +RDEPEND="${CDEPEND} !dev-scheme/sigscheme X? ( media-fonts/font-sony-misc @@ -75,35 +76,39 @@ RDEPEND="${COMMON_DEPEND} ) ) l10n_zh-TW? ( media-fonts/intlfonts ) - ) -" -BDEPEND=" - dev-util/intltool + )" +BDEPEND="gnome-base/librsvg sys-devel/gettext virtual/pkgconfig -" + kde? ( dev-build/cmake ) + nls? ( dev-util/intltool )" PATCHES=( + "${FILESDIR}"/${PN}-clang-16.patch "${FILESDIR}"/${PN}-gentoo.patch + "${FILESDIR}"/${PN}-kde.patch + "${FILESDIR}"/${PN}-slibtool.patch "${FILESDIR}"/${PN}-tinfo.patch + "${FILESDIR}"/${PN}-Wconversion.patch "${FILESDIR}"/${PN}-xkb.patch "${FILESDIR}"/${PN}-zh-TW.patch - "${FILESDIR}"/${P}-fno-common.patch ) DOCS=( AUTHORS NEWS README RELNOTE doc ) -AT_NO_RECURSIVE="yes" SITEFILE="50${PN}-gentoo.el" src_prepare() { default sed -i "s:\$libedit_path/lib:/$(get_libdir):g" configure.ac - # fix build with >=dev-scheme/chicken-4, bug #656852 - touch scm/json-parser-expanded.scm + use nls || sed -i "/^if .*USE_NLS/,/^fi/d" configure.ac # fix build with "-march=pentium4 -O2", bug #661806 use x86 && append-cflags $(test-flags-CC -fno-inline-small-functions) + # Fix build w/ Clang 16+ and >= openssl 1.1.x, tries to use + # SSLv2_method otherwise. + append-cppflags -DOPENSSL_NO_SSL2 + eautoreconf } @@ -116,6 +121,7 @@ src_configure() { $(use_enable emacs) $(use_with emacs lispdir "${SITELISP}") $(use_with expat) + $(use_enable kde kde5-applet) $(use_with libedit) $(use_with libffi ffi) $(use_with gtk gtk3) @@ -139,6 +145,7 @@ src_configure() { --disable-kde-applet --disable-kde4-applet --without-mana + --enable-maintainer-mode --without-prime --disable-qt4-qt3support ) @@ -166,8 +173,9 @@ src_compile() { default if use emacs; then - cd emacs + cd emacs || die elisp-compile *.el || die + cd - >/dev/null || die fi } diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest index 3a2c90d3091e..37540f6f35b3 100644 --- a/app-i18n/unicode-cldr/Manifest +++ b/app-i18n/unicode-cldr/Manifest @@ -1,3 +1,2 @@ -DIST unicode-cldr-common-33.0.zip 20401984 BLAKE2B 1318f8c73678f4ed2ff6a2d947171515d52825c2395e77c8149fb6a5646110876dd8e1bc30a3b918cb25c4bf106b42fe2a372a9938ff0dbf106cf0d7dc33d75a SHA512 f2f9fa5242702fd8044c9b239e175b7ead41e36da39c9e67e70b4fde7ed5d28115141ea457cda4f645b10a2d29734b35590bd0f012296bdf4986a920b87532dd -DIST unicode-cldr-common-35.1.zip 22368309 BLAKE2B 3d00bafccca8d0b8821083fdf94440adca6f8931951de33f5914308bccddaf5c3b642d59c2b7d04588995c9a284852677ae3ab2feeb9fe531e7479d08f4ee7be SHA512 e06594da3d6dc376457e507fe234281fcb04d08daabfdaed60afb3aa59f88cdc0a7c27974c52ebd432746fcc7664948f9d6e6fde5874ad85c6c73a6441425465 -DIST unicode-cldr-common-37.0.zip 25983328 BLAKE2B 6210d9f71cb57bc8e663eb51b2af552e30debdfeae206c2368e3ddafad723d1077cb0a2b2defb75170ef056f2d81d510e62761cbec2ed2071071e3859e7dd098 SHA512 b42e2c889b78d2ed774e2fb9f67cf3f9154aca57c5a966ea740fb7852c8c59e142f89764491f569c62d58f288e55176c8517674e2aefd2e9b8598eee3ba4307d +DIST unicode-cldr-common-44.0.zip 31750682 BLAKE2B a6f708d6c5bd02efc1e0672250b181542fb0f91d48bbaabddfc3b6b9e21201e3c9e6d09222cbc929b4ae654d2a0804a90f77f384df93577af188a907ce20bd61 SHA512 f2cd8733948caf308d6e39eae21724da7f29f528f8969d456514e1e84ecd5f1e6936d0460414a968888bb1b597bc1ee723950ea47df5cba21a02bb14f96d18b6 +DIST unicode-cldr-common-45.0.zip 31812363 BLAKE2B 031d08f2db4a6c75585488faf43196a912e348edc9ff582e9c507c8f1c8ae2cf7c86aaa8265a8fa60540c2b3f4844d0aa01dad516344195bd4d40926d65a48fc SHA512 638123882bd29911fc9492ec152926572fec48eb6c1f5dd706aee3e59cad8be4963a334bb7a09a645dbedc3356f60ef7ac2ef7ab4ccf2c8926b547782175603c diff --git a/app-i18n/unicode-cldr/metadata.xml b/app-i18n/unicode-cldr/metadata.xml index e1a49f498885..a34fdeebcd32 100644 --- a/app-i18n/unicode-cldr/metadata.xml +++ b/app-i18n/unicode-cldr/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <stabilize-allarches/> </pkgmetadata> diff --git a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild deleted file mode 100644 index b85c8b99db19..000000000000 --- a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="Unicode Common Locale Data Repository" -HOMEPAGE="http://cldr.unicode.org/" -if [[ "${PV}" =~ ^[[:digit:]]+\.0$ ]]; then - SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip" -else - SRC_URI="https://unicode.org/Public/${PN#*-}/${PV}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip" -fi - -LICENSE="unicode" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" -IUSE="" - -DEPEND="app-arch/unzip" -RDEPEND="" - -S="${WORKDIR}" - -src_install() { - insinto /usr/share/unicode/cldr - doins -r common -} diff --git a/app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild b/app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild deleted file mode 100644 index cb5a1743d529..000000000000 --- a/app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="Unicode Common Locale Data Repository" -HOMEPAGE="http://cldr.unicode.org/" -if [[ "${PV}" =~ ^[[:digit:]]+\.0$ ]]; then - SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip" -else - SRC_URI="https://unicode.org/Public/${PN#*-}/${PV}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip" -fi - -LICENSE="unicode" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -DEPEND="app-arch/unzip" -RDEPEND="" - -S="${WORKDIR}" - -src_install() { - insinto /usr/share/unicode/cldr - doins -r common -} diff --git a/app-i18n/unicode-cldr/unicode-cldr-37.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-44.0.ebuild index faf48dd3eca0..55353dbcabc0 100644 --- a/app-i18n/unicode-cldr/unicode-cldr-37.0.ebuild +++ b/app-i18n/unicode-cldr/unicode-cldr-44.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" DESCRIPTION="Unicode Common Locale Data Repository" HOMEPAGE="https://cldr.unicode.org/" @@ -9,11 +9,11 @@ SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip LICENSE="unicode" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="" -DEPEND="app-arch/unzip" RDEPEND="" +BDEPEND="app-arch/unzip" S="${WORKDIR}" src_install() { diff --git a/app-i18n/unicode-cldr/unicode-cldr-45.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-45.0.ebuild new file mode 100644 index 000000000000..d1884ffabc13 --- /dev/null +++ b/app-i18n/unicode-cldr/unicode-cldr-45.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +DESCRIPTION="Unicode Common Locale Data Repository" +HOMEPAGE="https://cldr.unicode.org/" +SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip" + +LICENSE="unicode" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="" + +RDEPEND="" +BDEPEND="app-arch/unzip" +S="${WORKDIR}" + +src_install() { + insinto /usr/share/${PN/-//} + doins -r common +} diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest index 229e95b1c6c3..63a2bf750d5e 100644 --- a/app-i18n/unicode-data/Manifest +++ b/app-i18n/unicode-data/Manifest @@ -1,6 +1,4 @@ -DIST unicode-data-12.0.0-UCD.zip 8410561 BLAKE2B 10d34faaad501ddaba6de73a126b8dc5acc2941f81050ec4ff432f9a6aeabe1e13004e0ee190d37751517e3c2ea07c879d3bf2e39b8430d473f93f7fe05b08a8 SHA512 f9d845170df7e4952f90c6c75b256c2d330e174b95534fd6e8076bc6ad827a007b5e2b49562d29a4f7e6a529a41bb59330fb2acf94993f983049114d7b294a33 -DIST unicode-data-12.0.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa8ae791fdc8dbf728d3fba7a7004edcfbfa655424371cd4c9e667e1f1d6a5623b0ac1d320f0709c232b58b02494a728c7d2dd SHA512 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375 -DIST unicode-data-12.1.0-UCD.zip 8410738 BLAKE2B b635b449a04f3ffed8ec7311064cf2093cec5e7ebf8ec9a52b753a1c9a3f50374bdfe41a4e3e61bceefb69a847474b086b24a43f7f02de7183474737086f869f SHA512 68512627ecb75520b354160216cc14622c0d5321356f03429a102f734bddf6859c4ab266ed15db177dcbffd76c97d13d90de9a4fc38b10082a0e58fe3c82cda4 -DIST unicode-data-12.1.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa8ae791fdc8dbf728d3fba7a7004edcfbfa655424371cd4c9e667e1f1d6a5623b0ac1d320f0709c232b58b02494a728c7d2dd SHA512 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375 -DIST unicode-data-13.0.0-UCD.zip 7537310 BLAKE2B 5bcc8f010f81fea22cd0b5806ee190bbe9e58348c5cc3627141de3b1df5a00cbdcd800ebd0eb3bc0499b2c26920f6cadf42804b539e5be0aeeeb9eaee334a817 SHA512 aed6d06c370dd87bc5713e19ff4cde47b065b76a18149194fa843e4efc5269f749ec8905cad9132d3b803ab621a46e372052b8f3c3e9b6a65afa6516b0f2b4f2 -DIST unicode-data-13.0.0-Unihan.zip 7044963 BLAKE2B fffcd322c87c607e9e689bfef4ec79b4ec576b4ffd84465ed6d38f485ac4fccc7d0f46662f76dbb79630e070b12bf9e1530bbbd5b32c043b71f696018e1f3ad2 SHA512 87238202b5da069ab1bbc4672d86c6fd0711e354fb17f53b0b4152850c56c0fa09e6e45820ae52d49756b25fe696518ceaa34cbfe5366ff60688c9a5c3a2d5be +DIST unicode-data-15.0.0-UCD.zip 7059105 BLAKE2B 5615eeb9a73f9bd36986bd0d8fdc3c22d8b33d6ba36bb79f1d78ead2f4193fd926f1dd939c9c53047efdbd9346937f66e8c7cbf538ea4fe6a4bd5bdc02aa5528 SHA512 442a99694fccf0d1ff6f6236bec2cff7408eef4d9dba575ba4f5dc45cebf4d2b1b30334ef8a843887a0f410b24e0f79f7f30f06a195659def998875981604a6a +DIST unicode-data-15.0.0-Unihan.zip 7293545 BLAKE2B 46d8b13ac6970a27d70262d45c703496dd99bff4ac7eefed2003f3f7d02b070461211eb03400f0fe0decfb65a3dccd0973c8da286f9f6fc84681dd263ea366b6 SHA512 d9cf39adebe83ed0fd8d473cf057b8aa8b2362019d9f7ee7afc041501b1bbbe4d13050350ac40ce4a020cd1d64d52548fe262c3b2893934a032e1de8075e964c +DIST unicode-data-15.1.0-UCD.zip 8248819 BLAKE2B 6280ee4c7044bf72cfc1f04c02c06bda1052c4909b2209d41a0ddef3e1eca7d639afa293d1536d1af1ef118311327ec4ec52cdefe8eac081bc84738972993a0e SHA512 6285b78d5765092d04632f2bdf23f43fe4c3d8acc28700ff941b5a647bf86aba348ea280cee54f5761e534070439cd5628cb25cb7cd9d7dca08e05000f434f54 +DIST unicode-data-15.1.0-Unihan.zip 7999959 BLAKE2B a92e3fa3dfb765b94641596b67779385edf519b788192a2798b27107fc6860cedc00d445066dad67746b7cd04a7fd2ed5a0f2b65a864d52f043750ad37cd318d SHA512 fc1a32fc68b3e1d2d358fca91c2cd6c1103557405e91ff558585f18a2e9b1ee6f8af89e7ee922ff36cade67a5cf4f5b4042ba97d350af7b92b18f161eef5ec78 diff --git a/app-i18n/unicode-data/metadata.xml b/app-i18n/unicode-data/metadata.xml index 6d1ac9db2d8b..477954d6064f 100644 --- a/app-i18n/unicode-data/metadata.xml +++ b/app-i18n/unicode-data/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>fonts@gentoo.org</email> diff --git a/app-i18n/unicode-data/unicode-data-12.1.0.ebuild b/app-i18n/unicode-data/unicode-data-12.1.0.ebuild deleted file mode 100644 index d5f7f27ee193..000000000000 --- a/app-i18n/unicode-data/unicode-data-12.1.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Unicode data from unicode.org" -HOMEPAGE="https://www.unicode.org/ucd/" -SRC_URI="https://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip - https://www.unicode.org/Public/zipped/${PV}/Unihan.zip -> ${P}-Unihan.zip" - -LICENSE="unicode" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" - -BDEPEND="app-arch/unzip" - -S="${WORKDIR}" - -src_unpack() { - # Unihan.zip needs to be installed as a zip for reverse deps - # https://bugzilla.gnome.org/show_bug.cgi?id=768210 - unpack ${P}-UCD.zip -} - -src_install() { - insinto /usr/share/${PN} - doins -r "${S}"/* - newins "${DISTDIR}"/${P}-Unihan.zip Unihan.zip -} diff --git a/app-i18n/unicode-data/unicode-data-13.0.0.ebuild b/app-i18n/unicode-data/unicode-data-15.0.0.ebuild index 51dd6ec58bcb..ab72b57ae6b9 100644 --- a/app-i18n/unicode-data/unicode-data-13.0.0.ebuild +++ b/app-i18n/unicode-data/unicode-data-15.0.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 DESCRIPTION="Unicode data from unicode.org" HOMEPAGE="https://unicode.org/ucd/" @@ -10,11 +10,9 @@ SRC_URI="https://unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip LICENSE="unicode" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" DEPEND="app-arch/unzip" -RDEPEND="" S="${WORKDIR}" src_unpack() { diff --git a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild b/app-i18n/unicode-data/unicode-data-15.1.0.ebuild index 90545a676bfe..e5fcb101d0df 100644 --- a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild +++ b/app-i18n/unicode-data/unicode-data-15.1.0.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Unicode data from unicode.org" -HOMEPAGE="http://www.unicode.org/ucd/" -SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip - http://www.unicode.org/Public/zipped/${PV}/Unihan.zip -> ${P}-Unihan.zip" +HOMEPAGE="https://unicode.org/ucd/" +SRC_URI="https://unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip + https://unicode.org/Public/zipped/${PV}/Unihan.zip -> ${P}-Unihan.zip" LICENSE="unicode" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" - -BDEPEND="app-arch/unzip" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" +DEPEND="app-arch/unzip" S="${WORKDIR}" src_unpack() { diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest index 8efe0be0f679..fea1dd0ff203 100644 --- a/app-i18n/unicode-emoji/Manifest +++ b/app-i18n/unicode-emoji/Manifest @@ -1,15 +1,5 @@ -DIST unicode-emoji-data-11.0.txt 59720 BLAKE2B f1416d01d384245769549cc6ea93a2fe28bbfe77d30b26c9042965e3f9aee546572ef593284f767017b3a76acbc8015987c924be3afcc06df60b31588962a455 SHA512 501847414275564c7753b7d2b8e45cdfbf9fe96a96f0f3eea81f34c480da551b317b432ca426f6441c95eea520992e8888ead749e9c60da38233afd159d9b555 -DIST unicode-emoji-data-12.0.txt 63812 BLAKE2B 7e21860d73372aeebf487c2c4ddebe76585fef30670bdb4d27cd4d1f62ce863009524f1c4eaef62be693b127fb08b20585b2b1ca059bf993412b0f7d1530d061 SHA512 3e60e8a63abb40332a7ace61d1790b29e00251edca92afe52075627fb210a1097eea6033b727b458b6a5c7935018706ae71a2c1ec439bea3ccb8501c47c4abb5 -DIST unicode-emoji-data-13.0.txt 105959 BLAKE2B 6cfbc3170f8ef990ece1f1ae9e923ac4a753dc2c2d949e5bc82c2afb0bb12a90eb4e2dcd505666b8cadc91c42f6ca9c6bec3293fecafdacf911a885b0cc42468 SHA512 7b6f838a5b863b070cdf4289a8b7a2e6f07e5af8c6614aa58b4179658f7d73161615c3c4757464585d1e9d73d307e0a60fd6621900aa9e88365d8c03729780d0 -DIST unicode-emoji-sequences-11.0.txt 105983 BLAKE2B 5b929faa3cfdbcfa11fa72f77386d3a7aee2dddc5ceb3d110d275a3ed523ddadc7be71b3fb857901d880970d5ab48dfc4b024d7e379b5efb0992e7424bfde80a SHA512 c9af23e0738350b6d61691498ac82cccec970bb2cd4a0c5d6fab6c86fef742c09c6a83f50124c1f98c285e706d145786bb29cbf4339ff1a01c75ad7515b159a6 -DIST unicode-emoji-sequences-12.0.txt 155539 BLAKE2B 701e283fcfda3582a7ec1e0922a8fa584c2e77bb7d59aaa826324d2163972b59b004107c778dc41880c7768f9c884f64d6e41639696c91052d8c81e5fb409f22 SHA512 7ddadff1259c08d503b5936aecac9ad51e9cb2b0ed84c70fdaf0df370b2edd5e24ebed99d5df7325becf269e9f2d931d1bbbabe5d95c1b9af08111bf37bd29b3 -DIST unicode-emoji-sequences-13.0.txt 178671 BLAKE2B e391c53f8737fe7e9d8b002e61471afd903859ed9c5ca8035b04fa1c31d3f199b443e39ba7996604c606c5c46f2d9ff521d40af85e0b7c493bfcc784e2e61af3 SHA512 65f4fdaf6f2038d34f645220a0306036244dba69aeba0a44939584c18ad8e0488cb612f07e17cdb1ffea3d8d2fe3e54ed2e134855c3dc615730fd14cd297a9a3 -DIST unicode-emoji-test-11.0.txt 361356 BLAKE2B 0e3b035fff3a4e542b3dd1172cf1438648a273ec0490316f843009b725c04764180a3ce0581b3e9819a0a5724c95ae5b536065e80401510d0b8e174636544184 SHA512 89c5a0f2eb460234e50dcc0fc904fbb254a1c0afa54b5bb672032f01764e0bed3624d1a4cd5627c83fcf1ea1347c9e3baaca05b2c685890afa505763baf8be79 -DIST unicode-emoji-test-12.0.txt 394898 BLAKE2B bdb5d32b657edfac1693fc8748653f2cbd513dc5b5cd558d24c2667bb5e7efa1c3bbf25c042bff509722acf448fb633baea24ddaac8c0144e0b368a394ea6b18 SHA512 b02c7977961f1b9a8c52322ba6b8d27afb84a2d131887add18352460dc6eb2488afd7bb9dac2e3f62b88604b69d02e4289bbaad551463d8b4b0589fbc16b64b9 -DIST unicode-emoji-test-13.0.txt 453143 BLAKE2B 3effaedbd7f37c0bc1d3aa122b0240c4dbf981b05bed83b6bb6523a1680900c64ff27edd1dc14d14d072a8631176f5fab5ed0166bbead6944d5b89e9729d6c75 SHA512 6da82936f1eb92e5d31a4e815204e17119011408d746c60c3ecd700c8039389d7c790c8ea6b8ec2828aadd863b923f0d3861a42a1f6b5ecdbbb19d2f5f81ea56 -DIST unicode-emoji-variation-sequences-11.0.txt 36333 BLAKE2B c32b674969a102d24645d33fb000c31997c26c1e6de956fc82ae41c2fd43b244f3757e8ab217cbb03434defca16373fd33affa25c6df0b7b9393f0ab191ec65f SHA512 a0a487ef43d9cd49ff2ced654794e7190f357b00dd70ec9b84e640181dc5b2df44b2063aa4b16447d00815094155b24531f115e9121c51c95635b0af4b043643 -DIST unicode-emoji-variation-sequences-12.0.txt 36333 BLAKE2B 812dfa33f4c21aee0ac7895339d81ab6fb36c550f72df0dbfc491390082223e3babc55cf6a78b7f2ce1ed5bf739ae5eef8c7fc2afe223c5c1c14491d3d29490b SHA512 aaf6c964db27ba41b0becc6aad87e40ea7b3d7a593d33052a4ad1a67528cdf663a46622c367830b6ac47e3efccf1e52eeb18802b235560b47a7fc485097e1fba -DIST unicode-emoji-variation-sequences-13.0.txt 36485 BLAKE2B 81a7ee549a209aa1cfc0c0c941c9163c35da357541d8a234be26d18df1abbc8db8b62577c6aa15699b0b173497374a4a4fa1f7d23a9d2698f33ba0ea7d3a1b03 SHA512 7edaf7c4df3eb34aa208ae5688a59220d125d3eb262b750493e758584d92ab3dfb3eee23a9e31c50902f4513a5a91e6cee5708bc16d052a568bd7b355573895c -DIST unicode-emoji-zwj-sequences-11.0.txt 126959 BLAKE2B 82d78fd5fd47bb4201001903c0610e3950a2fa1c315fe8494e15977999ba0b8f0d4431eb842db6f01ab765fd181067b07258ddb4c547ddfc01fc0da7680ea540 SHA512 a2a50cd5451d3ba1da0f3b46e18a10d621ead0372599b98dad0fd47fdb271407f72bd72854136c93311b13950cedc2b1594f06d460e551ab120ed30ba8abce4d -DIST unicode-emoji-zwj-sequences-12.0.txt 148234 BLAKE2B d5facf566e48f49f87df30b928b4d60cfeafa11da383aa34cefae0b05a796f3a9c78bbaa79ee8b460eea92c753b7e7d7840849fdc9f7bc57b2752f8b63d2988c SHA512 8d7c59d01d702d10f162476d7f96feea0d515521d1dca6aa819ed4d482a83d54c26ed225fcf864b607999a7016dddc89961b0760584d7ec0b5cbdf8e12b85051 -DIST unicode-emoji-zwj-sequences-13.0.txt 189608 BLAKE2B 759c8c0763ed88a9ebbf40a8ef1046537773cae3043186aded7089ca3052a5c6d6baba3c30f00df57dcab0a83d46323a0c1e8551db63c3329610c641646a388a SHA512 a0b04ca2732acd33c7ea9a2929ef5d60080dfeb4b1b452e853486e57663518773af4e863b239dd2bd6f5e78ce2a7e828898757ca4adc82134da370111c3e0272 +DIST unicode-emoji-data-15.1.txt 111505 BLAKE2B a5b3ccb6a22f4399dee08812a4d8d587cd7020ab83df6dcc9824b74ca690bf0a6ce9b895fba430c1a90d8b1f839d2db85703a86d1664386402af04100b1ad745 SHA512 bd8bde3d6296994ada56d336b0e31802fd1b73175e3d07b719f7629484412d4331d5e3b0585a38e4bfadca1ac26b9d5a1c69a6c6b7dffcf0edfc4edaacadf97e +DIST unicode-emoji-sequences-15.1.txt 191562 BLAKE2B d16d7b923895d4aadba0f69ed07391b2e7df114c2eabca8a00c82c3b7ae97619e81b2c3fcc3658542fd340074fadfd4e1515613cc3233aa0c5ceede3edd34ce8 SHA512 19cf9b366a76d472d35e3e5d2adcb70e962397bce60a65e7685e9b203310dab2b63ee45fae8691c06dc6fedfac4e5c3730f9aadde119e3a7f4560c9ff325fd8a +DIST unicode-emoji-test-15.1.txt 639405 BLAKE2B e338db1b4334f9e1f86eeb357c5187f14667a10f4ea65ea1fc622230cec6d305c1c13e08233931f06f99787af0a6c7b2b5f3d09039642ea99c9b4159d2c51b2b SHA512 1e267845f2cc72aed60455a60e7cb8774433e0a1d0a9be98de6169304047184c8a7d5919117dd085dccfc4a7b507cb8938a3a6e34fd6fd9216fda27f8c126e5e +DIST unicode-emoji-variation-sequences-15.1.txt 38358 BLAKE2B 6d55aa432c701c419def0414a5c656f68fa0fe1dd31aed88c420449a754b5b1a104bfbc604fc4344a7e34f5feb1852b00f103113ca0067195f77cebd32b28858 SHA512 86a4843448e66488fcdcfaa9777f4be7352c679661d90318abf11e498a9d8e263e8e34aab0e49575a5e613be771541c67c28dc8b64351141ee56639106b90a17 +DIST unicode-emoji-zwj-sequences-15.1.txt 251595 BLAKE2B 84a643d46edc4428ff5379431059e386fa45dbf4252abf44bb2429fe295daf3c051e93af6d80465bdf0cb17730b955c05062f795e7f47ceccf6e2ba594bda069 SHA512 b9be3543cb44b8b394be12f06b9d3a27aa7da134cc5060d51681e2759c2aa0ce2604edf9f8782f8d3606e9765f2703b35807a932d36914b24261e59a07fffed1 diff --git a/app-i18n/unicode-emoji/metadata.xml b/app-i18n/unicode-emoji/metadata.xml index e1a49f498885..a34fdeebcd32 100644 --- a/app-i18n/unicode-emoji/metadata.xml +++ b/app-i18n/unicode-emoji/metadata.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <stabilize-allarches/> </pkgmetadata> diff --git a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild deleted file mode 100644 index 8939ac8ffae5..000000000000 --- a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -DESCRIPTION="UTS #51 Unicode Emoji" -HOMEPAGE="https://unicode.org/emoji/" -BASE_URI="https://unicode.org/Public/${PN#*-}/${PV}" -SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt - ${BASE_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt - ${BASE_URI}/${PN#*-}-test.txt -> ${PN}-test-${PV}.txt - ${BASE_URI}/${PN#*-}-variation-sequences.txt -> ${PN}-variation-sequences-${PV}.txt - ${BASE_URI}/${PN#*-}-zwj-sequences.txt -> ${PN}-zwj-sequences-${PV}.txt" - -LICENSE="unicode" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -S="${WORKDIR}" - -src_unpack() { - : -} - -src_install() { - insinto /usr/share/unicode/emoji - local source_file target_file - for source_file in ${A}; do - target_file="${source_file#${PN%-*}-}" - target_file="${target_file%-${PV}.txt}.txt" - newins "${DISTDIR}/${source_file}" "${target_file}" - done -} diff --git a/app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild deleted file mode 100644 index 9460559ffde2..000000000000 --- a/app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -DESCRIPTION="UTS #51 Unicode Emoji" -HOMEPAGE="https://unicode.org/emoji/" -BASE_URI="https://unicode.org/Public/${PN#*-}/${PV}" -SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt - ${BASE_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt - ${BASE_URI}/${PN#*-}-test.txt -> ${PN}-test-${PV}.txt - ${BASE_URI}/${PN#*-}-variation-sequences.txt -> ${PN}-variation-sequences-${PV}.txt - ${BASE_URI}/${PN#*-}-zwj-sequences.txt -> ${PN}-zwj-sequences-${PV}.txt" - -LICENSE="unicode" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="" - -DEPEND="" -RDEPEND="" - -S="${WORKDIR}" - -src_unpack() { - : -} - -src_install() { - insinto /usr/share/unicode/emoji - local source_file target_file - for source_file in ${A}; do - target_file="${source_file#${PN%-*}-}" - target_file="${target_file%-${PV}.txt}.txt" - newins "${DISTDIR}/${source_file}" "${target_file}" - done -} diff --git a/app-i18n/unicode-emoji/unicode-emoji-13.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-15.1.ebuild index 2a2ab980f142..f453ab3700d4 100644 --- a/app-i18n/unicode-emoji/unicode-emoji-13.0.ebuild +++ b/app-i18n/unicode-emoji/unicode-emoji-15.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI="8" DESCRIPTION="UTS #51 Unicode Emoji" HOMEPAGE="https://unicode.org/emoji/techindex.html" @@ -15,10 +15,9 @@ SRC_URI="${DATA_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt LICENSE="unicode" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="" -DEPEND="" RDEPEND="" S="${WORKDIR}" diff --git a/app-i18n/xcin/Manifest b/app-i18n/xcin/Manifest deleted file mode 100644 index 3ac538ec8aca..000000000000 --- a/app-i18n/xcin/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST xcin_2.5.2.99.pre2+cvs20030224-1.4.diff.gz 1321937 BLAKE2B 4213f585d62d37215495354890203272fda0d7068bd6ceb8c0d75a2d1cd8c6626997607ab5b821887248f2e4207733eb3a26d021873893488b8dee83fddd3e52 SHA512 d1c6a667a8dcf996e02d694a0ff73eca409f542ce11b0e4d8563ed04c62e12c1d8feb6307153c5cfe982e66848b414dd65fc23d022ccc54cf2a0e3978b8c33e5 -DIST xcin_2.5.2.99.pre2+cvs20030224.orig.tar.gz 1530591 BLAKE2B 1c68d8bd4f11c458c2fefe974fc5f565a59deee23129f1c53e5714655d5be543e7a97f72eab2dc56aa098b78b53bfa77a4c0fbcb56cb93b936cc8b4ee5435135 SHA512 1068a9cf7f3b7ff3c2ff7e0443e487e660f3ec8c7f0114f1ad614fb1c7a73d15613ce0c198514816f00afaaa22434660ed11d329413bf010aa52b27513a5ac14 diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch deleted file mode 100644 index 3d472f95b0f4..000000000000 --- a/app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/doc/En/internal/module.En xcin-2.5.2.99.pre2+cvs20030224/doc/En/internal/module.En ---- xcin-2.5.2.99.pre2+cvs20030224.orig/doc/En/internal/module.En 2000-12-13 18:55:41.000000000 +0200 -+++ xcin-2.5.2.99.pre2+cvs20030224/doc/En/internal/module.En 2009-12-29 18:09:20.000000000 +0200 -@@ -481,13 +481,13 @@ - char *lc_ctype; /* LC_CTYPE locale category name */ - char *lc_messages; /* LC_MESSAGES locale category name */ - char *encoding; /* encoding name */ -- } locale_t; -+ } xcin_locale_t; - - typedef struct { - char *rcfile; /* rcfile name. */ - char *default_dir; /* Default module directory. */ - char *user_dir; /* User data directory. */ -- locale_t locale; /* Locale name. */ -+ xcin_locale_t locale; /* Locale name. */ - } xcin_rc_t; - - The return value of this function is True when excuting successfully, -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/doc/internal/module xcin-2.5.2.99.pre2+cvs20030224/doc/internal/module ---- xcin-2.5.2.99.pre2+cvs20030224.orig/doc/internal/module 2002-10-29 13:53:42.000000000 +0200 -+++ xcin-2.5.2.99.pre2+cvs20030224/doc/internal/module 2009-12-29 18:09:24.000000000 +0200 -@@ -423,13 +423,13 @@ - char *lc_ctype; /* LC_CTYPE locale category name */ - char *lc_messages; /* LC_MESSAGES locale category name */ - char *encoding; /* encoding name */ -- } locale_t; -+ } xcin_locale_t; - - typedef struct { - char *rcfile; /* rcfile name. */ - char *default_dir; /* Default module directory. */ - char *user_dir; /* User data directory. */ -- locale_t locale; /* Locale name. */ -+ xcin_locale_t locale; /* Locale name. */ - } xcin_rc_t; - - ¥»¨ç¦¡Y¦¨¥\¶Ç¦^ True, ¥¢±Ñ¶Ç¦^ False¡C -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/include/xcintool.h xcin-2.5.2.99.pre2+cvs20030224/src/include/xcintool.h ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/include/xcintool.h 2002-10-29 13:53:42.000000000 +0200 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/include/xcintool.h 2009-12-29 18:09:01.000000000 +0200 -@@ -202,12 +202,12 @@ - char *lc_messages; - char *encoding; - int encid, locid; --} locale_t; -+} xcin_locale_t; - - typedef struct { - int argc; /* Command line arguement list */ - char **argv; -- locale_t locale; /* Locale name. */ -+ xcin_locale_t locale; /* Locale name. */ - char *usrhome; /* User home directory. */ - char *default_dir; /* Default module directory. */ - char *user_dir; /* User data directory. */ -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/cin2tab.c xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/cin2tab.c ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/cin2tab.c 2009-12-29 18:07:44.000000000 +0200 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/cin2tab.c 2009-12-29 18:09:12.000000000 +0200 -@@ -233,7 +233,7 @@ - } - - static void --cin2tab_setlocale(locale_t *locale) -+cin2tab_setlocale(xcin_locale_t *locale) - { - char loc_return[128], enc_return[128]; - int ret; -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/xcin_main.c xcin-2.5.2.99.pre2+cvs20030224/src/xcin_main.c ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/xcin_main.c 2003-01-20 19:50:05.000000000 +0200 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/xcin_main.c 2009-12-29 18:09:06.000000000 +0200 -@@ -56,7 +56,7 @@ - static void - xcin_setlocale(void) - { -- locale_t *locale = &(xcin_core.xcin_rc.locale); -+ xcin_locale_t *locale = &(xcin_core.xcin_rc.locale); - char loc_return[128], enc_return[128]; - - set_perr("xcin"); -@@ -332,7 +332,7 @@ - char *cmd[2], value[256], *s, loc_buf[64], *loc_name=NULL; - char *fmt = N_("%s:\n\tlocale section \"%s\": %s: value not specified.\n"); - xcin_rc_t *xrc = &(xcin_core.xcin_rc); -- locale_t *locale = &(xcin_core.xcin_rc.locale); -+ xcin_locale_t *locale = &(xcin_core.xcin_rc.locale); - /* - * Determine the true locale setting name. - */ -@@ -409,7 +409,7 @@ - char *cmd[2], value[256], *s, *s1, objname[100], objenc[100]; - char *fmt = N_("%s:\n\tIM section \"%s\": %s: %s.\n"); - xcin_rc_t *xrc = &(xcin_core.xcin_rc); -- locale_t *locale = &(xcin_core.xcin_rc.locale); -+ xcin_locale_t *locale = &(xcin_core.xcin_rc.locale); - int setkey; - /* - * Go to each CINPUT sub-node and read important keywords. -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/xim.c xcin-2.5.2.99.pre2+cvs20030224/src/xim.c ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/xim.c 2009-12-29 18:07:44.000000000 +0200 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/xim.c 2009-12-29 18:09:06.000000000 +0200 -@@ -1032,7 +1032,7 @@ - XIMTriggerKeys on_keys; - XIMEncodings encodings; - Window mainwin; -- locale_t *locale; -+ xcin_locale_t *locale; - char* imlocale = NULL; - int i; - diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch deleted file mode 100644 index 374490848980..000000000000 --- a/app-i18n/xcin/files/xcin-2.5.3_pre3-ldflags.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/bimsphone/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/bimsphone/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/bimsphone/Makefile.in 2001-11-11 21:50:46.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/bimsphone/Makefile.in 2011-11-21 01:08:21.736965412 +0900 -@@ -15,7 +15,7 @@ - - $(TARGET): $(OBJ) - $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \ -- $(OBJ) $(LIB) -rpath $(moddir) -+ $(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir) - include .depend - - depend: -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/chewing/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/chewing/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/chewing/Makefile.in 2011-11-21 01:07:12.878761904 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/chewing/Makefile.in 2011-11-21 08:32:24.024474064 +0900 -@@ -21,7 +21,7 @@ - - $(TARGET): $(OBJ) - $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \ -- $(OBJ) $(LIB) -rpath $(moddir) -+ $(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir) - include .depend - - sort_word: sort_word.c key2pho.c -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/gen_inp/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/gen_inp/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/gen_inp/Makefile.in 2001-11-11 21:50:46.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/gen_inp/Makefile.in 2011-11-21 01:08:21.736965412 +0900 -@@ -15,7 +15,7 @@ - - $(TARGET): $(OBJ) - $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \ -- $(OBJ) $(LIB) -rpath $(moddir) -+ $(OBJ) $(LDFLAGS) $(LIB) -rpath $(moddir) - include .depend - - depend: -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/zh_hex/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/zh_hex/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Cinput/zh_hex/Makefile.in 2001-11-11 21:50:47.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/Cinput/zh_hex/Makefile.in 2011-11-21 01:08:21.736965412 +0900 -@@ -14,7 +14,7 @@ - - $(TARGET): $(OBJ) - $(LIBTOOL) --mode=link $(CC) -module -avoid-version -o $(TARGET) \ -- $(OBJ) -rpath $(moddir) -+ $(OBJ) $(LDFLAGS) -rpath $(moddir) - include .depend - - depend: -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/Makefile.in 2001-11-05 01:47:26.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/Makefile.in 2011-11-21 01:08:53.576059606 +0900 -@@ -26,7 +26,7 @@ - - $(BIN): subsys $(OBJ) - @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -export-dynamic \ -- $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LIB) -+ $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LDFLAGS) $(LIB) - include .depend - - subsys: -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/lib/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/lib/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/lib/Makefile.in 2001-09-21 02:00:57.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/lib/Makefile.in 2011-11-21 01:08:21.736965412 +0900 -@@ -23,7 +23,7 @@ - - $(LXCIN_NAME): make_subdir - ( OBJS=`ls $(LXCIN_OBJ)`; \ -- $(LIBTOOL) --mode=link $(CC) -o $@ $$OBJS $(LIB) -rpath $(libdir) \ -+ $(LIBTOOL) --mode=link $(CC) -o $@ $$OBJS $(LDFLAGS) $(LIB) -rpath $(libdir) \ - -version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) ) - - make_subdir: -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/Makefile.in 2001-11-05 01:47:29.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/Makefile.in 2011-11-21 01:08:21.736965412 +0900 -@@ -14,7 +14,7 @@ - all: $(BIN) - - $(BIN): $(OBJ) -- $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LIB) -+ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(INC) $(DEFS) -o $(BIN) $(OBJ) $(LDFLAGS) $(LIB) - include .depend - - depend: -diff -Naur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/testprog/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/src/util/testprog/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/testprog/Makefile.in 2002-01-01 22:49:17.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/src/util/testprog/Makefile.in 2011-11-21 08:33:44.547672718 +0900 -@@ -15,7 +15,7 @@ - all: $(BIN) - - $(BIN): $(OBJ) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJ) $(LIB) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJ) $(LDFLAGS) $(LIB) - include .depend - - depend: diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch deleted file mode 100644 index d5967c31476f..000000000000 --- a/app-i18n/xcin/files/xcin-2.5.3_pre3-make.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/cin/big5/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/cin/big5/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/cin/big5/Makefile.in 2001-09-07 00:41:32.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/cin/big5/Makefile.in 2011-11-21 00:44:20.979695505 +0900 -@@ -9,43 +9,43 @@ - all: all-$(OS_TYPE) - - all-LINUX: -- ( BIG5ENC=big5 BIG5HKENC=big5hkscs make -f Rules make-big5 make-big5hkscs ) -+ ( BIG5ENC=big5 BIG5HKENC=big5hkscs $(MAKE) -f Rules make-big5 make-big5hkscs ) - - all-FREEBSD: -- ( BIG5ENC=big5 make -f Rules make-big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 ) - - all-OPENBSD: -- ( BIG5ENC=big5 make -f Rules make-big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 ) - - all-NETBSD: -- ( BIG5ENC=big5 make -f Rules make-big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 ) - - all-HPUX: -- ( BIG5ENC=big5 BIG5HKENC=hkbig5 make -f Rules make-big5 make-big5hkscs ) -+ ( BIG5ENC=big5 BIG5HKENC=hkbig5 $(MAKE) -f Rules make-big5 make-big5hkscs ) - - all-SOLARIS: -- ( BIG5ENC=big5 make -f Rules make-big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules make-big5 ) - - - install: all install-$(OS_TYPE) - - install-LINUX: -- ( BIG5ENC=big5 BIG5HKENC=big5hkscs make -f Rules install_big5 install_big5hkscs ) -+ ( BIG5ENC=big5 BIG5HKENC=big5hkscs $(MAKE) -f Rules install_big5 install_big5hkscs ) - - install-FREEBSD: -- ( BIG5ENC=big5 make -f Rules install_big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 ) - - install-OPENBSD: -- ( BIG5ENC=big5 make -f Rules install_big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 ) - - install-NETBSD: -- ( BIG5ENC=big5 make -f Rules install_big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 ) - - install-HPUX: -- ( BIG5ENC=big5 BIG5HKENC=hkbig5 make -f Rules install_big5 install_big5hkscs ) -+ ( BIG5ENC=big5 BIG5HKENC=hkbig5 $(MAKE) -f Rules install_big5 install_big5hkscs ) - - install-SOLARIS: -- ( BIG5ENC=big5 make -f Rules install_big5 ) -+ ( BIG5ENC=big5 $(MAKE) -f Rules install_big5 ) - - - clean: -diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/cin/gb/Makefile.in xcin-2.5.2.99.pre2+cvs20030224/cin/gb/Makefile.in ---- xcin-2.5.2.99.pre2+cvs20030224.orig/cin/gb/Makefile.in 2001-09-07 00:41:33.000000000 +0900 -+++ xcin-2.5.2.99.pre2+cvs20030224/cin/gb/Makefile.in 2011-11-21 00:44:07.491653510 +0900 -@@ -9,43 +9,43 @@ - all: all-$(OS_TYPE) - - all-LINUX: -- ( GB2312ENC=gb2312 GBKENC=gbk make -f Rules make-gb2312 make-gbk ) -+ ( GB2312ENC=gb2312 GBKENC=gbk $(MAKE) -f Rules make-gb2312 make-gbk ) - - all-FREEBSD: -- ( GB2312ENC=euc make -f Rules make-gb2312 ) -+ ( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 ) - - all-OPENBSD: -- ( GB2312ENC=euc make -f Rules make-gb2312 ) -+ ( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 ) - - all-NETBSD: -- ( GB2312ENC=euccn make -f Rules make-gb2312 ) -+ ( GB2312ENC=euccn $(MAKE) -f Rules make-gb2312 ) - - all-HPUX: -- ( GB2312ENC=hp15cn make -f Rules make-gb2312 ) -+ ( GB2312ENC=hp15cn $(MAKE) -f Rules make-gb2312 ) - - all-SOLARIS: -- ( GB2312ENC=euc make -f Rules make-gb2312 ) -+ ( GB2312ENC=euc $(MAKE) -f Rules make-gb2312 ) - - - install: all install-$(OS_TYPE) - - install-LINUX: -- ( GB2312ENC=gb2312 GBKENC=gbk make -f Rules install_gb2312 install_gbk ) -+ ( GB2312ENC=gb2312 GBKENC=gbk $(MAKE) -f Rules install_gb2312 install_gbk ) - - install-FREEBSD: -- ( GB2312ENC=euc make -f Rules install_gb2312 ) -+ ( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 ) - - install-OPENBSD: -- ( GB2312ENC=euc make -f Rules install_gb2312 ) -+ ( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 ) - - install-NETBSD: -- ( GB2312ENC=euccn make -f Rules install_gb2312 ) -+ ( GB2312ENC=euccn $(MAKE) -f Rules install_gb2312 ) - - install-HPUX: -- ( GB2312ENC=hp15cn make -f Rules install_gb2312 ) -+ ( GB2312ENC=hp15cn $(MAKE) -f Rules install_gb2312 ) - - install-SOLARIS: -- ( GB2312ENC=euc make -f Rules install_gb2312 ) -+ ( GB2312ENC=euc $(MAKE) -f Rules install_gb2312 ) - - clean: - rm -f *.tab* core diff --git a/app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch b/app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch deleted file mode 100644 index 747c8c5ca022..000000000000 --- a/app-i18n/xcin/files/xcin-2.5.3_pre3-slibtool.patch +++ /dev/null @@ -1,37 +0,0 @@ -commit 376d5276758b7eb2ee2b5e11d60f2105aac263f2 -Author: orbea <orbea@riseup.net> -Date: Sat Apr 10 16:40:33 2021 -0700 - - build: Fix linking with slibtool. - - Linking with the static libraries is not ideal, but since - that is what is provided... - -diff --git a/src/Makefile.in b/src/Makefile.in -index 62e6154..ac15131 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -6,8 +6,8 @@ top_srcdir = @top_srcdir@ - include $(top_srcdir)/Rules - - INC = ${xcininc} ${intl_inc} ${x_includes} -I${ximd_inc} --LIB = ${xcinlib} -lXimd -lim_comm lib/libxcin.la \ -- ${x_libraries} ${locale_lib} ${dl_lib} ${intl_lib} -lm -+LIB = lib/libxcin.la lib/libim_comm.a lib/libXimd.a ${x_libraries} \ -+ ${locale_lib} ${dl_libs} ${intl_lib} -lm - - BIN = xcin - SRC = xcin_main.c module.c gui.c xim.c xim_IC.c fkey.c gui_main.c \ -diff --git a/src/util/cin2tab/Makefile.in b/src/util/cin2tab/Makefile.in -index a2ad6f8..0663c5e 100644 ---- a/src/util/cin2tab/Makefile.in -+++ b/src/util/cin2tab/Makefile.in -@@ -3,7 +3,7 @@ top_srcdir = @top_srcdir@ - include $(top_srcdir)/Rules - - INC = $(x_includes) $(xcininc) $(intl_inc) --LIB = $(xcinlib) -lim_comm ../../lib/libxcin.la $(locale_lib) $(intl_lib) -lm -+LIB = ../../lib/libxcin.la ../../lib/libim_comm.a $(locale_lib) $(intl_lib) -lm - - BIN = cin2tab - SRC = cin2tab.c syscin.c gencin.c bimscin.c diff --git a/app-i18n/xcin/metadata.xml b/app-i18n/xcin/metadata.xml deleted file mode 100644 index c921b96adf6c..000000000000 --- a/app-i18n/xcin/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> -</maintainer> -</pkgmetadata> diff --git a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild b/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild deleted file mode 100644 index 9be714d2af28..000000000000 --- a/app-i18n/xcin/xcin-2.5.3_pre3-r3.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools - -MY_P=${PN}_2.5.2.99.pre2+cvs20030224 - -DESCRIPTION="Chinese X Input Method" -HOMEPAGE="http://cle.linux.org.tw/xcin/" -SRC_URI=" - mirror://debian/pool/main/x/${PN}/${MY_P}.orig.tar.gz - mirror://debian/pool/main/x/${PN}/${MY_P}-1.4.diff.gz" - -LICENSE="XCIN GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="debug nls unicode" - -RDEPEND=" - app-i18n/libchewing - >=app-i18n/libtabe-0.2.6 - >=sys-libs/db-4.5:* - x11-libs/libX11 - unicode? ( media-fonts/arphicfonts )" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" - -S="${WORKDIR}/${MY_P/_/-}" - -PATCHES=( - "${WORKDIR}"/${MY_P}-1.4.diff - "${FILESDIR}"/${P}-glibc-2.10.patch - "${FILESDIR}"/${P}-make.patch - "${FILESDIR}"/${P}-ldflags.patch - "${FILESDIR}"/${P}-slibtool.patch -) - -src_prepare() { - default - - rm configure || die - cd script || die - mv configure.{in,ac} || die - eautoreconf - mv configure .. || die -} - -src_configure() { - econf \ - --disable-static \ - --with-xcin-rcdir="${EPREFIX}"/etc \ - --with-xcin-dir="${EPREFIX}"/usr/$(get_libdir)/xcin25 \ - --with-db-lib="${EPREFIX}"/usr/$(get_libdir) \ - --with-tabe-inc="${EPREFIX}"/usr/include/tabe \ - --with-tabe-lib="${EPREFIX}"/usr/$(get_libdir) \ - $(use_enable debug) -} - -src_compile() { - emake -j1 -} - -src_install() { - emake \ - prefix="${ED}/usr" \ - program_prefix="${D}" \ - install - - # no static archives - find "${ED}" -name '*.la' -delete || die - - local docdir - for docdir in doc doc/En doc/En/internal doc/history doc/internal doc/modules; do - docinto ${docdir#doc/} - - local doc - while IFS="" read -d $'\0' -r doc; do - if use unicode; then - iconv -f BIG5 -t UTF-8 --output=${doc}.UTF-8 ${doc} || die - mv ${doc}.UTF-8 ${doc} || die - fi - dodoc ${doc} - done < <(find ${docdir} -maxdepth '1' -type f -print0) - done -} diff --git a/app-i18n/xsunpinyin/Manifest b/app-i18n/xsunpinyin/Manifest deleted file mode 100644 index ab2a2125633b..000000000000 --- a/app-i18n/xsunpinyin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33 diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild deleted file mode 100644 index 038164ba0649..000000000000 --- a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 2011-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" -PYTHON_COMPAT=(python{3_7,3_8,3_9}) - -inherit python-any-r1 scons-utils toolchain-funcs - -MY_PN="sunpinyin" -MY_P="${MY_PN}-${PV}" - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/sunpinyin/sunpinyin" -elif [[ "${PV}" == *_pre* ]]; then - SUNPINYIN_GIT_REVISION="f39c195db08661e894017507842991a1ef70bedf" -fi - -DESCRIPTION="Standalone XIM server for SunPinyin" -HOMEPAGE="https://github.com/sunpinyin/sunpinyin" -if [[ "${PV}" == "9999" ]]; then - SRC_URI="" -elif [[ "${PV}" == *_pre* ]]; then - SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/${SUNPINYIN_GIT_REVISION}.tar.gz -> ${MY_P}.tar.gz" -else - SRC_URI="https://github.com/sunpinyin/${MY_PN}/archive/v${PV/_/-}.tar.gz -> ${MY_P}.tar.gz" -fi - -LICENSE="|| ( CDDL LGPL-2.1 )" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -BDEPEND="virtual/pkgconfig" -DEPEND="~app-i18n/sunpinyin-${PV} - dev-libs/glib:2 - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/pango" -RDEPEND="${DEPEND} - app-i18n/sunpinyin-data" - -if [[ "${PV}" == *_pre* ]]; then - S="${WORKDIR}/${MY_PN}-${SUNPINYIN_GIT_REVISION}" -elif [[ "${PV}" != "9999" ]]; then - S="${WORKDIR}/${MY_PN}-${PV/_/-}" -fi - -src_prepare() { - default - - # https://github.com/sunpinyin/sunpinyin/pull/101 - sed -e "/^[[:space:]]*print /s/print \(.*\)/print(\1)/" -i wrapper/xim/SConstruct || die - - # https://github.com/sunpinyin/sunpinyin/issues/110 - sed -e "s/^\( *\)('CXX', 'CXX'),/&\n\1('AR', 'AR'),\n\1('RANLIB', 'RANLIB'),/" -i wrapper/xim/SConstruct || die - - # https://github.com/sunpinyin/sunpinyin/issues/114 - sed -e "/^#include <iconv\.h>$/d" -i wrapper/xim/xim.c || die -} - -src_configure() { - tc-export AR CC CXX RANLIB -} - -src_compile() { - escons -C wrapper/xim \ - --prefix="${EPREFIX}/usr" -} - -src_install() { - escons -C wrapper/xim --install-sandbox="${D}" install -} diff --git a/app-i18n/xvnkb/Manifest b/app-i18n/xvnkb/Manifest index 595ce7a35ab9..e43421578fc2 100644 --- a/app-i18n/xvnkb/Manifest +++ b/app-i18n/xvnkb/Manifest @@ -1 +1 @@ -DIST xvnkb-0.2.9a.tar.bz2 76429 BLAKE2B 33205bfe8dcc2fd68eaffb507dfb2db55cc1a71d33765f807b3804091a29f8c34ca8dcaf65a3f3978da921534d054096fb22abded3c4829d5ca256d3e51fff34 SHA512 3dbf4adb65f321d721fc74e05e92d2d1460e63c49e8a1ab2e10ab9f015e1a57bd3e641645d1283f1d0c5592eb7b342bf210d9fcab9ba441b6416c2f8fd1af6da +DIST xvnkb-0.2.11.tar.bz2 76397 BLAKE2B 8ebe4c389f5174b74af32fb001ef5f94d388b16a7c1ca0f409faffc6d63a4543d4daf7dc3609a8e7066324280eaf2d980e4a4e379ae478010269b808effb61cd SHA512 10d24ec159a89dd5fa68540bb8a92ae4d925f11039e7a7b77ed273862e4eb28ccd66d53ca1d0304f2a6d38182eddd304362d2bfd8c6804a2e7bfb354b20e5e83 diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch index f089f0dde899..8cae65fda777 100644 --- a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch +++ b/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch @@ -1,13 +1,11 @@ -diff --git a/Makefile.common b/Makefile.common -index 06f0b78..d9f8976 100644 --- a/Makefile.common +++ b/Makefile.common -@@ -19,10 +19,10 @@ all: do-it-all +@@ -19,10 +19,10 @@ $(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $< $(CORE): $(CORE_OBJS) -- $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) -+ $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) $(LDFLAGS) +- $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) -lX11 ++ $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) $(LDFLAGS) -lX11 $(GUI): $(GUI_OBJS) - $(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) @@ -15,11 +13,9 @@ index 06f0b78..d9f8976 100644 main: $(CORE) $(GUI) @echo >/dev/null -diff --git a/tools/Makefile.common b/tools/Makefile.common -index fe16cc1..16ec511 100644 --- a/tools/Makefile.common +++ b/tools/Makefile.common -@@ -16,10 +16,10 @@ all: do-it-all +@@ -16,10 +16,10 @@ $(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $< xvnkb_ctrl: $(CONTROL_OBJS) diff --git a/app-i18n/xvnkb/files/xvnkb-cc.patch b/app-i18n/xvnkb/files/xvnkb-cc.patch new file mode 100644 index 000000000000..1104998f7883 --- /dev/null +++ b/app-i18n/xvnkb/files/xvnkb-cc.patch @@ -0,0 +1,10 @@ +--- a/tools/Makefile.common ++++ b/tools/Makefile.common +@@ -49,6 +49,6 @@ + Makefile.dep: + @echo + @echo -n Create $@ ... +- @gcc -I$(XLIB_INC) -MM *.c > $@ ++ @$(CC) -I$(XLIB_INC) -MM *.c > $@ + @echo " done" + @echo diff --git a/app-i18n/xvnkb/metadata.xml b/app-i18n/xvnkb/metadata.xml index 73d5d9ae8a5a..0df6a83c250e 100644 --- a/app-i18n/xvnkb/metadata.xml +++ b/app-i18n/xvnkb/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="project"> - <email>cjk@gentoo.org</email> - <name>Cjk</name> - </maintainer> - <upstream> - <remote-id type="sourceforge">xvnkb</remote-id> - </upstream> + <maintainer type="project"> + <email>cjk@gentoo.org</email> + <name>Cjk</name> + </maintainer> + <upstream> + <remote-id type="sourceforge">xvnkb</remote-id> + </upstream> </pkgmetadata> diff --git a/app-i18n/xvnkb/xvnkb-0.2.11.ebuild b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild new file mode 100644 index 000000000000..a03d2ecadfdf --- /dev/null +++ b/app-i18n/xvnkb/xvnkb-0.2.11.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +inherit toolchain-funcs + +DESCRIPTION="Vietnamese input keyboard for X" +HOMEPAGE="https://xvnkb.sourceforge.net/" +SRC_URI="https://${PN}.sourceforge.net/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="spell xft" + +RDEPEND="x11-libs/libX11:= + xft? ( x11-libs/libXft:= )" +DEPEND="${RDEPEND} + x11-base/xorg-proto" +BDEPEND="xft? ( virtual/pkgconfig )" + +PATCHES=( + "${FILESDIR}"/${PN}-cc.patch + "${FILESDIR}"/${P}-ldflags.patch +) + +src_prepare() { + default + tc-export CC +} + +src_configure() { + # *not* autotools. Uses broken logic that assumes all the world is a bash + bash ./configure \ + $(usex spell '' '--no-spellcheck') \ + $(usex xft '' '--no-xft') \ + --use-extstroke \ + || die "./configure failed" + [[ -f Makefile ]] || die "./configure failed to set an error code, but didn't create a Makefile either" +} + +src_install() { + dobin ${PN} + dobin tools/${PN}_ctrl + + dolib.so ${PN}.so.${PV} + dosym ${PN}.so.${PV} /usr/$(get_libdir)/${PN}.so + + einstalldocs + dodoc -r doc/. scripts contrib +} + +pkg_postinst() { + elog "Remember to" + elog "$ export LANG=en_US.UTF-8" + elog "(or any other UTF-8 locale) and" + elog "$ export LD_PRELOAD=/usr/$(get_libdir)/${PN}.so" + elog "before starting X Window" + elog "More documents are in ${EROOT}/usr/share/doc/${PF}" + + ewarn "Programs with suid/sgid will have LD_PRELOAD cleared" + ewarn "You have to unset suid/sgid to use with ${PN}" +} diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild deleted file mode 100644 index 3f52d6d81c32..000000000000 --- a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Vietnamese input keyboard for X" -SRC_URI="http://xvnkb.sourceforge.net/${P}.tar.bz2" -HOMEPAGE="http://xvnkb.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="spell xft" - -RDEPEND=" - x11-libs/libX11:= - xft? ( x11-libs/libXft:= )" -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto" - -PATCHES=( "${FILESDIR}"/${P}-ldflags.patch ) - -src_configure() { - tc-export CC - - local myconf=() - ! use spell && myconf+=( --no-spellcheck ) - ! use xft && myconf+=( --no-xft ) - - # *not* autotools - ./configure \ - --use-extstroke "${myconf[@]}" \ - || die "./configure failed" -} - -src_install() { - dobin xvnkb - dobin tools/xvnkb_ctrl - - dolib.so xvnkb.so.${PV} - dosym xvnkb.so.${PV} /usr/$(get_libdir)/xvnkb.so - - einstalldocs - dodoc -r doc/. scripts contrib -} - -pkg_postinst() { - elog "Remember to" - elog "$ export LANG=en_US.UTF-8" - elog "(or any other UTF-8 locale) and" - elog "$ export LD_PRELOAD=/usr/$(get_libdir)/xvnkb.so" - elog "before starting X Window" - elog "More documents are in ${EROOT}/usr/share/doc/${PF}" - - ewarn "Programs with suid/sgid will have LD_PRELOAD cleared" - ewarn "You have to unset suid/sgid to use with xvnkb" -} diff --git a/app-i18n/yaskkserv/files/yaskkserv.service b/app-i18n/yaskkserv/files/yaskkserv.service index 40c8ee4c8974..770de1fcf02b 100644 --- a/app-i18n/yaskkserv/files/yaskkserv.service +++ b/app-i18n/yaskkserv/files/yaskkserv.service @@ -5,8 +5,7 @@ Requires=yaskkserv.socket [Service] User=nobody -EnvironmentFile=/etc/conf.d/yaskkserv -ExecStart=/usr/sbin/yaskkserv${YASKKSERV_SERVER_TYPE} --no-daemonize ${YASKKSERV_OPTS} +ExecStart=/usr/sbin/yaskkserv_normal --no-daemonize /usr/share/skk/SKK-JISYO.L.yaskkserv [Install] WantedBy=multi-user.target diff --git a/app-i18n/yaskkserv/metadata.xml b/app-i18n/yaskkserv/metadata.xml index 6e6dda1b2b32..e706a3e7bc88 100644 --- a/app-i18n/yaskkserv/metadata.xml +++ b/app-i18n/yaskkserv/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/yaskkserv2/Manifest b/app-i18n/yaskkserv2/Manifest new file mode 100644 index 000000000000..db2c32e07c26 --- /dev/null +++ b/app-i18n/yaskkserv2/Manifest @@ -0,0 +1,160 @@ +DIST addr2line-0.21.0.crate 40807 BLAKE2B 9796b9a1177a299797902b7f64247d81d63d3f7e0dcc1256990628e84c5f92e3094ee8d753d9b72187b9aaa73b7ca67c0217899f2226ebd1076f8d25b458475b SHA512 afde7660dda30dee240e79df1fb5b92d4572520bf17a134ef3765e2a077af9e13713952d52e27fae420109b40f6e24dbce1056687dbcbead858ffc21cc7dc69b +DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1 +DIST aho-corasick-1.0.5.crate 172064 BLAKE2B bab7767070b959e8e4c054bf505b9423d7fc8b02dc682b559f54db986abe72ddf83a069b4bb585d71b47de92d2fce66a1c151a0d29c4aae99378ca05c3d5eb50 SHA512 6b0a64dbfe0c166341a34cd169bc46d28e40f72db4d599a1aff5327a6e891408f39e8e92e983cf9396a8e8135f93e41550237ff3e5c8c05a5325688746fd814b +DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9 +DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f +DIST backtrace-0.3.69.crate 77299 BLAKE2B 594358f1d9171fc369f50cacffab03b8a10a8fe3da5b915611cb74b0dbad0e048c7dc79c53569d89827db583e0f61fb7269147b6258781a1599a811e642414a8 SHA512 6e86de53e1c5003ef68b6a85479cde1e70bf416bdc50e6e32ead9f9f070fa30ad46de22574041c844ddfeabd5d15de01ef746f19f8cb7f257c491ef0bf071244 +DIST base64-0.21.4.crate 77029 BLAKE2B 4380440305c8a293218bb1fdba5c257b2a088af2f74f2936937cd0f0b3462248b572bdbfe5e2a82af1f2cf04267267317b1c2b74972fa9976795e9c174d2352f SHA512 33fba19be1e7c3e74b57ae0487fda904258f31457c005467caf2e44eb55e271e0d2e3f2d4b80b667b05fc625878e0b136a07984dc88335a2099278672b3c4b0f +DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3 +DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 +DIST bitflags-2.4.0.crate 36954 BLAKE2B 1d6cfeb0a17dc53a6249a83c8c7ad7c102985ffcfd7f7f76506889684235e78fe489d23b5a5f9018f0bd526a38d6b1449784c62322fb01f4bb507c0af8bd545c SHA512 0c3d6667abea48811a792749702136ee3db97518b33bc4c7d35737505bf56315e0e5810deeea28b7a1b540ec0e21bd319ba0b3c5c4aef0ba8ed5499ffdfd9b0c +DIST block-buffer-0.10.4.crate 10538 BLAKE2B d819c4f9c4be85868e8b105fb7e479d2e58d3ed85c3339bd677a3e111f85cb1ff624a54d7802ab79a6e1d9221115f66388568340480fe83eae1cb448f19f5b11 SHA512 b7d436d8e627e16e6ddc300ee8f706a6cef28ff6f09eff848eedee46f84bdcd03601303c92ab8996042e55922866a59259948177c0a4496eed723523e77f6fdb +DIST bumpalo-3.14.0.crate 82400 BLAKE2B 13bde02e2e60ea3099f4e46ff679d07b2e8046740c1855bb81fe8d20a4ef0fb26e565da724f628a00c9154ef16ffc9018f67433d2a32544564b66803b5bab223 SHA512 179c116a5320c5f21163c343ed48add36089d806e35bc303318dcfe09ba1d5f02bf8012726d0c2cb76a73fae05a7c887a91e18f9e5ff3b9f9ad8a2f12838757b +DIST bytes-1.5.0.crate 58909 BLAKE2B 2931f19e813eff73be407677622fa29e45f9b49434d5b3a04104b56563fc0e941fd8c5f996258a1aa660000ef014668d70b683b751af8e48d28d0aea76890c92 SHA512 6654cf41d8f0d7e19b05fd95044b9a3bfccd81f469c797c6aa763a4dd29e1b34064bed2e094548d147045cca7bc4706059de5bcf9f6579189e6068fbbf1c29a3 +DIST cc-1.0.83.crate 68343 BLAKE2B 33245b33fa845ea2f36da36e3830ec835f937e4319865b357ee9d5ea29a0f9f8392eadb38bf1d95e3c15ed201e561acaa87aedcef744f8db3dabff87a96c7f02 SHA512 742a248c3a7547bb220a0b9c97b67a831fab9b4ac21daa08c85a3966b9fe576088def33e16132fcabec9a2828a6fc437088bb045bfc98b2cea829df6742565a7 +DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff +DIST clap-3.2.25.crate 219403 BLAKE2B 75a8ee36c52e64cf0ac7ed5604d8a575c41c756a588bd418e6c1edccfb358350cdd831b4176f01b987fe7fa5901ca2bccee6b0f68ccba7dbe40baf85a5f3bdb4 SHA512 557c8932175d7ecd077b32b68904924e52dd46d04fd04ba36b3a9dfd7ab1dbe8c2128fecfd75d0388b21fca4aee55a941794181cc2910a4d4eb3c54e9c7e73ea +DIST clap_lex-0.2.4.crate 9652 BLAKE2B 5120b508dedf52507068c0c369a45ddfbe0369e5c05b65bc5a78c422b2a4bf488f9ef1e0bed4e335450f2c08b80148eb5f7efed678039b5a94b5bd666385939f SHA512 6c05e5fd850befd45be9005af7252385f2304aa28a107413bbe329d97aea835f7acfd0bd169c99f69f466ab93d6e1c35d73a4e48343457a06fe2d6be5bedde0f +DIST core-foundation-0.9.3.crate 27059 BLAKE2B d94fec51b1b1055c285609f4bba45c5169a8cc775e251eac7fbf0da7ef894e1be9ca9f4236b82b67be0610bdf811366e0c6fd3cdb671a1e83c49717e2c5b2d03 SHA512 de07967c4f5e2d2e730b6f21984c228dad2cb2f55187f13074a2200f4ce9f906763ee818267a9c67ea560229db7363473b230670a6dbd224fc335f32ba03d072 +DIST core-foundation-sys-0.8.4.crate 17725 BLAKE2B 8afe47838dc91c8848c0d6a96a604149e5f0762228dbc10c17b85e4e9cd2c3928712bd0b28e1071f5fd6fd76d4ef972cb86c6c929246fb6e84577776933a8ac7 SHA512 15da472316d6decc213e4e5f08ecd22a108ebefe427b890741de4f9199614f19123e64329da76de5e8b4c9ff74ffc31738fd929acc1460fc757b4aa1fd3fdbb6 +DIST cpufeatures-0.2.9.crate 11895 BLAKE2B 1e369466bce2ddf7be6bbe219997628223a3a114914e5ed44b44f3fb6d6a084fbb47cc50ecb109287b074e159c675ae89356cb68cd843b41b502ebe824febca0 SHA512 88235b7d7152f4578a321ebc4f83f69070206b2acaf0e6331b52e1a6633e96edc787f9a409ac2e2799106a259166a302150fa4ddc88352b7739d50ac6ca9038f +DIST crypto-common-0.1.6.crate 8760 BLAKE2B f2422bfb89c15d47a8f91c8f6695e05eb56990a922e3cdf3d426044736f9932324c0d899a151a6df4d6683e6a6b21659c657d3988734014c02cd854bb4b924e7 SHA512 471dbc43f517089d2cfe0868e29510c6ca579875b3bb5d013c70796db969b609b6c4bb35c9a07b9a2917012dc5708b717d48e317a20038adbe7e7039bf3ada6f +DIST daemonize-0.5.0.crate 7125 BLAKE2B 9706f4ffb140533f73fe520755a06ee909fe1768e3f2e9b553acd2c1b80bcd4aff152058d1d70fb1ece7a7de6059cefa9d2db0fadf493aae641e1445e3c6d686 SHA512 8ab439f3cb43a83a84ff11fed4ef37adaac4ef5a83e497e8d6ad06ba1f10359366eed9741a07f3c97f3c83472da5513b5e28b6ded4b4b3ca9a1c536b7de62921 +DIST digest-0.10.7.crate 19557 BLAKE2B 61e69d78cb8d6850ae26ad7ff2d52dd6dce820d8c621230def11cc0e8aa6d883a6e1b25340fb45748db52a8ccf3c8d36a8aa0c8cdf4d4eeb4e3f870d86abe09a SHA512 0dd8c012468ab9011b89413ea4d3647d95b1f683b020a0e6274c95ed5148638b56fef19cd9044c837ad53715b582b88eed277fe96e917c27c5d7abdbf7c3794c +DIST encoding_rs-0.8.33.crate 1370071 BLAKE2B 0e81419086ca6e18f2aba5194b87eaba49ddf20493fd6ee09d479db86306e39dff9b23f399594afc42f1fdb33855e070beaa1871794dc0b0371c35d296a6369a SHA512 20d28a4c0ff0710f911f510be56c2bc5e7514b76d370493d2b89b7f25d1c0cd46ffa64862e54fc472f07f928a2cc24cf9d790a37751cafafc81f263705aac4bc +DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f +DIST errno-0.3.3.crate 10543 BLAKE2B 958e9d12766533ae9e84a60b121794929b9b3b1a8111aca9a2e914beee5784b64c946e143cd8031335ac9cb51069e51dbc9a6b61073a2ccfd3ff60612a20b619 SHA512 9524db39d0c9be287e0d2aed3358a86e961b2868717037212a2e9dc408bc73198ab23196d7923a9ba7e0e9357276075148f582e0325ad36ae1b212a8c674173e +DIST errno-dragonfly-0.1.2.crate 1810 BLAKE2B 781fc26dce5c33d83b9a1fd9be2b2ce9ac2559aaa858957ba6777e143b1e44cdfee48e1b47e3c91a95075a51921d1a421d0b45eb3d8de827cf4dd0ad744a7d8c SHA512 f853f1e1b8dd0f359a8f9a0399b3384c1103cd090d96e2b2204f91a40d40a9eb99383d4aa6a11e5470c51557afacf452d4be2049600d4235d27f59870fa3b916 +DIST error-chain-0.11.0.crate 27207 BLAKE2B e50c4e2d6a173e9866311bb81adbde4bddd64d529bfcc919ecade60926112b537cff491a4ba8e84586b3dc63e87e2b3c0695452c165ddf202d6901b2d6247f2c SHA512 a7c06be660a554b4c50deacaf6ef0699cf6e8cf234d9610324c70dac0cffeff1540dfbf10efd41427858551b095c998d670f1287c9459c35217bd78d8887c60b +DIST fastrand-2.0.0.crate 14402 BLAKE2B 8bf830151ec616dbc25f216265722e39f8a2cd9ae036b0904b73775a30497368aaf9bb7f49890c330024c3d9b8084749c91f601b60b53bc8cef2da8b0aa71322 SHA512 9449dd52e4b722d5747f68f127843c0d1a402765c2b6186b9526f8ae23293cb1f6b50adcbf18a8ea768292642184cb0eb42b1801d20f6815397903f9977f3cbc +DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334 +DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232 +DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a +DIST form_urlencoded-1.2.0.crate 8923 BLAKE2B 2408d9bbca582be13febf041262f0e63a3d661dd8fd2a42e9203feb6ff02a94e3eade6b83179fab34448b9913c7924fdf53e0670ae97e550318229432978e33d SHA512 899ddd113a79bdeac12e499f581c5499d1a4b698c75cfc2d6aada5880cd802fc8537ff9ce68eca28374318d66fd70100962105c1e8962868a5732bb86326c104 +DIST futures-channel-0.3.28.crate 32281 BLAKE2B 128709ed9c3f275ee9365135426b626dab7d34a706cb9435a6ee45e2a28f7d2e6702b7bcd8b0788f7171ccc75917f287834a18c8af58b73ec07f46425aecdd97 SHA512 21bcae42859687538a3bbd4a4328b1a176bf8eec3b03f9d341f8ec08e796ada1638c0c3011246995d742e392a3ecf4446ccd2e92ea5426fe658c5f5ad8303b99 +DIST futures-core-0.3.28.crate 14780 BLAKE2B 551327876d54a6ccd97382679d61afb3e344f7c8e26813ac85779a57850cbb1f54041c82d71a7bfe4a30d1c8d9aeb560d8d4bf5babe7010fb7cf3c36c8ebf3cf SHA512 a21900a68f1a9232c245b160e95896b109315f10719147b4f104e11edb5b59c862555e07aee37a7d4fbedf0f09a02d4ed329f92fa1ad4679db1d7c78ae2865e0 +DIST futures-io-0.3.28.crate 8910 BLAKE2B 5554e9dd8548be47e7195ae8b223288cc2e765dc9feb703092972ec9e19ade825bc9d7093625a77c7dd2213df59e2c70ada84a84446b5a940c3e62daeb9dd57d SHA512 805177f2677a09d94ce5f010af9244e0e0dc285937e355a836179297c4c912a762f8d96bce57af388502810dcb67a772b7a522f5c6b21be3aa4b7ee46372d402 +DIST futures-sink-0.3.28.crate 7852 BLAKE2B 752286cb15ff37e9bf4c6cc80c8ebfeb229dbaa4e8aea6fa505f1e145e5dec99c4818c8e7ba2bd8a03898350e05bc124a5ad83e28989e282dbc132ed13e7fbf3 SHA512 e3535aaffa42215448d78adcba72f1dc3131598169dbcc8b52b82fe3e74f4b0d5631ab3dd3ac5d4315be890b94d6fd8f53de274ee4815f9abb27d40982c96c07 +DIST futures-task-0.3.28.crate 11848 BLAKE2B 79cd7b01d24a5274b0e564edf0f5d041414d9dee02c503f2303958e679db0db3c652c64352052d20bbad7bace078b553f77920e2ae21a948a1c884eeecc663ab SHA512 198f3efa51b1a8492a4151a6e4ef6e7abd09f2f537f5ffc2b8f2cf739718fb9714718226ee1cde7a58d41a2e623445ae64013f02e7f00489320c06292465fa82 +DIST futures-util-0.3.28.crate 158510 BLAKE2B 0721356a4947b39cd066dc8a88afa7686b832be269295af3ebff8cd74b42dffe5484399f66e3e11e2b54c2b8e04ee002a9d507eeb5259fbdc00b226e0f94b175 SHA512 0c7dd3701b7ab0a443a56aa64e6d9b6ba7bb9ccba4c05dfe17608df3e2bed1c2fa460a0cb4abb9fb25289d3a776128ffcc4fced75ca73a65d40b18ee2e9a46e4 +DIST generic-array-0.14.7.crate 15950 BLAKE2B e74c785e3127095625951da192a018281ea9976aaeb11019f9088c3f27748c5fed1ef25d577150864486dc48b5138d6892e42f99979339f711a66fc70756c82b SHA512 363a7b04e4102f9ca63d429721c1ada6272be6bf0a2e97da681faf76381f73f0e3acb86623b9ce2dae441de9fda704088391779b9769ec02b3c8c9f9f35f897d +DIST getrandom-0.2.10.crate 34955 BLAKE2B 8e7b8554ae360484ceca2a05f834c2664b08f41cbc6c955663e1f8f22fb5750481518bf1c7b49f49223a99a66914ef013347b9186acc97a20249f3222a13f9d4 SHA512 82af9e0417bff9272ed0478be4ac90426405ce210014b21899c6b95fde1b16893bf46295388ff5f13fa712a04c99c46b770fab83f41a1343af1590a86ca8da3b +DIST gimli-0.28.0.crate 269277 BLAKE2B 4d651d9f71b826d06b3089cb09933f30d785801b8072228c9a5c9ed2011172c679e86205dd507cb1866634238b20721773e60410bd25fbcc5c3421c72ba565be SHA512 a5a861c7398ec655635a39c3a421ca5c9effb03f4980a000c342b81b9bf229481639a8a62c4396508a9800ec9d313317036a8e4e7da3add5adeca596f1c09d51 +DIST h2-0.3.21.crate 166581 BLAKE2B 0d7b186a303ec8da4327cebf3caa9cf43809a8957f0bda67fd7cf5633e7bc53cc4c646321a1f9a719ad199c58d4006dd71bf2ff25f616d2bf19c4b6f0e286a54 SHA512 30993b3d5fc8cb08889208e3f43c145a4555f0c8aa864bf65afabb9cca65bba454d7553cd17b912a2c4a19172a1d14df0326bfe791f646961abc7b557357f1c8 +DIST hashbrown-0.12.3.crate 102968 BLAKE2B 492072f27eaec45abd2c5d7405c614c0c6a8221425e901bb6174bfa1688ee524408a618650126d6c683b7285b9bf0a21dcdbff7347e4d8f97bf7111defa1b7e5 SHA512 b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 +DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a +DIST hermit-abi-0.3.2.crate 13783 BLAKE2B 43089507a5ca0731a9e9a54fdc8f4dd5f807244797eba5bdcc072c2c2b3761481df65b8cc65900769777d9d21f8345b502cb1915ec36747160e87f179469a661 SHA512 22901ec8976a7c96e93c9e07a2c5d3db49d7af60ce60c7ee6f61c3cbe93190d1f285e737c1c8b2236d540ab14e5d92e42828ec05f1b212332a862baf2b1b57f6 +DIST http-0.2.9.crate 100146 BLAKE2B a720a5ea6e59d1bd4e7b422fdaa30b3b9d72a7533c5e91d1c8ee2b1dcd899309b490479ec578aa3b51f1dddeb5c6510f28136e9fd1f04d2af12d2418261f6c03 SHA512 17bbc886d34f5aa4b56d82a605a54e920a244988085d06e70bc416f8e0edfa3356544f29082b3fbf3dcea18e741ade374375dd82ebe2276fd9a9508735a1e03a +DIST http-body-0.4.5.crate 9242 BLAKE2B decb7a27f123c38afc1f7f36ad570bac6d5513e57334870621477c17e0363a8abe4d6a3360bb1c87707d188be66ff100f42237727304e07d8515c1faaa179d48 SHA512 d01de0747155283331086f2849d1dccc0387feda576f60d84cdd1bc8817ac82ae131c294b5cf9ddabb7ac91bfdef67bc2ea5fcbbb04f41b473d4c5f5b2ac13d5 +DIST httparse-1.8.0.crate 29954 BLAKE2B 82c48fdd6d28e94c42df180415ea3e30d471ace2fee09d7d8d33aff0a8e9a15d3029c90f3bb036b4f587c8902094a2ec21e4ca6ca7b654a82562bd84fe208ef9 SHA512 849159d9876e0474c71f3c7aa3a7271699b807b293832d88d52e4326ed410b25f9d7b9ad75a143a51fb5c8ea5016c2513348edbc050d3b62dc9a6737ae98ee8f +DIST httpdate-1.0.3.crate 10639 BLAKE2B ce0b401c69f76252639c10f6c2e4a823574a58565d7c5cc3633c72837aa4ec3630b34b148de4378ec498db196e3b2e1413ca0e5a4d9247855380fe19a8c20f94 SHA512 0586888fe89f40b838d5ceb083084d0b8058feff1d2933faedb96896dc86eec68b541a0374a508fd11b86eeadab3c62f88568ffe2c53206fad438373a50b2e5a +DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da +DIST hyper-0.14.27.crate 195700 BLAKE2B 4c079a6f99b1da3816c08df3935b5c9c1a3acf878111f4afffe67cbe816975aae0bd49577fa7cdc1bd55ed78dd2328cb1b0cc09064e9bf6caadde91403159912 SHA512 580f2589dc1f938d2563d3fdfd1cb2f1b11278333ac54e813e4dbe50a0e63952546385f057b20eb123516b2f74e19b62a3ed0cd546fdf868f6a5770cd95643a2 +DIST hyper-tls-0.5.0.crate 13257 BLAKE2B 50cbe4ca7c1862fd3fff192de070341dd32bfb9f108b516e1e261ec8da7c4f7972b7b66e3d45c1497733a913b0281bef706994270ec8bd03eba7368612127aa4 SHA512 45dc16cc9ce48706e0b3575dca35ba1b6b3084dda8c2cc489d126e1c4f0bb96a9b2baa860d09f68c5e0a48c2a69e3eaf62f4f0406fffc4efefcd79d26c82896e +DIST idna-0.4.0.crate 271429 BLAKE2B 8b81bc4535d2e8a1100ddeaf6f43c043fd601ee3b37eb109a9dff01630a81603223407bd5c2f1a1b108d741c811781b205c10148a0122b8125c237a5d5ba8a58 SHA512 b4133c5f73bd9c4ccc05245a9edcc5c980714129ce4f6eb7851eea7e509617ff972fadefe6ac78db6b4106667d9d6070de52c4d42414c95921e3d9fe1b7a76cb +DIST indexmap-1.9.3.crate 54653 BLAKE2B 7bc1768589e74020dc15d3dd064009edaaef39b7aeb682d0ca8e49944e3f020b9c04d64feb102e88b22feb40863479dfaf4722d6a77b5d19e7ca553f4bf64c1b SHA512 2aa8069eb07a814c8fa3e11296c9f032ef60963520d7786ad20cca5cb7e73b8f76d97722a994d65295bb713020aadce5008cd3df5e99d8bd968ef1979f910a37 +DIST ipnet-2.8.0.crate 27474 BLAKE2B 143208136453b9c97fac5f1166f395dbbf3bdb6185768fcd8e5d4bff867802bb1ae09294d4d7585e26b7726561f84f4a2ce1f6a730c8906d34a5a5c5f50ce8b4 SHA512 18773715f0acad731885e551a402432a6fb29f120575ddde380cd8af8d332acf2b5be4657d1a321ae7a6226fa0ae58feb6ac295b6e4cd255144465c2ea2c0692 +DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d +DIST js-sys-0.3.64.crate 80313 BLAKE2B 7cf5dcb2b9e0b63cb82771c9e98518a4cda70372c5aed07866a07d2aa51274622357e4b5a665499328f5a3c38f7c515303da50421bad4a496fbb658e2132325f SHA512 a4f389a4eb45c2122e7bcf365dccdce8fcf14b1b521b8b839746bba8783296e2f1b959d73bdd874743f49c61a24c4077dec52f63cc7d594cd42e9cd6ea9c2e64 +DIST json-0.12.4.crate 105942 BLAKE2B 0e3dc93a53ab2e1ba489ea37976b40b6f430648a7d0a91a26481ba6e4e6befa377ff832db3f554a27630e4763c87b55358ee89c455c4414b78fae45a625154df SHA512 bcdf6d873decccc66e018e21775ceed6c0e389c6d0b2011071368321789a38867e1d641d92c9607e3fabc6e8d6b260ec0ccc2a9bc545184bb3e63bae6731a39e +DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 +DIST libc-0.2.148.crate 690988 BLAKE2B 41dd38cfff1431cd8184220745697d794a66f6badec750be3910ddc4a6ddcf964692b5b28a5a9714592c5579da26248092facb9407920330b55aaef38501420c SHA512 1dec9ec8f4c610c08f62bc2b45dd32f1e4528a045161d848b5c4f0382be1158a690f4d7760203d7d2347a80422671f43b07531871cf44990887eaaed35d924d4 +DIST linux-raw-sys-0.4.7.crate 1350647 BLAKE2B 7489b530d59c2b1c32dfa77b260fa9892ec3ce9b15bbac90b0b7565806798d7580145321e0a2206d7a1f50b6cb7684dcd85f30a11dc330f071aa2f6042f941bc SHA512 df36f3f188767080f118aac32138233209a1f0cd11682425fc101cb054e138cf0582ad044d0f326a20ce517f425665ea1ad9ac5eda147712a994884101974d48 +DIST log-0.4.20.crate 38307 BLAKE2B cb9c9a401b49bd68c18d5e42f2ed94446f1aeb184caa23cefacad4ce54a2a357143af54a5595c45d6f3c3d20b054c451d9e6ccdc09c19cca99ffffdaf8bbfc72 SHA512 8661b0c71d3b7fc0d679aa3d7f06910e6d3da1c53862aa06526000e1bcaa0b0b068415a1a9ab317c318f00d15346dba8a4f5d2a60d8850790bed9cfaaf757b3e +DIST memchr-2.6.3.crate 94377 BLAKE2B 5f1603397d6703ddd9a1e68429cb6e9dae9021e14692c1e084f3b5c82d36645a1fa930c7a76b97df8e1919402fa7e1c621969ce85ce20c82b3087104afe18f25 SHA512 8d5e1425ea702a0950c95271dfd2e81610731496f77af0d683536b074a22922a7d7ec6da41577487d1d658e3b27257b7d1e142761b523e68760a2f5f24f049bc +DIST mime-0.3.17.crate 15712 BLAKE2B abb892b75b40657d356b6b53b9a45b2c822a05873453e919f2bbfeed9e5c06104f24db9cef2716f302198020870eaf96b2c62aff55cc11d8ca4f4f614d7c8e17 SHA512 e6d2ca92bb58fc747c1bb65a7f9023e5dbf4b94966003a72e4913bcaaeccdd6752725cdbd5081e0fd69d9e8f364d79664fcbe70061737d5c39e5b3e3a154a0d1 +DIST miniz_oxide-0.7.1.crate 55194 BLAKE2B 56afbe0c0b3eca98105ae2d507493f365353cce29a6b04910ff26bc75899400fdbd067756cbda7b3d86f047fb8f3d737de00043a4a7348a813cc43e45824e33f SHA512 5eb6ffe34a866403273ff0267ff7838aeb50722ca57a03d5a1d842a5f19a3b4af570b133a3b9d64d78eafe49e4b9732b92dd63fd9c6b0ce59b3295daf10f6a3c +DIST mio-0.8.8.crate 94264 BLAKE2B f70334d3daa8794079c865c5e91d9b32fee2b90af95a6690f7cbe0765818ed9a0f5d539f3390119565c3ed47025979657e30ee2e871760a776829dcddb59783c SHA512 448a05f19a147fe119965f7f1aaf24c2a40ed816ddf2e5c95ba3bdaded5e2812314c64a50dc7baada93bb005b65159cb6597f82a407936885ea376bb128b0c9a +DIST native-tls-0.2.11.crate 29008 BLAKE2B 594511c364e639e309f32f37ae20ecfc5ddeeb39c3f7180c5f3f2cf304d8c323b977af933ffe70cce696a5a63e17c5fa7ddb119d46fc3db819a28e31a388640b SHA512 7e77959932f2859757f1aeb37b78fdd459b7b6fd02424f4b7399525b94c21d1f499a718775503b8f3dfe3b4b740e1cfbee77052a2ebd0994468addb3fa665e6c +DIST num_cpus-1.16.0.crate 15713 BLAKE2B 11b432fc7c7496d48918f09ed0954e0f1d0845596301266321293b374392898853fb7c313a0b0fd9d22d9dbfe3ccc5cc1e38f38407c89b2e5906eb76caa6ad68 SHA512 a75863afc4a563e63c64d06471c7921615355d98011ea9497b1f1a7dac2bdfc876509136018e8062ac38575ccf476a196d1fd9231e09e90017333bbf2df4615d +DIST object-0.32.1.crate 275463 BLAKE2B df88d37427c2741931ab0ef24a482755168c7348ccc280f8264e94e5f8548c608799868e0bc5984632ee02aa84313fc5e222b7cd7ebc6829729ea49544f13416 SHA512 5bfd3b8960fd80bb48691fdef35d7a9fc3d752a1cf5f29cb4e146a17d427e878d972d208e8aefe5015b3c62d065ed9a66f2f9f790b4743d1a4a3f9c0b8e581e3 +DIST once_cell-1.18.0.crate 32969 BLAKE2B a08d5beee50a7add28bd9e50b18709e7b34574f0f55f80909d5efb7ac5917e5f30bdcf3fb43ddd0a4f420a427390c7ffe1cc1c7191a3a1d939bc6e3139e6eef7 SHA512 9328968afdf3535b2d9e0113d75afa725259d76994ef2e1948ad7efa4ec8a65bac7cfdc31b749d5cd55ad4e28d2e28ac57b871e3067b89182453c7e2413a13b8 +DIST openssl-0.10.57.crate 262768 BLAKE2B a30b3b94cd72a45c948c0424e563fafb8905b726f2ec45a7a02509526596bcaac92775641a479d9da79c3abfc98b9f16b4c0176cb1b13e581c2ec76c8b1406e6 SHA512 26cae586d171a872881f70b846fae3fdd08ec473e05fd1fc0abc2f398717a7ae967a0f480933689b04e7ad139f88bc1ccf80a31c6205cf76ab2fa23c8352891b +DIST openssl-macros-0.1.1.crate 5601 BLAKE2B 69dc1c1f3b7bc4f934cae0dce64c3efa501162e5279efd6af3b74f7a7716c04b6996b306b310f1c045cfa2eff2895314a47ecbb020a817e461c6d77d0bc11e92 SHA512 57e75c84f78fb83f884eeaedb0dd135ecb40192dad2facd908e6a575c9b65b38a2c93bca4630e09ea5a82c77d8bc8364cb2f5778cbfe9d8f484cafe3346b883c +DIST openssl-probe-0.1.5.crate 7227 BLAKE2B d1fd6a9498b3ab7f25b228f19043067604bf20790530fd0ab6fe3d4d3bc27f13e6e94d1e7ef49314c3663477d8916b8790b90427f74976143b54b95350895165 SHA512 7e560314150709a34520472698060c4f29689d4e608dc4dde146140aa690350d3603279c693367deeb0f21ab34ef61956143a3447827a2b7a3d578b9ccd6552c +DIST openssl-sys-0.9.93.crate 66922 BLAKE2B 570bfb78704657a89f2e363b96bef65d8cf617f1bb625c271f4728b4cf6011c11369ca1396e01470934fb596528b358a7240520ea706be64e9ce79d83a98b06a SHA512 173a8e28aeda81220a35d3a0b3c09586a235aafa4aceb65dddeccd3b94729e841ceab29b1defbfa1d959d82185c0fe13b0d998e115a098432fbd2a993ef582f0 +DIST os_str_bytes-6.5.1.crate 22778 BLAKE2B 1d3daa82b41e6e360ec17051be2c5b1a394fe49ae349b2888e6f30fccf99d102c71357f76c3f68118de59e24480221b352a223ed01f26f11bf707b1c7de81941 SHA512 6d7a4475398daaae4e3d55ad58a8fba729517acf5744a5a6296f477207ee91e5bc36c2b54e58f6f9b15ce9bc75286e9ba62a59d577f0171d8151d3aaa01311b8 +DIST percent-encoding-2.3.0.crate 10196 BLAKE2B 155bb1aaf0db4d22179bbe24b2d312f3d507876436e8ce76dfb59775282c1136a6c2bf5672f4b6bc274e4535acc9e50497c3e20b77aa2490512755c9cc9e6c41 SHA512 54ba129b0f3b43627707be994a281cdb69d5a7bdbc91dfeaa0226cf2834adeff7d2597dca5d11dd48b5731e831acf1284497b251abfebc0618761f98fe3c01cd +DIST pin-project-lite-0.2.13.crate 29141 BLAKE2B c434a336716c9cdd16ebc297fed393e9106ef167a693c4aa0b12c681e03141b8ba3cdf64c310916cb7d5cc43cbbfcaaeb39bb5fb1e8b3efb9e94a3f72af914eb SHA512 7f12595d751d315de6c0d380e2f501b74154661eb676987d2cab6fdc956091a68c9cac658df45dbff73615e982e6ae2ea138c09ebb708cd6c351f0d18dbbdbee +DIST pin-utils-0.1.0.crate 7580 BLAKE2B 457e1287202f16d1873b24bf4f1de1828300128c4ba3131758e64f9784d36d47365f22d85493c3a85d854f0d8dbb4c6cef3a0f5b064014dc03943e58b7ba9178 SHA512 828422b8440cc82ac6b0743e0112fa7540d437aed457564999092b1462cd7672cd6b1f0201b67075431aeedd3d9c5127468a3dd028744109944f7f023c82fd70 +DIST pkg-config-0.3.27.crate 18838 BLAKE2B 1295eb4f08751b3663cb2c7c2753f29bf2ccd80f4e5856909fe10b6f006c37fb9672c9518b9b416546469faa18821512673a66543c0bd1e848bddabc456d0a90 SHA512 41e9b8d4fce6b8244c2ac8566318a001b481bd42a182f1a832c81ce93c6a023e18af03aa3500b134c30195219d35080433bdba69b2594e9665081debfbb4533a +DIST ppv-lite86-0.2.17.crate 22242 BLAKE2B 48c4a31a3b555fa37072c4de083580bb769747c7668748541af472778b5b58c3e7ab2b5e178760f542f973774f09910bdd4058ae5fb9d6b10c103eb76cfd0d3d SHA512 539d916e7e5869d832045c1aa88aec519bd000227f9b01d4dd0bfc9ffb640d5f5eb21b05eba718174773c97192a655ad3cb31b53ceb914dd19179a6699b3583a +DIST proc-macro2-1.0.67.crate 43683 BLAKE2B a7f485d058ffb654c22ad01088756d8050780e559d86f96590e284c3babf1bb59ce347400c1681b296c6f58e2d42ed67d3e458483368399c22d7810685adcbc6 SHA512 3827f5f698aaecc168a03643e330e03aca7b0de98bd57dc97507c1bd53b6ec64752a1f4dee4c8a12ab02f410775a11f5ce7b0d36ec0e1fbbec197e3d7e199eab +DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9 +DIST quote-1.0.33.crate 28090 BLAKE2B 77c4b166f1200e1ee2ab94a5014acd334c1fe4b7d72851d73768d491c56c6779a0882a304c1f30c88732a6168351f0f786b10516ae537cff993892a749175848 SHA512 c1e76c3c017e8554eebe309f8167fd56fce931981c06798aa85a0cc6d64a9cba6ab103f5a1324e69c6f9ca5dc47a8e31ff2e847850542748697afcd265b5939c +DIST rand-0.8.5.crate 87113 BLAKE2B 516f26bb2a969d0d79e957818133f35d2c0b4d9f1b401098ea23c5b80d27599e842b9298c0c5e46e2a6cb6953857bf8a9fb71ec9366c5ce6708cf17df14f179c SHA512 8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 +DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 +DIST rand_core-0.6.4.crate 22666 BLAKE2B 8b6b66d50aade877f2779c006f8038db450f808c66d73d79efa66c4178dc03db06f12201bf0e7930181c4b0f4030c49b20cce6eb7839763cf2217cad9710789a SHA512 36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 +DIST redox_syscall-0.3.5.crate 23404 BLAKE2B 85aa4299d9816666bf576f523da5cdeae87b3c8fbb2af103e82258d23f73303c068a4b6c3ef4117ad67958cb31e41f836a9f59f2ce1bc52c23605e34399afcf1 SHA512 16f8f4766932bb54e4740cfdb4f0802f76246c0bf88c1d76c69c115949b124b625d8c3b85d8947073c2e9544f425aa16c10f71fabe3c03d29e424c47fe4ccdde +DIST regex-1.9.5.crate 253883 BLAKE2B aeb05371251aaa0fd11dce1f22ea095345b3b1e68d9d5e083b4b8b0b938d0d901b3bade66015bec830db3ee71d0d2ccac09b842ff9919e08b0e98112ea1897be SHA512 79b921edc977dc98bd07e89dc17873c8a1088473ddf941504973259bb8c46ad11bbe3818fb88a7ed07b86841206c322a9555033d0a5dfebb18fcae45e07ea53e +DIST regex-automata-0.3.8.crate 610113 BLAKE2B 1aebbca26e76e85b42b035fa9ba02f98425b75fdeeec0f12c1c08e8f4a320c64d36c129c692e622256d7f8772052041c47df1aff165d8337d55d61770963a777 SHA512 47ad01be2c51fd510576e14f399b7f30d379a2cce2dbef3af4ee3e609859451082885132ae703c810e2b19bb3716976356e057a1a592ed507146aff9e7138dac +DIST regex-syntax-0.7.5.crate 343366 BLAKE2B af07596e45e3525ffd253d6070ddad08dffc8f0409ea14843a135646da8b37a7a568c12ede809d9fa47eec2329f68da7a3b3c0e0cabfa200de64affe6ecefee3 SHA512 6388dbf68c8c86d8a5bd8cfb13a86e9ab2da1a339fd607c1a16848f85dd21c85d744d694c7b918954ea27eeefc90b589926c9da464343fb78ab639a5e2925efd +DIST reqwest-0.11.20.crate 155122 BLAKE2B f816012d5e8c966c96230a27a9ac394f6349903117e71404b18e33c25031e6697cc9d0f205eee78d9cc806f81f43fc4ba433beda6f1a7db66f3ba6c51b9af21f SHA512 0cd5fcaf8f3997683f39aec422c3cd5f37a5f0b3b7ffacae7d97008b0de93e21ab7318fba9a9eebbb677a5bc4289610d5153e8ac1e8fe94aac9da2c2ede94c6d +DIST rustc-demangle-0.1.23.crate 28970 BLAKE2B 611d2e41a8a9799db2f8bcb8fc8fefcda361d055a417d2bfaaf2dedcce9d6f388c69d905a28c65e6691b4d408d7922ccdc97ce524c87c3cccb8467e314bc87b9 SHA512 8cd29800254b1305ad50f1fc008838c52d9659f97a51a68e9f2bd6d0a60126f3ebdd1c79760f96445b3bf998d0773526ddf663b174acca81babdc0b423247247 +DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544 +DIST rustix-0.38.13.crate 342118 BLAKE2B 9fb31bba5253870345abc513768b0b0deaf581212462e328edd7ebcaa028979454585502ea9b4c93b82701ad08d134b637066f81204b4bb2a374ed5747c36acf SHA512 66e3914746895222963ab80da0fcbbb8489cb74dd37913f57f8570258265a94657d7dea37c944ed20543012bcb474ada3c50650a194554ba74fab07c313aab93 +DIST ryu-1.0.15.crate 46906 BLAKE2B 6d6949e43aaa27fba0ec6002fa11ba859af8d867f87c90d88413267186abbf6302b817985bca3d577ab3fab2e319e11756f144473a16330dfd8fc7b604cdc4b3 SHA512 4655b5647f919082a9b84b889539ae7fb23a1201057cf280efe79c58cb5f040864efb7812cda5021bf6d34838a15d173ac8bdb0fb9fa2dba85173d3efa5a826b +DIST schannel-0.1.22.crate 41642 BLAKE2B ccb512f6c6765e5245dcee607b7886411710aa89d317cbaed2f511f74a927a0083042653e070c9d4b976ec83a74f3f37218f3ecb621781ee367b774596227f68 SHA512 6ec962cbd25f25dcee5e31b5012e61d38b97a7e8651a5439ab4cbc8ab33a0e2ce04fa22e06a82ef8750001c6659937ffd8dccb0cbd6971f68b0c354d0075aaa0 +DIST security-framework-2.9.2.crate 79295 BLAKE2B 96be139f2d2b9bc2fec7805c9e90f19f68fb6cf3f09a879f1d5952b502951900fd6889451c6866e53394859a0f8a842b4a674c4bfa82cd71f48195c0af365475 SHA512 fdc58c1c12ff849af3acf34208411caee50f30b9d55e20ef9d3922ee37664c606abcf90c4b415e5c22498dff2116fe2b2f374a0bd382c837ae7d281cd1a0a54a +DIST security-framework-sys-2.9.1.crate 18284 BLAKE2B f1484b6b691f3616192ab363c81eb3d6279ad0bae6bb7fbc4eadfd9fc6b6bcd5ce42fb8edab1eb8934f40a1d42714eeb8ca3616871e8f80c90318834901e8ca6 SHA512 3118d1e982d94c5fc6e8ad6270ba398da98a042c7a2060eafb3b78a54491091c46529bec30d4f871744431f01b828ba2a795f695cd20d008441839f3c4350462 +DIST serde-1.0.188.crate 76230 BLAKE2B 81e92adf17e3f2ce73c82e3069b8fd656211cfeb6755abd338b74d52f748f5bba6690abf5c83ea2a126fbd6187bc587b539f0ebcf621e928085876f28fbb9513 SHA512 7d42ce834bcd1034f8ccbcd6646cc93f8e189e344f29f4d7b0ab148ba11ce7848d0ab986dce7a0245fcd6893243f5768f7bc0ca9c24c75c53585ecc899d312d2 +DIST serde_derive-1.0.188.crate 55563 BLAKE2B 3b24044915a704d9d8a2cae6e6547ecffea7ee3fd4260ddb2bf7fa38b23fd7fc597b61ac28bf65b9f0d45e18ffd6bc7596f5a3d602cc79835697fb3f5440242f SHA512 fa9132a319f7829e6afad65289031be99255466d76270875d9d81f82f63e53592eaef5452d0df38da92e9d0b6f2b37e91026635fff4bf597b0ae662b71b5eff0 +DIST serde_json-1.0.107.crate 146458 BLAKE2B 753be6076826ee0ba41a067e81c031e6fd69b539086a2d649e6595136fd05d61b717c3d4cb6774af0a0c02102f7f4588e682bd21732450afa93877d093596880 SHA512 ecd4ef86538df402f2a397cb86c5b4b277a9a43d742e2af3d51ab5ac0ba31c677bfc72db06c10f8abbc970ee41d5f77d758f1f70ea18495d96bf78cb7d66c2bc +DIST serde_urlencoded-0.7.1.crate 12822 BLAKE2B 38c74ea862f041828467dfa586bad9b8e1d1d64a9f82fb7f98727e3965377d00e59f2dbf20955a9dce976b6911c0a619d2a6e4cc9dfc73cf0f6c449d873fd072 SHA512 b209ad01b6565e95c1d5b431a3f4f8a0df3d11c2a06a44123048bfa4b34ebb6807eec593f0c1c89de3a06ac3786a14747df9c70b4f4d5e4b72b4feb53084eb60 +DIST sha1-0.10.5.crate 12146 BLAKE2B 476a0c365ab639a0ce427856787595865a60339fd6b81a45f879ff9b9112021d2c3a62e0a817b4555951131a7fe257d0c30988631ddddc3d217274c46c79ebe6 SHA512 1046b91a9ea64b90098ee6e16c63f0620dc7c2dc847d200972a3da3c8d1ac61fa9030682099a411cdd24717b64d488e0b1be1cbe8f7bfee26b8c15cf4f8e5e9b +DIST slab-0.4.9.crate 17108 BLAKE2B 8e5288c4d00efa915e7be27b55f2204850968624f0d8101c091a357131106bceeea7a63c98007420c12f67893dd2228b15d3f23508108c3a0ceaa605474bc7a9 SHA512 b6b5423ae026472920f7c9a4abe0962314140a36dc562c0a9e3fa60725b2b8b7a8b343110d9d4c0e18fb318b0103e14c0ccbc9ae350d5563a5ac80c35f228c40 +DIST socket2-0.4.9.crate 45421 BLAKE2B 19c296b1b42839086793a29234f604a6c94ed1b9d30c4eb1ec695a76acfa266840f482e64b4ee2d5b4520f70849fbaf88984020ac25ec393918b89b2682d2541 SHA512 6cb2aabc409fc7d9942afc2073a36ad8730c06dcdab1866b9d3d72dc55afc643be6a2ca1f38c2e19fbfe782ae584512a1ab357c0f4974f98967a4f489e65331f +DIST socket2-0.5.4.crate 54663 BLAKE2B ae0e17bf233f3536a10f190c4e4ffafe9d20e4f6359877203cea29b5de6ed65d89617def3d691e3a7c1040dad1bfa414fb9f121692d0881c44a845165be1b8db SHA512 76ec5d712b24e0c42d0400abe2d6681f0e9d707f5ed562475a0496b80a2003991564519c555a175e8837f6e8083a7216b197634e5a1a68d2f5cc268ae6e30c2a +DIST strsim-0.10.0.crate 11355 BLAKE2B bcb25ad0a7284e24e4f17ebe0ccb621bdc4118e499b50b094d98aa7e8fcc0b96716c9953c3516ce7ea78309d41d424892ded595259696a5bbffdcb07802b5c2f SHA512 78b318532addfcf5c1ccc1e14539e258aab9d3cd893cc45d82342549bde838c177d90f13c560671f8f32929af47d0b467db35e6876bd7697d8b3f9e055aeeac1 +DIST syn-2.0.33.crate 242543 BLAKE2B 059b4e484739e7a3ba563ede8a361fb020e4d8002024758c24a5d507fc083f553e30497435db27fa36176bd724963dbeee3bec76da0fb3f654c89132ee6567ac SHA512 5534c33d0a4bbe93f46a489406745169127e8c72d50aed39ecb249090868b13dc225e03ee95a1d3e13b5ce7e2dd26d79adf3b993289a183d14ee9fc1a19e9a16 +DIST syslog-4.0.1.crate 7131 BLAKE2B a6555d6eed6a0701cca7d58554f2ee612a5d18975dc1979414ac536128e0e7d4a67dde0ad2e40b5ffec823f7edd55dc45d646097fcd457fa6124de95411b4c55 SHA512 faff2117fbf377343149e30a4b338fdd799fb7e4bf425962c2523423f8322aae75f180e4a4c42f1497239400cc60a49cfcf65c00c48433ac956ff17e52063341 +DIST tempfile-3.8.0.crate 31720 BLAKE2B ac975555bb4957f91e7d5733ef737bf25c62a738096457afa05079ed038de5e7144cbfd0e28bacd3eeb832de611616fb39ec07866481205c1f5c1005b2869d31 SHA512 8bc8e954bc0c6af46cf6e77d70f93583baea39fce54b111f4bba51fe5d5e5c184753ae2a2ea68a882b6ba5a157a57aeffeecc3e3cae86d78d952f3aa025fdf7f +DIST termcolor-1.2.0.crate 17917 BLAKE2B 5ca7802b0bd29495bcd2deaddcdb4c3ff964073a373eaf39964a24ed91a48c5c33e192d676099e2837064df3149fdd73aba7d241e9aeaad9887bf1bcae9d38f0 SHA512 cf1896523353390b2f90b2a8bf30f47da5fc7c2daa635bd0cd8059bdc73feb243e46e4279562fe45d5726f2840833b1e967c7de19ffc0c853592d9f86c0c1be7 +DIST textwrap-0.16.0.crate 53722 BLAKE2B 44140aa2dfd5076005749449a56e920418e71e34cb92f1d697eb3f3e7f6fe87b0a3861c8a4050a4a62e03187b6cadc4495e4200bee52ee183541431c73e47209 SHA512 97ae8acece5663e1a6b08b827179e96d5ad0ee67d635888cc3d83454b52cf48fce97eb0eba374ba4747834099c74f43d66d9fec868e84be45369a42c1aaec2c3 +DIST thiserror-1.0.48.crate 18862 BLAKE2B b98d63646526e1ed0baf27a17faacee3d8be34421f6fb211d4e1909965a3a327440c0b97c4aba423f416c5a849a47a1d42623a6e64ae27d2236706dc9a30a783 SHA512 078427d19a28f59aaca27f508795cfb06c024b5a34dfc83360c3bec2b8f7abe474706a41fb68732998f154507921beb03dd033f0a6d1dcfcee03b1f2adb8a0b2 +DIST thiserror-impl-1.0.48.crate 15096 BLAKE2B 6b5eed1102256f2c809c21201cf319cc8eed11ab1dd04e6b6bf9759c8eb32e58f0c88407e7c515ac801cea69abfa3bba0c4ee98b034459129f322f6918e9e168 SHA512 6826e242445fba8beb16325fe2e0ad0423b84aae6c1a035dca85e6e07d2b62be8879cb1a0a2b307602d330ad83530260a2480123c9ac5cde59157f74ffd665b7 +DIST time-0.1.45.crate 28911 BLAKE2B d43e2431752881f6885d572017f461b304d07ee5ef0d8b4898e62b47c8154268839c3bf69b141159090cfc0d90bd0113d6084fe99ea1f2b1e20668528ce21112 SHA512 e643fb8649f3efdaa1b0b6abc6a140d55ac550a55cad99d0cce9415dc51e155fb1ea240953eeaba5dc47ec73c49ab7f2962af79c693436289de0eb3ff60985ee +DIST tinyvec-1.6.0.crate 45991 BLAKE2B e9699d4d80a78978f0ebfd049f5b33d7f23d401cf4f4439ccb168e8c0e322473ad0ea7e2ff0ff69e9aac3e5c4c9ae5a7102185533bfbf96dbe77b3526e700bc9 SHA512 e5acaf353c58c60ae5556130a934f1048abb79cf6668ae467d308bac44b689d8a9997227ea879f4b5fe50f29cde8761801b088d7149bcd063b973056c381921c +DIST tinyvec_macros-0.1.1.crate 5865 BLAKE2B 2bf4f68ca11dc19c72232951605a4c809b34ff38ee365ee4f592a3c41360e23c9330cfba961e2692a0ad568fef4aaaac51c40808d491178cf7a0c4b5a1c5d484 SHA512 10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e +DIST tokio-1.32.0.crate 725004 BLAKE2B 80dde8073cdd361c8e05a8ef3b0fed0b4ee56c915ed6c0adde4bc2db487e0dd60a3adafa55aa9a763d37ec992a27208063aeee6a95b594b2e5b02e2bf65da9a0 SHA512 c7a64e08b4584b52c98118dd07316ee3bc0c2b405278f37bce58c512072c20268df66a8ab553e4d3bd3470753899ac3b1df4b9b5411743dc0e092fbc2d9b11a2 +DIST tokio-native-tls-0.3.1.crate 20676 BLAKE2B 4c752179aab8b4beaa6aa212dc8d9e4a2b7c12be0dbf80406f20f92fd12844a3390e88a1536875596ab44774a67ce35115ca4622f9faa977c80c4261ab4c06ea SHA512 bda2e77671e030a021f628ad760b3fbdc26e7483a5f9ef6c6892ae0fc38b538d52d527805c020d578079896d50fff0bbc036a87cc91604904840d5b7dc181914 +DIST tokio-util-0.7.8.crate 101644 BLAKE2B bfd0b10b2ef7d1264262f78e406aaab07a1e060885dd7d9694b3cc34b6ae9f3d46946bbdc5aa3dbd0f6164973fc3305b20da04f37176250e874b3259860cfe51 SHA512 7b1501dd224b4a6749a5296751d83e6d57bae238a92430c32017813ab82c358086a555fd7d34537cc944c240ba73d4fb94864a5743dca05c138f834d45ee245e +DIST tower-service-0.3.2.crate 6847 BLAKE2B d4571704eb4bf7f729f4535a04b7eb94f644d71ba8c5604297843351adf4bcce7ff64ec4e5435783ee6ada1b0a5c97726cfaade391525c6b2bca933cd5e8ec19 SHA512 f4578421603067fa708c4ad9eca5ca096b5262b6d51a404f37d9fbb6c64f027cec6114991e4b7f8324cb756c033971a384f1804add28e00d0cd6b2ee01d9e005 +DIST tracing-0.1.37.crate 73888 BLAKE2B 60c74379bf84d7b152f0b4d5b4d4669a1227dce0f3b5c10210338193853ca332de7eed3cc3b6160ee3719da7fdfe565665a887f2f82fb1e1c716c421048a2e87 SHA512 2116045f51b35e90fc933cc136d045d09c0aaa33400a9056051d887fea2d2982b394830e4d4c3bcb4b831e62b9c19f6c751c2d216169f663aa18c4067aed7d75 +DIST tracing-core-0.1.31.crate 61263 BLAKE2B feec046ddd3e04995bfe24defd6ae1187fd7ad78d80d69031178f67ed534e9aa6ab6aaea92dad509f57e220df5f6f025ab8f96bbc957834126f53dcad36580c3 SHA512 66fcd0b4f32de3816b1dcbeda1af26fae0a79d088894637984dc6a0ca65b609f5f166cea376601f6a75f8e3a281da6d4450dc796aa0a7177ad615330237e2bed +DIST try-lock-0.2.4.crate 4467 BLAKE2B 7afbe36d02ccf31351c7c7ca4415578383bb4d0fbf89ba2c5c7835dbf410326fb0f6cb302baf7c1edccc4b193a2ab8079545fd67f26a74457d116204f3c6e745 SHA512 fbd989589eb0a1fb226de65537d51eceab632603e69710b37708d6109ed09c07333189675d5e560e35cc836e5cd211c726d8ce247186b5ea4529328d46c22632 +DIST twoway-0.2.2.crate 30454 BLAKE2B 3d349c555e0df87b6fe4910611c5759e6ffc5287dc1994ea47c8e17ce0d636f0ba219d73aa68af21a560d926caa4a417ac0d4b6d2d60b6f2832b9849339b77a8 SHA512 dcaa31226ca9c0d67e6eb85fbf97c8089ffae66daacd55cb043677807a76b09c6e4b6533b6c6c9ee06b0a09ac7b9d1c3bbd3ad31cb2d4748f59a784fc489d9f2 +DIST typenum-1.16.0.crate 42477 BLAKE2B acc6dcd4521493c438a8a3d997ab0456fdbff3db66aee9b81ba219714d47522c3ca8fe26f8ce84edfda416ff9a22747caf3ecc9cc4bcd1e7647ac351d5aef407 SHA512 93da3ed62573acbc9d5d31257fb72ae9cfc7d59e4040c1f32d93e8fec94795e1aa20a3bf76ddc64c4b383184306bb2a66e51fd61b64dd4ce46a1bca8238b57b2 +DIST unchecked-index-0.2.2.crate 8325 BLAKE2B 25c7bbee1d3b90bad05a91131ce1647a48b97e08a745e9cc8b829e1e9c2e1a6b650715ae7747105df07096607fc929ad7b8d54f06e23c662c1750bb4c7e7ca1b SHA512 3634e077fab98284e6e99bbb1fa6691f58d2c39ece67c65c89f8142820f0bb1836553a107f49eec0c72455c47807bd8bc1aba940029a6e27b4b79b9be79b2ca5 +DIST unicode-bidi-0.3.13.crate 44477 BLAKE2B 90d80e7c57e93aa9aaa83e7c3c1a93bb6e4d51047803e61ed3f7c80361987947b2029a2b679bd301e8a0766ee8ea7f080e9b9b6ebcbb4354e19813a0f7da2abc SHA512 fb094fcfd907d90fa7232432aca0143209446e4c5c73d8a0fe6d2dc44b9dbb5b8b926c59b5e3f9a5a0a36f91c04613509b6e430c9c4adf526e7445e6e8d7a3d9 +DIST unicode-ident-1.0.12.crate 42168 BLAKE2B 4cede03c08758ccd6bf53a0d0057d7542dfdd0c93d342e89f3b90460be85518a9fd24958d8b1da2b5a09b5ddbee8a4263982194158e171c2bba3e394d88d6dac SHA512 bc1824e1e4452a40732fc69874d7e1a66f7803717a314790dcf48867eba34bc9441331ef031e386912e52c385645c25b6ed39d4f149973b5b97371b1b96b1920 +DIST unicode-normalization-0.1.22.crate 122604 BLAKE2B 3f3430b279cc0ce1595392c869442ce676ab097154c688779ebcf726e10c497df59be2cd7bb2f84f99499a9df0654760a10ac92224c17d74775aeebe291241e1 SHA512 a5810d5e9cd93dbb80e013997aa9d38e60834619483a6623eb2859ec5d59a5aec3fc4db123dc7f4e2fe9f2b8799cf6af48bdff22d69a00a23707240e8bf3bb3c +DIST url-2.4.1.crate 78228 BLAKE2B 6e324237af50605e9285889d967e6a66e258982c5e78ec99b2df68cbcc555574c0b0d650724ecb015e1065c737c88e3c04205973c35b0afcd63f222e91dde3f9 SHA512 ff2aed100e405f4474e17dcc01d59b63460e7a8babeb7cdcf9df6c1c65216c425e24d557f76c7097702b2befc381656107bef755ce929089b52a3901c46aa185 +DIST vcpkg-0.2.15.crate 228735 BLAKE2B 6b6bacd9a7fa38919241f45a97f58cae957e58d3aac99df208a26aa718e4f1644f4ccefa31b09151e5c1952288e0e5837c363918b98c7f55079a948a952c1c50 SHA512 7322a21e8811b2fe4e79e09dc321458068ecdf1953f05d36233f3278ecc0b1dfc64194db7010dd46fcf692285f42475beb090c6c6cac0c8f9fe0eb5c770e3172 +DIST version_check-0.9.4.crate 14895 BLAKE2B fa1fa4008af165bfc1fdbe560488afd9d232cfafee94104fbcc4cbc52f234849bff9ddfa88109a1ac682f6d9c1d86b0459893d223f64e65adc08966aaf93dc89 SHA512 b172dc9a3759a4a683ffc39b9a40b03b9974b626a088217de87090466cef695226557c226cf3e469b2b25ee7297b7eb0d7719878cab42457f80146a81943c0c8 +DIST want-0.3.1.crate 6398 BLAKE2B bcc1384bbb86db27b5e082b29a8dd4d89c37b40f6cdec4df8a86c8d205b418468b6cd42a78bd14ebaba057b28e151c00b474c098d7596f49a823ce33510c13b9 SHA512 f93f765113f035e134b967e8eb3f4511b8e03e793a47899b614d826afac02348fc02865c298a10410ecec4eb64f35f66c22bcbdbe36ed0c4c1665dca1db4d526 +DIST wasi-0.10.0+wasi-snapshot-preview1.crate 26964 BLAKE2B 525db01649a5981ee82ad80a1a4bab9baffd235262452675619f36a1b454017a74593c53c129f8c30b865994bbe30ef19cebaad9d245ccf54b9b07ef70d5d8ec SHA512 88e2da617f50d9ebfb1e0c5857321fb86b5ee88ae8a8d199d3cc092e0f39688a2cb68503f7c6bb09dd6bc50a9a03597a1eb2e032150fbd0d0b8afa02ad771c88 +DIST wasi-0.11.0+wasi-snapshot-preview1.crate 28131 BLAKE2B fe501889f25d65e2d032f885cc50c4f8bf7dd70fd5cbc438de349838370d8699e9627b0a4fc76030ea9fe6d508f41d0c9928a875fdbc47e73bfb17241cf7b155 SHA512 043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f +DIST wasm-bindgen-0.2.87.crate 175052 BLAKE2B bf8cf4aa1786ac5c2ba76e80500b5c54313adf9690ef370e60b894401bd1b81416da7bb46b90c014412c96f30f995bd1e52cf7f3a6be1111aea40866e8178396 SHA512 0c3099155ef079d2b91d2d5b135243d687bf865cdd9ae9d97d8cc2eb4c9bf7439b66b28d5b1d7e95048e53be63ed4909b6b3f2427951348de25ca7abb7a03705 +DIST wasm-bindgen-backend-0.2.87.crate 26821 BLAKE2B e230aa256a1f681ab3ffd2c83c3f6a810c305bb79a5e1d806b8b2b9f54ef0babc83809f6153b9ca511faa4b122f80bd1cc9eb97e7ae3cb4cba9e2dc1c6bd0b51 SHA512 317ee2bdf85067cb7f4b4ed6ff475ff9e5063143e9b7c8a28572211c09025935815227c4afa8c92823ac92102562d4d34531aa4891d8c922048d37e27377ee94 +DIST wasm-bindgen-futures-0.4.37.crate 15193 BLAKE2B 06844bb1ef1b492461e245ac16ed13024c7f3acedd0355aeab11b8e8f32d8b607c5642ac5a41432e72a7d3fc84b6c842929a6609b8e77d7482e273a561506ef8 SHA512 144d321ac7c9f55d94e8a0a6803c2994be763141a757f33c27513fac45b0193d4e4429c899bf1fad25039d56054a0fa381f0171df09c06260532cb06d5407448 +DIST wasm-bindgen-macro-0.2.87.crate 13897 BLAKE2B 0926975b0328cdd5525820358795b7b68b4ab9dc460715ed84e5d276e76e936057140efb1ba875acf25f3d2862e680f9827bd05cc47560d54f7ec673f30244cb SHA512 af366d8d853b280014cdf5286f3b1f6d7fb0837ce6e359a81cb6f85161537c8e2cd06d7f893c957f5bf1548d34084d33a213670b471937782b56033a23cb15a6 +DIST wasm-bindgen-macro-support-0.2.87.crate 20006 BLAKE2B d32dfc7231e4fbc226586e66063538208f9e299fbf803c4e2d1e1e61b4a22f51cc7509bdd269a44f072f9843a083ee84d2326408fb3211009ce93542c3fdc6ce SHA512 9390aa2767fed1027be168612c424d4c7cd4423addd83b79afd8c67886f66303ca4846e6454302ecc78b47bc62e8ee46849a4c0d3edb98849ce8476901424e33 +DIST wasm-bindgen-shared-0.2.87.crate 7248 BLAKE2B 0393ce9452119fd5f92836a76b28d3a697f91fb09de39d1af0a2a83e81d48bd4a17f39b48f15ae97edca3e361d4f8fedae8de04173c4ba1711decc73f64000d5 SHA512 cb9ff537554f56fd07052ddc4adc904a57ee64e13298df1dfca58b361ce163c34640e7dd9ed301ec1375f335dfa424230e22638ea7569ceb34aeca4505f6c008 +DIST web-sys-0.3.64.crate 725584 BLAKE2B f650eecc22ca53b75fff06c4117439d8fe9efa486701cb16a0daf76865cd017a9e25ed8c7ae1fc65fa2dd94a12c14bc2e6f9e837b70b47b4ca468bef65a29f82 SHA512 b02b0bc3f1354842b364d2f062ea4f5025edb6e615046750b56a6e2fcacef7e0b46a190eb45e14e590cf297e3ec1a813a81612ac5acfc12d744fe16c5ce041a4 +DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 +DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 +DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd +DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 +DIST windows-sys-0.48.0.crate 2628884 BLAKE2B 551e900de4f67187ef034b60df9fd0e0d8f82a3100ef28e1eabd543ac129d882dc86ffcc1714071aba09e4cb2ae2d2f07ace1a32b99fd989ce525cf05991edab SHA512 bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed +DIST windows-targets-0.48.5.crate 6904 BLAKE2B 7396bb210f37bd51da86f39fca3425c8f6610721d5c4e94f9fafa0a8a8046303b3fcc6979146bcfaa32f4406d242a0455f6cbb220f84c6ff84650e755acf5223 SHA512 e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 +DIST windows_aarch64_gnullvm-0.48.5.crate 418492 BLAKE2B 5c6f7d73ad05740f0bac304ed1ef9b2ea63b0d6ca8f875552ae299a0b73b1557e8fe996f1c2b69be9f2df350c9288690f49ee62239a2896991364331d6c55462 SHA512 20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 +DIST windows_aarch64_msvc-0.48.5.crate 798483 BLAKE2B 60c466d6536426425a34b5ca20da97c8127ebeb4fb9b1363911165bada484f8913fcd50e90410b5661e0c27dbfe8f4eeaa62fb17d1f3566bfc82b6255e11619b SHA512 223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff +DIST windows_i686_gnu-0.48.5.crate 844891 BLAKE2B fdc37cd74a4982056bf22fdb7b84e1c55dc838f3cb19ff3648730a77e673ef4ecc0380b3e4277bb8df2fcfa25f57b69014713d9e3ed27c28e19b25b3ea2ab774 SHA512 931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a +DIST windows_i686_msvc-0.48.5.crate 864300 BLAKE2B 3d3ea8be55e2d6ced0eeda18abe1dffb925a1a78f456d683e4450d9f2fd287ad2e8494d65b2b770c677a12b3a60d10f0435e16c61880e3867c3657fd44892442 SHA512 70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e +DIST windows_x86_64_gnu-0.48.5.crate 801619 BLAKE2B aa7e7e6a6ff9f9553ada3a0a39a9aa798e9d995a8eef36e0b6fdb2a0db93ddecee5548970575271fe43aec74797a420d0ee231d503b5bad1bd999059261e0e33 SHA512 1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 +DIST windows_x86_64_gnullvm-0.48.5.crate 418486 BLAKE2B 12a2199d434617c1df1a839e9f435620ad64b40c579f6d0c3677553ad7a48e5765d12c266b04946402e15c92cff2e4ac4979ce2130750ef426e2672119680284 SHA512 c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa +DIST windows_x86_64_msvc-0.48.5.crate 798412 BLAKE2B 8abc0721e2fb337fe17c91d278947d36122d9045b839ba0cf3e690202d242265b676f23cc301da5f9d98c56ca4ecb76f7d6f072ee71bf986a1deca87020b90e5 SHA512 fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 +DIST winreg-0.50.0.crate 29703 BLAKE2B db9a968ef96cc07bc1088831affc4627e09c7ab8170a54fdf70a599c2d6180a8a9ac46b6304b61fdd2fac96e01bb004ebd8051940300c7b52c5b7b7975732d11 SHA512 2f52a9e3ab794665263499c88dfdf06009c6477d180a90ebbe86e786ae7f5003c9dc8b3c26224024e79450f3b94688000458f2ea8b1ae1c3691453c3d4df4787 +DIST yaskkserv2-0.1.7.tar.gz 178989 BLAKE2B 3407827bf3c0b4a6cb5e9755917e82e1fe0fcfd698422fccd78a17fe072f2a507e89f778771b684f24b41dbb7bf2524662148ecf67319317b358929acd7d66bf SHA512 a409ddddc4facfd0bf88ab975ec8ce0c68352550620c8c98e2d7d375258b597adbe18b355e9ff398d710420455152ff9b302a45fcc367a8962b829c5d53a3c9e +DIST yaskkserv2-testdata-202110.tar.xz 6789332 BLAKE2B fc7c44ca9899972095f37f01e9c08c95c763ff3fa027a785f8d979e4a8c6f0ad2defc965e1d3263d9fbc595368ab83022a2b615712b0795854538a68c138fc93 SHA512 351a5a67014bfcf0f8ed16ba171c59936e26c3aad960a44484304a0df86d26b2a6f75a3c4762149c5dbcc7c7717cc29559e7ce1b2f0e79f913c33501ee63e3c2 diff --git a/app-i18n/yaskkserv2/files/yaskkserv2.confd b/app-i18n/yaskkserv2/files/yaskkserv2.confd new file mode 100644 index 000000000000..88aa250a0128 --- /dev/null +++ b/app-i18n/yaskkserv2/files/yaskkserv2.confd @@ -0,0 +1,2 @@ +# Options to pass to yaskkserv2 +YASKKSERV2_OPTS= diff --git a/app-i18n/yaskkserv2/files/yaskkserv2.initd b/app-i18n/yaskkserv2/files/yaskkserv2.initd new file mode 100644 index 000000000000..c07a1b30eadc --- /dev/null +++ b/app-i18n/yaskkserv2/files/yaskkserv2.initd @@ -0,0 +1,13 @@ +#!/sbin/openrc-run +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +command="/usr/sbin/${RC_SVCNAME}" +command_args="--no-daemonize ${YASKKSERV2_OPTS}" +command_background="true" +pidfile="${pidfile:-/run/${RC_SVCNAME}.pid}" + +depend() { + need net + use logger +} diff --git a/app-i18n/yaskkserv2/files/yaskkserv2.service b/app-i18n/yaskkserv2/files/yaskkserv2.service new file mode 100644 index 000000000000..95e7af683973 --- /dev/null +++ b/app-i18n/yaskkserv2/files/yaskkserv2.service @@ -0,0 +1,11 @@ +[Unit] +Description=Yet Another SKK server +Requires=network-online.target +After=network-online.target + +[Service] +User=nobody +ExecStart=/usr/sbin/yaskkserv2 --no-daemonize + +[Install] +WantedBy=multi-user.target diff --git a/app-i18n/xsunpinyin/metadata.xml b/app-i18n/yaskkserv2/metadata.xml index 271ef4abaa80..488bef8ae6a4 100644 --- a/app-i18n/xsunpinyin/metadata.xml +++ b/app-i18n/yaskkserv2/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> <name>Cjk</name> </maintainer> <upstream> - <remote-id type="github">sunpinyin/sunpinyin</remote-id> + <remote-id type="github">wachikun/yaskkserv2</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/yaskkserv2/yaskkserv2-0.1.7.ebuild b/app-i18n/yaskkserv2/yaskkserv2-0.1.7.ebuild new file mode 100644 index 000000000000..7c5d7b13e2b2 --- /dev/null +++ b/app-i18n/yaskkserv2/yaskkserv2-0.1.7.ebuild @@ -0,0 +1,229 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +CRATES=" + addr2line-0.21.0 + adler-1.0.2 + aho-corasick-1.0.5 + atty-0.2.14 + autocfg-1.1.0 + backtrace-0.3.69 + base64-0.21.4 + bincode-1.3.3 + bitflags-1.3.2 + bitflags-2.4.0 + block-buffer-0.10.4 + bumpalo-3.14.0 + bytes-1.5.0 + cc-1.0.83 + cfg-if-1.0.0 + clap-3.2.25 + clap_lex-0.2.4 + core-foundation-0.9.3 + core-foundation-sys-0.8.4 + cpufeatures-0.2.9 + crypto-common-0.1.6 + daemonize-0.5.0 + digest-0.10.7 + encoding_rs-0.8.33 + env_logger-0.7.1 + errno-0.3.3 + errno-dragonfly-0.1.2 + error-chain-0.11.0 + fastrand-2.0.0 + fnv-1.0.7 + foreign-types-0.3.2 + foreign-types-shared-0.1.1 + form_urlencoded-1.2.0 + futures-channel-0.3.28 + futures-core-0.3.28 + futures-io-0.3.28 + futures-sink-0.3.28 + futures-task-0.3.28 + futures-util-0.3.28 + generic-array-0.14.7 + getrandom-0.2.10 + gimli-0.28.0 + h2-0.3.21 + hashbrown-0.12.3 + hermit-abi-0.1.19 + hermit-abi-0.3.2 + http-0.2.9 + http-body-0.4.5 + httparse-1.8.0 + httpdate-1.0.3 + humantime-1.3.0 + hyper-0.14.27 + hyper-tls-0.5.0 + idna-0.4.0 + indexmap-1.9.3 + ipnet-2.8.0 + itoa-1.0.9 + js-sys-0.3.64 + json-0.12.4 + lazy_static-1.4.0 + libc-0.2.148 + linux-raw-sys-0.4.7 + log-0.4.20 + memchr-2.6.3 + mime-0.3.17 + miniz_oxide-0.7.1 + mio-0.8.8 + native-tls-0.2.11 + num_cpus-1.16.0 + object-0.32.1 + once_cell-1.18.0 + openssl-0.10.57 + openssl-macros-0.1.1 + openssl-probe-0.1.5 + openssl-sys-0.9.93 + os_str_bytes-6.5.1 + percent-encoding-2.3.0 + pin-project-lite-0.2.13 + pin-utils-0.1.0 + pkg-config-0.3.27 + ppv-lite86-0.2.17 + proc-macro2-1.0.67 + quick-error-1.2.3 + quote-1.0.33 + rand-0.8.5 + rand_chacha-0.3.1 + rand_core-0.6.4 + redox_syscall-0.3.5 + regex-1.9.5 + regex-automata-0.3.8 + regex-syntax-0.7.5 + reqwest-0.11.20 + rustc-demangle-0.1.23 + rustc-hash-1.1.0 + rustix-0.38.13 + ryu-1.0.15 + schannel-0.1.22 + security-framework-2.9.2 + security-framework-sys-2.9.1 + serde-1.0.188 + serde_derive-1.0.188 + serde_json-1.0.107 + serde_urlencoded-0.7.1 + sha1-0.10.5 + slab-0.4.9 + socket2-0.4.9 + socket2-0.5.4 + strsim-0.10.0 + syn-2.0.33 + syslog-4.0.1 + tempfile-3.8.0 + termcolor-1.2.0 + textwrap-0.16.0 + thiserror-1.0.48 + thiserror-impl-1.0.48 + time-0.1.45 + tinyvec-1.6.0 + tinyvec_macros-0.1.1 + tokio-1.32.0 + tokio-native-tls-0.3.1 + tokio-util-0.7.8 + tower-service-0.3.2 + tracing-0.1.37 + tracing-core-0.1.31 + try-lock-0.2.4 + twoway-0.2.2 + typenum-1.16.0 + unchecked-index-0.2.2 + unicode-bidi-0.3.13 + unicode-ident-1.0.12 + unicode-normalization-0.1.22 + url-2.4.1 + vcpkg-0.2.15 + version_check-0.9.4 + want-0.3.1 + wasi-0.10.0+wasi-snapshot-preview1 + wasi-0.11.0+wasi-snapshot-preview1 + wasm-bindgen-0.2.87 + wasm-bindgen-backend-0.2.87 + wasm-bindgen-futures-0.4.37 + wasm-bindgen-macro-0.2.87 + wasm-bindgen-macro-support-0.2.87 + wasm-bindgen-shared-0.2.87 + web-sys-0.3.64 + winapi-0.3.9 + winapi-i686-pc-windows-gnu-0.4.0 + winapi-util-0.1.5 + winapi-x86_64-pc-windows-gnu-0.4.0 + windows-sys-0.48.0 + windows-targets-0.48.5 + windows_aarch64_gnullvm-0.48.5 + windows_aarch64_msvc-0.48.5 + windows_i686_gnu-0.48.5 + windows_i686_msvc-0.48.5 + windows_x86_64_gnu-0.48.5 + windows_x86_64_gnullvm-0.48.5 + windows_x86_64_msvc-0.48.5 + winreg-0.50.0 +" +TESTDATA="${PN}-testdata-202110" + +inherit cargo systemd + +DESCRIPTION="Yet Another SKK server" +HOMEPAGE="https://github.com/wachikun/yaskkserv2" +SRC_URI="https://github.com/wachikun/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + $(cargo_crate_uris) + test? ( https://dev.gentoo.org/~hattya/distfiles/${TESTDATA}.tar.xz )" +RESTRICT="!test? ( test )" + +LICENSE="|| ( Apache-2.0 MIT )" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="test" + +DEPEND="dev-libs/openssl:0=" +RDEPEND="${DEPEND} + app-i18n/skk-jisyo" +BDEPEND="test? ( + app-emacs/ddskk + app-i18n/yaskkserv +)" + +QA_FLAGS_IGNORED=".*" + +src_prepare() { + default + + sed -i "/^dictionary =/s|= .*|= ${EPREFIX}/usr/lib/${PN}/default.euc|" etc/${PN}.conf + export OPENSSL_NO_VENDOR=true + # skip network tests + sed -i "s/^fn ${PN}.*_google_/#[ignore]\n&/" src/skk/test_unix/${PN}.rs +} + +src_test() { + export YASKKSERV2_TEST_DIRECTORY="${T}"/${PN} + mkdir -p "${YASKKSERV2_TEST_DIRECTORY}" || die + cp -r "${WORKDIR}"/${TESTDATA}/* "${YASKKSERV2_TEST_DIRECTORY}" || die + cargo_src_test +} + +src_install() { + cargo_src_install + dodir /usr/sbin + mv "${ED}"/usr/{,s}bin/${PN} || die + rm "${ED}"/usr/bin/test_wrapper || die + einstalldocs + + keepdir /usr/lib/${PN} + + insinto /etc + doins etc/${PN}.conf + + newinitd "${FILESDIR}"/${PN}.initd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} + + systemd_dounit "${FILESDIR}"/${PN}.service +} + +pkg_preinst() { + "${ED}"/usr/bin/${PN}_make_dictionary --dictionary-filename "${ED}"/usr/lib/${PN}/default.euc "${EPREFIX}"/usr/share/skk/SKK-JISYO.L || die + "${ED}"/usr/bin/${PN}_make_dictionary --dictionary-filename "${ED}"/usr/lib/${PN}/default.utf8 --utf8 "${EPREFIX}"/usr/share/skk/SKK-JISYO.L || die +} diff --git a/app-i18n/zinnia-tomoe/metadata.xml b/app-i18n/zinnia-tomoe/metadata.xml index 0601843f122a..65232f902279 100644 --- a/app-i18n/zinnia-tomoe/metadata.xml +++ b/app-i18n/zinnia-tomoe/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild b/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild index 59e943d8c1f0..a3033bcb1164 100644 --- a/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild +++ b/app-i18n/zinnia-tomoe/zinnia-tomoe-0.6.0_p20080911.ebuild @@ -1,7 +1,7 @@ -# Copyright 2013-2020 Gentoo Authors +# Copyright 2013-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="8" inherit autotools @@ -9,23 +9,23 @@ MY_P="${P/_p/-}" DESCRIPTION="Handwriting model files trained with Tomoe data" HOMEPAGE="https://taku910.github.io/zinnia/ https://github.com/taku910/zinnia https://sourceforge.net/projects/zinnia/" -SRC_URI="mirror://sourceforge/zinnia/${MY_P}.tar.bz2" +SRC_URI="https://downloads.sourceforge.net/zinnia/${MY_P}.tar.bz2" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" KEYWORDS="amd64 ~arm64 ~ppc64 x86" IUSE="" -DEPEND="app-i18n/zinnia" -RDEPEND="${DEPEND}" - +RDEPEND="app-i18n/zinnia" +DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" -DOCS=(AUTHORS) +DOCS=( AUTHORS ) src_prepare() { default - mv configure.in configure.ac || die - sed -e "/^modeldir[[:space:]]*=/s/lib/$(get_libdir)/" -i Makefile.am || die + sed -i "/^modeldir[[:space:]]*=/s/lib/$(get_libdir)/" Makefile.am || die + + mv configure.{in,ac} || die eautoreconf } diff --git a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch b/app-i18n/zinnia/files/zinnia-0.06-c++11.patch index 0ef6ae40e434..66a78a5a6997 100644 --- a/app-i18n/zinnia/files/zinnia-0.06-c++-2011.patch +++ b/app-i18n/zinnia/files/zinnia-0.06-c++11.patch @@ -1,5 +1,5 @@ ---- /trainer.cpp -+++ /trainer.cpp +--- a/trainer.cpp ++++ b/trainer.cpp @@ -103,7 +103,7 @@ if (!fn) { return false; diff --git a/app-i18n/zinnia/files/zinnia-0.06-flags.patch b/app-i18n/zinnia/files/zinnia-0.06-flags.patch index 80442ee4880f..5c26415f6018 100644 --- a/app-i18n/zinnia/files/zinnia-0.06-flags.patch +++ b/app-i18n/zinnia/files/zinnia-0.06-flags.patch @@ -1,5 +1,5 @@ ---- /configure.in -+++ /configure.in +--- a/configure.in ++++ b/configure.in @@ -59,15 +59,6 @@ AC_SUBST([pkgconfigdir]) AC_MSG_NOTICE([pkgconfig directory is ${pkgconfigdir}]) diff --git a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch b/app-i18n/zinnia/files/zinnia-0.06-perl.patch index 4da9e1eeb900..02d52faf93a7 100644 --- a/app-i18n/zinnia/files/zinnia-0.06-perl_build.patch +++ b/app-i18n/zinnia/files/zinnia-0.06-perl.patch @@ -1,5 +1,5 @@ ---- /perl/Makefile.PL -+++ /perl/Makefile.PL +--- a/perl/Makefile.PL ++++ b/perl/Makefile.PL @@ -4,7 +4,7 @@ 'CC' => 'c++', 'LD' => 'c++', diff --git a/app-i18n/zinnia/metadata.xml b/app-i18n/zinnia/metadata.xml index 0601843f122a..65232f902279 100644 --- a/app-i18n/zinnia/metadata.xml +++ b/app-i18n/zinnia/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>cjk@gentoo.org</email> diff --git a/app-i18n/zinnia/zinnia-0.06-r3.ebuild b/app-i18n/zinnia/zinnia-0.06-r3.ebuild index 70d37abf609e..8a6dbee115a7 100644 --- a/app-i18n/zinnia/zinnia-0.06-r3.ebuild +++ b/app-i18n/zinnia/zinnia-0.06-r3.ebuild @@ -1,13 +1,13 @@ -# Copyright 2010-2020 Gentoo Authors +# Copyright 2010-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="8" inherit autotools flag-o-matic perl-module toolchain-funcs DESCRIPTION="Zinnia - Online hand recognition system with machine learning" HOMEPAGE="https://taku910.github.io/zinnia/ https://github.com/taku910/zinnia https://sourceforge.net/projects/zinnia/" -SRC_URI="mirror://sourceforge/zinnia/${P}.tar.gz" +SRC_URI="https://downloads.sourceforge.net/zinnia/${P}.tar.gz" LICENSE="BSD" SLOT="0" @@ -15,25 +15,19 @@ KEYWORDS="amd64 ~arm64 ~ppc64 x86" IUSE="perl static-libs" PATCHES=( - "${FILESDIR}/${P}-flags.patch" - "${FILESDIR}/${P}-perl_build.patch" - "${FILESDIR}/${P}-c++-2011.patch" + "${FILESDIR}"/${P}-c++11.patch + "${FILESDIR}"/${P}-flags.patch + "${FILESDIR}"/${P}-perl.patch ) -DOCS=(AUTHORS) +HTML_DOCS=( doc/{index{,-ja}.html,${PN}.css} ) src_prepare() { default - mv configure.in configure.ac || die - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die - eautoreconf + sed -i "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.in || die - if use perl; then - pushd perl > /dev/null - PATCHES=() - perl-module_src_prepare - popd > /dev/null - fi + mv configure.{in,ac} || die + eautoreconf } src_configure() { @@ -44,8 +38,7 @@ src_compile() { default if use perl; then - pushd perl > /dev/null - + cd perl >/dev/null || die # We need to run this here as otherwise it won't pick up the # just-built -lzinnia and cause the extension to have # undefined symbols. @@ -60,7 +53,7 @@ src_compile() { OPTIMIZE="${CPPFLAGS} ${CXXFLAGS}" \ LDDLFLAGS="-shared" \ OTHERLDFLAGS="${LDFLAGS}" - popd > /dev/null + cd - >/dev/null || die fi } @@ -70,16 +63,12 @@ src_test() { src_install() { default + einstalldocs find "${D}" -name "*.la" -delete || die if use perl; then - pushd perl > /dev/null + cd perl >/dev/null || die perl-module_src_install - popd > /dev/null + cd - >/dev/null || die fi - - ( - docinto html - dodoc doc/*.css doc/*.html - ) } |