gentoo resync : 20.06.2021

12 files changed, 42 insertions, 269 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 265193b183d6..28f9bcb7505f 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index 5814554c46e2..b7d838aea8f9 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -10,7 +10,5 @@ AUX canna.hosts 5 BLAKE2B a10fe2813bf946464641605e8cdda362629a62817de0a7f72f2b0e
 AUX canna.initd 782 BLAKE2B 1e34cfc3ed28f5903600f591e55d0eb559aa5336eee54a54a7ab40d2be3816f6a62a947e9c87d4834425f71640c96847836830439f4eeb76a4f25a372fc9d1d0 SHA512 1fd348f2aa4139bbe6154b157b75bf8a39a8ddf36a9a072088279c88241981a9af9024df71aa777ca4e93270d53d0bea8363b31cfb07d229d4a37c48828779e6
 AUX update-canna-dics_dir 1101 BLAKE2B 9b429c2ddfb0e3c2c8a754f7fb61b776abbb809f81c93127e5f8be9ec768df6c28fcce75fe69a5b92a195ce49e20572c083aca5b4309f042a50b53bffafc4042 SHA512 135fdabf3995ddf82d3f14aece908e952f3d514fd83e2f86d8113b1026b7dcaea2156225be251a6d9a74a35ee075d5ebb32c05d9deb85905120287d0af1f4207
 DIST Canna37p3.tar.bz2 1263065 BLAKE2B b5fb496c0ef71dc57b2da1409eea2238ea62ece3286d498d694bc7a18cb0f5e052dca95d692b4302988acd2199d350b893ae4aedc91aab0b737c3e0675be9cba SHA512 82846f2393aa2654dd2c97a93178098b8bd11e5409b584447f1b6fdf303adacc9802e2293cafd98b68af8b69622625ed00aa9712bf270feaa119adfdf4211158
