gentoo resync : 03.07.2021

6 files changed, 218 insertions, 16 deletions

diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest
index f4216fee6fcf..f750a6c74485 100644
--- a/app-i18n/tagainijisho/Manifest
+++ b/app-i18n/tagainijisho/Manifest
@@ -1,14 +1,18 @@
 DIST JMdict-2020-07-01.gz 19735470 BLAKE2B 06126c07516241af6789c3427ebe68ce6da3a5116414f8d1cd5248c18319a4b302ec241499c36b380e3a49f43cac2b381e4130d2bae4a7b100de76724786eadd SHA512 08c3feed364666dfbf87c73ac5da20a7eaa414e7fde274f314b058a6b268cc197b834225aed57cea74f6cdc95f374031c1a87ee9e3023f421ed9f3f1af4ca1d0
 DIST JMdict-2020-10-01.gz 19845877 BLAKE2B f75e9cb1096c1f35276606119d1f0e1cf2687f69d9afe2bced55a6b75aa8ada0c8f245e05e8f7246d73463ed895cd232f1ee30ccd639cb32801c51cbc9a56dcc SHA512 4e6490eda15928a48cbfff59bf73d21dea19d2e80dffce70f65a247b0a9393bea787c8378b06b7e7c807eeb9a296971efac9f3ec2d3ab6771c7a016e0e747113
 DIST JMdict-2021-04-01.gz 20023736 BLAKE2B 57c2114550882729022cc639606f4512f7670e906f1e362e2fa3e40adb3fd10734e198f6703a7c372fe42fd61d620534c13fb702706e57cc9f40bce061c8218f SHA512 8791b7a1fa2a1e43c07b73d51395de2f1b0e52dfa84463b9e451b79e54a3af676dc0b11a99526987476b1ad167b1ace4d75134484469a927a8f8386e5478f7ca
+DIST JMdict-2021-07-01.gz 20106907 BLAKE2B 0a56834241f4a908b05e99f21917149d161b40a190d271d4477ec18b3b4972648142ab6db3b45fd290caa9d99b1e0a946e16e165dbeabe8eda73a4c9f6d7d286 SHA512 b7217ca9d25601733b03bc0193c1fd3a206b11a20731c2b52650cd5de626d02a486f089464e7c85f3525bd392b64b5c2f5348d752a791df46c06805ee082a42b
 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 kanjidic2-2021-04-01.xml.gz 1487178 BLAKE2B 81e05d3d80bea1eec64e4af80b195dce2f3396a3c70f359fb27e7db68ab6f5a177b732bfeef53d9ba6af8cfdf860f130d6077b853bfb6e7e3b7eeb4fe3028915 SHA512 c3e617878f1f9da46580a93e47a669ba90a84ebf25790fdc40ee56f6a39cd704941a6f068708bd106e81f63fb34ca5b5992c758cc3f898fbed038fd4181ac437
+DIST kanjidic2-2021-07-01.xml.gz 1487197 BLAKE2B f2fc6cc033c4615cdc0699970f2fd022ea7dab0ec8358eb6baa031e54b8dab4d766410b136e96ce9fe2120b1e2a8362bf8c902bcc9037335745dac24e4cebba5 SHA512 f64d4f207a402b40f02c05a21ba4edb38b74277fecd11694643e2fc4a5857720583a9553e21c9502ff98cb8d17c606f4d24e29b9d939b36d65ae3538d0fa8063
 DIST kanjivg-20160426.xml.gz 3587660 BLAKE2B c85291f3671f0980186e8deb296cfa743322df438d6f09fd69a4f5a30c3db6f097d6ff0a817b88c5c9a2c8d4a40c90b31c0a54cb71d681849b557ee364707c48 SHA512 1d35a8cc5d4947f6bedfc71a2f08e2d1fda832d7a02588c00953e1746812b0e51d4d1c39dff49999b4f65ec850788359f6e0d1465f0e688b1bf753c4c67b3c54
 DIST tagainijisho-1.2.0_pre20200118132551.tar.gz 3635265 BLAKE2B f8f831f698bf0ca56c57e8343adee92d3b42842c95fb971c9d8696eaf660ce458d8fd2108ab4568463bed6711c5295d27efc34f2fab512c3d0bc2a11a4f76c1b SHA512 14d6fc5ce891437159ca2b3db53c776420a6d4e305f6753c7ccf5ce773d43fa31f875ee9582c9db1fe05364b18772cec43dd046a6492b6eb45c12b62f7d60407
 DIST tagainijisho-1.2.0_pre20210313131524.tar.gz 3639618 BLAKE2B f2dbb376dddf76b27a01b9a06309ed048d8e6bae7022a027b3da3b93f39c9bce63d0e5e06dd04434d61742213e48930643c9a81ca9102ca4202f6261404179f1 SHA512 3775bbc34bf3bef0604b6b18fcee7d2698f567002e23707205d2ee256f518514ad16d27d5cdb1cc5e6d42063b1532ab4b59cdb49d2934973cb6557e77e9b7a07
