Version bump wrt bug #453680. Remove old.

Package-Manager: portage-2.1.11.50/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

5 files changed, 57 insertions, 190 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/Manifest b/net-libs/libkolab/Manifest
index 900673b475b8..1ae5c94a67af 100644
--- a/net-libs/libkolab/Manifest
+++ b/net-libs/libkolab/Manifest
@@ -1,21 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX libkolab-fix-include.patch 3766 SHA256 ff6c5a6bd9b393fa248486e9d703cb53c9a79e486f75a2d6e5a8b689fcd26a21 SHA512 c3084fb7f40e4d4fdc7a020e10f544dcd726028ef3c9e4d94519d981f2a1948b401fb99046cbdef4cb92bd65ef9b5e0757c282c3a3d7b9ca1410a78d228a7663 WHIRLPOOL 4d6153e420081e58e89beffcb3c6b11caaefd49b7ca4ebe67ee43445fa43433160f403162de42d1a18ee45b6fdbf7e9fbca3b447cbff6c2b4fe8fbf0613b8a4c
-DIST libkolab-0.2.0.tar.gz 98597 SHA256 ffbd3b350d8e9b8f596362259088dbd5b6ac2bcf16881be1cb287ba6c675b255 SHA512 52c070de331a505818cb89d1f5045fae00da45f36f65bafb47732ef3bb91919ce1eef9e7096d9d876844227f788590d23fa6c3c7d12a8d57188ba6143bbb06d9 WHIRLPOOL 508cf6d23862fb402ee9077a9c46f1fc36d7b6e6587db8a7155dc3b42a40037250bb6f5e3d02a2dd04a83263481d1bd4e3d3b214387423c5866a38fdba116042
 DIST libkolab-0.3.2.tar.gz 149649 SHA256 6e96fa0a1b103c74779818cbc7da2073a5d75e33f3ec19c4368bedea393d2d7b SHA512 18a8b2df97683d5b03430f91e9296459f94ad10ae1ba0c244b10a715481355f0a0a66d9d87288782885f10c3a637306486aa443b9bcaa27d9b620aec490f6244 WHIRLPOOL 5285a1426de086cc5e1957c91899f8b7d04417084692f382532813dd7ae757312ba1860dab351e377787e6c5878a6843bd8b1a9e678f688cab7ca3da2231eebf
-EBUILD libkolab-0.2.0.ebuild 758 SHA256 d225a151c327481a30922baa58f968c2232c19e0313d3cd6b30d09ef8ffc41c7 SHA512 374ae52e82e6e89888b79f311bcff1c7720277cede013cc960aed2ecc6018db7059e3026a131aad08e62180a5e393e0c5c77cd48be75b1e9101fe68715a9efe1 WHIRLPOOL 26f7c1edf5128bcd367d3600687f6c3e8dd481bc3bd3eff2cd430adbf2ea40f29e6b25c4f0b40c0eed66a12a07574a523aa1bb0e9e893c6431d581ebe12090fa
+DIST libkolab-0.4.1.tar.gz 162041 SHA256 88a4e4905cb3ae955a3d4d8cd785f4b97cce9868db6d97ef89f5535da25d1b67 SHA512 338f5a588c046ee9bb3c780a2b7b16d36d6fd406d0d8ab0d77b90b2fed816fbc2795839758f45253e5df9cc524819e0b01577f5adb4a068840b55837760b9861 WHIRLPOOL 365ce6a9733b13287a17e205ef8e6967c4f3540849010525fa5be382ef3f9bbe171fb2a8b86a6f48c6c45308228d4b082b1969a78979c87372423eef3a792e02
 EBUILD libkolab-0.3.2.ebuild 911 SHA256 db0757e70550236ff35b2c435edc2955bb2627776ec7872d577bfe77870ec565 SHA512 57455a66abb91d23f121820f2c1af17b284b55670c5d53ecd0b9a6852091c9f4308d613dab6dc77b21c357a1f06ca5e468702c33370d20f96a94b367f27c9762 WHIRLPOOL 3cc3ea809c54d5dd43c29113c092cd8d4e293892d6d463bf184e4675d959e71eacb9c532b5b31399135a37f8a649330fe2df1b3fe76005fbc736513b0b938532
