Version bump wrt bug #453680. Remove old.

(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

4 files changed, 47 insertions, 179 deletions

diff --git a/net-libs/libkolab/ChangeLog b/net-libs/libkolab/ChangeLog
index 771648013f3d..5222ff881e1f 100644
--- a/net-libs/libkolab/ChangeLog
+++ b/net-libs/libkolab/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libkolab
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libkolab/ChangeLog,v 1.9 2012/12/01 14:41:53 kensington Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkolab/ChangeLog,v 1.10 2013/01/29 10:55:52 kensington Exp $
+
+*libkolab-0.4.1 (29 Jan 2013)
+
+  29 Jan 2013; Michael Palimaka <kensington@gentoo.org> +libkolab-0.4.1.ebuild,
+  -files/libkolab-fix-include.patch, -libkolab-0.2.0.ebuild:
+  Version bump wrt bug #453680. Remove old.
 
   01 Dec 2012; Michael Palimaka <kensington@gentoo.org> libkolab-0.2.0.ebuild,
   libkolab-0.3.2.ebuild:
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 71dc68410109..000000000000
--- 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 7b9ad184fc0b..000000000000
--- 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: /var/cvsroot/gentoo-x86/net-libs/libkolab/libkolab-0.2.0.ebuild,v 1.4 2012/12/01 14:41:53 kensington Exp $
-
-EAPI=4
-
-inherit kde4-base
-
-DESCRIPTION="Advanced Kolab Object Handling Library"
-HOMEPAGE="http://kolab.org"
-SRC_URI="http://dev.gentoo.org/~creffett/distfiles/${P}.tar.gz"
-
-LICENSE="LGPL-2+ LGPL-2.1+ LGPL-3+"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-PATCHES=( "${FILESDIR}/libkolab-fix-include.patch" )
-
-DEPEND="
-	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
-	>=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/libkolab-0.4.1.ebuild b/net-libs/libkolab/libkolab-0.4.1.ebuild
new file mode 100644
index 000000000000..f006bdf96e7a
--- /dev/null
+++ b/net-libs/libkolab/libkolab-0.4.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkolab/libkolab-0.4.1.ebuild,v 1.1 2013/01/29 10:55:52 kensington Exp $
+
+EAPI=5
+
+inherit kde4-base multilib
+
+DESCRIPTION="Advanced Kolab Object Handling Library"
+HOMEPAGE="http://kolab.org"
+SRC_URI="http://mirror.kolabsys.com/pub/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2+ LGPL-2.1+ LGPL-3+"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="php python test"
+
+# Tests fail, last checked 0.4.1
+RESTRICT="test"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	dev-lang/swig
+	>=net-libs/libkolabxml-0.7.0
+	php? ( dev-lang/php )
+	python? ( dev-lang/python )
+
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR=$(get_libdir)
+		$(cmake-utils_use_with test BUILD_TESTS)
+		$(cmake-utils_use python PYTHON_BINDINGS)
+		$(cmake-utils_use php PHP_BINDINGS)
+	)
+	kde4-base_src_configure
+}