[gentoo-commits] proj/kde:master commit in: kde-apps/kaddressbook/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     53e8e0cccdf84a705b2e7198b0c53e0190afa3ca
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 17:01:32 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=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 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="prison">Enable support for QRcodes in contacts</flag>
-	</use>
 </pkgmetadata>