-MISC ChangeLog 1314 SHA256 6dc1c162de01b414163381d9c10d7951d83681ff60425f11c763815066d9ed0d SHA512 4f9d4205e606749daef828f1c731fab025d256f27d708280595d41aefe84f1f6580f9b5e07d4971485563aa78fbe464d5b619ca513736e2b767e293900327663 WHIRLPOOL e988816ae2eec2f64645db5be7df8acec8ffc96c0597e055ff8966ef1412de6a10309e24b0b3b9503c646eb81253aab9d05fc7b0ea71e002b734321b540b984d
+EBUILD libkolab-0.4.1.ebuild 966 SHA256 121f43169a94cd31bb87af8022691b19e64204c67d6e729521b02dc99d97a90c SHA512 f963db0f3db2d8b4b87c1cce6681505e64e6a20ba79f5321c51f6539455f6dea1533856e1349bf7cd86d90aa5b73840828dc6672f7f5d4c675a024a4e0f70c9e WHIRLPOOL 086dbcd61bbec84b7a7148e300b916b47a941c9b3020f8b8814e4aed66c7956818f231ac0c44c5d270a39ff543862ae80f9b73c7225a08e09606f235fcadc767
+MISC ChangeLog 1532 SHA256 88c1e724eee84a8c10c07146421f104b7b5bfa59d0689992b89c58d97ffa4667 SHA512 328b689ce3b06aeee09ab65422dcf37d7dd67a3cff162c3b3513d405fe134845a1701a8a36833d595cc83eead41f441a368cd0ecfa05738f56b29f89d4142019 WHIRLPOOL 121d1c524236dd149cf35ef708bbcd73dcf125571578f1f1212cf41172bdd989cfa75dc2b6ac927c320243fae434fdc4ea367eb0a30dfe07a3fec9b59f659752
 MISC metadata.xml 158 SHA256 b5a2d16139d03b8af578bc87503b14b589dd7e3544d879297ccdb735d35a02e2 SHA512 a9f1d39008120816359e4198157b5613ab427fde9b8503e24346193fe9c84edc9a62860b90fd56c4adf4526bb7873a489a0f98efc75b52caa913e911ffd50f12 WHIRLPOOL 22e1f5aef99c4356a076c106161a1a73b40367e9f95e3ddc38c66a153674daef83871f77d765dd7d1bd7d970b72fd3841577176e361fcdb9936bf0309fd28635
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQuhbEAAoJEMbwO6tnXQ0ssuQH/003kHSmQRcnI/w8Ic6cTtAb
-tIYbJRWND/gci740cXbiIpSNiK5R5GMxxl+5SVEKekfIoKHTUGZ6lMqvgKuX2FHa
-CobZFoAVv4vkRdY2BDv8U2SKttzNoPEg8mGi2IISc5tcCFWdxBADxrkDz5TsnVOz
-tlCbHdMLK3CWcVfftli/WRp2RNfXUjxzmQSfW/WK2RW6hPkkvYGIkeJHGrR8uKUi
-jIgZJRxLfwUpxeJNcZ2shw+jJlpbEcak0z5SSkzsuRj+EnjmTtOH3Yfs3jcqvwXj
-YGbQO9MRYli7fd8dhkwQ+asAHa9LR96FQt2MCb3aXneCjRzdo9leTiXa9FBYnLQ=
-=l3I+
+iQEcBAEBCAAGBQJRB6nqAAoJEMbwO6tnXQ0s8iAIAKxClxe4MvEYE6hugcC633WL
+sdUyaQXcszBzTHZoO9D7Lklay+ent0v3/B9Nj1p96seYFTZGFjF6ok+bpGewSDkb
+ohxmGQDtAZBcv33q1PSbyLaeJn0xs/uUQ3JuNaeeSq1fkA8pmqBwT86bKt5BYPJl
+HUtCQIjbasD7k2Vnxc3sjWKQoXQGrvg8+q91JWvK0Xl6USXTCgMPP2cJD+FTaJsT
+BhHKhecvn0Dt21jsSCIQCSqkb4uj0SRsBwrCYtmMTWJ1uxcZlDkB+8wxBL1eDqNu
+dOEvlE0YTt3hfighIdWl8OXOieoaJ7PsixB6H+5UsQmqxio65zq/Sy3ripfoZMQ=
+=Zrwo
 -----END PGP SIGNATURE-----
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
+}