From 1aad81f1e95f32e45b962e565e3346c52468517c Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Wed, 13 Sep 2017 19:02:42 +0200
Subject: 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 367373cda69..f5cd2e864e6 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 367373cda69..f5cd2e864e6 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 b17398a5cb9..2fdbf33d963 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>
-- 
cgit v1.2.3