commit: 3b17aa016a0d8ef623e4b9454023f4930afad97f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 17:08:26 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=3b17aa01
kde-apps/kdepim-apps-libs: Drop USE=prison, no longer optional
Upstream commit e056b4df1922e41641b18cad4b1355c71c11a315
Package-Manager: Portage-2.3.8, Repoman-2.3.3
.../kdepim-apps-libs/kdepim-apps-libs-17.08.49.9999.ebuild | 12 ++----------
kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild | 12 ++----------
kde-apps/kdepim-apps-libs/metadata.xml | 3 ---
3 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.08.49.9999.ebuild
b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.08.49.9999.ebuild
index ab485d0e06..863412a80c 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.08.49.9999.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-17.08.49.9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Libraries for KDE PIM applications"
LICENSE="GPL-2+ LGPL-2.1+"
KEYWORDS=""
-IUSE="prison"
+IUSE=""
DEPEND="
$(add_frameworks_dep kconfig)
@@ -21,6 +21,7 @@ DEPEND="
$(add_frameworks_dep kio)
$(add_frameworks_dep kservice)
$(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep prison)
$(add_kdeapps_dep akonadi)
$(add_kdeapps_dep akonadi-contacts)
$(add_kdeapps_dep grantleetheme)
@@ -31,16 +32,7 @@ DEPEND="
$(add_qt_dep qtgui)
$(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/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
index ab485d0e06..863412a80c 100644
--- a/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
+++ b/kde-apps/kdepim-apps-libs/kdepim-apps-libs-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
DESCRIPTION="Libraries for KDE PIM applications"
LICENSE="GPL-2+ LGPL-2.1+"
KEYWORDS=""
-IUSE="prison"
+IUSE=""
DEPEND="
$(add_frameworks_dep kconfig)
@@ -21,6 +21,7 @@ DEPEND="
$(add_frameworks_dep kio)
$(add_frameworks_dep kservice)
$(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep prison)
$(add_kdeapps_dep akonadi)
$(add_kdeapps_dep akonadi-contacts)
$(add_kdeapps_dep grantleetheme)
@@ -31,16 +32,7 @@ DEPEND="
$(add_qt_dep qtgui)
$(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/kdepim-apps-libs/metadata.xml
b/kde-apps/kdepim-apps-libs/metadata.xml
index b17398a5cb..2fdbf33d96 100644
--- a/kde-apps/kdepim-apps-libs/metadata.xml
+++ b/kde-apps/kdepim-apps-libs/metadata.xml
@@ -5,7 +5,4 @@
<email>k...@gentoo.org</email>
<name>Gentoo KDE Project</name>
</maintainer>
- <use>
- <flag name="prison">Enable support for QRcodes in
contacts</flag>
- </use>
</pkgmetadata>
