reinit the tree, so we can have metadata

6 files changed, 262 insertions, 0 deletions

diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
new file mode 100644
index 000000000000..90371d7c656d
--- /dev/null
+++ b/mail-client/trojita/Manifest
@@ -0,0 +1,8 @@
+AUX trojita-0.7-gpg-tests.patch 1465 SHA256 34115ea4e6f3a273035fa36efe509faab9ea8723aaafa73e39e5ccc800c866e3 SHA512 e494de83085dbbd7c545e47fcb1116cfb48e787f7b8706bee51f30f74a9047d1cf835f20086355671643ee0ef88d01428683999765d4bb59c3d9d943e92c69eb WHIRLPOOL 8146f357e9c795b2bcc2053ee11ed20658d5f433ae567d873e9c57b55974347e1557573c1b9e6141a41bc8052d4d4b1dcca61650e7b7c3ba29fe7e0547df1a21
+AUX trojita-0.7-gpgme.patch 1416 SHA256 2c68152b3b96f7472472f9d2501b79c3b55633b88fac7bb12d149660f22b4ab4 SHA512 4031feb66e7ce53e5669e00dd8ca91a6a53a22207aae90e13ef38012777b76275911d78fbdcd58809571a7c649fb4025cdb7de97e9793102c62f5e8b7b0561e1 WHIRLPOOL 1c134ee5e4c895cd3d7e3b83f7427ee4be1e2a0cd4006fabd3f28c5b8f01b4647a0074a5cd751c7eed907cbdbedad41e5018b8cc6e3cbe6c593d9a5ffc721cfb
+DIST trojita-0.7.tar.xz 1038212 SHA256 e08da881721cafa00ecd772eaef6b99fd37d068cb703eeb532de0ed1ea0136d9 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8 WHIRLPOOL 2df7c34566bfdfff3a66566888ad8a9f9390af9a72eeb4a26dd96b96e46d07597441e8b9d56d7f18e2412f4a2e3b855e17a161ec88f0a9791e4db39117471e20
+EBUILD trojita-0.7-r2.ebuild 1849 SHA256 7a1770bd2ad340d1d84bff6abb0b61355b46099b31df6c7f0f4dbc028deb585f SHA512 54c1095763d5b3b4a97d84f996ab0c316bdd0c35271f4715de2f024e2e4506efa29e28e4b50dffa464eaad7fb7e4136aa63e6142c46fca7dbc2e14ffb6951b32 WHIRLPOOL 4aa7d792bcfb6a9139b0a2ba2f82cc76983af74f63dcc472af2e5f6581c17a3a0d77a489b17e15dceff4e3cccad519e35d28e9490687281fb8342689658a4089
+EBUILD trojita-9999.ebuild 1769 SHA256 ea304f98efce8eb60cd5a830c205a55e72de2dcc843ba0250e06349072de82f0 SHA512 01280ad986a648dc5cde48f195b5a32610c7fd8b787c439e6ae3d631162676159688e2e40f03aab519a7c29d0888619b11a533eadb6a622964e86b39ea836b1f WHIRLPOOL a115ad45d39f7db8142b241ddb1649c1c4e055f4f14648dd67f736f216cf63eaac07deb8531e93d50bb8d4c56c4452a0b65f3cc5a2e126acfd599cebcfe56d3a
+MISC ChangeLog 5309 SHA256 f01bf4531b6c8ad523b0dd0e200c895fa5b163e7fcb9d8c8ef798a71e1969a0a SHA512 e0d7773746a3bde207857a2e08423cbeb6694b0f9a2c79cbf4ceea7a1267cbd1a249ffeb8e32e4636bf8801adc52dfd0308dedb27d29e7af5da21d58faf74267 WHIRLPOOL d762e9779f111b947d0dc91fc20440548deb6413e7a17644aef93d94044136fd43ea9cbc61c2738a772f6d5950e3d3bc2e0230edd8455d8b4531da2a91a0aece
+MISC ChangeLog-2015 6418 SHA256 56c38e4b8cde5a3e19204e91d4af692cda3b8a627a89d20c90578118c760396d SHA512 2e0892f84ac6bf9630253407a1085f884c379d4500aaca3f8eebe26e21025dd37ee60e94ebb5fbf8511ee84252485bdfadbfb6779fccd56cc5dc5bfe0f5be1ad WHIRLPOOL 86ba786003eb9331da737fd936daedeb16f1c18054a06b8688b4e69c710a3b241236c5625fb58df400f5ceb903e9ef3495fe974289f82a0bc4f2403d47fa7549
+MISC metadata.xml 643 SHA256 74bfbd3b3a2b9080dfdfd7e17d35a49a1ffc65d39c8c1520af7d379b14aef66c SHA512 8a9fe47d6bc7f566e8bb896526d76bdc05171f034c48eda9c2d67e770d0eb9e98e7dbd30d98d6674ae7d8c6f9f3551013365356bc2dd2c0088bef5a17488236e WHIRLPOOL 76fcf44aa077fa94627a8b9e54cc63af353f8e4b1a6a59677216414918389de8b10a112a5034ba292ce6ceacf360913cc73c25f38a471f64a0b7a414df5f73dd
diff --git a/mail-client/trojita/files/trojita-0.7-gpg-tests.patch b/mail-client/trojita/files/trojita-0.7-gpg-tests.patch
new file mode 100644
index 000000000000..db41ee577e82
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-gpg-tests.patch
@@ -0,0 +1,27 @@
+commit be8fd5831afa0a04f14cd6206e6576f03ee59558
+Author: Amaury Pouly <amaury.pouly@gmail.com>
+Date:   Sat Sep 17 16:40:46 2016 +0100
+
+    Fix GPG test
+    
+    At least GnuPG, when run with both --fingerprint and --with-colons will output
+    the fingerprint of the public key and the subkey. The command below will thus
+    output two fingerprints and the delete command will fail because it cannot
+    find the second fingerprint (which is a subkey and not a public key). It seems
+    that a safe approach is to consider only the first fingerprint line.
+    
+    Change-Id: I4c6aa79e4473bca146aa087728a5652d91586a81
+
+diff --git a/tests/Cryptography/keygen.sh b/tests/Cryptography/keygen.sh
+index c94c0ab..98c69ca 100755
+--- a/tests/Cryptography/keygen.sh
++++ b/tests/Cryptography/keygen.sh
+@@ -115,7 +115,7 @@ $TAIL" > crypto_test_data.h
+ echo -n "key *\nexpire\nseconds=1\nsave\n" | ${GPG} --no-tty --quiet --command-fd 0 --edit-key "expired@test.trojita.flaska.net"
+ 
+ # extract fingerprint of key to be deleted
+-FINGERPRINT="$(${GPG} --quiet --no-tty --list-keys --with-colons --fingerprint unknown@test.trojita.flaska.net | grep fpr | cut -d : -f 10)"
++FINGERPRINT="$(${GPG} --quiet --no-tty --list-keys --with-colons --fingerprint unknown@test.trojita.flaska.net | grep fpr | head -n 1 | cut -d : -f 10)"
+ 
+ # delete key
+ yes | DISPLAY="" ${GPG} --quiet --batch --no-tty --delete-secret-and-public-key --yes --command-fd 0 --passphrase-fd 0 "${FINGERPRINT}"
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 000000000000..2a7a6d5e7085
--- /dev/null
+++ b/mail-client/trojita/files/trojita-0.7-gpgme.patch
@@ -0,0 +1,34 @@
+commit 1978d0a12d2cb4886c5612d6a50b145f409d815c
+Author: Andreas Sturmlechner <andreas.sturmlechner@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/metadata.xml b/mail-client/trojita/metadata.xml
new file mode 100644
index 000000000000..7cf4bb201385
--- /dev/null
+++ b/mail-client/trojita/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jkt@gentoo.org</email>
+		<name>Jan Kundrát</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="password">Store passwords securely via <pkg>dev-libs/qtkeychain</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">trojita</remote-id>
+	</upstream>
+</pkgmetadata>
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 000000000000..bc979f3f5ee6
--- /dev/null
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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"
+	"${FILESDIR}/${P}-gpg-tests.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
+}
diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild
new file mode 100644
index 000000000000..4988ce563e13
--- /dev/null
+++ b/mail-client/trojita/trojita-9999.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://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 debug +dbus +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? (
+		dev-libs/mimetic
+		>=app-crypt/gpgme-1.8.0[cxx,qt5]
+	)
+	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"
+
+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
+}