From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 35994138359 for ; Sun, 16 Aug 2020 16:01:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A73BE0880; Sun, 16 Aug 2020 16:01:02 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7A5AE087F for ; Sun, 16 Aug 2020 16:01:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D69234F2A6 for ; Sun, 16 Aug 2020 16:01:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D977324 for ; Sun, 16 Aug 2020 16:00:58 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1597593645.44b47cf0f0a5ac2e2aa5f361d397964051e6989c.asturm@gentoo> Subject: [gentoo-commits] proj/kde-sunset:master commit in: kde-apps/okular/ X-VCS-Repository: proj/kde-sunset X-VCS-Files: kde-apps/okular/okular-16.08.3.ebuild kde-apps/okular/okular-4.14.3.ebuild X-VCS-Directories: kde-apps/okular/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 44b47cf0f0a5ac2e2aa5f361d397964051e6989c X-VCS-Branch: master Date: Sun, 16 Aug 2020 16:00:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7f67db4b-88dd-4c88-8c75-e7a3de89b7b9 X-Archives-Hash: 9c8f27b3b712eb79cf6342e2b608e0f5 commit: 44b47cf0f0a5ac2e2aa5f361d397964051e6989c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 16 15:59:47 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 16 16:00:45 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=44b47cf0 kde-apps/okular: Depend on media-libs/qimageblitz[-qt5] This is required to avoid mixing Qt versions at runtime. Thanks-to: Stas Cymbalov gmail.com> Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/okular/okular-16.08.3.ebuild | 4 ++-- kde-apps/okular/okular-4.14.3.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kde-apps/okular/okular-16.08.3.ebuild b/kde-apps/okular/okular-16.08.3.ebuild index 49fd93a4..e23e02ae 100644 --- a/kde-apps/okular/okular-16.08.3.ebuild +++ b/kde-apps/okular/okular-16.08.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -18,7 +18,7 @@ IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff" DEPEND=" media-libs/freetype media-libs/phonon[qt4] - media-libs/qimageblitz + media-libs/qimageblitz[-qt5(+)] sys-libs/zlib chm? ( dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt4] ) diff --git a/kde-apps/okular/okular-4.14.3.ebuild b/kde-apps/okular/okular-4.14.3.ebuild index b9868b3f..fcc23aa3 100644 --- a/kde-apps/okular/okular-4.14.3.ebuild +++ b/kde-apps/okular/okular-4.14.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -18,7 +18,7 @@ IUSE="chm crypt debug djvu dpi ebook +jpeg mobi +postscript +pdf +tiff" DEPEND=" media-libs/freetype - media-libs/qimageblitz + media-libs/qimageblitz[-qt5(+)] sys-libs/zlib chm? ( dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt4(+)] )