summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2015-12-28 19:21:39 +0100
committerMichael Palimaka <kensington@gentoo.org>2015-12-29 23:48:26 +1100
commitee09c0d1c9d0d71e5ac325da895573d967ffb96f (patch)
tree8945d52643b594474b31e31a0ed608f848653870
parent6688a113964607e2b67dcd49993775e41025c29d (diff)
downloadkde-ee09c0d1c9d0d71e5ac325da895573d967ffb96f.tar.gz
kde-ee09c0d1c9d0d71e5ac325da895573d967ffb96f.tar.bz2
kde-ee09c0d1c9d0d71e5ac325da895573d967ffb96f.zip
kde-apps/kaccounts-integration: Fix dependencies
Package-Manager: portage-2.2.24
-rw-r--r--kde-apps/kaccounts-integration/kaccounts-integration-15.12.0-r1.ebuild (renamed from kde-apps/kaccounts-integration/kaccounts-integration-15.12.0.ebuild)23
-rw-r--r--kde-apps/kaccounts-integration/kaccounts-integration-15.12.49.9999.ebuild23
-rw-r--r--kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild23
-rw-r--r--kde-apps/kaccounts-integration/metadata.xml3
4 files changed, 3 insertions, 69 deletions
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-15.12.0.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-15.12.0-r1.ebuild
index dd09186f8a2..37f168a9dbf 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-15.12.0.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-15.12.0-r1.ebuild
@@ -13,32 +13,20 @@ HOMEPAGE="https://community.kde.org/KTp"
LICENSE="LGPL-2.1"
KEYWORDS="~amd64 ~x86"
-IUSE="google"
+IUSE=""
COMMON_DEPEND="
- $(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdeclarative)
$(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kpackage)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_kdeapps_dep kcontacts)
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
- dev-qt/qtxml:5
net-libs/accounts-qt
net-libs/signond
- google? (
- dev-qt/qtwebkit:5
- net-libs/libkgapi:5
- )
"
DEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kcmutils)
@@ -48,12 +36,3 @@ RDEPEND="${COMMON_DEPEND}"
# bug #549444
RESTRICT="test"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package google KF5GAPI)
- $(cmake-utils_use_find_package google Qt5WebKitWidgets)
- )
-
- kde5_src_configure
-}
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-15.12.49.9999.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-15.12.49.9999.ebuild
index 9f1842bf01c..8ac0cd02d39 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-15.12.49.9999.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-15.12.49.9999.ebuild
@@ -13,32 +13,20 @@ HOMEPAGE="https://community.kde.org/KTp"
LICENSE="LGPL-2.1"
KEYWORDS=""
-IUSE="google"
+IUSE=""
COMMON_DEPEND="
- $(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdeclarative)
$(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kpackage)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_kdeapps_dep kcontacts)
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
- dev-qt/qtxml:5
net-libs/accounts-qt
net-libs/signond
- google? (
- dev-qt/qtwebkit:5
- net-libs/libkgapi:5
- )
"
DEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kcmutils)
@@ -48,12 +36,3 @@ RDEPEND="${COMMON_DEPEND}"
# bug #549444
RESTRICT="test"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package google KF5GAPI)
- $(cmake-utils_use_find_package google Qt5WebKitWidgets)
- )
-
- kde5_src_configure
-}
diff --git a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
index 9f1842bf01c..8ac0cd02d39 100644
--- a/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
+++ b/kde-apps/kaccounts-integration/kaccounts-integration-9999.ebuild
@@ -13,32 +13,20 @@ HOMEPAGE="https://community.kde.org/KTp"
LICENSE="LGPL-2.1"
KEYWORDS=""
-IUSE="google"
+IUSE=""
COMMON_DEPEND="
- $(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kdbusaddons)
$(add_frameworks_dep kdeclarative)
$(add_frameworks_dep ki18n)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kpackage)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_kdeapps_dep kcontacts)
dev-qt/qtdbus:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
- dev-qt/qtxml:5
net-libs/accounts-qt
net-libs/signond
- google? (
- dev-qt/qtwebkit:5
- net-libs/libkgapi:5
- )
"
DEPEND="${COMMON_DEPEND}
$(add_frameworks_dep kcmutils)
@@ -48,12 +36,3 @@ RDEPEND="${COMMON_DEPEND}"
# bug #549444
RESTRICT="test"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package google KF5GAPI)
- $(cmake-utils_use_find_package google Qt5WebKitWidgets)
- )
-
- kde5_src_configure
-}
diff --git a/kde-apps/kaccounts-integration/metadata.xml b/kde-apps/kaccounts-integration/metadata.xml
index f08407c4338..a23f444b67d 100644
--- a/kde-apps/kaccounts-integration/metadata.xml
+++ b/kde-apps/kaccounts-integration/metadata.xml
@@ -2,7 +2,4 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>kde</herd>
- <use>
- <flag name="google">Enable support for Google Contacts Sync via <pkg>kde-apps/libkgapi</pkg></flag>
- </use>
</pkgmetadata>