[gentoo-commits] proj/kde-sunset:master commit in: kde-base/smokeqt/

[gentoo-commits] proj/kde-sunset:master commit in: kde-base/smokeqt/

[Andreas Sturmlechner]

commit:     61b9965393e5e118fc20f908af825cf060472637
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 15:59:50 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 16:00:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=61b99653

kde-base/smokeqt: Depend on media-libs/qimageblitz[-qt5]

This is required to avoid mixing Qt versions at runtime.

Thanks-to: Stas Cymbalov <dummyunit <AT> gmail.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild b/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild
index 8d852da5..7c73ff3e 100644
--- a/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild
+++ b/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,7 +28,7 @@ DEPEND="
 	dev-qt/qtsvg:4
 	dev-qt/qttest:4
 	phonon? ( media-libs/phonon[qt4] )
-	qimageblitz? ( >=media-libs/qimageblitz-0.0.4 )
+	qimageblitz? ( >=media-libs/qimageblitz-0.0.4[-qt5(+)] )
 	qscintilla? ( x11-libs/qscintilla:= )
 	qwt? ( x11-libs/qwt:5[svg] )
 	webkit? ( dev-qt/qtwebkit:4 )

[gentoo-commits] proj/kde-sunset:master commit in: kde-base/smokeqt/

[Andreas Sturmlechner]

commit:     d6bb55012be0bed26019df91adf177d1ca695a93
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 18:01:56 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 18:18:56 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=d6bb5501

kde-base/smokeqt: Switch to x11-libs/qscintilla:0-qt4=, drop ~arm

Missing ~arm KEYWORD on x11-libs/qscintilla

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild b/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild
index 1213315c..25a61ae4 100644
--- a/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild
+++ b/kde-base/smokeqt/smokeqt-4.14.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,14 +8,14 @@ MULTIMEDIA_REQUIRED="optional"
 QTHELP_REQUIRED="optional"
 OPENGL_REQUIRED="optional"
 KDE_REQUIRED="never"
-
 inherit kde4-base
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine - Qt bindings"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="debug +phonon qimageblitz qscintilla qwt webkit xmlpatterns"
 HOMEPAGE="https://techbase.kde.org/Development/Languages/Smoke"
 
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="debug +phonon qimageblitz qscintilla qwt webkit xmlpatterns"
+
 # Maybe make more of Qt optional?
 DEPEND="
 	$(add_kdebase_dep smokegen)
@@ -29,7 +29,7 @@ DEPEND="
 	dev-qt/qttest:4
 	phonon? ( media-libs/phonon:0-qt4 )
 	qimageblitz? ( >=media-libs/qimageblitz-0.0.4[-qt5(+)] )
-	qscintilla? ( x11-libs/qscintilla:= )
+	qscintilla? ( x11-libs/qscintilla:0-qt4= )
 	qwt? ( x11-libs/qwt:5[svg] )
 	webkit? ( dev-qt/qtwebkit:4 )
 	xmlpatterns? ( dev-qt/qtxmlpatterns:4 )