Updating liguros repo

14 files changed, 98 insertions, 59 deletions

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/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-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/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/kcm-fcitx/kcm-fcitx-0.5.5.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
index 7204e2277fe5..c8f903b0e905 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2013-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit cmake-utils
 
@@ -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,12 +46,9 @@ 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=(
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..5edbbf830dd2 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2013-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
 inherit cmake-utils
 
@@ -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
@@ -40,12 +46,9 @@ 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=(
diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest
index cad34b8297eb..6d6c2ed98d48 100644
--- a/app-i18n/tagainijisho/Manifest
+++ b/app-i18n/tagainijisho/Manifest
@@ -1,6 +1,6 @@
-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
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/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 f0261693f40b..f7ebf72c4efa 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
 )