-EBUILD tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild 6715 BLAKE2B e28afaae3fd0e81c806ee428859e2bb4d035a749608830378af3a7ccb5b5dde7d4838c2bc59e263e6f482a9ba6bc1542113e0d2da21ed18297e476270682b2a7 SHA512 941f9a6bfbc7beedab9d2c28a49de13e8b53db25cd5ecbb67c0436d3ceb86c7173320a58dffee5a6e7446fbc5c1351b992138a8146d2b0e31af4d1d566679e82
-EBUILD tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild 6715 BLAKE2B e28afaae3fd0e81c806ee428859e2bb4d035a749608830378af3a7ccb5b5dde7d4838c2bc59e263e6f482a9ba6bc1542113e0d2da21ed18297e476270682b2a7 SHA512 941f9a6bfbc7beedab9d2c28a49de13e8b53db25cd5ecbb67c0436d3ceb86c7173320a58dffee5a6e7446fbc5c1351b992138a8146d2b0e31af4d1d566679e82
-EBUILD tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401.ebuild 6717 BLAKE2B 79ead4200ad6d1bfdc41c8a3a0199269ff575bf96f4ae3a61ee28e65aa92b032885900caaa87de38975bd8a32970ba2c22d3d4ab89a620a354825a4f421fb4a6 SHA512 fb786c1200ff3f986016dfac25ef01848da0cef5096f3c964e083dc155161a5c1cd9d2f219de3d63c3cbdb07e53d65dfbf83c19e8615860e5f4657297ac883aa
-EBUILD tagainijisho-9999.ebuild 6666 BLAKE2B 77c8872a93d3cf327a8b72d547d9a8827d2a2020b66b0c342b4fa6bac68896a968b7cd4dd26cb42a2d55ed436feffa6bc221feb18ac3f3a65ffb660497ebe922 SHA512 8165099dba86f85f9fd92521f65ab4c736d39c24ae3789e00ed5ba1662109223848d511665db5308103074c3ebb43552c3d0d39f8ecea489c7560dc0a965ce12
+DIST tagainijisho-1.2.0_pre20210627073130.tar.gz 3639873 BLAKE2B 5dfef3a9d9489b3f9a2dfda9a73700311a597f73eddca375608d62069c2e01e37f977ebf78416483f8f8de6347accbdcaebd4f5dca65ee0ec88d2c90a2f7715d SHA512 bb6ddd487bdb7f7e6b664ad1fe92067c136ddc6ed4a01f5882f0fa2c9ebe2b77605dc0f5202f824e2e5a4f1829dff3c43410c339e6bf853ce890ce39567aa43f
+EBUILD tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild 6703 BLAKE2B 8c80435235ec361412aec1e493209fb15146d44d4da7ac79ff2f4a6da38345893f836b00ed159832d24794d620e3aef722e48f9e0650eeb83377b5038a24489c SHA512 2e916c79c6ce7f44d83ee7259de5c8f29ae91991c076515a25f1260035d4fbd5362c6f73bf22f67fd7c32806ae748c9dfc8160c8dea871a6ffc7fb9b9470aa49
+EBUILD tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild 6703 BLAKE2B 8c80435235ec361412aec1e493209fb15146d44d4da7ac79ff2f4a6da38345893f836b00ed159832d24794d620e3aef722e48f9e0650eeb83377b5038a24489c SHA512 2e916c79c6ce7f44d83ee7259de5c8f29ae91991c076515a25f1260035d4fbd5362c6f73bf22f67fd7c32806ae748c9dfc8160c8dea871a6ffc7fb9b9470aa49
+EBUILD tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401.ebuild 6652 BLAKE2B c731cf58de9378460524ab1d0b3d4560e4787819813b98d26e6eaef624bf59f07b794b13b9ec537d62e92bf0ea76763165c855924df3adb8e070a945b7a15232 SHA512 c5b492a39bb01a17b072b9b931eab80fc6166a79e9607eeceae51c8e64106f8df5c179f5cf6c22097e4a2eb93f6ac8d138a445dac267c9bcc35cf1fafd8229d2
+EBUILD tagainijisho-1.2.0_pre20210627073130_p20210701_p20210701.ebuild 6652 BLAKE2B 67078e5ad688f425fd4f64088b2503c390f4e12c2f2dafb7d73cf991280d585880c07b857cf00f63ada422127fa47737ea5403197212ece9d2480b6622caa828 SHA512 cff1f344de1462f3099b5c55fe19af2e3a9c4b78593d76b1312c53793e685b37e90f550bf77868aa10801565633879463a860c0fa53aa662ce6a8531de260f48
+EBUILD tagainijisho-9999.ebuild 6601 BLAKE2B 289ffa950fe44e0c8cec9d01e3287e44f6c747ec8716a3d014539fab471d0750f01067646063f04a84cc8fe9d8495c11929f93df05986374df8f182117806e84 SHA512 fa170ae5ab3c227d213da75560f4d5522751b01a8cf7dffd63fc624a8fe1d62f37cde4ee076d68c68a7f0b8a2c7f884c21e274dd05fb2acf1007683b0322097c
 MISC metadata.xml 1161 BLAKE2B c996fb26b11405d39539ffc2828893edd7607923c673da429da5d346568ce6f9356f16787484b68359916b38833b0ffaf52513b2a56a5baddaba97124fa2d804 SHA512 69342420a9792a780b73336ff3a4587752a3728f82e45f7725d33a788e9d9accef16b7fa079c18070867a46fa10f85794ab6fdaaf15e2b2f0eeef45df6d45fb3
diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild
index 9ddc9a9aa0c6..3800b36bbc6b 100644
--- a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20200701_p20200701.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2014-2020 Gentoo Authors
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
@@ -189,7 +189,7 @@ src_configure() {
 		-DEMBED_SQLITE=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild
index 9ddc9a9aa0c6..3800b36bbc6b 100644
--- a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20200118132551_p20201001_p20201001.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2014-2020 Gentoo Authors
+# Copyright 2014-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
@@ -189,7 +189,7 @@ src_configure() {
 		-DEMBED_SQLITE=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401.ebuild
index 0c1d1c997d04..4db725401cff 100644
--- a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20210313131524_p20210401_p20210401.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
@@ -50,7 +50,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 if [[ "${PV}" == 9999 ]]; then
-	# We wget dictionary files in addition to using git
 	PROPERTIES="live"
 fi
 
@@ -189,7 +188,7 @@ src_configure() {
 		-DEMBED_SQLITE=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20210627073130_p20210701_p20210701.ebuild b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20210627073130_p20210701_p20210701.ebuild
new file mode 100644
index 000000000000..3c0ad54fa9e5
--- /dev/null
+++ b/app-i18n/tagainijisho/tagainijisho-1.2.0_pre20210627073130_p20210701_p20210701.ebuild
@@ -0,0 +1,200 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake xdg-utils
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/Gnurou/tagainijisho"
+elif [[ "${PV}" == *_pre* ]]; then
+	inherit vcs-snapshot
+
+	TAGAINIJISHO_GIT_REVISION="a16d7b82002d95365b54b8cd07d4fd80e2b9cfeb"
+fi
+if [[ "${PV}" != 9999 ]]; then
+	TAGAINIJISHO_VERSION="${PV%_p*_p*}"
+	JMDICT_DATE="${PV#${TAGAINIJISHO_VERSION}_p}"
+	JMDICT_DATE="${JMDICT_DATE%_p*}"
+	JMDICT_DATE="${JMDICT_DATE:0:4}-${JMDICT_DATE:4:2}-${JMDICT_DATE:6}"
+	KANJIDIC2_DATE="${PV#${TAGAINIJISHO_VERSION}_p*_p}"
+	KANJIDIC2_DATE="${KANJIDIC2_DATE:0:4}-${KANJIDIC2_DATE:4:2}-${KANJIDIC2_DATE:6}"
+fi
+if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+	KANJIVG_VERSION="20160426"
+fi
+
+DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool"
+HOMEPAGE="https://www.tagaini.net/ https://github.com/Gnurou/tagainijisho"
+if [[ "${PV}" == 9999 ]]; then
+	SRC_URI=""
+elif [[ "${PV}" == *_pre* ]]; then
+	SRC_URI="https://github.com/Gnurou/${PN}/archive/${TAGAINIJISHO_GIT_REVISION}.tar.gz -> ${PN}-${TAGAINIJISHO_VERSION}.tar.gz"
+else
+	SRC_URI="https://github.com/Gnurou/${PN}/releases/download/${PV}/${PN}-${TAGAINIJISHO_VERSION}.tar.gz"
+fi
+if [[ "${PV}" != 9999 ]]; then
+	# Upstream: https://www.edrdg.org/pub/Nihongo/JMdict.gz
+	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/JMdict-${JMDICT_DATE}.gz"
+	# Upstream: https://www.edrdg.org/pub/Nihongo/kanjidic2.xml.gz
+	SRC_URI+=" https://home.apache.org/~arfrever/distfiles/kanjidic2-${KANJIDIC2_DATE}.xml.gz"
+fi
+if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+	SRC_URI+=" https://github.com/KanjiVG/kanjivg/releases/download/r${KANJIVG_VERSION}/kanjivg-${KANJIVG_VERSION}.xml.gz"
+fi
+
+LICENSE="GPL-3+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+if [[ "${PV}" == 9999 ]]; then
+	PROPERTIES="live"
+fi
+
+BDEPEND="dev-qt/linguist-tools:5"
+DEPEND=">=dev-db/sqlite-3.12:3
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+pkg_langs=(ar cs de es fa fi fr hu id it nb nl pl pt ru sv th tr uk vi zh)
+IUSE+=" ${pkg_langs[@]/#/l10n_}"
+unset pkg_langs
+
+if [[ "${PV}" != 9999 ]]; then
+	S="${WORKDIR}/${PN}-${TAGAINIJISHO_VERSION}"
+fi
+
+src_unpack() {
+	if [[ "${PV}" == 9999 ]]; then
+		git-r3_src_unpack
+	elif [[ "${PV}" == *_pre* ]]; then
+		unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz
+		mv ${PN}-${TAGAINIJISHO_GIT_REVISION} ${PN}-${TAGAINIJISHO_VERSION} || die
+	else
+		unpack ${PN}-${TAGAINIJISHO_VERSION}.tar.gz
+	fi
+
+	if [[ "${PV}" == 9999 ]]; then
+		# JMdict.gz and kanjidic2.xml.gz are updated once per day.
+
+		local distdir="${PORTAGE_ACTUAL_DISTDIR:-${DISTDIR}}"
+		local today="$(TZ="UTC" date --date=today "+%Y-%m-%d")"
+		local yesterday="$(TZ="UTC" date --date=yesterday "+%Y-%m-%d")"
+
+		if [[ -f ${distdir}/JMdict-${today}.gz && -s ${distdir}/JMdict-${today}.gz ]]; then
+			# Use previously downloaded file from today.
+			JMDICT_DATE="${today}"
+		elif [[ -f ${distdir}/JMdict-${yesterday}.gz && -s ${distdir}/JMdict-${yesterday}.gz ]]; then
+			# Use previously downloaded file from yesterday. File from today may still be nonexistent.
+			JMDICT_DATE="${yesterday}"
+		else
+			# Download file from today or yesterday.
+			wget https://www.edrdg.org/pub/Nihongo/JMdict.gz -O JMdict.gz || die
+			JMDICT_DATE="$(gzip -cd JMdict.gz | grep -E "^<!-- JMdict created: [[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2} -->$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")"
+			if [[ ${JMDICT_DATE} != ${today} && ${JMDICT_DATE} != ${yesterday} ]]; then
+				die "Unexpected date in JMdict.gz: '${JMDICT_DATE}'"
+			fi
+			(
+				addwrite "${distdir}"
+				mv JMdict.gz "${distdir}/JMdict-${JMDICT_DATE}.gz" || die
+			)
+		fi
+		einfo "Date in JMdict.gz: '${JMDICT_DATE}'"
+
+		if [[ -f ${distdir}/kanjidic2-${today}.xml.gz && -s ${distdir}/kanjidic2-${today}.xml.gz ]]; then
+			# Use previously downloaded file from today.
+			KANJIDIC2_DATE="${today}"
+		elif [[ -f ${distdir}/kanjidic2-${yesterday}.xml.gz && -s ${distdir}/kanjidic2-${yesterday}.xml.gz ]]; then
+			# Use previously downloaded file from yesterday. File from today may still be nonexistent.
+			KANJIDIC2_DATE="${yesterday}"
+		else
+			# Download file from today or yesterday.
+			wget https://www.edrdg.org/pub/Nihongo/kanjidic2.xml.gz -O kanjidic2.xml.gz || die
+			KANJIDIC2_DATE="$(gzip -cd kanjidic2.xml.gz | grep -E "^<date_of_creation>[[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}</date_of_creation>$" | sed -e "s/.*\([[:digit:]]\{4\}-[[:digit:]]\{2\}-[[:digit:]]\{2\}\).*/\1/")"
+			if [[ ${KANJIDIC2_DATE} != ${today} && ${KANJIDIC2_DATE} != ${yesterday} ]]; then
+				die "Unexpected date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'"
+			fi
+			(
+				addwrite "${distdir}"
+				mv kanjidic2.xml.gz "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" || die
+			)
+		fi
+		einfo "Date in kanjidic2.xml.gz: '${KANJIDIC2_DATE}'"
+
+		mkdir "${S}/3rdparty" || die
+		gzip -cd "${distdir}/JMdict-${JMDICT_DATE}.gz" > "${S}/3rdparty/JMdict" || die
+		gzip -cd "${distdir}/kanjidic2-${KANJIDIC2_DATE}.xml.gz" > "${S}/3rdparty/kanjidic2.xml" || die
+	else
+		mkdir "${S}/3rdparty" || die
+		pushd "${S}/3rdparty" > /dev/null || die
+
+		unpack JMdict-${JMDICT_DATE}.gz
+		mv JMdict-${JMDICT_DATE} JMdict || die
+
+		unpack kanjidic2-${KANJIDIC2_DATE}.xml.gz
+		mv kanjidic2-${KANJIDIC2_DATE}.xml kanjidic2.xml || die
+
+		popd > /dev/null || die
+	fi
+
+	if [[ "${PV}" == 9999 || "${PV}" == *_pre* ]]; then
+		pushd "${S}/3rdparty" > /dev/null || die
+
+		unpack kanjivg-${KANJIVG_VERSION}.xml.gz
+		mv kanjivg-${KANJIVG_VERSION}.xml kanjivg.xml || die
+
+		popd > /dev/null || die
+	fi
+}
+
+src_configure() {
+	# GUI linguae
+	# en is not optional, and build fails if none other than en is set, so adding ja as non-optional too.
+	local lang use_lang
+	for lang in i18n/*.ts; do
+		lang=${lang#i18n/tagainijisho_}
+		lang=${lang%.ts}
+		case ${lang} in
+			fa_IR|fi_FI|pt_BR)
+				# Use generic tags.
+				use_lang=${lang%%_*}
+				;;
+			*)
+				use_lang=${lang}
+				;;
+		esac
+
+		if [[ ${lang} != en && ${lang} != ja ]] && ! use l10n_${use_lang}; then
+			rm i18n/tagainijisho_${lang}.ts || die
+		fi
+	done
+
+	# Dictionary linguae
+	# en is not optional here either, but nothing special needs to be done.
+	local dict_langs
+	for lang in $(sed -e 's/;/ /g' -ne '/set(DICT_LANG ".*")/s/.*"\(.*\)".*/\1/p' CMakeLists.txt); do
+		if use l10n_${lang}; then
+			dict_langs+="${dict_langs:+;}${lang}"
+		fi
+	done
+
+	local mycmakeargs=(
+		-DDICT_LANG="${dict_langs:-;}"
+		-DEMBED_SQLITE=OFF
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/app-i18n/tagainijisho/tagainijisho-9999.ebuild b/app-i18n/tagainijisho/tagainijisho-9999.ebuild
index f40dcd4a2936..1ece4615a3cb 100644
--- a/app-i18n/tagainijisho/tagainijisho-9999.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" == 9999 ]]; then
 	inherit git-r3
@@ -50,7 +50,6 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 if [[ "${PV}" == 9999 ]]; then
-	# We wget dictionary files in addition to using git
 	PROPERTIES="live"
 fi
 
@@ -189,7 +188,7 @@ src_configure() {
 		-DEMBED_SQLITE=OFF
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {