gentoo resync : 18.11.2019

7 files changed, 45 insertions, 40 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 337ff86f4c80..77db54da85a4 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 78d0e2a6ed49..18d0eb243295 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -5,5 +5,5 @@ DIST at-spi2-atk-2.34.0.tar.xz 96116 BLAKE2B 242b29b988d97b06ca85495be77f9c4cf1c
 EBUILD at-spi2-atk-2.26.2.ebuild 1023 BLAKE2B 61b044781a10a1b5f8d09a587e5ae7f216469a0aa5602db43b1b3e84adc64075f92d50b7771606ef758b40b68e5d8ab311457596346aa3fa456809a40c029d7c SHA512 7639f2a05c71eb2beb9bde53e5b39a978b1915914c0473c97cb371c4836f7022003b141d81c01df8aa3ed96f347bbff5a2199039058d96b19b2f617ba397733f
 EBUILD at-spi2-atk-2.30.1.ebuild 977 BLAKE2B 765f061f0dcac3f1bf4fd7615a25501ab9e49e261f359814bfb0849d4c73ceee3d25d12a1db2d9420c6bbd3dd317dc64cd0324cb81e904dba2eceafdc083a6e3 SHA512 03406d21a6148baa19d38e61b7b5fa35874d1c06f67a0b09dd5a32f275e9549772f71616e3e31c852a0c7731524a91b95255df27249d1842ac5383ae42028c08
 EBUILD at-spi2-atk-2.32.0.ebuild 997 BLAKE2B 968cad87bbf41e2d4c04036d92703233091c3a9ee4ee36b3a7a8335f8dc074c7d3e7840507fe0e466a1ffb3a27a6170011630267ee35a0e005461f1854ecde40 SHA512 dd61e81115812c5074115c1e424c7c973b2ddee7187990d3d44b7977623b1f5ee0852e034818e619c863d85f6eb874d5ab81f20ffec58df7edda88cb9dc054cd
-EBUILD at-spi2-atk-2.34.0.ebuild 997 BLAKE2B 50917ddc3f3b4de29bc986799e54ed921d7f704879ffb81a1f33a6698e17953c7c614db1056308411d6f88146efeacc1f4aff4c800de567f09fd1ad7a7c05589 SHA512 b301c2e6ac908343e99df00776a38785c1af0976fc2f716e825be4095d138790eb38cdd8559c0edd55cdf352efed0008f9f1294cfc15c59ddca38a6ccfd68364
+EBUILD at-spi2-atk-2.34.0.ebuild 999 BLAKE2B 17bee5d2f38162b6f546704698fbf66daedfb5533f9a20e71a464526dda4ba008f5b945bb06c37b166eb923592816984ce097172514e32fe9f49a398fc3e1bee SHA512 8ec3822af64c4364ba3e9effa75878846e0a27d31e55d893d49783c0a0fbfdd6d61e6baa748d81164085dfb43f36a5ed0750e7412e39ac40dcc64e27031f3334
 MISC metadata.xml 562 BLAKE2B 5f5b7b6f0ecfc0067041c3f9982d322485db7a3f992ba2ec20ace679a9771da3731fa68f09768423af5eb042b05b5d665de2f6eb8026f5890941004c2741ca23 SHA512 d9cd5d0c04bc5a3e4e815f0b7a8a5ce0ed0aac2d5b4cf5540669b7450b3ecff7a7346c1a80daf033330e7a5aebe13f85d1821c109cf0c861f85ca514e7e2678f
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
index 2a9349ea14eb..f0a7e15237e5 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
@@ -8,7 +8,7 @@ inherit gnome.org meson multilib-minimal virtualx xdg
 DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
 HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
-LICENSE="LGPL-2+"
+LICENSE="LGPL-2.1+"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index bcb63061a750..17181b617608 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -7,5 +7,5 @@ DIST at-spi2-core-2.34.0.tar.xz 186736 BLAKE2B 6210ef0254760f1ef6e9c9124680f6048
 EBUILD at-spi2-core-2.26.2.ebuild 1584 BLAKE2B ff8551dc308b17ed9a176c7731edc55071cf1a07824b88445caca75c77d0c1be1ff3da7f73635caf09def845f9c625edc21f4e9d2ea1cca6775f569139dd6d25 SHA512 6e23445b170ab56c66fcafc97be94a485866cbfe7236edd889d08915d29b35882eb7e4888b633e619513965c72090617b40f09b0269341d68536675cc5f0c553
 EBUILD at-spi2-core-2.30.1.ebuild 1496 BLAKE2B cef0e969a5277a05522d74f7e5215276e01acfe4f5f745c5439308a94295569a43544a6a196f691e9c355973a5421a088d770b0bbefef7b4280fff797daf71c1 SHA512 dbf19f739e1460cb9bf45b636bc321835e21db7319cbc391c6a2210c74a21ff0fd2462f87bfadfaf1850f32e78dd072704232054baa98839b25d08586c024994
 EBUILD at-spi2-core-2.32.1.ebuild 1495 BLAKE2B 8230af2aaf0bc436b828f26be682d7be729a97a828ce234c2c2f1e5e06ea24aa500ae1f2ffc94a8ed2f1991585367d8b10b96ab5c1dbf40805a47ced7ad47f99 SHA512 69aa34e2dd32e9cfb5703c6d8cb95a86a0f4193cc22865caee72591699b0d189652fe14a1771dd306bd7a5e5bc5748575f4d32a626e4f0c529dabd6d83975ae2
