gentoo resync : 18.11.2019

9 files changed, 22 insertions, 16 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 75730ab9a0b9..20accf20d562 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index 9fa720fcbe0f..b380924c276c 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,5 +1,5 @@
 DIST cdemu-daemon-3.2.2.tar.bz2 82366 BLAKE2B d21436a5dbf1c6d953aa7ceb58e5d4580931391ea407c45de8f7c7154c181aef76535833bf02999d77d3a9e0c624db1124a9d333d028e206844a1256b3c5dde0 SHA512 4010bad27d5f595d20e1666700d32c2fb3f943f2e50645317bcc8fbbbba58cd61b3f6d3276e91fff55f449e44291abc776a56ded7c4f0bb7901ac247da72d7fe
 DIST cdemu-daemon-3.2.3.tar.bz2 83130 BLAKE2B 2be64beb662ebeb51d75a34bccece5f5eede8abe447d4d0be60bf1bbe4e1f9ac6eeaa67783f763f4966571cf4e13fb9b61610ead40d8a13842400f48bb3b1618 SHA512 a1c7fdea9e32e71591a29de98f28dd4d2d0ffb972861916ab287ff33f5f070da8fcc113b602e4b02fd08a72f7361ae85440ef5eb156e312a849cd716207026a7
 EBUILD cdemu-daemon-3.2.2.ebuild 1140 BLAKE2B 37bf7e266dcbf187004b9e6184176791873d8a6ef29d11e2a0348d606affd72ae5fe8a0ced71e44c460ec218cdb41dd4073539000920fc290adfa7a7a10c2383 SHA512 2e05466f5bdec9615e5bc03343706b2abd1c310532364fb09454170aa2389f70bb490a1538e2097dadb73131907f2820e4b9ca8f774f12c1a94d1e922e322adf
-EBUILD cdemu-daemon-3.2.3.ebuild 1175 BLAKE2B cecc90f640cd974e3cdb4720c4757113d1c94663a54f7d67286727b1dca9071ce5427259462eb3d356dc266667a839f879f7604a113ccf2e2972c76d123984df SHA512 14cbc522f9cf92e979f58b485c8e61bd21070d42416e2f54f3bb7ef29adca55067c47722ab7b5302c5cf395edbb0ab22a6b4d2efede68b11cadf50f6d8887d92
+EBUILD cdemu-daemon-3.2.3.ebuild 1174 BLAKE2B acc9567e6546ad5a43139b662f7bf11f0859884558f17bd8703213e53a63ecf578f229f683035a7da5d0f6aa5fb40d2bbf0b22f43bd5cb2790d66156dc58185c SHA512 2c59f3472f7c7663f24baf55e53db9d474201b7ca20ac7ae211907e5ca7e07e27416760cafd741f5c7a51418db91485e5cca586d4d7605cae336a86b163a9462
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.3.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.3.ebuild
index 1350c2f5c681..b538cf3f7ce7 100644
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.3.ebuild
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/cdemu/cdemu-daemon/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND=">=dev-libs/glib-2.38:2
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index 648d80f1ecb5..9abcc54ec1fe 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -3,5 +3,5 @@ DIST cdemu-client-3.2.2.tar.bz2 44305 BLAKE2B 3a656bfda48a502752cb2b14df413a2646
 DIST cdemu-client-3.2.3.tar.bz2 44311 BLAKE2B 23451618897a5281478c9d70ded357089a4baaf47b22f36b4add9c5d2c899478629ce034cce0e593b501a127cdc1f5527f0aaf1951f709bf4c2d131e898045a2 SHA512 5d98870fa42bb639009dc6971747f252f3403eda882bffacf55f647193a1a9fb7a75ad69a7512da3abdcdeb64510b0f163ea997c4d75a804fa93880b62b03dd6
 EBUILD cdemu-3.2.1.ebuild 1081 BLAKE2B 33bb3596f62c2df6265e4313dd0fa84e52fb73d64cdcc938650c9a340b7b6c19505acaae17b4c61080bbdc578a834ac80b90f2027ee0462f345f66d1895f41bf SHA512 95642bbf73fd7a54dae54a4408275be33a55545b91af88db0e5e6890f03433d079309d0a4f28c32b44fa85332f354657391453fa57aedf623af8f6b77bbc4ea0
 EBUILD cdemu-3.2.2.ebuild 1081 BLAKE2B 70bfa6055b171bb1502ecf1a2e00564cf1c2a9699689f6e35cf65410e14025db42bc567162e000ee40d32a881e2f01c13d2adf7a0a775ade15bd546367c9b406 SHA512 84b0acd9dab2d99032de8bfe366455c4e12f4bd07175fc71d24881ee23f81a132da5e84254bc3873723159aacf67a7ca87ed929e9e32f603649ec4294e03d62f
