gentoo resync : 15.01.2020

9 files changed, 32 insertions, 28 deletions

diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 6c7f8871bc9a..db85992660d2 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/calculator/Manifest b/sci-calculators/calculator/Manifest
index 9115130a6840..d551a82a7c33 100644
--- a/sci-calculators/calculator/Manifest
+++ b/sci-calculators/calculator/Manifest
@@ -1,3 +1,3 @@
-DIST fox-1.7.54.tar.gz 5384000 BLAKE2B 8970872d1c626d7ac5b0f944e8ea26a29bb757e4c646116016eaa1eccc2c0328c5047438e87fb6c2deab0a65e2b34cc91e8458150329a3e574e93608694a2dec SHA512 cf14a09f9a6a812ac87839a5df8fd68f693e59050695e8da5dbfe018676f29bc263e4f9208dc06419068e4140b826a0dcf70a8925fec379edf3e4d0d0b693795
-EBUILD calculator-1.7.54.ebuild 360 BLAKE2B f0ce3b2e955ab919985c8876e151dd3e8971248388adf54025df120e08672cd60e1282f6d5465d8f1d32ab587042c91ef98b1498a88ab0190bc13c3fac30af49 SHA512 90479c596e75a141536fc318691f882ff6aef3fa98e80d57b01bf0bc217a33bbc126e388b28d68dcea653077f9bb3daacc313d5f5e386d2525ee6224a0b31468
+DIST fox-1.7.67.tar.gz 5689421 BLAKE2B 60f2d8e887a41f1e234cd31c1bd2702bcedae0f1b47cb7b9832c317e34a9b517cb603033d28e5ed66c4b97c85deaf3caa8dd40a508eaf715d63772e6ef0020b0 SHA512 a45db7ea9453e2afe0ff61ed6608925e94f9202dc1fbee5e2b88a5a1c16310019cb4611090f8234ad6ebc46a6519a36085683c4553d47bc9c21b8ef0c13ab540
+EBUILD calculator-1.7.67.ebuild 363 BLAKE2B d6918b5fe0e5cb8d1a77d19412fd45a2654e22d00a51044aaf3dd19b446c16b0c9fced527a06f7eda8c0ee2ec1a144397b2383a593a5dcfceb96c5a6b05eec0c SHA512 30c6dd54504d218d3955b3ee639cb1b3fddd0ac56fa16c3814206afb57e4a3031043145dd3fbb3d05bfab63faddc1fb345a0018ccb5f5c538fbb109c85fe76f0
 MISC metadata.xml 945 BLAKE2B e2610b60d11231c8e780a0aae0b054b7f480317a97978c40abff0e69e47eae7c4c85213d914cda18f85d1d01ec25feda2acf690757c2e8e57a7cc6b5e8918967 SHA512 518844efe7b8a5d9333da013de0afec182d46291189ddd4ce6bdd795c81546e255058af326e10c32462ce3573da5426322cc9d7c6fabf1cb0be466db2702c667
diff --git a/sci-calculators/calculator/calculator-1.7.54.ebuild b/sci-calculators/calculator/calculator-1.7.67.ebuild
index 869609f171cf..f4b47b59dcc6 100644
--- a/sci-calculators/calculator/calculator-1.7.54.ebuild
+++ b/sci-calculators/calculator/calculator-1.7.67.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Scientific calculator based on the FOX Toolkit"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="~x11-libs/fox-${PV}
diff --git a/sci-calculators/keurocalc/Manifest b/sci-calculators/keurocalc/Manifest
index 213a0a3d1a60..cc9426d14e21 100644
--- a/sci-calculators/keurocalc/Manifest
+++ b/sci-calculators/keurocalc/Manifest
@@ -1,3 +1,3 @@
 DIST keurocalc-1.3.0.tar.xz 331764 BLAKE2B 56106c70a478abb9ebbdbe99f96b34300e51b4fbeab147915c1dec6a28fccdda7a8e72caa1684113bc57693fbdef82d68edd0225ad85307fc7468f062f33f7ec SHA512 5e9029e1c1f7550555cfa38e7327cab749240b6e6e6e142fdee60f6608de889bfa6a9f25b12e879fd6770ac7c22f1f9f7f6021b85f7df380404d37d128e40710