-EBUILD at-spi2-core-2.34.0.ebuild 1495 BLAKE2B 8230af2aaf0bc436b828f26be682d7be729a97a828ce234c2c2f1e5e06ea24aa500ae1f2ffc94a8ed2f1991585367d8b10b96ab5c1dbf40805a47ced7ad47f99 SHA512 69aa34e2dd32e9cfb5703c6d8cb95a86a0f4193cc22865caee72591699b0d189652fe14a1771dd306bd7a5e5bc5748575f4d32a626e4f0c529dabd6d83975ae2
+EBUILD at-spi2-core-2.34.0.ebuild 1522 BLAKE2B 984d61b0604193e018161d33f41130965d4740f83285a19ff054461ee2b8bec6952daf9d183fd6ff1327eaf0b59dd6fe3798a6e299a0e31054c20c1639cbccac SHA512 71c45e02d51f45c33ba2ef7f32465985affcf31d10a9dd7240595b308aeef59018319a723582431c96d37373c83b354719b3ac405edf2ac4cb6264f95f0343fc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
index 09737b71d1b7..a142399fb76b 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.34.0.ebuild
@@ -8,7 +8,7 @@ inherit gnome.org meson multilib-minimal systemd virtualx xdg
 DESCRIPTION="D-Bus accessibility specifications and registration daemon"
 HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
-LICENSE="LGPL-2+"
+LICENSE="LGPL-2.1+"
 SLOT="2"
 IUSE="X gtk-doc +introspection"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
@@ -25,6 +25,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	>=dev-util/meson-0.50.0
 	dev-util/glib-utils
 	gtk-doc? (
 		>=dev-util/gtk-doc-1.25
diff --git a/app-accessibility/simon/Manifest b/app-accessibility/simon/Manifest
index c7d19614b66a..063de295d4a0 100644
--- a/app-accessibility/simon/Manifest
+++ b/app-accessibility/simon/Manifest
@@ -1,2 +1,2 @@
-EBUILD simon-9999.ebuild 2056 BLAKE2B ce24a11f4546204f91713d353b5f43e25aa152b2908b72d104a6a76c3e4d650621104f7059b82b25394c4bad416a30de61df4f08eb35b54e83dd10c3fe022c92 SHA512 e9644177580668ab9b063327ca63c0c7e87677af9fee050b17e495ec580ee238df5675dc3b130e6bf6283d13f795dc9f900ab573ae0ba6786d08f15d3e817276
+EBUILD simon-9999.ebuild 1939 BLAKE2B e61384925067d62645e423f6e30f60eeda947049a8d49b30f764044813712b6208e4f2746e392110c53519ff95f63e121c9982ffa9eaab93a17d2f1fd36ff173 SHA512 75f642f0b61f42746d23c4a4d6528aae615854262079921538047ef0918bdbeb38155b1602d4a9245ad359eee43e54bc0366bfc2ac294bfd864db0c19b6c2a0f
 MISC metadata.xml 526 BLAKE2B 90a5578ad2dd40b107c0a810ac487cf2c952f056bc8c6bb109cfceda2b66cdfc2ccc027e741d2eb0a4ee77e9ac349f43f7724b126d077c988ba4dd3c0c940375 SHA512 ab2dbc917334c5877b7654179b0f28e7d2824d98ba68c62e13ab912f5c1010198b8891ea5764c9e304727ac18be28b758f23f414e145047f99caef335006659d
diff --git a/app-accessibility/simon/simon-9999.ebuild b/app-accessibility/simon/simon-9999.ebuild
index 8c9e1d6bf7f0..3115d4658433 100644
--- a/app-accessibility/simon/simon-9999.ebuild
+++ b/app-accessibility/simon/simon-9999.ebuild
@@ -4,51 +4,55 @@
 EAPI=7
 
 EGIT_BRANCH="kf5"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+inherit ecm kde.org
 
 DESCRIPTION="Open-source speech recognition program for replacing mouse and keyboard"
 HOMEPAGE="https://simon-listens.org/"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/simon/${PV}/${P}.tar.xz"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="mirror://kde/unstable/simon/${PV}/${P}.tar.xz"
+	KEYWORDS=""
+fi
 
 LICENSE="GPL-2"
-KEYWORDS=""
+SLOT="5"
 IUSE="libsamplerate opencv pim sphinx"
 
 DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep khtml)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep okular)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	$(add_qt_dep qtx11extras)
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	kde-apps/okular:5
+	kde-frameworks/karchive:5
+	kde-frameworks/kcmutils:5
+	kde-frameworks/kcompletion:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kconfigwidgets:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kcrash:5
+	kde-frameworks/kdbusaddons:5
+	kde-frameworks/kdelibs4support:5
+	kde-frameworks/kguiaddons:5
+	kde-frameworks/khtml:5
+	kde-frameworks/ki18n:5
+	kde-frameworks/kiconthemes:5
+	kde-frameworks/kio:5
+	kde-frameworks/kparts:5
+	kde-frameworks/ktexteditor:5
+	kde-frameworks/kwidgetsaddons:5
+	kde-frameworks/kxmlgui:5
 	media-libs/alsa-lib
 	media-libs/libqaccessibilityclient:5
 	x11-libs/libX11
 	x11-libs/libXtst
-	x11-libs/qwt:6=[qt5]
+	x11-libs/qwt:6=
 "
 RDEPEND="${DEPEND}"
 
@@ -65,11 +69,11 @@ src_configure() {
 		-DQWT_LIBRARY=/usr/$(get_libdir)/libqwt6-qt5.so
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }
 
 pkg_postinst() {
-	kde5_pkg_postinst
+	ecm_pkg_postinst
 
 	elog "Optional dependency:"
 	use sphinx && elog "  app-accessibility/julius (alternative backend)"