Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

4 files changed, 113 insertions, 2 deletions

diff --git a/kde-apps/kitinerary/Manifest b/kde-apps/kitinerary/Manifest
index 967cd4325bb6..7ca24e7a17e9 100644
--- a/kde-apps/kitinerary/Manifest
+++ b/kde-apps/kitinerary/Manifest
@@ -1,3 +1,6 @@
+AUX kitinerary-18.08.3-poppler-0.72.patch 2495 BLAKE2B 30c9cd8492f05a1dfc00b0179914bc714049e6ea87bdf684a91d076fd150aa75db509d5157f4b41c776afea44eb13988eff1e00ee172cf22c329decd00dcde0e SHA512 55e7de7b24960a6fc74ddfad205ab69a4bd124d5eca926a6c301686da0f57eec25f15ff4be31e9c133d1bcd981077864630bff0222aded33591518e0ca985db1
+DIST kitinerary-18.08.3.tar.xz 622380 BLAKE2B 55213b5897abd8a8cbe763116cfddb3a498e8cbe1edc4a50fe073da193d97fe6a872c3dc5843e3b15e0d23cba5aa57be4118c2ec554a1b2f43c2bb3b8b121bc1 SHA512 d2fec91f292a143f96096a6642764599198a6055c44f63b3706bbb6428bab919c507ab6a4a2211faf6e57480ed8d6e6ff3643b612d295ff32d415a79509d25fa
 DIST kitinerary-18.12.3.tar.xz 652220 BLAKE2B 3de86b30f9a9a430fbd88d35cdb90202ce7b67493ec3e47e4bb6ed7274c42f37a6aef4c6bacb727ffc5564abb85d7aa383ae3cd6954d7e5cbe09edf4b759bb51 SHA512 b2a91dec7e58c4d5a8ac6ec10b9521fe817d61e1234500ec29bff6a3be9987efde7d851c2e2cc37ba64f7029e38416e171a80c127bd3534d16ca96e1d674fe6e