-EBUILD keurocalc-1.3.0.ebuild 788 BLAKE2B 98cca4462ba6534723283a5dfc4fc2f0cc19ca326d037b3c58bf8b105eecc61e74a43170c42e2f50ab08590ae0599cc58d8aff19a0c8bf4ad75dc67ee35b677b SHA512 a9540d70c4233a79376f31f2e2265b8e4a6f6c0c7e083ef2cb8c3be1a3b8c6e54e00340903d50793c98380320446f90a59f687610a265f4659e18d2568856b5b
+EBUILD keurocalc-1.3.0.ebuild 903 BLAKE2B 92f056debcd3096e27993e3b4f86c471bbc49079026af87105a731eb4c08d774def24a394c94ebada6e98a60e1ba1f0e8affcb665ecb60fd65998b1bc978862f SHA512 38c5dbd788f96ccc07417907cfc0edb3c6c22348eb22a96224f131209d74d49e28e49b5bae097181e7202b6d73151a685f9d07513f8e16ff8a4893a425873d83
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sci-calculators/keurocalc/keurocalc-1.3.0.ebuild b/sci-calculators/keurocalc/keurocalc-1.3.0.ebuild
index 93c92767663f..717b7c999b63 100644
--- a/sci-calculators/keurocalc/keurocalc-1.3.0.ebuild
+++ b/sci-calculators/keurocalc/keurocalc-1.3.0.ebuild
@@ -3,29 +3,33 @@
 
 EAPI=7
 
-KDE_HANDBOOK="forceoptional"
-inherit kde5
+ECM_HANDBOOK="forceoptional"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
 
 DESCRIPTION="Universal currency converter and calculator"
-HOMEPAGE="https://kde.org/applications/office/keurocalc/ https://userbase.kde.org/KEuroCalc"
+HOMEPAGE="https://kde.org/applications/office/org.kde.keurocalc
+https://userbase.kde.org/KEuroCalc"
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+ FDL-1.2"
+SLOT="5"
 KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}
 	!sci-calculators/keurocalc:4
diff --git a/sci-calculators/units/Manifest b/sci-calculators/units/Manifest
index 1fac09b5cf59..59ef96560bf0 100644
--- a/sci-calculators/units/Manifest
+++ b/sci-calculators/units/Manifest
@@ -2,7 +2,7 @@ AUX units-2.17-network-sandbox.patch 469 BLAKE2B 800ffebb2bf096fac9ca94672caa457
 DIST units-2.16.tar.gz 1178197 BLAKE2B 6de569cd70c8067be053c5acb0885f898b76252bf6bafbea5f8b4972eca0acb13adfb4b2bc70ef0a3df747ee31084076fea3d3199922f0c44fc8c6d08232192b SHA512 afca2bf313208db2d0a3f4e96fed7bb86a3e96030b420e1cfa68a140499b9a8f2ef8c166c1d608d03c9ca6260199569a67c67c623d8c6a4b8d52e9d5cb6e3091
 DIST units-2.18.tar.gz 1248892 BLAKE2B b1dd86907ba6af3251577c533d6c39705ff4a8cdf099c15c61efaf7876ee9a4131212e09b3e9ca0f2355fc547256e33be4fcb9efc552b38e3e990e76b9465992 SHA512 2ae9f08acb03f2f443514800dafb454434d7d1a43497d2a937c2e9e8429f63d821be11ae3090693e8cadbd2f9cdeafba8f80c1671d84a9cceb0f72ad75d8cad7
 DIST units-2.19.tar.gz 1271288 BLAKE2B b6d61661d88e8221d5689e7f1cdba357479d4e34c4c6fd51c336e76850521b3ad7d8f1bfd9ff8173917931151c8da2180928879be940358e35ae3e96a6e30765 SHA512 f28df8f0b95b53620d4d21ed369551b8510663ff3658293ba62de2722e7dc2d87506db7c65dc192e35f3c3a20842e8ed09ddaa7352532f7e3eaeab4c001061c8