-EBUILD canna-3.7_p3-r1.ebuild 2264 BLAKE2B cd59e7889883924274c75eabaf64ca6264456b4a0218a6e326e038d3bf7dd3df3b79679118db7a4d09741f56fcee3c19e5edd3a8edc4bde6eeaa4720c34d839b SHA512 dd51d607cff4107ae904abe906e5d0396e0bcbe53d3b1df3157680b56a95cbc336f96a006cc7ec9498db4e7dc657808749b42b549ffaa4aab755d1c5b0f87b6d
-EBUILD canna-3.7_p3-r2.ebuild 2893 BLAKE2B caf22d1d8914257992917784c03f173446e3cfa0c28aeb55a9007b07d053e33d9cc574d4f55eb253954442ab8c6f17805bf72c04113b36874a6693fe690490a2 SHA512 8c5a7660f2be089841953914fa8863d0ba9190b88c23d8266d5181c1da9e17f313e36b4448ec8009a65802b203d69c72428a640a3a2e0bf01049dffac3f12bba
-EBUILD canna-3.7_p3-r3.ebuild 3303 BLAKE2B 6fe3d13730d9f125f8458e1668cf8bbb54624d6972f5ff0aa5f8ab7f715650950be720c31490d8b7ddefcbd11dd56cc90b5622ee41c4e429ccaa7fe06df6d05a SHA512 7ed105d416e17c8ffd56157e50540f063e071d512e60e7152a0b50169ad0da310ea1f8a1b3063c2ac8c68a2e6d2060650f1971f6bfd6de61bbe5fc83f05fbee1
+EBUILD canna-3.7_p3-r4.ebuild 3336 BLAKE2B b2ff41c2a285a79be1c643d7e79275967684c609484beb5fb45f31b99d2a4dca47b908aa87b281d9def01914869935ab0eeee650833da435c21b99c1b99df5d9 SHA512 e93ffdf2f98e97ce5dfb0704daad8389576e81ec7c1d1706a7711185e9548b8dd2206642a03f07d250db96e3e6b8a66796c82eb111b366c87f62b0ea1a5671db
 MISC metadata.xml 383 BLAKE2B 2947ceefe007eb9bcfd46a69a4b97a2406383931cb320cb594b96952697378147824461f1b55d5caddc419b19aebeb1c5ce69c0f0d31568cbbbe3d1d15fba9ba SHA512 8affc10d697147ea5430d73c40eb4e7621ee9a06d444725566d4e16a28ccab4f53aed3025905894fe6cba0ea874dcf0d2d583d3dcedf3a0ccc8b139af02e5e98
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
deleted file mode 100644
index ceff59140582..000000000000
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cannadic toolchain-funcs
-
-MY_P="Canna${PV//[._]/}"
-
-DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.osdn.jp/"
-SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="x11-misc/gccmakedep
-	x11-misc/imake"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-kpdef.patch
-	"${FILESDIR}"/${PN}-overflow.patch
-	"${FILESDIR}"/${PN}-posix-sort.patch
-	"${FILESDIR}"/${PN}-Wformat.patch
-	"${FILESDIR}"/${PN}-Wformat-security.patch
-)
-DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
-
-src_prepare() {
-	default
-
-	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
-
-	# Multilib-strict fix for amd64
-	sed -i "/DefLibCannaDir/s:/lib$:/$(get_libdir):" Canna.conf
-}
-
-src_configure() {
-	xmkmf -a || die
-}
-
-src_compile() {
-	# bug #279706
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		SHLIBGLOBALSFLAGS="${LDFLAGS}" \
-		${PN}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install.man
-	einstalldocs
-
-	dodir /usr/share/man{,/ja}/man8
-	local man mandir
-	for man in cannaserver cannakill ; do
-		for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do
-			mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
-		done
-	done
-
-	# for backward compatibility
-	dosbin "${FILESDIR}"/update-canna-dics_dir
-
-	keepdir /var/lib/${PN}/dic/{user,group}
-	fowners bin:bin /var/lib/${PN}/dic/{user,group}
-	fperms 0775 /var/lib/${PN}/dic/{user,group}
-
-	insinto /var/lib/${PN}/dic/dics.d
-	newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
-
-	keepdir /var/log/${PN}
-
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	insinto /etc
-	newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
-}
-
-pkg_postinst() {
-	update-cannadic-dir
-
-	if ! locale -a | grep -iq "ja_JP.eucjp"; then
-		elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
-		elog
-		elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
-		elog "# locale-gen"
-		elog
-	fi
-}
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
deleted file mode 100644
index a06d55f21d76..000000000000
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cannadic toolchain-funcs
-
-MY_P="Canna${PV//[._]/}"
-
-DESCRIPTION="A client-server based Kana-Kanji conversion system"
-HOMEPAGE="http://canna.osdn.jp/"
-SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
-
-LICENSE="MIT GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc ipv6"
-
-DEPEND="x11-misc/gccmakedep
-	x11-misc/imake
-	doc? (
-		app-text/ghostscript-gpl
-		dev-texlive/texlive-langjapanese
-		dev-texlive/texlive-latexrecommended
-	)"
-RDEPEND=""
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-gentoo.patch
-	"${FILESDIR}"/${PN}-kpdef.patch
-	"${FILESDIR}"/${PN}-overflow.patch
-	"${FILESDIR}"/${PN}-posix-sort.patch
-	"${FILESDIR}"/${PN}-Wformat.patch
-	"${FILESDIR}"/${PN}-Wformat-security.patch
-)
-DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
-
-src_prepare() {
-	default
-
-	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
-
-	sed -i \
-		-e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
-		-e "/UseInet6/s:0:$(usex ipv6 1 0):" \
-		Canna.conf
-}
-
-src_configure() {
-	xmkmf -a || die
-
-	if use doc; then
-		cd doc/man/guide/tex
-		xmkmf -a || die
-		cd - > /dev/null
-	fi
-}
-
-src_compile() {
-	# bug #279706
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		CDEBUGFLAGS="${CFLAGS}" \
-		LOCAL_LDFLAGS="${LDFLAGS}" \
-		SHLIBGLOBALSFLAGS="${LDFLAGS}" \
-		${PN}
-
-	if use doc; then
-		# NOTE: build fails if infinality enabled in fontconfig
-		einfo "Compiling DVI, PS, and PDF documents"
-		# bug #223077
-		emake -C doc/man/guide/tex -j1 \
-			JLATEXCMD="platex -kanji=euc" \
-			DVI2PSCMD="dvips" \
-			VARTEXFONTS="${T}"/fonts \
-			${PN}.ps \
-			${PN}.pdf
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install.man
-	einstalldocs
-
-	dodir /usr/share/man{,/ja}/man8
-	local man mandir
-	for man in cannaserver cannakill ; do
-		for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do
-			mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
-		done
-	done
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/man/guide/tex/${PN}.{dvi,ps,pdf}
-	fi
-
-	# for backward compatibility
-	dosbin "${FILESDIR}"/update-canna-dics_dir
-
-	keepdir /var/lib/${PN}/dic/{user,group}
-	fowners bin:bin /var/lib/${PN}/dic/{user,group}
-	fperms 0775 /var/lib/${PN}/dic/{user,group}
-
-	insinto /var/lib/${PN}/dic/dics.d
-	newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
-
-	keepdir /var/log/${PN}
-
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
-	insinto /etc
-	newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
-}
-
-pkg_postinst() {
-	update-cannadic-dir
-
-	if ! locale -a | grep -iq "ja_JP.eucjp"; then
-		elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
-		elog
-		elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
-		elog "# locale-gen"
-		elog
-	fi
-}
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild b/app-i18n/canna/canna-3.7_p3-r4.ebuild
index 5550c3d89b3e..a5e3cf174d49 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit autotools cannadic toolchain-funcs
 