-EBUILD cdemu-3.2.3.ebuild 1119 BLAKE2B dee60330137faf7f4e59a4969cfcab868ae073d356f401f90dae14ebca364ff8c20793de04488f0bffd3736a1a9c40e236f6a2403e2a027d87e1bf83d7765f38 SHA512 5d7546c59d2af2a0338ab15c1cd767ccafed8fae90e91f63b93691fc28b698bb12e7eb29c03ca8a6d53745b1eb1937d7e490d04f63f771ba79f18460e41256ff
+EBUILD cdemu-3.2.3.ebuild 1118 BLAKE2B 30145b51fe5903d9f43fe4c734ae9303e8cd88b93200979e0019980f545fda87487de4b6c1494e5a47f0fff50bc4e1bab66f047e748e659c523d4e9e4aa452fa SHA512 bbd872e3756bec14c44708c65e84508daef94befb097eca6e98753f66b22b4be5ecde06a082f2765cca2dae7166b5180e46404c9a858b3619b17227cd47b72ba
 MISC metadata.xml 529 BLAKE2B 88d72a301708901597eb11c475ae67d8477381c77d430b49042cb4a8658aa44b88273858f87cbbaa1fc16ae222b604fa9ff81f6f791d39c39d5c76b58b9d0d81 SHA512 27850929d16910038f7b406c0ec4c22648c91a6f8a8f9cd56c0a3ea8e4e772de9b77598514c5a621eb71386635a327829251a90128ba33073ac34485a3b60a92
diff --git a/app-cdr/cdemu/cdemu-3.2.3.ebuild b/app-cdr/cdemu/cdemu-3.2.3.ebuild
index 690af4a20977..0929becda5a1 100644
--- a/app-cdr/cdemu/cdemu-3.2.3.ebuild
+++ b/app-cdr/cdemu/cdemu-3.2.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.sourceforge.net/cdemu/cdemu-client/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="+cdemu-daemon"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index 22bc29d97b4c..97f39431752f 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -3,5 +3,5 @@ DIST gcdemu-3.2.2.tar.bz2 52251 BLAKE2B 9defe9972e0ec1a594cc354113ef4877846a9abc
 DIST gcdemu-3.2.3.tar.bz2 52229 BLAKE2B 9f8d0b6e04b438c0637f42875b144ad4d1a643b8f1216d868040121e417203ffedbf983fec235eb30bf9d11bcfe142e52c1c89966ac3b64442071d0897a9e8bf SHA512 1d31b9edeb111145c7dd438fc645c7513877fe89f78cf262c282bba2d2e7f9a99a8499e607bf00f880186bd4a37a8ebbcc5ba14e1e014254e767a8335396d6e2
 EBUILD gcdemu-3.2.1.ebuild 1124 BLAKE2B ca3230f358917866a2fb5708b459b33eeca45ea23a16d7c51c53b8b18a2ae3615f39a6a6f12d8fcc7a4be0a54155907dec68eddd5bb4b731c4fb5cb74eb54f37 SHA512 bbdd46cae47b5f06d428f0131403b2b2bb39e000f02035d298155d7c81bf178c5cafbbf612a4abd34b656b835ecd3bb68643e56efd507befc7734dccdc7ba380
 EBUILD gcdemu-3.2.2.ebuild 1124 BLAKE2B 6e850dab70659ad96f92e4fd7a7b8a8da960633f0eb1d953aa3e8ef50f98fb15a102e49bcda067beabcd28ba1269196c7db351f17d572e120956add4aff9c25b SHA512 0c2d1c5db61774cd66944f1dcdc79e69900a78b0cda0440ae532b22c1565778e7697a19dbc90a9cadcf7d48aae811873f688fb634e54973c8668a120df390e81
