kde-apps/kdepimlibs: Fix compatibility with app-crypt/gpgme[cxx,qt5]

Avoid file collisions by renaming the affected files.

Maintainer comments:
- 4.14.{11_pre,10_p}20160611 are two incarnations of the same tarball
    4.14.10_p20160611 reverts one commit that breaks POP3 w/ kmail-4.4
- Applied ebuild sed,mv and patch magic to sources.
- Applied Gentoo patches to sources to obsolete $FILESDIR

Gentoo-bug: 611818
Package-Manager: Portage-2.3.3, Repoman-2.3.1

4 files changed, 141 insertions, 0 deletions

diff --git a/kde-apps/kdepimlibs/Manifest b/kde-apps/kdepimlibs/Manifest
index f2bf5ebdda22..eb7ae879258c 100644
--- a/kde-apps/kdepimlibs/Manifest
+++ b/kde-apps/kdepimlibs/Manifest
@@ -1,2 +1,3 @@
 DIST kdepimlibs-4.14.10.tar.xz 2831160 SHA256 c8cc9694add6ecf121bda050235ffa68d8307a82c85fbdffe69a8eab5be584c2 SHA512 64f396957ae1f70a19ba689fabc0850aed04e4e4bce58a4bbc27af2b5cfa27b50472614b4096d8424ee6b4463faaed37d98e6cccfe36d208e9193ba20dc6766a WHIRLPOOL b9123e702f5d4f696cd09d3e7932dbc796f4d8e09feace56a49a96ddb64478bf8cd237bcac9c438d77491822cd655f3f44b76e657f6dbb09b8deb96ab90da52a
 DIST kdepimlibs-4.14.11_pre20160211.tar.gz 4300730 SHA256 3c2559987871761ac13185b0ffa9f7575fe0a5c2e00950b433b25edea7ec47fd SHA512 d0977a5387b0937d850fb3adc8c0bc8086ddb0894d238272f0586e53cc8a157a50b7e6d4aeb97a7fb944521de4f8978a23f172a6bf1b8e6afbbba5a183832b1c WHIRLPOOL 28bdf9c93de2c500fe2c1264c8dff42cc816d414d6b15820bc6c6aaaafc0fe67008ce13b678e0c41ac6780863e94eccb43ab18beb4c052230cad312f4530f58d
+DIST kdepimlibs-4.14.11_pre20160611.tar.xz 2860084 SHA256 15ebde0f9683f42b89dc2ad6656bc71bf516e2b885333cc5438891217e59ddd4 SHA512 19560362f07328f3743b5aabdef74a55e3ac7f8016f1bb6d63aa792985b9b0c4d3f34e979df6022df31623ffb7f701c90f9262a70cc9326596429ff1395c4f6d WHIRLPOOL cddf5beb57f66e19b60baa896ba08879c1537d44cb35fb33776c439461411a1e0b07ec03229bc1d4a6d086235e50c19022411fe1d2a56d7901d8a6e9c1fbcbd0
diff --git a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.10_p20160611-revert-544410c90.patch b/kde-apps/kdepimlibs/files/kdepimlibs-4.14.10_p20160611-revert-544410c90.patch
new file mode 100644
index 000000000000..94f1494a3ddd
--- /dev/null
+++ b/kde-apps/kdepimlibs/files/kdepimlibs-4.14.10_p20160611-revert-544410c90.patch
@@ -0,0 +1,25 @@
+diff --git a/kioslave/pop3/pop3.cpp b/kioslave/pop3/pop3.cpp
+index 8238a5fca..20730950d 100644
+--- a/kioslave/pop3/pop3.cpp
++++ b/kioslave/pop3/pop3.cpp
+@@ -812,7 +812,6 @@ void POP3Protocol::get(const KUrl & url)
+        .
+      */
+     if (result) {
+-      mimeType("text/plain");
+       while (true /* !AtEOF() */ ) {
+         memset(buf, 0, sizeof(buf));
+         myReadLine(buf, sizeof(buf) - 1);
+@@ -849,12 +848,6 @@ void POP3Protocol::get(const KUrl & url)
+     m_cmd = CMD_NONE;
+   } else if (cmd == "download" || cmd == "headers") {
+     const QStringList waitingCommands = path.split(',', QString::SkipEmptyParts);
+-    if ( waitingCommands.isEmpty() ) {
+-      kDebug(7105) << "tried to request" << cmd << "for" << path << "with no specific item to get";
+-      closeConnection();
+-      error(ERR_INTERNAL, m_sServer);
+-      return;
+-    }
+     bool noProgress = (metaData("progress") == "off"
+                        || waitingCommands.count() > 1);
+     int p_size = 0;
diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild
new file mode 100644
index 000000000000..aa5f15224d93
--- /dev/null
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.10_p20160611.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P/10_p/11_pre}.tar.xz"
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug ldap prison"
+
+# some akonadi tests timeout, that probably needs more work as its ~700 tests
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.8.0
+	dev-libs/boost:=
+	dev-libs/cyrus-sasl
+	dev-libs/libgpg-error
+	dev-libs/libical:=
+	dev-libs/qjson
+	kde-apps/akonadi:4
+	media-libs/phonon[qt4]
+	x11-misc/shared-mime-info
+	ldap? ( net-nds/openldap )
+	prison? ( kde-frameworks/prison:4 )
+"
+# boost is not linked to, but headers which include it are installed
+# bug #418071
+RDEPEND="${DEPEND}"
+
+# breaks veryoldpim POP3, see also: https://git.reviewboard.kde.org/r/124987/
+PATCHES=( "${FILESDIR}/${P}-revert-544410c90.patch" )
+
+S="${WORKDIR}/${P/10_p/11_pre}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+		-DBUILD_doc=$(usex handbook)
+		$(cmake-utils_use_find_package ldap Ldap)
+		$(cmake-utils_use_find_package prison Prison)
+	)
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# Collides with net-im/choqok
+	rm "${ED}"usr/share/apps/cmake/modules/FindQtOAuth.cmake || die
+
+	# contains constants/defines only
+	QA_DT_NEEDED="$(find "${ED}" -type f -name 'libakonadi-kabc.so.*' -printf '/%P\n')"
+}
diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild
new file mode 100644
index 000000000000..423dc7ea7078
--- /dev/null
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160611.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug ldap prison"
+
+# some akonadi tests timeout, that probably needs more work as its ~700 tests
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.8.0
+	dev-libs/boost:=
+	dev-libs/cyrus-sasl
+	dev-libs/libgpg-error
+	dev-libs/libical:=
+	dev-libs/qjson
+	kde-apps/akonadi:4
+	media-libs/phonon[qt4]
+	x11-misc/shared-mime-info
+	ldap? ( net-nds/openldap )
+	prison? ( kde-frameworks/prison:4 )
+"
+# boost is not linked to, but headers which include it are installed
+# bug #418071
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+		-DBUILD_doc=$(usex handbook)
+		$(cmake-utils_use_find_package ldap Ldap)
+		$(cmake-utils_use_find_package prison Prison)
+	)
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# Collides with net-im/choqok
+	rm "${ED}"usr/share/apps/cmake/modules/FindQtOAuth.cmake || die
+
+	# contains constants/defines only
+	QA_DT_NEEDED="$(find "${ED}" -type f -name 'libakonadi-kabc.so.*' -printf '/%P\n')"
+}