gentoo resync : 15.12.2019

11 files changed, 29 insertions, 28 deletions

diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 2d53101a1142..5a9c868d7e22 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/dikt/Manifest b/app-dicts/dikt/Manifest
index b92615df6975..a0256a3b03ca 100644
--- a/app-dicts/dikt/Manifest
+++ b/app-dicts/dikt/Manifest
@@ -1,3 +1,3 @@
 DIST dikt-2s1.tar.xz 52620 BLAKE2B 7afbefdf136b4aaf81ca30399263760a10366c362f07cf620a2c42ab10e5cd6b1eb3ada308f99d7a80a077089cc189ca634d5fdb30a30063dc12fc5e748ad555 SHA512 b7b26ace5ce6326191047d0d0515db2b88e790475be569d7bb994879046aa26c93a663d6bef31f8e8b233377ebd602355fb11b275f3aec910f99a5372fcde682
-EBUILD dikt-2s_p1.ebuild 924 BLAKE2B 32242a4478edf276293a2bedc7c86249e4f0db121903eeb2e64e8b73b5eea3dd998b00060f77a1b85564cc6ce962aef39d0d6974ebcdb09141f15dcdf5d9cc0f SHA512 2a3779952b9f2ce320213a14ac0d9a84216aa2d3d13f4fda4bc69b02c0edfaeddae25210cd79879cba15a8c1b1f02416083652735eaf43bdc85221c482caaf32
+EBUILD dikt-2s_p1.ebuild 1039 BLAKE2B 6e096474a80ad1d1c71b14e9f1de6eaee57decf856be98606e6b99574dae2e31796fc8b8161efc38713f813963cb40d796c2a28af884813ad401cc6a394cf9de SHA512 2995c925bc211174329a8e23789f86f297685e8c3993346f231ea797b984b6d842d6eb61b8afa57389623de90da320777e3d79af8c0881ea2260547c1681ee4a
 MISC metadata.xml 326 BLAKE2B 624268b9a2d4f8983ec8169bd8104664b0c801608dfdc5b14bab148ed403d7953fef7d1dcdc9bb38fe96537caa8039d727be4c1f8e2583177940cf86b24c6340 SHA512 5916d213c1415f8acd3c51547b307708e108381384001ac3cb940ae74d7c20313f0917128b9b20f6d30693f08f29ffb721e55586d6ce9b8b5d99fc72c9e35dc0
diff --git a/app-dicts/dikt/dikt-2s_p1.ebuild b/app-dicts/dikt/dikt-2s_p1.ebuild
index f99de7a93486..c655a5c576d5 100644
--- a/app-dicts/dikt/dikt-2s_p1.ebuild
+++ b/app-dicts/dikt/dikt-2s_p1.ebuild
@@ -4,7 +4,9 @@
 EAPI=7
 
 MY_P=${P/_p/}
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm
 
 DESCRIPTION="Dictionary application that implements the Dict protocol"
 HOMEPAGE="https://www.dikt.tv/"
@@ -16,21 +18,21 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
 	!app-dicts/dikt:4
diff --git a/app-dicts/gwaei/Manifest b/app-dicts/gwaei/Manifest
index d90afc29dada..74ec58caf0e0 100644
--- a/app-dicts/gwaei/Manifest
+++ b/app-dicts/gwaei/Manifest
@@ -1,3 +1,3 @@
 DIST gwaei-3.6.2.tar.xz 547592 BLAKE2B 0a0f90639b81158ef6bfc69f0f74ad70af65ae9462c93f6e507d6a1087c424da9689f2308300c5d4b8090143d8d9e2f7fe183719e37fa463ffe2b937714b7463 SHA512 96876f7e15ff5e166dcd116e2286294b7b375e55723684e4e3dec31aba46d1c89ccd70007fc01cab97a5fd5e671ec073c3f69525ff7e68126851e587d4f20c3b
