Apply patch from upstream trunk for Sieve script editing wrt #305211, thanks to Marti...
authorSamuli Suominen <ssuominen@gentoo.org>
Wed, 24 Feb 2010 09:38:19 +0000 (09:38 +0000)
committerSamuli Suominen <ssuominen@gentoo.org>
Wed, 24 Feb 2010 09:38:19 +0000 (09:38 +0000)
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

kde-base/kdepimlibs/ChangeLog
kde-base/kdepimlibs/Manifest
kde-base/kdepimlibs/files/kdepimlibs-4.4.0-sieve.patch [new file with mode: 0644]
kde-base/kdepimlibs/kdepimlibs-4.4.0-r1.ebuild [new file with mode: 0644]

index 1f246307f0acf2898b8ae6e5f500807a1096c68a..df4c14c3a6e16e9f097acba4f6f02c3ad2497617 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepimlibs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.64 2010/02/20 10:37:04 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.65 2010/02/24 09:38:18 ssuominen Exp $
+
+*kdepimlibs-4.4.0-r1 (24 Feb 2010)
+
+  24 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +kdepimlibs-4.4.0-r1.ebuild, +files/kdepimlibs-4.4.0-sieve.patch:
+  Apply patch from upstream trunk for Sieve script editing wrt #305211,
+  thanks to Martin Regner and Andreas K. Huettel.
 
   20 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
   kdepimlibs-4.3.5.ebuild:
index 3a29e666b2179f7b7bd4ce356ac6402ed71e27b2..8f5ce03e91dad9cb581d08bac9b9c7ed4b0c23b1 100644 (file)
@@ -1,3 +1,4 @@
+AUX kdepimlibs-4.4.0-sieve.patch 782 RMD160 a03e4fd90718480a664e6d6c5dd731c00952f9b3 SHA1 b5ad5190c4b20633b3b4ee7b3b7af18f5ea308c2 SHA256 5e834de70f7b6750d12f664ff421d33b6da70e9884653e4ad06e55a648d04f2c
 DIST kdepimlibs-4.3.3.tar.bz2 1780850 RMD160 cb3cf30367af204637e937da42e4c4bc033d0e8d SHA1 a380ec7707433c814d3a196b9bebebd2363ed2e2 SHA256 81e87727be8f760b1c0797441ef343924021451c2466089a460979c0d173179c
 DIST kdepimlibs-4.3.4.tar.bz2 1781468 RMD160 4c1d1ed223acb849645f43dc2545d5c451d98f1b SHA1 4f7cd55999e82f504e3766b6f360ae58b984d5cb SHA256 8e4cf2d6dadd23ab0f62dc5bdc61172f62a97b794bfb454cd84f37b9cb54030d
 DIST kdepimlibs-4.3.5.tar.bz2 1781714 RMD160 fec7cdec8b753356227fc192401a43fdd91a2bfe SHA1 441b10fc0c89a91c447d73a68e3dc877156c5f67 SHA256 767bcdc0437cc53df68f3b6beb12563eed218f64812beeb3721d6e2dfa7a5e17
@@ -5,6 +6,7 @@ DIST kdepimlibs-4.4.0.tar.bz2 2427530 RMD160 fac7033737dbcd6a9b208e974be431eda79
 EBUILD kdepimlibs-4.3.3.ebuild 1011 RMD160 fea170592617deea8fc84c8a483f20347217cc2a SHA1 b18691d931d73dbd90ad6fa147e5e7c1364803b4 SHA256 a3763c68b033aaa82d5c1c678343eb80b01d9ea3c5e42b129c22adcf83f8342a
 EBUILD kdepimlibs-4.3.4.ebuild 1049 RMD160 39732227b58dd5f38d663227d5bd39d565079af5 SHA1 37ba6a57119ce60766a51bad204bafb50f4f0519 SHA256 cb316c7459de63b4ae16662157481d1de8258c6976a1a37737ee95e62712c1d6
 EBUILD kdepimlibs-4.3.5.ebuild 1049 RMD160 e13d1f1b38442d3052b4a46b1a4d0990cbd16a78 SHA1 e84c99a72c745a7bc3e5a9877cbb60adfd4352d5 SHA256 0d33a9c96ee38b78144bd9dce9d3b2efdef783799b46b6c4503eca12d1d24235
+EBUILD kdepimlibs-4.4.0-r1.ebuild 1609 RMD160 455c9a87192622b6aeb81d142b81a110a7d7e627 SHA1 ab2cf220f453a5dac62273b2da8b7ed2ae9060cc SHA256 e3c79c75bb3fcf4257d326590a912f41e62fbae585dec326f8372bc9e2772d8f
 EBUILD kdepimlibs-4.4.0.ebuild 1561 RMD160 9d3d4b181b7f4258a5754f6952e94512b656b773 SHA1 50614861e48560c8fec2a75b4c7052aaa34f9f0a SHA256 eb082979b1b5fa8195052cba7d81d76afd6f22f1e87794be2b7a8e7d3489f288
