commit: fcf39a79df5b3b14e887edb2a25c232ac7587708 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Fri Dec 16 20:42:17 2016 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Fri Dec 16 21:19:57 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcf39a79
mail-client/trojita: Port from kde-apps/gpgmepp to app-crypt/gpgme[qt5] Package-Manager: portage-2.3.0 Closes: https://github.com/gentoo/gentoo/pull/3137 Signed-off-by: Johannes Huber <johu <AT> gentoo.org> mail-client/trojita/files/trojita-0.7-gpgme.patch | 34 +++++++++ mail-client/trojita/trojita-0.7-r2.ebuild | 86 +++++++++++++++++++++++ 2 files changed, 120 insertions(+) diff --git a/mail-client/trojita/files/trojita-0.7-gpgme.patch b/mail-client/trojita/files/trojita-0.7-gpgme.patch new file mode 100644 index 00000000..2a7a6d5 --- /dev/null +++ b/mail-client/trojita/files/trojita-0.7-gpgme.patch @@ -0,0 +1,34 @@ +commit 1978d0a12d2cb4886c5612d6a50b145f409d815c +Author: Andreas Sturmlechner <andreas.sturmlech...@gmail.com> +Date: Wed Oct 26 22:42:47 2016 +0200 + + Switch from KF5Gpgmepp to Gpgmepp + + Gpgmepp is part of GpgME since 1.7.0. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index edf3e79..6993d2e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -84,7 +84,7 @@ trojita_plugin_option(WITH_QTKEYCHAIN_PLUGIN "Build Qtkeychain password plugin" + trojita_find_package(Git "" "" "" "") + + trojita_find_package(Mimetic "" "http://www.codesink.org/mimetic_mime_library.html"; "C++ MIME Library" "Required for client-side MIME parsing" WITH_MIMETIC) +-trojita_find_package(KF5Gpgmepp "" "https://quickgit.kde.org/?p=gpgmepp.git"; "C++ bindings for gpgme" "Needed for encrypted/signed e-mails" WITH_GPGMEPP) ++trojita_find_package(QGpgme 1.8.0 "http://www.gnupg.org"; "Qt5/C++ bindings for GpgME" "Needed for encrypted/signed e-mails" WITH_GPGMEPP) + trojita_option(WITH_CRYPTO_MESSAGES "Enable support for encrypted messages" AUTO "WITH_MIMETIC;WITH_GPGMEPP") + + if(WIN32) +@@ -615,11 +615,7 @@ if(WITH_MIMETIC) + endif() + if(WITH_CRYPTO_MESSAGES) + if(WITH_GPGMEPP) +- if (WIN32) +- target_link_libraries(Cryptography KF5::Gpgmepp KF5::QGpgme) +- else() +- target_link_libraries(Cryptography KF5::Gpgmepp-pthread KF5::QGpgme) +- endif() ++ target_link_libraries(Cryptography QGpgme) + endif() + endif() + diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild b/mail-client/trojita/trojita-0.7-r2.ebuild new file mode 100644 index 00000000..308c9fd --- /dev/null +++ b/mail-client/trojita/trojita-0.7-r2.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +EGIT_REPO_URI="git://anongit.kde.org/${PN}.git" +inherit cmake-utils fdo-mime gnome2-utils virtualx +[[ ${PV} == 9999 ]] && inherit git-r3 + +DESCRIPTION="A Qt IMAP e-mail client" +HOMEPAGE="http://trojita.flaska.net/"; +if [[ ${PV} != 9999 ]]; then + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="0" +IUSE="+crypt +dbus debug +password test +zlib" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwebkit:5 + dev-qt/qtwidgets:5 + crypt? ( + >=app-crypt/gpgme-1.8.0[cxx,qt5] + dev-libs/mimetic + ) + dbus? ( dev-qt/qtdbus:5 ) + password? ( dev-libs/qtkeychain[qt5] ) + zlib? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5 + test? ( dev-qt/qttest:5 ) + zlib? ( virtual/pkgconfig ) +" + +DOCS=( README LICENSE ) + +PATCHES=( "${FILESDIR}/${P}-gpgme.patch" ) + +src_prepare() { + cmake-utils_src_prepare + + # the build system is taking a look at `git describe ... --dirty` and + # gentoo's modifications to CMakeLists.txt break these + sed -i "s/--dirty//" "${S}/cmake/TrojitaVersion.cmake" || die "Cannot fix the version check" +} + +src_configure() { + local mycmakeargs=( + -DWITH_CRYPTO_MESSAGES=$(usex crypt) + -DWITH_GPGMEPP=$(usex crypt) + -DWITH_MIMETIC=$(usex crypt) + -DWITH_DBUS=$(usex dbus) + -DWITH_QTKEYCHAINPLUGIN=$(usex password) + -DWITH_TESTS=$(usex test) + -DWITH_ZLIB=$(usex zlib) + ) + + cmake-utils_src_configure +} + +src_test() { + virtx cmake-utils_src_test +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +}
