diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /app-i18n | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'app-i18n')
114 files changed, 1220 insertions, 3553 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz Binary files differindex 92259cdf8258..1a4bea6a6b0b 100644 --- a/app-i18n/Manifest.gz +++ b/app-i18n/Manifest.gz diff --git a/app-i18n/fcitx-anthy/Manifest b/app-i18n/fcitx-anthy/Manifest index e0574508a532..2c4cde4d585d 100644 --- a/app-i18n/fcitx-anthy/Manifest +++ b/app-i18n/fcitx-anthy/Manifest @@ -1,4 +1,4 @@ DIST fcitx-anthy-0.2.3.tar.xz 78020 BLAKE2B ae054f753dd7d10a0dafd80d67413c29806b6c3b08de9eac3d7eae1d540f01b7bafd22bd9c722a7fc517f1752d90c1c3d82e75aaf58a807daa60b7e9a047d152 SHA512 2769871059053fb370ba84af7cdf0c461d64724a240d58a5a8889cfd9bfb5d145998f79ed2d06a1ae1ab907f9db04fc122bfaf6957ef572fc833e400ffefc642 -EBUILD fcitx-anthy-0.2.3.ebuild 790 BLAKE2B 8095627f0a170756d500a620adea5c3754de92fa04750d4491a6a726ac1268b83439050ebd67d0f615337abb28c059fca339a918d23363c84cb411408fe688fe SHA512 a606c14d46db2cfa323fe2bac05cc3ae0faf7bdba61ea84579b380429ab87a8f921934158d673adf6acc5ab73e1aa8046a564cbeabfdf4bea5d557c287d1340d -EBUILD fcitx-anthy-4.9999.ebuild 771 BLAKE2B 8d2ec5c3b65dd069622056af3a6898f3a334ef541e5b2b650c15ca440644959b7e02e5fac7c7a6b1ee4702a1be7a38a9fdb8c924452a2fe9df0961ac67cb50dd SHA512 4aa0584c572605a79e79842b74fc3a1e85adcb87e5b0be062e317e235dd2159a834eebe8d28364849c095a39e277cdc3c4317b47c6470878e0ea9b8125ed0269 +EBUILD fcitx-anthy-0.2.3.ebuild 784 BLAKE2B b1c3a32f4e878d38cb77cd278e67184fc1d2868071ef6c400047ef28545467ee3bc3a28a3201de647c37dd72d254930b06dac6187ec485c8a8fe03a57adfd1f3 SHA512 448abeb934e60470b79c22efaa58826a93fe0fe384a36a7fcc04c9d7b638624e123f0943a8ab8acd7a25523f59dd4f30c35074ecbd3e2f025cf26e8d03e3e8ac +EBUILD fcitx-anthy-4.9999.ebuild 765 BLAKE2B 974c2629472eeb6122b291e06c7a621b19cf22a253b2dba10a40285e5a65e111bf047fb9cf0d711b2a5b4338927012886462aeb84aba51366d010b4bf797072b SHA512 79f581adc7a301fb4012e4abab6c8a3821257b3981b595699c52d83036fbe856293c5876e3fe1d9935e02f2f28e8218ca4e45e1a86258fa64b55ace44bf71a72 MISC metadata.xml 450 BLAKE2B 7b27aad529b9f760cafd38ed497a6a428df9580b0612f40eca157f206bdd145f038973ce2823f42f988af182ea60ebb34abdfa41f5d1b9fcf089ed4f421df8c8 SHA512 6100dad76b1522292d84eac3dacf69890747a6c76cc1c1e519b97f749a6d86ba34d3cfa439b6a529db87df9b4f0a019ac38e616860c6fa734186631dffa75d47 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 4230b7a7138f..fc844ebde29e 100644 --- a/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild +++ b/app-i18n/fcitx-anthy/fcitx-anthy-0.2.3.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake-utils xdg-utils +inherit cmake xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -25,7 +25,7 @@ KEYWORDS="amd64 ppc ppc64 x86" IUSE="" BDEPEND="virtual/pkgconfig" -DEPEND=">=app-i18n/fcitx-4.2.9:4[X,xml] +DEPEND=">=app-i18n/fcitx-4.2.9:4[X,xkb] app-i18n/anthy:= virtual/libintl" RDEPEND="${DEPEND}" diff --git a/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild b/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild index 7bdab3f7755a..229e8d76dc49 100644 --- a/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild +++ b/app-i18n/fcitx-anthy/fcitx-anthy-4.9999.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake-utils xdg-utils +inherit cmake xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -25,7 +25,7 @@ KEYWORDS="" IUSE="" BDEPEND="virtual/pkgconfig" -DEPEND=">=app-i18n/fcitx-4.2.9:4[X,xml] +DEPEND=">=app-i18n/fcitx-4.2.9:4[X,xkb] app-i18n/anthy:= virtual/libintl" RDEPEND="${DEPEND}" diff --git a/app-i18n/fcitx-chewing/Manifest b/app-i18n/fcitx-chewing/Manifest index 178c2dbb63b3..b01bb3d819c1 100644 --- a/app-i18n/fcitx-chewing/Manifest +++ b/app-i18n/fcitx-chewing/Manifest @@ -1,4 +1,4 @@ DIST fcitx-chewing-0.2.3.tar.xz 19804 BLAKE2B 0a83ae9a17eb74898e41471450a9054bb05e504a60d05bda91fa53f90cb4328b0db4bd5e1d662c81c9322268660e57a7f2cb9c547593913206a00394883341b1 SHA512 3492ad6ecaf00bb1ea07b76c9c23da075615597c1a68434a2da003cbe410d12172510d4306379777a1d04a359b017c49d278c002a7230b030693b668b6030bfd -EBUILD fcitx-chewing-0.2.3.ebuild 800 BLAKE2B 8b8e2fc3940c5cb94d09e233621022a7a0b63a02718d8d762fc1bd5e8f0742787ff3c88b3ab8510d278c9e8e8f320aa74d772c497cee41be2e6715c6927afc4e SHA512 2b0adeda2dc93ecc9fee70535f0742e8e2d9bbba334c1c1f9777ceabeeff63a136b11370c0b5491c4862738eea9840a1c99aa6aae34e03529a82f511d6eb1529 -EBUILD fcitx-chewing-4.9999.ebuild 781 BLAKE2B 3e7a6049c9436c47e3da1b17f3d0848a455ed18f83578973cd7282a123163ecb4d3043a92d0d4d5008fb407672a5616f6470b7848687d83d2c48a3e7886f6d4e SHA512 fea462f56aeb2fbc5ad9995f7f59311666fed27e68f802872319bd4c1c32dca872c6f6547717fb9be58f49d9bebf8c70fbaed4c8e3a38044a1b87a60517ac183 +EBUILD fcitx-chewing-0.2.3.ebuild 794 BLAKE2B b0883cab14161ad89ec9ffb4f3b8ec653c54bcd772c39d1c89adb838616c3ab0306bee05773c83244299b3c50ec813a78f148aaaf5c521476fb9eddf6e8816ed SHA512 e68fec3fe75da0a853a6a4759457e35522c6c75f39b4256a583976a22b048d611a120493473686a03b9289306b3f0935717acf4217bb3d4c70f1887fd393e122 +EBUILD fcitx-chewing-4.9999.ebuild 775 BLAKE2B afac4b517c3f11dd5a9b0fc8e0a92f1d43d6f99fc6572edabe0648a55f9085898025ab19f4be7e5957760365ebed0279441efcd2f60fc9cdc9c6cc99bc3d06b1 SHA512 21db151a86da51155aead4012a8eb19393fe4928f950f4905d6a4904c2a907eb0e8b041ad6e86355917bc5185e6749ad81701e5e3c67b6050b6bdb111fd8d170 MISC metadata.xml 452 BLAKE2B 9fcd460dbcff6b2c7739019a6a51f1e65d8ed2d215c8ecf4c7b0f60b7286e9e46c5f9e190d9c968ea1216f43dc5da9fb297cf188b514a02068279eed349b8bc2 SHA512 b4a1540d3993d402fb63dcf4e4f45d5812bcec85ce0635830af088afb74a1214a81e75dfdbf6ba408b3ec2ecc9b98b6e6f76298e5f818f945b7ce88717be62e5 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 5c7b46177e7c..62f9a48cb0ac 100644 --- a/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild +++ b/app-i18n/fcitx-chewing/fcitx-chewing-0.2.3.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake-utils xdg-utils +inherit cmake xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 diff --git a/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild b/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild index 8b63f929ae44..abf180f4e754 100644 --- a/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild +++ b/app-i18n/fcitx-chewing/fcitx-chewing-4.9999.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake-utils xdg-utils +inherit cmake xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 diff --git a/app-i18n/fcitx-cloudpinyin/Manifest b/app-i18n/fcitx-cloudpinyin/Manifest index 5c2242cbf3e6..028d52ca1525 100644 --- a/app-i18n/fcitx-cloudpinyin/Manifest +++ b/app-i18n/fcitx-cloudpinyin/Manifest @@ -1,4 +1,4 @@ DIST fcitx-cloudpinyin-0.3.6.tar.xz 22596 BLAKE2B e53f64dc999eb1ffb1d3c37b6ed75272da9a76d196df681b71876281ded778f83c73eef2f9100233f580a389e36bfc8681cd7be5e23ce4d9c27c26384062cf9a SHA512 d3a05fc48659db64a0a827c9b75cfb8b33f7cdb48bd936a2ba33f49469e29558a7da0f58cb7e6929b1265d451d23b0a37d87b7b69752599656c94049077d9914 -EBUILD fcitx-cloudpinyin-0.3.6.ebuild 740 BLAKE2B 68efe41bc69dd5d36fee43fde0e9d3a766a42496c289519d8aafabb5a90c9955919d87de08fe95e95f535bcae84413fd8067d9eb917743584680d73b2912bac8 SHA512 43d166a5c05dc18ae7efb60611aacc95287e692bde694cc7b759e287b9448b364b16694bf45fef96fe1c4854886c63f7d53c48775fb026ecc102eb40814fc34e -EBUILD fcitx-cloudpinyin-4.9999.ebuild 721 BLAKE2B 0054d18ce2cbf47c526bd9ad245e8a62e214899fabb5ba25e6a326b8185b9cf33699dff332843e5ae81340fe321c53423e4287c9804bd2bc411b907f5570279a SHA512 04f75419710666120cd0a46939ab00beffc54c377c329be5569a7520ea6f9a4b2d353551b2d1b3ceb518d7f743f927c21c8d8281afab054153226515b016794b +EBUILD fcitx-cloudpinyin-0.3.6.ebuild 734 BLAKE2B 09edc3d6d167dfb75602d8924cc8986c67fdf6cacce39aabdac16bf6bac1e8b833919ce628a7c528c93608936675b176a1d3af45e870d2dfc3ceec4a6bdf9ff7 SHA512 cb2bc4611218f4c6e6034d55cd2d273e53cf24c014ef05257cfd4fa23ef920643a5f8917adecfb140d2de362c129a5e8e47200b9b6dabe7510267e0f9e3616b8 +EBUILD fcitx-cloudpinyin-4.9999.ebuild 715 BLAKE2B e5fab1a6ddb4188819efafb20adc30a60da16cef2b77515a4ed4dfc88f50165134f1b418a136016e6c3f24f4983d31c65ad7c34546c2f10d02c483a3bf965973 SHA512 5cd5055005d7caf9c63ab206a3646e96d9def6483698c2e58222fc0a80a0bfd2dc34de4f579255b01c4c4fa85a40119a898ec7500ca7136b6f8315e6d83ecfbb MISC metadata.xml 456 BLAKE2B e7aea5104a7beb0c6d879e801dd4988557759cc89cb48331dfe64b5cb336da07eb5ca0db77fd07f70e2b035a556b41327a1a619a12fd1a80480e0be40373c227 SHA512 d101b830ffa54146258fa424d14129c3693abe3e64582a3fecae2add16d0928d4d18642ff5c5816227cd458862dde6778d679a9cdf8605187862c657060f63ca 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 2cf1b903b2d9..23e8cb103602 100644 --- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild +++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-0.3.6.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake-utils +inherit cmake if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 diff --git a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild index 6a77e0dc6823..cdd15de53f01 100644 --- a/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild +++ b/app-i18n/fcitx-cloudpinyin/fcitx-cloudpinyin-4.9999.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake-utils +inherit cmake if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest index 37cdf526f48c..46eef124333a 100644 --- a/app-i18n/fcitx-configtool/Manifest +++ b/app-i18n/fcitx-configtool/Manifest @@ -1,4 +1,4 @@ DIST fcitx-configtool-0.4.10.tar.xz 50440 BLAKE2B f2f2241d3ea139f6f3de9b8c6ffcc71c789dfa291efe4c551596eebc8a04f13f9fe698cc25d8349a174399044d15ddca2aeab952ac2bc7f0f4e9e47d453329ca SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f -EBUILD fcitx-configtool-0.4.10.ebuild 849 BLAKE2B e38e94e63fd89abca4bb81bc4a8416487c8149b831b1702e3393a8e9a092a54f15c35917c1ac9b36be13542d0a3c8ac60133d32502b6a89837fc51d4c9b63c81 SHA512 5f98ca5c3209f676d72c2ee651c1a1882305d58288051d899ec5987b2652c1d4b31b8d9cb1548f5af96f9ba7f32a5a15b936115cd0d629e0bc070d1998bfd022 -EBUILD fcitx-configtool-4.9999.ebuild 830 BLAKE2B 3d4386bd8005064eb82234f9fbb63e2b05021979e894c67ac5b37b4a95d1d1ae9103152e00e1640d385f08131b4426cf0e5b0e94ee8071046eaaae966679f706 SHA512 479f25c0976da7779e12a973b2473001c053191cced668ad9cefc7dd6050adaa778780263d639874c3a47f4360d6c2ec4f8e3f5c3747be6d740ed2fe4c5bc89d +EBUILD fcitx-configtool-0.4.10.ebuild 837 BLAKE2B acf5e7b715031125db579e07a887d8cbd2452c6cafe7f35c3579aa12132853806e4efe21d5b7013ad0727c49fb16f37b55fcd53a3f54dba51c6547c6ccf15881 SHA512 dde980fb55abc939c37b5d2c15d6ea6a79fe12789752d5bdd0bf3fadab58fdecd720f4f9baa31b520c61b42511d2d4d1ad42ef3c0d3a52a606064df754c07e35 +EBUILD fcitx-configtool-4.9999.ebuild 818 BLAKE2B d034a75bf15f37b71243d5d1c15a8ec6114ca559d715101f031d434b1a9478c39298f95b022c7c4f8cd08ad2701eeefb4cef628a4795f5fd15567723b0c71362 SHA512 42b150975f7293dfdb67c6d6479803526438adc80032adbaadf6f03927f6adaafd4469d145d07a21f8b929cba6eddf20e21d2374085c8791d77046ed0f496659 MISC metadata.xml 455 BLAKE2B 89268d866dde8861e25a631d76d7053a6e847134d02195aa883952b79a0f81742c4cad0f8938b0eb180240d5e95ff1c73b7c673d9a3b2dafd0b28f20e186589c SHA512 5fb4ff1f8fe55ba75d4609791f0f41cfe8728000cd0d5bf07d3f4df99bf375ab23f15cfd0754b032b333d67c7cfef6a13daa007d81a67b8be0b27454b7e7548e 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 1f5e7d08ada6..f7411584a948 100644 --- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild +++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake-utils +inherit cmake if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -40,5 +40,5 @@ src_configure() { -DENABLE_GTK3=ON ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild index 9ef906f089f5..e8947d258263 100644 --- a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild +++ b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake-utils +inherit cmake if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -40,5 +40,5 @@ src_configure() { -DENABLE_GTK3=ON ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/app-i18n/fcitx-hangul/Manifest b/app-i18n/fcitx-hangul/Manifest index 4a0874df38cc..2aa0a3798851 100644 --- a/app-i18n/fcitx-hangul/Manifest +++ b/app-i18n/fcitx-hangul/Manifest @@ -1,4 +1,4 @@ DIST fcitx-hangul-0.3.1.tar.xz 26612 BLAKE2B 59770762ecbd5027d9010d99037881c576f638d30cf22234e5b110e9264637c3ff2049fbf8c7e44ca27acebff5668b2eefee5aeff78622ccb338ff68abc42490 SHA512 6ad2e34644c9246490a91342a11b186d40702f7e587beeb056ad98538da50dbf9fdc9f298e5b379bef50f63ad5be5da79ba84e60a22b57c330d0a68dd5bf5ca6 -EBUILD fcitx-hangul-0.3.1.ebuild 828 BLAKE2B 794b9114b74f452a01e6e8d7ef9b50a7eb25b7c812643828e5fb8eee3495d85161ec91f8f8c32b498345f2a8619e87b589576aa60b1a455db5206e370585c468 SHA512 f484caadbab854dc137ec8afb670f5f486acc978798111bd8cfcde9047bc7c1bb6496d8479a3349a613f8ae2ab9a8869bafacd41dbcf8fbf0ce04ca91e229559 -EBUILD fcitx-hangul-4.9999.ebuild 809 BLAKE2B 70e25340da67dba9add379caf6d82c467630e87c3505e78d5fcbe09e19abbd20623c7ca1fdb8d1fff0722f943d4beb8123470b05b2e6dee107225229b724ee12 SHA512 ab8f3c3c742005a9c23c9b238d3125573aacebb0e14b794252857e1e03e19f93e793d86180fd952f7944f3e710555da2de09e3f1409de9f3c1c01961ff75e307 +EBUILD fcitx-hangul-0.3.1.ebuild 822 BLAKE2B f4d971b9c5210e709a1263015783300155d112f7eb6f5c17c59a4c7990f50eec27d7394bb2023677bc0c162fcef7cbe30b92e1401f39af0d6018c5bcb0b17e80 SHA512 8df67887faf2bbcd58a2703c2e57668883a60658437e7d8f6969663ba41b225b4f70f30a0e49a4d5a2ba718e49d8ec9c22c917e11422d5a7f1a293021df5303d +EBUILD fcitx-hangul-4.9999.ebuild 803 BLAKE2B 84ccc25600ba5cdbbbb51f6ae9c2a4b4b04cd902a3f2444502ddfb0980b0c6b892fdd994b8d2b1ff3b252f033133e64941aa9da20211f56e6344b3d2a0d48ad9 SHA512 0ec0d8966b9b5df8963c1602e5430f9b0dae90e4c35cde5107848d0acbb37dbd0ecc116d4fae25d56b36c333ff483b41be062e43a9225eabf2fba831e03a9494 MISC metadata.xml 451 BLAKE2B 23aaffbadede41a5f006329aaa18e9c9938545b19bc11cd391c37e52581d501abecd44877197a129bb570fb97d0b97bfa205f5dfcf355163e325624c28feed39 SHA512 71946f56143f4b7e4a7a4b032f36d95a94ab5c6a78a8f89860233a0e3b2a5c57088d9312a936316af0035ce2058c473595eb89cd5cd699cc2c86ad57be699891 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 fdbf7d7716b5..e203a031e17f 100644 --- a/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild +++ b/app-i18n/fcitx-hangul/fcitx-hangul-0.3.1.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake-utils xdg-utils +inherit cmake xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 diff --git a/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild b/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild index 0c3f83a8582d..a8d7517f6eb4 100644 --- a/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild +++ b/app-i18n/fcitx-hangul/fcitx-hangul-4.9999.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake-utils xdg-utils +inherit cmake xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 diff --git a/app-i18n/fcitx-libpinyin/Manifest b/app-i18n/fcitx-libpinyin/Manifest index 7f834d075636..3b382fc00e20 100644 --- a/app-i18n/fcitx-libpinyin/Manifest +++ b/app-i18n/fcitx-libpinyin/Manifest @@ -1,5 +1,5 @@ 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 -EBUILD fcitx-libpinyin-0.5.3.ebuild 1480 BLAKE2B 36b80c0fbf07be52c61652e5905fbe219aeaff0852c9137359f05ea1b8c192f3d374e4743727a02ac184397b9d50a5c6c634853b7252a47ce4a5768151d6ea3f SHA512 771b7b52c95a34c453bb8146abec4796e173922c80e855ad0047063a872d85f05fe0993a022a30c741d68dad364383f8d3109f121fefa91a25ffda109f3064cb -EBUILD fcitx-libpinyin-4.9999.ebuild 1461 BLAKE2B 1c31d1702c7616db8ff6f5594c772a1c704db81b9c9e3fed40642ae73992357eace8acd1e24e49a905b8a1d9edef4c6fc39fbe2369869a964f9b9b69901fb309 SHA512 7b2da078b268aee69e6d693ef7ca26ddcf39f638f4da05c6a6eb18cc40f6b7740d503446e18eaf963f133f0110ccb1f3b6a50b4789c2c313adc1d33b14992483 +EBUILD fcitx-libpinyin-0.5.3.ebuild 1601 BLAKE2B 180fe2f12f7dc9105b952d888c016fe4056d2b3a16e3fbf861a7ea6bed33e97b6ccd1fef6e06153df9b18543a5ee078a5588b4692ac7915c00d5dc70b0eeb42c SHA512 73a01b5853c521ae1a6b69bb9fc17d8df27b20444dd89ff1e6f2fb3fa036265eaa6ddb435bec5469f3d49cefab5d28296b5755481b26b6fa8a2e5dfa062e51fe +EBUILD fcitx-libpinyin-4.9999.ebuild 1582 BLAKE2B e4664b16a52aa4ef11868cf67729c6dc53c77f4b8c16019ff700bae854cc7def01336c9d8c47e19568f9e08e6f2a8cc6c9d0b750d3669b49205e8d199ee8d0f8 SHA512 92b3610d1466a90bbe71b3132131df5592111fa8eb2051f59ba62b75a77374a593056e3617e58c6cc82c7c92d8a95f8c652cebcca8ac672b98646082b8204fd9 MISC metadata.xml 537 BLAKE2B d60daacfeb2a33824bd399d144ea7bd9a99a6a96062df226d4de0b674387df563a1294366b0cb2e216c33b321680f00adc88905167508898f6c3a37d6f0c1bfe SHA512 32e4b2319df016e83055699ada867d1e1aba7b09d26308f03143df986e6aaadf77243da97894d33282ad7d1a7ee881723a4eadcac6f4573fce05ba3700a10609 diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild index 079c6e3c5fa3..1742c97885a1 100644 --- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild +++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild @@ -1,9 +1,9 @@ # Copyright 2012-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit cmake-utils xdg-utils +inherit cmake xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -24,7 +24,14 @@ SLOT="4" KEYWORDS="amd64 ppc ppc64 x86" IUSE="dictionary-manager" -RDEPEND=">=app-i18n/fcitx-4.2.9:4 +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 @@ -38,8 +45,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +RDEPEND="${DEPEND}" DOCS=(AUTHORS) @@ -48,7 +54,7 @@ src_prepare() { ln -s "${DISTDIR}/fcitx-data-model.text.20161206.tar.gz" data/model.text.20161206.tar.gz || die fi - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -56,7 +62,7 @@ src_configure() { -DENABLE_QT=$(usex dictionary-manager) ) - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild index af2da3f65dcd..23aae0d11f68 100644 --- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild +++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild @@ -1,9 +1,9 @@ # Copyright 2012-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit cmake-utils xdg-utils +inherit cmake xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -24,7 +24,14 @@ SLOT="4" KEYWORDS="" IUSE="dictionary-manager" -RDEPEND=">=app-i18n/fcitx-4.2.9:4 +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 @@ -38,8 +45,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4 >=dev-qt/qtwebengine-5.7:5[widgets] >=dev-qt/qtwidgets-5.7:5 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" +RDEPEND="${DEPEND}" DOCS=(AUTHORS) @@ -48,7 +54,7 @@ src_prepare() { ln -s "${DISTDIR}/fcitx-data-model.text.20161206.tar.gz" data/model.text.20161206.tar.gz || die fi - cmake-utils_src_prepare + cmake_src_prepare } src_configure() { @@ -56,7 +62,7 @@ src_configure() { -DENABLE_QT=$(usex dictionary-manager) ) - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { diff --git a/app-i18n/fcitx-m17n/Manifest b/app-i18n/fcitx-m17n/Manifest index 2c8b0082fdc3..4f4636e77ab6 100644 --- a/app-i18n/fcitx-m17n/Manifest +++ b/app-i18n/fcitx-m17n/Manifest @@ -1,4 +1,4 @@ DIST fcitx-m17n-0.2.4.tar.xz 35076 BLAKE2B c53c8ee8156b49607cd5bd951eb031e2dccb6a18bcdafcbfd17ebf07506c750414abac3f2dd5965fdd8b154df9c16820850f61d07cd38745db0af89ccf2acfff SHA512 b7c483e9c88e58a47ead294c36ed182558f09b41996e97faaba9fd3a96612f6a0fc240fdcb95db9a08c1546abe5fc97337957e2124844bd011363b7468f6e112 -EBUILD fcitx-m17n-0.2.4.ebuild 681 BLAKE2B 66dafecd4f122c4448d0062b950181860871d633aafcfcc3ff6d0256de7fc30435fc0a1682897689549c2ea028eec49733fe75b71bd4cb8b4cae77a115ee14a2 SHA512 52e253c6110ba3f14ce805379618437283cae4ffecbb8e46f9cf2a4121e42e8dbc724aaa8d85975809d3272e424c28248f1c495446d8c966c6545168325ddde4 -EBUILD fcitx-m17n-4.9999.ebuild 656 BLAKE2B 869e6428aef7799ba2da23ad869e4467a7db2eff60a8df0f22c5da125e920561506ec8bcd8046b0990813f121d745a8e5fd281ff42683f62a7f383ce7985d15e SHA512 db7d1f93484238cc69cdd0a72949e772093918ae617e026e90fca24101b0251d438d59c63631fae2c7a19bac6a59987c5648f485b0bc2f79c5643ae90eec81dc +EBUILD fcitx-m17n-0.2.4.ebuild 709 BLAKE2B 3ffe009bd55dfc99014f91efa9e85daef6e4bd81eda805efd67a2c1cbc16cf74aab0b8846a40ed2952d7dc107b9ef8edef7705143e8ba4db8a07d2a553ccdd3d SHA512 571d3c6b61f7e4127c22a52ea963769e19cebcd271394ac3463bc6ff70da85b9aa2d62ce0aa85e9e2cfcaff290c0ad11ea58b0265e7b3d46d47714265a0d4c81 +EBUILD fcitx-m17n-4.9999.ebuild 684 BLAKE2B b305cb0b38cf7fac69bd8e394393f359513bd7a8e85b800762280a9bed1f685723ed9530776dbc3fce0e61946c9c45740224958ff16a388c07b22e73c22fe381 SHA512 e65e8ca0017ae9486bf138005e9c0759a4d5e64294384bb3e7be20ed083f5441be56bc2ac066b16f06174ae77f77bed36f33185f816ed33f1ffff17b2ca4012e MISC metadata.xml 449 BLAKE2B e146ed29ed13e93285bfdc7a08000f72888b3208c1d5a2d2cf301f613e6b2530499ced88b292ec74d81fd0d2af9e0a01b8f07358bd8d39f4d0de23fb986b0f49 SHA512 97c79c2a23d736128429846b87000d52f815e3b32999ea0ca3ee1be2d6281ff6aeb2208d1340e74414a5b5e31e06e3675292e307960d088767c09c252f5d87ef 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 82a35d462868..f282e295308e 100644 --- a/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild +++ b/app-i18n/fcitx-m17n/fcitx-m17n-0.2.4.ebuild @@ -1,9 +1,9 @@ # Copyright 2016-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit cmake-utils +inherit cmake if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -24,10 +24,11 @@ SLOT="4" KEYWORDS="amd64 ~hppa ppc ppc64 x86" IUSE="" -RDEPEND=">=app-i18n/fcitx-4.2.9:4 +BDEPEND=">=app-i18n/fcitx-4.2.9:4 + virtual/pkgconfig" +DEPEND=">=app-i18n/fcitx-4.2.9:4 dev-libs/m17n-lib virtual/libintl" -DEPEND="${RDEPEND} - virtual/pkgconfig" +RDEPEND="${DEPEND}" DOCS=() diff --git a/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild b/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild index a043cd7fefa4..2c40502ee4c3 100644 --- a/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild +++ b/app-i18n/fcitx-m17n/fcitx-m17n-4.9999.ebuild @@ -1,9 +1,9 @@ # Copyright 2016-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit cmake-utils +inherit cmake if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -24,10 +24,11 @@ SLOT="4" KEYWORDS="" IUSE="" -RDEPEND=">=app-i18n/fcitx-4.2.9:4 +BDEPEND=">=app-i18n/fcitx-4.2.9:4 + virtual/pkgconfig" +DEPEND=">=app-i18n/fcitx-4.2.9:4 dev-libs/m17n-lib virtual/libintl" -DEPEND="${RDEPEND} - virtual/pkgconfig" +RDEPEND="${DEPEND}" DOCS=() diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest index 75c9878d4e7e..7b8ec17fdc29 100644 --- a/app-i18n/fcitx-qt5/Manifest +++ b/app-i18n/fcitx-qt5/Manifest @@ -1,4 +1,9 @@ +AUX fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch 859 BLAKE2B 6dc1a1d4b942600ec953cb18134a9e5fd9a812af8eb1629f942edd0e2a927596eba3ca276be1228d09a2ac14fbb4735d299473e915a90644fb869d979a10283d SHA512 39657019234402ee385667dcb8071209502d4b8e471bdff7fa13980afe2a358891d78447fb95d0f2c14a5aaccdb878d4cc8b9e95a85bb9c22cbdea475523c3a4 DIST fcitx-qt5-1.2.3.tar.xz 134124 BLAKE2B 0c17f9c3b9d9878fe228881c7287375d3b73a8c27f806590747e56b8644a86300e243d62efcb6589d197edd352e2a79d49be704718ff53381e2fb5e2a5a2b1af SHA512 e3e9a76419caca4eeebf3c149a72ee939a25f463d03dd8461caf44cace310278b08e83d460112f240cd54ed05dba3c5e9732198f0c3d0b9d81c3a444c33ab8d3 -EBUILD fcitx-qt5-1.2.3.ebuild 879 BLAKE2B be5dfb274f73fe3f86483cf143ba870e02e734c747b44fa41f2b0e42a92d78c4060c0425f8e623a2daa2781a2a29a837e73ae7dd40c527dcf6c4a5f22a04ee8b SHA512 eca74e334561ce2e0e0ddd3dd1e57bcbc3c65c843b80ca397030dfd8b53e1288a2b1efcdfb4e0b470adc12143395d37c59a544c04561a45e7107e2cdd97a09a0 -EBUILD fcitx-qt5-4.9999.ebuild 854 BLAKE2B 27fc34f2e3babda0d894e53873dca4523e22da121d31413fb415492630aa280397c29f482b6ba9ff498ac1a59495f0750a483d085a3667e6dbd5b3f029e7c427 SHA512 4db0ccaa5a3d7500c969c456c59944464b2607fe3482ecaf733d520d76a9a9da0388161ab690387aa628ce9eb453477332b3efa4f6a6d61435d0b51d060e2b3b +DIST fcitx-qt5-1.2.4.tar.xz 107620 BLAKE2B 3577555192d2eda9e48fbd31149100f0d21fd1b0b7d162d14cef89818f86d5e32e2bb835f4f47acf150cfd0b0fc506031454e4ffe1315424314fc7512d391f8f SHA512 c9ceaaedeb26ac4c7fa1e0bf34096725afc14642b795d9c624f4fc7fbf56c04acad12d8d3ffb60c164281b6373554c0524e56209a2d1d123fbf348d15dcc282a +DIST fcitx-qt5-1.2.5.tar.xz 98604 BLAKE2B 07f3d62c3c47e5ce0805a087cc4819dec44d8038cc428a3f9b39d640e409372eeaf0f8326a00be8b4af1ef6ec21870dd5ebdabfe39a2cf92ab9cec8c32be059f SHA512 238ebd02e4b07a1bffcbf2d1534492589bce206c3bce0197e075e8cd3f1b16a2867b5e9beb3bc2a0a5e9391acbf20c07d4d5a35f1550b4e71ee663712a8d56c6 +EBUILD fcitx-qt5-1.2.3.ebuild 953 BLAKE2B f73f95dc706619866904fc03cacad15b13faf7a5e28045d2e6e5b72dfe1fa04d979406dbddf02bc62499466b7ad804462f806b4bf0dfc76df045fabce29cd0c8 SHA512 eac8c0ad2a284f54f6487ac203fd29f1fc63b2ff6c8e193cccd9ce92ad182eafe68e8aa39c2686dd26fac4ced569933b32ea3dd286560f3764d623891e5e0edd +EBUILD fcitx-qt5-1.2.4.ebuild 957 BLAKE2B a126752b8b2e5233f31eb1387a2537b6e87a9fd4d2c10896c756447e36263b067dd7e2628c7f3dba93a5ace3bb4471069c0876fc6025e79591badc190fb8a4c4 SHA512 d3f8568e472b53e2eb7d918ffde3f280f4437074c6e184776f4c240191a37b5f2fcb67d42a03750374a517de7aa8280cbb92525696e7006b06c3d163f5156344 +EBUILD fcitx-qt5-1.2.5.ebuild 1033 BLAKE2B 262026c136df7c9e2fee0d422394611574cc3494a9429db5a8933d089839597e99ea336b5bc2deadd5fb32517ad13795d628d91b0987f7297f18b01442c83690 SHA512 a31fba7bee9f1381e70aeb0db5aeea1d7e238fbe66a0e881f4b86cd0e44ad4e57b8a156f1b544e0030654383b749a549c03315e46b6ab9058c0318252ad1ef25 +EBUILD fcitx-qt5-4.9999.ebuild 928 BLAKE2B 5967c2e2b9ea9fc3accf378978ad1c5d29d452502c8614ad70feae710fc72266f1974850871bd96ce522ce6b27c4240afd805a461528a165a969ba1c9af5cb4e SHA512 25a3395f1309f09aaace89cfe2e38c7693108b8b72891994d73f15a847c8a9e5c38a0a686890e50ecd0a98a8580d6a1c7d99deb149e6ea8e4c4289b1a1fd572e MISC metadata.xml 448 BLAKE2B 5ce33f3716f2b2d13353f7393c8c406d4025e03c7c6856cf6aae6d3337b566c70fa1bd90be5c8f6e34b940c55dad1803639101b8266b9b91d405611742698f12 SHA512 37fc515507954a58b16c0fc81ddfe1b24ac21db88b7cd858ef14167526ec48ddfaa144ac5653bf9c5fffdc148ecbeb82ae57b807822c8f85a5cf90d3c81bd6a4 diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild index 0517f4e0d2dc..1699cf4ea4aa 100644 --- a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild +++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.3.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake-utils +inherit cmake if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -24,7 +24,11 @@ SLOT="4" KEYWORDS="amd64 ~hppa ppc ppc64 x86" IUSE="" -BDEPEND="kde-frameworks/extra-cmake-modules:5 +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 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-1.2.4.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild new file mode 100644 index 000000000000..610eb112d602 --- /dev/null +++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.4.ebuild @@ -0,0 +1,44 @@ +# Copyright 2014-2020 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/fcitx/fcitx-qt5" +fi + +DESCRIPTION="Fcitx input method module for Qt 5" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5" +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + SRC_URI="" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" +fi + +LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+" +SLOT="4" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~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 + virtual/pkgconfig" +# Private headers of dev-qt/qtgui:5 used. +RDEPEND=">=app-i18n/fcitx-4.2.9:4 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5= + dev-qt/qtwidgets:5 + virtual/libintl + x11-libs/libxkbcommon" +DEPEND="${RDEPEND} + dev-qt/qtconcurrent:5" + +DOCS=() diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild new file mode 100644 index 000000000000..729c6f77088a --- /dev/null +++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.2.5.ebuild @@ -0,0 +1,48 @@ +# Copyright 2014-2020 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/fcitx/fcitx-qt5" +fi + +DESCRIPTION="Fcitx input method module for Qt 5" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx-qt5" +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + SRC_URI="" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" +fi + +LICENSE="BSD GPL-2+ GPL-3+ LGPL-2+" +SLOT="4" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~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 + virtual/pkgconfig" +# Private headers of dev-qt/qtgui:5 used. +RDEPEND=">=app-i18n/fcitx-4.2.9:4 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5= + dev-qt/qtwidgets:5 + virtual/libintl + x11-libs/libxkbcommon" +DEPEND="${RDEPEND} + dev-qt/qtconcurrent:5" + +PATCHES=( + "${FILESDIR}/${P}-QFcitxPlatformInputContext_recursion.patch" +) + +DOCS=() diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild index 9c1255da7ca4..25daf4bb5236 100644 --- a/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild +++ b/app-i18n/fcitx-qt5/fcitx-qt5-4.9999.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake-utils +inherit cmake if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -24,7 +24,11 @@ SLOT="4" KEYWORDS="" IUSE="" -BDEPEND="kde-frameworks/extra-cmake-modules:5 +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 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 new file mode 100644 index 000000000000..f3e31991b53d --- /dev/null +++ b/app-i18n/fcitx-qt5/files/fcitx-qt5-1.2.5-QFcitxPlatformInputContext_recursion.patch @@ -0,0 +1,27 @@ +https://github.com/fcitx/fcitx-qt5/commit/6f2033c497fe0da1fd197bc3be35695b11eafd93 + +--- /platforminputcontext/qfcitxplatforminputcontext.cpp ++++ /platforminputcontext/qfcitxplatforminputcontext.cpp +@@ -291,8 +291,21 @@ + return; + } + if (proxy) { +- cursorRectChanged(); + proxy->focusIn(); ++ // We need to delegate this otherwise it may cause self-recursion in ++ // certain application like libreoffice. ++ auto window = m_lastWindow; ++ QMetaObject::invokeMethod( ++ this, ++ [this, window]() { ++ if (window != m_lastWindow) { ++ return; ++ } ++ if (auto *proxy = validICByWindow(window.data())) { ++ cursorRectChanged(); ++ } ++ }, ++ Qt::QueuedConnection); + } + } + diff --git a/app-i18n/fcitx-rime/Manifest b/app-i18n/fcitx-rime/Manifest index 54bab80ed513..b2479cbc098c 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 917 BLAKE2B f0acef45c38348b0c35476d1322e3459e48ff00c3cd58759bce84c3acbf25545978a89d334e44f15c9da49231726adef445e72e7a8dd206b9991a23da091cc26 SHA512 4d6b54142f8531afccb2b8236dd2c7d469c2aecf703cb562459066de5803b79024adb8c164e0d45aae6259aadf5120764f079a64df020e71adb5d72010e60d1d -EBUILD fcitx-rime-4.9999.ebuild 1120 BLAKE2B 0599154f7bbc8b19527f7af86a15a109a60f49f6175b50da5ce86815f8c7249d322331c891054ed95d50fa0ef8e6f2db5bcb99b72d54fecb04493f9bd0e16eec SHA512 7c4de0eea31be6c94d45d66b6077185024dbacfe46419286de6361e92b5b1d6d167646f48662b67788aac3f1c04d9e53f73510c4cf6cf076ed967b5cd34c24d0 +EBUILD fcitx-rime-0.3.2.ebuild 939 BLAKE2B 2b291d49cf95fc78e4ba61b8e7833e185b2fe63b60256ca8601d8cec1ab13e0b184757c4c138bb71695ac5d668cbaf0230b4f1f86f8a4f6b19d5cd8b7d787f09 SHA512 45c61a796cf01c57b818240d41c1f9ff3d1861b09568aa19fde8f3a1cfc03e375936678a39b87ffeff7f66b3647f614344600075cfbd148dd4cb99ef104da088 +EBUILD fcitx-rime-4.9999.ebuild 1226 BLAKE2B 46d921f42c0288e257346757bb9d376e665c58c2bbbf1a685ea24943caf401c0cefa3d8ea4abd4b21a5c49cf3e04f6a729e1ac37115b53fc21c777021980040b SHA512 fcbe4b1004193b8cef033e97fa87f4c25804baecf17ea02948d15569038292c9b4be9cfee913195acf2cdd2dc5486e187c3abfe8fd69fbd5dc3bb37e1515c9e4 MISC metadata.xml 633 BLAKE2B ef743e2803b410627255e712b1f0c759c9605eaadf4cc980382acae3a657cfad935b45cdaa6f0bbf697bc1eaf8e2963e8de4a0dc5afe62ffa9f3c6a8bd6ba361 SHA512 91e6413d4cdc60e3d4f989ea06fd5b65acff6684d09fdfe4253f812678bf1e9aa0a4f191ef7ff88e6c394e9d1a8ed252b57ac48262483e52dfa4615c785ff4eb diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild index 273db4b0c27a..18b40399bbf0 100644 --- a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild +++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild @@ -1,9 +1,9 @@ # Copyright 2012-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit cmake-utils xdg-utils +inherit cmake xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -24,12 +24,13 @@ SLOT="4" KEYWORDS="amd64 ppc ppc64 x86" IUSE="" -RDEPEND=">=app-i18n/fcitx-4.2.9:4 +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/rime-data virtual/libintl" -DEPEND="${RDEPEND} - virtual/pkgconfig" +RDEPEND="${DEPEND} + app-i18n/rime-data" DOCS=() @@ -38,7 +39,7 @@ src_configure() { -DRIME_DATA_DIR="${EPREFIX}/usr/share/rime-data" ) - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { diff --git a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild index 382c68ff7502..49fb4753f008 100644 --- a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild +++ b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild @@ -1,9 +1,9 @@ # Copyright 2012-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit cmake-utils xdg-utils +inherit cmake xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -24,9 +24,14 @@ SLOT="4" KEYWORDS="" IUSE="+configuration_tool" -RDEPEND=">=app-i18n/fcitx-4.2.9:4 +BDEPEND=">=app-i18n/fcitx-4.2.9:4 + virtual/pkgconfig + configuration_tool? ( + dev-qt/qtcore:5 + dev-qt/qtwidgets:5 + )" +DEPEND=">=app-i18n/fcitx-4.2.9:4 >=app-i18n/librime-1.0.0:= - app-i18n/rime-data virtual/libintl configuration_tool? ( >=app-i18n/fcitx-qt5-1.1:4 @@ -34,8 +39,9 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )" -DEPEND="${RDEPEND} - virtual/pkgconfig +RDEPEND="${DEPEND} + app-i18n/rime-data" +DEPEND="${DEPEND} configuration_tool? ( dev-qt/qtconcurrent:5 )" DOCS=() @@ -46,7 +52,7 @@ src_configure() { -DENABLE_QT5GUI=$(usex configuration_tool) ) - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { diff --git a/app-i18n/fcitx-sayura/Manifest b/app-i18n/fcitx-sayura/Manifest index 7313e6884fc8..73d27d00a0f7 100644 --- a/app-i18n/fcitx-sayura/Manifest +++ b/app-i18n/fcitx-sayura/Manifest @@ -1,4 +1,4 @@ DIST fcitx-sayura-0.1.2.tar.xz 25400 BLAKE2B 6bed1b86499b4448e87cb76c719d8fec3f7af7e5a4a4846ddc30e6e278f5e67c5ee47d39f4e19d3c8c927ce34bf66f51cf189d1147af0e509c3815ba4552a953 SHA512 2118c95d4f831e5f4e0af0549ae3eb4f16bff8b30b03452837bd14f35fcb524f730b27ceb7c14cf6a4db7400a67070929a75465195b5524187e97c7ca02de466 -EBUILD fcitx-sayura-0.1.2.ebuild 783 BLAKE2B d04aa22655b9bdd43a7cb8d4fe0c9e5c94a36f97fcddfcb4a90c04d206c0007baafdc44e734cb64ec1b88fee8ee6651d7edabea9528a2d40fe6687b56c06b259 SHA512 ccb236dbef0ebd891506d650e23d67d505abe41c5af67f04dab88220c9e1198c1d379a71fd04944db129b921ac8c7bf2b6cec985b6d6a9927e1c858297f1effb -EBUILD fcitx-sayura-4.9999.ebuild 758 BLAKE2B 4e7388512c12862b0f92cd58bd59dacdfc2bde874e0d94ca1c692dc871cde6305c5422fde2383cdb8264ceb724c010a613bd3ecbe40a602f8fdb0c5bc1451c8e SHA512 ea1935e70bb7923a09e4a529dc835ab2957bcf0cd9f20d849dd3a38e885959a2f8d6bdd049f39cbb1e8829fcd2a5f0503da707a4cf03d6266d376d66e0b6c2d5 +EBUILD fcitx-sayura-0.1.2.ebuild 777 BLAKE2B e40203bc3690cb53df151ff7a0d734226c7ef4049760746b63080bb76efc90301d87a0dcbcf045dc0a47820990eee0b48ac87f5e318a0e46793b465434bf67f3 SHA512 7bdbc7748a560dde57407415ec109885413bc677ee4f61e2ef7bb5f12964be1e1daf5a6fe5e9f39c625699e7f05562a69c770324588672739b94bcc576318158 +EBUILD fcitx-sayura-4.9999.ebuild 752 BLAKE2B 1586570bbf9450e512cb8f1db440cd71c3c3e7156b81a6348f315b2c20b7c139771e8090ff660d440afe42c8e26739a211bdda8889344de8d59adc46695e211a SHA512 769efa27440e0b39d7d6b508004ae07570e9dd9287c72f4c4afd33e4a448dfed27ea5688dc3cd5e74eb8274294db644c7a6b3599d835e120adaa8dfd3d5f6c12 MISC metadata.xml 451 BLAKE2B 1e44b5ecebfb78a8f5990a2ea12bdd0ebeea8f64ae3a0554f3c66642e826be215dda70c24d2b6fcde7d7ae2c3d42092b7b0763b9f8405f967d3e09fe8062b3f5 SHA512 d1ba4ff51b06d03e9ff7c13e3f9693c8f91cceaec228f4bd90b560a02be5b42e5fe3d8d7a885816c12b9ef123484537df67f572c0e7bd3d5555f0809132537f1 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 3d0258f459a7..69fb1d323273 100644 --- a/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild +++ b/app-i18n/fcitx-sayura/fcitx-sayura-0.1.2.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake-utils xdg-utils +inherit cmake xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 diff --git a/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild b/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild index 8b9f2d116f0a..071943eb140c 100644 --- a/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild +++ b/app-i18n/fcitx-sayura/fcitx-sayura-4.9999.ebuild @@ -3,7 +3,7 @@ EAPI="7" -inherit cmake-utils xdg-utils +inherit cmake xdg-utils if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 diff --git a/app-i18n/fcitx/Manifest b/app-i18n/fcitx/Manifest index eb3a2923c3ff..862a8b109da5 100644 --- a/app-i18n/fcitx/Manifest +++ b/app-i18n/fcitx/Manifest @@ -1,9 +1,15 @@ +AUX fcitx-4.2.9.8-enchant.patch 855 BLAKE2B 86337ed49c8b6ceee8ac11034e89248f66a3bfbac94a19c5949e94ce9e6ab7d57367701ef7e0cfe89a06cc0a5fdf48115edb13c1da43141ac7fe7eed2723d2d6 SHA512 4d1a03793d4156d7867afbbd362086d40a62f56777428e9d5b27a36120377c69b37fbfdfc709b1ae1c9faa534769051f1eaa8c9fbbaa193b28cc24bcd155e486 +AUX fcitx-4.2.9.8-xkb.patch 794 BLAKE2B e95f44dfa529bdb2f91d31f2e6f1f94c4d0c9c08927a0fd19c544e5e5983ad0509222756bd6feeb3fb8aec1deb7a09ad85d55def1993c766b0dbb46687e0ac89 SHA512 3cb7c0267a8f758366aa09ae07596d20f3c72a4cd940f5e6c4a469fb72c3284282c883402f3ff09a1c4eb695fdd214433026b5899638e00c11cab6b168e49349 DIST fcitx-4.2.9.6_dict.tar.xz 8738408 BLAKE2B 812256657ef8f6648a8a3de4bef4e423288ee3d91d493783eae2cb55b5b5964a791f3317af1aea0d877e01ea06491c34f6c594038d27713be3a6b35c93bc5545 SHA512 dc8308d1a4e9b7595da285ca6521f33027f5b8e6968bc28f751bd4f40116166cabbe1c05e29072afbe88473d2a9d6999124476260785e07f62a243df6e896bb0 +DIST fcitx-4.2.9.7_dict.tar.xz 8734508 BLAKE2B e8770a3afe902fab11325f345a128156a9e6e8c4f5e712c68a03a12282c0bc6a279968bacdb2129a243967c8fdfc6b7145f5ad13daea5bf0c5fb28332e79437e SHA512 b940478c648e30b2ea55903465ed02c8a0c3ae3539e4bd5b77be46a9e4d0c13ceff074ddd7532f86893111eb96308e1740db621a83fb809e4fd02256d75ebe7b +DIST fcitx-4.2.9.8_dict.tar.xz 8737888 BLAKE2B 2de3ccbf1b37a9bcf1a3cb257d7837669e946765722c3d6f442ad071d7d81a6e8178e47051fc3aa53b9b4771d3aca602c2e22fa7a3d117a9e1f2779497e02c52 SHA512 50a954c3178f53fd2d441cdaf81fb44a7fe8dfb263fa6d8dd4ee4884fc7ae8321880c726c9366d11e2a4ac8da2233268d06e5d0800d4527ba0bdb1a1430248ed DIST fcitx-data-en_dict-20121020.tar.gz 630491 BLAKE2B 2df897b1c9fb3a2ce186ee590e5f3ccbc7930f047218bf0fefa317f74b3287fc0be9c393d3310fe07208379118ec4c46608a1c703ef37b3aee65b2d790cb7f0d SHA512 8418bd02492bfd786c0fab93be4400ef027ec8e9fac02220cc1f653f5eb67f54573a6a84a15baba19bb34ab892745c87df16499d6304ea75009131e2ab3b97f2 DIST fcitx-data-pinyin.tar.gz 1608886 BLAKE2B 3b7e72559bb838b4f2245e6faf2d627df17e9383ef8fe382e10333c1a95d79409ec042caa7d77c9bcd956b1c5d5456dab9d82208cd89d90e2be759c76f56f3d1 SHA512 1ee19eed3ee58be6cd6562ec363fe3bf630fff5e8820b3bfdd6d4618fceb082695e888dec5366a3685d58706f720e19319d891c223227237aed12674ea982131 DIST fcitx-data-py_stroke-20121124.tar.gz 445601 BLAKE2B 43b29b30da11b18196918e4df847406871eff75595b62608ad86b0ef6de83ec5e1b722645cabb809281075b393b5970e4d9580594caa73060c866c2d3cd988e7 SHA512 d80ff9a3549e07c7a6935e686785f9a076c58f1a782a832ae28ee65e2a213d67f089f450ce09bed87ec2a141c32b9c1fcb83c221ddcab436858fa9009f161fb3 DIST fcitx-data-py_table-20121124.tar.gz 186822 BLAKE2B d696413f2e88f1ca87938d632e12997d14a31a66eaf011c6a7b3c0f607cf45f48e53644ea07d73dbbb0ad898dee6d5ff2d0e4fc2fdcae923acbc03d3d387aaeb SHA512 0fa72ce6820a316e9729bc0d7a08af5ca3468134de9ff1bf0c559a398846a7bcf7313a3609d943e6bab637d930cf45ad9acfe25a8d3df078a774b071a7296486 DIST fcitx-data-table.tar.gz 4144686 BLAKE2B 696845bb234915a364d614d47cc3baf8421a12ca1778611b0843e52e651da98b5ed9f3e0c9895a829b67f1bcceb1f982a7f6606c8a2d383af8c4573a150c71ef SHA512 99e1d69c679355fcf3e117a1ef39b131cbd3af841387d2335757247d840b90ff6b7323e16fca98cf7a043033faf250d2e9c6d47b96845d18c278a0cf6f30fec9 -EBUILD fcitx-4.2.9.6.ebuild 4538 BLAKE2B 24885bb784c46556f4ae323cb1773131d41742b16dc6dca784583a285aabcd34751d69fe6cf6f99a3f455f64813fcdbf79f60a7a7eab517826f098847ac6b145 SHA512 d5275a9d6d0c5bd134a29721995e09389640954fd966b2ff9de2d205ba6642c191d50ff37dfd92da7f5ac009979740f8776a871ba570f99428aeb2bff8cc424f -EBUILD fcitx-4.9999.ebuild 4506 BLAKE2B c4e02d1bb61fdcaf57468d354c2d04b6797ae9e9b120f106ac853c818351700740323ae1c03b72a3f18ef6fc7b3864a414e923f8064f88a1879331d1695a32f0 SHA512 ae757929c401888ddb76b1f0244c53415180c95e2679a8d23282b41831d478ef87ff1a7f1086feecdba1678d89b4c057be4f4e4537bb210fed1c97976c45bc54 -MISC metadata.xml 1076 BLAKE2B 26683fedf129c5a12418a498aab7dbeee3b309b9f88a91e1038ba4f8babea80a8e1847b2b2e3d3e942fd9d3de32a97c6d7229fb97d5d91131c6a0093119d0de7 SHA512 dd819898fe67f8d746f43f02606d7a38360be1f66e6c6d33f0f81aff389018c7a988bb27304344a4107287b753a5acda3c20ad10d37f9ca859d1e948acdb2224 +EBUILD fcitx-4.2.9.6.ebuild 4538 BLAKE2B 6b2a1fb24810d3c15f19cb01b9019d0cc6147171e3160b9204d2489fe032df3151827ab141dec6075484906749abb09719a3e9e5be17d89f0bfeb49525ff7c31 SHA512 bb54ec7c4fdff72eef9233a3326afc4b8cd21d1c101c17ca903574cc487561b4b5a88ed91680aecafbaa752ee724743cdf0817fad3c2069366ce421593c38b7a +EBUILD fcitx-4.2.9.7.ebuild 4199 BLAKE2B c40ef62b59f2867329590a46eac97985b4860e5767beddf34fddbd7937b7d8370855d7cb600143e27107d6a815e4a09586d83287c329ecbf8c653dd679e26a79 SHA512 bc5bce4a291abaccaba62636861fa17c3b557314f019d7bf45e2d5d617c7be7b82854ae49d052d1eedd5993fc75f9020a346c46abd5398d1fd144b8f73c0ce6e +EBUILD fcitx-4.2.9.8.ebuild 4291 BLAKE2B 0b3540400289eb21293cdeb50556db2f1dd25f5d4a56b99125155f3b03e24dea018a18a215b1fdd7eb5a0b8263129794c02a258d0fb85fb09a6d4630ca77dabd SHA512 4144d08f64ad6f5b59538c27a104d5be2cac538d5bcc597e46efda545cd03b96e6b157b45f9a5ee3cdd0eb542a065345b64d6f05a3069192815f756630c23184 +EBUILD fcitx-4.9999.ebuild 4255 BLAKE2B 26388e143acae73274c280db530b2ca584b1157c5b9b736f57436e4203851943ff8d45d6db5562d240c90fdcc91d97aa3e457609531a9cdfd8dbe70be9a6a1af SHA512 4d8b32e04dcabe1a18ed1de7368ffafc2aa7293af16b188995585d837eb3715fcd972f5793a83f6fa8daf21ec60d366c95725c76c7694ae669429c8f1ab264ae +MISC metadata.xml 1189 BLAKE2B 027fb94416c905c2246444aadebc20230aa922a94228a870f1e99b8721ace82681fc27395e565a81f79ec088765cc2bde303d40788ba29c32727d57554aae196 SHA512 7f7f05a1716f4da573c075961a4367718defa22899e1f29f7d4bb13b0345e0b979c6a7b1e3040d0fd3f5ec03c0d4813585ae043340799d5a46cd3ede1be2bbc5 diff --git a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild index abf4e1cbdb6a..43274c9346bd 100644 --- a/app-i18n/fcitx/fcitx-4.2.9.6.ebuild +++ b/app-i18n/fcitx/fcitx-4.2.9.6.ebuild @@ -26,7 +26,7 @@ fi LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT" SLOT="4" KEYWORDS="amd64 ~arm64 ~hppa ppc ppc64 x86" -IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xml" +IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xkb" REQUIRED_USE="cairo? ( X ) pango? ( cairo )" RESTRICT="!test? ( test )" @@ -46,7 +46,7 @@ DEPEND="dev-libs/glib:2 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender - xml? ( + xkb? ( x11-libs/libxkbfile x11-misc/xkeyboard-config ) @@ -63,7 +63,7 @@ DEPEND="dev-libs/glib:2 lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:0= ) - xml? ( + xkb? ( app-text/iso-codes dev-libs/libxml2 )" @@ -102,7 +102,7 @@ src_configure() { -DENABLE_GIR=$(usex introspection ON OFF) -DENABLE_GTK2_IM_MODULE=$(usex gtk2 ON OFF) -DENABLE_GTK3_IM_MODULE=$(usex gtk3 ON OFF) - -DENABLE_LIBXML2=$(usex xml ON OFF) + -DENABLE_LIBXML2=$(usex xkb ON OFF) -DENABLE_LUA=$(usex lua ON OFF) -DENABLE_OPENCC=$(usex opencc ON OFF) -DENABLE_PANGO=$(usex pango ON OFF) diff --git a/app-i18n/fcitx/fcitx-4.2.9.7.ebuild b/app-i18n/fcitx/fcitx-4.2.9.7.ebuild new file mode 100644 index 000000000000..5a6d41ac6a92 --- /dev/null +++ b/app-i18n/fcitx/fcitx-4.2.9.7.ebuild @@ -0,0 +1,143 @@ +# Copyright 2003-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit cmake gnome2-utils xdg-utils + +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/fcitx/fcitx" +fi + +DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx" +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz + https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz + https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz + https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz + https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz" +fi + +LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT" +SLOT="4" +KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango +table test +xkb" +REQUIRED_USE="cairo? ( X ) pango? ( cairo )" +RESTRICT="!test? ( test )" + +BDEPEND="dev-util/glib-utils + kde-frameworks/extra-cmake-modules:5 + virtual/pkgconfig + introspection? ( dev-libs/gobject-introspection ) + nls? ( sys-devel/gettext )" +DEPEND="dev-libs/glib:2 + sys-apps/dbus + sys-apps/util-linux + virtual/libiconv + virtual/libintl + x11-libs/libxkbcommon + X? ( + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXrender + xkb? ( + dev-libs/libxml2 + x11-libs/libxkbfile + x11-misc/xkeyboard-config + ) + ) + cairo? ( + x11-libs/cairo[X] + x11-libs/libXext + pango? ( x11-libs/pango ) + !pango? ( media-libs/fontconfig ) + ) + enchant? ( app-text/enchant:0= ) + gtk2? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + lua? ( dev-lang/lua:= ) + nls? ( sys-devel/gettext ) + opencc? ( app-i18n/opencc:0= ) + xkb? ( + app-text/iso-codes + dev-libs/json-c:0= + )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-4.2.9.8-xkb.patch" +) + +DOCS=(AUTHORS ChangeLog THANKS) + +src_prepare() { + if [[ "${PV}" =~ (^|\.)9999$ ]]; then + ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die + ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die + ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die + ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die + ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DSYSCONFDIR="${EPREFIX}/etc" + -DENABLE_CAIRO=$(usex cairo ON OFF) + -DENABLE_DEBUG=$(usex debug ON OFF) + -DENABLE_ENCHANT=$(usex enchant ON OFF) + -DENABLE_GETTEXT=$(usex nls ON OFF) + -DENABLE_GIR=$(usex introspection ON OFF) + -DENABLE_GTK2_IM_MODULE=$(usex gtk2 ON OFF) + -DENABLE_GTK3_IM_MODULE=$(usex gtk3 ON OFF) + -DENABLE_LUA=$(usex lua ON OFF) + -DENABLE_OPENCC=$(usex opencc ON OFF) + -DENABLE_PANGO=$(usex pango ON OFF) + -DENABLE_QT=OFF + -DENABLE_QT_GUI=OFF + -DENABLE_QT_IM_MODULE=OFF + -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else echo OFF; fi) + -DENABLE_TABLE=$(usex table ON OFF) + -DENABLE_TEST=$(usex test ON OFF) + -DENABLE_X11=$(usex X ON OFF) + -DENABLE_XDGAUTOSTART=$(usex autostart ON OFF) + -DENABLE_XKB=$(usex xkb ON OFF) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + rm -r "${ED}/usr/share/doc/${PN}" +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + + elog + elog "Quick Phrase Editor is provided by:" + elog " app-i18n/fcitx-qt5:4" + elog +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 +} diff --git a/app-i18n/fcitx/fcitx-4.2.9.8.ebuild b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild new file mode 100644 index 000000000000..0b9336e8a571 --- /dev/null +++ b/app-i18n/fcitx/fcitx-4.2.9.8.ebuild @@ -0,0 +1,145 @@ +# Copyright 2003-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit cmake gnome2-utils xdg-utils + +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/fcitx/fcitx" +fi + +DESCRIPTION="Fcitx (Flexible Context-aware Input Tool with eXtension) input method framework" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx" +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + SRC_URI="https://download.fcitx-im.org/data/pinyin.tar.gz -> fcitx-data-pinyin.tar.gz + https://download.fcitx-im.org/data/table.tar.gz -> fcitx-data-table.tar.gz + https://download.fcitx-im.org/data/py_stroke-20121124.tar.gz -> fcitx-data-py_stroke-20121124.tar.gz + https://download.fcitx-im.org/data/py_table-20121124.tar.gz -> fcitx-data-py_table-20121124.tar.gz + https://download.fcitx-im.org/data/en_dict-20121020.tar.gz -> fcitx-data-en_dict-20121020.tar.gz" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz" +fi + +# LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT qt4? ( BSD )" +LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT" +SLOT="4" +KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86" +IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango +table test +xkb" +REQUIRED_USE="cairo? ( X ) pango? ( cairo )" +RESTRICT="!test? ( test )" + +BDEPEND="dev-util/glib-utils + kde-frameworks/extra-cmake-modules:5 + virtual/pkgconfig + introspection? ( dev-libs/gobject-introspection ) + nls? ( sys-devel/gettext )" +DEPEND="dev-libs/glib:2 + sys-apps/dbus + sys-apps/util-linux + virtual/libiconv + virtual/libintl + x11-libs/libxkbcommon + X? ( + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libXinerama + x11-libs/libXrender + xkb? ( + dev-libs/libxml2 + x11-libs/libxkbfile + x11-misc/xkeyboard-config + ) + ) + cairo? ( + x11-libs/cairo[X] + x11-libs/libXext + pango? ( x11-libs/pango ) + !pango? ( media-libs/fontconfig ) + ) + enchant? ( app-text/enchant:= ) + gtk2? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + lua? ( dev-lang/lua:= ) + nls? ( sys-devel/gettext ) + opencc? ( app-i18n/opencc:0= ) + xkb? ( + app-text/iso-codes + dev-libs/json-c:0= + )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-4.2.9.8-enchant.patch" + "${FILESDIR}/${PN}-4.2.9.8-xkb.patch" +) + +DOCS=(AUTHORS ChangeLog THANKS) + +src_prepare() { + if [[ "${PV}" =~ (^|\.)9999$ ]]; then + ln -s "${DISTDIR}/fcitx-data-pinyin.tar.gz" src/im/pinyin/data/pinyin.tar.gz || die + ln -s "${DISTDIR}/fcitx-data-table.tar.gz" src/im/table/data/table.tar.gz || die + ln -s "${DISTDIR}/fcitx-data-py_stroke-20121124.tar.gz" src/module/pinyin-enhance/data/py_stroke-20121124.tar.gz || die + ln -s "${DISTDIR}/fcitx-data-py_table-20121124.tar.gz" src/module/pinyin-enhance/data/py_table-20121124.tar.gz || die + ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die + fi + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)" + -DSYSCONFDIR="${EPREFIX}/etc" + -DENABLE_CAIRO=$(usex cairo ON OFF) + -DENABLE_DEBUG=$(usex debug ON OFF) + -DENABLE_ENCHANT=$(usex enchant ON OFF) + -DENABLE_GETTEXT=$(usex nls ON OFF) + -DENABLE_GIR=$(usex introspection ON OFF) + -DENABLE_GTK2_IM_MODULE=$(usex gtk2 ON OFF) + -DENABLE_GTK3_IM_MODULE=$(usex gtk3 ON OFF) + -DENABLE_LUA=$(usex lua ON OFF) + -DENABLE_OPENCC=$(usex opencc ON OFF) + -DENABLE_PANGO=$(usex pango ON OFF) + -DENABLE_QT=OFF + -DENABLE_QT_GUI=OFF + -DENABLE_QT_IM_MODULE=OFF + -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else echo OFF; fi) + -DENABLE_TABLE=$(usex table ON OFF) + -DENABLE_TEST=$(usex test ON OFF) + -DENABLE_X11=$(usex X ON OFF) + -DENABLE_XDGAUTOSTART=$(usex autostart ON OFF) + -DENABLE_XKB=$(usex xkb ON OFF) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + rm -r "${ED}/usr/share/doc/${PN}" +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 + + elog + elog "Quick Phrase Editor is provided by:" + elog " app-i18n/fcitx-qt5:4" + elog +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_icon_cache_update + xdg_mimeinfo_database_update + use gtk2 && gnome2_query_immodules_gtk2 + use gtk3 && gnome2_query_immodules_gtk3 +} diff --git a/app-i18n/fcitx/fcitx-4.9999.ebuild b/app-i18n/fcitx/fcitx-4.9999.ebuild index 53d5b963fa21..295d5fa08862 100644 --- a/app-i18n/fcitx/fcitx-4.9999.ebuild +++ b/app-i18n/fcitx/fcitx-4.9999.ebuild @@ -23,10 +23,11 @@ else SRC_URI="https://download.fcitx-im.org/${PN}/${P}_dict.tar.xz" fi +# LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT qt4? ( BSD )" LICENSE="BSD-1 GPL-2+ LGPL-2+ MIT" SLOT="4" KEYWORDS="" -IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango static-libs +table test +xml" +IUSE="+X +autostart +cairo debug +enchant gtk2 +gtk3 +introspection lua nls opencc +pango +table test +xkb" REQUIRED_USE="cairo? ( X ) pango? ( cairo )" RESTRICT="!test? ( test )" @@ -46,7 +47,8 @@ DEPEND="dev-libs/glib:2 x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrender - xml? ( + xkb? ( + dev-libs/libxml2 x11-libs/libxkbfile x11-misc/xkeyboard-config ) @@ -57,18 +59,23 @@ DEPEND="dev-libs/glib:2 pango? ( x11-libs/pango ) !pango? ( media-libs/fontconfig ) ) - enchant? ( app-text/enchant:0= ) + enchant? ( app-text/enchant:= ) gtk2? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) lua? ( dev-lang/lua:= ) nls? ( sys-devel/gettext ) opencc? ( app-i18n/opencc:0= ) - xml? ( + xkb? ( app-text/iso-codes - dev-libs/libxml2 + dev-libs/json-c:0= )" RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-4.2.9.8-enchant.patch" + "${FILESDIR}/${PN}-4.2.9.8-xkb.patch" +) + DOCS=(AUTHORS ChangeLog THANKS) src_prepare() { @@ -80,14 +87,6 @@ src_prepare() { ln -s "${DISTDIR}/fcitx-data-en_dict-20121020.tar.gz" src/module/spell/dict/en_dict-20121020.tar.gz || die fi - # https://github.com/fcitx/fcitx/issues/250 - sed \ - -e "/find_package(XkbFile REQUIRED)/i\\ if(ENABLE_X11)" \ - -e "/find_package(XkbFile REQUIRED)/s/^/ /" \ - -e "/find_package(XkbFile REQUIRED)/a\\ find_package(XKeyboardConfig REQUIRED)\n endif(ENABLE_X11)" \ - -e "/^find_package(XKeyboardConfig REQUIRED)/,+1d" \ - -i CMakeLists.txt - cmake_src_prepare } @@ -102,7 +101,6 @@ src_configure() { -DENABLE_GIR=$(usex introspection ON OFF) -DENABLE_GTK2_IM_MODULE=$(usex gtk2 ON OFF) -DENABLE_GTK3_IM_MODULE=$(usex gtk3 ON OFF) - -DENABLE_LIBXML2=$(usex xml ON OFF) -DENABLE_LUA=$(usex lua ON OFF) -DENABLE_OPENCC=$(usex opencc ON OFF) -DENABLE_PANGO=$(usex pango ON OFF) @@ -110,11 +108,11 @@ src_configure() { -DENABLE_QT_GUI=OFF -DENABLE_QT_IM_MODULE=OFF -DENABLE_SNOOPER=$(if use gtk2 || use gtk3; then echo ON; else echo OFF; fi) - -DENABLE_STATIC=$(usex static-libs ON OFF) -DENABLE_TABLE=$(usex table ON OFF) -DENABLE_TEST=$(usex test ON OFF) -DENABLE_X11=$(usex X ON OFF) -DENABLE_XDGAUTOSTART=$(usex autostart ON OFF) + -DENABLE_XKB=$(usex xkb ON OFF) ) cmake_src_configure 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 new file mode 100644 index 000000000000..f152f1dc6e5a --- /dev/null +++ b/app-i18n/fcitx/files/fcitx-4.2.9.8-enchant.patch @@ -0,0 +1,32 @@ +https://github.com/fcitx/fcitx/issues/475 + +--- /cmake/FindEnchant.cmake ++++ /cmake/FindEnchant.cmake +@@ -16,15 +16,15 @@ + endif(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) + + find_package(PkgConfig) +-pkg_check_modules(PC_ENCHANT enchant) ++pkg_check_modules(PC_ENCHANT enchant-2 enchant) + + find_path(ENCHANT_INCLUDE_DIR + NAMES enchant.h + HINTS ${PC_ENCHANT_INCLUDE_DIRS} +- PATH_SUFFIXES "enchant") ++ PATH_SUFFIXES enchant-2 enchant) + + find_library(ENCHANT_LIBRARIES +- NAMES enchant ++ NAMES enchant-2 enchant + HINTS ${PC_ENCHANT_LIBRARY_DIRS}) + + if(ENCHANT_INCLUDE_DIR AND ENCHANT_LIBRARIES) +@@ -39,7 +39,7 @@ + #include <stdlib.h> + #include <stddef.h> + #include <string.h> +- #include <enchant/enchant.h> ++ #include <enchant.h> + + EnchantBroker *enchant_broker_init(); + char **enchant_dict_suggest(EnchantDict *dict, const char *str, 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 new file mode 100644 index 000000000000..e21c3a1db7e8 --- /dev/null +++ b/app-i18n/fcitx/files/fcitx-4.2.9.8-xkb.patch @@ -0,0 +1,32 @@ +https://github.com/fcitx/fcitx/issues/250 + +--- /CMakeLists.txt ++++ /CMakeLists.txt +@@ -96,12 +96,15 @@ + endif() + endif() + if (ENABLE_XKB) +- # Parse xkb xml file +- find_package(LibXml2 REQUIRED) + find_package(IsoCodes REQUIRED) +- find_package(XkbFile REQUIRED) + # Parse isocodes json + pkg_check_modules(JsonC "json-c" IMPORTED_TARGET REQUIRED) ++ if(ENABLE_X11) ++ # Parse xkb xml file ++ find_package(LibXml2 REQUIRED) ++ find_package(XkbFile REQUIRED) ++ find_package(XKeyboardConfig REQUIRED) ++ endif(ENABLE_X11) + endif (ENABLE_XKB) + if(ENABLE_PRESAGE) + find_package(Presage) +@@ -121,8 +124,6 @@ + message(FATAL_ERROR "Xkb is needed") + endif (NOT X11_Xkb_FOUND) + +-find_package(XKeyboardConfig REQUIRED) +- + endif() + + if (ENABLE_TEST) diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml index d364159f7497..ec867fe607ad 100644 --- a/app-i18n/fcitx/metadata.xml +++ b/app-i18n/fcitx/metadata.xml @@ -17,6 +17,7 @@ <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="table">Install table input methods for Simplified Chinese</flag> + <flag name="xkb">Enable support for XKB (required for fcitx-xkb, fcitx-xkbdbus, part of fcitx-keyboard)</flag> </use> <upstream> <remote-id type="github">fcitx/fcitx</remote-id> diff --git a/app-i18n/ibus-sunpinyin/Manifest b/app-i18n/ibus-sunpinyin/Manifest index ee8c544ae091..7f981aabba9e 100644 --- a/app-i18n/ibus-sunpinyin/Manifest +++ b/app-i18n/ibus-sunpinyin/Manifest @@ -1,7 +1,4 @@ AUX ibus-sunpinyin-2.0.4_pre20200306162733-python-3.patch 4691 BLAKE2B 162301e028b0b8f864c394368897d635b3fea8939e52c9068884b08752f51a5d550381680dda65b42e80f471bd0ab616940f138fd53c79655454d6fbfa070b3c SHA512 e67e202fe2587a4b985b047c893164d3a68ba7ff4ae08d9cf5dde501614c9d71bc4d9628858f7bd9ef2f954c9826134d8965c59f8548723df6e94ab8652daafd -AUX ibus-sunpinyin-python3.patch 388 BLAKE2B 35131840c58bc47980dbbe046723217afb8926f61de601d664524b961c80f718753e41a82b7cdcd8b137d71c97ad84b91a3b71677610b2f369f9be2da2582185 SHA512 90c7d08588e996e7df966f9ee4b3b044a038392a0f3f074f4803b45a6579ad774119a3c700167924f073a3109f8172f8fea12129c2eb36e914b89eb68cc5a7dc DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33 -DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e -EBUILD ibus-sunpinyin-2.0.4_pre20200306162733.ebuild 2176 BLAKE2B 0d888d6dc8454753b7718dea85bca241a8680d3fea5a452b12d69e3c9e2d4f307783292a49aeb459108d0d390467492c688c1efaedffe8cc0e00d34fa76a8f51 SHA512 765578cd624782d80fd94dd6925b2e43ef44af73c2da19e69b344100e0a49f09a15f6b067b690e1b9ed6b500400d926fee6326af8fbfee6a8195822b37c458f7 -EBUILD ibus-sunpinyin-3.0.0_rc1-r1.ebuild 1331 BLAKE2B afb4525f5edfee440423c10c0412fd9a7d5cb6dc283bbd4cae5413f16e3d892b0e4ee178529b881d9243e9bce0482a65fe4f2f1168b6a21b2e184a5cdba28feb SHA512 915b0c1d6704e5b18a4b931bcb84cfd480f02322c01e74a0246eb7e7dc58e2a4609513889a9a88af7072e5b9361c03975a65e7cae0449deee17bb41f178c843b +EBUILD ibus-sunpinyin-2.0.4_pre20200306162733.ebuild 2180 BLAKE2B d2c7cc069013764e681d2dd560d933432a975860f751074800ef840b5591f4d9ec046565b57767b70b2f31076f6910eb09143fa4810c012dedf571f76bcf45d4 SHA512 09a8092c2e4e15e80f1943a342e62a0388c27115c61926fb6a6893c0b727e824226cc6ed8876a621dc95ce40dc1b2f7e00e468226f40699ef362db7c27a93378 MISC metadata.xml 420 BLAKE2B d59e5e24e6892f397a61f9b4f9cb3d82ca59a522ad8a82c29fcd9d636f097c0b8257363ae6d6977dafb3894aa8aa5f2f22b7664e4cfd8c79a571f9bf62e55f73 SHA512 ed92e8d756f41ea6618cf6f159a3514739a32344b4a63ab64037083e693d18af37de8747edf6c2f6e9006e4ce60ac128f4dbe36c2ab85801b78cbfe28a753a61 diff --git a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-python3.patch b/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-python3.patch deleted file mode 100644 index 07f4699680ef..000000000000 --- a/app-i18n/ibus-sunpinyin/files/ibus-sunpinyin-python3.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/wrapper/ibus/setup/main.py -+++ b/wrapper/ibus/setup/main.py -@@ -37,8 +37,11 @@ - import sys - import os - from os import path --import gtk --import ibus -+from gi import require_version as gi_require_version -+gi_require_version('Gtk', '3.0') -+gi_require_version('IBus', '1.0') -+from gi.repository import Gtk as gtk -+from gi.repository import IBus as ibus - import gettext - import locale - 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 index a73dd516a5ce..faabcbdc3751 100644 --- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild +++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-2.0.4_pre20200306162733.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=(python{3_6,3_7,3_8}) +PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9}) inherit python-single-r1 scons-utils toolchain-funcs diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1-r1.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1-r1.ebuild deleted file mode 100644 index 6037fa22fe86..000000000000 --- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PLOCALES="zh_CN" -PYTHON_COMPAT=( python2_7 ) - -inherit l10n python-single-r1 scons-utils toolchain-funcs vcs-snapshot - -MY_P="${P#*-}" - -DESCRIPTION="Chinese SunPinyin engine for IBus" -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="+nls" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep ' - app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}] - ') - ~app-i18n/sunpinyin-${PV}:= - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext )" -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}"/${PN}-python3.patch ) - -src_prepare() { - sed -i "/^locales/s/'.*'/$(l10n_get_locales | sed "s/\([^[:space:]]\+\)/\'\1\',/g")/" wrapper/ibus/SConstruct - sed -i "s/python/${EPYTHON}/" wrapper/ibus/setup/${PN/-/-setup-}.in - - default - tc-export CXX -} - -src_compile() { - escons -C wrapper/ibus \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --libexecdir="${EPREFIX}"/usr/libexec -} - -src_install() { - escons -C wrapper/ibus --install-sandbox="${D}" install - dodoc wrapper/ibus/README -} diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest index 13c871119ad4..6cce6fe40ac0 100644 --- a/app-i18n/ibus-typing-booster/Manifest +++ b/app-i18n/ibus-typing-booster/Manifest @@ -1,7 +1,5 @@ -DIST ibus-typing-booster-2.9.5.tar.gz 8236281 BLAKE2B 749890cc3477db890603c9a700bff1a097fd2cd09d01477f319658c65c73688903171e49a0284176ce396d83587ef23a067a0aabe81c57bf70479050a15e8c80 SHA512 58db7d7e687512d8c436b23c28e1c614d56f486de13153f5ddfddecf32595f6de8c8289273b288c1df857dac5577df3eea48ca900b709a13b9c91b2e0ec21286 -DIST ibus-typing-booster-2.9.6.tar.gz 8238571 BLAKE2B f0d64d71c778bc47427ae7b87a23d53f77a537765113334cada73312452cfc0c66f8a321ff17f7722da6554230347253ac2bd0e311b4c5a8831dc17f34e8ef72 SHA512 d3038b744ba5049fed8cf4ba9d455502ef3061f35604d135ffb15604bbac78be1b4ba4232528daf87cb750772309cc9745d7ebc31ced2fc989395e0c62701eb4 +DIST ibus-typing-booster-2.10.1.tar.gz 9449495 BLAKE2B 36e52d3e6349a89a1202429f7068221dc75dc0072d9e49424cf410ab12c2e732b9ea9fc54a2bbbfe386f2687535b9e0d46e5567f1572c42cf7fe98243c234a38 SHA512 d4262d7bec0b65919f5d25c97b319a48808d1257ea0697163bcaae238870d57640ed8fb44d423abb844416e1c99c130b1d6d5813a0edfa849afc762929e61f66 DIST ibus-typing-booster-2.9.7.tar.gz 8833452 BLAKE2B 4c4f33bcff2fa9e20afeccf242bec1a6e11fca0b5cb515b2c2dce7ef2401c092a7197a6637e2ca72d4c1bacd694860c07ae645a313e41cd879d6bde8c1736d12 SHA512 984beacdd6b853e074127372a912442ba1dbc536ecf194a34d03025277b9d6277e967e63a9bdcd1620f5094965a191297ccae9adbff2d54d1cd474437a1ec16b -EBUILD ibus-typing-booster-2.9.5.ebuild 1099 BLAKE2B 7bb5ca273bd6e5a4f6c4e2913fc0a7c2cd42fdc68a9003fec646164b24950ed17b49dab5bccb0c1bc3ccf029b6fc1791d39d975ad890e59a9c7ccb05e69850d4 SHA512 ce95b1ec4505e8e367d27ecd2808675efbb19e3ebec672bee3fd5c1cbe9b7d0d328e5dd3b354ca2a5be18f82732d8e46031704fb9eb05c8cabffe7b03071abb1 -EBUILD ibus-typing-booster-2.9.6.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53 -EBUILD ibus-typing-booster-2.9.7.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53 +EBUILD ibus-typing-booster-2.10.1.ebuild 1101 BLAKE2B 9e4f83cb5209d9e7f49e2716957c517d5d952d8e64a1e8756f380034a8ee0c7971028bdfb1af96180a0a4dbcc13e9dc813e083cbad5e5e630f8659a5710c8b10 SHA512 8b9d7d3bccb894abf60b112fd6061cb535910d78685c184162d5a27f174417bd2ad16439417602ed79142bd2a123d6db483b53b2446453dc5b508ef4265c3f53 +EBUILD ibus-typing-booster-2.9.7.ebuild 1099 BLAKE2B 7bb5ca273bd6e5a4f6c4e2913fc0a7c2cd42fdc68a9003fec646164b24950ed17b49dab5bccb0c1bc3ccf029b6fc1791d39d975ad890e59a9c7ccb05e69850d4 SHA512 ce95b1ec4505e8e367d27ecd2808675efbb19e3ebec672bee3fd5c1cbe9b7d0d328e5dd3b354ca2a5be18f82732d8e46031704fb9eb05c8cabffe7b03071abb1 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.6.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.1.ebuild index ed1abe745449..ed1abe745449 100644 --- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.6.ebuild +++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.10.1.ebuild diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.5.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.5.ebuild deleted file mode 100644 index 69c81149e145..000000000000 --- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.5.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" -PYTHON_COMPAT=( python3_{6,7,8} ) -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_MULTI_USEDEP}] - dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] - dev-python/pyenchant[${PYTHON_MULTI_USEDEP}] - dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}] - dev-python/pyxdg[${PYTHON_MULTI_USEDEP}] - ')" -RDEPEND="${DEPEND} - >=dev-db/m17n-db-1.7" -BDEPEND="sys-devel/gettext - virtual/pkgconfig" - -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.9.7.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.7.ebuild index ed1abe745449..69c81149e145 100644 --- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.7.ebuild +++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.9.7.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.g LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="" RESTRICT="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest index 9a02e4be84ee..e30dd9055ceb 100644 --- a/app-i18n/ibus/Manifest +++ b/app-i18n/ibus/Manifest @@ -1,3 +1,6 @@ DIST ibus-1.5.22.tar.gz 3578251 BLAKE2B 08ad72bd455d2841700b11a4ade88e2b9768433f86bac4baf20db882580b10a4705f545a845a03d3b4196a75c43d33c51ffd31a3516d71030f891ce48dce69c2 SHA512 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d -EBUILD ibus-1.5.22.ebuild 4115 BLAKE2B 2ec77d1d248e15dcbbafcc957643fe0988cfceedc60e120b9ded7d8cc1cc03fd26484d92d7d8c4abeec95de185cf0945e31d04a8c12c7d5d10ceecff050e8312 SHA512 5b470de75de14aa7dd45064fa7730d8b3b7d4180c623d31ac8313cc5e4920ecea4054163753f29fe042ecfb39c1505a3a9b1acbcdbddbbe19e505e64c451d6a4 +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 +EBUILD ibus-1.5.22.ebuild 4143 BLAKE2B a3c44e85e5c76e7f4ab564de3d48ef834e91081bf2b5f2b82212a2f155653b786f5f32f55e692ebd05a8f8b860ea7d62341bb109ef262b359f66358c4ef24d67 SHA512 39189e93d230bbf5d695e2c0ae944b681c33132ac33dc81d0cf2c286bed31997deeb77ee27276398f5817d75045854e372d8c28ccd157f2cf9fba0561cd466b5 +EBUILD ibus-1.5.23.ebuild 4454 BLAKE2B c3c94770bb2108ab973d6388845c84ebe6ca1f4d31401308197f5e6a17f21673fcdc20228a8cbea77a67e86aae01f97f124743d116ecdd2b6b7b9d182258acaf SHA512 9f5329063e5936311b0d3b7ac1d9f6f20625e03e8ccd29179e5c1b407dbae7c119b8d8dddc83e6d76e31555a0fdb95f5caa467a104934af9525ab5753ee6e1db MISC metadata.xml 865 BLAKE2B bbf090f2a0102b1a5672dfd051cb4240b923b60146900e4c966a5d3da33ee795140820f5d2865dec984c90db6fc98e4cfe010f20e26f376cf98e929dca2516b6 SHA512 4c7ad9414350dba19fc3c0846c3197d0bb2f8cfe653242c547db9fedaa014329cfd39a2d086c7954b1377aaaee762dd3f4063ec071ef36dc748bf3dbadf85e77 diff --git a/app-i18n/ibus/ibus-1.5.22.ebuild b/app-i18n/ibus/ibus-1.5.22.ebuild index 5eae573dbe96..f7c9f747cdd6 100644 --- a/app-i18n/ibus/ibus-1.5.22.ebuild +++ b/app-i18n/ibus/ibus-1.5.22.ebuild @@ -4,6 +4,7 @@ EAPI=7 PYTHON_COMPAT=( python{3_6,3_7,3_8} ) 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 diff --git a/app-i18n/ibus/ibus-1.5.23.ebuild b/app-i18n/ibus/ibus-1.5.23.ebuild new file mode 100644 index 000000000000..f3ee3b6f8a79 --- /dev/null +++ b/app-i18n/ibus/ibus-1.5.23.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{3_6,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/kcm-fcitx/Manifest b/app-i18n/kcm-fcitx/Manifest index 70070bf0a0b1..b39b2d3f8467 100644 --- a/app-i18n/kcm-fcitx/Manifest +++ b/app-i18n/kcm-fcitx/Manifest @@ -1,4 +1,6 @@ DIST kcm-fcitx-0.5.5.tar.xz 63364 BLAKE2B e3b185468a4587c510e47bee4d7260d5d9ed27032174e3928ed3f008a68e8a4b9d124bda14a75348d65c41ddff2e39bb91d8a4f3663a81788850e5fb33740c8a SHA512 e6a7bcad10003a956389ee266cf6d2f3730dafafcdd0bb43de328397749775e5cd305f16fdca2365e246c903677dba042da81a6dfd873aa1be74174e2b0b372e -EBUILD kcm-fcitx-0.5.5.ebuild 1196 BLAKE2B 5c7612b75ec49946a7c3236ffae7dede6df61b615c8ed32af80466555804596de673738360a4844a070fc4c5eb0621cea721dda5bfa306d533c1b734d39f7e88 SHA512 15f9aaa3081334fd542396eece62b93642604db726cb78c7e2a1739682907ee6dd0e57a7eb0a744557223b2f3e16e64061600d65f8bbcecf07e425af8d57b000 -EBUILD kcm-fcitx-4.5.9999.ebuild 1187 BLAKE2B 31e76e84ee5500c8f6fab64882c5c0b2d73a29cc3bd04aaf5089b009003b7d4d3ade412c6e06b8819f27ef1b7d133c487d9e2f9303099217f6f5402e19a32d1a SHA512 7e264ab819e3332c1c2e8365a562cd1a5db030cf3303419ae4678b85711790921a6455180c779a0102c4cb0175b88b4bf10bf4901d5ca02e0d02ca1077defa59 +DIST kcm-fcitx-0.5.6.tar.xz 63556 BLAKE2B 8518c454f15e5faeaab136c08eef9a7474537414485815e67ee26fcff815f6506769ec047158450a7a0f1843ac31616d34317e9de7bec8ee62fc81541134625a SHA512 a3d378ecd9ea9fa5bcc42c75e5b0b0ac2ba6c94fda93b7213d821546bb83b5904c75c2fc9482cd7b47fbf5ad81a0641b7ec345aa2e630c8795bf8d5b89f9cd3b +EBUILD kcm-fcitx-0.5.5.ebuild 1263 BLAKE2B 06af9dd1cf4147e0eaefd80a71dde34f8099f62c4eb627bc8a40f665ecf98e422a6e75506ec5bc05366f2383cf8e2a1693b65cee64b6632a7c773358e9f22992 SHA512 dc5d5055d11dd5c3a2df6efc6790d274c3d9368fc96cc5b772f6cdffc224d3fe7c639c990aed551d7b9f5a8b0a03cd0a7a739791b9aa87249e4e497c41bbb7b9 +EBUILD kcm-fcitx-0.5.6.ebuild 1237 BLAKE2B a8185c2b4eb7034c7a290ccfcbfa22a6b55611467ce67bf0af672a9814603266de0050069faa1df8959c990c15c2d7712b17bd842881ef73f13548390dba8d4c SHA512 97e922d96ae36ff6796cefc7f0dd3fe0b7db4bea78e7c3124b182639edcea8ce6b37313a5d8fb3eb65661516f3afb656738799c25be6e3d1b52d3ec945d8f474 +EBUILD kcm-fcitx-4.5.9999.ebuild 1226 BLAKE2B d15fe4ee56ecc6ffec98601e0af3d1d122c32bc3e7b2257fba3727cd665282725ccb02d806e645579b6504bd560a132a96e20d4707866d126e31f0c2093ef666 SHA512 89b8471c0b1871088e4ac8e1d8cb773f2d05f6cfa3b51e5f87334a855c94c9ec1b084cad530abf3d7c820e358bf3eb24eaa4e91a4e3569bdf614add1729527a5 MISC metadata.xml 448 BLAKE2B 1bad84f73fbc4e994084f472c2beaab2217259d6da1c1dcd3d7c91fdf30a1c1252adc930236e5ab8f99fa6f764aca4db5219996730037b4ea7da22ae075de6d1 SHA512 fd57b8dd9c679ef1309c6f02c55add627d029e6232bd3efdd8acb6c76be334411cf42e40950f749234f0c290467c4e3245232278a54118010ce01df664aed871 diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild index 7204e2277fe5..8f420c466aae 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild @@ -1,9 +1,9 @@ # Copyright 2013-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit cmake-utils +inherit cmake if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -24,7 +24,13 @@ SLOT="4-plasma5" KEYWORDS="amd64 x86" IUSE="" -RDEPEND=">=app-i18n/fcitx-4.2.9:4 +BDEPEND=">=app-i18n/fcitx-4.2.9:4 + dev-qt/qtcore:5 + dev-qt/qtwidgets:5 + kde-frameworks/extra-cmake-modules:5 + sys-devel/gettext + virtual/pkgconfig" +DEPEND=">=app-i18n/fcitx-4.2.9:4 >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -40,17 +46,14 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4 kde-frameworks/kwidgetsaddons:5 virtual/libintl x11-libs/libX11 - x11-libs/libxkbfile - !${CATEGORY}/${PN}:4[-minimal(-)]" -DEPEND="${RDEPEND} - kde-frameworks/extra-cmake-modules:5 - sys-devel/gettext - virtual/pkgconfig" + x11-libs/libxkbfile" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:4-plasma4[-minimal(-)]" src_configure() { local mycmakeargs=( -DKDE_INSTALL_USE_QT_SYS_PATHS=yes ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild new file mode 100644 index 000000000000..be86ae5b382d --- /dev/null +++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild @@ -0,0 +1,58 @@ +# Copyright 2013-2020 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/fcitx/kcm-fcitx" +fi + +DESCRIPTION="KDE configuration module for Fcitx" +HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx" +if [[ "${PV}" =~ (^|\.)9999$ ]]; then + SRC_URI="" +else + SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz" +fi + +LICENSE="GPL-2+" +SLOT="4-plasma5" +KEYWORDS="~amd64 ~x86" +IUSE="" + +BDEPEND=">=app-i18n/fcitx-4.2.9:4 + dev-qt/qtcore:5 + dev-qt/qtwidgets:5 + kde-frameworks/extra-cmake-modules:5 + sys-devel/gettext + virtual/pkgconfig" +DEPEND=">=app-i18n/fcitx-4.2.9:4 + >=app-i18n/fcitx-qt5-1.1:4 + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + kde-frameworks/kconfigwidgets:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kio:5 + kde-frameworks/kitemviews:5 + kde-frameworks/kwidgetsaddons:5 + virtual/libintl + x11-libs/libX11 + x11-libs/libxkbfile" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:4-plasma4[-minimal(-)]" + +src_configure() { + local mycmakeargs=( + -DKDE_INSTALL_USE_QT_SYS_PATHS=yes + ) + + cmake_src_configure +} 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 bed2c38530a0..753485c93790 100644 --- a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild +++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild @@ -1,9 +1,9 @@ # Copyright 2013-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" -inherit cmake-utils +inherit cmake if [[ "${PV}" =~ (^|\.)9999$ ]]; then inherit git-r3 @@ -24,7 +24,13 @@ SLOT="4-plasma5" KEYWORDS="" IUSE="" -RDEPEND=">=app-i18n/fcitx-4.2.9:4 +BDEPEND=">=app-i18n/fcitx-4.2.9:4 + dev-qt/qtcore:5 + dev-qt/qtwidgets:5 + kde-frameworks/extra-cmake-modules:5 + sys-devel/gettext + virtual/pkgconfig" +DEPEND=">=app-i18n/fcitx-4.2.9:4 >=app-i18n/fcitx-qt5-1.1:4 dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -36,21 +42,17 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kitemviews:5 - kde-frameworks/knewstuff:5 kde-frameworks/kwidgetsaddons:5 virtual/libintl x11-libs/libX11 - x11-libs/libxkbfile - !${CATEGORY}/${PN}:4[-minimal(-)]" -DEPEND="${RDEPEND} - kde-frameworks/extra-cmake-modules:5 - sys-devel/gettext - virtual/pkgconfig" + x11-libs/libxkbfile" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:4-plasma4[-minimal(-)]" src_configure() { local mycmakeargs=( -DKDE_INSTALL_USE_QT_SYS_PATHS=yes ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/app-i18n/libchewing/Manifest b/app-i18n/libchewing/Manifest index d68fefa571b4..66befca2e5ce 100644 --- a/app-i18n/libchewing/Manifest +++ b/app-i18n/libchewing/Manifest @@ -1,5 +1,5 @@ -AUX libchewing-0.5.1-autoconf-archive-2019.01.06.patch 34944 BLAKE2B 582e2041ff8e99c90df6726ffe0fe7c3f09672ba841def4ded4f367d704a56349da9fe8c555e9b24ec5c82d73774c8690219532c08904cda29a2a33845d2f3d6 SHA512 8e93539fdea3fc6ef01ea070a64d6bdd873ec1c2555fbcb40cc639a22c74a07f8c2936eb100ebb36d146c0e17ce5f80afa8dd3468ff1f5c26a835c3d12b98bb2 +DIST libchewing-0.5.1-autoconf-archive-2019.01.06.patch 34944 BLAKE2B 582e2041ff8e99c90df6726ffe0fe7c3f09672ba841def4ded4f367d704a56349da9fe8c555e9b24ec5c82d73774c8690219532c08904cda29a2a33845d2f3d6 SHA512 8e93539fdea3fc6ef01ea070a64d6bdd873ec1c2555fbcb40cc639a22c74a07f8c2936eb100ebb36d146c0e17ce5f80afa8dd3468ff1f5c26a835c3d12b98bb2 DIST libchewing-0.5.1.tar.bz2 3141084 BLAKE2B 28f9e803c8815c0e1b1a1134becffe12f92c1ae24b4b6d4163769d898861fec024db8332befe7130487a72fc20859b6292837e9d68ab1b6477de4cf4f789f2ee SHA512 a6551661bb5e56bba59730b93b373db56af7d42f2ab4881fbfff8727689dd2604d42d2e5c0b04820df66a431dfb5fcb73cc5c9b538615da76198ee3635501c1f -EBUILD libchewing-0.5.1.ebuild 1381 BLAKE2B 546fefdea9ca8ca10cce5b11d67733ba33ea7cbb329e305a7a4f09ad0964ed68cf84ce4325d5f9dcc69c94fc9ca1ebfcbcc101d1864fafd5b85e7d5b19ba6d93 SHA512 c061d1cdc0fe35280c2a859a1960ca6fafebc57676cf9f3622cf01023abec753994d7a214fe39326b74f986ec9ee094979d113348ec6ba864d9157fb179ca9f6 -EBUILD libchewing-9999.ebuild 1350 BLAKE2B 6b76defcf101a6df5958bbdf491199ec3828f438c2939345500734e1764d9a6b15abe0d1e1513ec2b4aaee52ac7e5f749b1de82c11000f0ef5664e386f24db9c SHA512 29a7c50f47c409179c80c5ccb1422c489931fda72d8682378aa954d148048c86943c7a88f4d0eea77dab87e13e308aa7e25b3d9c0f0a390d2f0002a57549e56c -MISC metadata.xml 327 BLAKE2B 3f9b234590aef775dc0ae62f4eef42cc1e363e04c3dabc2464eee9cfb44ec0b1fc4fe9b233f781c15784b3a699537d67e884ee7f1648a62b3a863480a5e831cd SHA512 c9ab28ab34d940a30e97b989fd96904d2e0816e4b1bc5b843b082d64d6cd476335d9402640e71f2cf8f57f44dcae9af66d5e07075b189fa74f21faba40d819e3 +EBUILD libchewing-0.5.1.ebuild 1574 BLAKE2B f115786ab64deb2511c31fe18d0f5caea7cd6b7fa3cdad01eedc2474ac234767914c5b417e8f96286b6fe285f88b0c8e17bb90623868d075bb746e349c7edfa6 SHA512 1273773d8803f46589f5d3c2e63376096ab390ee544f29953645a13b6ce6a2286c362b9ef73d96037849bd22a5b55f0b92cf4d2f14745421f52d50fa229c2e45 +EBUILD libchewing-9999.ebuild 1543 BLAKE2B 7eb46008f44ce2947ce897a1473019b240499301414d8b28485c0bb547c396ea4918107dc1b37a3810fdd5736742c0f81071b42f2d087b264f075294dc19dd7c SHA512 3719e6ee3c0655a40f6a8c5d401c5ca54e5b730bee0be8b2395f8605e486c2f9e79a0934b1c65c9fd7e976ffdcf138832c227d711765204a11a7a14c091f5df1 +MISC metadata.xml 451 BLAKE2B d11dd7e6884ba77c0dd4b344a1c2a3d95a3894f6f3a85b8e662d102ff0ce0f1f15efea29630baba1aff113181066c6115d19a79408ec91fedc1a0b10e66e4c34 SHA512 c2d5d2e4c929cf9a987acfc30e7013ba8f092947437290aba560f566b171635fb457c6a6a98e55cc61cefbda5364c806ef49cff5c19e7834429d24114f014796 diff --git a/app-i18n/libchewing/files/libchewing-0.5.1-autoconf-archive-2019.01.06.patch b/app-i18n/libchewing/files/libchewing-0.5.1-autoconf-archive-2019.01.06.patch deleted file mode 100644 index 5db3d0a23ab0..000000000000 --- a/app-i18n/libchewing/files/libchewing-0.5.1-autoconf-archive-2019.01.06.patch +++ /dev/null @@ -1,809 +0,0 @@ -https://github.com/chewing/libchewing/issues/308 - ---- /m4/ax_pthread.m4 -+++ /m4/ax_pthread.m4 -@@ -1,5 +1,5 @@ - # =========================================================================== --# http://www.gnu.org/software/autoconf-archive/ax_pthread.html -+# https://www.gnu.org/software/autoconf-archive/ax_pthread.html - # =========================================================================== - # - # SYNOPSIS -@@ -19,10 +19,10 @@ - # is necessary on AIX to use the special cc_r compiler alias.) - # - # NOTE: You are assumed to not only compile your program with these flags, --# but also link it with them as well. e.g. you should link with -+# but also to link with them as well. For example, you might link with - # $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS - # --# If you are only building threads programs, you may wish to use these -+# If you are only building threaded programs, you may wish to use these - # variables in your default LIBS, CFLAGS, and CC: - # - # LIBS="$PTHREAD_LIBS $LIBS" -@@ -30,8 +30,8 @@ - # CC="$PTHREAD_CC" - # - # In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant --# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name --# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). -+# has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to -+# that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX). - # - # Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the - # PTHREAD_PRIO_INHERIT symbol is defined when compiling with -@@ -67,7 +67,7 @@ - # Public License for more details. - # - # You should have received a copy of the GNU General Public License along --# with this program. If not, see <http://www.gnu.org/licenses/>. -+# with this program. If not, see <https://www.gnu.org/licenses/>. - # - # As a special exception, the respective Autoconf Macro's copyright owner - # gives unlimited permission to copy, distribute and modify the configure -@@ -82,35 +82,40 @@ - # modified version of the Autoconf Macro, you may extend this special - # exception to the GPL to apply to your modified version as well. - --#serial 20 -+#serial 24 - - AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) - AC_DEFUN([AX_PTHREAD], [ - AC_REQUIRE([AC_CANONICAL_HOST]) -+AC_REQUIRE([AC_PROG_CC]) -+AC_REQUIRE([AC_PROG_SED]) - AC_LANG_PUSH([C]) - ax_pthread_ok=no - - # We used to check for pthread.h first, but this fails if pthread.h --# requires special compiler flags (e.g. on True64 or Sequent). -+# requires special compiler flags (e.g. on Tru64 or Sequent). - # It gets checked for in the link test anyway. - - # First of all, check if the user has set any of the PTHREAD_LIBS, - # etcetera environment variables, and if threads linking works using - # them: --if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then -- save_CFLAGS="$CFLAGS" -+if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then -+ ax_pthread_save_CC="$CC" -+ ax_pthread_save_CFLAGS="$CFLAGS" -+ ax_pthread_save_LIBS="$LIBS" -+ AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"]) - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -- save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" -- AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) -- AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes) -- AC_MSG_RESULT($ax_pthread_ok) -- if test x"$ax_pthread_ok" = xno; then -+ AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS]) -+ AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes]) -+ AC_MSG_RESULT([$ax_pthread_ok]) -+ if test "x$ax_pthread_ok" = "xno"; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi -- LIBS="$save_LIBS" -- CFLAGS="$save_CFLAGS" -+ CC="$ax_pthread_save_CC" -+ CFLAGS="$ax_pthread_save_CFLAGS" -+ LIBS="$ax_pthread_save_LIBS" - fi - - # We must check for the threads library under a number of different -@@ -123,7 +128,7 @@ - # which indicates that we try without any flags at all, and "pthread-config" - # which is a program returning the flags for the Pth emulation library. - --ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" -+ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - - # The ordering *is* (sometimes) important. Some notes on the - # individual items follow: -@@ -132,68 +137,225 @@ - # none: in case threads are in libc; should be tried before -Kthread and - # other compiler flags to prevent continual compiler warnings - # -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) --# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) --# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) --# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) --# -pthreads: Solaris/gcc --# -mthreads: Mingw32/gcc, Lynx/gcc -+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64 -+# (Note: HP C rejects this with "bad form for `-t' option") -+# -pthreads: Solaris/gcc (Note: HP C also rejects) - # -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it --# doesn't hurt to check since this sometimes defines pthreads too; --# also defines -D_REENTRANT) --# ... -mt is also the pthreads flag for HP/aCC -+# doesn't hurt to check since this sometimes defines pthreads and -+# -D_REENTRANT too), HP C (must be checked before -lpthread, which -+# is present but should not be used directly; and before -mthreads, -+# because the compiler interprets this as "-mt" + "-hreads") -+# -mthreads: Mingw32/gcc, Lynx/gcc - # pthread: Linux, etcetera - # --thread-safe: KAI C++ - # pthread-config: use pthread-config program (for GNU Pth library) - --case ${host_os} in -+case $host_os in -+ -+ freebsd*) -+ -+ # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -+ # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -+ -+ ax_pthread_flags="-kthread lthread $ax_pthread_flags" -+ ;; -+ -+ hpux*) -+ -+ # From the cc(1) man page: "[-mt] Sets various -D flags to enable -+ # multi-threading and also sets -lpthread." -+ -+ ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags" -+ ;; -+ -+ openedition*) -+ -+ # IBM z/OS requires a feature-test macro to be defined in order to -+ # enable POSIX threads at all, so give the user a hint if this is -+ # not set. (We don't define these ourselves, as they can affect -+ # other portions of the system API in unpredictable ways.) -+ -+ AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING], -+ [ -+# if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS) -+ AX_PTHREAD_ZOS_MISSING -+# endif -+ ], -+ [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])]) -+ ;; -+ - solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based -- # tests will erroneously succeed. (We need to link with -pthreads/-mt/ -- # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather -- # a function called by this macro, so we could check for that, but -- # who knows whether they'll stub that too in a future libc.) So, -- # we'll just look for -pthreads and -lpthread first: -+ # tests will erroneously succeed. (N.B.: The stubs are missing -+ # pthread_cleanup_push, or rather a function called by this macro, -+ # so we could check for that, but who knows whether they'll stub -+ # that too in a future libc.) So we'll check first for the -+ # standard Solaris way of linking pthreads (-mt -lpthread). -+ -+ ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags" -+ ;; -+esac -+ -+# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC) - -- ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" -+AS_IF([test "x$GCC" = "xyes"], -+ [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"]) -+ -+# The presence of a feature test macro requesting re-entrant function -+# definitions is, on some systems, a strong hint that pthreads support is -+# correctly enabled -+ -+case $host_os in -+ darwin* | hpux* | linux* | osf* | solaris*) -+ ax_pthread_check_macro="_REENTRANT" - ;; - -- darwin*) -- ax_pthread_flags="-pthread $ax_pthread_flags" -+ aix*) -+ ax_pthread_check_macro="_THREAD_SAFE" -+ ;; -+ -+ *) -+ ax_pthread_check_macro="--" - ;; - esac -+AS_IF([test "x$ax_pthread_check_macro" = "x--"], -+ [ax_pthread_check_cond=0], -+ [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"]) -+ -+# Are we compiling with Clang? -+ -+AC_CACHE_CHECK([whether $CC is Clang], -+ [ax_cv_PTHREAD_CLANG], -+ [ax_cv_PTHREAD_CLANG=no -+ # Note that Autoconf sets GCC=yes for Clang as well as GCC -+ if test "x$GCC" = "xyes"; then -+ AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG], -+ [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */ -+# if defined(__clang__) && defined(__llvm__) -+ AX_PTHREAD_CC_IS_CLANG -+# endif -+ ], -+ [ax_cv_PTHREAD_CLANG=yes]) -+ fi -+ ]) -+ax_pthread_clang="$ax_cv_PTHREAD_CLANG" -+ -+ax_pthread_clang_warning=no -+ -+# Clang needs special handling, because older versions handle the -pthread -+# option in a rather... idiosyncratic way -+ -+if test "x$ax_pthread_clang" = "xyes"; then -+ -+ # Clang takes -pthread; it has never supported any other flag -+ -+ # (Note 1: This will need to be revisited if a system that Clang -+ # supports has POSIX threads in a separate library. This tends not -+ # to be the way of modern systems, but it's conceivable.) -+ -+ # (Note 2: On some systems, notably Darwin, -pthread is not needed -+ # to get POSIX threads support; the API is always present and -+ # active. We could reasonably leave PTHREAD_CFLAGS empty. But -+ # -pthread does define _REENTRANT, and while the Darwin headers -+ # ignore this macro, third-party headers might not.) -+ -+ PTHREAD_CFLAGS="-pthread" -+ PTHREAD_LIBS= -+ -+ ax_pthread_ok=yes -+ -+ # However, older versions of Clang make a point of warning the user -+ # that, in an invocation where only linking and no compilation is -+ # taking place, the -pthread option has no effect ("argument unused -+ # during compilation"). They expect -pthread to be passed in only -+ # when source code is being compiled. -+ # -+ # Problem is, this is at odds with the way Automake and most other -+ # C build frameworks function, which is that the same flags used in -+ # compilation (CFLAGS) are also used in linking. Many systems -+ # supported by AX_PTHREAD require exactly this for POSIX threads -+ # support, and in fact it is often not straightforward to specify a -+ # flag that is used only in the compilation phase and not in -+ # linking. Such a scenario is extremely rare in practice. -+ # -+ # Even though use of the -pthread flag in linking would only print -+ # a warning, this can be a nuisance for well-run software projects -+ # that build with -Werror. So if the active version of Clang has -+ # this misfeature, we search for an option to squash it. -+ -+ AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread], -+ [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG], -+ [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown -+ # Create an alternate version of $ac_link that compiles and -+ # links in two steps (.c -> .o, .o -> exe) instead of one -+ # (.c -> exe), because the warning occurs only in the second -+ # step -+ ax_pthread_save_ac_link="$ac_link" -+ ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g' -+ ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"` -+ ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)" -+ ax_pthread_save_CFLAGS="$CFLAGS" -+ for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do -+ AS_IF([test "x$ax_pthread_try" = "xunknown"], [break]) -+ CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS" -+ ac_link="$ax_pthread_save_ac_link" -+ AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], -+ [ac_link="$ax_pthread_2step_ac_link" -+ AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])], -+ [break]) -+ ]) -+ done -+ ac_link="$ax_pthread_save_ac_link" -+ CFLAGS="$ax_pthread_save_CFLAGS" -+ AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no]) -+ ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try" -+ ]) -+ -+ case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in -+ no | unknown) ;; -+ *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;; -+ esac -+ -+fi # $ax_pthread_clang = yes - --if test x"$ax_pthread_ok" = xno; then --for flag in $ax_pthread_flags; do -+if test "x$ax_pthread_ok" = "xno"; then -+for ax_pthread_try_flag in $ax_pthread_flags; do - -- case $flag in -+ case $ax_pthread_try_flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - -+ -mt,pthread) -+ AC_MSG_CHECKING([whether pthreads work with -mt -lpthread]) -+ PTHREAD_CFLAGS="-mt" -+ PTHREAD_LIBS="-lpthread" -+ ;; -+ - -*) -- AC_MSG_CHECKING([whether pthreads work with $flag]) -- PTHREAD_CFLAGS="$flag" -+ AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag]) -+ PTHREAD_CFLAGS="$ax_pthread_try_flag" - ;; - - pthread-config) -- AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no) -- if test x"$ax_pthread_config" = xno; then continue; fi -+ AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) -+ AS_IF([test "x$ax_pthread_config" = "xno"], [continue]) - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) -- AC_MSG_CHECKING([for the pthreads library -l$flag]) -- PTHREAD_LIBS="-l$flag" -+ AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag]) -+ PTHREAD_LIBS="-l$ax_pthread_try_flag" - ;; - esac - -- save_LIBS="$LIBS" -- save_CFLAGS="$CFLAGS" -- LIBS="$PTHREAD_LIBS $LIBS" -+ ax_pthread_save_CFLAGS="$CFLAGS" -+ ax_pthread_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+ LIBS="$PTHREAD_LIBS $LIBS" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we -@@ -204,7 +366,11 @@ - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. -+ - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h> -+# if $ax_pthread_check_cond -+# error "$ax_pthread_check_macro must be defined" -+# endif - static void routine(void *a) { a = 0; } - static void *start_routine(void *a) { return a; }], - [pthread_t th; pthread_attr_t attr; -@@ -213,16 +379,14 @@ - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_cleanup_pop(0) /* ; */])], -- [ax_pthread_ok=yes], -- []) -+ [ax_pthread_ok=yes], -+ []) - -- LIBS="$save_LIBS" -- CFLAGS="$save_CFLAGS" -+ CFLAGS="$ax_pthread_save_CFLAGS" -+ LIBS="$ax_pthread_save_LIBS" - -- AC_MSG_RESULT($ax_pthread_ok) -- if test "x$ax_pthread_ok" = xyes; then -- break; -- fi -+ AC_MSG_RESULT([$ax_pthread_ok]) -+ AS_IF([test "x$ax_pthread_ok" = "xyes"], [break]) - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -@@ -230,70 +394,74 @@ - fi - - # Various other checks: --if test "x$ax_pthread_ok" = xyes; then -- save_LIBS="$LIBS" -- LIBS="$PTHREAD_LIBS $LIBS" -- save_CFLAGS="$CFLAGS" -+if test "x$ax_pthread_ok" = "xyes"; then -+ ax_pthread_save_CFLAGS="$CFLAGS" -+ ax_pthread_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+ LIBS="$PTHREAD_LIBS $LIBS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. -- AC_MSG_CHECKING([for joinable pthread attribute]) -- attr_name=unknown -- for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do -- AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], -- [int attr = $attr; return attr /* ; */])], -- [attr_name=$attr; break], -- []) -- done -- AC_MSG_RESULT($attr_name) -- if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then -- AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, -- [Define to necessary symbol if this constant -- uses a non-standard name on your system.]) -- fi -- -- AC_MSG_CHECKING([if more special flags are required for pthreads]) -- flag=no -- case ${host_os} in -- aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; -- osf* | hpux*) flag="-D_REENTRANT";; -- solaris*) -- if test "$GCC" = "yes"; then -- flag="-D_REENTRANT" -- else -- flag="-mt -D_REENTRANT" -- fi -- ;; -- esac -- AC_MSG_RESULT(${flag}) -- if test "x$flag" != xno; then -- PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" -- fi -+ AC_CACHE_CHECK([for joinable pthread attribute], -+ [ax_cv_PTHREAD_JOINABLE_ATTR], -+ [ax_cv_PTHREAD_JOINABLE_ATTR=unknown -+ for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], -+ [int attr = $ax_pthread_attr; return attr /* ; */])], -+ [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break], -+ []) -+ done -+ ]) -+ AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \ -+ test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \ -+ test "x$ax_pthread_joinable_attr_defined" != "xyes"], -+ [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], -+ [$ax_cv_PTHREAD_JOINABLE_ATTR], -+ [Define to necessary symbol if this constant -+ uses a non-standard name on your system.]) -+ ax_pthread_joinable_attr_defined=yes -+ ]) -+ -+ AC_CACHE_CHECK([whether more special flags are required for pthreads], -+ [ax_cv_PTHREAD_SPECIAL_FLAGS], -+ [ax_cv_PTHREAD_SPECIAL_FLAGS=no -+ case $host_os in -+ solaris*) -+ ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS" -+ ;; -+ esac -+ ]) -+ AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \ -+ test "x$ax_pthread_special_flags_added" != "xyes"], -+ [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS" -+ ax_pthread_special_flags_added=yes]) - - AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], -- ax_cv_PTHREAD_PRIO_INHERIT, [ -- AC_LINK_IFELSE([ -- AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])], -- [ax_cv_PTHREAD_PRIO_INHERIT=yes], -- [ax_cv_PTHREAD_PRIO_INHERIT=no]) -+ [ax_cv_PTHREAD_PRIO_INHERIT], -+ [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], -+ [[int i = PTHREAD_PRIO_INHERIT;]])], -+ [ax_cv_PTHREAD_PRIO_INHERIT=yes], -+ [ax_cv_PTHREAD_PRIO_INHERIT=no]) - ]) -- AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"], -- AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.])) -+ AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \ -+ test "x$ax_pthread_prio_inherit_defined" != "xyes"], -+ [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.]) -+ ax_pthread_prio_inherit_defined=yes -+ ]) - -- LIBS="$save_LIBS" -- CFLAGS="$save_CFLAGS" -+ CFLAGS="$ax_pthread_save_CFLAGS" -+ LIBS="$ax_pthread_save_LIBS" - - # More AIX lossage: compile with *_r variant -- if test "x$GCC" != xyes; then -+ if test "x$GCC" != "xyes"; then - case $host_os in - aix*) - AS_CASE(["x/$CC"], -- [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], -- [#handle absolute path differently from PATH based program lookup -- AS_CASE(["x$CC"], -- [x/*], -- [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], -- [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) -+ [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], -+ [#handle absolute path differently from PATH based program lookup -+ AS_CASE(["x$CC"], -+ [x/*], -+ [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], -+ [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) - ;; - esac - fi -@@ -301,13 +469,13 @@ - - test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" - --AC_SUBST(PTHREAD_LIBS) --AC_SUBST(PTHREAD_CFLAGS) --AC_SUBST(PTHREAD_CC) -+AC_SUBST([PTHREAD_LIBS]) -+AC_SUBST([PTHREAD_CFLAGS]) -+AC_SUBST([PTHREAD_CC]) - - # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: --if test x"$ax_pthread_ok" = xyes; then -- ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) -+if test "x$ax_pthread_ok" = "xyes"; then -+ ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1]) - : - else - ax_pthread_ok=no ---- /m4/ax_with_curses.m4 -+++ /m4/ax_with_curses.m4 -@@ -1,5 +1,5 @@ - # =========================================================================== --# http://www.gnu.org/software/autoconf-archive/ax_with_curses.html -+# https://www.gnu.org/software/autoconf-archive/ax_with_curses.html - # =========================================================================== - # - # SYNOPSIS -@@ -12,7 +12,9 @@ - # present, along with the associated header file. The NcursesW - # (wide-character) library is searched for first, followed by Ncurses, - # then the system-default plain Curses. The first library found is the --# one returned. -+# one returned. Finding libraries will first be attempted by using -+# pkg-config, and should the pkg-config files not be available, will -+# fallback to combinations of known flags itself. - # - # The following options are understood: --with-ncursesw, --with-ncurses, - # --without-ncursesw, --without-ncurses. The "--with" options force the -@@ -52,23 +54,29 @@ - # - # (These preprocessor symbols are discussed later in this document.) - # --# The following output variable is defined by this macro; it is precious --# and may be overridden on the ./configure command line: -+# The following output variables are defined by this macro; they are -+# precious and may be overridden on the ./configure command line: - # --# CURSES_LIB - library to add to xxx_LDADD -+# CURSES_LIBS - library to add to xxx_LDADD -+# CURSES_CFLAGS - include paths to add to xxx_CPPFLAGS - # --# The library listed in CURSES_LIB is NOT added to LIBS by default. You --# need to add CURSES_LIB to the appropriate xxx_LDADD line in your --# Makefile.am. For example: --# --# prog_LDADD = @CURSES_LIB@ --# --# If CURSES_LIB is set on the configure command line (such as by running --# "./configure CURSES_LIB=-lmycurses"), then the only header searched for --# is <curses.h>. The user may use the CPPFLAGS precious variable to --# override the standard #include search path. If the user needs to --# specify an alternative path for a library (such as for a non-standard --# NcurseW), the user should use the LDFLAGS variable. -+# In previous versions of this macro, the flags CURSES_LIB and -+# CURSES_CPPFLAGS were defined. These have been renamed, in keeping with -+# AX_WITH_CURSES's close bigger brother, PKG_CHECK_MODULES, which should -+# eventually supersede the use of AX_WITH_CURSES. Neither the library -+# listed in CURSES_LIBS, nor the flags in CURSES_CFLAGS are added to LIBS, -+# respectively CPPFLAGS, by default. You need to add both to the -+# appropriate xxx_LDADD/xxx_CPPFLAGS line in your Makefile.am. For -+# example: -+# -+# prog_LDADD = @CURSES_LIBS@ -+# prog_CPPFLAGS = @CURSES_CFLAGS@ -+# -+# If CURSES_LIBS is set on the configure command line (such as by running -+# "./configure CURSES_LIBS=-lmycurses"), then the only header searched for -+# is <curses.h>. If the user needs to specify an alternative path for a -+# library (such as for a non-standard NcurseW), the user should use the -+# LDFLAGS variable. - # - # The following shell variables may be defined by this macro: - # -@@ -88,7 +96,7 @@ - # - # AX_WITH_CURSES - # if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then --# AX_MSG_ERROR([requires either NcursesW or Ncurses library]) -+# AC_MSG_ERROR([requires either NcursesW or Ncurses library]) - # fi - # - # If any Curses library will do (but one must be present and must support -@@ -167,7 +175,7 @@ - # Public License for more details. - # - # You should have received a copy of the GNU General Public License along --# with this program. If not, see <http://www.gnu.org/licenses/>. -+# with this program. If not, see <https://www.gnu.org/licenses/>. - # - # As a special exception, the respective Autoconf Macro's copyright owner - # gives unlimited permission to copy, distribute and modify the configure -@@ -182,11 +190,66 @@ - # modified version of the Autoconf Macro, you may extend this special - # exception to the GPL to apply to your modified version as well. - --#serial 13 -+#serial 18 -+ -+# internal function to factorize common code that is used by both ncurses -+# and ncursesw -+AC_DEFUN([_FIND_CURSES_FLAGS], [ -+ AC_MSG_CHECKING([for $1 via pkg-config]) -+ -+ AX_REQUIRE_DEFINED([PKG_CHECK_EXISTS]) -+ _PKG_CONFIG([_ax_cv_$1_libs], [libs], [$1]) -+ _PKG_CONFIG([_ax_cv_$1_cppflags], [cflags], [$1]) -+ -+ AS_IF([test "x$pkg_failed" = "xyes" || test "x$pkg_failed" = "xuntried"],[ -+ AC_MSG_RESULT([no]) -+ # No suitable .pc file found, have to find flags via fallback -+ AC_CACHE_CHECK([for $1 via fallback], [ax_cv_$1], [ -+ AS_ECHO() -+ pkg_cv__ax_cv_$1_libs="-l$1" -+ pkg_cv__ax_cv_$1_cppflags="-D_GNU_SOURCE $CURSES_CFLAGS" -+ LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs" -+ CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags" -+ -+ AC_MSG_CHECKING([for initscr() with $pkg_cv__ax_cv_$1_libs]) -+ AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])], -+ [ -+ AC_MSG_RESULT([yes]) -+ AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs]) -+ AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[ -+ ax_cv_$1=yes -+ ],[ -+ AC_MSG_RESULT([no]) -+ m4_if( -+ [$1],[ncursesw],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfow"], -+ [$1],[ncurses],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfo"] -+ ) -+ LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs" -+ -+ AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs]) -+ AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[ -+ ax_cv_$1=yes -+ ],[ -+ ax_cv_$1=no -+ ]) -+ ]) -+ ],[ -+ ax_cv_$1=no -+ ]) -+ ]) -+ ],[ -+ AC_MSG_RESULT([yes]) -+ # Found .pc file, using its information -+ LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs" -+ CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags" -+ ax_cv_$1=yes -+ ]) -+]) - - AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES]) - AC_DEFUN([AX_WITH_CURSES], [ -- AC_ARG_VAR([CURSES_LIB], [linker library for Curses, e.g. -lcurses]) -+ AC_ARG_VAR([CURSES_LIBS], [linker library for Curses, e.g. -lcurses]) -+ AC_ARG_VAR([CURSES_CFLAGS], [preprocessor flags for Curses, e.g. -I/usr/include/ncursesw]) - AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses], - [force the use of Ncurses or NcursesW])], - [], [with_ncurses=check]) -@@ -195,20 +258,17 @@ - [], [with_ncursesw=check]) - - ax_saved_LIBS=$LIBS -+ ax_saved_CPPFLAGS=$CPPFLAGS -+ - AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes], - [ax_with_plaincurses=no], [ax_with_plaincurses=check]) - - ax_cv_curses_which=no - - # Test for NcursesW -+ AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncursesw" != xno], [ -+ _FIND_CURSES_FLAGS([ncursesw]) - -- AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno], [ -- LIBS="$ax_saved_LIBS -lncursesw" -- -- AC_CACHE_CHECK([for NcursesW wide-character library], [ax_cv_ncursesw], [ -- AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])], -- [ax_cv_ncursesw=yes], [ax_cv_ncursesw=no]) -- ]) - AS_IF([test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes], [ - AC_MSG_ERROR([--with-ncursesw specified but could not find NcursesW library]) - ]) -@@ -216,7 +276,8 @@ - AS_IF([test "x$ax_cv_ncursesw" = xyes], [ - ax_cv_curses=yes - ax_cv_curses_which=ncursesw -- CURSES_LIB="-lncursesw" -+ CURSES_LIBS="$pkg_cv__ax_cv_ncursesw_libs" -+ CURSES_CFLAGS="$pkg_cv__ax_cv_ncursesw_cppflags" - AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present]) - AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) - -@@ -318,16 +379,13 @@ - ]) - ]) - ]) -+ unset pkg_cv__ax_cv_ncursesw_libs -+ unset pkg_cv__ax_cv_ncursesw_cppflags - - # Test for Ncurses -+ AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [ -+ _FIND_CURSES_FLAGS([ncurses]) - -- AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [ -- LIBS="$ax_saved_LIBS -lncurses" -- -- AC_CACHE_CHECK([for Ncurses library], [ax_cv_ncurses], [ -- AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])], -- [ax_cv_ncurses=yes], [ax_cv_ncurses=no]) -- ]) - AS_IF([test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes], [ - AC_MSG_ERROR([--with-ncurses specified but could not find Ncurses library]) - ]) -@@ -335,7 +393,8 @@ - AS_IF([test "x$ax_cv_ncurses" = xyes], [ - ax_cv_curses=yes - ax_cv_curses_which=ncurses -- CURSES_LIB="-lncurses" -+ CURSES_LIBS="$pkg_cv__ax_cv_ncurses_libs" -+ CURSES_CFLAGS="$pkg_cv__ax_cv_ncurses_cppflags" - AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if the Ncurses library is present]) - AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) - -@@ -390,12 +449,13 @@ - ]) - ]) - ]) -+ unset pkg_cv__ax_cv_ncurses_libs -+ unset pkg_cv__ax_cv_ncurses_cppflags - -- # Test for plain Curses (or if CURSES_LIB was set by user) -- -+ # Test for plain Curses (or if CURSES_LIBS was set by user) - AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [ -- AS_IF([test "x$CURSES_LIB" != x], [ -- LIBS="$ax_saved_LIBS $CURSES_LIB" -+ AS_IF([test "x$CURSES_LIBS" != x], [ -+ LIBS="$ax_saved_LIBS $CURSES_LIBS" - ], [ - LIBS="$ax_saved_LIBS -lcurses" - ]) -@@ -408,8 +468,8 @@ - AS_IF([test "x$ax_cv_plaincurses" = xyes], [ - ax_cv_curses=yes - ax_cv_curses_which=plaincurses -- AS_IF([test "x$CURSES_LIB" = x], [ -- CURSES_LIB="-lcurses" -+ AS_IF([test "x$CURSES_LIBS" = x], [ -+ CURSES_LIBS="-lcurses" - ]) - AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) - -@@ -515,4 +575,8 @@ - AS_IF([test "x$ax_cv_curses_obsolete" != xyes], [ax_cv_curses_obsolete=no]) - - LIBS=$ax_saved_LIBS -+ CPPFLAGS=$ax_saved_CPPFLAGS -+ -+ unset ax_saved_LIBS -+ unset ax_saved_CPPFLAGS - ])dnl ---- /test/Makefile.am -+++ /test/Makefile.am -@@ -65,7 +65,8 @@ - if ENABLE_TEXT_UI - TEXT_UI_BIN=genkeystroke - genkeystroke_SOURCES = genkeystroke.c --genkeystroke_LDADD = $(LDADD) @CURSES_LIB@ -+genkeystroke_CPPFLAGS = $(AM_CPPFLAGS) @CURSES_CFLAGS@ -+genkeystroke_LDADD = $(LDADD) @CURSES_LIBS@ - else - TEXT_UI_BIN= - endif diff --git a/app-i18n/libchewing/libchewing-0.5.1.ebuild b/app-i18n/libchewing/libchewing-0.5.1.ebuild index 796538bfb4f3..4447cb296419 100644 --- a/app-i18n/libchewing/libchewing-0.5.1.ebuild +++ b/app-i18n/libchewing/libchewing-0.5.1.ebuild @@ -15,9 +15,10 @@ fi DESCRIPTION="Intelligent phonetic (Zhuyin/Bopomofo) input method library" HOMEPAGE="http://chewing.im/ https://github.com/chewing/libchewing" if [[ "${PV}" == "9999" ]]; then - SRC_URI="" + SRC_URI="https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch" else - SRC_URI="https://github.com/chewing/${PN}/releases/download/v${PV}/${P}.tar.bz2" + SRC_URI="https://github.com/chewing/${PN}/releases/download/v${PV}/${P}.tar.bz2 + https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch" fi LICENSE="LGPL-2.1" @@ -33,7 +34,7 @@ DEPEND="${RDEPEND} test? ( sys-libs/ncurses[unicode] )" PATCHES=( - "${FILESDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch" + "${DISTDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch" ) src_prepare() { diff --git a/app-i18n/libchewing/libchewing-9999.ebuild b/app-i18n/libchewing/libchewing-9999.ebuild index 041ef001addd..a02537b46ef3 100644 --- a/app-i18n/libchewing/libchewing-9999.ebuild +++ b/app-i18n/libchewing/libchewing-9999.ebuild @@ -15,9 +15,10 @@ fi DESCRIPTION="Intelligent phonetic (Zhuyin/Bopomofo) input method library" HOMEPAGE="http://chewing.im/ https://github.com/chewing/libchewing" if [[ "${PV}" == "9999" ]]; then - SRC_URI="" + SRC_URI="https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch" else - SRC_URI="https://github.com/chewing/${PN}/releases/download/v${PV}/${P}.tar.bz2" + SRC_URI="https://github.com/chewing/${PN}/releases/download/v${PV}/${P}.tar.bz2 + https://dev.gentoo.org/~juippis/distfiles/tmp/libchewing-0.5.1-autoconf-archive-2019.01.06.patch" fi LICENSE="LGPL-2.1" @@ -33,7 +34,7 @@ DEPEND="${RDEPEND} test? ( sys-libs/ncurses[unicode] )" PATCHES=( - "${FILESDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch" + "${DISTDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch" ) src_prepare() { diff --git a/app-i18n/libchewing/metadata.xml b/app-i18n/libchewing/metadata.xml index baa53a1242c5..e2a2046c180f 100644 --- a/app-i18n/libchewing/metadata.xml +++ b/app-i18n/libchewing/metadata.xml @@ -1,11 +1,15 @@ <?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">chewing/libchewing</remote-id> - </upstream> + <maintainer type="person"> + <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">chewing/libchewing</remote-id> + </upstream> </pkgmetadata> diff --git a/app-i18n/libhangul/Manifest b/app-i18n/libhangul/Manifest index 60f806cc9473..72167eec2bdd 100644 --- a/app-i18n/libhangul/Manifest +++ b/app-i18n/libhangul/Manifest @@ -1,3 +1,3 @@ DIST libhangul-0.1.0.tar.gz 2899845 BLAKE2B 5d6f4f9d6dfc32b8d6c6c0219b6e25b9c483555dbe623e5d284043d15eb24b4c7044003bcfd4c55b1ff6ab4b3b0c28037a8497f79fc9b733eb7de8952fee3ed0 SHA512 cf84850bf7a41e743457300513c5efdf7b3e18d168f4fdc324aaa8e1be78743752fcb98385764f94c707777ab82cc9444e076808e61fdbd915c9c0d7ea93c534 -EBUILD libhangul-0.1.0.ebuild 802 BLAKE2B 8fd2f60e3595f9580c9aa79d075562fb07ce2f540296adbd652bed53e56bb4ef340bf989a63b9a31c435930ef1e54748836582e709c94703527c5a76d19968d9 SHA512 93cdc42dffba14ee6e63f78fd250ce6da34caabd4cc7faef34e4e2319820deb069f3d1728f9ae600b45239265bd4588e21a746e175815f756f99906d5ca3efd1 -MISC metadata.xml 372 BLAKE2B a6ebcb84d56d599c5aaacfaee2fd8aeff43258684bab32b56a3bfac0407bed79685e15b06624896df2691be1a4b6dc5836b1089422331b2decdfbbb01f1d11f9 SHA512 d94236fff05607342f4cb3c6bc917a2fe26bd05b7f5e36a004a016122b92657e0f0803c17ca59e0384776ff3b09fbf0d91c298c8c599b4e6c82d19fe65d6b2a8 +EBUILD libhangul-0.1.0.ebuild 811 BLAKE2B 5eb2e5bf56ef7877b2b5dd15b8b9dae095fdb0d0e76c846cd238b543bf075d6566f7ec8be4b89ca2229cfc429c59c6ad86614f27951ef6d7696aaa8e9908826d SHA512 ad8e216edb7f4cc0ef1e53637faf8cd02eb9188842589ec0fd348e51356c4fb1658ae5024ead7a7960a4c20cd55d7d2817f55d54dbd7ebbe7d162005234fe899 +MISC metadata.xml 506 BLAKE2B 42c76d7a94c1f0ab842815490149a84d1ab66775e64ac8b3596219d0e8c019d8fc7e07fbe2497ffe014e762d227e424c7a19d0f55182d38233b9d53f7b6c13a1 SHA512 66ae1665ecb4b0a0f82ced19ab5da85fd13f10294be5b45fac0af8bb6dd00c2404685c365860725c36d2c922fb33c7ba93ec91fca1d2d7b69ccf7ea52f44ecb2 diff --git a/app-i18n/libhangul/libhangul-0.1.0.ebuild b/app-i18n/libhangul/libhangul-0.1.0.ebuild index cb63ebcdd7fd..2d05ccfaf080 100644 --- a/app-i18n/libhangul/libhangul-0.1.0.ebuild +++ b/app-i18n/libhangul/libhangul-0.1.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2006-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" DESCRIPTION="Library for hangul input method logic, hanja dictionary" HOMEPAGE="https://github.com/libhangul/libhangul" @@ -13,11 +13,11 @@ KEYWORDS="amd64 ppc ppc64 x86" IUSE="nls static-libs test" RESTRICT="!test? ( test )" +BDEPEND="virtual/pkgconfig + nls? ( sys-devel/gettext )" RDEPEND="virtual/libiconv nls? ( virtual/libintl )" DEPEND="${RDEPEND} - virtual/pkgconfig - nls? ( sys-devel/gettext ) test? ( dev-libs/check )" src_configure() { @@ -32,5 +32,5 @@ src_test() { src_install() { default - find "${ED}" -name '*.la' -delete || die + find "${ED}" -name "*.la" -delete || die } diff --git a/app-i18n/libhangul/metadata.xml b/app-i18n/libhangul/metadata.xml index 81d97de41a3f..16a564952317 100644 --- a/app-i18n/libhangul/metadata.xml +++ b/app-i18n/libhangul/metadata.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> + <maintainer type="person"> + <email>arfrever.fta@gmail.com</email> + <name>Arfrever Frehtes Taifersar Arahesis</name> + </maintainer> <maintainer type="project"> <email>cjk@gentoo.org</email> <name>Cjk</name> diff --git a/app-i18n/libkkc/Manifest b/app-i18n/libkkc/Manifest index be61292e865e..8987dd01f7da 100644 --- a/app-i18n/libkkc/Manifest +++ b/app-i18n/libkkc/Manifest @@ -1,4 +1,4 @@ DIST libkkc-0.3.6_pre20190809104047.tar.gz 389976 BLAKE2B 03c43384f4f1f0e48a3eec2afb9f90a39e42469439a7dbc06692e020d83b8362f19c41ea8960cd5147edca04dcf67be5e74315f494dd017a6ce018f217b6a5a7 SHA512 87c5294900b29e4b2225c24ee744c619691a5f25edc453c2ece44133695a8d0e1a1a07bb5a00d615cc95057ae5b451c845c7ce476df555e025097c38aff87a69 -EBUILD libkkc-0.3.6_pre20190809104047.ebuild 1517 BLAKE2B 87b30ee93cb675c6c0712ded21cf1f7304f25cf5dcbb9d10acf909002545001f6a500c15c29b26ad204528081569f1559f1f1856f0288f1772bc1452d39ae8e1 SHA512 f32d370aed7997bc9c41c0bb344ea3374db871c19e35a3ffcdb2be397beca1db5270763ad86c65acc1525e21ccf2b64fb5e38d72f412739ebf79c956acecdd16 -EBUILD libkkc-9999.ebuild 1466 BLAKE2B 3a79ce7a060af4aeb3be425ccd03faeede174e19204aadb4c43a2c724e767a1e1ec19ad37f77dc1400abe0ecfd8cfe28e3dd21d337c6e701251995becaba05fc SHA512 7c3760ecbd64c79c31eac546206739cea4ea51c17d0a2c90980cd7631e557207bc99dbe7bbe56f1c4f9b9d9d50d303c4d535ab13e153ff18ff9cad76e81b309b -MISC metadata.xml 320 BLAKE2B 32f31ada16f19171c1b3347b4ef63e1894a8f5449dba822ce14b6be5a28636acdf0a9d6ad2808f946cb0d58a384ef40abdd65193156c1b31210949be4e55ca9e SHA512 83a16f6a6b7ecbfbb75a77f38b1de0f9b856e4d4c856f157e4d2d8863f830655b78d1969344383d7d3c12df6a4b3e4d1962be4d8bdc8a77ad9a7c204a111504e +EBUILD libkkc-0.3.6_pre20190809104047.ebuild 1518 BLAKE2B 7097b0eca773a3b0e158b7b537b8572f9cead5f0dcf339003c13a38e4b4ab512751627754c1f080c1cbea77390973a8affbf0bad471fc6010deebea419a857c4 SHA512 e0a74986dbb6cf79748791766d8fb201a16329bf36da2004d2e540c0e8d7c139fdc0fd46bc97edebfbb678bc37991a0e2a9a80b4d881e141ddf6bc9538f59681 +EBUILD libkkc-9999.ebuild 1467 BLAKE2B 99a22ee7aa62bd57c4f004a17e76eac16d352aa41491b804439d611cdcdd3c562ed7e7a1c0a9b91057a220d42a7fd5693e5897610d179d90b5fec7671a2f9c7f SHA512 c916bc29ca455585c11a97914cb27a570b27919e2b3ef66d253573a499e79a4c732777ba82dad71718c6295eb19a206b10f30eb9a5593e1f9d27eef6585cb1b2 +MISC metadata.xml 444 BLAKE2B 7c8c97023d21627b1ceef21dab3ecde1f159025683d154eab606c4837f4c31a52a5626e3507193d72569fddc6fadcfb7dfa7b4e3279f9990f243dc38259b78ae SHA512 774b964eae4e57f414c927a3a3de6793374ecd6d6f5a81251cd04165e54208d68d890754904e099fe3da0a7790bb324c2fa171b3a530983f4063403cc08a9a92 diff --git a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild index 3f920501d615..8ac08a9cb2b5 100644 --- a/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild +++ b/app-i18n/libkkc/libkkc-0.3.6_pre20190809104047.ebuild @@ -1,8 +1,8 @@ -# Copyright 2013-2019 Gentoo Authors +# Copyright 2013-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=(python{3_6,3_7}) +PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9}) inherit autotools python-any-r1 vala @@ -63,5 +63,5 @@ src_configure() { src_install() { default - find "${D}" -name "*.la" -type f -delete || die + find "${ED}" -name "*.la" -delete || die } diff --git a/app-i18n/libkkc/libkkc-9999.ebuild b/app-i18n/libkkc/libkkc-9999.ebuild index 971d75ef2cb5..199f77aa98be 100644 --- a/app-i18n/libkkc/libkkc-9999.ebuild +++ b/app-i18n/libkkc/libkkc-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 2013-2019 Gentoo Authors +# Copyright 2013-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=(python{3_6,3_7}) +PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9}) inherit autotools python-any-r1 vala @@ -63,5 +63,5 @@ src_configure() { src_install() { default - find "${D}" -name "*.la" -type f -delete || die + find "${ED}" -name "*.la" -delete || die } diff --git a/app-i18n/libkkc/metadata.xml b/app-i18n/libkkc/metadata.xml index 4d9edd9a3b5f..da21de5a3482 100644 --- a/app-i18n/libkkc/metadata.xml +++ b/app-i18n/libkkc/metadata.xml @@ -1,11 +1,15 @@ <?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/libkkc</remote-id> - </upstream> + <maintainer type="person"> + <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 e3aa18c41375..d0f01ebb96a9 100644 --- a/app-i18n/libpinyin/Manifest +++ b/app-i18n/libpinyin/Manifest @@ -1,5 +1,6 @@ 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-model19.text.tar.gz 20279012 BLAKE2B d8721d106235ef6fb99ad8dd4f4911bb23bf66f0259b01c39fd8ee829f0a63f326894802d62e51531a10f453dff1f4bb6e3e1648cf4aeac8213dccd10fc8ca4d SHA512 93c70423ba14faa3402bce775f82769dd4ee3a49083beddc540825f88facbd847328e9d01d99473adb7cf26de0f853e2b2e14fe849b1c49531134d1ca4ed2ef2 EBUILD libpinyin-2.3.0.ebuild 1396 BLAKE2B 572d949e4718597eb9de387f1f0d3b3c0f00612b94ce59afef40ab5c8f1baa5c0e48f8b4b37b620b97014004ac67691bfcb267f45d7c8b0cd22c7b47dd10ab2e SHA512 8fac54ea183a925e861589c752279527e74ec7a4614c5a4227458aa1f0986f70ee412fd9797d6bf1ef275d8d2cdf9266a3ffc3a775cad2bbe5c1bba503aa2e4e -EBUILD libpinyin-9999.ebuild 1370 BLAKE2B a7a6ae8f0202bc2ff943eaaad11017b1ffe1788321a4a0842c12db42a63befe52a54b7e391311550fcedad612a633df00973549ec48bb6754c382366709b85c5 SHA512 d353fa58d01227c4dcd965c454ea729606fbe33fed1566fd338f303c9ec50edff44d4185de1dd857df851f312aa16528a20556f5e15b447dd9e9e28850dcce13 -MISC metadata.xml 384 BLAKE2B b3f62b356f505bb69731e6f56d43a080e509b578da0762be6ccc112ed1262446034b82d89cbdcca87d502c006319fd11cb4069804b8d8c12f4263a15bbf4f525 SHA512 4317a502e82b23aa2c66d406148eab83996139b4522f999884559b7b6d15709ded6779dc64aeedc657a1be3cd1337281c9e1297ae22dc6b227aef419dc707518 +EBUILD libpinyin-9999.ebuild 1371 BLAKE2B 387ed25199ff3c1d8e38ac48a270266e238b40caeb67a54517ba4106b031874efe9fd1775d1b0fc82eb8ba3bc4af773e41d0ffaed51d1082aa530ebb775d57aa SHA512 7d9a872d32124a3541643a04ecaff43d5a6215dce70aadf95f3e5d775dcb690be73ae2bda40baf17c75b2c9097ecc546206847234b4061ddb4f2595f5e4e60ef +MISC metadata.xml 506 BLAKE2B 51516288081e7bec40801cdc1ec540e4ca5772b8b9c894000b9c977721647538a752d1b5022313c48fd5489502fa0b4745f7ebee4330a1547babbbf55efcc5d7 SHA512 72df0aa1c1b13dbfefd3a2b18c72d5244b330cc2aee501ee6a1dda18e968902a2a1b459571f35f34afbab14e3d0ade543680d87c5552f8c1691a10cd58da1937 diff --git a/app-i18n/libpinyin/libpinyin-9999.ebuild b/app-i18n/libpinyin/libpinyin-9999.ebuild index 531fc1ba3f55..5c0606058de5 100644 --- a/app-i18n/libpinyin/libpinyin-9999.ebuild +++ b/app-i18n/libpinyin/libpinyin-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2012-2019 Gentoo Authors +# Copyright 2012-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -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/" @@ -57,5 +57,5 @@ src_configure() { src_install() { default - find "${D}" -name "*.la" -delete || die + find "${ED}" -name "*.la" -delete || die } diff --git a/app-i18n/libpinyin/metadata.xml b/app-i18n/libpinyin/metadata.xml index a46185d494b6..d0737be7e3d0 100644 --- a/app-i18n/libpinyin/metadata.xml +++ b/app-i18n/libpinyin/metadata.xml @@ -1,12 +1,16 @@ <?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">libpinyin/libpinyin</remote-id> - <remote-id type="sourceforge">libpinyin</remote-id> - </upstream> + <maintainer type="person"> + <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">libpinyin/libpinyin</remote-id> + <remote-id type="sourceforge">libpinyin</remote-id> + </upstream> </pkgmetadata> diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest index aaf623fbd9d7..1fa1415d0b4f 100644 --- a/app-i18n/mozc/Manifest +++ b/app-i18n/mozc/Manifest @@ -3,7 +3,6 @@ AUX mozc-2.20.2673.102-tests_build.patch 1037 BLAKE2B 8f3c0b3361371a994957a89f5b AUX mozc-2.20.2673.102-tests_skipping.patch 2086 BLAKE2B a104d6a83b02b49e1208be1b39699b90ad419d8befa29ed0366f7cbc454fe9ce27361f21897a5c74dadfc2d9eb31a30d7237e20db8c1fb205b8e71b40f4a0e57 SHA512 4a2e5a35c5e65ebeb737f656d6efb313c660c2c7cf62abd5d9295fd16e2dffde21d069cd74fd0cfd2454cd7f7c9d136dfbadbf79832db8441c619ff37c7e4b0e AUX mozc-2.23.2815.102-environmental_variables.patch 4636 BLAKE2B 2c1d952899b50d0205127fe5f708c8cc8ad115db35f1ebfe5b589550203ee64fe06b0d66b10989c12063feff96f679ebd6ee4562651ac81681019634e6e9c462 SHA512 40e87a52d96794a91f5cf77f387d341b7d58a4b27e3d1455c4230fbe75107c09c3bd4784394437265548ee2704a4d1838cc0965f0333e554484dafe8b106cb7b AUX mozc-2.23.2815.102-gcc-8.patch 496 BLAKE2B 318fcda19cf4f7e95920b5df4f5638621bcae992891941fa6f220d4dac1b2eac0faeda7a857a587baed41b361608f20c4bbda0d9a69a60b823572482c6789f46 SHA512 9c2b0e9695f4cd050f0d5f35d0e23f22715b9c6e5607629c7dc023560a5191bd755497fe6fe5306789c00e68d5bd9b7179d5515c982967788fca432134b71cad -AUX mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch 40296 BLAKE2B 982f43fa68031eb0f779ec4d034fef838a4fce7834291db889c9edffba3df4acd5bfdf187dd4a52ee8fd0714de943f9d5112070cd69502e1449dab4dbf8543b2 SHA512 6e05b2f22663ddbfb24a8344928ec24c0b4cf523728c1623367970b8f263142af95c056c82d0827414833d5b9f26c3a024a04a688851021601a5cbcc1474e754 AUX mozc-2.23.2815.102-python-3_1.patch 19991 BLAKE2B e553f5b3beb7a82f9f91f585a17004f96d9bb3883b432af2f4232211de3d8c4e348cf0d1327fe2e49410112540a01533068ca76464a7deb79429bfa7c49f58c8 SHA512 7d51f282fa3132d279b979ae96d2d7a1a3009c2ad96544033084deb0b739638ae69263b0067172a890d5ca3dd7e47f412af05b8f57ee64505a040cbdb77af388 AUX mozc-2.23.2815.102-python-3_2.patch 17794 BLAKE2B 53849d003e3821a6d07e5019d0defb9b4558f91938da2367e82cf5327d2c69e13107eb91b7c05b731e1693ca02ca1e61771b81c29d391e412a43fd0fe64973b8 SHA512 a8d017d9b5aa7c89638fcb464a016b8e98b2e20dacc0c68c4362824cad315e0c76c15cabce84059de4a3d2184c1388289f253ebd22f1c640a3946a1189955d72 AUX mozc-2.23.2815.102-python-3_3.patch 17011 BLAKE2B b7a40ec699da304130ab8b0e149d57ebc1b31c608c03fb35104918e0d33289eb5b40211a18f2083a2addcaed68b691ef2d029c106e2f2fec861f416a2e5f2134 SHA512 52b5cd4ee5e61582f2b9172a927e9e54bf07aea90462448fd63385c7be12c37b19cbdd784a21db3950ec4269249221f4f3bb3570ce0068d5a2448db63a33463c @@ -13,7 +12,8 @@ AUX mozc-2.23.2815.102-server_path_check.patch 3447 BLAKE2B 8e18cf2f7100cdfeb8e6 AUX mozc-2.23.2815.102-system_libraries.patch 9064 BLAKE2B 0cdf732a1bbf16d4af1d6dee81aacf3f3cb1f1c00c6aeb0fc12dac9dcd8611124e388e5fc721eb9b9472e073515d7457b182ee7cfe466b83bf319d572ae55240 SHA512 2d5b06e855f8c1889367b9b672e3ec81a037bc592872e28319e0180a0dcd177cdff817775a1a0f74ebf48e0b7558cf3b67953120411be753c662c43f409b05ce 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.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 -EBUILD mozc-2.23.2815.102.ebuild 11134 BLAKE2B f5569a3a225216f6e34021d888664169e3fd07cc1faeceb7e64a46581e9a17b56e700e0c282ebcc1de5d163cebe2a9ecd67835937b38e96decae9851f865445e SHA512 4740d3ab5421017067db1886320ba4563ebbe159335ee92748507692861d256bc5b9d21bda3341b6877c35f968fc8e7c5e43b3a215f600fc477339b167c9e7c7 -EBUILD mozc-9999.ebuild 10967 BLAKE2B e6e857970fa7e9dfc191328fe84df1f5b5829e63878579049f56bce2cd8abfcc655078d7ff4a09c0c8ae8d1656385fdebc4a73e36ad6c3b8e7bf286dac27d7ae SHA512 21877036de3d1630bd9d1aa9a369111442b1c40a641f8ddbab0c745f9749d9dc8ecf90af084e88170b2786985f0c4ea5adadf802637390cdc9ee3bb67754ac17 +EBUILD mozc-2.23.2815.102.ebuild 11247 BLAKE2B 6df0d12985da09fd920250c98a65e3fc4957ce6eefa9105fcee0f02e6f9ec49d8de629bae5ad08729bedc95138679f7887d986d027b0ae62c7ec5661fd6e281c SHA512 e4983c41c4623c2c8015d005af8ba261857caa0c5852b69af1640619e94e9f4e5f1c72a992831aa88b9bafa57d49ef0c049d9c3a14a6a495172578401f93072d +EBUILD mozc-9999.ebuild 11080 BLAKE2B a38a04853549491d1fb431bb3cdc7fcb55aa5593aea513bef3268e00f3e6dfaa4e64e1e6e5191634f9bf03dd1395289fdb309a33fe76609c0164c54848f74798 SHA512 435233f85519815fb761a488c99f3e757c89a42a95d0ff35c80b2c359d8a0434c1aa656c5d8b90b8b1561521d4207e2773910e161a6f3d297728fc3d64b551f3 MISC metadata.xml 1001 BLAKE2B cbbb63e46d6b9cca2c1c5d08dcfeacc8fe82910a0a7398a9060a2ccd06d395765865674b1c66c72cdb9c71d5984b8d0a05a2784052219a6d6af2e0da175e65ac SHA512 98b86d4e51b43d95f7d647cf2cb57ed2a8a7e1b20042a60bae7e56d82596e2f94b2d57cb9dfbf45ae5e2a5a19e78f335e89a8e724424b8fc04f21d344c4e2c75 diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch deleted file mode 100644 index 2cd757281545..000000000000 --- a/app-i18n/mozc/files/mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch +++ /dev/null @@ -1,1039 +0,0 @@ -https://github.com/google/mozc/issues/460 - ---- /src/dictionary/user_dictionary.cc -+++ /src/dictionary/user_dictionary.cc -@@ -289,7 +289,7 @@ - } - - auto_register_mode_ = false; -- dic_->Load(*(storage.get())); -+ dic_->Load(storage.get()->user_dictionary_storage_base); - } - - private: ---- /src/dictionary/user_dictionary_session.cc -+++ /src/dictionary/user_dictionary_session.cc -@@ -69,11 +69,11 @@ - } - - virtual bool RunUndo(mozc::UserDictionaryStorage *storage) { -- if (storage->dictionaries_size() == 0) { -+ if (storage->user_dictionary_storage_base.dictionaries_size() == 0) { - return false; - } - -- storage->mutable_dictionaries()->RemoveLast(); -+ storage->user_dictionary_storage_base.mutable_dictionaries()->RemoveLast(); - return true; - } - -@@ -94,7 +94,7 @@ - } - - RepeatedPtrField<UserDictionary> *dictionaries = -- storage->mutable_dictionaries(); -+ storage->user_dictionary_storage_base.mutable_dictionaries(); - dictionaries->AddAllocated(dictionary_.release()); - - // Adjust the position of the reverted dictionary. -@@ -120,10 +120,10 @@ - } - - virtual bool RunUndo(mozc::UserDictionaryStorage *storage) { -- if (storage->dictionaries_size() != 1) { -+ if (storage->user_dictionary_storage_base.dictionaries_size() != 1) { - return false; - } -- dictionary_->Swap(storage->mutable_dictionaries(0)); -+ dictionary_->Swap(storage->user_dictionary_storage_base.mutable_dictionaries(0)); - return true; - } - -@@ -144,7 +144,7 @@ - virtual bool RunUndo(mozc::UserDictionaryStorage *storage) { - UserDictionary *dictionary = - UserDictionaryUtil::GetMutableUserDictionaryById( -- storage, dictionary_id_); -+ &storage->user_dictionary_storage_base, dictionary_id_); - if (dictionary == NULL) { - return false; - } -@@ -169,7 +169,7 @@ - virtual bool RunUndo(mozc::UserDictionaryStorage *storage) { - UserDictionary *dictionary = - UserDictionaryUtil::GetMutableUserDictionaryById( -- storage, dictionary_id_); -+ &storage->user_dictionary_storage_base, dictionary_id_); - if (dictionary == NULL || dictionary->entries_size() == 0) { - return false; - } -@@ -195,7 +195,7 @@ - virtual bool RunUndo(mozc::UserDictionaryStorage *storage) { - UserDictionary *dictionary = - UserDictionaryUtil::GetMutableUserDictionaryById( -- storage, dictionary_id_); -+ &storage->user_dictionary_storage_base, dictionary_id_); - if (dictionary == NULL || - index_ < 0 || dictionary->entries_size() <= index_) { - return false; -@@ -240,7 +240,7 @@ - virtual bool RunUndo(mozc::UserDictionaryStorage *storage) { - UserDictionary *dictionary = - UserDictionaryUtil::GetMutableUserDictionaryById( -- storage, dictionary_id_); -+ &storage->user_dictionary_storage_base, dictionary_id_); - if (dictionary == NULL) { - return false; - } -@@ -306,7 +306,7 @@ - virtual bool RunUndo(mozc::UserDictionaryStorage *storage) { - UserDictionary *dictionary = - UserDictionaryUtil::GetMutableUserDictionaryById( -- storage, dictionary_id_); -+ &storage->user_dictionary_storage_base, dictionary_id_); - if (dictionary == NULL) { - return false; - } -@@ -345,7 +345,7 @@ - - // TODO(hidehiko) move this to header. - const UserDictionaryStorage &UserDictionarySession::storage() const { -- return *storage_; -+ return storage_->user_dictionary_storage_base; - } - mozc::UserDictionaryStorage *UserDictionarySession::mutable_storage() { - return storage_.get(); -@@ -464,7 +464,7 @@ - const string &dictionary_name, uint64 *new_dictionary_id) { - UserDictionaryCommandStatus::Status status = - UserDictionaryUtil::CreateDictionary( -- storage_.get(), dictionary_name, new_dictionary_id); -+ &storage_->user_dictionary_storage_base, dictionary_name, new_dictionary_id); - if (status == UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS) { - AddUndoCommand(new UndoCreateDictionaryCommand); - } -@@ -488,7 +488,7 @@ - int original_index; - UserDictionary *deleted_dictionary; - if (!UserDictionaryUtil::DeleteDictionary( -- storage_.get(), dictionary_id, -+ &storage_->user_dictionary_storage_base, dictionary_id, - &original_index, &deleted_dictionary)) { - // Failed to delete the dictionary. - return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID; -@@ -510,7 +510,7 @@ - uint64 dictionary_id, const string &dictionary_name) { - string original_name; - const UserDictionary *dictionary = -- UserDictionaryUtil::GetUserDictionaryById(*storage_, dictionary_id); -+ UserDictionaryUtil::GetUserDictionaryById(storage_->user_dictionary_storage_base, dictionary_id); - if (dictionary != NULL) { - // Note that if dictionary is null, it means the dictionary_id is invalid - // so following RenameDictionary will fail, and error handling is done -@@ -547,7 +547,7 @@ - uint64 dictionary_id, const UserDictionary::Entry &entry) { - UserDictionary *dictionary = - UserDictionaryUtil::GetMutableUserDictionaryById( -- storage_.get(), dictionary_id); -+ &storage_->user_dictionary_storage_base, dictionary_id); - if (dictionary == NULL) { - return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID; - } -@@ -575,7 +575,7 @@ - uint64 dictionary_id, int index, const UserDictionary::Entry &entry) { - UserDictionary *dictionary = - UserDictionaryUtil::GetMutableUserDictionaryById( -- storage_.get(), dictionary_id); -+ &storage_->user_dictionary_storage_base, dictionary_id); - if (dictionary == NULL) { - return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID; - } -@@ -604,7 +604,7 @@ - uint64 dictionary_id, const std::vector<int> &index_list) { - UserDictionary *dictionary = - UserDictionaryUtil::GetMutableUserDictionaryById( -- storage_.get(), dictionary_id); -+ &storage_->user_dictionary_storage_base, dictionary_id); - if (dictionary == NULL) { - return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID; - } -@@ -644,7 +644,7 @@ - uint64 dictionary_id, const string &data) { - UserDictionary *dictionary = - UserDictionaryUtil::GetMutableUserDictionaryById( -- storage_.get(), dictionary_id); -+ &storage_->user_dictionary_storage_base, dictionary_id); - if (dictionary == NULL) { - return UserDictionaryCommandStatus::UNKNOWN_DICTIONARY_ID; - } -@@ -699,7 +699,7 @@ - uint64 *new_dictionary_id) { - UserDictionaryCommandStatus::Status status = - UserDictionaryUtil::CreateDictionary( -- storage_.get(), dictionary_name, new_dictionary_id); -+ &storage_->user_dictionary_storage_base, dictionary_name, new_dictionary_id); - if (status != UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS) { - return status; - } -@@ -709,7 +709,7 @@ - - UserDictionary *dictionary = - UserDictionaryUtil::GetMutableUserDictionaryById( -- storage_.get(), *new_dictionary_id); -+ &storage_->user_dictionary_storage_base, *new_dictionary_id); - if (dictionary == NULL) { - // The dictionary should be always found. - return UserDictionaryCommandStatus::UNKNOWN_ERROR; -@@ -719,7 +719,7 @@ - } - - bool UserDictionarySession::EnsureNonEmptyStorage() { -- if (storage_->dictionaries_size() > 0) { -+ if (storage_->user_dictionary_storage_base.dictionaries_size() > 0) { - // The storage already has at least one dictionary. Do nothing. - return false; - } -@@ -728,7 +728,7 @@ - uint64 new_dictionary_id; - UserDictionaryCommandStatus::Status status = - UserDictionaryUtil::CreateDictionary( -- storage_.get(), default_dictionary_name_, &new_dictionary_id); -+ &storage_->user_dictionary_storage_base, default_dictionary_name_, &new_dictionary_id); - CHECK_EQ( - status, UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS); - return true; -@@ -755,7 +755,7 @@ - - void UserDictionarySession::ClearDictionariesAndUndoHistory() { - ScopedUserDictionaryLocker l(storage_.get()); -- storage_->clear_dictionaries(); -+ storage_->user_dictionary_storage_base.clear_dictionaries(); - ClearUndoHistory(); - } - ---- /src/dictionary/user_dictionary_session_test.cc -+++ /src/dictionary/user_dictionary_session_test.cc -@@ -95,12 +95,12 @@ - - ASSERT_EQ(UserDictionaryCommandStatus::FILE_NOT_FOUND, session.Load()); - -- session.mutable_storage()->set_version(10); -+ session.mutable_storage()->user_dictionary_storage_base.set_version(10); - ASSERT_EQ(UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS, - session.Save()); - - // Clear once, in order to make sure that Load is actually working. -- session.mutable_storage()->Clear(); -+ session.mutable_storage()->user_dictionary_storage_base.Clear(); - ASSERT_EQ(UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS, - session.Load()); - -@@ -130,7 +130,7 @@ - - // Create huge dummy data. - { -- UserDictionaryStorage *storage = session.mutable_storage(); -+ UserDictionaryStorage *storage = &session.mutable_storage()->user_dictionary_storage_base; - for (int i = 0; i < 100; ++i) { - UserDictionary *dictionary = storage->add_dictionaries(); - for (int j = 0; j < 1000; ++j) { -@@ -147,7 +147,7 @@ - ASSERT_EQ(UserDictionaryCommandStatus::FILE_SIZE_LIMIT_EXCEEDED, - session.Save()); - -- session.mutable_storage()->Clear(); -+ session.mutable_storage()->user_dictionary_storage_base.Clear(); - ASSERT_EQ(UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS, - session.Load()); - -@@ -191,7 +191,7 @@ - - while (session.storage().dictionaries_size() < - ::mozc::UserDictionaryStorage::max_dictionary_size()) { -- session.mutable_storage()->add_dictionaries(); -+ session.mutable_storage()->user_dictionary_storage_base.add_dictionaries(); - } - EXPECT_EQ(UserDictionaryCommandStatus::DICTIONARY_SIZE_LIMIT_EXCEEDED, - session.CreateDictionary("dictionary 2", &dummy_dictionary_id)); -@@ -204,7 +204,7 @@ - const uint64 kDummyId = 10; - { - UserDictionary *user_dictionary = -- session.mutable_storage()->add_dictionaries(); -+ session.mutable_storage()->user_dictionary_storage_base.add_dictionaries(); - user_dictionary->set_id(kDummyId); - } - -@@ -229,7 +229,7 @@ - const uint64 kDummyId = 10; - { - UserDictionary *user_dictionary = -- session.mutable_storage()->add_dictionaries(); -+ session.mutable_storage()->user_dictionary_storage_base.add_dictionaries(); - user_dictionary->set_id(kDummyId); - } - ---- /src/dictionary/user_dictionary_storage.cc -+++ /src/dictionary/user_dictionary_storage.cc -@@ -109,7 +109,7 @@ - mozc::protobuf::io::IstreamInputStream zero_copy_input(&ifs); - mozc::protobuf::io::CodedInputStream decoder(&zero_copy_input); - decoder.SetTotalBytesLimit(kDefaultTotalBytesLimit, -1); -- if (!ParseFromCodedStream(&decoder)) { -+ if (!user_dictionary_storage_base.ParseFromCodedStream(&decoder)) { - LOG(ERROR) << "Failed to parse"; - if (!decoder.ConsumedEntireMessage() || !ifs.eof()) { - LOG(ERROR) << "ParseFromStream failed: file seems broken"; -@@ -137,11 +137,11 @@ - } - - // Check dictionary id here. if id is 0, assign random ID. -- for (int i = 0; i < dictionaries_size(); ++i) { -- const UserDictionary &dict = dictionaries(i); -+ for (int i = 0; i < user_dictionary_storage_base.dictionaries_size(); ++i) { -+ const UserDictionary &dict = user_dictionary_storage_base.dictionaries(i); - if (dict.id() == 0) { -- mutable_dictionaries(i)->set_id( -- UserDictionaryUtil::CreateNewDictionaryId(*this)); -+ user_dictionary_storage_base.mutable_dictionaries(i)->set_id( -+ UserDictionaryUtil::CreateNewDictionaryId(this->user_dictionary_storage_base)); - } - } - -@@ -171,7 +171,7 @@ - return false; - } - -- if (!SerializeToOstream(&ofs)) { -+ if (!user_dictionary_storage_base.SerializeToOstream(&ofs)) { - LOG(ERROR) << "SerializeToString failed"; - last_error_type_ = SYNC_FAILURE; - return false; -@@ -227,7 +227,7 @@ - return false; - } - -- const UserDictionary &dic = dictionaries(index); -+ const UserDictionary &dic = user_dictionary_storage_base.dictionaries(index); - for (size_t i = 0; i < dic.entries_size(); ++i) { - const UserDictionaryEntry &entry = dic.entries(i); - ofs << entry.key() << "\t" << entry.value() << "\t" -@@ -241,7 +241,7 @@ - bool UserDictionaryStorage::CreateDictionary( - const string &dic_name, uint64 *new_dic_id) { - UserDictionaryCommandStatus::Status status = -- UserDictionaryUtil::CreateDictionary(this, dic_name, new_dic_id); -+ UserDictionaryUtil::CreateDictionary(&this->user_dictionary_storage_base, dic_name, new_dic_id); - // Update last_error_type_ - switch (status) { - case UserDictionaryCommandStatus::DICTIONARY_NAME_EMPTY: -@@ -273,7 +273,7 @@ - } - - bool UserDictionaryStorage::DeleteDictionary(uint64 dic_id) { -- if (!UserDictionaryUtil::DeleteDictionary(this, dic_id, NULL, NULL)) { -+ if (!UserDictionaryUtil::DeleteDictionary(&this->user_dictionary_storage_base, dic_id, NULL, NULL)) { - // Failed to delete dictionary. - last_error_type_ = INVALID_DICTIONARY_ID; - return false; -@@ -304,8 +304,8 @@ - return true; - } - -- for (int i = 0; i < dictionaries_size(); ++i) { -- if (dic_name == dictionaries(i).name()) { -+ for (int i = 0; i < user_dictionary_storage_base.dictionaries_size(); ++i) { -+ if (dic_name == user_dictionary_storage_base.dictionaries(i).name()) { - last_error_type_ = DUPLICATED_DICTIONARY_NAME; - LOG(ERROR) << "duplicated dictionary name"; - return false; -@@ -318,14 +318,14 @@ - } - - int UserDictionaryStorage::GetUserDictionaryIndex(uint64 dic_id) const { -- return UserDictionaryUtil::GetUserDictionaryIndexById(*this, dic_id); -+ return UserDictionaryUtil::GetUserDictionaryIndexById(this->user_dictionary_storage_base, dic_id); - } - - bool UserDictionaryStorage::GetUserDictionaryId(const string &dic_name, - uint64 *dic_id) { -- for (size_t i = 0; i < dictionaries_size(); ++i) { -- if (dic_name == dictionaries(i).name()) { -- *dic_id = dictionaries(i).id(); -+ for (size_t i = 0; i < user_dictionary_storage_base.dictionaries_size(); ++i) { -+ if (dic_name == user_dictionary_storage_base.dictionaries(i).name()) { -+ *dic_id = user_dictionary_storage_base.dictionaries(i).id(); - return true; - } - } -@@ -335,7 +335,7 @@ - - user_dictionary::UserDictionary *UserDictionaryStorage::GetUserDictionary( - uint64 dic_id) { -- return UserDictionaryUtil::GetMutableUserDictionaryById(this, dic_id); -+ return UserDictionaryUtil::GetMutableUserDictionaryById(&this->user_dictionary_storage_base, dic_id); - } - - UserDictionaryStorage::UserDictionaryStorageErrorType -@@ -352,8 +352,8 @@ - } - - int auto_index = -1; -- for (int i = 0; i < dictionaries_size(); ++i) { -- if (dictionaries(i).name() == kAutoRegisteredDictionaryName) { -+ for (int i = 0; i < user_dictionary_storage_base.dictionaries_size(); ++i) { -+ if (user_dictionary_storage_base.dictionaries(i).name() == kAutoRegisteredDictionaryName) { - auto_index = i; - break; - } -@@ -361,17 +361,17 @@ - - UserDictionary *dic = NULL; - if (auto_index == -1) { -- if (UserDictionaryUtil::IsStorageFull(*this)) { -+ if (UserDictionaryUtil::IsStorageFull(this->user_dictionary_storage_base)) { - last_error_type_ = TOO_MANY_DICTIONARIES; - LOG(ERROR) << "too many dictionaries"; - UnLock(); - return false; - } -- dic = add_dictionaries(); -- dic->set_id(UserDictionaryUtil::CreateNewDictionaryId(*this)); -+ dic = user_dictionary_storage_base.add_dictionaries(); -+ dic->set_id(UserDictionaryUtil::CreateNewDictionaryId(this->user_dictionary_storage_base)); - dic->set_name(kAutoRegisteredDictionaryName); - } else { -- dic = mutable_dictionaries(auto_index); -+ dic = user_dictionary_storage_base.mutable_dictionaries(auto_index); - } - - if (dic == NULL) { -@@ -410,13 +410,13 @@ - } - - bool UserDictionaryStorage::ConvertSyncDictionariesToNormalDictionaries() { -- if (CountSyncableDictionaries(*this) == 0) { -+ if (CountSyncableDictionaries(this->user_dictionary_storage_base) == 0) { - return false; - } - -- for (int dictionary_index = dictionaries_size() - 1; -+ for (int dictionary_index = user_dictionary_storage_base.dictionaries_size() - 1; - dictionary_index >= 0; --dictionary_index) { -- UserDictionary *dic = mutable_dictionaries(dictionary_index); -+ UserDictionary *dic = user_dictionary_storage_base.mutable_dictionaries(dictionary_index); - if (!dic->syncable()) { - continue; - } -@@ -433,10 +433,10 @@ - - // Delete removed or unused sync dictionaries. - if (dic->removed() || dic->entries_size() == 0) { -- for (int i = dictionary_index + 1; i < dictionaries_size(); ++i) { -- mutable_dictionaries()->SwapElements(i - 1, i); -+ for (int i = dictionary_index + 1; i < user_dictionary_storage_base.dictionaries_size(); ++i) { -+ user_dictionary_storage_base.mutable_dictionaries()->SwapElements(i - 1, i); - } -- mutable_dictionaries()->RemoveLast(); -+ user_dictionary_storage_base.mutable_dictionaries()->RemoveLast(); - continue; - } - -@@ -445,7 +445,7 @@ - kDictionaryNameConvertedFromSyncableDictionary; - int index = 0; - while (UserDictionaryUtil::ValidateDictionaryName( -- *this, new_dictionary_name) -+ this->user_dictionary_storage_base, new_dictionary_name) - != UserDictionaryCommandStatus::USER_DICTIONARY_COMMAND_SUCCESS) { - ++index; - new_dictionary_name = Util::StringPrintf( -@@ -456,7 +456,7 @@ - dic->set_syncable(false); - } - -- DCHECK_EQ(0, CountSyncableDictionaries(*this)); -+ DCHECK_EQ(0, CountSyncableDictionaries(this->user_dictionary_storage_base)); - - return true; - } -@@ -487,7 +487,7 @@ - bool UserDictionaryStorage::IsValidDictionaryName(const string &name) { - UserDictionaryCommandStatus::Status status = - UserDictionaryUtil::ValidateDictionaryName( -- UserDictionaryStorage::default_instance(), name); -+ user_dictionary::UserDictionaryStorage::default_instance(), name); - - // Update last_error_type_. - switch (status) { ---- /src/dictionary/user_dictionary_storage.h -+++ /src/dictionary/user_dictionary_storage.h -@@ -72,13 +72,15 @@ - class Mutex; - class ProcessMutex; - --// Inherit from ProtocolBuffer --// TODO(hidehiko): Get rid of this implementation. --class UserDictionaryStorage : public user_dictionary::UserDictionaryStorage { -+class UserDictionaryStorage { - public: - typedef user_dictionary::UserDictionary UserDictionary; - typedef user_dictionary::UserDictionary::Entry UserDictionaryEntry; - -+ // Instance of base class generated by Protocol Buffers compiler. -+ // Regular inheritance strongly discouraged. -+ user_dictionary::UserDictionaryStorage user_dictionary_storage_base; -+ - enum UserDictionaryStorageErrorType { - USER_DICTIONARY_STORAGE_NO_ERROR = 0, // default - FILE_NOT_EXISTS, ---- /src/dictionary/user_dictionary_storage_test.cc -+++ /src/dictionary/user_dictionary_storage_test.cc -@@ -118,13 +118,13 @@ - const size_t kDictionariesSize = 3; - uint64 id[kDictionariesSize]; - -- const size_t dict_size = storage.dictionaries_size(); -+ const size_t dict_size = storage.user_dictionary_storage_base.dictionaries_size(); - - for (size_t i = 0; i < kDictionariesSize; ++i) { - EXPECT_TRUE(storage.CreateDictionary( - "test" + std::to_string(static_cast<uint32>(i)), - &id[i])); -- EXPECT_EQ(i + 1 + dict_size, storage.dictionaries_size()); -+ EXPECT_EQ(i + 1 + dict_size, storage.user_dictionary_storage_base.dictionaries_size()); - } - - for (size_t i = 0; i < kDictionariesSize; ++i) { -@@ -133,7 +133,7 @@ - } - - for (size_t i = 0; i < kDictionariesSize; ++i) { -- EXPECT_EQ(storage.mutable_dictionaries(i + dict_size), -+ EXPECT_EQ(storage.user_dictionary_storage_base.mutable_dictionaries(i + dict_size), - storage.GetUserDictionary(id[i])); - EXPECT_EQ(NULL, storage.GetUserDictionary(id[i] + 1)); - } -@@ -165,7 +165,7 @@ - EXPECT_FALSE(storage.DeleteDictionary(0)); - - EXPECT_TRUE(storage.DeleteDictionary(id[1])); -- EXPECT_EQ(kDictionariesSize + dict_size - 1, storage.dictionaries_size()); -+ EXPECT_EQ(kDictionariesSize + dict_size - 1, storage.user_dictionary_storage_base.dictionaries_size()); - } - - TEST_F(UserDictionaryStorageTest, DeleteTest) { -@@ -174,7 +174,7 @@ - - // repeat 10 times - for (int i = 0; i < 10; ++i) { -- storage.Clear(); -+ storage.user_dictionary_storage_base.Clear(); - std::vector<uint64> ids(100); - for (size_t i = 0; i < ids.size(); ++i) { - EXPECT_TRUE(storage.CreateDictionary( -@@ -191,10 +191,10 @@ - alive.push_back(ids[i]); - } - -- EXPECT_EQ(alive.size(), storage.dictionaries_size()); -+ EXPECT_EQ(alive.size(), storage.user_dictionary_storage_base.dictionaries_size()); - - for (size_t i = 0; i < alive.size(); ++i) { -- EXPECT_EQ(alive[i], storage.dictionaries(i).id()); -+ EXPECT_EQ(alive[i], storage.user_dictionary_storage_base.dictionaries(i).id()); - } - } - } -@@ -268,7 +268,7 @@ - const size_t entry_size = Util::Random(100) + 1; - for (size_t j = 0; j < entry_size; ++j) { - UserDictionaryStorage::UserDictionary *dic = -- storage1.mutable_dictionaries(i); -+ storage1.user_dictionary_storage_base.mutable_dictionaries(i); - UserDictionaryStorage::UserDictionaryEntry *entry = - dic->add_entries(); - entry->set_key(GenRandomString(10)); -@@ -288,7 +288,7 @@ - EXPECT_TRUE(storage2.Load()); - } - -- EXPECT_EQ(storage1.DebugString(), storage2.DebugString()); -+ EXPECT_EQ(storage1.user_dictionary_storage_base.DebugString(), storage2.user_dictionary_storage_base.DebugString()); - } - } - -@@ -352,7 +352,7 @@ - uint64 dict_id = 0; - ASSERT_TRUE(storage.CreateDictionary(data.dictionary_name, &dict_id)); - UserDictionaryStorage::UserDictionary *dict = -- storage.mutable_dictionaries(storage.GetUserDictionaryIndex(dict_id)); -+ storage.user_dictionary_storage_base.mutable_dictionaries(storage.GetUserDictionaryIndex(dict_id)); - dict->set_syncable(data.is_sync_dictionary); - dict->set_removed(data.is_removed_dictionary); - if (data.has_normal_entry) { -@@ -369,7 +369,7 @@ - entry->set_removed(true); - } - } -- EXPECT_EQ(9, UserDictionaryStorage::CountSyncableDictionaries(storage)); -+ EXPECT_EQ(9, UserDictionaryStorage::CountSyncableDictionaries(storage.user_dictionary_storage_base)); - - ASSERT_TRUE(storage.ConvertSyncDictionariesToNormalDictionaries()); - -@@ -385,12 +385,12 @@ - { true, kDictionaryNameConvertedFromSyncableDictionary }, - }; - -- EXPECT_EQ(0, UserDictionaryStorage::CountSyncableDictionaries(storage)); -- ASSERT_EQ(arraysize(expected_data), storage.dictionaries_size()); -+ EXPECT_EQ(0, UserDictionaryStorage::CountSyncableDictionaries(storage.user_dictionary_storage_base)); -+ ASSERT_EQ(arraysize(expected_data), storage.user_dictionary_storage_base.dictionaries_size()); - for (size_t i = 0; i < arraysize(expected_data); ++i) { - SCOPED_TRACE(Util::StringPrintf("verify %d", static_cast<int>(i))); - const ExpectedData &expected = expected_data[i]; -- const UserDictionaryStorage::UserDictionary &dict = storage.dictionaries(i); -+ const UserDictionaryStorage::UserDictionary &dict = storage.user_dictionary_storage_base.dictionaries(i); - - EXPECT_EQ(expected.dictionary_name, dict.name()); - EXPECT_FALSE(dict.syncable()); -@@ -404,42 +404,42 @@ - } - - // Test duplicated dictionary name. -- storage.Clear(); -+ storage.user_dictionary_storage_base.Clear(); - { - uint64 dict_id = 0; - storage.CreateDictionary( - UserDictionaryStorage::default_sync_dictionary_name(), &dict_id); - storage.CreateDictionary( - kDictionaryNameConvertedFromSyncableDictionary, &dict_id); -- ASSERT_EQ(2, storage.dictionaries_size()); -+ ASSERT_EQ(2, storage.user_dictionary_storage_base.dictionaries_size()); - UserDictionaryStorage::UserDictionary *dict; -- dict = storage.mutable_dictionaries(0); -+ dict = storage.user_dictionary_storage_base.mutable_dictionaries(0); - dict->set_syncable(true); - dict->add_entries()->set_key("0"); -- dict = storage.mutable_dictionaries(1); -+ dict = storage.user_dictionary_storage_base.mutable_dictionaries(1); - dict->set_syncable(false); - dict->add_entries()->set_key("1"); - } - ASSERT_TRUE(storage.ConvertSyncDictionariesToNormalDictionaries()); -- EXPECT_EQ(0, UserDictionaryStorage::CountSyncableDictionaries(storage)); -- EXPECT_EQ(2, storage.dictionaries_size()); -+ EXPECT_EQ(0, UserDictionaryStorage::CountSyncableDictionaries(storage.user_dictionary_storage_base)); -+ EXPECT_EQ(2, storage.user_dictionary_storage_base.dictionaries_size()); - EXPECT_EQ(Util::StringPrintf("%s_1", - kDictionaryNameConvertedFromSyncableDictionary), -- storage.dictionaries(0).name()); -+ storage.user_dictionary_storage_base.dictionaries(0).name()); - EXPECT_EQ(kDictionaryNameConvertedFromSyncableDictionary, -- storage.dictionaries(1).name()); -+ storage.user_dictionary_storage_base.dictionaries(1).name()); - } - - TEST_F(UserDictionaryStorageTest, AddToAutoRegisteredDictionary) { - { - UserDictionaryStorage storage(GetUserDictionaryFile()); -- EXPECT_EQ(0, storage.dictionaries_size()); -+ EXPECT_EQ(0, storage.user_dictionary_storage_base.dictionaries_size()); - EXPECT_TRUE(storage.AddToAutoRegisteredDictionary( - "key1", "value1", UserDictionary::NOUN)); -- EXPECT_EQ(1, storage.dictionaries_size()); -- EXPECT_EQ(1, storage.dictionaries(0).entries_size()); -+ EXPECT_EQ(1, storage.user_dictionary_storage_base.dictionaries_size()); -+ EXPECT_EQ(1, storage.user_dictionary_storage_base.dictionaries(0).entries_size()); - const UserDictionaryStorage::UserDictionaryEntry &entry1 = -- storage.dictionaries(0).entries(0); -+ storage.user_dictionary_storage_base.dictionaries(0).entries(0); - EXPECT_EQ("key1", entry1.key()); - EXPECT_EQ("value1", entry1.value()); - EXPECT_EQ(UserDictionary::NOUN, entry1.pos()); -@@ -447,10 +447,10 @@ - - EXPECT_TRUE(storage.AddToAutoRegisteredDictionary( - "key2", "value2", UserDictionary::NOUN)); -- EXPECT_EQ(1, storage.dictionaries_size()); -- EXPECT_EQ(2, storage.dictionaries(0).entries_size()); -+ EXPECT_EQ(1, storage.user_dictionary_storage_base.dictionaries_size()); -+ EXPECT_EQ(2, storage.user_dictionary_storage_base.dictionaries(0).entries_size()); - const UserDictionaryStorage::UserDictionaryEntry &entry2 = -- storage.dictionaries(0).entries(1); -+ storage.user_dictionary_storage_base.dictionaries(0).entries(1); - EXPECT_EQ("key2", entry2.key()); - EXPECT_EQ("value2", entry2.value()); - EXPECT_EQ(UserDictionary::NOUN, entry2.pos()); -@@ -474,7 +474,7 @@ - { - UserDictionaryStorage storage(GetUserDictionaryFile()); - { -- UserDictionary *dictionary = storage.add_dictionaries(); -+ UserDictionary *dictionary = storage.user_dictionary_storage_base.add_dictionaries(); - dictionary->set_id(kDummyDictionaryId); - UserDictionary::Entry *entry = dictionary->add_entries(); - entry->set_key("key"); ---- /src/dictionary/user_dictionary_test.cc -+++ /src/dictionary/user_dictionary_test.cc -@@ -334,9 +334,9 @@ - std::istringstream is(contents); - CHECK(is.good()); - -- storage->Clear(); -+ storage->user_dictionary_storage_base.Clear(); - UserDictionaryStorage::UserDictionary *dic -- = storage->add_dictionaries(); -+ = storage->user_dictionary_storage_base.add_dictionaries(); - CHECK(dic); - - string line; -@@ -389,7 +389,7 @@ - { - UserDictionaryStorage storage(""); - UserDictionaryTest::LoadFromString(kUserDictionary0, &storage); -- dic->Load(storage); -+ dic->Load(storage.user_dictionary_storage_base); - } - - // A normal lookup operation. -@@ -425,7 +425,7 @@ - { - UserDictionaryStorage storage(""); - LoadFromString(kUserDictionary1, &storage); -- dic->Load(storage); -+ dic->Load(storage.user_dictionary_storage_base); - } - - // A normal lookup again. -@@ -450,7 +450,7 @@ - { - UserDictionaryStorage storage(""); - LoadFromString(kUserDictionary0, &storage); -- dic->Load(storage); -+ dic->Load(storage.user_dictionary_storage_base); - } - - // A normal lookup operation. -@@ -480,7 +480,7 @@ - { - UserDictionaryStorage storage(""); - LoadFromString(kUserDictionary1, &storage); -- dic->Load(storage); -+ dic->Load(storage.user_dictionary_storage_base); - } - - // A normal lookup. -@@ -504,7 +504,7 @@ - { - UserDictionaryStorage storage(""); - LoadFromString(kUserDictionary0, &storage); -- dic->Load(storage); -+ dic->Load(storage.user_dictionary_storage_base); - } - - // A normal lookup operation. -@@ -540,7 +540,7 @@ - uint64 id = 0; - EXPECT_TRUE(storage.CreateDictionary("test", &id)); - UserDictionaryStorage::UserDictionary *dic = -- storage.mutable_dictionaries(0); -+ storage.user_dictionary_storage_base.mutable_dictionaries(0); - - // "名詞" - UserDictionaryStorage::UserDictionaryEntry *entry = -@@ -555,7 +555,7 @@ - entry->set_value("suggest_only"); - entry->set_pos(user_dictionary::UserDictionary::SUGGESTION_ONLY); - -- user_dic->Load(storage); -+ user_dic->Load(storage.user_dictionary_storage_base); - } - - // "suggestion_only" should not be looked up. -@@ -577,7 +577,7 @@ - { - UserDictionaryStorage storage(""); - UserDictionaryTest::LoadFromString(kUserDictionary0, &storage); -- dic->Load(storage); -+ dic->Load(storage.user_dictionary_storage_base); - } - - TestLookupPrefixHelper(nullptr, 0, "start", 4, *dic); -@@ -612,7 +612,7 @@ - uint64 id = 0; - EXPECT_TRUE(storage.CreateDictionary("test", &id)); - UserDictionaryStorage::UserDictionary *dic = -- storage.mutable_dictionaries(0); -+ storage.user_dictionary_storage_base.mutable_dictionaries(0); - for (size_t j = 0; j < 10000; ++j) { - UserDictionaryStorage::UserDictionaryEntry *entry = - dic->add_entries(); -@@ -681,15 +681,15 @@ - UserDictionaryStorage storage(filename); - EXPECT_TRUE(storage.Load()); - int index = 0; -- EXPECT_EQ(1, storage.dictionaries_size()); -- EXPECT_EQ(100, storage.dictionaries(index).entries_size()); -+ EXPECT_EQ(1, storage.user_dictionary_storage_base.dictionaries_size()); -+ EXPECT_EQ(100, storage.user_dictionary_storage_base.dictionaries(index).entries_size()); - for (int i = 0; i < 100; ++i) { - EXPECT_EQ("key" + std::to_string(i), -- storage.dictionaries(index).entries(i).key()); -+ storage.user_dictionary_storage_base.dictionaries(index).entries(i).key()); - EXPECT_EQ("value" + std::to_string(i), -- storage.dictionaries(index).entries(i).value()); -+ storage.user_dictionary_storage_base.dictionaries(index).entries(i).value()); - EXPECT_EQ(user_dictionary::UserDictionary::NOUN, -- storage.dictionaries(index).entries(i).pos()); -+ storage.user_dictionary_storage_base.dictionaries(index).entries(i).pos()); - } - } - -@@ -722,12 +722,12 @@ - { - UserDictionaryStorage storage(filename); - EXPECT_TRUE(storage.Load()); -- EXPECT_EQ(1, storage.dictionaries_size()); -- EXPECT_EQ(1, storage.dictionaries(0).entries_size()); -- EXPECT_EQ("key", storage.dictionaries(0).entries(0).key()); -- EXPECT_EQ("value", storage.dictionaries(0).entries(0).value()); -+ EXPECT_EQ(1, storage.user_dictionary_storage_base.dictionaries_size()); -+ EXPECT_EQ(1, storage.user_dictionary_storage_base.dictionaries(0).entries_size()); -+ EXPECT_EQ("key", storage.user_dictionary_storage_base.dictionaries(0).entries(0).key()); -+ EXPECT_EQ("value", storage.user_dictionary_storage_base.dictionaries(0).entries(0).value()); - EXPECT_EQ(user_dictionary::UserDictionary::NOUN, -- storage.dictionaries(0).entries(0).pos()); -+ storage.user_dictionary_storage_base.dictionaries(0).entries(0).pos()); - } - } - -@@ -746,7 +746,7 @@ - uint64 id = 0; - EXPECT_TRUE(storage.CreateDictionary("test", &id)); - UserDictionaryStorage::UserDictionary *dic = -- storage.mutable_dictionaries(0); -+ storage.user_dictionary_storage_base.mutable_dictionaries(0); - for (size_t j = 0; j < 10000; ++j) { - UserDictionaryStorage::UserDictionaryEntry *entry = - dic->add_entries(); -@@ -770,7 +770,7 @@ - - suppression_dictionary_->Lock(); - EXPECT_TRUE(suppression_dictionary_->IsLocked()); -- user_dic->Load(storage); -+ user_dic->Load(storage.user_dictionary_storage_base); - EXPECT_FALSE(suppression_dictionary_->IsLocked()); - - for (size_t j = 0; j < 10; ++j) { -@@ -782,11 +782,11 @@ - - // Remove suppression entry - { -- storage.Clear(); -+ storage.user_dictionary_storage_base.Clear(); - uint64 id = 0; - EXPECT_TRUE(storage.CreateDictionary("test", &id)); - UserDictionaryStorage::UserDictionary *dic = -- storage.mutable_dictionaries(0); -+ storage.user_dictionary_storage_base.mutable_dictionaries(0); - for (size_t j = 0; j < 10000; ++j) { - UserDictionaryStorage::UserDictionaryEntry *entry = - dic->add_entries(); -@@ -798,7 +798,7 @@ - } - - suppression_dictionary_->Lock(); -- user_dic->Load(storage); -+ user_dic->Load(storage.user_dictionary_storage_base); - EXPECT_FALSE(suppression_dictionary_->IsLocked()); - - for (size_t j = 0; j < 10; ++j) { -@@ -825,7 +825,7 @@ - uint64 id = 0; - EXPECT_TRUE(storage.CreateDictionary("test", &id)); - UserDictionaryStorage::UserDictionary *dic = -- storage.mutable_dictionaries(0); -+ storage.user_dictionary_storage_base.mutable_dictionaries(0); - - for (size_t j = 0; j < 10; ++j) { - UserDictionaryStorage::UserDictionaryEntry *entry = -@@ -845,7 +845,7 @@ - entry->set_pos(user_dictionary::UserDictionary::SUGGESTION_ONLY); - } - -- user_dic->Load(storage); -+ user_dic->Load(storage.user_dictionary_storage_base); - } - - { -@@ -878,7 +878,7 @@ - UserDictionaryStorage storage(""); - - { -- UserDictionaryStorage::UserDictionary *dic1 = storage.add_dictionaries(); -+ UserDictionaryStorage::UserDictionary *dic1 = storage.user_dictionary_storage_base.add_dictionaries(); - CHECK(dic1); - UserDictionaryStorage::UserDictionaryEntry *entry; - entry = dic1->add_entries(); -@@ -893,7 +893,7 @@ - entry->set_pos(user_dictionary::UserDictionary::NOUN); - } - { -- UserDictionaryStorage::UserDictionary *dic2 = storage.add_dictionaries(); -+ UserDictionaryStorage::UserDictionary *dic2 = storage.user_dictionary_storage_base.add_dictionaries(); - CHECK(dic2); - UserDictionaryStorage::UserDictionaryEntry *entry; - entry = dic2->add_entries(); -@@ -912,7 +912,7 @@ - entry->set_value("value5"); - entry->set_pos(user_dictionary::UserDictionary::NOUN); - } -- dic->Load(storage); -+ dic->Load(storage.user_dictionary_storage_base); - - EXPECT_INTEGER_STATS("UserRegisteredWord", 5); - } -@@ -925,7 +925,7 @@ - { - UserDictionaryStorage storage(""); - UserDictionaryTest::LoadFromString(kUserDictionary0, &storage); -- dic->Load(storage); -+ dic->Load(storage.user_dictionary_storage_base); - } - - // Entry is in user dictionary but has no comment. ---- /src/gui/word_register_dialog/word_register_dialog.cc -+++ /src/gui/word_register_dialog/word_register_dialog.cc -@@ -298,7 +298,7 @@ - } - - UserDictionary *dic = -- session_->mutable_storage()->mutable_dictionaries(index); -+ session_->mutable_storage()->user_dictionary_storage_base.mutable_dictionaries(index); - CHECK(dic); - - if (dic->name() != DictionarycomboBox->currentText().toStdString()) { ---- /src/prediction/user_history_predictor.cc -+++ /src/prediction/user_history_predictor.cc -@@ -291,23 +291,23 @@ - return false; - } - -- if (!ParseFromString(input)) { -+ if (!user_history_base.ParseFromString(input)) { - LOG(ERROR) << "ParseFromString failed. message looks broken"; - return false; - } - -- VLOG(1) << "Loaded user histroy, size=" << entries_size(); -+ VLOG(1) << "Loaded user histroy, size=" << user_history_base.entries_size(); - return true; - } - - bool UserHistoryStorage::Save() const { -- if (entries_size() == 0) { -+ if (user_history_base.entries_size() == 0) { - LOG(WARNING) << "etries size is 0. Not saved"; - return false; - } - - string output; -- if (!AppendToString(&output)) { -+ if (!user_history_base.AppendToString(&output)) { - LOG(ERROR) << "AppendToString failed"; - return false; - } -@@ -494,12 +494,12 @@ - return false; - } - -- for (size_t i = 0; i < history.entries_size(); ++i) { -- dic_->Insert(EntryFingerprint(history.entries(i)), -- history.entries(i)); -+ for (size_t i = 0; i < history.user_history_base.entries_size(); ++i) { -+ dic_->Insert(EntryFingerprint(history.user_history_base.entries(i)), -+ history.user_history_base.entries(i)); - } - -- VLOG(1) << "Loaded user histroy, size=" << history.entries_size(); -+ VLOG(1) << "Loaded user histroy, size=" << history.user_history_base.entries_size(); - - return true; - } -@@ -521,13 +521,13 @@ - - UserHistoryStorage history(filename); - for (const DicElement *elm = tail; elm != nullptr; elm = elm->prev) { -- history.add_entries()->CopyFrom(elm->value); -+ history.user_history_base.add_entries()->CopyFrom(elm->value); - } - - // Updates usage stats here. - UsageStats::SetInteger( - "UserHistoryPredictorEntrySize", -- static_cast<int>(history.entries_size())); -+ static_cast<int>(history.user_history_base.entries_size())); - - if (!history.Save()) { - LOG(ERROR) << "UserHistoryStorage::Save() failed"; ---- /src/prediction/user_history_predictor.h -+++ /src/prediction/user_history_predictor.h -@@ -61,11 +61,15 @@ - class UserHistoryPredictorSyncer; - - // Added serialization method for UserHistory. --class UserHistoryStorage : public mozc::user_history_predictor::UserHistory { -+class UserHistoryStorage { - public: - explicit UserHistoryStorage(const string &filename); - ~UserHistoryStorage(); - -+ // Instance of base class generated by Protocol Buffers compiler. -+ // Regular inheritance strongly discouraged. -+ mozc::user_history_predictor::UserHistory user_history_base; -+ - // Loads from encrypted file. - bool Load(); - ---- /src/prediction/user_history_predictor_test.cc -+++ /src/prediction/user_history_predictor_test.cc -@@ -2222,7 +2222,7 @@ - - UserHistoryStorage storage1(filename); - -- UserHistoryPredictor::Entry *entry = storage1.add_entries(); -+ UserHistoryPredictor::Entry *entry = storage1.user_history_base.add_entries(); - CHECK(entry); - entry->set_key("key"); - entry->set_key("value"); -@@ -2230,7 +2230,7 @@ - UserHistoryStorage storage2(filename); - storage2.Load(); - -- EXPECT_EQ(storage1.DebugString(), storage2.DebugString()); -+ EXPECT_EQ(storage1.user_history_base.DebugString(), storage2.user_history_base.DebugString()); - FileUtil::Unlink(filename); - } - ---- /src/rewriter/usage_rewriter_test.cc -+++ /src/rewriter/usage_rewriter_test.cc -@@ -312,7 +312,7 @@ - // Load mock data - { - UserDictionaryStorage storage(""); -- UserDictionaryStorage::UserDictionary *dic = storage.add_dictionaries(); -+ UserDictionaryStorage::UserDictionary *dic = storage.user_dictionary_storage_base.add_dictionaries(); - - UserDictionaryStorage::UserDictionaryEntry *entry = dic->add_entries(); - entry->set_key("うま"); -@@ -320,7 +320,7 @@ - entry->set_pos(user_dictionary::UserDictionary::NOUN); - entry->set_comment("アルパカコメント"); - -- user_dictionary_->Load(storage); -+ user_dictionary_->Load(storage.user_dictionary_storage_base); - } - - // Emulates the conversion of key="うま". diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild index 828d6b1e8d6e..08be8f8c45aa 100644 --- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild +++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=(python{3_6,3_7,3_8}) +PYTHON_COMPAT=(python{3_7,3_8,3_9}) inherit elisp-common multiprocessing python-any-r1 toolchain-funcs @@ -25,6 +25,7 @@ if [[ "${PV}" == "9999" ]]; then 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 + 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 )" fi @@ -111,7 +112,7 @@ src_prepare() { 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 "${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.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" diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild index 615bd291481a..b93a912f62ea 100644 --- a/app-i18n/mozc/mozc-9999.ebuild +++ b/app-i18n/mozc/mozc-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=(python{3_6,3_7,3_8}) +PYTHON_COMPAT=(python{3_7,3_8,3_9}) inherit elisp-common multiprocessing python-any-r1 toolchain-funcs @@ -25,6 +25,7 @@ if [[ "${PV}" == "9999" ]]; then 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 + 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 )" fi @@ -111,7 +112,7 @@ src_prepare() { 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 "${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.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" diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest index 96f1cf888566..7282cd5a38e9 100644 --- a/app-i18n/opencc/Manifest +++ b/app-i18n/opencc/Manifest @@ -1,6 +1,8 @@ AUX opencc-stop-copy.patch 625 BLAKE2B ab2f98a03bb079ad116994c4d05e59e3638f648b3e03ea4e6a357a8658612a1425f2578989c0086e31d749e3533ffb814457071582f9fbf3fbcdf0d184892940 SHA512 e34388bc5d1841e3655c6209e31cf18957a9a02f23d49d9b1f184e48005cf5d5c108656439900f0d79fc1801700872a433ab761154abc424b717e12a616487ca AUX opencc-test.patch 202 BLAKE2B 1dd3bc35c1f8644cd4f27ce8a5b5dea3b0ef2750612f112d7dc6de658634ad5151972b80c7b2ede9f41ea98ac7a2d29eaeb961132c862f66dd160dc2dd522a6d SHA512 5318058587b41fb7021ffce64d4b999b1beed294ce4c00137fb4b0396dd2cb471af789bceb8a8076b1d4ec2226d3c3fdf8b3d3d6a1f5d80936cf2407b8bdd3ec DIST opencc-1.0.5.tar.gz 1598354 BLAKE2B a66b32b96dab543d8401960ff0548a4e3f9414606513941426eacf105bca0755a7b364c68b7eb996ef82444e52f849d2f8151353a14fb97a358ad1463fbea2d3 SHA512 3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1 -EBUILD opencc-1.0.5.ebuild 1025 BLAKE2B b9c774d3cfed6c15a2e73d37a7dd2482c0ba5563a842485985cf5e1e8daa4c30d8567482de35c553d6834e1bfd969a2dc83da365cbe986f35d0b7c29beb8c9d7 SHA512 c2f1712eb26ddf53b56f9250dc318293e1389aa1ee7179212f61725344e92d88dae8afb1563e13adb4f563881874cc6a659c0b1fd55e81ca0cc9b750c120057e -EBUILD opencc-9999.ebuild 989 BLAKE2B 56348d3d7b5365fa1143bd26c86d06f45870b347a3700c72200d6e6ae0bb3f9bf50e830d5456cf004edd249e8edc45663f49d858eab3a323aa752070f4bc921f SHA512 b15870c21c474a4af87e0a8a9cb96f2f6f92c398d93050f345c84e5acb0fed31c68cc9616dedcde57dd892c1839d5d8c9d73d7c04617160aca3902c8e644954c -MISC metadata.xml 491 BLAKE2B ec523a795afb6ae99cc5835e3df9fe07916aac4bf8552254f3bacbb9e1764a3ba5a79eddcabd8f34417544709a10a0bd34e6133a01b9b7a15156a9d282316d86 SHA512 303cf35b932c5d5a1fdd1a25b2c71a65a4aab761fe3c66d72439d691255a5edd1b943287afe8b4c53ab62531a012dafb5f416471a172f5b487557684dc6655df +DIST opencc-1.0.6.tar.gz 1621561 BLAKE2B d58ee0e04e133fbf6a7632788bcaf0f7891bb74051a970075f6d94b048adfec7bbe4438913933d7dfdd4d58ec2c1a5ec47685415c26532ddd8c13e8abd52cab6 SHA512 67c7bb7432483c1781701dc64ff28e4d5750898ed3d2d41f97d3782918b5f9aa1a49baa1e3a58e4b24cfbd2adcf9ea166a05ad934221fb1cb7afb35e909749e7 +EBUILD opencc-1.0.5.ebuild 1379 BLAKE2B c1a62bbb0971d538154cf525af4ff8d9a8becb59a701d663f2bcfe0f77db900eb18224c379bb7df46a472a27124a1db225c817838784cd917a9cb933e410c045 SHA512 9be51d5871bbd0bad6db8bb1cb4f6e58326ed4b9060add48eec76069f79dfdf2152171bc731712d03342f0c62b11fa4ccc7a8e60c95aa87da55067115c21a0d8 +EBUILD opencc-1.0.6.ebuild 1354 BLAKE2B 948b8d384e4f9af810005a1e44209def5977ebcee6b0ebaeb208b39790f91aa821f63a79c725999a785fdd197fceabf6372bce1f05de4512fb74719aa4fbed88 SHA512 e2537586767a47fbbb22101e9ba22ef45742381fd9f6845b09804bb723407a5578cec62601fae79c4a463bcab339e9adce99179507290c6d67546fa999e873e6 +EBUILD opencc-9999.ebuild 1380 BLAKE2B 4e4301a0b1927025ec88bbe3162895782ff3f49e6a1d6ecc1cb69a60a157838c6848db288d53949a5a8ab1da313972f8d28359676628eb8bec68c4540ea784bd SHA512 50141301b91df838a7833d18d7df5d27266f071ca6e80f8621f4856fc9912f1db6f4d6f725d37ad5cf47b4ea41dc70456c7eec1ed10bd2f5de628826bf386256 +MISC metadata.xml 609 BLAKE2B 033d770cab9cbc02a2e50b414ec469089f6864826f0bc7f969b19552303aec84d540b0b748770b43e61ec4ff5aa5f946c292e587a8ea144d2e16de70bda8669d SHA512 73432bae21dfaa03db07de30b15aa5417b25b7d9a6b886b595652f2fbde2d505367236164f6e01ff4cab31e967aaea9d2b30f636a28aacc2cb167c51e2535626 diff --git a/app-i18n/opencc/metadata.xml b/app-i18n/opencc/metadata.xml index 377bdc587a2d..b53d22485f11 100644 --- a/app-i18n/opencc/metadata.xml +++ b/app-i18n/opencc/metadata.xml @@ -1,15 +1,19 @@ <?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> - <longdescription lang="en"> - OpenCC is a library for converting characters and phrases between - Traditional Chinese and Simplified Chinese. - </longdescription> - <upstream> - <remote-id type="github">BYVoid/OpenCC</remote-id> - </upstream> + <maintainer type="person"> + <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> + <longdescription lang="en"> + OpenCC is a library for converting characters and phrases between + Traditional Chinese and Simplified Chinese. + </longdescription> + <upstream> + <remote-id type="github">BYVoid/OpenCC</remote-id> + </upstream> </pkgmetadata> diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild index 63d6cf51df70..791c79b18315 100644 --- a/app-i18n/opencc/opencc-1.0.5.ebuild +++ b/app-i18n/opencc/opencc-1.0.5.ebuild @@ -1,48 +1,64 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 2010-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" +PYTHON_COMPAT=(python{3_7,3_8,3_9}) -inherit cmake-utils +inherit cmake python-any-r1 if [[ "${PV}" == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/BYVoid/OpenCC" -else - inherit vcs-snapshot - - SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz -> ${P}.tar.gz" fi -DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese" +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" +# 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 )" -DEPEND="doc? ( app-doc/doxygen )" +BDEPEND="${PYTHON_DEPS} + doc? ( app-doc/doxygen )" +DEPEND="" +RDEPEND="" + +if [[ "${PV}" != "9999" ]]; then + S="${WORKDIR}/OpenCC-ver.${PV}" +fi -DOCS="AUTHORS *.md" PATCHES=( - "${FILESDIR}"/${PN}-test.patch - "${FILESDIR}"/${PN}-stop-copy.patch + "${FILESDIR}/${PN}-test.patch" + "${FILESDIR}/${PN}-stop-copy.patch" ) +DOCS=(AUTHORS NEWS.md README.md) + src_prepare() { - sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt + cmake_src_prepare - cmake-utils_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) + -DBUILD_DOCUMENTATION=$(usex doc ON OFF) -DBUILD_SHARED_LIBS=ON - -DENABLE_GTEST=$(usex test) + -DENABLE_GTEST=$(usex test ON OFF) ) - cmake-utils_src_configure + + cmake_src_configure } diff --git a/app-i18n/opencc/opencc-1.0.6.ebuild b/app-i18n/opencc/opencc-1.0.6.ebuild new file mode 100644 index 000000000000..70b4f7a65c7b --- /dev/null +++ b/app-i18n/opencc/opencc-1.0.6.ebuild @@ -0,0 +1,63 @@ +# 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-9999.ebuild b/app-i18n/opencc/opencc-9999.ebuild index 0b47d39a633a..8a1dbc501c8b 100644 --- a/app-i18n/opencc/opencc-9999.ebuild +++ b/app-i18n/opencc/opencc-9999.ebuild @@ -1,48 +1,64 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 2010-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" +PYTHON_COMPAT=(python{3_7,3_8,3_9}) -inherit cmake-utils +inherit cmake python-any-r1 if [[ "${PV}" == "9999" ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/BYVoid/OpenCC" -else - inherit vcs-snapshot - - SRC_URI="https://github.com/BYVoid/${PN^^[oc]}/archive/ver.${PV}.tar.gz -> ${P}.tar.gz" fi -DESCRIPTION="Libraries for conversion between Traditional and Simplified Chinese" +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" +# 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="" IUSE="doc test" RESTRICT="!test? ( test )" -DEPEND="doc? ( app-doc/doxygen )" +BDEPEND="${PYTHON_DEPS} + doc? ( app-doc/doxygen )" +DEPEND="" +RDEPEND="" + +if [[ "${PV}" != "9999" ]]; then + S="${WORKDIR}/OpenCC-ver.${PV}" +fi -DOCS="AUTHORS *.md" PATCHES=( - "${FILESDIR}"/${PN}-test.patch - "${FILESDIR}"/${PN}-stop-copy.patch + "${FILESDIR}/${PN}-stop-copy.patch" ) +DOCS=(AUTHORS NEWS.md README.md) + src_prepare() { - sed -i "s|\${DIR_SHARE_OPENCC}/doc|share/doc/${PF}|" doc/CMakeLists.txt + cmake_src_prepare - cmake-utils_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) + -DBUILD_DOCUMENTATION=$(usex doc ON OFF) -DBUILD_SHARED_LIBS=ON - -DENABLE_GTEST=$(usex test) + -DENABLE_GTEST=$(usex test ON OFF) ) - cmake-utils_src_configure + + cmake_src_configure } diff --git a/app-i18n/pology/Manifest b/app-i18n/pology/Manifest deleted file mode 100644 index fa4c0d50d4e2..000000000000 --- a/app-i18n/pology/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST pology-0.12.tar.bz2 1773467 BLAKE2B 7725b6dcb10c0f14533ee31a3d75c78e4fbd12d79ce21017b16d339a880cb73c47c8801e54f5ca0c49d8f364a12179caf6f4100b6eee5b5c47638f61d47a30d0 SHA512 2e23d1dd0c38cc17826908734adf46fb30c30d58f906fc223e2e9251791dad43d02840ae4eca55e04682af574df45a553ccd83faf85a785a1446f645e4222b4f -EBUILD pology-0.12-r2.ebuild 1637 BLAKE2B 442bd1b818c343258f31fe93ed4b98a3bb43d5bdcb818bb62557533167f12700d2671b723f12d50b24828fb1adaf5cfa2f93e11c830fca05c1d6a0eeb60abe75 SHA512 780318047c162857ce910e6d5fdfb7b0125a4cf6b39b7c2235091ab3905491e28bd5ac91d18808f474d9dc1be2d588a5963c9137d22fb3eb6985d462b8dccaed -MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/app-i18n/pology/metadata.xml b/app-i18n/pology/metadata.xml deleted file mode 100644 index 2fdbf33d963d..000000000000 --- a/app-i18n/pology/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>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> -</pkgmetadata> diff --git a/app-i18n/pology/pology-0.12-r2.ebuild b/app-i18n/pology/pology-0.12-r2.ebuild deleted file mode 100644 index 96b897adefd6..000000000000 --- a/app-i18n/pology/pology-0.12-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 ) -inherit bash-completion-r1 cmake kde.org python-single-r1 - -DESCRIPTION="A framework for custom processing of PO files" -HOMEPAGE="http://pology.nedohodnik.net" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="http://pology.nedohodnik.net/release/${P}.tar.bz2" - KEYWORDS="amd64 x86" -fi - -LICENSE="GPL-3" -SLOT="0" -IUSE="" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - app-text/docbook-xsl-stylesheets - app-text/docbook-xml-dtd:4.5 -" -RDEPEND="${PYTHON_DEPS} - dev-libs/libxml2 - dev-libs/libxslt - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_MULTI_USEDEP}] - ') - sys-devel/gettext -" -DEPEND="${RDEPEND}" - -# Magic on python parsing makes it impossible to make it parallel safe -MAKEOPTS+=" -j1" - -src_prepare() { - cmake_src_prepare - sed -e "/DOC_INSTALL_DIR/s/^/#DONT/" -i CMakeLists.txt || die - python_fix_shebang . -} - -src_configure() { - local mycmakeargs=( - -DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF} - -DCMAKE_DISABLE_FIND_PACKAGE_Epydoc=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Pygments=ON - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - python_optimize - - dosym ../../../pology/syntax/kate/synder.xml /usr/share/apps/katepart/syntax/synder.xml - - newbashcomp "${ED}"/usr/share/pology/completion/bash/pology posieve - bashcomp_alias {posieve,poediff}{,.py} - - elog "You should also consider following packages to install:" - elog " app-text/aspell" - elog " app-text/hunspell" - elog " dev-vcs/git" - elog " dev-vcs/subversion" - elog " sci-misc/apertium" -} diff --git a/app-i18n/scim-anthy/Manifest b/app-i18n/scim-anthy/Manifest index 620d749d9d8a..14e42f4384b8 100644 --- a/app-i18n/scim-anthy/Manifest +++ b/app-i18n/scim-anthy/Manifest @@ -1,5 +1,5 @@ -AUX scim-anthy-1.2.7-gtk2_build.patch 24547 BLAKE2B 22b20c7b34e83a9392fe89a2484d994364e12b5618fd7fac0e19af3c8988c1b3acbfe31872f98308c1c201d4e5c1ea598597bc15e04e77e54cfb2fedea7d9e4d SHA512 2814481606429228891cda1c70ed53b4014d2e192f6ab7859d5033a9353ab02dea044291ec8e5667853ac6db2da19f06c4a42ce6fe27d11110a5b0f6ee56bd0e +DIST scim-anthy-1.2.7-gtk2_build.patch 24547 BLAKE2B 22b20c7b34e83a9392fe89a2484d994364e12b5618fd7fac0e19af3c8988c1b3acbfe31872f98308c1c201d4e5c1ea598597bc15e04e77e54cfb2fedea7d9e4d SHA512 2814481606429228891cda1c70ed53b4014d2e192f6ab7859d5033a9353ab02dea044291ec8e5667853ac6db2da19f06c4a42ce6fe27d11110a5b0f6ee56bd0e DIST scim-anthy-1.2.7-patches.tar.xz 11236 BLAKE2B 5db168479db59bdd1a9a9561af8635e370a338620f4c4cb1676a707c60c0140e2ddd6517896ff5d8a90cd0fe9e2fe25eea7dca693c02e765fb6b8a584f9f409c SHA512 ff265547ea78912b3cb2519793fc7159d466da6bbd3cd47f63a67731207c46ba8932a5384899ffbe517bb3d91f14ee282906ee287025ae64ccee7636dd633f08 DIST scim-anthy-1.2.7.tar.gz 680942 BLAKE2B 9f2b33d53e5ed14c806dcae50a73d3bb234ec74b820651b09ccf0e3b78924bb0331ec4f5b93f9b0bcb2429bf528f9ddc35d0cda9b3a4d30780f083493945c963 SHA512 4ece2e458b204a68392ed676134ff45f1e193fda00d5ffb219c4e947f7f069a0221b279f110bf4093a22e57c41cb1555c6be4d42bea1c9e848af06ad8e0bc2da -EBUILD scim-anthy-1.2.7-r1.ebuild 1050 BLAKE2B f57ddf1e7e487b71f26c801297b1892daf519595f05341a95d0a37ac3ecfdf8a8108c3b87622651a54cf62e5f6510639e6710a0a2d4a2e3ab27519669d71961e SHA512 b13ec0cbcf05a2748454c06e8989efcd40c9096866caea4e1c798bcca0a4a41d86042fc91233f822b4b2263984ff2577648ada54e3f670f79564cdff7b3bcb79 +EBUILD scim-anthy-1.2.7-r1.ebuild 1130 BLAKE2B 3f1afc60f5495a59991cee47af4d3b46ed0aa935e4a34922e90aa587c612de26c1b7ac0aee483116c3014e533b54ac8764e4710c4262de4db8999a988c96d68b SHA512 58763d4d14747fd986a84389362fd694e0ccd0c635e5e2ea493936c67e90d01c636628da1be0a6869a9add492f50e68bb9ba73c204f42ea22125a1664534453b MISC metadata.xml 505 BLAKE2B 811e271383ea3c8f7f3ef772c8b97a395682e3f40c948d6ac09e9aed18b96e7ad0943a4e11e5e2f9fdd5615d86aaf3e5977975d02e5f6c2342d1fee3b563d3f4 SHA512 85aba6ffa284906fc8732242f5efe3563483930dd625871d670840c558f99e04e509080d0ff804746db8d5a3da9210680bab223dd78bcae79cc2ebcde622114b diff --git a/app-i18n/scim-anthy/files/scim-anthy-1.2.7-gtk2_build.patch b/app-i18n/scim-anthy/files/scim-anthy-1.2.7-gtk2_build.patch deleted file mode 100644 index 3ab4f3d7d90d..000000000000 --- a/app-i18n/scim-anthy/files/scim-anthy-1.2.7-gtk2_build.patch +++ /dev/null @@ -1,1065 +0,0 @@ -diff -ru a/src/scim_anthy_prefs.cpp b/src/scim_anthy_prefs.cpp ---- a/src/scim_anthy_prefs.cpp 2008-04-24 11:49:53.000000000 +0800 -+++ b/src/scim_anthy_prefs.cpp 2018-05-31 09:31:40.289517678 +0800 -@@ -36,7 +36,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CLOSE_CAND_WIN_ON_SELECT, -@@ -46,7 +46,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_LEARN_ON_MANUAL_COMMIT, -@@ -56,7 +56,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_LEARN_ON_AUTO_COMMIT, -@@ -66,7 +66,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_ROMAJI_HALF_SYMBOL, -@@ -76,7 +76,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_ROMAJI_HALF_NUMBER, -@@ -86,7 +86,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_ROMAJI_ALLOW_SPLIT, -@@ -95,7 +95,7 @@ - N_("A_llow spliting romaji on editing preedit string"), - NULL, - N_("If this check is enabled, you can delete each letter."), -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_MODE, -@@ -104,7 +104,7 @@ - N_("_Entering the pseudo ASCII input mode with capital letters."), - NULL, - N_("If this check is enabled, capital letters will becomes a trigger to enter the pseudo ASCII input mode."), -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_ROMAJI_PSEUDO_ASCII_BLANK_BEHAVIOR, -@@ -113,7 +113,7 @@ - N_("Insert a _blank with a blank key."), - NULL, - N_("If this check is enabled, a blank key will works to insert a blank when entering the pseudo ASCII input mode."), -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_PREDICT_ON_INPUT, -@@ -122,7 +122,7 @@ - N_("_Show predicted candidates while inputting letters"), - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_USE_DIRECT_KEY_ON_PREDICT, -@@ -131,7 +131,7 @@ - N_("Use _direct select keys while predicting"), - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SHOW_INPUT_MODE_LABEL, -@@ -141,7 +141,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SHOW_CONVERSION_MODE_LABEL, -@@ -151,7 +151,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SHOW_TYPING_METHOD_LABEL, -@@ -161,7 +161,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SHOW_PERIOD_STYLE_LABEL, -@@ -171,7 +171,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SHOW_SYMBOL_STYLE_LABEL, -@@ -181,7 +181,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SHOW_DICT_LABEL, -@@ -191,7 +191,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SHOW_DICT_ADMIN_LABEL, -@@ -201,7 +201,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SHOW_ADD_WORD_LABEL, -@@ -211,7 +211,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - NULL, -@@ -221,7 +221,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - }; - -@@ -237,7 +237,7 @@ - NULL, - N_("Specify the number of candidates to show in a page of the candidates window."), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_N_TRIGGERS_TO_SHOW_CAND_WIN, -@@ -250,7 +250,7 @@ - N_("The number of times to press a conversion key until show the candidates window." - "Specify 0 to never show it."), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_NICOLA_TIME, -@@ -262,7 +262,7 @@ - NULL, - N_("Time to regard as simultaneous key pressing."), - NULL, -- false, -+ NULL, - }, - { - NULL, -@@ -273,7 +273,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - }; - -@@ -287,7 +287,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_TYPING_METHOD, -@@ -297,7 +297,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CONVERSION_MODE, -@@ -307,7 +307,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_PERIOD_STYLE, -@@ -317,7 +317,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SYMBOL_STYLE, -@@ -327,7 +327,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SPACE_TYPE, -@@ -337,7 +337,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_TEN_KEY_TYPE, -@@ -347,7 +347,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_BEHAVIOR_ON_PERIOD, -@@ -357,7 +357,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_BEHAVIOR_ON_FOCUS_OUT, -@@ -367,7 +367,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_LEFT_THUMB_SHIFT_KEY, -@@ -377,7 +377,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_RIGHT_THUMB_SHIFT_KEY, -@@ -387,7 +387,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_COMMIT_REVERSE_LEARN_KEY, -@@ -398,7 +398,7 @@ - N_("The key events to commit the preedit string " - "with reversing the preference of learning. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_COMMIT_FIRST_SEGMENT_REVERSE_LEARN_KEY, -@@ -409,7 +409,7 @@ - N_("The key events to commit the first segment " - "with reversing the preference of learning. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_COMMIT_SELECTED_SEGMENT_REVERSE_LEARN_KEY, -@@ -420,7 +420,7 @@ - N_("The key events to commit the selected segment " - "with reversing the preference of learning. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_DICT_ENCODING, -@@ -433,7 +433,7 @@ - "but it depends on the implementation of your operating system " - "and actual encoding of your dictionary."), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_DICT_ADMIN_COMMAND, -@@ -443,7 +443,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_ADD_WORD_COMMAND, -@@ -453,7 +453,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_PREEDIT_STYLE, -@@ -463,7 +463,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CONVERSION_STYLE, -@@ -473,7 +473,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECTED_SEGMENT_STYLE, -@@ -483,7 +483,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - { - NULL, -@@ -493,7 +493,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - }; - -@@ -507,7 +507,7 @@ - N_("Select toggle on/off keys"), - N_("The key events to toggle on/off Japanese mode. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CIRCLE_INPUT_MODE_KEY, -@@ -517,7 +517,7 @@ - N_("Select circle input mode keys"), - N_("The key events to circle input mode. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CIRCLE_KANA_MODE_KEY, -@@ -527,7 +527,7 @@ - N_("Select circle kana mode keys"), - N_("The key events to circle kana mode. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_LATIN_MODE_KEY, -@@ -537,7 +537,7 @@ - N_("Select Latin mode keys"), - N_("The key events to switch input mode to Latin. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_WIDE_LATIN_MODE_KEY, -@@ -547,7 +547,7 @@ - N_("Select wide Latin mode keys"), - N_("The key events to switch input mode to wide Latin. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_HIRAGANA_MODE_KEY, -@@ -557,7 +557,7 @@ - N_("Select hiragana mode keys"), - N_("The key events to switch input mode to hiragana. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_KATAKANA_MODE_KEY, -@@ -567,7 +567,7 @@ - N_("Select katakana mode keys"), - N_("The key events to switch input mode to katakana. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_HALF_KATAKANA_MODE_KEY, -@@ -577,7 +577,7 @@ - N_("Select half katakana mode keys"), - N_("The key events to switch input mode to half katakana. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CANCEL_PSEUDO_ASCII_MODE_KEY, -@@ -587,7 +587,7 @@ - N_("Select pseudo ASCII mode cancel key"), - N_("The key events to cancel the pseudo ASCII mode."), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CIRCLE_TYPING_METHOD_KEY, -@@ -597,7 +597,7 @@ - N_("Select circle typing method keys"), - N_("The key events to circle typing method. "), - NULL, -- false, -+ NULL, - }, - { - NULL, -@@ -607,7 +607,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - }; - -@@ -621,7 +621,7 @@ - N_("Select inserting space keys"), - N_("The key events to insert a space. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_INSERT_ALT_SPACE_KEY, -@@ -631,7 +631,7 @@ - N_("Select inserting alternative space keys"), - N_("The key events to insert a alternative space. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_INSERT_HALF_SPACE_KEY, -@@ -641,7 +641,7 @@ - N_("Select inserting half width space keys"), - N_("The key events to insert a half width space. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_INSERT_WIDE_SPACE_KEY, -@@ -651,7 +651,7 @@ - N_("Select inserting wide space keys"), - N_("The key events to insert a wide space. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_BACKSPACE_KEY, -@@ -661,7 +661,7 @@ - N_("Select backspace keys"), - N_("The key events to delete a character before caret. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_DELETE_KEY, -@@ -671,7 +671,7 @@ - N_("Select delete keys"), - N_("The key events to delete a character after caret. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_COMMIT_KEY, -@@ -681,7 +681,7 @@ - N_("Select commit keys"), - N_("The key events to commit the preedit string. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CONVERT_KEY, -@@ -691,7 +691,7 @@ - N_("Select convert keys"), - N_("The key events to convert the preedit string to kanji. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_PREDICT_KEY, -@@ -701,7 +701,7 @@ - N_("Select predict keys"), - N_("The key events to predict a word or sentence from already inserted text. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CANCEL_KEY, -@@ -711,7 +711,7 @@ - N_("Select cancel keys"), - N_("The key events to cancel preediting or converting. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CANCEL_ALL_KEY, -@@ -721,7 +721,7 @@ - N_("Select cancel all keys"), - N_("The key events to return to initial state. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_RECONVERT_KEY, -@@ -731,7 +731,7 @@ - N_("Select reconvert keys"), - N_("The key events to reconvert the commited string in selection. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_DO_NOTHING_KEY, -@@ -742,7 +742,7 @@ - N_("The key events to eat and do nothing anymore. " - "For example, it can be used to disable space key completely."), - NULL, -- false, -+ NULL, - }, - { - NULL, -@@ -752,7 +752,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - }; - -@@ -766,7 +766,7 @@ - N_("Select move caret to first keys"), - N_("The key events to move the caret to the first of preedit string. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_MOVE_CARET_LAST_KEY, -@@ -776,7 +776,7 @@ - N_("Select move caret to last keys"), - N_("The key events to move the caret to the last of the preedit string. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_MOVE_CARET_FORWARD_KEY, -@@ -786,7 +786,7 @@ - N_("Select move caret forward keys"), - N_("The key events to move the caret forward. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_MOVE_CARET_BACKWARD_KEY, -@@ -796,7 +796,7 @@ - N_("Select move caret backward keys"), - N_("The key events to move the caret backward. "), - NULL, -- false, -+ NULL, - }, - { - NULL, -@@ -806,7 +806,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - }; - -@@ -820,7 +820,7 @@ - N_("Select keys to select the first segment"), - N_("The key events to select the first segment. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_LAST_SEGMENT_KEY, -@@ -830,7 +830,7 @@ - N_("Select keys to select the last segment"), - N_("The key events to select the the last segment. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_NEXT_SEGMENT_KEY, -@@ -840,7 +840,7 @@ - N_("Select keys to select the next segment"), - N_("The key events to select the next segment. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_PREV_SEGMENT_KEY, -@@ -850,7 +850,7 @@ - N_("Select keys to select the previous segment"), - N_("The key events to select the previous segment. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SHRINK_SEGMENT_KEY, -@@ -860,7 +860,7 @@ - N_("Select keys to shrink the segment"), - N_("The key events to shrink the selected segment. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_EXPAND_SEGMENT_KEY, -@@ -870,7 +870,7 @@ - N_("Select keys to expand the segment"), - N_("The key events to expand the selected segment. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_COMMIT_FIRST_SEGMENT_KEY, -@@ -880,7 +880,7 @@ - N_("Select keys to commit the first segment"), - N_("The key events to commit the first segment. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_COMMIT_SELECTED_SEGMENT_KEY, -@@ -890,7 +890,7 @@ - N_("Select keys to commit the selected segment"), - N_("The key events to commit the selected segment. "), - NULL, -- false, -+ NULL, - }, - { - NULL, -@@ -900,7 +900,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - }; - -@@ -914,7 +914,7 @@ - N_("Select the first candidate keys"), - N_("The key events to select the first candidate. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_LAST_CANDIDATE_KEY, -@@ -924,7 +924,7 @@ - N_("Select the last candidate keys"), - N_("The key events to the select last candidate. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_NEXT_CANDIDATE_KEY, -@@ -934,7 +934,7 @@ - N_("Select the next candidate keys"), - N_("The key events to select the next candidate. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_PREV_CANDIDATE_KEY, -@@ -944,7 +944,7 @@ - N_("Select the previous candidate keys"), - N_("The key events to select the previous candidate. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CANDIDATES_PAGE_UP_KEY, -@@ -954,7 +954,7 @@ - N_("Select page up candidates keys"), - N_("The key events to switch candidates page up. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CANDIDATES_PAGE_DOWN_KEY, -@@ -964,7 +964,7 @@ - N_("Select page down candidates keys"), - N_("The key events to switch candidates page down. "), - NULL, -- false, -+ NULL, - }, - { - NULL, -@@ -974,7 +974,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - }; - -@@ -988,7 +988,7 @@ - N_("Select keys to select 1st candidate"), - N_("The key events to select the 1st candidate. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_2_KEY, -@@ -998,7 +998,7 @@ - N_("Select keys to select 2nd candidate"), - N_("The key events to select the 2nd candidate. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_3_KEY, -@@ -1008,7 +1008,7 @@ - N_("Select keys to select 3rd candidate"), - N_("The key events to select the 3rd candidate. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_4_KEY, -@@ -1018,7 +1018,7 @@ - N_("Select keys to select 4th candidate"), - N_("The key events to select the 4th candidate. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_5_KEY, -@@ -1028,7 +1028,7 @@ - N_("Select keys to select 5th candidate"), - N_("The key events to select the 5th candidate. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_6_KEY, -@@ -1038,7 +1038,7 @@ - N_("Select keys to select 6th candidate"), - N_("The key events to select the 6th candidate. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_7_KEY, -@@ -1048,7 +1048,7 @@ - N_("Select keys to select 7th candidate"), - N_("The key events to select the 7th candidate. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_8_KEY, -@@ -1058,7 +1058,7 @@ - N_("Select keys to select 8th candidate"), - N_("The key events to select the 8th candidate. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_9_KEY, -@@ -1068,7 +1068,7 @@ - N_("Select keys to select 9th candidate"), - N_("The key events to select the 9th candidate. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECT_CANDIDATE_10_KEY, -@@ -1078,7 +1078,7 @@ - N_("Select keys to select 10th candidate"), - N_("The key events to select the 10th candidate. "), - NULL, -- false, -+ NULL, - }, - { - NULL, -@@ -1088,7 +1088,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - }; - -@@ -1102,7 +1102,7 @@ - N_("Select keys to convert character type forward"), - N_("Rotate character type forward."), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CONV_CHAR_TYPE_BACKWARD_KEY, -@@ -1112,7 +1112,7 @@ - N_("Select keys to convert character type backward"), - N_("Rotate character type backward."), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CONV_TO_HIRAGANA_KEY, -@@ -1122,7 +1122,7 @@ - N_("Select keys to convert to hiragana"), - N_("The key events to convert the preedit string to hiragana. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CONV_TO_KATAKANA_KEY, -@@ -1132,7 +1132,7 @@ - N_("Select keys to convert to katakana"), - N_("The key events to convert the preedit string to katakana. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CONV_TO_HALF_KEY, -@@ -1142,7 +1142,7 @@ - N_("Select keys to convert to half width"), - N_("The key events to convert the preedit string to half width. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CONV_TO_HALF_KATAKANA_KEY, -@@ -1152,7 +1152,7 @@ - N_("Select keys to convert to half width katakana"), - N_("The key events to convert the preedit string to half width katakana. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CONV_TO_WIDE_LATIN_KEY, -@@ -1162,7 +1162,7 @@ - N_("Select keys to convert to wide latin"), - N_("The key events to convert the preedit string to wide latin. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CONV_TO_LATIN_KEY, -@@ -1172,7 +1172,7 @@ - N_("Select keys to convert to latin"), - N_("The key events to convert the preedit string to latin. "), - NULL, -- false, -+ NULL, - }, - { - NULL, -@@ -1182,7 +1182,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - }; - -@@ -1196,7 +1196,7 @@ - N_("Select edit dictionary keys"), - N_("The key events to launch dictionary administration tool. "), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_ADD_WORD_KEY, -@@ -1206,7 +1206,7 @@ - N_("Select add a word keys"), - N_("The key events to launch the tool to add a word. "), - NULL, -- false, -+ NULL, - }, - { - NULL, -@@ -1216,7 +1216,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - }; - -@@ -1233,7 +1233,7 @@ - N_("The color of preediting text"), - N_("The color of preediting text"), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_CONVERSION_FG_COLOR, -@@ -1246,7 +1246,7 @@ - N_("The color of conversion text"), - N_("The color of conversion text"), - NULL, -- false, -+ NULL, - }, - { - SCIM_ANTHY_CONFIG_SELECTED_SEGMENT_FG_COLOR, -@@ -1259,7 +1259,7 @@ - N_("The color of selected segment text"), - N_("The color of selected segment text in the conversion text"), - NULL, -- false, -+ NULL, - }, - { - NULL, -@@ -1272,7 +1272,7 @@ - NULL, - NULL, - NULL, -- false, -+ NULL, - }, - }; - diff --git a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild index ee98d2db2ecf..84ab4c38fa3f 100644 --- a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild +++ b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild @@ -8,6 +8,7 @@ inherit autotools eutils DESCRIPTION="Japanese input method Anthy IMEngine for SCIM" HOMEPAGE="http://scim-imengine.sourceforge.jp/index.cgi?cmd=view;name=SCIMAnthy" SRC_URI="mirror://sourceforge.jp/scim-imengine/37309/${P}.tar.gz + https://dev.gentoo.org/~juippis/distfiles/tmp/scim-anthy-1.2.7-gtk2_build.patch gtk3? ( https://dev.gentoo.org/~heroxbd/${P}-patches.tar.xz )" LICENSE="GPL-2" @@ -31,7 +32,7 @@ src_prepare() { if use gtk3; then EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" epatch else - epatch "${FILESDIR}/${P}-gtk2_build.patch" + epatch "${DISTDIR}/${P}-gtk2_build.patch" fi eautoreconf diff --git a/app-i18n/scim-m17n/Manifest b/app-i18n/scim-m17n/Manifest index 38cc186bbe4b..15f97d5aa08d 100644 --- a/app-i18n/scim-m17n/Manifest +++ b/app-i18n/scim-m17n/Manifest @@ -1,3 +1,3 @@ DIST scim-m17n-0.2.3.tar.gz 355801 BLAKE2B e6dbfd74ffdac4af4a1dea335a41eded6a499637e772dcb33295c4e5e25e2b04ba420b04ec7029bd6638ea22f74fc9a06f63a48114df7683486581686a733dd3 SHA512 c54be4c8c331d5621dcfa6c0c6f302231071dbbaf3ef7aee4117fe2c2616d58e184d3bae720dce27d5cb6567064add6979630090c72f9350391ca9c3e9c404f3 -EBUILD scim-m17n-0.2.3.ebuild 761 BLAKE2B 976228f44e64bc4e0bab402e472787959303c458233cb5d820d232e43b907a01223311942719ee92705dd8542bb9f3829a0a377b1aaf4c53523719f4d7f04e81 SHA512 181b4e6b73fd032478c38f461b1ed782f23712eacea793313411bb66b182eafa7d69ec87822d449a46a70e023accea8095c168ae0aed62466b58c30fae4a9c84 +EBUILD scim-m17n-0.2.3.ebuild 873 BLAKE2B 812029fbea815fdf23b303c59dbaa4d15a1729812e4587d249677b3c3accb609c7a2a980287089bf306e81f6b59c8cc5420efee9b3d4a9ec121e1b2fbf90489e SHA512 601d8b35ff133f1b8274caea985dba89d0eaadd352a3ad89d1172634a973f73a9992dffa0c6863ebefde9eb68d8070beae27a52654686a8335b8b168775a8590 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7 diff --git a/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild b/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild index 87039f7d14aa..6fb3a51c366f 100644 --- a/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild +++ b/app-i18n/scim-m17n/scim-m17n-0.2.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,6 +17,15 @@ RDEPEND=">=app-i18n/scim-1.4 DEPEND="${RDEPEND} virtual/pkgconfig" +src_configure() { + econf --disable-static +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} + pkg_postinst() { elog elog "To use SCIM with both GTK2 and XIM, you should use the following" diff --git a/app-i18n/scim/Manifest b/app-i18n/scim/Manifest index 12692763a279..136be145428d 100644 --- a/app-i18n/scim/Manifest +++ b/app-i18n/scim/Manifest @@ -1,4 +1,4 @@ AUX xinput-scim 240 BLAKE2B 8c235304288f531db5bea179ff0100f6152b55348057a2604f37e37522a54883d06c954f2804ad4c04dfd3b3518fc5401ad5185e85a85a68d80e38dbbd728eef SHA512 1cfe95fdbf840b9fa43c980bb3f2e16fc6008714f8807650582ca906cb91ddd28b3b7b3c9f1325035e2c614d587d172071b2b7e3c6b30ca3128902b335773893 DIST scim-1.4.18.tar.gz 1288060 BLAKE2B c2f1ce5608423734899aa6698060245c4ee253048d04d32bf5e853b8c68255340a8d35c0ebaaa50871b07c23ee9018b6bac03b18fbd4fa4dbea0e67c32c9ae30 SHA512 9a6090fc1ab950905a9c54d6678ce3d2a44297d1a992a3e933b0466688638e6cf470c1682daa58a6fbb6de3216b649273faf7edff1ac0ecca1c2c77fc19108fb -EBUILD scim-1.4.18.ebuild 2556 BLAKE2B e6314c763a236c56cb8dfd06d1dda577f64a4468b23e29230c76c9d47cb03fcc284daeebeb554c3455fbf6045138a0e366f13b665cbcecbbb6c2673b67ab4477 SHA512 8f2dd0f47e380e979dbe7d00db9965dbb271149635b86224a4458341910664455308b1d7b8d0b17984605430eaea32232ddbde026dc8e6ab8fc5c32a8d053147 +EBUILD scim-1.4.18.ebuild 2544 BLAKE2B e5d8efb8a109575df125b70e27a64cb3450db3194dff524576aa98bc3fc8258b2cd44e482f088612b3556813238a58a769149809adde588d70cd82e77f4b4275 SHA512 fd4bf07abf7acb22eb93fa9df9009e9ff7f1223652b588cf192b5a2a9d61f416b4a042532ca6d34a5391055e5c8a0ff06375f485adff44ab5d77aa68ea3f93b1 MISC metadata.xml 399 BLAKE2B 35834cd16ccba6bf71752ae33d56e8a70391517ba09f83526d402b3aec5fc5d9c13513e090bb014cad67658c905c1dbbe396cc0c9dfc6f1e7c32c4c09a81d777 SHA512 3bbbad26a22cc5222316cf769f638a0e181ea94d8cee39058bcbd1a08e61dd0096441721190323ddb285c504dc061027e4c4185f8bee1d4d0b4b197903f3be0e diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild index 0cc809f40762..80693dc30bb9 100644 --- a/app-i18n/scim/scim-1.4.18.ebuild +++ b/app-i18n/scim/scim-1.4.18.ebuild @@ -3,7 +3,7 @@ EAPI="6" -inherit autotools flag-o-matic gnome2-utils qmake-utils +inherit autotools flag-o-matic gnome2-utils DESCRIPTION="Smart Common Input Method (SCIM) is an Input Method (IM) development platform" HOMEPAGE="https://github.com/scim-im/scim" diff --git a/app-i18n/sunpinyin/Manifest b/app-i18n/sunpinyin/Manifest index 776b4ca2a5b7..a037a1042747 100644 --- a/app-i18n/sunpinyin/Manifest +++ b/app-i18n/sunpinyin/Manifest @@ -1,9 +1,3 @@ -AUX sunpinyin-2.0.4-gcc-6.patch 959 BLAKE2B 72e027a928bd9f684dbecc7ce50074df6d915b9e699de661853012961454bce48008bff50fd2de135ef828f08e84647b624bd844b9baafb2e929480171a44f63 SHA512 7093542613a2c15c6e1dc7e500bc38f65061d927d3f89f281973f401f19f0e151f0ef438c2a1c21d102bd56b23c81d206b6a524d77b04ae4e0b79f0b97691b96 -AUX sunpinyin-2.0.4-pod2man.patch 406 BLAKE2B debbbd0c004625c3e9dc73e07876774d12d3514757ea1d5a8ad9a978868f85175d0fa92e0e46541e00c208498b7bae9ac7257491de50f6d0829616c68decbcd5 SHA512 7a0b48e4b0270b1c60844b91df42dd8f59460c9a5725c5492fd4886b77d8e993dbe2c8efc464da271d51d19d17c3c94573c57c0dd7f28414336138212911e387 -DIST sunpinyin-2.0.4_pre20130108.tar.xz 964764 BLAKE2B 2c9d2e3fc02009ad10784c9408434c6806d1403026fb27629701650fe0e8a69c5580050846cf5c3b870215b8bfd68fe9c52d8bdaf83c41e523224463af9cf530 SHA512 7c1dd7db8b800e9d436746a560a16de2c6777576868f2e7e28f6dcb767b91ccd62b974f9d4ce6bd6ce80d30e1ee83887c3ee03c227e7e9fa59c01db4867465b2 DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33 -DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e -EBUILD sunpinyin-2.0.4_pre20130108-r2.ebuild 969 BLAKE2B 3a4fed1810722b8d0f74282add5b5298c120b373c083fab1f1289285435915a12be3b8cfd3c44514c5f0d085231ffe933d5fab0ba3a2522d1422b71447bb0da8 SHA512 588f5bf39e30b91ecea1550c28c6ab2fca113fbbcc999f12ebaa335abccb214d4d2f4f6d28dbbdf728561b6ccecd9177f518134b0d39dd9c36a19428cab70ebf -EBUILD sunpinyin-2.0.4_pre20200306162733.ebuild 1585 BLAKE2B 910ce94a0b0595f95ee479a186241c3d3d8d5ba8abca47e9bf9dc33ef1df3d9fd48c02d2a1d3d7cc04d9253ed2f71a52d06c91e9a50dd3bdf400d834c9f80509 SHA512 1fd476776703c7669bd187fea471c25c4471f74e897720de92454b5a18831826385b1846ce70990a871cfdbc8ae8e5d5c2674c060777b51f64be0658d08f9698 -EBUILD sunpinyin-3.0.0_rc1.ebuild 918 BLAKE2B e5220cd1829a49aa2155ab92e5b9c2ea82ca281bff4743935f24b2072a8237f064905f979feccca99007d653877728430108c45793286eeb41d3668832b39859 SHA512 065897821edeed4dece2aff5061f7d97fcf634a544a7d1d6cf614b4215e05808459c7940953e8ae6f0319f3803d36630cb520b2b97da1284289e5d447da9a3e3 +EBUILD sunpinyin-2.0.4_pre20200306162733.ebuild 1603 BLAKE2B 2355307f042bc089cb8732f48937f2c86fdb34205aa6aa838b01b50a652a4cb53ce8801803717b523401e0280f273c29f42c8cb88e27680cd8cf61c512a876d3 SHA512 bda02741dbe5e67b4d1d43a22eb08880f17ed701ea8ca6d4bb0ec5368c74a5aa9940524b880e53badc0257c6a0163f01849083b799db7cf2c0fe650039ecfba3 MISC metadata.xml 328 BLAKE2B 61db20b9475140020b99ef82cc8949db01b996bbe043b4aa68bd7bd6cb67c56286ce0e00c8dd1a039798b23a8921621260286231f1d87a079ef13a4a764b8049 SHA512 c67333df77b03f92845334d6b738c172cc2e1935b5df4cad2d7bc983c08cda59f1427588ab8d054cd40b7fdc52c0adcb516d74c7de4bb320f85979a6a3297628 diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch deleted file mode 100644 index 0bceb38318b3..000000000000 --- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-gcc-6.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://bugs.gentoo.org/553796 - -Author: Peter Levine <plevine457@gmail.com> - ---- a/src/slm/tslmpack/common.h -+++ b/src/slm/tslmpack/common.h -@@ -53,10 +53,10 @@ - typedef std::map<float, int> RealIndexMap; // map real values to their indices - typedef std::map<std::string, unsigned int> TLexicon; // map word to wid - --#define EffectivePr(a) (float((usingLogPr) ? ((a) / log(2.0)) : (-log2((a))))) --#define OriginalPr(b) (float((usingLogPr) ? ((b) * log(2.0)) : (exp2(-(b))))) --#define EffectiveBow(a) (float((usingLogPr) ? (exp(-(a))) : ((a)))) --#define OriginalBow(b) (float((usingLogPr) ? (-log((b))) : ((b)))) -+#define EffectivePr(a) (float((usingLogPr) ? ((a) / logf(2.0f)) : (-log2f((a))))) -+#define OriginalPr(b) (float((usingLogPr) ? ((b) * logf(2.0f)) : (exp2f(-(b))))) -+#define EffectiveBow(a) (float((usingLogPr) ? (expf(-(a))) : ((a)))) -+#define OriginalBow(b) (float((usingLogPr) ? (-logf((b))) : ((b)))) - - #endif //_SLM_PACK_COMMON_H - diff --git a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch b/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch deleted file mode 100644 index 36e69d2deda3..000000000000 --- a/app-i18n/sunpinyin/files/sunpinyin-2.0.4-pod2man.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.debian.org/790287 -https://code.google.com/p/sunpinyin/issues/detail?id=327 - -Author: Guo Yixuan <culu.gyx@gmail.com> - ---- a/man/SConscript -+++ b/man/SConscript -@@ -1,7 +1,7 @@ - import os - Import('env') - --pod2man = Builder(action = 'pod2man < $SOURCE > $TARGET') -+pod2man = Builder(action = 'pod2man $SOURCE $TARGET') - env.Append(BUILDERS = {'Man': pod2man}) - - env.Man('mmseg.1', 'mmseg.pod') diff --git a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild deleted file mode 100644 index 34f908fd9808..000000000000 --- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20130108-r2.ebuild +++ /dev/null @@ -1,46 +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 - -DESCRIPTION="A Statistical Language Model based Chinese input method library" -HOMEPAGE="https://github.com/sunpinyin/sunpinyin" -SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz" - -LICENSE="LGPL-2.1 CDDL" -SLOT="0/3" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -RDEPEND="dev-db/sqlite:3" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" -PDEPEND="<=app-i18n/sunpinyin-data-20130220" - -PATCHES=( - "${FILESDIR}"/${P/_pre*}-gcc-6.patch - "${FILESDIR}"/${P/_pre*}-pod2man.patch -) - -src_prepare() { - sed -i "/^docdir/s/${PN}/${PF}/" SConstruct - - default - 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/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild index 9c87c79773ce..8944cebe91d1 100644 --- a/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild +++ b/app-i18n/sunpinyin/sunpinyin-2.0.4_pre20200306162733.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=(python{3_6,3_7,3_8}) +PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9}) inherit python-any-r1 scons-utils toolchain-funcs @@ -26,12 +26,13 @@ fi LICENSE="|| ( CDDL LGPL-2.1 )" SLOT="0/3" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ppc ppc64 x86" IUSE="" BDEPEND="dev-lang/perl virtual/pkgconfig" -DEPEND="dev-db/sqlite:3" +DEPEND="dev-db/sqlite:3 + virtual/libiconv" RDEPEND="${DEPEND}" if [[ "${PV}" == *_pre* ]]; then diff --git a/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild b/app-i18n/sunpinyin/sunpinyin-3.0.0_rc1.ebuild deleted file mode 100644 index 386c1694c1a2..000000000000 --- a/app-i18n/sunpinyin/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 - -DESCRIPTION="A Statistical Language Model based Chinese input method library" -HOMEPAGE="https://github.com/sunpinyin/sunpinyin" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV/_rc/-rc}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1 CDDL" -SLOT="0/3" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="" - -RDEPEND="dev-db/sqlite:3" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/intltool - sys-devel/gettext - virtual/pkgconfig" -PDEPEND=">=app-i18n/sunpinyin-data-20140820" - -src_prepare() { - sed -i "/^docdir/s/${PN}/${PF}/" SConstruct - - default - 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 f082c499ea90..f865e14ffcb5 100644 --- a/app-i18n/tagainijisho/Manifest +++ b/app-i18n/tagainijisho/Manifest @@ -1,10 +1,10 @@ -DIST JMdict-2020-04-01.gz 19606278 BLAKE2B aa4f4287dc57ad825df6a8606840d2dd64bf9901cfc546cf25cacda3c838bc0827430bfb948c92183f6f35d356eb97eaf09b743e70740364293dc278168510ba SHA512 ad3907bff000b684af2d78135da0258756757cc715c5827f02a8703e6b9a3f0796fd6e3d24509ec13d84464ec6591e7acb0b9c253724e55a2cb44a564a7e5602 DIST JMdict-2020-07-01.gz 19735470 BLAKE2B 06126c07516241af6789c3427ebe68ce6da3a5116414f8d1cd5248c18319a4b302ec241499c36b380e3a49f43cac2b381e4130d2bae4a7b100de76724786eadd SHA512 08c3feed364666dfbf87c73ac5da20a7eaa414e7fde274f314b058a6b268cc197b834225aed57cea74f6cdc95f374031c1a87ee9e3023f421ed9f3f1af4ca1d0 -DIST kanjidic2-2020-04-01.xml.gz 1482869 BLAKE2B 05a8ed51adaf56023b41d6ac956496fda780d14e55d1947dfdec0647a78d4bcb2f5cab730e729ab42a176bed7de7548276d9d9fd668ca2c6e045296ba0ab4f7a SHA512 87d0562bb5d4ae7153be8d684d1bd9b199039417a76289d783e96e09ea52b6741d923dc2f38500a7b2299c9f4cd0f6c8d7b8b7e00da2f102681387ec858ce852 +DIST JMdict-2020-10-01.gz 19845877 BLAKE2B f75e9cb1096c1f35276606119d1f0e1cf2687f69d9afe2bced55a6b75aa8ada0c8f245e05e8f7246d73463ed895cd232f1ee30ccd639cb32801c51cbc9a56dcc SHA512 4e6490eda15928a48cbfff59bf73d21dea19d2e80dffce70f65a247b0a9393bea787c8378b06b7e7c807eeb9a296971efac9f3ec2d3ab6771c7a016e0e747113 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 kanjivg-20160426.xml.gz 3587660 BLAKE2B c85291f3671f0980186e8deb296cfa743322df438d6f09fd69a4f5a30c3db6f097d6ff0a817b88c5c9a2c8d4a40c90b31c0a54cb71d681849b557ee364707c48 SHA512 1d35a8cc5d4947f6bedfc71a2f08e2d1fda832d7a02588c00953e1746812b0e51d4d1c39dff49999b4f65ec850788359f6e0d1465f0e688b1bf753c4c67b3c54 DIST tagainijisho-1.2.0_pre20200118132551.tar.gz 3635265 BLAKE2B f8f831f698bf0ca56c57e8343adee92d3b42842c95fb971c9d8696eaf660ce458d8fd2108ab4568463bed6711c5295d27efc34f2fab512c3d0bc2a11a4f76c1b SHA512 14d6fc5ce891437159ca2b3db53c776420a6d4e305f6753c7ccf5ce773d43fa31f875ee9582c9db1fe05364b18772cec43dd046a6492b6eb45c12b62f7d60407 -EBUILD tagainijisho-1.2.0_pre20200118132551_p20200401_p20200401.ebuild 6662 BLAKE2B d0e51fac4398e2108660bc3a111b01c140be5237d7fbf2e2bf60ea2cdc7439df96df2233ca0b7ec02b2aa89feecbf35cf5601fd14b0ff15e8bf8d813c0917858 SHA512 7a7128adc528c86e3860ddb8ce7a1e6d039a1eb8b3659c21f9ee64d0e410d19f1225c8be2b644b2f367feb463c9c37c4869b0e0115dec84d6176d4a6a78a39ec EBUILD tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild 6662 BLAKE2B d0e51fac4398e2108660bc3a111b01c140be5237d7fbf2e2bf60ea2cdc7439df96df2233ca0b7ec02b2aa89feecbf35cf5601fd14b0ff15e8bf8d813c0917858 SHA512 7a7128adc528c86e3860ddb8ce7a1e6d039a1eb8b3659c21f9ee64d0e410d19f1225c8be2b644b2f367feb463c9c37c4869b0e0115dec84d6176d4a6a78a39ec +EBUILD tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild 6662 BLAKE2B d0e51fac4398e2108660bc3a111b01c140be5237d7fbf2e2bf60ea2cdc7439df96df2233ca0b7ec02b2aa89feecbf35cf5601fd14b0ff15e8bf8d813c0917858 SHA512 7a7128adc528c86e3860ddb8ce7a1e6d039a1eb8b3659c21f9ee64d0e410d19f1225c8be2b644b2f367feb463c9c37c4869b0e0115dec84d6176d4a6a78a39ec EBUILD tagainijisho-9999.ebuild 6611 BLAKE2B 49eb2ad3a99a2cae8097c3fbe54f99b7d63fe1ba2b88793bfe9a57f38afc04ae4ccd5297642603cc55203ec461d2b56885cf0a504c75b9319194df878d27b752 SHA512 ff98dc941da2ae88e664564a5fbf674e75f5da2e8d1501dac23c294bc1ed718f6b8e7252c9e889cc9b3519217b9a2b37a5e6f38dd828dce7f269296af316311d MISC metadata.xml 1133 BLAKE2B 863fcd0cbb85b715cf7666210c74a9e88423b0e982b3e05b4333036b607e4d2cf73b35dc6b8f5e549a35a6d8e2cc107f110f3500762d49065bd1ed2097dd6338 SHA512 cde2818f44f02091ac994ca049a25b90519b62b669b7923a52043df23a0de7f3e1f657d3080e574048556dbacd5521995addd35267ec9d1357360f473222cef7 diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200401_p20200401.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild index 9d1700175eb0..9d1700175eb0 100644 --- a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200401_p20200401.ebuild +++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild diff --git a/app-i18n/tomoe/Manifest b/app-i18n/tomoe/Manifest index 29f42ec320be..090cd7b0d54c 100644 --- a/app-i18n/tomoe/Manifest +++ b/app-i18n/tomoe/Manifest @@ -1,7 +1,8 @@ AUX tomoe-export-symbols.patch 8483 BLAKE2B 45a7ce461400256809275d626bcf7c3d4b1201be2a07f7db2c77b94059e11b5026cdd060cc7e2f57a1c1d60498ca266218b3c26356dd27447f00bc8fd090b107 SHA512 32caa46e10d2c1885e7d850f7ecb3ac79a4754156100e4db68e87f1614b0d9db71fde6af9d8520f337143bf2a3e6f3fe1f6e7e83f1c066552238a2a2c3d3bba5 AUX tomoe-gentoo.patch 599 BLAKE2B d297c41007f17ac07f6a80fb451c2d605ebf275b64af96b81e31875ff2ce065684d78e60610627b2295195b024813b3d02b2327a3c06c38e992d7e78361f897a SHA512 50b573c046f9b98c64bfd8e0320f7d4d7f4c113d6cc5368fbaa68575d199ce269bfc8827709a6565f244a1b6e82e220db7309570a022c30ad03c51317110030b AUX tomoe-glib-2.32.patch 688 BLAKE2B 5aeb0fa73f54331e20d8a3cd360a4e7c06e770f988686bd3ddd055b49390abd1c064a9369d89c7a4f6cd6c9631a075ba56857b0db54befeace96c233cf9e7947 SHA512 ec0344ccb48ecc8f0df3a76424ed93c9e223a3b22733626a460c4729681d7f9f072ddb84311d22e161c04503dd845c7da774ea9832df32cb79199ca47589073c +AUX tomoe-glibc-2.32.patch 321 BLAKE2B 538417b3af4fd1664835760c1dd01ebb51ed6fb041e48f684c0463a084ce66e377ac390075cc165c8ad0836d9c9da2516d7911598c73d9123f6ed5b7154b10b8 SHA512 b4b0675eab9c34cd4e662d6dfb025680bb165354ea0785dad6ef4de83a3bd1a7afa2aae1d371e8fd30324c721ef5a89e324913ffd77b583a62da25fe1ab8a348 AUX tomoe-ruby19.patch 2646 BLAKE2B 7b2289af7e87946bb9c4cb197b493bc2b8625a3bc3f22ee42270a403bd36b1bee4efcbb46117f11d537e3c8a38dfbcfca6484c0a1db6ec2f0b7a5469dac35b47 SHA512 52f555412853c3485e8d3ab7b7739f030e2c3d2b5c4aac14ebb967c93427fe04cbcfec2f5997f09f0f7611dc268ee63437b256ef4cac1ea805f0ae84a522b836 DIST tomoe-0.6.0.tar.gz 4918949 BLAKE2B c9f4accc77fe7c6214c4d19dbbac7d0d39ed7947588ab1b8a1416f6cfeda33a6cfa84352f888d02848c8e2026bd5c36d2fe52d099bda6ca41a6d215733b11aa3 SHA512 eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8 -EBUILD tomoe-0.6.0-r6.ebuild 1768 BLAKE2B ba5ea4da80001632668244a20bf4e703d87db7989969c0b2b74714a3291f5a660dc2ce5a8360cfb85b08d8df3ad0d0c931f0d9fe526bce1fe4fb1d4133399046 SHA512 668000834b77dce1488cccc8a0a8ad688e471bb16be72b5d1dfb704bb5d57fe5399cc82c4fb0276077a0137d4c2e78e444093df79f620c9e38b82f08e413665c +EBUILD tomoe-0.6.0-r6.ebuild 1806 BLAKE2B cd4409ea41a557bdda65162a59b3644bd1a0bee54866b13b0222f97a01158171b7593d560f4ff36cd8f0cba352575b03bc8ddfb9934178ca8b04962b0d4c2cd2 SHA512 bc1c4b59683ba077b3a67c7f1ddcdea4cadf4c98a9191219273817dca96d729b918357d9bae25c9ab20cfc095c829ce2a90fb3d7efe6255516ee067d9a0ae8c3 MISC metadata.xml 482 BLAKE2B 454f6c496dda5f9ca738bb81c843a650be203b58bbaf4f0775204be463de6eccdd11023705295e89d1cc8513eead67dbe1fb26740bdc39216e8e2d4ee838e8ca SHA512 0898e0ba0bd42458870d268ee6bc881da1c88ab01969037d57f0d4abf5f140a7ce77bf87d918976bd763a33c8869e73d0fb2ec744be747d5bc30d594cc54efeb diff --git a/app-i18n/tomoe/files/tomoe-glibc-2.32.patch b/app-i18n/tomoe/files/tomoe-glibc-2.32.patch new file mode 100644 index 000000000000..5d296cdcdd39 --- /dev/null +++ b/app-i18n/tomoe/files/tomoe-glibc-2.32.patch @@ -0,0 +1,11 @@ +--- /lib/tomoe-xml-parser.c ++++ /lib/tomoe-xml-parser.c +@@ -441,7 +441,7 @@ + f = fopen (filename, "rb"); + if (!f) { + g_warning ("failed to open dictionary file %s: %s", filename, +- sys_errlist[errno]); ++ strerror(errno)); + } + g_return_val_if_fail (f, FALSE); + diff --git a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild index 00b0c32111b1..ad6822db39c6 100644 --- a/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild +++ b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 2006-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -39,6 +39,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch "${FILESDIR}"/${PN}-export-symbols.patch + "${FILESDIR}"/${PN}-glibc-2.32.patch "${FILESDIR}"/${PN}-glib-2.32.patch "${FILESDIR}"/${PN}-ruby19.patch ) diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest index 80c57e79a055..d7f7561d84b8 100644 --- a/app-i18n/transifex-client/Manifest +++ b/app-i18n/transifex-client/Manifest @@ -1,3 +1,5 @@ DIST transifex-client-0.13.9.tar.gz 197283 BLAKE2B 9fd6f63a54d09f190f7dd6701e4994e4fd67e23cf630dcb49641a3c7356e55f1146be7c2a590fb09a52cccfa99e709c48fffd7df416d1d4c10231c4f42919380 SHA512 3dc4a1e713a797ce1ea626c9e85dd353fec3034ba21ab04bc89e5b927e0298b4f6560a793eec50d1a99c7ab340462c33d18c1e159697c476001be868cb7f87fa +DIST transifex-client-0.14.2.tar.gz 211398 BLAKE2B 4210a06da9fd09e689d28ae77a90c65f96cbba7b44a2cc506c2e385dc2f34659bfbda25eb81cef850442f4b3da22a859e19761798ec123888564b0327f0c6503 SHA512 5d7f8241d61621197df95cb42b2a8fb8088e77543f076c2401db14f7e44d67e49478d0b04cb525fc6281b37e5026edc8121f90cb7332e669d63be6112264044d EBUILD transifex-client-0.13.9.ebuild 752 BLAKE2B 0ddbf4e4a08f2890dd3da509f2d3ae52a2235268a8f845960a7c92279aa3bb573adf6d3102219c8c7e399a080fb28d6f18ed689b01244f523bc0bc723eed7212 SHA512 7eb6b8ddfc035f0331b0bb4f0b0dde20131c54c4553429a486ef97b338e8b458083f642807e8834b1e30b727ed51982279d8648ae991fffb12c25671d73d0dc5 +EBUILD transifex-client-0.14.2.ebuild 893 BLAKE2B a8df2ddeaf46601836217f3a5f0a5f1b7f1e116f6350ced90505ad3ca692189e79d5e7457121fd06e35ead95e4b16fa80efd382b4ae3af85fc9102018f9c44ce SHA512 3c5cb6db79d2f2f1729266435b5bf0cab2fe5b9847b38017a73d558804877ea24bfec10d91709757af21c0b92a6781d976708f115279d1686458c52b2784e093 MISC metadata.xml 511 BLAKE2B cb47fd7af2c99fe027060cd09a0ed4943faf219f1a9117be347e317c651d68f4a8d6967a51d899f6e125110138cfd47242b8818ef0bdf51f8b08d3989680ed79 SHA512 e1ff78568bc8bc8c80a48ffe569deb6fe36f431443ef10903a3fe03ea3f2b1452e0c145388c7225d0dfcac126b692276b27e8973a8875788234924a1d2cd8c31 diff --git a/app-i18n/transifex-client/transifex-client-0.14.2.ebuild b/app-i18n/transifex-client/transifex-client-0.14.2.ebuild new file mode 100644 index 000000000000..9a36eedf7f4e --- /dev/null +++ b/app-i18n/transifex-client/transifex-client-0.14.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +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/" +SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~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}]" + +distutils_enable_tests setup.py + +src_prepare() { + eapply_user + sed -i -e 's:test_fetch_timestamp_from_git_tree:_&:' \ + tests/test_utils.py || die +} diff --git a/app-i18n/uchardet/Manifest b/app-i18n/uchardet/Manifest index aa05776df701..08012284ef41 100644 --- a/app-i18n/uchardet/Manifest +++ b/app-i18n/uchardet/Manifest @@ -1,7 +1,7 @@ AUX uchardet-0.0.6-enforce-IEEE-float-precision-r1.patch 2401 BLAKE2B 3f0cf425385d333488c7eeb37c37f3ec6a224e0a96d2c1bbcaded770c8ab6b5bd8277808fbce2bbc960cb3838e0e9de8d889ef9fe2af2e3b44ec4a81031d43f1 SHA512 fb684a362095810bb462609859018dd22987704ab9def0d0ea9ab6afc076fddcf338c622b9f587649d6f561a216b8bc234d3499c499ce3d4589113e908037972 DIST uchardet-0.0.6.tar.xz 169192 BLAKE2B a0bc80ecd12565c1459b8136e3dc0530250571b5adbe4a7013c561f846f64f58482b9fd9cc5aa7493f20e913f59504a6e08c26571bf33ff34b4823f55d857b8c SHA512 eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 DIST uchardet-0.0.7.tar.xz 215492 BLAKE2B 1f8b171676bc6edf1f3493a4a370e32b7b956104ea0b12a03837d817c386d59aa512c3a107426aedb087987cf3a7b99c4b2df4a667ed685ff9959f6bc6b4506c SHA512 ddb7b63dd09c1d9acbe620d86217e583d9aa5340780ab4010ec9faa4fd331498859d5efa7829bf8847da89325accf8f7304b51d410210178fc1ffa6658064a6f -EBUILD uchardet-0.0.6-r2.ebuild 854 BLAKE2B cf08d7188aeb89ed3b08956f404bd79392716206a2c8384f31978e0b5b726fc8d3916224bc0420ab2d085927d98629160116830c2a92a75cc8d6ee6dde257727 SHA512 254306625498713aa5406cdd3e2eeadb3a6b944656f806bb82bc5dca807574a68f0129fe2d94414a2ee7c39ab2e57f40d38ae49bd4c69de5a2dfc6b2452b7a6e +EBUILD uchardet-0.0.6-r2.ebuild 852 BLAKE2B a6de024ad35692b0274e47f8d3cfa29bb75767cb3df15e68274185fff05311d3cf94f1cdd8009f3fb2900d30b6c710ff1bc0fc210fad50086311400b47c1e3cc SHA512 1a438390a330197e487fc1578a572c65b1a6c1a7fb75bf06e0d5e6e2bfc39a42ef816afc509567b169c2c371438e315e4fb4f48dec4484509d99e87a7a811b60 EBUILD uchardet-0.0.7.ebuild 899 BLAKE2B 8986cc6e306cf85d8bd33944748450783aac0280e5415308dc3c005ebf33df275e37f680942823c244864c9bcffc05cd35b73171ac5f410453fd90d911a73689 SHA512 b802c47645927791f8ea8c64ca544ec7901aa7eec7f3d4067cadc767e7149d9203009ed64c2564f4753a5d54b2d3a31cb04d2f3efe35eda0cc832c389ef4cc95 EBUILD uchardet-9999.ebuild 838 BLAKE2B 1fa9152117465b5e792942983a98d1a0f69373b34f723d1811d5bc8718cffa6f61f3a808d5e70e5837bd4969eb32a49b744a7e200d7d1760d60a0bdf1b08a6c2 SHA512 2a0a59e862a98c88f1a4186043e3eb6819ea09b5b28fa5ae8ec5edaa2f328ced05cd2ad19b2288ee119741987ed7f8ba8756d440d48c264996f2e3d6a6e39e04 -MISC metadata.xml 531 BLAKE2B 704db918c9ad9f097c7db7003c925e3d880611a2fe8da3b1439737db4e6b74dda42d990b8073b159e2a437b8e671d54467ead7aadae6ac25181a668dde715141 SHA512 01b7353c36311f9c12d819339afec0e6b7cd081ec9bcafab57108fb4b128dc435f66b3bdd6df4962c261881cfbf51b46cb3dcccfa493e71ba0c94ecbaa41f5b7 +MISC metadata.xml 671 BLAKE2B e4d37fa90064a38dceb1472cc2683257d8f7f7ef5f4c15a440f2d9102f91561d408b919c29077b305013e5dc967b42400ec49ee6a50037708a76b2c2e1742e44 SHA512 38fbc4d87e388fc19dcb64a65fe8859307dd7636a4327353131a7c8ebf8974cd74c73486b9dedf1f350d1d42e23a23e33737a1e2e3f4b769f9f64d730149c8a6 diff --git a/app-i18n/uchardet/metadata.xml b/app-i18n/uchardet/metadata.xml index 8e0af8580e0a..83fddc43dc8a 100644 --- a/app-i18n/uchardet/metadata.xml +++ b/app-i18n/uchardet/metadata.xml @@ -11,5 +11,7 @@ </maintainer> <upstream> <bugs-to>https://gitlab.freedesktop.org/uchardet/uchardet/-/issues</bugs-to> + <doc>https://www.freedesktop.org/wiki/Software/uchardet/#usage</doc> + <remote-id type="gitlab">uchardet/uchardet</remote-id> </upstream> </pkgmetadata> diff --git a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild index 9653c0231a4f..8d86ff1b0b38 100644 --- a/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild +++ b/app-i18n/uchardet/uchardet-0.0.6-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/uchardet/releases/${P}.tar.xz" LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86" IUSE="cpu_flags_x86_sse2 static-libs test" RESTRICT="!test? ( test )" diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest index cc123110bd39..bccbc5346950 100644 --- a/app-i18n/uim/Manifest +++ b/app-i18n/uim/Manifest @@ -5,5 +5,5 @@ AUX uim-xkb.patch 400 BLAKE2B 54992f9ef87e4ede3e2beaadf4bd55c018b0aec3eb645b7716 AUX uim-zh-TW.patch 871 BLAKE2B 091efbed0182f05c87e5a5c789ca7ea3862e61566dad5411a5158b348e73123a60efe869b7aa8d43af603ba01e908eb5d135762069abb3c01951a144739b6126 SHA512 0cf0955cded7870b5012f283adb30dbbab6fee9d468178248987036cd3e78fc21e1279481289f9400784fb1e59fda91d1cc8ac1cc8b3d57f0f24258b8b9f40f4 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc DIST uim-1.8.8.tar.bz2 6228743 BLAKE2B 8fc44b61239f766ba3d9ebf3201c11471b3a844e082237f5ec97dd0fa6fbb04a0a588df5c0479a0aa4bcb4d9c4edcc93c36ec68618701c8aa88fa30732fdce28 SHA512 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3 -EBUILD uim-1.8.8.ebuild 5474 BLAKE2B 55ef0e1a31bbe7448b7803ab02f5f303ab352fb35febec28f433f8e3f9cd58419ea70c11da6a7e9b14223bc8b67deaca45ed7b56f5e6e17b70c9814569d20c11 SHA512 99fe55bc3576f0d210b8aa3a0371b1efedbf139c3c2c0345bafa790c18fdb22c89b61ae99dcc517b540116c2df2215c4f120138546c849d13202ccf8da8c7a5c +EBUILD uim-1.8.8.ebuild 5477 BLAKE2B 7f203eafd78f5b77c724a59116af1a154a4633df5712e33eade8de351869a1fcb81cd61f4a50658a885491ef5581f4625ed603f6f780d6b5aac6630c3f354bea SHA512 5c3e6dfc798f5ca600416c69360f8b09ce9d932d9e402d82be2830d8a219e03fd5df9ee468316533ad7348c85e81acdeee9c6cd4c83f7e3747441fc61560a809 MISC metadata.xml 1058 BLAKE2B 3569e92b5050f14f1ed7482e602db2bddda608f49940bd1d0be7708247abd6ef67e648918f271722b8688f56065394da64acd48c0333a23bc6475be4349d49af SHA512 392645fde85e225d2ffeac5fae39018208f40e4f2a44e6a2dd082af82759c69bfb17c1fc8a515d10e0ae808b747074ad6cc13c1cca79582047f8778c8458e088 diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8.ebuild index 3cb465c9e793..412b439ce31c 100644 --- a/app-i18n/uim/uim-1.8.8.ebuild +++ b/app-i18n/uim/uim-1.8.8.ebuild @@ -35,7 +35,7 @@ CDEPEND="!dev-scheme/sigscheme eb? ( dev-libs/eb ) emacs? ( >=app-editors/emacs-23.1:* ) expat? ( dev-libs/expat ) - libffi? ( virtual/libffi ) + libffi? ( dev-libs/libffi:= ) gtk? ( x11-libs/gtk+:3 ) gtk2? ( x11-libs/gtk+:2 ) libedit? ( dev-libs/libedit ) diff --git a/app-i18n/xsunpinyin/Manifest b/app-i18n/xsunpinyin/Manifest index 16284575cfc8..8b0e8a775ca4 100644 --- a/app-i18n/xsunpinyin/Manifest +++ b/app-i18n/xsunpinyin/Manifest @@ -1,5 +1,3 @@ DIST sunpinyin-2.0.4_pre20200306162733.tar.gz 547519 BLAKE2B 6e0e4457217d7b85221cab15173f588a5c7c039208a8f6cd48ed5fb21c5b5eae2f4616d6fddbf6eff8a006193097de26c866d5385d4602f41059ee8d7e52a2d5 SHA512 e8cf73aeca8dcbc7dd6f51f034a9a0363201bc14a814800e071c987933935b0e8039aa84178a6bd1cba1c7dee4b25b2d5546e78ea683e68e8981afea48fdab33 -DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e -EBUILD xsunpinyin-2.0.4_pre20200306162733.ebuild 1822 BLAKE2B 29544096b09a537a7ff42ffb1018748b80189877c785837a9bbc8e06e4c3b12e2460e5f71baaf900de2a68b7cac83b63214fcf96769125bc677ddd942e859bb7 SHA512 a60ba52e47fc68e71b3dc3e5d719fc6237c152a9454a127287830ae8df5f8be4c8fb28450775887a0cd634648dd2cac82a9783d82007c19aae4afb89ac4a804c -EBUILD xsunpinyin-3.0.0_rc1.ebuild 838 BLAKE2B da1adbb00714726eedd65cd1ccfe144ed469265dce54afb0e64ba2f8ffe72cab2eaa6f99a44375164d28fbabe2315296318a1c8916aff579ecb53d7b48542a37 SHA512 f44f42d1a03aa89d9c2ab128f4a8d40823546029a053910f1b5b28ad3a48a9b951ea83bb15f6301a361ad0c0efa72b83d8f855d2fced666d5588d6fa0f330cf4 +EBUILD xsunpinyin-2.0.4_pre20200306162733.ebuild 1943 BLAKE2B 6449d085eabb7e845416540364db8c7fe6aa4727c6cc2a90d3e773ea76ae56d43ce2026e0fbbe6acbe968a24d9e214f2903b7a6e8e985f58e4b6e5cb3f0f8ccc SHA512 ef30aee88a418d7f34b3d9ccb7c33f240b97582b75059aea664107b70b1d3a98b88d1d862c450f8bd3671af9b675270c3c6f9f7136a2454352095422829f01ee MISC metadata.xml 318 BLAKE2B cd239258d08a95f0d27a760678be36731954a721daae521d147b882fd07eb5206a38ce9ac9938e94e3501611cd95aba5699fb2e5a5176f3652e8e5531e5e4cf8 SHA512 44d76425ce41ba6cb84f584c7dfe3b0552eb65aec93b4ed72f9c2e6c153e5e51a3965bf4248486046d3ca9e39f861c3bcde90424ba35e4a57f2102a24faf0df5 diff --git a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild index 410b23009438..06ccf1ef63b2 100644 --- a/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild +++ b/app-i18n/xsunpinyin/xsunpinyin-2.0.4_pre20200306162733.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI="7" -PYTHON_COMPAT=(python{3_6,3_7,3_8}) +PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9}) inherit python-any-r1 scons-utils toolchain-funcs @@ -57,6 +57,9 @@ src_prepare() { # 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() { diff --git a/app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild b/app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild deleted file mode 100644 index c87c83f85db7..000000000000 --- a/app-i18n/xsunpinyin/xsunpinyin-3.0.0_rc1.ebuild +++ /dev/null @@ -1,40 +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:1}" - -DESCRIPTION="A standalone XIM server for SunPinyin" -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="" - -RDEPEND="~app-i18n/sunpinyin-${PV}:= - x11-libs/gtk+:2 - x11-libs/libX11" -DEPEND="${RDEPEND} - virtual/pkgconfig" -S="${WORKDIR}/${MY_P}" - -src_prepare() { - default - tc-export CXX -} - -src_compile() { - escons -C wrapper/xim \ - --prefix="${EPREFIX}"/usr -} - -src_install() { - escons -C wrapper/xim --install-sandbox="${D}" install - dodoc wrapper/xim/README -} diff --git a/app-i18n/yaskkserv/Manifest b/app-i18n/yaskkserv/Manifest index b08022c09094..69eb64f1894e 100644 --- a/app-i18n/yaskkserv/Manifest +++ b/app-i18n/yaskkserv/Manifest @@ -3,5 +3,5 @@ AUX yaskkserv.confd 280 BLAKE2B 465561acdcf1daa1589d84a74708ceff777dee5ed04510e2 AUX yaskkserv.initd 341 BLAKE2B 1e26304d24ecb6a931936ff06d9f24bb92b4aa01a3ea7d5db0ec7cd12c48c062f5ce664624b51592d87bb971cb82855fbc2220ca82cd6d0f4d55172e7ba2b0f5 SHA512 2fd63604283c811c7f6fe192e3d8f2b5b3542106b54d39707aa8d6116328634ae43421d6a620fcd1555cdbd53985b2444a381bc32e071cac7e040f6a337a3d8e AUX yaskkserv.service 277 BLAKE2B 7755728e443ceccdd359864bea9e9e25926c860f13fb3acbecebfdedd919db7fd65ecc1e922f662dc676b2aa90b325a7aaed049abcae9291602f0bb5097b0015 SHA512 8ff4aa6ec41c3df17f560de157a60cd3bf3fcc03a2613c603d533f2891207b7001e2469dd3e9ac8c8cfc7ab5909978467922906e22ba4b4635627b234008ce32 DIST yaskkserv-1.1.1.tar.xz 75136 BLAKE2B b5a26e7d12951d9256e050d543338a48a61e9b6883a0866e4f7a2d367783a5757a5a12cdd810a87e84ade5bfebdc9c24eb093c09081e1d9099ce848d435eb45e SHA512 5f421ef684011aed716e929b90ab98fb1703abe707928847d79a34815750d59df59f4dec8bef6e8ce399340aedb32688d6dd8a5d02ba9372a935ec8f1adffc29 -EBUILD yaskkserv-1.1.1.ebuild 1579 BLAKE2B 5bde86a8bb87008d8018eefa160f0bfe27bbd93c7d5531cd67fb5dfca42396e26e55ea43fcd4f1a965d44d938fec06784c44dcae5b37cfdb8b7cd120626d8380 SHA512 ee4eb587834d1b8054dd5d7e0f0a4112e84c3cc53b5c27cd241cb5f9bca0edbf7ed667386931dd0863adeab002d4738fd5fb42f49c4cf8aac5375d9569603a8a +EBUILD yaskkserv-1.1.1-r1.ebuild 1574 BLAKE2B 2441bdc45243b20f304bb56ae535d507229b43cd049dde520dc10c5d0cfc9d58c8dbfd60d3e3e210808f478f7303485183e4d285d2ff0fcfcc765e59e7434007 SHA512 d117b601719d8ab71aed6c3d56f152631f8768d26ccffcc8a6b05b0c3a32a78eae73ef347710b573d62726a5469e3cc6b0e54e9b31668c8f96a76440582b0f73 MISC metadata.xml 317 BLAKE2B fbc4f3d636930729ccd570bcdcfd2ff7a12f856b6d5a39fc0d8f65870557fb950a856123beff19c601058016d7353db674221ec823a495298f37ceb295728067 SHA512 01ef8712d73a0b66562c2c90c76271c590a6d07ed3641db256e10b7a079ea21e3d7dfcc2542f3452234a7f24d81645e64172a3e745bbcf537e0e857e68a3b446 diff --git a/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild b/app-i18n/yaskkserv/yaskkserv-1.1.1-r1.ebuild index 2ddbb09ee7fc..0049ea150691 100644 --- a/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild +++ b/app-i18n/yaskkserv/yaskkserv-1.1.1-r1.ebuild @@ -20,7 +20,7 @@ RDEPEND="app-i18n/skk-jisyo !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) - systemd? ( virtual/udev[systemd] )" + systemd? ( sys-apps/systemd )" DEPEND="${RDEPEND} dev-lang/perl" |