-EBUILD kitinerary-18.12.3.ebuild 831 BLAKE2B 9e9e485cb2fa103dc665e60f3b5068e572a0023025ec71714e5f25bdf589e68643751282d4e2bc732875084987fa2fc80ec03d129c2bd96188edb0669774a3cf SHA512 fc84870356d18906104222c384ef59919a84187f37ecad63826ab421ce627d54bfe2b0fd584f5f60bf2ccb1944d442c952e6a5d04a58f33f87408ae4c2008ae0
+EBUILD kitinerary-18.08.3.ebuild 875 BLAKE2B 6409c9925645d29076d7b9c122becebdcaeb0ef53ae20c49557495236de448870b554621f3a281ecf773d6aded4a60356baca4e6cd34e07c8cf7c17a87835db7 SHA512 93017332530687b2b84edee7a754195c56c17085ca1b8f09e533ef2aa732c78ed9f64a0672908eb8a14b242fa49ad9349cc7e1ffdd78f261c0162cd178481d76
+EBUILD kitinerary-18.12.3.ebuild 826 BLAKE2B d4be3985019e32b373bd1b6e61a8135e986a55d1204957b4ac295806b202515bd409eca33ddd7630c7c0e701e18e0e8f65845feee62aa16b9e557f67edaca2fe SHA512 907b93f61f2fb54ca071d7a4a0314e5dc89ce1939386d45a5b01a7c965b79523904719770057453e1226195288f7e92e5f540e0ab09469595690054e7647a422
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kitinerary/files/kitinerary-18.08.3-poppler-0.72.patch b/kde-apps/kitinerary/files/kitinerary-18.08.3-poppler-0.72.patch
new file mode 100644
index 000000000000..904e7b231914
--- /dev/null
+++ b/kde-apps/kitinerary/files/kitinerary-18.08.3-poppler-0.72.patch
@@ -0,0 +1,68 @@
+From f2dee911572a6ec93c63b9b4e376f841bb91e306 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Fri, 22 Feb 2019 19:13:11 +0100
+Subject: [PATCH] Fix build against poppler-0.72
+
+---
+ CMakeLists.txt                | 3 +++
+ src/config-kitinerary.h.cmake | 1 +
+ src/pdfdocument.cpp           | 8 ++++++++
+ 3 files changed, 12 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bdc2e2b..b970de7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,6 +42,9 @@ if(TARGET Poppler::Core)
+     if (${Poppler_VERSION} VERSION_GREATER 0.57)
+         set(HAVE_POPPLER_0_58 ON)
+     endif()
++    if (${Poppler_VERSION} VERSION_GREATER 0.71)
++        set(HAVE_POPPLER_0_72 ON)
++    endif()
+ endif()
+ if (TARGET zxing::libzxing)
+     set(HAVE_ZXING ON)
+diff --git a/src/config-kitinerary.h.cmake b/src/config-kitinerary.h.cmake
+index 4576266..0dc8969 100644
+--- a/src/config-kitinerary.h.cmake
++++ b/src/config-kitinerary.h.cmake
+@@ -22,6 +22,7 @@
+ 
+ #cmakedefine HAVE_POPPLER
+ #cmakedefine HAVE_POPPLER_0_58
++#cmakedefine HAVE_POPPLER_0_72
+ #cmakedefine HAVE_ZXING
+ #cmakedefine HAVE_KCAL
+ #cmakedefine HAVE_KCONTACTS
+diff --git a/src/pdfdocument.cpp b/src/pdfdocument.cpp
+index fb4b98b..9f23645 100644
+--- a/src/pdfdocument.cpp
++++ b/src/pdfdocument.cpp
+@@ -306,7 +306,11 @@ QString PdfPage::textInRect(double left, double top, double right, double bottom
+     const auto pageRect = d->m_doc->m_popplerDoc->getPage(d->m_pageNum + 1)->getCropBox();
+     std::unique_ptr<GooString> s(device->getText(ratio(pageRect->x1, pageRect->x2, left), ratio(pageRect->y1, pageRect->y2, top),
+                                                  ratio(pageRect->x1, pageRect->x2, right), ratio(pageRect->y1, pageRect->y2, bottom)));
++#ifdef HAVE_POPPLER_0_58
++    return QString::fromUtf8(s->c_str());
++#else
+     return QString::fromUtf8(s->getCString());
++#endif
+ #else
+     Q_UNUSED(left);
+     Q_UNUSED(top);
+@@ -440,7 +444,11 @@ PdfDocument* PdfDocument::fromData(const QByteArray &data, QObject *parent)
+         PdfPage page;
+         page.d->m_pageNum = i;
+         page.d->m_doc = doc->d.get();
++#ifdef HAVE_POPPLER_0_72
++        page.d->m_text = QString::fromUtf8(s->c_str());
++#else
+         page.d->m_text = QString::fromUtf8(s->getCString());
++#endif
+         page.d->m_images = std::move(device->m_images);
+         for (auto it = page.d->m_images.begin(); it != page.d->m_images.end(); ++it) {
+             (*it).d->m_page = page.d.data();
+-- 
+2.19.2
+
diff --git a/kde-apps/kitinerary/kitinerary-18.08.3.ebuild b/kde-apps/kitinerary/kitinerary-18.08.3.ebuild
new file mode 100644
index 000000000000..bcf656b17131
--- /dev/null
+++ b/kde-apps/kitinerary/kitinerary-18.08.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Data Model and Extraction System for Travel Reservation information"
+HOMEPAGE="https://www.kde.org/applications/office/kontact/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="amd64 x86"
+IUSE="pdf"
+
+DEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep ki18n)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kpkpass)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	sys-libs/zlib
+	pdf? ( app-text/poppler:=[qt5] )
+"
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-addons-18.07.80
+"
+
+PATCHES=( "${FILESDIR}/${P}-poppler-0.72.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pdf Poppler)
+	)
+	kde5_src_configure
+}
diff --git a/kde-apps/kitinerary/kitinerary-18.12.3.ebuild b/kde-apps/kitinerary/kitinerary-18.12.3.ebuild
index 5571ac137281..90556bff9e76 100644
--- a/kde-apps/kitinerary/kitinerary-18.12.3.ebuild
+++ b/kde-apps/kitinerary/kitinerary-18.12.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Data Model and Extraction System for Travel Reservation information
 HOMEPAGE="https://www.kde.org/applications/office/kontact/"
 
 LICENSE="LGPL-2.1+"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="pdf"
 
 DEPEND="