-EBUILD units-2.16.ebuild 1299 BLAKE2B 2840c373648241ad22d6c7954b23423282c8e7318cafada522dc7c81053d8d0af1d0cbaabdaf304c56c85e8e3a5b4d0283dfc8f7222d18c66f85413730c641a6 SHA512 fde3add2815161747ef71f6c33f900943e7e4b8ad0c3945cdc990b63fcaed0571fa6a918fbb5e03aef0342bf84164eee94646239378bd1abbcf1cabe41a73d6f
-EBUILD units-2.18.ebuild 1406 BLAKE2B 16bfcceca088b8ae90d91eb12f8d9bcba2edfffd849c5f342b45f0d6468c8d811aad5b6e6913f1479da57fdc115186dcbef7742ec3bd67ff0b272a79be951c41 SHA512 4137f56283b3b4fdbf621c6a7c9115fc58894eccb8ada3d202cd8b69ab27a7b61a0541d8bad42cb7109775e7db8f5b5f637f541b4885d8a51fb697bc18bd65cf
-EBUILD units-2.19.ebuild 1383 BLAKE2B 1195cdb44072d5da7a00bd9d85ace4ec1ececaf151c2811f7cd8184c2c70994c39a26ba7613b617547ef36416a222bd08807f1531d39385b0e49f27da75f4934 SHA512 9edce6bbb2c7d275fdfee29304a0a10c48a541d210e2d19b66210efe85f6b1dd25e35147cf2c816a52141683182f7b1f69b2b4af980c231b8034831006d4be3f
+EBUILD units-2.16.ebuild 1295 BLAKE2B b80f7bcab1c8c45ff5efa6fa8f17949f6786cad754cf3b638dc97ba6c2245850f21c5453963569fa03b50545c23d05dd31ddf0a144f3ef7ce6fce8991510f6b8 SHA512 e78ebccd048e6d0abc239f6e2d2ca627f8b8f8cf1cde1ec0955e2b4a06cd7b4ef3738176838158fc8bcb3e93de87777ed1890d065c618d48e0b6d1704fe0070d
+EBUILD units-2.18.ebuild 1402 BLAKE2B feb1491d08673e70a88e43991eeec1e9d36c6b6a69bcf420b7540b7dc144bb635e4ea703a21bce3349768842144943f98890f3b92a054946cd1e8db9b5894cd9 SHA512 cf02dbae3d89041fd7ac6cfa41d3f837ef2d6ac235247b157dde27897bdd72b4725100f9f749925b5bd03742fae354a89bdbfc96425b07d28285d336f9b00388
+EBUILD units-2.19.ebuild 1376 BLAKE2B 9c0fc3b7e29f71c3b466dd14be7a70be1949af943fcf94ff9fd94b24c25535e571203809bbc49bb76d2a87930c5a1d0f7faa9efd7607593b08dc9008ca0c3ea8 SHA512 d2e2298215ee48877144de3043f630c729538295034cb8896b7ad69df4d0f03fe539db704a351ed94f9dfd5e03a09c80f703f64c03795f49f3c2ccac03bc1eb7
 MISC metadata.xml 342 BLAKE2B 5dfe07ae92c9b1741b7c2f49f8f0ba853aebfaa20d156685ed5a8fe9c8f0bb094bc240f197e3fb57f65494d4a41b037d7d4e2631c11d26e4fbada04f2916b749 SHA512 c648f964163e26133e70b40687d317d57067fa3bdff11080a33123b7fbf9e9af3aff1d4890ce4e75283b86ef026896804606283c888cb2dbc0c66a171dca8657
diff --git a/sci-calculators/units/units-2.16.ebuild b/sci-calculators/units/units-2.16.ebuild
index f72ff8ee12f4..eecbc8fcc779 100644
--- a/sci-calculators/units/units-2.16.ebuild
+++ b/sci-calculators/units/units-2.16.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit eutils python-single-r1
 
 DESCRIPTION="Unit conversion program"
diff --git a/sci-calculators/units/units-2.18.ebuild b/sci-calculators/units/units-2.18.ebuild
index 3df5a8826c27..ab70dde6bd9a 100644
--- a/sci-calculators/units/units-2.18.ebuild
+++ b/sci-calculators/units/units-2.18.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit eutils python-single-r1
 
 DESCRIPTION="Unit conversion program"
diff --git a/sci-calculators/units/units-2.19.ebuild b/sci-calculators/units/units-2.19.ebuild
index 5bbc862db247..33e0d4159977 100644
--- a/sci-calculators/units/units-2.19.ebuild
+++ b/sci-calculators/units/units-2.19.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 inherit python-single-r1
 
 DESCRIPTION="Unit conversion program"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="FDL-1.3 GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+units--cur"
 REQUIRED_USE="units--cur? ( ${PYTHON_REQUIRED_USE} )"