diff options
| -rw-r--r-- | kde-base/kdepimlibs/ChangeLog | 8 | ||||
| -rw-r--r-- | kde-base/kdepimlibs/files/kdepimlibs-4.7.4-size.patch | 13 | ||||
| -rw-r--r-- | kde-base/kdepimlibs/kdepimlibs-4.7.4-r1.ebuild | 73 |
3 files changed, 93 insertions, 1 deletions
diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog index 244c669784b4..1b51ff6af646 100644 --- a/kde-base/kdepimlibs/ChangeLog +++ b/kde-base/kdepimlibs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-base/kdepimlibs # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.120 2011/12/12 01:09:42 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.121 2011/12/15 23:59:19 dilfridge Exp $ + +*kdepimlibs-4.7.4-r1 (15 Dec 2011) + + 15 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> + +kdepimlibs-4.7.4-r1.ebuild, +files/kdepimlibs-4.7.4-size.patch: + Fix imap4 protocol regression, bug 382411. Yeah! Thanks to Luke-Jr! 12 Dec 2011; Jonathan Callen <abcd@gentoo.org> -files/kdepimlibs-4.6.2-encoding.patch: diff --git a/kde-base/kdepimlibs/files/kdepimlibs-4.7.4-size.patch b/kde-base/kdepimlibs/files/kdepimlibs-4.7.4-size.patch new file mode 100644 index 000000000000..ec5630d0eecf --- /dev/null +++ b/kde-base/kdepimlibs/files/kdepimlibs-4.7.4-size.patch @@ -0,0 +1,13 @@ +diff --git a/kioslave/imap4/imapcommand.cpp b/kioslave/imap4/imapcommand.cpp +index 43daccd..8256570 100644 +--- a/kioslave/imap4/imapcommand.cpp ++++ b/kioslave/imap4/imapcommand.cpp +@@ -231,7 +231,7 @@ CommandPtr + imapCommand::clientAppend (const QString & box, const QString & flags, + ulong size) + { +- QString tmp = QString(flags.isEmpty() ? QString("") : QString(('(' + flags + ") ")) + '{' + QString::number(size) + '}'); ++ QString tmp = QString((flags.isEmpty() ? QString("") : QString(('(' + flags + ") "))) + '{' + QString::number(size) + '}'); + return CommandPtr( new imapCommand ("APPEND", + "\"" + KIMAP::encodeImapFolderName (box) + "\" " + tmp)); + } diff --git a/kde-base/kdepimlibs/kdepimlibs-4.7.4-r1.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.7.4-r1.ebuild new file mode 100644 index 000000000000..2251add8932e --- /dev/null +++ b/kde-base/kdepimlibs/kdepimlibs-4.7.4-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.7.4-r1.ebuild,v 1.1 2011/12/15 23:59:19 dilfridge Exp $ + +EAPI=4 + +KDE_HANDBOOK="optional" +CPPUNIT_REQUIRED="optional" +KDE_SCM="git" +inherit kde4-base + +DESCRIPTION="Common library for KDE PIM apps." +HOMEPAGE="http://www.kde.org/" + +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +LICENSE="LGPL-2.1" +IUSE="debug ldap semantic-desktop" + +# some akonadi tests timeout, that probaly needs more work as its ~700 tests +RESTRICT="test" + +COMMON_DEPEND=" + >=app-crypt/gpgme-1.1.6 + dev-libs/libgpg-error + >=dev-libs/libical-0.43 + dev-libs/cyrus-sasl + $(add_kdebase_dep kdelibs 'semantic-desktop=') + semantic-desktop? ( + >=app-office/akonadi-server-1.5.80 + media-libs/phonon + x11-misc/shared-mime-info + ) + ldap? ( net-nds/openldap ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/boost-1.35.0-r5 +" +RDEPEND="${COMMON_DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-4.7.4-size.patch" +) + +src_prepare() { + kde4-base_src_prepare + + # Disable hardcoded checks + sed -r -e '/find_package\((Akonadi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \ + -e '/macro_log_feature\((Akonadi|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \ + -e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \ + -i CMakeLists.txt || die + if ! use semantic-desktop; then + sed -e '/include(SopranoAddOntology)/s/^/#DISABLED /' \ + -i CMakeLists.txt || die + # More reliable than -DBUILD_akonadi=OFF + rm -r akonadi mailtransport || die + fi +} + +src_configure() { + mycmakeargs=( + $(cmake-utils_use_build handbook doc) + $(cmake-utils_use_with ldap) + $(cmake-utils_use_with semantic-desktop Akonadi) + $(cmake-utils_use_with semantic-desktop SharedDesktopOntologies) + $(cmake-utils_use_with semantic-desktop Soprano) + $(cmake-utils_use_with semantic-desktop Nepomuk) + # $(cmake-utils_use_with prison) + -DWITH_Prison=NO + ) + + kde4-base_src_configure +} |