summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-09-13 19:01:32 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-09-13 19:09:15 +0200
commit53e8e0cccdf84a705b2e7198b0c53e0190afa3ca (patch)
tree9c607b19d3c8aacc6ebb442261cda4e041d6f786
parent2fe403cdd524f496b74d15cad1012e3c38322e97 (diff)
downloadkde-53e8e0cccdf84a705b2e7198b0c53e0190afa3ca.tar.gz
kde-53e8e0cccdf84a705b2e7198b0c53e0190afa3ca.tar.bz2
kde-53e8e0cccdf84a705b2e7198b0c53e0190afa3ca.zip
kde-apps/kaddressbook: Drop USE=prison, no longer optional
Upstream commit 98cf37b6e6ab31d371f567ee6229d2ff8d29889d Package-Manager: Portage-2.3.8, Repoman-2.3.3
-rw-r--r--kde-apps/kaddressbook/kaddressbook-17.08.49.9999.ebuild12
-rw-r--r--kde-apps/kaddressbook/kaddressbook-9999.ebuild12
-rw-r--r--kde-apps/kaddressbook/metadata.xml3
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 7f9b2eb228b..be59b696b1d 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 7f9b2eb228b..be59b696b1d 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 b17398a5cb9..2fdbf33d963 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>