-EBUILD gwaei-3.6.2.ebuild 1340 BLAKE2B 75ce0f16f3c9a35bacdf00140aa99cfc37275563d760c9a27ba9ecb4b9bfb54ee64850a70b25feafb15d1f74cfb010a10ad661842415e8357dbcda8e0dc5dc2a SHA512 461fb40875e4ee90d69dbe9418c35f7ad123fed878fd32103c7f6810fd02efc5248c631580e9f228b8029206a00f93ca32c1c5a64d0e00e61d596055c00f8261
+EBUILD gwaei-3.6.2.ebuild 1357 BLAKE2B f610b5b3bde56cc03cc234b5fa9e2dfb5877af594c1dfb30a782576db59b9cbe24261310319f3f3aa22597321ef75a1bdcc16e5ee1f64f2f3628ccce2407a5a6 SHA512 9dec52d67c23c133df858aeab12200a6ac91dc9a332f45b58bcd4664bc6285cd74c2a4de6a52e06f05dde03b34debcd55b5a0fa71fbc399d8adec3ee68a81154
 MISC metadata.xml 762 BLAKE2B 96509839f9438ea2d387e73790629af5db6f7307dd7dc009489ee9aac1520ac53efb6cf855ceaa3a272cb128b60e2bd068f61e0375c104985d30198c10a1995a SHA512 2fade949182ab7d2a48a98f24c45f806cc84fdb481c8357c282fffc44c7a02a36dcb58f3c7ec586ee87c7a98b04522c33cc01135bfddeb49044ee2791b8b820b
diff --git a/app-dicts/gwaei/gwaei-3.6.2.ebuild b/app-dicts/gwaei/gwaei-3.6.2.ebuild
index d1e6c6457f68..760d43ab9b63 100644
--- a/app-dicts/gwaei/gwaei-3.6.2.ebuild
+++ b/app-dicts/gwaei/gwaei-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gtk hunspell nls test mecab"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=net-misc/curl-7.20.0
 	>=dev-libs/glib-2.31
@@ -48,7 +49,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	find "${D}" -name '*.la' -delete
 
 	dodoc AUTHORS README
diff --git a/app-dicts/prime-dict/Manifest b/app-dicts/prime-dict/Manifest
index 4268aa62bdd1..92d251b1da79 100644
--- a/app-dicts/prime-dict/Manifest
+++ b/app-dicts/prime-dict/Manifest
@@ -1,3 +1,3 @@
 DIST prime-dict-1.0.0.tar.gz 6756593 BLAKE2B 7348e7a46dcf5a6d15ec2c5e09c4d89e724d912071a11b48b52f9e6cff62c0c52b7736da322a69ed6662e03c4b987702691174d48331e4ed692887d72b9169c0 SHA512 0cad16048baeeca982feaa3e95f7afaabaa94f511e1e80ad332cf106ea39e226f3119bcdc9636010cb5d5e0aef10dec0b8fc4d42b743e32c51971cb45e85dabf
-EBUILD prime-dict-1.0.0-r3.ebuild 635 BLAKE2B 530851c4144eff17f401fe4e8e36b7b3a6bed1f8df153e33456bafb22e5bde00fafa4aac39c4cacd7f18777e8617784744808ec46bedc855c415d5e29c749736 SHA512 094cd7184e7ce5e83aa1703822cfe0443677a8859c7455ac40b40560f18b341eb45bf68597e8a731091617216786c2e6ae70d6ff848954e024b4c9697944a510
+EBUILD prime-dict-1.0.0-r3.ebuild 628 BLAKE2B ea9ffc4a31920fecccb64dae56c41a1712c968252f998c69b3c8bfa45983013f6321b4216e31dadca91ac0bff7deb0e45292b76af3b56d23bdcc0d808dd26b6c SHA512 2586e48dca725ee99e0c3afe4d0a0035e565d6b131c9b750156b2f3a8421d13200bffdc2138e70837decf9e708b4c87605d48053b4cee9f5fe4b6dfc6a2d4b68
 MISC metadata.xml 312 BLAKE2B 1a3aff27feacdc44eef84b804f34de6cca67a6ddd6b9e7bfe255eeeca051d7a70fc885fffa8bec7f1e1235704ade9f54815ee9b13db8eee73a18410b5fd9df16 SHA512 4c8a557ae5d0d62d8614e4ecbaf530c763a5420bc2ec18e8e6909f32fb342d55f4923b649cbc9585cfcc0a73afa40babf709dd95a7c19828dc09ad2ea4403346
