net-libs/libkgapi: pkgmove to kde-apps/libkgapi

Package-Manager: portage-2.3.3

15 files changed, 128 insertions, 10 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/kde-apps/libkgapi/Manifest b/kde-apps/libkgapi/Manifest
new file mode 100644
index 000000000000..cb474fcc1fa9
--- /dev/null
+++ b/kde-apps/libkgapi/Manifest
@@ -0,0 +1,2 @@
+DIST libkgapi-2.2.0.tar.bz2 127026 SHA256 c02965b639c2496d489d4f1865e35473db6f1b5e9e84fb079988d33db629c2b4 SHA512 c5f37aacb89243d7985d7064aa8941d3d2a6c26685113e876b38c737ea2e1126b40b0f88b0908e7ea8a7bcb2fade1dc528c2f73f22890b9e892c6d18d9d3bb42 WHIRLPOOL 1aa1d5c661098793a6c6a112ed92198c044cd0ab9e320631e165dc2cbb510df6c7d0a96412b2147728aaba822e40c571c07ca2b88ad5f5a055c0755490774a08
+DIST libkgapi-5.3.1.tar.xz 159584 SHA256 366692ced93442809175351f5590e6a82c4e6316f21d989c239bb72132a601fa SHA512 257d1beea9615e9daa05333ad2de948a4e729c6cad192acbd50803be51ee86d7b3665a05fb94b40afc1bcdfcb5dbf5c2c8d2e6d635cf9c1988fe169ec69462cd WHIRLPOOL 2c9c1c073702af0fdc8dd56410299a6547a6dd0a263e8eb20d162f153ceca8aa56efb7c8666c7594f270b5d3fee2ec2543d1569aeed80700bfdae8541bdc36fb
diff --git a/kde-apps/libkgapi/files/libkgapi-5.3.1-qt-5.8.patch b/kde-apps/libkgapi/files/libkgapi-5.3.1-qt-5.8.patch
new file mode 100644
index 000000000000..a7f69a86caeb
--- /dev/null
+++ b/kde-apps/libkgapi/files/libkgapi-5.3.1-qt-5.8.patch
@@ -0,0 +1,52 @@
+From 03a019820e9da9cf293a3ac66e55da745894c504 Mon Sep 17 00:00:00 2001
+From: Milian Wolff <mail@milianw.de>
+Date: Tue, 31 Jan 2017 17:18:57 +0100
+Subject: Fix compile with Qt 5.8: add missing QImage includes
+
+---
+ src/contacts/contactcreatejob.cpp     | 2 +-
+ src/contacts/contactfetchphotojob.cpp | 1 +
+ src/contacts/contactmodifyjob.cpp     | 2 +-
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/contacts/contactcreatejob.cpp b/src/contacts/contactcreatejob.cpp
+index 5f41c1a..a7eb5f7 100644
+--- a/src/contacts/contactcreatejob.cpp
++++ b/src/contacts/contactcreatejob.cpp
+@@ -31,7 +31,7 @@
+ #include <QtNetwork/QNetworkRequest>
+ #include <QtNetwork/QNetworkReply>
+ #include <QtCore/QBuffer>
+-
++#include <QtGui/QImage>
+ 
+ using namespace KGAPI2;
+ 
+diff --git a/src/contacts/contactfetchphotojob.cpp b/src/contacts/contactfetchphotojob.cpp
+index 54606cb..a3ebe48 100644
+--- a/src/contacts/contactfetchphotojob.cpp
++++ b/src/contacts/contactfetchphotojob.cpp
+@@ -28,6 +28,7 @@
+ 
+ #include <QtNetwork/QNetworkRequest>
+ #include <QtNetwork/QNetworkReply>
++#include <QtGui/QImage>
+ 
+ Q_DECLARE_METATYPE(KGAPI2::ContactPtr)
+ 
+diff --git a/src/contacts/contactmodifyjob.cpp b/src/contacts/contactmodifyjob.cpp
+index ead5787..03a0e73 100644
+--- a/src/contacts/contactmodifyjob.cpp
++++ b/src/contacts/contactmodifyjob.cpp
+@@ -31,7 +31,7 @@
+ #include <QtNetwork/QNetworkRequest>
+ #include <QtNetwork/QNetworkReply>
+ #include <QtCore/QBuffer>
+-
++#include <QtGui/QImage>
+ 
+ using namespace KGAPI2;
+ 
+-- 
+cgit v0.11.2
+
diff --git a/kde-apps/libkgapi/libkgapi-2.2.0.ebuild b/kde-apps/libkgapi/libkgapi-2.2.0.ebuild
new file mode 100644
index 000000000000..4722687d7058
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-2.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+WEBKIT_REQUIRED="always"
+inherit kde4-base
+
+DESCRIPTION="Library for accessing Google calendar and contact resources"
+HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkgapi"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 ~arm x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdeapps_dep kdepimlibs '' 4.14)
+	dev-libs/qjson
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-apps/libkgapi/libkgapi-5.3.1-r1.ebuild b/kde-apps/libkgapi/libkgapi-5.3.1-r1.ebuild
new file mode 100644
index 000000000000..9f749f196920
--- /dev/null
+++ b/kde-apps/libkgapi/libkgapi-5.3.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Library for accessing Google calendar and contact resources"
+HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkgapi"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebkit)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt-5.8.patch )
diff --git a/kde-apps/libkgapi/metadata.xml b/kde-apps/libkgapi/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/kde-apps/libkgapi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>