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 259751396D0 for ; Wed, 13 Sep 2017 17:09:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83A75E0D09; Wed, 13 Sep 2017 17:09:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 5107BE0D09 for ; Wed, 13 Sep 2017 17:09:27 +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 292D233FE7D for ; Wed, 13 Sep 2017 17:09:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10AB8907D for ; Wed, 13 Sep 2017 17:09:24 +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: <1505322555.53e8e0cccdf84a705b2e7198b0c53e0190afa3ca.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kaddressbook/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kaddressbook/kaddressbook-17.08.49.9999.ebuild kde-apps/kaddressbook/kaddressbook-9999.ebuild kde-apps/kaddressbook/metadata.xml X-VCS-Directories: kde-apps/kaddressbook/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 53e8e0cccdf84a705b2e7198b0c53e0190afa3ca X-VCS-Branch: master Date: Wed, 13 Sep 2017 17:09:24 +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-Archives-Salt: 1a3c494a-304e-431b-ad7d-4b2ba563f80a X-Archives-Hash: f3ca1434457487af1571a783d1c375f8 commit: 53e8e0cccdf84a705b2e7198b0c53e0190afa3ca Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Sep 13 17:01:32 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Sep 13 17:09:15 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=53e8e0cc kde-apps/kaddressbook: Drop USE=prison, no longer optional Upstream commit 98cf37b6e6ab31d371f567ee6229d2ff8d29889d Package-Manager: Portage-2.3.8, Repoman-2.3.3 kde-apps/kaddressbook/kaddressbook-17.08.49.9999.ebuild | 12 ++---------- kde-apps/kaddressbook/kaddressbook-9999.ebuild | 12 ++---------- kde-apps/kaddressbook/metadata.xml | 3 --- 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/kde-apps/kaddressbook/kaddressbook-17.08.49.9999.ebuild b/kde-apps/kaddressbook/kaddressbook-17.08.49.9999.ebuild index 7f9b2eb228..be59b696b1 100644 --- a/kde-apps/kaddressbook/kaddressbook-17.08.49.9999.ebuild +++ b/kde-apps/kaddressbook/kaddressbook-17.08.49.9999.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/" LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" -IUSE="prison" +IUSE="" COMMON_DEPEND=" $(add_frameworks_dep kcmutils) @@ -33,6 +33,7 @@ COMMON_DEPEND=" $(add_frameworks_dep kservice) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep prison) $(add_kdeapps_dep akonadi) $(add_kdeapps_dep akonadi-contacts) $(add_kdeapps_dep akonadi-search) @@ -49,7 +50,6 @@ COMMON_DEPEND=" $(add_qt_dep qtwidgets) >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 - prison? ( $(add_frameworks_dep prison) ) " DEPEND="${COMMON_DEPEND} test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') ) @@ -58,11 +58,3 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/kdepim-l10n $(add_kdeapps_dep kdepim-runtime) " - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package prison KF5Prison) - ) - - kde5_src_configure -} diff --git a/kde-apps/kaddressbook/kaddressbook-9999.ebuild b/kde-apps/kaddressbook/kaddressbook-9999.ebuild index 7f9b2eb228..be59b696b1 100644 --- a/kde-apps/kaddressbook/kaddressbook-9999.ebuild +++ b/kde-apps/kaddressbook/kaddressbook-9999.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://www.kde.org/applications/office/kaddressbook/" LICENSE="GPL-2+ handbook? ( FDL-1.2+ )" KEYWORDS="" -IUSE="prison" +IUSE="" COMMON_DEPEND=" $(add_frameworks_dep kcmutils) @@ -33,6 +33,7 @@ COMMON_DEPEND=" $(add_frameworks_dep kservice) $(add_frameworks_dep kwidgetsaddons) $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep prison) $(add_kdeapps_dep akonadi) $(add_kdeapps_dep akonadi-contacts) $(add_kdeapps_dep akonadi-search) @@ -49,7 +50,6 @@ COMMON_DEPEND=" $(add_qt_dep qtwidgets) >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 - prison? ( $(add_frameworks_dep prison) ) " DEPEND="${COMMON_DEPEND} test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') ) @@ -58,11 +58,3 @@ RDEPEND="${COMMON_DEPEND} !kde-apps/kdepim-l10n $(add_kdeapps_dep kdepim-runtime) " - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package prison KF5Prison) - ) - - kde5_src_configure -} diff --git a/kde-apps/kaddressbook/metadata.xml b/kde-apps/kaddressbook/metadata.xml index b17398a5cb..2fdbf33d96 100644 --- a/kde-apps/kaddressbook/metadata.xml +++ b/kde-apps/kaddressbook/metadata.xml @@ -5,7 +5,4 @@ kde@gentoo.org Gentoo KDE Project - - Enable support for QRcodes in contacts -