-EBUILD gcdemu-3.2.3.ebuild 1153 BLAKE2B e5d9507480086ed92b0db30c0335ba37f0659d1e0612c0896560e0ca40cf59320b9ac90e00b8b53dd5d241de379cd5e93da47a1bc304dadd8c9c580cf6182147 SHA512 bcd419a25a55edb22901d00212673530ed5b4bc5df1d4b7eb6e676d40cfcf601589d7114148bec0d8e967dd381da9223dd719d0ec0911c5388c95730241b5a17
+EBUILD gcdemu-3.2.3.ebuild 1152 BLAKE2B 3f054867d54b70f0532f2505302a82ff39632b71c5ddef830428ccb6175990ed24f932e6b678aed89dd664c315d246ccb42e094c1a73b45e971f57a78139d4ad SHA512 c5570d54e35e2ed50d1164867e1b88ef6e3ab8e7fa3daefccc1ee0554516686fc0bc05eb7d6d458c148d821417eb83ecefc0b84f16811d0818aefee7648f98b9
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/gcdemu/gcdemu-3.2.3.ebuild b/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
index ebf608985e2a..c5330923b91f 100644
--- a/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
+++ b/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://download.sourceforge.net/cdemu/gcdemu/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-cdr/isoimagewriter/Manifest b/app-cdr/isoimagewriter/Manifest
index e74f04700237..3b94e56e2fea 100644
--- a/app-cdr/isoimagewriter/Manifest
+++ b/app-cdr/isoimagewriter/Manifest
@@ -1,3 +1,3 @@
 DIST isoimagewriter-0.8.tar.xz 430368 BLAKE2B d540ca0ee874b633618480ff5cc30ceea5f0aef84e3e4b0236fc6474ce590661ca8728a3719cc733cc791d14cfdcaad609ffa32d79b99df141381aa3f35edec8 SHA512 1d5031695647be54e5de10f6243b68bf8d2dc29a7894c8ac69954df353d5baa740290b572c89cd37650718749117f5e3b25dd99b8b374d8ba0376288878f9199
-EBUILD isoimagewriter-0.8.ebuild 603 BLAKE2B 76462bfe8373be5885da3ab8a1c97122505fc909f259306ccc7abfea84d4333031adc5f89e0cd78a6f56eb5205e0580cc9fe3c42758632449791d80bc9222152 SHA512 11a294090f6429f6c37feb9e5ba61e977b38b5d1d220a0777f0531000ce47377b1f63bf7143cec6b92c5be4c623594bd00d2db52e2bb4e92f2fd55e63b273353
+EBUILD isoimagewriter-0.8.ebuild 669 BLAKE2B 4a50386e2413db78572acf5f65d05716713984069686ff87612af73fbc3f192276bc9d9136a5a03f08faf8af1be7d73bf60359d1b509877103b055d40ed60ae0 SHA512 e66929d8f1e74244a5746fd4229fc30aa2c38af19ee3fb21119faa06da05503906e2479451c9bed17be298915d5233ee286ef19af82fe8fbad8129670fd56b82
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild b/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild
index 904e057d83fd..023d9ca94133 100644
--- a/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild
+++ b/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild
@@ -3,23 +3,29 @@
 
 EAPI=7
 
-inherit kde5
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Write hybrid ISO files onto a USB disk"
-HOMEPAGE="http://wiki.rosalab.com/en/index.php/Blog:ROSA_Planet/ROSA_Image_Writer"
-[[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
+HOMEPAGE="https://community.kde.org/ISOImageWriter"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/unstable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64"
+SLOT="5"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
 	app-crypt/gpgme[cxx,qt5]
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
 	virtual/libudev:=
 "
 RDEPEND="${DEPEND}"