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 DA8841382C5 for ; Mon, 15 Jun 2020 23:03:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA4C6E0E5D; Mon, 15 Jun 2020 23:03:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7EE83E0E5D for ; Mon, 15 Jun 2020 23:03:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 3E08F34F2DC for ; Mon, 15 Jun 2020 23:03:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0CBA92A8 for ; Mon, 15 Jun 2020 23:03:06 +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: <1592257549.97d71860a83c02289f52ea6c3e11dd8532ae2523.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-gfx/digikam/ X-VCS-Repository: proj/kde X-VCS-Files: media-gfx/digikam/digikam-9999.ebuild media-gfx/digikam/metadata.xml X-VCS-Directories: media-gfx/digikam/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 97d71860a83c02289f52ea6c3e11dd8532ae2523 X-VCS-Branch: master Date: Mon, 15 Jun 2020 23:03:06 +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: 23e16ddc-865c-4057-a573-c31251bbcdfb X-Archives-Hash: 00c7946069fb3cbec4730294fe80088e commit: 97d71860a83c02289f52ea6c3e11dd8532ae2523 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jun 15 21:45:49 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jun 15 21:45:49 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=97d71860 media-gfx/digikam: Drop IUSE=vkontakte Upstream commit fefc451b793c73d7f3ab05ebc65705e9dbc40f3f Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/digikam/digikam-9999.ebuild | 9 +++------ media-gfx/digikam/metadata.xml | 1 - 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/media-gfx/digikam/digikam-9999.ebuild b/media-gfx/digikam/digikam-9999.ebuild index 434ae7fe07..f96bf0ae40 100644 --- a/media-gfx/digikam/digikam-9999.ebuild +++ b/media-gfx/digikam/digikam-9999.ebuild @@ -8,12 +8,11 @@ QTMIN=5.12.3 inherit ecm kde.org toolchain-funcs if [[ ${KDE_BUILD_TYPE} != live ]]; then - MY_PV=${PV/_/-} - MY_P=${PN}-${MY_PV} + MY_P=${PN}-${PV/_/-} if [[ ${PV} =~ beta[0-9]$ ]]; then SRC_URI="mirror://kde/unstable/${PN}/" else - SRC_URI="mirror://kde/unstable/${PN}/${PV}/" + SRC_URI="mirror://kde/stable/${PN}/${PV}/" fi SRC_URI+="${MY_P}.tar.xz" KEYWORDS="~amd64 ~x86" @@ -25,7 +24,7 @@ HOMEPAGE="https://www.digikam.org/" LICENSE="GPL-2" SLOT="5" -IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" +IUSE="addressbook calendar gphoto2 heif +imagemagick +lensfun marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop webkit X" BDEPEND=" >=dev-util/cmake-3.14.3 @@ -91,7 +90,6 @@ COMMON_DEPEND=" panorama? ( >=kde-frameworks/threadweaver-${KFMIN}:5 ) scanner? ( >=kde-apps/libksane-19.04.3:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-${KFMIN}:5 ) - vkontakte? ( net-libs/libkvkontakte:5 ) !webkit? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) X? ( @@ -142,7 +140,6 @@ src_configure() { $(cmake_use_find_package panorama KF5ThreadWeaver) $(cmake_use_find_package scanner KF5Sane) $(cmake_use_find_package semantic-desktop KF5FileMetaData) - $(cmake_use_find_package vkontakte KF5Vkontakte) -DENABLE_QWEBENGINE=$(usex !webkit) $(cmake_use_find_package X X11) ) diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index a9fe85e506..f08d859d16 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -17,7 +17,6 @@ Enable support for media player using media-libs/qtav Build the panorama plugin which requires media-gfx/hugin Enable kde-frameworks/kfilemetadata support - Build net-libs/libkvkontakte plugin for vkontakte.ru Build with dev-qt/qtwebkit instead of dev-qt/qtwebengine