diff options
19 files changed, 15 insertions, 14 deletions
diff --git a/kde-apps/blogilo/blogilo-16.12.2.ebuild b/kde-apps/blogilo/blogilo-16.12.2.ebuild index 397ab5d04b00..2ce82d55a4e3 100644 --- a/kde-apps/blogilo/blogilo-16.12.2.ebuild +++ b/kde-apps/blogilo/blogilo-16.12.2.ebuild @@ -37,7 +37,7 @@ DEPEND=" $(add_qt_dep qtsql) $(add_qt_dep qtwebengine 'widgets') $(add_qt_dep qtwidgets) - google? ( net-libs/libkgapi:5 ) + google? ( $(add_kdeapps_dep libkgapi '' 5.3.1) ) " RDEPEND="${DEPEND} !<kde-apps/kdepim-apps-libs-16.04.50 diff --git a/kde-apps/blogilo/blogilo-4.14.11_pre20160211.ebuild b/kde-apps/blogilo/blogilo-4.14.11_pre20160211.ebuild index 10f89e038988..4972b8e1dd81 100644 --- a/kde-apps/blogilo/blogilo-4.14.11_pre20160211.ebuild +++ b/kde-apps/blogilo/blogilo-4.14.11_pre20160211.ebuild @@ -20,7 +20,7 @@ IUSE="debug" DEPEND=" $(add_kdeapps_dep kdepim-common-libs) $(add_kdeapps_dep kdepimlibs 'akonadi(+)') - >=net-libs/libkgapi-2.2.0:4 + $(add_kdeapps_dep libkgapi '' 2.2.0) " RDEPEND="${DEPEND}" diff --git a/kde-apps/blogilo/metadata.xml b/kde-apps/blogilo/metadata.xml index 800ffa1f7e9f..d52095404d1c 100644 --- a/kde-apps/blogilo/metadata.xml +++ b/kde-apps/blogilo/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo KDE Project</name> </maintainer> <use> - <flag name="google">Google service integration via <pkg>net-libs/libkgapi</pkg></flag> + <flag name="google">Google service integration via <pkg>kde-apps/libkgapi</pkg></flag> </use> </pkgmetadata> diff --git a/kde-apps/kdepim-addons/kdepim-addons-16.12.2.ebuild b/kde-apps/kdepim-addons/kdepim-addons-16.12.2.ebuild index 0ef0fef537b1..b85e6377a176 100644 --- a/kde-apps/kdepim-addons/kdepim-addons-16.12.2.ebuild +++ b/kde-apps/kdepim-addons/kdepim-addons-16.12.2.ebuild @@ -49,7 +49,7 @@ COMMON_DEPEND=" $(add_qt_dep qtnetwork) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) - google? ( net-libs/libkgapi:5 ) + google? ( $(add_kdeapps_dep libkgapi '' 5.3.1) ) " DEPEND="${COMMON_DEPEND} >=app-crypt/gpgme-1.7.1[cxx,qt5] diff --git a/kde-apps/kdepim-addons/metadata.xml b/kde-apps/kdepim-addons/metadata.xml index 800ffa1f7e9f..d52095404d1c 100644 --- a/kde-apps/kdepim-addons/metadata.xml +++ b/kde-apps/kdepim-addons/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo KDE Project</name> </maintainer> <use> - <flag name="google">Google service integration via <pkg>net-libs/libkgapi</pkg></flag> + <flag name="google">Google service integration via <pkg>kde-apps/libkgapi</pkg></flag> </use> </pkgmetadata> diff --git a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild index 4ec98aafeaef..cc3cd8f40964 100644 --- a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild +++ b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild @@ -23,7 +23,7 @@ DEPEND=" dev-libs/grantlee:0 kde-apps/akonadi:4 kde-frameworks/baloo:4 - google? ( net-libs/libkgapi:4 ) + google? ( $(add_kdeapps_dep libkgapi '' 2.2.0) ) " RDEPEND="${DEPEND} !kde-apps/libkdepim:4 diff --git a/kde-apps/kdepim-common-libs/metadata.xml b/kde-apps/kdepim-common-libs/metadata.xml index 800ffa1f7e9f..d52095404d1c 100644 --- a/kde-apps/kdepim-common-libs/metadata.xml +++ b/kde-apps/kdepim-common-libs/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo KDE Project</name> </maintainer> <use> - <flag name="google">Google service integration via <pkg>net-libs/libkgapi</pkg></flag> + <flag name="google">Google service integration via <pkg>kde-apps/libkgapi</pkg></flag> </use> </pkgmetadata> diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-16.12.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-16.12.2.ebuild index fef586ddd280..e625b93559b1 100644 --- a/kde-apps/kdepim-runtime/kdepim-runtime-16.12.2.ebuild +++ b/kde-apps/kdepim-runtime/kdepim-runtime-16.12.2.ebuild @@ -59,7 +59,7 @@ CDEPEND=" $(add_qt_dep qtxml) $(add_qt_dep qtxmlpatterns) dev-libs/libical:= - google? ( >=net-libs/libkgapi-5.1.0:5 ) + google? ( $(add_kdeapps_dep libkgapi '' 5.1.0) ) ssl? ( dev-libs/cyrus-sasl ) " DEPEND="${CDEPEND} diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211.ebuild index 8abef2016e6d..0f3c80ec296b 100644 --- a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211.ebuild +++ b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211.ebuild @@ -26,7 +26,7 @@ DEPEND=" dev-libs/libxslt kde-apps/akonadi:4 x11-misc/shared-mime-info - google? ( >=net-libs/libkgapi-2.0:4 ) + google? ( $(add_kdeapps_dep libkgapi '' 2.0) ) " RDEPEND="${DEPEND} kde-frameworks/oxygen-icons:5 diff --git a/kde-apps/kdepim-runtime/metadata.xml b/kde-apps/kdepim-runtime/metadata.xml index 65f42d1ea330..79bfb58e5487 100644 --- a/kde-apps/kdepim-runtime/metadata.xml +++ b/kde-apps/kdepim-runtime/metadata.xml @@ -6,6 +6,6 @@ <name>Gentoo KDE Project</name> </maintainer> <use> - <flag name="google">Google service integration via <pkg>net-libs/libkgapi</pkg></flag> + <flag name="google">Google service integration via <pkg>kde-apps/libkgapi</pkg></flag> </use> </pkgmetadata> diff --git a/net-libs/libkgapi/Manifest b/kde-apps/libkgapi/Manifest index cb474fcc1fa9..cb474fcc1fa9 100644 --- a/net-libs/libkgapi/Manifest +++ b/kde-apps/libkgapi/Manifest diff --git a/net-libs/libkgapi/files/libkgapi-5.3.1-qt-5.8.patch b/kde-apps/libkgapi/files/libkgapi-5.3.1-qt-5.8.patch index a7f69a86caeb..a7f69a86caeb 100644 --- a/net-libs/libkgapi/files/libkgapi-5.3.1-qt-5.8.patch +++ b/kde-apps/libkgapi/files/libkgapi-5.3.1-qt-5.8.patch diff --git a/net-libs/libkgapi/libkgapi-2.2.0.ebuild b/kde-apps/libkgapi/libkgapi-2.2.0.ebuild index 170145fa9674..4722687d7058 100644 --- a/net-libs/libkgapi/libkgapi-2.2.0.ebuild +++ b/kde-apps/libkgapi/libkgapi-2.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/net-libs/libkgapi/libkgapi-5.3.1-r1.ebuild b/kde-apps/libkgapi/libkgapi-5.3.1-r1.ebuild index 9f749f196920..9f749f196920 100644 --- a/net-libs/libkgapi/libkgapi-5.3.1-r1.ebuild +++ b/kde-apps/libkgapi/libkgapi-5.3.1-r1.ebuild diff --git a/net-libs/libkgapi/metadata.xml b/kde-apps/libkgapi/metadata.xml index 2fdbf33d963d..2fdbf33d963d 100644 --- a/net-libs/libkgapi/metadata.xml +++ b/kde-apps/libkgapi/metadata.xml diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.0.5.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.0.5.ebuild index 66eb96a9e69a..86dcd86bf291 100644 --- a/kde-misc/kio-gdrive/kio-gdrive-1.0.5.ebuild +++ b/kde-misc/kio-gdrive/kio-gdrive-1.0.5.ebuild @@ -22,9 +22,9 @@ DOCS=( README.md ) COMMON_DEPEND=" $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) + $(add_kdeapps_dep libkgapi '' 5.3.1) $(add_qt_dep qtwidgets) dev-libs/qtkeychain:=[qt5] - >=net-libs/libkgapi-5.3.1:5 " DEPEND="${COMMON_DEPEND} $(add_qt_dep qtgui) diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.1.0.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.1.0.ebuild index 3e204fbe0fa4..fcc322730bcf 100644 --- a/kde-misc/kio-gdrive/kio-gdrive-1.1.0.ebuild +++ b/kde-misc/kio-gdrive/kio-gdrive-1.1.0.ebuild @@ -21,9 +21,9 @@ DOCS=( README.md ) RDEPEND=" $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) + $(add_kdeapps_dep libkgapi '' 5.3.1) $(add_qt_dep qtwidgets) dev-libs/qtkeychain:=[qt5] - >=net-libs/libkgapi-5.3.1:5 " DEPEND="${RDEPEND} $(add_qt_dep qtgui) diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.1.1.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.1.1.ebuild index 3e204fbe0fa4..fcc322730bcf 100644 --- a/kde-misc/kio-gdrive/kio-gdrive-1.1.1.ebuild +++ b/kde-misc/kio-gdrive/kio-gdrive-1.1.1.ebuild @@ -21,9 +21,9 @@ DOCS=( README.md ) RDEPEND=" $(add_frameworks_dep ki18n) $(add_frameworks_dep kio) + $(add_kdeapps_dep libkgapi '' 5.3.1) $(add_qt_dep qtwidgets) dev-libs/qtkeychain:=[qt5] - >=net-libs/libkgapi-5.3.1:5 " DEPEND="${RDEPEND} $(add_qt_dep qtgui) diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017 index c4524311df08..09a6d6b0f1c1 100644 --- a/profiles/updates/1Q-2017 +++ b/profiles/updates/1Q-2017 @@ -1,3 +1,4 @@ move net-libs/libkpeople kde-frameworks/kpeople slotmove dev-libs/kirigami 5 1 move dev-libs/uchardet app-i18n/uchardet +move net-libs/libkgapi kde-apps/libkgapi |