gentoo resync : 15.12.2019

4 files changed, 16 insertions, 49 deletions

diff --git a/kde-apps/kross-interpreters/Manifest b/kde-apps/kross-interpreters/Manifest
index b9981a410c61..4bebcefa1ec0 100644
--- a/kde-apps/kross-interpreters/Manifest
+++ b/kde-apps/kross-interpreters/Manifest
@@ -1,6 +1,5 @@
-DIST kross-interpreters-19.04.3.tar.xz 150404 BLAKE2B 36e620728e390f6d26887ae6e80324ba5cbeae16d7b6f423abba3cdcf74955320eafe9921cc2fc34fbdf0d95feec87c0eae8883d5a5f767fb29092c19934bdb9 SHA512 3c9810d9870b69af984d416d031ac30cbe26514ea9734feee70a32d915acafea531a621a085adcd95e0d0e67c92f8508de94e749aae89c825520c2adf6a674a3
 DIST kross-interpreters-19.08.3.tar.xz 151832 BLAKE2B d6ec5c4fb21100a1548beab6c16600120a181aea1dc2da4753c36d9466dc485a17bc54ca49aa97fcf5f968c998a70f4d028daa18bf7a81052b86d2589fea9fd7 SHA512 2c8fc01bf004b4d5780eb6ba0462dc98681abcc6437f06ae35505e4ea8052aaee82d1d4d45d7696ea473e85df051fdf80e6e4112122a6fe45727f8f2a7ec050e
-EBUILD kross-interpreters-19.04.3-r1.ebuild 745 BLAKE2B 7739d19773cb05b232e432bae0d736035444b6cb67ae2bb350b5108c506157b2027cd7e1dea7bd51ddcc9d386532a245277d31c740afea45329f9c9237d6d58b SHA512 5b5e7e4660f3f3b153e393b2fa49b0b758e953bf21d3b95b08971c5efe847db96cb922fc74ffd82ebdb2f03a8bfc549a52d113bda42d24d0e274794126347511
-EBUILD kross-interpreters-19.04.3.ebuild 745 BLAKE2B 124f482ddb10eed49a45deccc1332e79b0408a5f8c311586d5b780592b387f52bea23b80e2fd38a7b16b8a9f4221dc984686aec5ff9258ef1f531b64bb0cad62 SHA512 1f7a675e3f45eccc3cbd63af5d1a60e2298fbcd031986dc9130653ac0e8ff10106da932e7bfbe7d57e0bfe077122fa04af187280d2e3b5a26b85b73c98e7c67a
-EBUILD kross-interpreters-19.08.3.ebuild 836 BLAKE2B 8979c737288f66c7b68140794196b2680d8f4a2940f845bcba86bfb2340a2ea789dc8cf8d008ab7de91242eea4eefbf6990fd5dde8a9ab0e66bd1619cfedf6c3 SHA512 e86c2c82accba72336c9fdaf7f60cee87bc68dc2f67d0669986eae65740c68e04d5bf0897e69d0cae4b26dcc375432b2013e5218ab9ef353e40563139763a54a
+DIST kross-interpreters-19.12.0.tar.xz 151652 BLAKE2B 6cbc3bf1d71c0c137c6842e848a2492ba390ecc8e78f6bdf45f985d5f950f215c3da54b96d6e84b41546429ddd91eb62666fcf23baa20052de3cb453e94ca00d SHA512 6b793d7ea37c46f1ea18e703aa07cc58c973b538987e12a32422bedfbc2fc8ee9a893d52d5d319aaec098f160568068c094f4e38bda00b6b3f84b72f4cd6e28e
+EBUILD kross-interpreters-19.08.3.ebuild 833 BLAKE2B 72718f83160e9b6f87f2b573dec9f190ba57a5eec45752333940a0a2f7446ab11a1a5e6b9df52bc2462c5f78450c365d38a3c065dfe3f183816750fd9237deb7 SHA512 de95cc9bf768282752d77854cd95f70276b063d7235ad8113b781b01b11642a13c9a107090b04db90f8526defc2278c26002da35368524411163fbb407f1aa01
+EBUILD kross-interpreters-19.12.0.ebuild 837 BLAKE2B bde994d32be3baba2cd9cd6953a7bb66c09c179415519bfdf65c367e8e3cdbdafa6e58f27bd1ed5689511b116c7faa2e41f3f0a80a741ef6e6117d409d0f41ed SHA512 a549d40af8f658e95a66ea14809ab6cdd60bfbe859985e5c05c2807b3cea49f53cb86440ba65fbc0f41bc0865448be2ec1a4d3a35cc5a7288b6247e034c295ed
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kross-interpreters/kross-interpreters-19.04.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-19.04.3.ebuild
deleted file mode 100644
index 9b60119cb673..000000000000
--- a/kde-apps/kross-interpreters/kross-interpreters-19.04.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby24"
-inherit kde5 python-single-r1 ruby-single
-
-DESCRIPTION="Kross interpreter plugins for programming languages"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+python ruby"
-
-REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	$(add_frameworks_dep kross)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_python=$(usex python)
-		-DBUILD_ruby=$(usex ruby)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-apps/kross-interpreters/kross-interpreters-19.08.3.ebuild b/kde-apps/kross-interpreters/kross-interpreters-19.08.3.ebuild
index 9595b479bfef..202f4baed895 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-19.08.3.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-19.08.3.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org python-single-r1 ruby-single
 DESCRIPTION="Kross interpreter plugins for programming languages"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+python ruby"
 
 REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/kde-apps/kross-interpreters/kross-interpreters-19.04.3-r1.ebuild b/kde-apps/kross-interpreters/kross-interpreters-19.12.0.ebuild
index b2cd075da1da..4a104a9af2af 100644
--- a/kde-apps/kross-interpreters/kross-interpreters-19.04.3-r1.ebuild
+++ b/kde-apps/kross-interpreters/kross-interpreters-19.12.0.ebuild
@@ -5,18 +5,23 @@ EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 USE_RUBY="ruby25"
-inherit kde5 python-single-r1 ruby-single
+KFMIN=5.63.0
+QTMIN=5.12.3
+inherit ecm kde.org python-single-r1 ruby-single
 
 DESCRIPTION="Kross interpreter plugins for programming languages"
-KEYWORDS="amd64 arm64 x86"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="+python ruby"
 
 REQUIRED_USE="|| ( python ruby ) python? ( ${PYTHON_REQUIRED_USE} )"
 
 DEPEND="
-	$(add_frameworks_dep kross)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
+	>=kde-frameworks/kross-${KFMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( ${RUBY_DEPS} )
 "
@@ -24,7 +29,7 @@ RDEPEND="${DEPEND}"
 
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
-	kde5_pkg_setup
+	ecm_pkg_setup
 }
 
 src_configure() {
@@ -33,5 +38,5 @@ src_configure() {
 		-DBUILD_ruby=$(usex ruby)
 	)
 
-	kde5_src_configure
+	ecm_src_configure
 }