gentoo resync : 25.08.2020

3 files changed, 4 insertions, 85 deletions

diff --git a/app-i18n/yaskkserv/Manifest b/app-i18n/yaskkserv/Manifest
index 6bc36079f5c6..b08022c09094 100644
--- a/app-i18n/yaskkserv/Manifest
+++ b/app-i18n/yaskkserv/Manifest
@@ -2,8 +2,6 @@ AUX yaskkserv-gentoo.patch 5013 BLAKE2B 5eed1d31e9ded20e2736747afdf7b646daf91825
 AUX yaskkserv.confd 280 BLAKE2B 465561acdcf1daa1589d84a74708ceff777dee5ed04510e2ca04bac2dbd034d1a5847476b68844bbd819f6818b8b1a07c52404548d417a8db30737ca7f235eb2 SHA512 dd9c906937814a1e59d92d80427e4ba97b2ff8e0a3d26dc457b882693de30ad5db5aa7941b948f876d7ef90b402bd4c42142eac3caca29f6976197463597a835
 AUX yaskkserv.initd 341 BLAKE2B 1e26304d24ecb6a931936ff06d9f24bb92b4aa01a3ea7d5db0ec7cd12c48c062f5ce664624b51592d87bb971cb82855fbc2220ca82cd6d0f4d55172e7ba2b0f5 SHA512 2fd63604283c811c7f6fe192e3d8f2b5b3542106b54d39707aa8d6116328634ae43421d6a620fcd1555cdbd53985b2444a381bc32e071cac7e040f6a337a3d8e
 AUX yaskkserv.service 277 BLAKE2B 7755728e443ceccdd359864bea9e9e25926c860f13fb3acbecebfdedd919db7fd65ecc1e922f662dc676b2aa90b325a7aaed049abcae9291602f0bb5097b0015 SHA512 8ff4aa6ec41c3df17f560de157a60cd3bf3fcc03a2613c603d533f2891207b7001e2469dd3e9ac8c8cfc7ab5909978467922906e22ba4b4635627b234008ce32
-DIST yaskkserv-1.1.0.tar.xz 75108 BLAKE2B ac567d4715d1767f0690462de934768335eafe4a61010534c16b430876f81ce43ac175dcc0a2546af996dd0bef8fd4c744b475985365abe3d571a4ed3f1c3a4c SHA512 9956a9b2fe587491b7c5f76482f13f91d1c87d445f2ff7effa5ffb68efe076f54f1c63e95b980d889963ac507ed49fa37f76f9deb239da7b7409da5be025c000
 DIST yaskkserv-1.1.1.tar.xz 75136 BLAKE2B b5a26e7d12951d9256e050d543338a48a61e9b6883a0866e4f7a2d367783a5757a5a12cdd810a87e84ade5bfebdc9c24eb093c09081e1d9099ce848d435eb45e SHA512 5f421ef684011aed716e929b90ab98fb1703abe707928847d79a34815750d59df59f4dec8bef6e8ce399340aedb32688d6dd8a5d02ba9372a935ec8f1adffc29
-EBUILD yaskkserv-1.1.0.ebuild 1579 BLAKE2B 7e490c06545e15ed6884d9b4f43eeb02e4445a5cf2728ad94a90afac8b4aeccd2b4e577f1fc6cbe10db81bbf6db51f2e68cfc6676ce5d10d05ead6e27feb2124 SHA512 6e3ae4f95f14765307ec861065d7e6f818b09f812b7a437ead85fe12f91a592f923460c963578e351214f07aa01e5d79b3c6fb53b4fb5fb2a221566239342600
-EBUILD yaskkserv-1.1.1.ebuild 1581 BLAKE2B 2e86f01a8244d264e941558858d017530d1474419246a9450429878a86b60c4e2c3c132c0a2e2c7fc916431e91a7ef66c655d29803ab5d39b20235c19f184cc9 SHA512 86c2ffe07cbb754059744700670034b543cabf01c67d8fbf0dd1847c253703b611a70da184b2163ee62efbf3ab8667b651029286354cab2a2f048bece0286251
+EBUILD yaskkserv-1.1.1.ebuild 1579 BLAKE2B 5bde86a8bb87008d8018eefa160f0bfe27bbd93c7d5531cd67fb5dfca42396e26e55ea43fcd4f1a965d44d938fec06784c44dcae5b37cfdb8b7cd120626d8380 SHA512 ee4eb587834d1b8054dd5d7e0f0a4112e84c3cc53b5c27cd241cb5f9bca0edbf7ed667386931dd0863adeab002d4738fd5fb42f49c4cf8aac5375d9569603a8a
 MISC metadata.xml 317 BLAKE2B fbc4f3d636930729ccd570bcdcfd2ff7a12f856b6d5a39fc0d8f65870557fb950a856123beff19c601058016d7353db674221ec823a495298f37ceb295728067 SHA512 01ef8712d73a0b66562c2c90c76271c590a6d07ed3641db256e10b7a079ea21e3d7dfcc2542f3452234a7f24d81645e64172a3e745bbcf537e0e857e68a3b446
diff --git a/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild b/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild
deleted file mode 100644
index 2724f1e528e5..000000000000
--- a/app-i18n/yaskkserv/yaskkserv-1.1.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs systemd
-
-DESCRIPTION="Yet Another SKK server"
-HOMEPAGE="http://umiushi.org/~wac/yaskkserv/"
-SRC_URI="http://umiushi.org/~wac/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gnutls libressl systemd"
-
-RDEPEND="app-i18n/skk-jisyo
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	systemd? ( virtual/udev[systemd] )"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
-
-PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
-HTML_DOCS=( documentation/. )
-
-src_configure() {
-	econf \
-		$(use_enable gnutls) \
-		$(use_enable systemd) \
-		--compiler="${tc_getCXX}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install_all
-	einstalldocs
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	systemd_dounit examples/${PN}.socket
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-yaskkserv_update() {
-	local f
-	for f in "${ROOT}"/usr/share/skk/SKK-JISYO.*; do
-		case ${f} in
-		*.cdb)
-			;;
-		*.${PN})
-			[[ -f ${f%.*} ]] || rm -f "${f}"
-			;;
-		*)
-			[[ ${f} -nt ${f}.${PN} ]] && ${PN}_make_dictionary "${f}" "${f}.${PN}"
-			;;
-		esac
-	done
-}
-
-pkg_postinst() {
-	yaskkserv_update
-
-	elog "You need to run:"
-	elog "  emerge --config =${CATEGORY}/${PF}"
-	elog "after updating app-i18n/skk-jisyo from next time."
-}
-
-pkg_postrm() {
-	rm -f "${ROOT}"/usr/share/skk/SKK-JISYO.*.${PN}
-	rmdir "${ROOT}"/usr/share/skk 2>/dev/null
-}
-
-pkg_config() {
-	yaskkserv_update
-}
diff --git a/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild b/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild
index 8faf1afe8655..2ddbb09ee7fc 100644
--- a/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild
+++ b/app-i18n/yaskkserv/yaskkserv-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,7 +11,7 @@ SRC_URI="http://umiushi.org/~wac/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnutls libressl systemd"
 
 RDEPEND="app-i18n/skk-jisyo
@@ -31,7 +31,7 @@ src_configure() {
 	econf \
 		$(use_enable gnutls) \
 		$(use_enable systemd) \
-		--compiler="${tc_getCXX}"
+		--compiler="$(tc-getCXX)"
 }
 
 src_install() {