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 4D2F1138334 for ; Sun, 23 Dec 2018 17:19:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E9B58E0A60; Sun, 23 Dec 2018 17:19:33 +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 C41E8E09FD for ; Sun, 23 Dec 2018 17:19:33 +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 6626A335CC1 for ; Sun, 23 Dec 2018 17:19:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C0EA4FB for ; Sun, 23 Dec 2018 17:19:29 +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: <1545585135.8a0996554a4b45c0c0b080670a83369e8fc477f5.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: media-plugins/kipi-plugins/ X-VCS-Repository: proj/kde X-VCS-Files: media-plugins/kipi-plugins/kipi-plugins-9999.ebuild X-VCS-Directories: media-plugins/kipi-plugins/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8a0996554a4b45c0c0b080670a83369e8fc477f5 X-VCS-Branch: master Date: Sun, 23 Dec 2018 17:19:29 +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: cf60acae-1d72-476e-850d-733be3eaed78 X-Archives-Hash: 7047202b2abe3c2dc4c24e85ad50a697 commit: 8a0996554a4b45c0c0b080670a83369e8fc477f5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Dec 23 16:59:10 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 23 17:12:15 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8a099655 media-plugins/kipi-plugins: Cleanup, no longer a 'digiKam' project Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kipi-plugins/kipi-plugins-9999.ebuild | 40 ++++------------------ 1 file changed, 7 insertions(+), 33 deletions(-) diff --git a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild index 5a19db4293..3cf1afdd1a 100644 --- a/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild +++ b/media-plugins/kipi-plugins/kipi-plugins-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,24 +9,15 @@ inherit kde5 DESCRIPTION="Plugins for the KDE Image Plugin Interface" HOMEPAGE="https://www.digikam.org/" -LICENSE="GPL-2+" -IUSE="flashexport mediawiki +remotestorage vkontakte" - if [[ ${KDE_BUILD_TYPE} = release ]]; then KEYWORDS="~amd64 ~x86" - if [[ ${PV} =~ beta[0-9]$ ]]; then - SRC_BRANCH="unstable" - else - SRC_BRANCH="stable" - fi - - MY_PV="${PV/_/-}" - MY_P="digikam-${MY_PV}" - SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz" - S="${WORKDIR}/${MY_P}/extra/${PN}" + SRC_URI="mirror://kde/stable/digikam/digikam-${PV}.tar.xz" fi -COMMON_DEPEND=" +LICENSE="GPL-2+" +IUSE="flashexport mediawiki +remotestorage vkontakte" + +RDEPEND=" $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -47,27 +38,10 @@ COMMON_DEPEND=" remotestorage? ( $(add_frameworks_dep kio) ) vkontakte? ( net-libs/libkvkontakte:5 ) " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} $(add_qt_dep qtconcurrent) sys-devel/gettext " -RDEPEND="${COMMON_DEPEND} - !media-plugins/kipi-plugins:4 -" - -src_prepare() { - if [[ ${KDE_BUILD_TYPE} = release ]]; then - if [[ ${SRC_BRANCH} = stable ]]; then - # prepare the translations - mv "${WORKDIR}/${MY_P}/po" po || die - find po -name "*.po" -and -not -name "kipiplugin*.po" -delete || die - echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die - echo "add_subdirectory( po )" >> CMakeLists.txt || die - fi - fi - - kde5_src_prepare -} src_configure() { local mycmakeargs=(