-MISC ChangeLog 7866 RMD160 37f9f949783bf77db1751592ba8a5fcba05c56c4 SHA1 163c794933a8bab0b64f78cb7e50622ab2362cd3 SHA256 e73060711e59decb31cb5eab417fa05b2bb5322daff189023128384d9876677a
+MISC ChangeLog 8147 RMD160 52c5604af247c17eeac52d016903bddf03e3f4a3 SHA1 ab6be2d2d2fa265d57b0e193d54c6144a547d05f SHA256 d78f7a2df068968b6f12fbdcc47a3b12c7b7ac37ed2b12c716dd92080164bfd9
 MISC metadata.xml 235 RMD160 9dd88a4dadf630a6ac46d2445c974be2787f280e SHA1 dc809b0bcc00b8c9e581b56f05ae38ebd137d8c0 SHA256 dd0d1c4c7e6cc084cb9ca9b8d1c42d6a14d8282303d172b3e58c6ac2d80d540f
diff --git a/kde-base/kdepimlibs/files/kdepimlibs-4.4.0-sieve.patch b/kde-base/kdepimlibs/files/kdepimlibs-4.4.0-sieve.patch
new file mode 100644 (file)
index 0000000..006c7b5
--- /dev/null
@@ -0,0 +1,20 @@
+http://bugs.kde.org/show_bug.cgi?id=212951
+http://bugs.gentoo.org/show_bug.cgi?id=305211
+
+--- kioslave/sieve/sieve.cpp
++++ kioslave/sieve/sieve.cpp
+@@ -364,12 +364,11 @@
+         }
+ 
+       // FIXME find a test server and test that this works
+-      // TODO ask the system whether SSL is available
+-      if (useTLSIfAvailable && QSslSocket::supportsSsl()) {
++  if (useTLSIfAvailable && m_supportsTLS && QSslSocket::supportsSsl()) {
+               sendData("STARTTLS");
+               if (operationSuccessful()) {
+                       ksDebug << "TLS has been accepted. Starting TLS..." << endl
+-                                << "WARNING this is untested and may fail.";
++              << "WARNING this is untested and may fail.";
+                       if (startSsl()) {
+                               ksDebug << "TLS enabled successfully." << endl;
+                               // reparse capabilities:
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.4.0-r1.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.4.0-r1.ebuild
new file mode 100644 (file)
index 0000000..1ae4068
--- /dev/null
@@ -0,0 +1,59 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.4.0-r1.ebuild,v 1.1 2010/02/24 09:38:18 ssuominen Exp $
+
+EAPI="2"
+
+CPPUNIT_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps."
+HOMEPAGE="http://www.kde.org/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="+akonadi debug +handbook ldap"
+
+# some akonadi tests timeout, that probaly needs more work as its ~700 tests
+RESTRICT="test"
+
+DEPEND="
+       >=app-crypt/gpgme-1.1.6
+       >=dev-libs/boost-1.35.0-r5
+       dev-libs/libgpg-error
+       >=dev-libs/libical-0.43
+       dev-libs/cyrus-sasl
+       akonadi? ( >=app-office/akonadi-server-1.3.1 )
+       ldap? ( net-nds/openldap )
+"
+RDEPEND="${DEPEND}"
+
+# libakonadi-kcal moved here from akonadi in 4.3.86
+add_blocker akonadi '<4.3.86'
+# @since 4.3 - libkholidays is in kdepimlibs now
+add_blocker libkholidays
+# @since 4.4 - kontactinterfaces is in kdepimlibs now
+add_blocker kontactinterfaces
+
+PATCHES=( "${FILESDIR}/${P}-sieve.patch" )
+
+src_prepare() {
+       kde4-base_src_prepare
+
+       if ! use akonadi; then
+               sed -e '/find_package(Akonadi/s/^/# DISABLED /' \
+                       -e '/macro_log_feature(Akonadi_FOUND/s/TRUE/FALSE/' \
+                       -e '/add_subdirectory(akonadi)/s/^/# DISABLED /' \
+                       -e '/add_subdirectory(mailtransport)/s/^/# DISABLED /' \
+                       -i CMakeLists.txt || die "failed to disable akonadi"
+       fi
+}
+
+src_configure() {
+       mycmakeargs=(
+               $(cmake-utils_use_build handbook doc)
+               $(cmake-utils_use_with ldap)
+       )
+
+       kde4-base_src_configure
+}