public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/
Date: Wed, 13 Sep 2017 17:09:24 +0000 (UTC)	[thread overview]
Message-ID: <1505322555.1aad81f1e95f32e45b962e565e3346c52468517c.asturm@gentoo> (raw)

commit:     1aad81f1e95f32e45b962e565e3346c52468517c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 17:02:42 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 17:09:15 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1aad81f1

kde-apps/akonadi-contacts: Drop USE=prison, no longer optional

Gentoo-bug: d6c7309b032f340f446586d90030b840a3a9d3ee

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../akonadi-contacts/akonadi-contacts-17.08.49.9999.ebuild   | 12 ++----------
 kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild       | 12 ++----------
 kde-apps/akonadi-contacts/metadata.xml                       |  3 ---
 3 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-17.08.49.9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-17.08.49.9999.ebuild
index 367373cda6..f5cd2e864e 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-17.08.49.9999.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-17.08.49.9999.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Library for akonadi contact integration"
 KEYWORDS=""
 LICENSE="GPL-2+"
-IUSE="prison"
+IUSE=""
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT+=" test"
@@ -29,6 +29,7 @@ DEPEND="
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep prison)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kcontacts)
@@ -38,16 +39,7 @@ DEPEND="
 	$(add_qt_dep qtwebengine 'widgets')
 	$(add_qt_dep qtwidgets)
 	>=dev-libs/grantlee-5.1.0:5
-	prison? ( $(add_frameworks_dep prison) )
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 "
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package prison KF5Prison)
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
index 367373cda6..f5cd2e864e 100644
--- a/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
+++ b/kde-apps/akonadi-contacts/akonadi-contacts-9999.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 DESCRIPTION="Library for akonadi contact integration"
 KEYWORDS=""
 LICENSE="GPL-2+"
-IUSE="prison"
+IUSE=""
 
 # some akonadi tests time out, that probably needs more work as it's ~700 tests
 RESTRICT+=" test"
@@ -29,6 +29,7 @@ DEPEND="
 	$(add_frameworks_dep ktextwidgets)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep prison)
 	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-mime)
 	$(add_kdeapps_dep kcontacts)
@@ -38,16 +39,7 @@ DEPEND="
 	$(add_qt_dep qtwebengine 'widgets')
 	$(add_qt_dep qtwidgets)
 	>=dev-libs/grantlee-5.1.0:5
-	prison? ( $(add_frameworks_dep prison) )
 "
 RDEPEND="${DEPEND}
 	!kde-apps/kdepim-l10n
 "
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package prison KF5Prison)
-	)
-
-	kde5_src_configure
-}

diff --git a/kde-apps/akonadi-contacts/metadata.xml b/kde-apps/akonadi-contacts/metadata.xml
index b17398a5cb..2fdbf33d96 100644
--- a/kde-apps/akonadi-contacts/metadata.xml
+++ b/kde-apps/akonadi-contacts/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="prison">Enable support for QRcodes in contacts</flag>
-	</use>
 </pkgmetadata>


             reply	other threads:[~2017-09-13 17:09 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-13 17:09 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-07-22 20:59 [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi-contacts/ Sam James
2024-09-12 19:30 Andreas Sturmlechner
2024-08-11  6:58 Andreas Sturmlechner
2024-08-10 19:55 Andreas Sturmlechner
2024-05-17 19:50 Andreas Sturmlechner
2024-02-29  3:13 Sam James
2023-08-06 20:39 Andreas Sturmlechner
2021-11-15 10:59 Andreas Sturmlechner
2020-02-23 11:38 Andreas Sturmlechner
2020-02-23 11:38 Andreas Sturmlechner
2018-03-08 20:55 Andreas Sturmlechner
2018-03-05 17:13 Andreas Sturmlechner
2017-12-25 10:14 Michael Palimaka
2017-10-11  5:19 Johannes Huber
2016-08-10 15:35 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1505322555.1aad81f1e95f32e45b962e565e3346c52468517c.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox