From f1bc537f089cc8477a9a18db597cb349e1b00e91 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Jun 2018 05:02:38 +0100 Subject: gentoo resync : 16.06.2018 --- app-i18n/Manifest.gz | Bin 21644 -> 21631 bytes app-i18n/atokx3/Manifest | 2 +- app-i18n/atokx3/atokx3-3.0.0-r12.ebuild | 4 +- app-i18n/fcitx-rime/Manifest | 4 +- app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild | 16 +- app-i18n/fcitx-rime/metadata.xml | 3 + app-i18n/mozc/Manifest | 10 +- app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch | 11 - .../mozc-2.20.2673.102-system_libraries.patch | 291 ------------------- app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch | 22 ++ app-i18n/mozc/mozc-2.20.2673.102.ebuild | 321 --------------------- app-i18n/mozc/mozc-2.23.2815.102.ebuild | 1 + app-i18n/mozc/mozc-9999.ebuild | 1 + app-i18n/tagainijisho/Manifest | 8 +- app-i18n/tagainijisho/metadata.xml | 4 + .../tagainijisho-1.2.0_pre20180610092832.ebuild | 189 ++++++++++++ app-i18n/tagainijisho/tagainijisho-9999.ebuild | 189 ++++++++++++ app-i18n/unicode-emoji/Manifest | 2 +- app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild | 4 +- 19 files changed, 439 insertions(+), 643 deletions(-) delete mode 100644 app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch delete mode 100644 app-i18n/mozc/files/mozc-2.20.2673.102-system_libraries.patch create mode 100644 app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch delete mode 100644 app-i18n/mozc/mozc-2.20.2673.102.ebuild create mode 100644 app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild create mode 100644 app-i18n/tagainijisho/tagainijisho-9999.ebuild (limited to 'app-i18n') diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz index c453657d49ab..44f70c18006b 100644 Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ diff --git a/app-i18n/atokx3/Manifest b/app-i18n/atokx3/Manifest index b8bf3827dd70..9b538ef32f53 100644 --- a/app-i18n/atokx3/Manifest +++ b/app-i18n/atokx3/Manifest @@ -2,5 +2,5 @@ AUX xinput-iiimf 259 BLAKE2B 02091d870ca82447aadfc6c33bffc38d2bfca596f4f5958917a DIST a20y1406lx.tgz 8491493 BLAKE2B d5823dbc49661434c48d056d0d1d082be3d1d136e8eb8aab6b48f27b8198102201d5daeaca11717fba512b6260b928e165e6f500e8f1d70665c8907b9b1e5ce2 SHA512 bf350be4f15db63b384ff10ec7e362c469a836d052e8885aac1bab049f7d4f0b04dacaecbe5c1303211405938bc3f674136ba5ae3b55ff31aa5e4f14dbec0273 DIST atokx3gtk216.tar.gz 69246 BLAKE2B 73d246e5c79da0888ffc32deed9d8770500c64377845c553f1ef4ca18b6c9ce93e20dd9188983d9a7664ead60dfb66f53f605a2ab7bf065db336266b5fb38178 SHA512 39c0ff01807626f417f34ef02e4be2fe07c52edc931775299e90fd8725d9c870c3473005fc87be5023d089e94fb4700f9ad36a10ad3373be22ec35e2a418eddd DIST atokx3up2.tar.gz 8427265 BLAKE2B 6af19673dd443f69870316413bd53712a5b1f148f07d7b7f9dddff3290a4b6d65866e7d38a3c6a3d1ff15990560b706d46a558a77ff4c8200b36b4f1345c62bb SHA512 b4ce05882418a18e6a0ab58d805a1edeca69187bfa16a98b8f79d749ec0cfdc1b838de30f3049d3b8b0929214164c4c2054dbe283dce0f18a1ab2daa181e306d -EBUILD atokx3-3.0.0-r12.ebuild 6720 BLAKE2B fb415b7e0bd2e21b19f137ea473ec685de3cedc7287188273c56844919b25c053a6ac404c8071c2ae622c2fcf8aa2133907c6831a7fa8f1bb6b5a0da5621c093 SHA512 1edcff3e2b30fb9e44db5a9ffeb76361678179a1528df76ec2c7d67c1ebdaea67cc5182b1e3a1e1f739bc75f4df0f8bfd156f3f47fcf3957a07950f4ddd22401 +EBUILD atokx3-3.0.0-r12.ebuild 6721 BLAKE2B 38a09411a47bd7ea2a41325377a3ec890ae25567a874953dd2bc0d443903f9c564410f68b50e8507a999f36a3a984077186869a0e6408566f38281e7a463bce4 SHA512 413de37981e24705a8311157df7fe18ae926fcfdbe99e64fa1cb8e01ae3ef238ebe11ef9a9c3e51392787b88215323a17fc6c502e49b0155f180f84e23cdbed1 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd diff --git a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild index 00345250cc31..70c48e5edce0 100644 --- a/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild +++ b/app-i18n/atokx3/atokx3-3.0.0-r12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -11,7 +11,7 @@ MY_UPDATE_GTK="${PN}gtk216" MY_ZIPCODE_P="a20y1406lx" DESCRIPTION="ATOK X3 for Linux - The most famous Japanese Input Method Engine" -HOMEPAGE="http://www.justsystems.com/jp/products/atok_linux/" +HOMEPAGE="https://www.justsystems.com/jp/products/atok_linux/" SRC_URI="https://gate.justsystems.com/download/atok/up/lin/${MY_UPDATE_P}.tar.gz https://gate.justsystems.com/download/atok/up/lin/${MY_UPDATE_GTK}.tar.gz https://gate.justsystems.com/download/zipcode/up/lin/${MY_ZIPCODE_P}.tgz" diff --git a/app-i18n/fcitx-rime/Manifest b/app-i18n/fcitx-rime/Manifest index df7f77f8a424..0815c051b62c 100644 --- a/app-i18n/fcitx-rime/Manifest +++ b/app-i18n/fcitx-rime/Manifest @@ -1,4 +1,4 @@ DIST fcitx-rime-0.3.2.tar.xz 40960 BLAKE2B 1c9185dd9d2912e74b9916916fed09a01c30e0867d93fe94e04d5324883783dddbdca0f553d80aa19e2e59d2ec8fd2a50a7f89118c22cb09310296292a566760 SHA512 8c6d845b0899d9b8b9b41b895abd5c1b8916856b71f529aabd08d1c27a2b09bb5a9343912d088da460c2e22da0a3ce759a34fd13099a149bb8cd1ff4eafe29f1 EBUILD fcitx-rime-0.3.2.ebuild 928 BLAKE2B 497a1711ca67fac4bc954557802141844820cd592574dbf9364073cc1c090913771f7230a081c94648935ab17494ae56620efd60579a16e49da27086ba9854b9 SHA512 b37b95bd7f889fab9139a2603ade1e8f0e858f8a7e315551fde0762efabd204d42e8bce1e1b042964f7199322df285474448c6a288a3119a534c02a84e04b2ab -EBUILD fcitx-rime-4.9999.ebuild 909 BLAKE2B f6816924c86279ebd507e1968c8a6ebc9421bdb42c5dbb53b2fbe93d6151559e58c393d8e72ce4b795d5a3901b0954be9521934968c8a0fdb59d2e9d976868b1 SHA512 3a913bba52ef1a2f58084a116f2b255afcd5f225b50ac0f6c8bb9b79a4fa578d9e9c6d7efb9fcb9f3218781199019fab74c5ee374e161dbeaf4f9a5b87a9f658 -MISC metadata.xml 550 BLAKE2B c147c51dc93c2a125a1dbaf3266ba9a7a85f26fc8a9ef5500621060efb58dea85c2b0abbc3c13a3edf14052ede667fb06ccf11063132c7f8c4fd60655ec4a775 SHA512 c22070e9df3fd2a04ce2ec1c1b1ce1b7b90db41abaa80d8dad82064a4bd218afef7d2ceff15e30530d8f95cf7e91cd43cb0da985f2f2312ef5c4c3c228b9f1e4 +EBUILD fcitx-rime-4.9999.ebuild 1131 BLAKE2B bb2831fa5e748170f6d8b1b2612ce3d1419c924427be2002c9a14408f60252b7cf51d905694024fcb7e686ae897602038f5ed7c526d3777ee4b1783c0eb7333d SHA512 831bd3e5dd6e12a6de49e0574bbe1d1c65adb281b84ec59dcb893a0c300da870b399e5850d54f631d452828021b707efd38ce6d6d08e97e3dc786ab700a38779 +MISC metadata.xml 633 BLAKE2B ef743e2803b410627255e712b1f0c759c9605eaadf4cc980382acae3a657cfad935b45cdaa6f0bbf697bc1eaf8e2963e8de4a0dc5afe62ffa9f3c6a8bd6ba361 SHA512 91e6413d4cdc60e3d4f989ea06fd5b65acff6684d09fdfe4253f812678bf1e9aa0a4f191ef7ff88e6c394e9d1a8ed252b57ac48262483e52dfa4615c785ff4eb diff --git a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild index 35443f12a6e1..74292ea23a01 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 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -22,20 +22,28 @@ fi LICENSE="GPL-2" SLOT="4" KEYWORDS="" -IUSE="" +IUSE="+configuration_tool" RDEPEND=">=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= app-i18n/rime-data - virtual/libintl" + virtual/libintl + configuration_tool? ( + >=app-i18n/fcitx-qt5-1.1:4 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + )" DEPEND="${RDEPEND} - virtual/pkgconfig" + virtual/pkgconfig + configuration_tool? ( dev-qt/qtconcurrent:5 )" DOCS=() src_configure() { local mycmakeargs=( -DRIME_DATA_DIR="${EPREFIX}/usr/share/rime-data" + -DENABLE_QT5GUI=$(usex configuration_tool) ) cmake-utils_src_configure diff --git a/app-i18n/fcitx-rime/metadata.xml b/app-i18n/fcitx-rime/metadata.xml index 45175a156241..c809836fd12d 100644 --- a/app-i18n/fcitx-rime/metadata.xml +++ b/app-i18n/fcitx-rime/metadata.xml @@ -13,6 +13,9 @@ cjk@gentoo.org Cjk + + Install configuration tool + fcitx/fcitx-rime diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest index 95fe447e6267..6aa3b6e5631a 100644 --- a/app-i18n/mozc/Manifest +++ b/app-i18n/mozc/Manifest @@ -1,15 +1,11 @@ AUX 50mozc-gentoo.el 121 BLAKE2B 0cad49e4a5a04d1cbdcd063cfd5a06c14bf4bab47890bbc089d8bba9889abb5197bea2cfb912f638052f912d7aca51a7e71b743b4742fd90b9d5ab5a60779fe5 SHA512 2d67a6723374872717ab7132f02f4030f00ddecabb8a1fc20c9d69d64406dc2ba2a1109734378fae7b4718a8ae9601beff4b6f27cb43a280fa2e0f946da70685 -AUX mozc-2.20.2673.102-gcc-5.patch 413 BLAKE2B ba16d915653022d0991e75fbc36a1ac85744f151878790f7c78a76b5ae018c647d73669ff34548eda84e3ebdc6a63f04f0a702c1bd48c680f123158043e829cd SHA512 4c05db865fa7985ff977ac574fe53e43ec103dc17432ed2a2d8a76c5e0230d8ca430eda3848da06b855471e0cd690e62ce73521b9a354f5f3cd4e901ad7e3760 -AUX mozc-2.20.2673.102-system_libraries.patch 9659 BLAKE2B 8f1a832596a5c4a56a8caca2d12724324826a40cd16fb66c900e0579c5739b425e92f496b65715651846af92a5e0f5b566516fb7a314213d3f4708a19f512c36 SHA512 c0f858a9536fc449e0d9fb3191df2419f0273a478c31d0404713fc4feae5ffb72afec7b47b57ae2111ed0bf40ead4a75e31a68286440113968e2f4e4d6c2d856 AUX mozc-2.20.2673.102-tests_build.patch 1037 BLAKE2B 8f3c0b3361371a994957a89f5b86020902262de65aef75f82e58fcfcea211b8a8d3c8418898781ac1de2a2c9bdc73ffc4cf68102122a22691d9592d5a02e6c62 SHA512 d99ee7edbb406e123b26ec186933608b42d36193b7bfe67232810c0fbd7a92bd8cfff26dc45eae4f020e82e9a8370cf2033c750250455585b6b3d88cc8c973ef AUX mozc-2.20.2673.102-tests_skipping.patch 2086 BLAKE2B a104d6a83b02b49e1208be1b39699b90ad419d8befa29ed0366f7cbc454fe9ce27361f21897a5c74dadfc2d9eb31a30d7237e20db8c1fb205b8e71b40f4a0e57 SHA512 4a2e5a35c5e65ebeb737f656d6efb313c660c2c7cf62abd5d9295fd16e2dffde21d069cd74fd0cfd2454cd7f7c9d136dfbadbf79832db8441c619ff37c7e4b0e +AUX mozc-2.23.2815.102-gcc-8.patch 496 BLAKE2B 318fcda19cf4f7e95920b5df4f5638621bcae992891941fa6f220d4dac1b2eac0faeda7a857a587baed41b361608f20c4bbda0d9a69a60b823572482c6789f46 SHA512 9c2b0e9695f4cd050f0d5f35d0e23f22715b9c6e5607629c7dc023560a5191bd755497fe6fe5306789c00e68d5bd9b7179d5515c982967788fca432134b71cad AUX mozc-2.23.2815.102-system_libraries.patch 9064 BLAKE2B 0cdf732a1bbf16d4af1d6dee81aacf3f3cb1f1c00c6aeb0fc12dac9dcd8611124e388e5fc721eb9b9472e073515d7457b182ee7cfe466b83bf319d572ae55240 SHA512 2d5b06e855f8c1889367b9b672e3ec81a037bc592872e28319e0180a0dcd177cdff817775a1a0f74ebf48e0b7558cf3b67953120411be753c662c43f409b05ce -DIST fcitx-mozc-2.18.2612.102.1.patch 140722 BLAKE2B a412b8dd94bcf44f7fd946bcc1072f3dde7d8d8da55d3ad04ef5d8ef851a63f4d4d8e7e6249172a9d1e75e1f1672e32e6a673e6016d94b034f80d23b660a80e2 SHA512 725c464727f230707b90975705ef1565f1178f9144e66c5a688696a4ef520a6fec1d11f7aa68ee05f82aa9417060b1cccf49a155e30734871a525eaa4c76addb DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B 709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3 SHA512 e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0 DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7 -DIST mozc-2.20.2673.102.tar.gz 48624369 BLAKE2B 0d80065f989c1f61e5f2852e7f471dd83777323b21499c118dc87f4fd6596329ab096dd64db3419895090ab61d6aef9a07e61c7fddeaf4f3a40ce3f3acbad949 SHA512 ad7a78b03b29847057625fd5422c03ac8fc5755c5e85c66fd6e80f81be719dd56bf1349a1d745797118deed239641512789687b4f9ffe49bab1bc966385229ae DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f -EBUILD mozc-2.20.2673.102.ebuild 9276 BLAKE2B 9308d63a798e68954c444139908b498bc2a1a50e3c3cfeac4b68aa5858452a5edd04ef81bb86e01cbe0fa1a396f3f83790474b8a4949f1ca3f3b2230fb4d088c SHA512 008e15376cbd7ec69c23309d23f06a20981a2b8f77b8f218e24915bfd525aa6a564e495fd5362ca3d5c50c85f07056544bb02f2d6d5d307758e2db86af97ae4e -EBUILD mozc-2.23.2815.102.ebuild 9306 BLAKE2B 963632d28582ce506c1f37b879e586648133d8d9c45113b430c5e71a625c6e12833bd4d41ddd9e103aedafb435f6a5b828ddcb93384296084605733be76ceb1a SHA512 56db2d6dbdd468d59d7249eb4c659ac5e125e148078aa76fb929f090f756e5defbb399663aa659e24614ee0131ff704321bd0ce2c76fad7f535ad2db2eadbd1a -EBUILD mozc-9999.ebuild 9146 BLAKE2B 3b6dea8d23f165e78b3da5a2d2fa3465605703ce77fe2df8069e9e7dc75f72ef8106f049b2039cf2fd1c78e06dbfa803bf31b076db2c2f2a9c7af0095dce41cf SHA512 0fccc09b374549a312a4a561b70d8e34fd0fe8b2e7e8161ce680c6662ea529e0c797bbe23ed388c8318bd18b07cf79dc946306906e3de9e2bf6f0fb6a6d545e1 +EBUILD mozc-2.23.2815.102.ebuild 9364 BLAKE2B 66262aab0b4025c336d1ad72ddbb192447bbe1bce7330c0248eb609e790efd1842a642aa8d35f4245207524f4a860f4de53f7c2bb3d690882fa473258ff7cd3a SHA512 1604746cb0640e21b51c0592c4bb6210091796fd9add3a1cd80e21b3e430bb126007e961518b2fb91f3f2c9a8e99ac89add7a3985cf33d9ac4285df6908f0ee4 +EBUILD mozc-9999.ebuild 9204 BLAKE2B d3df6f5680ad1c3e99da8a912886030b09391c47bfe5aebcdd1e012baeab26ca9dda452e112ad450530cc866b7081e067574d6e3000d23a36d3e44424f3092ba SHA512 dfc22d8567779fbf344a8ec82143a589800afac33d6a992020d26eabcf8864eee6bac28a185069364d494a630dea30cdc7889226e5c0349410717f3276fafb83 MISC metadata.xml 1127 BLAKE2B 55c44374c1d0c03845435544fb8bcd254bfa59faa54e773110fe2a9bcfba0f6863a1f5c167e3ca7d2a1108e566ae4d7d4155a1a1994bef006bbde906265fffe1 SHA512 8d1ee79d5e359c746627cc10ddae170088dd1be8a69379f60969e588c0c6141fea80ebcba0183a91e786116e8937c14e76888c9232526244aab584ed4ef27a54 diff --git a/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch b/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch deleted file mode 100644 index b8b2bf1808ec..000000000000 --- a/app-i18n/mozc/files/mozc-2.20.2673.102-gcc-5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /src/prediction/user_history_predictor.cc -+++ /src/prediction/user_history_predictor.cc -@@ -841,7 +841,7 @@ - // swap. - if (i + 1 < prefix.size()) { - string swapped_prefix = prefix; -- swap(swapped_prefix[i], swapped_prefix[i + 1]); -+ std::swap(swapped_prefix[i], swapped_prefix[i + 1]); - if (Util::StartsWith(str, swapped_prefix)) { - return true; - } diff --git a/app-i18n/mozc/files/mozc-2.20.2673.102-system_libraries.patch b/app-i18n/mozc/files/mozc-2.20.2673.102-system_libraries.patch deleted file mode 100644 index 2b2828b79997..000000000000 --- a/app-i18n/mozc/files/mozc-2.20.2673.102-system_libraries.patch +++ /dev/null @@ -1,291 +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': [ -+ ' - #define MOZC_JSONCPP_JSON_H_INCLUDED - #endif // !MOZC_JSONCPP_JSON_H_INCLUDED - ---- /src/testing/testing.gyp -+++ /src/testing/testing.gyp -@@ -53,76 +53,111 @@ - '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', -+ ], -+ }], -+ ], -+ 'xcode_settings': { -+ # Remove the force included file. This is not necessary for third -+ # party libraries, and it causes a build error. -+ 'OTHER_CFLAGS!' : [ -+ '-include base/namespace.h', -+ ], -+ }, - }], - ], -- 'xcode_settings': { -- # Remove the force included file. This is not necessary for third -- # party libraries, and it causes a build error. -- 'OTHER_CFLAGS!' : [ -- '-include base/namespace.h', -- ], -- }, - }, - { - 'target_name': 'gen_mozc_data_dir_header', 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 new file mode 100644 index 000000000000..07514048e7a4 --- /dev/null +++ b/app-i18n/mozc/files/mozc-2.23.2815.102-gcc-8.patch @@ -0,0 +1,22 @@ +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/mozc-2.20.2673.102.ebuild b/app-i18n/mozc/mozc-2.20.2673.102.ebuild deleted file mode 100644 index a0dd5acee8e1..000000000000 --- a/app-i18n/mozc/mozc-2.20.2673.102.ebuild +++ /dev/null @@ -1,321 +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 elisp-common multiprocessing python-any-r1 toolchain-funcs - -if [[ "${PV}" == "9999" ]]; then - inherit git-r3 - - EGIT_REPO_URI="https://github.com/google/mozc" - EGIT_SUBMODULES=(src/third_party/japanese_usage_dictionary) -else - MOZC_GIT_REVISION="280e38fe3d9db4df52f0713acf2ca65898cd697a" - JAPANESE_USAGE_DICTIONARY_GIT_REVISION="e5b3425575734c323e1d947009dd74709437b684" - JAPANESE_USAGE_DICTIONARY_DATE="20120416091336" - FCITX_PATCH_VERSION="2.18.2612.102.1" -fi - -DESCRIPTION="Mozc - Japanese input method editor" -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 - 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://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-${FCITX_PATCH_VERSION}.patch )" -fi - -# Mozc: BSD -# src/data/dictionary_oss: ipadic, public-domain -# src/data/unicode: unicode -# japanese-usage-dictionary: BSD-2 -LICENSE="BSD BSD-2 ipadic public-domain unicode" -SLOT="0" -KEYWORDS="amd64 ~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 )" - -RDEPEND=">=dev-libs/protobuf-3.0.0:= - emacs? ( virtual/emacs ) - fcitx4? ( app-i18n/fcitx:4 ) - 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 - dev-libs/glib:2 - x11-libs/libxcb - ) - renderer? ( - dev-libs/glib:2 - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/pango - )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/gyp - dev-util/ninja - virtual/pkgconfig - test? ( - >=dev-cpp/gtest-1.8.0 - dev-libs/jsoncpp - )" - -S="${WORKDIR}/${P}/src" - -SITEFILE="50${PN}-gentoo.el" - -execute() { - einfo "$@" - "$@" -} - -src_unpack() { - if [[ "${PV}" == "9999" ]]; then - git-r3_src_unpack - - if use fcitx4; 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 - else - unpack ${P}.tar.gz - mv mozc-${MOZC_GIT_REVISION} ${P} || die - - 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 - fi -} - -src_prepare() { - eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-system_libraries.patch" - eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-gcc-5.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 - fi - - eapply_user - - 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'/" \ - -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)) - - # Use absolute paths. Non-absolute paths are mishandled by GYP. - ar[0]=$(type -P ${ar[0]}) - cc[0]=$(type -P ${cc[0]}) - cxx[0]=$(type -P ${cxx[0]}) - ld[0]=$(type -P ${ld[0]}) - nm[0]=$(type -P ${nm[0]}) - readelf[0]=$(type -P ${readelf[0]}) - - sed \ - -e "s:calchan@gentoo.org Denis Dupeyron + + arfrever.fta@gmail.com + Arfrever Frehtes Taifersar Arahesis + 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 diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild new file mode 100644 index 000000000000..a84140be2b25 --- /dev/null +++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20180610092832.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit cmake-utils gnome2-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="dde2ad85dc6dc47ac7862e728878a7c8d9d4faf6" +fi +if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then + JMDICT_DATE="2018-06-12" + KANJIDIC2_DATE="2018-06-12" + 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 -> ${P}.tar.gz" +else + SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${P}.tar.gz" +fi +if [[ "${PV}" == *_pre* ]]; then + # Upstream: http://ftp.monash.edu.au/pub/nihongo/JMdict.gz + SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz" +fi +if [[ "${PV}" == *_pre* ]]; then + # 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="" + +RDEPEND=">=dev-db/sqlite-3.12:3 + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5" + +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 + +src_unpack() { + if [[ "${PV}" == 9999 ]]; then + git-r3_src_unpack + elif [[ "${PV}" == *_pre* ]]; then + unpack ${P}.tar.gz + mv tagainijisho-${TAGAINIJISHO_GIT_REVISION} ${P} || die + else + unpack ${P}.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 "^$" | 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 "^[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}$" | 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 + elif [[ "${PV}" == *_pre* ]]; then + 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}${dict_langs:-;}" + -DEMBED_SQLITE=OFF + ) + + cmake-utils_src_configure +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/app-i18n/tagainijisho/tagainijisho-9999.ebuild b/app-i18n/tagainijisho/tagainijisho-9999.ebuild new file mode 100644 index 000000000000..da6473ad98a4 --- /dev/null +++ b/app-i18n/tagainijisho/tagainijisho-9999.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit cmake-utils gnome2-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="" +fi +if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then + JMDICT_DATE="" + KANJIDIC2_DATE="" + 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 -> ${P}.tar.gz" +else + SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${P}.tar.gz" +fi +if [[ "${PV}" == *_pre* ]]; then + # Upstream: http://ftp.monash.edu.au/pub/nihongo/JMdict.gz + SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz" +fi +if [[ "${PV}" == *_pre* ]]; then + # 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="" +IUSE="" + +RDEPEND=">=dev-db/sqlite-3.12:3 + dev-qt/qtcore:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5" + +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 + +src_unpack() { + if [[ "${PV}" == 9999 ]]; then + git-r3_src_unpack + elif [[ "${PV}" == *_pre* ]]; then + unpack ${P}.tar.gz + mv tagainijisho-${TAGAINIJISHO_GIT_REVISION} ${P} || die + else + unpack ${P}.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 "^$" | 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 "^[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}$" | 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 + elif [[ "${PV}" == *_pre* ]]; then + 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}${dict_langs:-;}" + -DEMBED_SQLITE=OFF + ) + + cmake-utils_src_configure +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest index d370b5574a6a..0e700fdd2823 100644 --- a/app-i18n/unicode-emoji/Manifest +++ b/app-i18n/unicode-emoji/Manifest @@ -9,5 +9,5 @@ DIST unicode-emoji-variation-sequences-5.0.txt 36120 BLAKE2B 50e19bd7147486437dc DIST unicode-emoji-zwj-sequences-11.0.txt 126959 BLAKE2B 82d78fd5fd47bb4201001903c0610e3950a2fa1c315fe8494e15977999ba0b8f0d4431eb842db6f01ab765fd181067b07258ddb4c547ddfc01fc0da7680ea540 SHA512 a2a50cd5451d3ba1da0f3b46e18a10d621ead0372599b98dad0fd47fdb271407f72bd72854136c93311b13950cedc2b1594f06d460e551ab120ed30ba8abce4d DIST unicode-emoji-zwj-sequences-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b EBUILD unicode-emoji-11.0.ebuild 1031 BLAKE2B 68f74394355740b377a5b81554522f153b6e4c40010646662c69ddd3fead6c3a56711fdf42724d8b8a0e9206d46f7a903d1a2bb1e8ba8634994d2d946c739942 SHA512 aabc122ce67d5f0ed853ff8e0a8555d12e8a2f8b92b5506144a039e15f6326c38388ea3949f1d839142ff7fa5e77440da881e7f62cc877d7ab1d62fcb89c362e -EBUILD unicode-emoji-5.0.ebuild 878 BLAKE2B 6ba9e72ea96c5e0f747bdf09c1fb172b30a36e4195ec50c7f6c598370b25f0a9227a26a31eebc71c0e84d651599df8f2e9163ff42651a1aa55cec98dbaac7bb5 SHA512 be5759f2f41f8640817ee94ddc21e6f9cd58dec8253d5c7c147c1870ec01814e420c0d2ab72c6681b408774865157d2d3bd8766b090fcf28a62092351ef64ba0 +EBUILD unicode-emoji-5.0.ebuild 880 BLAKE2B 08d91ce21e632d7a1befe8be1ca4495ece3e56d38d9bf2f062d086ebe10c0b8db89d021ddde659f0c1a383edfae80bdc5becbcd0ca37c7edc158c1d93ef8775a SHA512 b23eae90ba1df31c6965028ebc6d9b0f3064cfdb16f1069a7774e20ea61780bc4b4c086113f45aaa7e5aa00c4501782ed01972186cb5b753b61d9b33dbc328c5 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd diff --git a/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild index c9cac48ce12c..88eb81f4ac53 100644 --- a/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild +++ b/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild @@ -4,8 +4,8 @@ EAPI="6" DESCRIPTION="UTR #51 Unicode Emoji" -HOMEPAGE="http://unicode.org/emoji" -BASE_URI="http://${PN%-*}.org/Public/${PN/*-}/${PV}" +HOMEPAGE="https://unicode.org/emoji" +BASE_URI="https://${PN%-*}.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 -- cgit v1.2.3