gentoo resync : 15.01.2020

4 files changed, 9 insertions, 52 deletions

diff --git a/games-kids/Manifest.gz b/games-kids/Manifest.gz
index 11edf31a7b6c..4bceaffccf06 100644
--- a/games-kids/Manifest.gz
+++ b/games-kids/Manifest.gz
diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index 85b9e10a2693..ac0c110e45f2 100644
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -1,5 +1,3 @@
-DIST gcompris-qt-0.96.tar.xz 73221940 BLAKE2B e6d81d1630d962709a1ab27c8735ac42ce67182440f3e78a7d3f39b59b28617211dddf3f6d62a323ee5af7f147e2dc784ff0b305bee7b345d1e59d3ed576ef1a SHA512 980bac743d786d3b35c28cec90bd785d568177c9299f5460918124d111565609fbcd35ec76412776151f6fe12ba9ab3efc77bc5cb05895e54dc7822f9862214c
 DIST gcompris-qt-0.97.tar.xz 75362060 BLAKE2B e6bc429ba4a8a622792935c9b2e68149f5c1f4d9aae4cac84ca517ebe83e59a9b4307f6ce84b36e658256cad5c8bd37b7cbc60a058b6d65be372ad1934cf666f SHA512 23cc807238121a6ea3abb8816795b2f3b243c3be1acf782705468d92758a2032a8cb5393c3c30028877d174ff53ebc3a62f69e9045bc70a5281d1d245b6e4eba
-EBUILD gcompris-0.96.ebuild 907 BLAKE2B f4b9eb381067e3c38ff9b5ae5da1973115a725f82a0a2d0b8f835cdd7a8bc1a7c14e55f46bcfc2e670968db1fa06b54882322c4549401f06d65f8233666739ba SHA512 821453c28e7e2cf8d22088d86c9b4a1f5bd8e032412ef735c0aef5bd9bd6cf6ccdbbd19de3df0f4bdeef9cf2782eb166326fdf1173c1cb4cd81b90ca5546d9cb
-EBUILD gcompris-0.97.ebuild 1017 BLAKE2B 2386bae2dc68d7862a95d49ddd111804bfffa2d29bc4fb07f9ce71abe4c99c14dcde13d7b87382d7cefe10532bea9fd1627cdb34c37ece284e2b3433f8373f43 SHA512 61b9343d71ba968dac11c92f064834091cc974298aa4c4fe602b17727b6a5cbbcac48e91650667a19908d44ca44a1a014f8b0ea6429238e8ad026605a5c2b3f3
+EBUILD gcompris-0.97-r1.ebuild 1173 BLAKE2B 673dc4375149384ab5b92df443412b98cd14803511de077a3cd671212070b0ea87802427dc929bca1929aa2d234f9d3964e205f6628778b6316833d82e0713ca SHA512 82f9d30131023be4332c3c5104713fb8ca7be1f78cf513f29b7e5e26dc98e7c92f82d09eafeb64e99accf9a6fcd1ccff8cdb287c9033ace3540673829650a581
 MISC metadata.xml 497 BLAKE2B b7025c9c4c39cb4738b1fba707dd139b53acc16a2054597bddc2fe1ef7130c276c0e623f5e5b81e7942c7ebd69a6f364e16d2804368e89b527852a6f0a6ec4c5 SHA512 578a96a0961e84fbbc48aea9d0b6d1d69bec48a8be8fb97fbfa213feb31dd6424cb39c07a11c9569d10090cc9fbbc6d376d5d8db001cc3ec7ee8714c69c9471d
diff --git a/games-kids/gcompris/gcompris-0.96.ebuild b/games-kids/gcompris/gcompris-0.96.ebuild
deleted file mode 100644
index aba03db4d756..000000000000
--- a/games-kids/gcompris/gcompris-0.96.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils desktop
-
-DESCRIPTION="full featured educational application for children from 2 to 10"
-HOMEPAGE="https://gcompris.net/"
-SRC_URI="https://gcompris.net/download/qt/src/gcompris-qt-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgraphicaleffects:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5[qml]
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtsensors:5[qml]
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-qt-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		# TODO: add box2d support
-		-DQML_BOX2D_MODULE=disabled
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	domenu org.kde.gcompris.desktop
-}
diff --git a/games-kids/gcompris/gcompris-0.97.ebuild b/games-kids/gcompris/gcompris-0.97-r1.ebuild
index 213187432c4f..c320ebcd4ec7 100644
--- a/games-kids/gcompris/gcompris-0.97.ebuild
+++ b/games-kids/gcompris/gcompris-0.97-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,18 +28,23 @@ BDEPEND="
 		sys-devel/clang
 	)
 "
-RDEPEND="
+COMMON_DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtsensors-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtmultimedia-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
 	>=dev-qt/qtxmlpatterns-${QTMIN}:5
 "
+RDEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5[qml]
+	>=dev-qt/qtquickcontrols-${QTMIN}:5
+"
 
 src_configure() {
 	local mycmakeargs=(