diff --git a/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild b/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild
index 818212f88dd0..9dbfb5867625 100644
--- a/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild
+++ b/app-dicts/prime-dict/prime-dict-1.0.0-r3.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="alpha amd64 hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 each_ruby_configure() {
-	econf --with-rubydir="$(ruby_rbconfig_value 'sitelibdir')" || die
+	econf --with-rubydir="$(ruby_rbconfig_value 'sitelibdir')"
 }
 
 each_ruby_compile() {
diff --git a/app-dicts/verbiste/Manifest b/app-dicts/verbiste/Manifest
index d415379af9b0..bc0dcc953a62 100644
--- a/app-dicts/verbiste/Manifest
+++ b/app-dicts/verbiste/Manifest
@@ -4,4 +4,4 @@ DIST verbiste-0.1.44.tar.gz 780465 BLAKE2B 692fd3bdf00323b08d4c8a66baaf9f6800c45
 EBUILD verbiste-0.1.38-r1.ebuild 1236 BLAKE2B 786f801fdfe99f02d750c6843d914a1fdc9b649258c970b3fc98e4b9c092f25ab5d00d3ef01743d0f9f8598f84623f9e888e65357493b3d1861129746d7718c7 SHA512 ec300d6918f9753962332bad1967ac819427ed07abbc3fc20b6ef40aca603421a7db31f33019c5f3785ac73f49d463bf16feea05742b9b294dab6919d130c12e
 EBUILD verbiste-0.1.41.ebuild 1166 BLAKE2B 6f0ec7e24f6f79b1bf05a33e7617fda43681f97d00069563933c6f90b6259bffe007f356778f1f130a6b601f10ac30b049ec5f147eaaca8344dae1fd6b0dd369 SHA512 26d02d225c7ecea2937117cae60435f00fe9ed32feb1e78dc7f6bbebf83875e88457618e33f9f4e6451d12108488f96d5e77636cc468d24f553f7b0d17e3f16e
 EBUILD verbiste-0.1.44.ebuild 1166 BLAKE2B 4de1b8de1003e32631066aa835471becea41e1bace5e5103dbd9cb3370a65eca47b5c68e0329d6e0b57bf2674b587dcee4e0ac1c88b6b4f5c6038bb6ade906d8 SHA512 59be64e2feea4968f4b3d2176b21aaed40b09955ae5d1600138330951b460eaa1db5e3332d9077e4db3b76428de373edc10c1d0cdb6199630956685f68ca2c6b
-MISC metadata.xml 312 BLAKE2B 796d1961515a145787510162d67e5b0325d97d78e1c517c7a7848c2e5b6d22a07c4a0915f4bb1b65528790ece95c916db71a28b986333af99433a155e64fdf42 SHA512 22e3dc352c25e63a278f8ad9dafce6869b4342b4264da89be1798fee69f233ec4518f93d1d6bf9d5b13373c2616f7d56a92b833f863b1f50ca19aa16651b5c1a
+MISC metadata.xml 265 BLAKE2B b5ccccb4ac3c3949e171764cb146030656a138d5034f73858caa1197093e39bd9b77f135d29b420765a3ce125d9c24912d4ff2e6fcbb4dd1daca5eccf45f9792 SHA512 b12ed7df2b599be2a1cf01aedbb7c89afb9c04b3c7efa39338d8b19359aa93db2f383517a7e540c243848f4349ca786d7ba89728029965e5533e11823d004149
diff --git a/app-dicts/verbiste/metadata.xml b/app-dicts/verbiste/metadata.xml
index 29ae55b6960a..dea57dcb475f 100644
--- a/app-dicts/verbiste/metadata.xml
+++ b/app-dicts/verbiste/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>eva@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>French conjugation system including an option gnome front-end</longdescription>
 </pkgmetadata>
diff --git a/app-dicts/wordnet/Manifest b/app-dicts/wordnet/Manifest
index ac318ccd7259..4b3c7b13864d 100644
--- a/app-dicts/wordnet/Manifest
+++ b/app-dicts/wordnet/Manifest
@@ -7,5 +7,5 @@ DIST wn3.1.dict.tar.gz 16358468 BLAKE2B f3df09f39ea29fce3378122f1a93d713acb8be39
 DIST wordnet-3.0-patchset-1.tar.bz2 8076 BLAKE2B 20684bd96814db6e0bf2d9aeb455def682fc38566d6abd3832bf0f7eae3b65b63e8b16aa21656bb81c1696bec0d179028ea8bb4687e5566a6d679bc55e300b9c SHA512 17668d736dd6dfe83e4d5d328729cbcdfb4dbca9a9707651534169bd2ce6fc2238d5c820d63330c51c20ab9b2964b56a609f58242b05dabbcfdfc0da61c048cb
 EBUILD wordnet-3.0-r4.ebuild 2102 BLAKE2B ffbad9b621e22d6eac0222ee0e9f9eb71b775ea6916c38b1b44e6257d4c08ec396692304e62ee5a40ec02de0a7b086e5faffeab1a33cbf25627de1017a740f25 SHA512 23a1bffeb3294743b1fca001fe68f07f0be2af4303d9bc9a60202401940c0d7c61691050a574045bba9543b67df0a4810d835b8b0b73206cf1fe2b9647fe6d0f
 EBUILD wordnet-3.0-r5.ebuild 2152 BLAKE2B 46f2d2f22ef3b05c044cb16cf9a391ced71836b5b60f4bded033a73d548974c91d00a2561c6040406a5f3289069878505d4b24b53971e6ce968a871b3c9a7271 SHA512 b4d7e2004c58b6c1bc8a8a45b2f3680fe7dd6af9d5786ea9c999f1b44909ab13b2893fdcd80a22bef908685fd6a6bcdc43b4f6e22f2e41069dcec97850416388
-EBUILD wordnet-3.1.ebuild 2796 BLAKE2B b4c8b7399d72c7aafe5e25a569e6a8d252a3c72bf3ebc808729fb993f2529bc174e8a782f38105c6925edfb088c0d0cd8fd774541a46452bdc056b75699a220f SHA512 fe498aba70d39e045713d08eb3db416e9cbaebafeffaae8d56fa82ac5519305a659f672eb9529ba0c446cdf63a36d3ab69631216d3c225c70faaf7a89ac9101d
+EBUILD wordnet-3.1.ebuild 2774 BLAKE2B 9762203453e33038dbd9ebab40fe0a69323c2d47c0819dccb32e07e33977a07b3eb64738cd7ac07719493dd54ae1118a2847d0c0e17b65b10ebedae506b9ac9f SHA512 3b529a29cdc966ba5773b40f5b9a31a286ee8568265f1c6c55301a5408a4738d1ab55000b44319a1ddb82401407d6340820943fd033f5e1f9bf60d0b0b2005cf
 MISC metadata.xml 358 BLAKE2B 11b80740d0327acc1dc7c94c2492cf25fa6941014d2c352af5e744036f30f386b9549c5773036708738b774830a22ed5a972e3d88de99dab4777cc46727945ce SHA512 1f57e2d03f71e806f11f7a8e5e667fb2d7255b2af6fd17bf6b095e4f6502cc9f0ff16ef1fb7febd93c98ac52f7a3b6857c0fe1772bb5dd269b455d6db2fa125b
diff --git a/app-dicts/wordnet/wordnet-3.1.ebuild b/app-dicts/wordnet/wordnet-3.1.ebuild
index b0f8adbbf560..4179efca8e6b 100644
--- a/app-dicts/wordnet/wordnet-3.1.ebuild
+++ b/app-dicts/wordnet/wordnet-3.1.ebuild
@@ -76,7 +76,7 @@ src_configure() {
 }
 
 src_compile(){
-	emake -e || die "emake failed"
+	emake -e
 }
 
 src_install(){