[gentoo-commits] proj/kde:master commit in: net-libs/libkolab/files/, net-libs/libkolab/

[Johannes Huber]

commit:     54fe28f132dddec86e0e97c9c43fb0c67d4876f0
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  1 20:04:45 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Aug  1 20:04:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=54fe28f1

[net-libs/libkolab] Moved to tree.

(Portage version: 2.2.0_alpha120/git/Linux x86_64, unsigned Manifest commit)

---
 net-libs/libkolab/files/libkolab-fix-include.patch |  146 --------------------
 net-libs/libkolab/libkolab-0.2.0.ebuild            |   31 ----
 net-libs/libkolab/metadata.xml                     |    5 -
 3 files changed, 0 insertions(+), 182 deletions(-)

diff --git a/net-libs/libkolab/files/libkolab-fix-include.patch b/net-libs/libkolab/files/libkolab-fix-include.patch
deleted file mode 100644
index 71dc684..0000000
--- a/net-libs/libkolab/files/libkolab-fix-include.patch
+++ /dev/null
@@ -1,146 +0,0 @@
---- conversion/commonconversion.h	2012-05-02 07:56:08.000000000 -0400
-+++ conversion/commonconversion.h	2012-07-02 23:04:24.762660720 -0400
-@@ -20,7 +20,7 @@
- 
- #include <KDE/KDateTime>
- #include <QStringList>
--#include <kolab/kolabcontainers.h>
-+#include <kolabcontainers.h>
- 
- 
- namespace Kolab {
-@@ -32,4 +32,4 @@
-     };
- };
- 
--#endif
-\ No newline at end of file
-+#endif
---- conversion/kabcconversion.h	2012-05-02 07:56:08.000000000 -0400
-+++ conversion/kabcconversion.h	2012-07-02 23:04:24.762660720 -0400
-@@ -20,7 +20,7 @@
- 
- #include "kolab_export.h"
- 
--#include <kolab/kolabcontact.h>
-+#include <kolabcontact.h>
- #include <kabc/addressee.h>
- #include <kabc/contactgroup.h>
- 
-@@ -40,4 +40,4 @@
-     };
- };
- 
--#endif
-\ No newline at end of file
-+#endif
---- conversion/kcalconversion.h	2012-05-02 07:56:08.000000000 -0400
-+++ conversion/kcalconversion.h	2012-07-02 23:04:24.763660720 -0400
-@@ -20,9 +20,9 @@
- 
- #include "kolab_export.h"
- 
--#include <kolab/kolabevent.h>
--#include <kolab/kolabtodo.h>
--#include <kolab/kolabjournal.h>
-+#include <kolabevent.h>
-+#include <kolabtodo.h>
-+#include <kolabjournal.h>
- #include <kcalcore/event.h>
- #include <kcalcore/todo.h>
- #include <kcalcore/journal.h>
-@@ -49,4 +49,4 @@
-     };
- };
- 
--#endif
-\ No newline at end of file
-+#endif
---- conversion/kolabconversion.h	2012-05-02 07:56:08.000000000 -0400
-+++ conversion/kolabconversion.h	2012-07-02 23:04:24.764660720 -0400
-@@ -20,7 +20,7 @@
- 
- #include "kolab_export.h"
- 
--#include <kolab/kolabnote.h>
-+#include <kolabnote.h>
- #include <kmime/kmime_message.h>
- 
- namespace Kolab {
-@@ -36,4 +36,4 @@
-     };
- };
- 
--#endif
-\ No newline at end of file
-+#endif
---- kolabformat/errorhandler.cpp	2012-05-02 07:56:08.000000000 -0400
-+++ kolabformat/errorhandler.cpp	2012-07-02 23:04:24.764660720 -0400
-@@ -20,7 +20,7 @@
- 
- #include <qdebug.h>
- 
--#include <kolab/kolabformat.h>
-+#include <kolabformat.h>
- 
- namespace Kolab {
-     
---- kolabformat/kolabobject.cpp	2012-05-02 07:56:08.000000000 -0400
-+++ kolabformat/kolabobject.cpp	2012-07-02 23:04:24.765660720 -0400
-@@ -34,7 +34,7 @@
- #include <conversion/kabcconversion.h>
- #include <conversion/kolabconversion.h>
- #include <akonadi/notes/noteutils.h>
--#include <kolab/kolabformat.h>
-+#include <kolabformat.h>
- 
- 
- namespace Kolab {
---- tests/benchmark.cpp	2012-05-02 07:56:08.000000000 -0400
-+++ tests/benchmark.cpp	2012-07-02 23:05:22.746664944 -0400
-@@ -19,7 +19,7 @@
- #include "kolabformatV2/event.h"
- #include "conversion/kcalconversion.h"
- #include <kmime/kmime_message.h>
--#include <kolab/kolabformat.h>
-+#include <kolabformat.h>
- #include <kdebug.h>
- #include "testutils.h"
- 
---- tests/formattest.cpp	2012-05-02 07:56:08.000000000 -0400
-+++ tests/formattest.cpp	2012-07-02 23:05:34.920665858 -0400
-@@ -26,8 +26,8 @@
- #include <qtemporaryfile.h>
- #include <QBuffer>
- #include <kdebug.h>
--#include <kolab/kolabcontainers.h>
--#include <kolab/kolabformat.h>
-+#include <kolabcontainers.h>
-+#include <kolabformat.h>
- 
- #include <kcalcore/icalformat.h>
- #include <kabc/vcardconverter.h>
---- tests/kcalconversiontest.cpp	2012-05-02 07:56:08.000000000 -0400
-+++ tests/kcalconversiontest.cpp	2012-07-02 23:05:46.269666653 -0400
-@@ -4,7 +4,7 @@
- #include <QtCore/QObject>
- #include <QtTest/QtTest>
- #include <KDE/KSystemTimeZones>
--#include <kolab/kolabcontact.h>
-+#include <kolabcontact.h>
- #include <kcalcore/recurrence.h>
- #include <kabc/addressee.h>
- 
---- tests/upgradetest.cpp	2012-05-02 07:56:08.000000000 -0400
-+++ tests/upgradetest.cpp	2012-07-02 23:06:03.269667875 -0400
-@@ -19,8 +19,8 @@
- #include "upgradetest.h"
- 
- #include <QTest>
--#include <kolab/kolabcontainers.h>
--#include <kolab/kolabformat.h>
-+#include <kolabcontainers.h>
-+#include <kolabformat.h>
- 
- #include "testutils.h"
- #include "kolabformat/kolabobject.h"

diff --git a/net-libs/libkolab/libkolab-0.2.0.ebuild b/net-libs/libkolab/libkolab-0.2.0.ebuild
deleted file mode 100644
index 56f7a53..0000000
--- a/net-libs/libkolab/libkolab-0.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit kde4-base
-
-DESCRIPTION="Advanced Kolab Object Handling Library"
-HOMEPAGE="kolab.org"
-SRC_URI="http://dev.gentoo.org/~creffett/distfiles/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-PATCHES=( "${FILESDIR}/libkolab-fix-include.patch" )
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs)
-	>=net-libs/libkolabxml-0.4.0
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with test BUILD_TESTS)
-	)
-	kde4-base_src_configure
-}

diff --git a/net-libs/libkolab/metadata.xml b/net-libs/libkolab/metadata.xml
deleted file mode 100644
index 8d36d5b..0000000
--- a/net-libs/libkolab/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>kde</herd>
-</pkgmetadata>