gentoo resync : 04.05.2021

5 files changed, 7 insertions, 9 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 17e528088efe..1a8fc3675e3c 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 1d0a83811e9e..bb7f9b892656 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -6,5 +6,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 5594 BLAKE2B e0d5a44d15d8aa3c3be61fc9b7e8623c8cc6dccbc3a15c8815f994d78d46b43b0cf3b22be1387fad6e31415abcec35db74c1ea1fae0b8c7a64a1c729a341a0cf SHA512 15826bacc58a89019cf23e8cdbe1491dc84b66739df06c50f7d31123b68f9fade1df76dc30c0ad139f94d58c20738f56f15660241c25134ea71f9ca09a7012a8
+EBUILD uim-1.8.8.ebuild 5533 BLAKE2B d7fe314c7709d6e17802f064295ca300a6601d53865d9a45b2aa918c3f6c0c03ad71f371f5adc57b746cd1d697246903d502fcf31d92c7cbe0663cdaea42f0ba SHA512 f735c01f5053df6dd09ad8d852a583d90e5fe562a777f5af88f7d88808467db5cadfbb2f59ff8746a9b2d323505a58f6139b5d79f48927785d52b63f83e09df1
 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 2f6435d4dcfe..e658b221ed76 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
 RESTRICT="test"
 REQUIRED_USE="gtk? ( X )
 	gtk2? ( X )
@@ -38,8 +38,7 @@ COMMON_DEPEND="
 	skk? ( app-i18n/skk-jisyo )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 	X? (
 		x11-libs/libICE
diff --git a/app-i18n/yaskkserv/Manifest b/app-i18n/yaskkserv/Manifest
index 69eb64f1894e..b28aef5f9864 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-r1.ebuild 1574 BLAKE2B 2441bdc45243b20f304bb56ae535d507229b43cd049dde520dc10c5d0cfc9d58c8dbfd60d3e3e210808f478f7303485183e4d285d2ff0fcfcc765e59e7434007 SHA512 d117b601719d8ab71aed6c3d56f152631f8768d26ccffcc8a6b05b0c3a32a78eae73ef347710b573d62726a5469e3cc6b0e54e9b31668c8f96a76440582b0f73
+EBUILD yaskkserv-1.1.1-r1.ebuild 1513 BLAKE2B ddcfd2a254b8564aeb8cb2951bfaf083f8e1234f7bd174f1207a50be538428488bc146da24a51a2442ca65b6838079944b52f9eb4191ab5382eb5c1a2f6cc572 SHA512 9d65274497ed7644e9ef47ab1c4368ca8095a948da98689192205a960c54b9bc40e5ec76480231e9fb688dda1838d4d3a5eaf9a8645f1157feb25a43149e7abc
 MISC metadata.xml 317 BLAKE2B fbc4f3d636930729ccd570bcdcfd2ff7a12f856b6d5a39fc0d8f65870557fb950a856123beff19c601058016d7353db674221ec823a495298f37ceb295728067 SHA512 01ef8712d73a0b66562c2c90c76271c590a6d07ed3641db256e10b7a079ea21e3d7dfcc2542f3452234a7f24d81645e64172a3e745bbcf537e0e857e68a3b446
diff --git a/app-i18n/yaskkserv/yaskkserv-1.1.1-r1.ebuild b/app-i18n/yaskkserv/yaskkserv-1.1.1-r1.ebuild
index 0049ea150691..3c066aaf0e88 100644
--- a/app-i18n/yaskkserv/yaskkserv-1.1.1-r1.ebuild
+++ b/app-i18n/yaskkserv/yaskkserv-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,13 +12,12 @@ SRC_URI="http://umiushi.org/~wac/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="gnutls libressl systemd"
+IUSE="gnutls systemd"
 
 RDEPEND="app-i18n/skk-jisyo
 	gnutls? ( net-libs/gnutls:= )
 	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)
 	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}