[kde-misc/akonadi-googledata] Add live ebuild (move from kde-misc/googledata and improve), add linguas and fix deps

7 files changed, 29 insertions, 24 deletions

diff --git a/kde-misc/akonadi-googledata/Manifest b/kde-misc/akonadi-googledata/Manifest
index f1de65fcb93..1dd636cd54f 100644
--- a/kde-misc/akonadi-googledata/Manifest
+++ b/kde-misc/akonadi-googledata/Manifest
@@ -1,3 +1,4 @@
 DIST akonadi-googledata-1.1.0.tar.bz2 122477 RMD160 e3b57c635f94b852a684f454fb00afc97e4615bb SHA1 42bb239f186e712336b47a4c2d62c1d01a2450e4 SHA256 f4d78c4dfb08254b3f4dc1c1058934a6923eb89294a28b2aac1ce7deb22c66f4
-EBUILD akonadi-googledata-1.1.0.ebuild 499 RMD160 26ee31e3219b424cc36c490c1292446464a82729 SHA1 0c1faf4e7fe6c8007c8768aa0e50e2f2e6203354 SHA256 038a2d84f0f4b65581ecf0934ac44661aa2617c252f4f4495473f932078e6654
-MISC metadata.xml 158 RMD160 7344d8189b297bc3aaa35226811d79c8dacb9f6f SHA1 4f1871fb2f1f05defed13aa3d8fd3d0e65788b5e SHA256 b1f2af69cc9a002750dfc0abd0f1dc63431290bebbabd4a17169dd3d4dbe89a2
+EBUILD akonadi-googledata-1.1.0.ebuild 717 RMD160 6c7dbb12e4de943a3907310fd0e58e15779c9370 SHA1 03b3c7ebda34736a548c58d3945416b271c495a8 SHA256 78b8772a9f13dc1762c81e4f9406461f6faa74c195e5dc5f71bbf4225e3accc0
+EBUILD akonadi-googledata-9999.ebuild 504 RMD160 40ce3d1a3d308a20e1715bb5b04520583c5723a7 SHA1 664ede603937065f73b9e9af092e261b4090318a SHA256 1952acfabc83603f8cd0d961ee1e89700170f3b707e5ae425fa4e202dcd95e85
+MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/kde-misc/akonadi-googledata/akonadi-googledata-1.1.0.ebuild b/kde-misc/akonadi-googledata/akonadi-googledata-1.1.0.ebuild
index 147bc097e8c..3c3c79ca715 100644
--- a/kde-misc/akonadi-googledata/akonadi-googledata-1.1.0.ebuild
+++ b/kde-misc/akonadi-googledata/akonadi-googledata-1.1.0.ebuild
@@ -2,7 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI="2"
+
+KDE_LINGUAS="ca ca@valencia cs da de en_GB eo es et fi fr ga gl hr hu is km lt
+lv nb nds nl pt pt_BR ro sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv th
+tr uk zh_CN zh_TW"
 
 inherit kde4-base
 
@@ -11,14 +15,16 @@ HOMEPAGE="http://pim.kde.org/akonadi/"
 SRC_URI="http://libgcal.googlecode.com/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-
+KEYWORDS="~amd64 ~x86"
 SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
+IUSE="debug"
 
-DEPEND="!kde-misc/googledata
-	app-office/akonadi-server
+DEPEND="
 	dev-libs/boost
 	dev-libs/libxslt
-	>=net-libs/libgcal-0.9.4"
-RDEPEND="${DEPEND}"
+	>=kde-base/kdepimlibs-${KDE_MINIMAL}[semantic-desktop]
+	>=net-libs/libgcal-0.9.4
+"
+RDEPEND="${DEPEND}
+	!kde-misc/googledata
+"
diff --git a/kde-misc/googledata/googledata-9999.ebuild b/kde-misc/akonadi-googledata/akonadi-googledata-9999.ebuild
index 62cd13b0ca4..76099ceb5fc 100644
--- a/kde-misc/googledata/googledata-9999.ebuild
+++ b/kde-misc/akonadi-googledata/akonadi-googledata-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI="2"
 
 KMNAME="extragear/pim"
+KMMODULE="googledata"
 inherit kde4-base
 
 DESCRIPTION="Google contacts and calendar akonadi resource"
@@ -12,9 +13,14 @@ HOMEPAGE="http://pim.kde.org/akonadi/"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS=""
-IUSE=""
+IUSE="debug"
 
-DEPEND="app-office/akonadi-server
-	>=net-libs/libgcal-0.9.0"
-RDEPEND="${DEPEND}"
+DEPEND="
+	dev-libs/boost
+	dev-libs/libxslt
+	>=kde-base/kdepimlibs-${KDE_MINIMAL}[semantic-desktop]
+	>=net-libs/libgcal-0.9.4
+"
+RDEPEND="${DEPEND}
+	!kde-misc/googledata
+"
diff --git a/kde-misc/akonadi-googledata/metadata.xml b/kde-misc/akonadi-googledata/metadata.xml
index 721dd1c8d2f..a23f444b67d 100644
--- a/kde-misc/akonadi-googledata/metadata.xml
+++ b/kde-misc/akonadi-googledata/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>kde</herd>
 </pkgmetadata>
-
diff --git a/kde-misc/googledata/Manifest b/kde-misc/googledata/Manifest
deleted file mode 100644
index 7776d23f4fd..00000000000
--- a/kde-misc/googledata/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD googledata-9999.ebuild 400 RMD160 9828256ac1a7e746446524a65f3bf841266c9266 SHA1 7eb0f08825dea7ccd09155dcb82366d8d96332b8 SHA256 dbe29362d88474159d20b27aa494ee9a2c44d7ac659982fef441ef5b79bc7c5b
-MISC metadata.xml 158 RMD160 7344d8189b297bc3aaa35226811d79c8dacb9f6f SHA1 4f1871fb2f1f05defed13aa3d8fd3d0e65788b5e SHA256 b1f2af69cc9a002750dfc0abd0f1dc63431290bebbabd4a17169dd3d4dbe89a2
diff --git a/kde-misc/googledata/metadata.xml b/kde-misc/googledata/metadata.xml
deleted file mode 100644
index 721dd1c8d2f..00000000000
--- a/kde-misc/googledata/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>kde</herd>
-</pkgmetadata>
-
diff --git a/profiles/updates/3Q-2010 b/profiles/updates/3Q-2010
new file mode 100644
index 00000000000..60c4dea4b4d
--- /dev/null
+++ b/profiles/updates/3Q-2010
@@ -0,0 +1 @@
+move kde-misc/googledata kde-misc/akonadi-googledata