@@ -10,17 +10,20 @@ MY_P="Canna${PV//[._]/}"
 DESCRIPTION="A client-server based Kana-Kanji conversion system"
 HOMEPAGE="http://canna.osdn.jp/"
 SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="canuum doc ipv6"
 
-RDEPEND="canuum? (
+RDEPEND="
+	canuum? (
 		dev-libs/libspt
 		sys-libs/ncurses:=
 	)"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	x11-misc/gccmakedep
 	x11-misc/imake
 	canuum? ( virtual/pkgconfig )
@@ -29,7 +32,6 @@ DEPEND="${RDEPEND}
 		dev-texlive/texlive-langjapanese
 		dev-texlive/texlive-latexrecommended
 	)"
-S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-gentoo.patch
@@ -40,7 +42,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-Wformat.patch
 	"${FILESDIR}"/${PN}-Wformat-security.patch
 )
-DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
 
 src_prepare() {
 	default
@@ -48,13 +49,12 @@ src_prepare() {
 	sed -i \
 		-e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
 		-e "/UseInet6/s:0:$(usex ipv6 1 0):" \
-		${PN^c}.conf
+		${PN^c}.conf || die
 
 	if use canuum; then
-		cd canuum
-		mv configure.{in,ac}
+		cd canuum || die
+		mv configure.{in,ac} || die
 		eautoreconf
-		cd - > /dev/null
 	fi
 }
 
@@ -62,17 +62,17 @@ src_configure() {
 	xmkmf -a || die
 
 	if use canuum; then
-		cd canuum
+		pushd canuum >/dev/null || die
 		xmkmf -a || die
 		# workaround for sys-libs/ncurses[tinfo]
-		sed -i "/^TERMCAP_LIB/s:=.*:=$($(tc-getPKG_CONFIG) --libs ncurses):" Makefile
-		cd - > /dev/null
+		sed -i "/^TERMCAP_LIB/s:=.*:=$($(tc-getPKG_CONFIG) --libs ncurses):" Makefile || die
+		popd >/dev/null || die
 	fi
 
 	if use doc; then
-		cd doc/man/guide/tex
+		pushd doc/man/guide/tex >/dev/null || die
 		xmkmf -a || die
-		cd - > /dev/null
+		popd >/dev/null || die
 	fi
 }
 
@@ -83,7 +83,7 @@ src_compile() {
 		CDEBUGFLAGS="${CFLAGS}" \
 		LOCAL_LDFLAGS="${LDFLAGS}" \
 		SHLIBGLOBALSFLAGS="${LDFLAGS}" \
-		${PN}
+		canna
 
 	if use canuum; then
 		einfo "Compiling canuum"
@@ -102,14 +102,15 @@ src_compile() {
 			JLATEXCMD="platex -kanji=euc" \
 			DVI2PSCMD="dvips" \
 			VARTEXFONTS="${T}"/fonts \
-			${PN}.ps \
-			${PN}.pdf
+			canna.ps \
+			canna.pdf
 	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install install.man
 	einstalldocs
+	dodoc *CHANGES* INSTALL* RKCCONF* WHATIS*
 
 	if use canuum; then
 		emake -C canuum DESTDIR="${D}" install install.man
@@ -118,27 +119,26 @@ src_install() {
 	fi
 
 	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins doc/man/guide/tex/${PN}.{dvi,ps,pdf}
+		dodoc doc/man/guide/tex/canna.{dvi,ps,pdf}
 	fi
 
 	# for backward compatibility
 	dosbin "${FILESDIR}"/update-canna-dics_dir
 
-	keepdir /var/lib/${PN}/dic/{user,group}
-	fowners bin:bin /var/lib/${PN}/dic/{user,group}
-	fperms 0775 /var/lib/${PN}/dic/{user,group}
+	keepdir /var/lib/canna/dic/{user,group}
+	fowners bin:bin /var/lib/canna/dic/{user,group}
+	fperms 0775 /var/lib/canna/dic/{user,group}
 
-	insinto /var/lib/${PN}/dic/dics.d
-	newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
+	insinto /var/lib/canna/dic/dics.d
+	newins "${ED}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir
 
-	keepdir /var/log/${PN}
+	keepdir /var/log/canna
 
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/canna.confd canna
+	newinitd "${FILESDIR}"/canna.initd canna
 
 	insinto /etc
-	newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
+	newins "${FILESDIR}"/canna.hosts hosts.canna
 }
 
 pkg_postinst() {
@@ -147,7 +147,7 @@ pkg_postinst() {
 	if ! locale -a | grep -iq "ja_JP.eucjp"; then
 		elog "Some dictionary tools in this package require ja_JP.EUC-JP locale."
 		elog
-		elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
+		elog "# echo 'ja_JP.EUC-JP EUC-JP' >> ${EROOT}/etc/locale.gen"
 		elog "# locale-gen"
 		elog
 	fi
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index a73fcc8d9387..a9fe36840623 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -6,8 +6,8 @@ DIST librime-1.5.3.tar.gz 2847083 BLAKE2B 4ffb2c5ddaf52f9c9227fa4ea019ef2965e611
 DIST librime-1.6.0.tar.gz 2856645 BLAKE2B de6d843a5028f6b0308c3432ada7dd00c08a71e73fe799b157fd71a4054c757a00d3b0fdc7743d94d6e87b03f256e822ee29c16c86f96f5d24c7d864266c4f78 SHA512 4aeace0f1628293d4b607483ab976841093a1ff03df8bf63d545715af00254d1f0b1bdcd120795ea688d152287069881e0740372f40e2174a14ae6f53b7f950b
 DIST librime-1.6.1.tar.gz 2856751 BLAKE2B c6b01342dcc9e8ee571cb14a36b851a50bf7b191211197421647ab05e6fa64c676f8936920870dcc335d06c635e354fed706832e41192bccd0a17aff02df1a43 SHA512 944361e9459662bb97b97ce9e2651acf0beb368b3769d1b9576cf4e5c2779302cae470fa39f5bc262cabb6a0e8590bcb77d32ffc87d7385b9465869fe7d5bcb3
 DIST librime-1.7.3.tar.gz 2859513 BLAKE2B 834622860cdc3038d1b983f476bca70f211dfbc3bc2b565a998163e22688841ee3a0c7f9a64bce285e2f3f5b5a9a802bd5506f17904ccb3291babf80d4748fb5 SHA512 8767d17c3d14a5a1bbb8269fab1627b907de72c288b362fdbc6191223937da21e8b18471b4ae8f83ce5afc0ec5c3ab12fbcb49930eb9969c1764c7390d9ee4b0
-EBUILD librime-1.5.3-r1.ebuild 1598 BLAKE2B e2bea3ac09fb0f5f132382caa6a37b8fc3e674688fbbba71e68a5a48e1375248633ec5de170030a5d734f18e294aeb8c3b2b2cba9d033c56bdd88e9709c14c1d SHA512 9c389f0f4ad573bada9c18bdfb3af3cac4f17e42f3bc1fe5d308fed123a3458a28e243f0ac4134753d24b1cbffb644707adbf693fc0f01d5fbc5eb25177bf416
-EBUILD librime-1.6.0.ebuild 1635 BLAKE2B 13cf817648886c13fc1c6c3913c9bdce4a3c1947928a70a5d904b6dd8160905e1e9651c6bd758a6c6711c7d37781776af75c90b4f7e22bdc6bf4b218e44bac6f SHA512 ff4577d82f8c7e00a565ebae6d8a6b9ad3ad49f33319de9c65c9b50c8599b00ad71ae69f9d304aee217458df858ce78a4557fa52d3f8943281ef9d1633f327d1
-EBUILD librime-1.6.1.ebuild 1635 BLAKE2B d69511b155960827c1d9a058132c5b9e36d03021688aadf7f42634526f10f4f0fe860b93b81dadf35da6486f8322cdf10d1d26912eba0cd172d4da764f77272c SHA512 c8766ba24f6b5f52cd200655796bc3621d4fe51fc115ad97ba59638c2c1d8ab9e5856832159c6c48854826a6ac8f6f338f9fa49f3325e5e2faad51a5b7838ab5
-EBUILD librime-1.7.3.ebuild 1585 BLAKE2B 6ce009eeb9308f28720b6d395d5b7c3a688c6c90dafb5cd689703ccfc71277019193f574404e1169f644487f737824c46bd7c1ac9b81fc5ae4db17df2ae90b62 SHA512 7b47c9ed42c26998bf361b617636dc3b768752db2865dfd3b1654da20bf476bfa292abe4681502ac54f627ee263023354b4bb5ddac0f53dd96cc8327025c05f9
+EBUILD librime-1.5.3-r2.ebuild 1601 BLAKE2B d7ab84518a7a37902153c06dd0c981e19e18f2a0ca73794a00a1194149746a93e6ade1e38138dc401b61e6f891da71ebcea709a3c4d2ec8e4fac302121cdb71b SHA512 9d8d92d930c405e070a6b9f62b19ed53e3a62a93ea758544c0016dbc62c23a3eed1e69a7e0c0fa09db642080cfe7c28494b253782c6c33f9becf752e3b5b288d
+EBUILD librime-1.6.0-r1.ebuild 1638 BLAKE2B 2155119e681abc5ab398b4f57d58e76af843e6fb17c0da5d5f245fa0c989dc888e6b428498b4018169dcce006398750fc312ce5b13c24130cefb662feae53dfc SHA512 e0992fec585f86ffefd35f010f60d409b00f24b231ffabb6a3b399ef23a1c158e9c4b7ac37e8afde105d6f8e314bd5d107f0f47c074d5ba31f5146ed6ba1879f
+EBUILD librime-1.6.1-r1.ebuild 1638 BLAKE2B c6fe9446a4dd687eb08eb5cf1aeee48fa45d07591332abb1bf0cc4950da1052074f62ac3ef6421b4c184a98dfacb0cbde943dbf5568988c286bd9bd64941b624 SHA512 9eb3c343c7ee4594efce9b2d653fd07f37c987fd8e0be36dd745a339262c4212235b83e4637cb4c2c6af2acbd990fd51dc6c359d4aa115311ff7ff1c602112a8
+EBUILD librime-1.7.3-r1.ebuild 1588 BLAKE2B e5e7e3cc52de0696bfc1acc5962a3dd086cb05064f78510a89ee58ba20d688805064da50e6bff12ab4b188bfa2793ae374d58832ab541feef26d2f0e0ea09e30 SHA512 06c82afa2e13745477d41c9934b77ef7f6dc1739e7128838d45c2f2fdb41346d9779d5d777433cf872d53edbb0e853dba3524719b48acd769ddb882c348822c4
 MISC metadata.xml 776 BLAKE2B b362c5696516b756bb9c9c3102d7d5f52f843807d523f26bb12adb6b2c077f98c0aaa2d5d7d87c0a413b8ed69994f35a7fb02db423592ffc5529150df4253f83 SHA512 1bf10d3e1394b0f9512cfe564dfa4eac007e5b343831a482764f1c7c99500ad55cd99e10f07a4428c67fb262b80a2e2be41f9c36f3a937f5521c72d969403817
diff --git a/app-i18n/librime/librime-1.5.3-r1.ebuild b/app-i18n/librime/librime-1.5.3-r2.ebuild
index e05bb22da525..bec00f1025a0 100644
--- a/app-i18n/librime/librime-1.5.3-r1.ebuild
+++ b/app-i18n/librime/librime-1.5.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -30,7 +30,7 @@ BDEPEND=""
 RDEPEND="app-i18n/opencc:0=
 	>=dev-cpp/glog-0.3.5:0=
 	dev-cpp/yaml-cpp:0=
-	dev-libs/boost:0=[nls,threads]
+	dev-libs/boost:0=[nls,threads(+)]
 	dev-libs/leveldb:0=
 	dev-libs/marisa:0="
 DEPEND="${RDEPEND}
diff --git a/app-i18n/librime/librime-1.6.0.ebuild b/app-i18n/librime/librime-1.6.0-r1.ebuild
index c3c438bc80de..77cc61ea01a8 100644
--- a/app-i18n/librime/librime-1.6.0.ebuild
+++ b/app-i18n/librime/librime-1.6.0-r1.ebuild
@@ -30,7 +30,7 @@ BDEPEND="dev-libs/capnproto:0"
 RDEPEND="app-i18n/opencc:0=
 	>=dev-cpp/glog-0.3.5:0=
 	dev-cpp/yaml-cpp:0=
-	dev-libs/boost:0=[threads]
+	dev-libs/boost:0=[threads(+)]
 	dev-libs/capnproto:0=
 	dev-libs/leveldb:0=
 	dev-libs/marisa:0="
diff --git a/app-i18n/librime/librime-1.6.1.ebuild b/app-i18n/librime/librime-1.6.1-r1.ebuild
index e1a0804e63a9..0f2a5d3dbec4 100644
--- a/app-i18n/librime/librime-1.6.1.ebuild
+++ b/app-i18n/librime/librime-1.6.1-r1.ebuild
@@ -30,7 +30,7 @@ BDEPEND="dev-libs/capnproto:0"
 RDEPEND="app-i18n/opencc:0=
 	>=dev-cpp/glog-0.3.5:0=
 	dev-cpp/yaml-cpp:0=
-	dev-libs/boost:0=[threads]
+	dev-libs/boost:0=[threads(+)]
 	dev-libs/capnproto:0=
 	dev-libs/leveldb:0=
 	dev-libs/marisa:0="
diff --git a/app-i18n/librime/librime-1.7.3.ebuild b/app-i18n/librime/librime-1.7.3-r1.ebuild
index 44959fdbee64..568aa94ae707 100644
--- a/app-i18n/librime/librime-1.7.3.ebuild
+++ b/app-i18n/librime/librime-1.7.3-r1.ebuild
@@ -30,7 +30,7 @@ BDEPEND="dev-libs/capnproto:0"
 RDEPEND="app-i18n/opencc:0=
 	>=dev-cpp/glog-0.3.5:0=
 	dev-cpp/yaml-cpp:0=
-	dev-libs/boost:0=[threads]
+	dev-libs/boost:0=[threads(+)]
 	dev-libs/capnproto:0=
 	dev-libs/leveldb:0=
 	dev-libs/marisa:0="
diff --git a/app-i18n/skkfep/Manifest b/app-i18n/skkfep/Manifest
index 9d32e31c51fb..664ee4c6b723 100644
--- a/app-i18n/skkfep/Manifest
+++ b/app-i18n/skkfep/Manifest
@@ -2,5 +2,5 @@ AUX skkfep-annotation.patch 540 BLAKE2B af0332372b17175124477c494a2f09d0bb688a63
 AUX skkfep-gentoo.patch 1836 BLAKE2B f8430c997bbdd192446e952ebbbb141b7de2b12b10ce6f6e63c7ede577719033b7969e6fde4a685717ea78a6f5e02be3c1f51a3ad058a6f31b6cb60e590822ee SHA512 7af2a73f36277fd99d9ab42e928183be4db00de665d3d4b51b6735ca7cdb9259aa1ecb6572b87732b6af865c7f04122fa3341543d9feea89081a1b53b3e58298
 AUX skkfep-system-dic.patch 325 BLAKE2B 2b13ae10b3be26a5674d69ec558351aed6ee4c56a22141d1220f9840e384b22c65583439e913ac9fddd128cd88fc1695eeb202b495558d0e89b283f1253d000a SHA512 af149e67e9b8fc727404bc67e50eeaf3ba37effccd73cd9416279631bd1c000685c129ddcdbd909ef1d1dbd4e84ac4efb0d3236b988c9c9b9416342edb005254
 DIST skkfep-0.87.tar.gz 45711 BLAKE2B ed2d9a7f779ba09fe71b023de395a37a84be81a7e70de7dcd0b04494c44319f067d19182e762b9a48395c08587b353457ffa8bdb84b5e0526880d6c735ffef53 SHA512 3dc842559640b56b967679042c31bfa889e66cd6b7d0347ec17ddc606b85f2a4bb49dc995b3b38c30e71f500031714e2083bfc028ad4ff76ac4f07476a3f2469
-EBUILD skkfep-0.87-r1.ebuild 1100 BLAKE2B 44454f8eac5b1f006f30012c07978238db9642d7d33abfa6647fad6db886242cda82a51533a29ef191cb585ac06e9bc5e320b73762b36140c629b4494e13843f SHA512 75a768831dd95b1851c8dfb2090fa4de2d5d0df5663e6972ff6e31d35f888727c716dba8bf09b70029ab08c097b436b7dd25023d5fa504eb5bfd6c9022ba557e
+EBUILD skkfep-0.87-r1.ebuild 1101 BLAKE2B 6999f3d8d99f39cf4c64143b699bbaa9ec8e001d84bc201567e04197048eca0fdc03fbd28ce283b5776bb890970e398741122bf8fe36c714fddb8d2331154236 SHA512 377fc37e4a66c38bd8ec3dc9d92a87ccb658e46c2e923b47136f2e80812fa2f5a1cf54fa31f2b6569216dd2fa0fe449711335c51e60afea71ace28c05518f514
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/app-i18n/skkfep/skkfep-0.87-r1.ebuild b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
index 7fc8f7512158..dd9870453969 100644
--- a/app-i18n/skkfep/skkfep-0.87-r1.ebuild
+++ b/app-i18n/skkfep/skkfep-0.87-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -26,6 +26,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-system-dic.patch
 	"${FILESDIR}"/${PN}-annotation.patch
 )
+
 DOCS=( README HISTORY TODO )
 
 src_prepare() {