subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: mail\-client\/trojita\/"

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-04-19 Thread Andreas Sturmlechner

commit: 2c2ffbe8ad3558d909964fd2e7b55fe35f13e6bc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 19 11:29:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 19 12:01:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c2ffbe8

mail-client/trojita: EAPI-7 bump, use cmake.eclass, xdg.eclass

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r2.ebuild | 47 ---
 mail-client/trojita/trojita-.ebuild   |  4 +--
 2 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index a5904f016e3..f2648fcf92b 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -1,26 +1,31 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-inherit cmake-utils gnome2-utils virtualx xdg-utils
-[[ ${PV} ==  ]] && inherit git-r3
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-if [[ ${PV} !=  ]]; then
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
+   inherit git-r3
+else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
KEYWORDS="amd64 x86"
 fi
+inherit cmake virtualx xdg
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password test +zlib"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="password? ( dbus )"
+RESTRICT="!test? ( test )"
 
+BDEPEND="
+   dev-qt/linguist-tools:5
+   zlib? ( virtual/pkgconfig )
+"
 RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -38,9 +43,7 @@ RDEPEND="
zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
test? ( dev-qt/qttest:5 )
-   zlib? ( virtual/pkgconfig )
 "
 
 DOCS=( README LICENSE )
@@ -53,11 +56,11 @@ PATCHES=(
 )
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_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"
+   sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix 
the version check"
 }
 
 src_configure() {
@@ -71,23 +74,9 @@ src_configure() {
-DWITH_ZLIB=$(usex zlib)
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_test() {
-   virtx cmake-utils_src_test
-}
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
+   virtx cmake_src_test
 }

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index a6f81504d4e..672e67f6cd6 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,9 +18,9 @@ HOMEPAGE="http://trojita.flaska.net/";
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password pim +spell test +zlib"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="password? ( dbus )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
dev-qt/linguist-tools:5

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-09-08 Thread Andreas Sturmlechner

commit: c6c53388179e5e54a951db2f2a983684ded2c608
Author: Jan Kundrát  kde  org>
AuthorDate: Mon Aug 26 14:32:40 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  8 16:23:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6c53388

mail-client/trojita: Unconditionally enable the abook plugin

Trojita supports different implementations of an "address book" via
plugins that are loaded at runtime. Only one plugin can be active at a
time, but any number of them can be built and installed. The user can
pick and select an appropriate plugin via a GUI configuration.

There is no need to disable the "abook" plugin, and upstream expects
this plugin to be always available. There are no external dependencies,
and the `abook` binary is not used.

Fixes: e0e382d4f9341 (mail-client/trojita: Add USE addressbook)
Closes: https://bugs.gentoo.org/692214
Signed-off-by: Jan Kundrát  kde.org>
Closes: https://github.com/gentoo/gentoo/pull/12794
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 7740a0aa6ff..75c450faa1e 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -58,7 +58,7 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
-   -DWITH_ABOOKADDRESSBOOK_PLUGIN=OFF
+   -DWITH_ABOOKADDRESSBOOK_PLUGIN=ON
-DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex addressbook)
-DWITH_CRYPTO_MESSAGES=$(usex crypt)
-DWITH_GPGMEPP=$(usex crypt)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-09-08 Thread Andreas Sturmlechner

commit: 5c3995890446ce24d99ca96ee14ebe82ba200323
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  8 16:27:28 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  8 16:27:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c399589

mail-client/trojita: USE addressbook -> pim for kde-apps/akonadi plugin

USE addressbook has become too generic since abook plugin is always being built.

Thanks-to: Jan Kundrát  kde.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/metadata.xml| 2 +-
 mail-client/trojita/trojita-.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index 7a659b227af..d5712067bc9 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -14,8 +14,8 @@
Gentoo KDE Project


-   Build kde-apps/akonadi 
addressbook plugin
Store passwords securely via 
dev-libs/qtkeychain
+   Enable support for KDE PIM resources 
integration via kde-apps/akonadi addressbook plugin


trojita

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 75c450faa1e..78c9bfff1e4 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="addressbook +crypt +dbus debug +password +spell test +zlib"
+IUSE="+crypt +dbus debug +password pim +spell test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
@@ -34,13 +34,13 @@ DEPEND="
dev-qt/qtsvg:5
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
-   addressbook? ( kde-apps/akonadi-contacts:5 )
crypt? (
>=app-crypt/gpgme-1.8.0[cxx,qt5]
dev-libs/mimetic
)
dbus? ( dev-qt/qtdbus:5 )
password? ( dev-libs/qtkeychain[qt5(+)] )
+   pim? ( kde-apps/akonadi-contacts:5 )
spell? ( kde-frameworks/sonnet:5 )
zlib? ( sys-libs/zlib )
 "
@@ -59,12 +59,12 @@ src_prepare() {
 src_configure() {
local mycmakeargs=(
-DWITH_ABOOKADDRESSBOOK_PLUGIN=ON
-   -DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex addressbook)
-DWITH_CRYPTO_MESSAGES=$(usex crypt)
-DWITH_GPGMEPP=$(usex crypt)
-DWITH_MIMETIC=$(usex crypt)
-DWITH_DBUS=$(usex dbus)
-DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
+   -DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex pim)
-DWITH_SONNET_PLUGIN=$(usex spell)
-DBUILD_TESTING=$(usex test)
-DWITH_ZLIB=$(usex zlib)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-09-08 Thread Andreas Sturmlechner

commit: 5ff66409b9e7ee5239952013cb6fd4b2a1edaecf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  8 16:31:17 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  8 16:31:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff66409

mail-client/trojita: Move dev-qt/qttest:5 to DEPEND

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 78c9bfff1e4..fb3c38171e0 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -23,10 +23,9 @@ REQUIRED_USE="password? ( dbus )"
 
 BDEPEND="
dev-qt/linguist-tools:5
-   test? ( dev-qt/qttest:5 )
zlib? ( virtual/pkgconfig )
 "
-DEPEND="
+RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5[ssl]
@@ -44,7 +43,9 @@ DEPEND="
spell? ( kde-frameworks/sonnet:5 )
zlib? ( sys-libs/zlib )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+   test? ( dev-qt/qttest:5 )
+"
 
 DOCS=( README LICENSE )

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-28 Thread Andreas Sturmlechner

commit: 08baa3311287ea39ca35c9b67abe636146728bc8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 28 21:01:24 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 28 21:55:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08baa331

mail-client/trojita: Drop 0.7-r3

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r3.ebuild | 83 ---
 1 file changed, 83 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r3.ebuild 
b/mail-client/trojita/trojita-0.7-r3.ebuild
deleted file mode 100644
index ba129ff4eb4..000
--- a/mail-client/trojita/trojita-0.7-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-   inherit git-r3
-else
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake virtualx xdg
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
-
-REQUIRED_USE="password? ( dbus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   zlib? ( virtual/pkgconfig )
-"
-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}
-   test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( README LICENSE )
-
-PATCHES=(
-   "${FILESDIR}/${P}-gpgme.patch"
-   "${FILESDIR}/${P}-gpg-tests.patch"
-   "${FILESDIR}/${P}-qt-5.11b3.patch"
-   "${FILESDIR}/${P}-qt-5.15.patch"
-   "${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # the build system is taking a look at `git describe ... --dirty` and
-   # gentoo's modifications to CMakeLists.txt break these
-   sed -e "s/--dirty//" -i 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_QTKEYCHAIN_PLUGIN=$(usex password)
-   -DWITH_TESTS=$(usex test)
-   -DWITH_ZLIB=$(usex zlib)
-   )
-
-   cmake_src_configure
-}
-
-src_test() {
-   virtx cmake_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-29 Thread Agostino Sarubbo

commit: 41dc092091ba9620141cf1d5030abc7bc05d180b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun 29 13:34:31 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun 29 13:34:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41dc0920

mail-client/trojita: amd64 stable wrt bug #729596

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.7-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.7-r4.ebuild 
b/mail-client/trojita/trojita-0.7-r4.ebuild
index e9b7c9e515a..199ae853726 100644
--- a/mail-client/trojita/trojita-0.7-r4.ebuild
+++ b/mail-client/trojita/trojita-0.7-r4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
inherit git-r3
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 inherit cmake virtualx xdg

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-29 Thread Agostino Sarubbo

commit: 5801a74755875ba4e54c9e9b089aa029514ff408
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun 29 13:39:05 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun 29 13:39:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5801a747

mail-client/trojita: x86 stable wrt bug #729596

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.7-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.7-r4.ebuild 
b/mail-client/trojita/trojita-0.7-r4.ebuild
index 199ae853726..ec2dd0a0cc5 100644
--- a/mail-client/trojita/trojita-0.7-r4.ebuild
+++ b/mail-client/trojita/trojita-0.7-r4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
inherit git-r3
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 inherit cmake virtualx xdg

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-29 Thread Andreas Sturmlechner

commit: 29dcb5b60c52945652edc27aa1505e0c48760d49
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 29 17:25:47 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 29 17:36:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29dcb5b6

mail-client/trojita: Cleanup vulnerable 0.7-r2

Bug: https://bugs.gentoo.org/729596
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r2.ebuild | 82 ---
 1 file changed, 82 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
deleted file mode 100644
index f2648fcf92b..000
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-   inherit git-r3
-else
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-inherit cmake virtualx xdg
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
-
-REQUIRED_USE="password? ( dbus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   zlib? ( virtual/pkgconfig )
-"
-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}
-   test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( README LICENSE )
-
-PATCHES=(
-   "${FILESDIR}/${P}-gpgme.patch"
-   "${FILESDIR}/${P}-gpg-tests.patch"
-   "${FILESDIR}/${P}-qt-5.11b3.patch"
-   "${FILESDIR}/${P}-qt-5.15.patch"
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # the build system is taking a look at `git describe ... --dirty` and
-   # gentoo's modifications to CMakeLists.txt break these
-   sed -e "s/--dirty//" -i 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_QTKEYCHAIN_PLUGIN=$(usex password)
-   -DWITH_TESTS=$(usex test)
-   -DWITH_ZLIB=$(usex zlib)
-   )
-
-   cmake_src_configure
-}
-
-src_test() {
-   virtx cmake_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-30 Thread Andreas Sturmlechner

commit: 92f86dd3ec45d980c9e1452a0b85d473400e1d22
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 30 19:55:34 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 30 19:56:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f86dd3

mail-client/trojita: Drop 0.7-r4

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r4.ebuild | 86 ---
 1 file changed, 86 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r4.ebuild 
b/mail-client/trojita/trojita-0.7-r4.ebuild
deleted file mode 100644
index ec2dd0a0cc5..000
--- a/mail-client/trojita/trojita-0.7-r4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-   inherit git-r3
-else
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-inherit cmake virtualx xdg
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
-
-REQUIRED_USE="password? ( dbus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   zlib? ( virtual/pkgconfig )
-"
-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}
-   test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( README LICENSE )
-
-PATCHES=(
-   "${FILESDIR}/${P}-gpgme.patch"
-   "${FILESDIR}/${P}-gpg-tests.patch"
-   "${FILESDIR}/${P}-qt-5.11b3.patch"
-   "${FILESDIR}/${P}-qt-5.13.patch" # bug 730058
-   "${FILESDIR}/${P}-qt-5.15.patch"
-   "${FILESDIR}/${P}-CVE-2019-10734.patch" # KDE-bug 404697
-   "${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596
-   "${FILESDIR}/${P}-cmake-cxx11.patch"
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # the build system is taking a look at `git describe ... --dirty` and
-   # gentoo's modifications to CMakeLists.txt break these
-   sed -e "s/--dirty//" -i 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_QTKEYCHAIN_PLUGIN=$(usex password)
-   -DWITH_TESTS=$(usex test)
-   -DWITH_ZLIB=$(usex zlib)
-   )
-
-   cmake_src_configure
-}
-
-src_test() {
-   virtx cmake_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-12-07 Thread Andreas Sturmlechner

commit: 46d89ee9796b4a7342b5a0b62542d3fe10d884ac
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec  7 19:09:55 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec  7 19:10:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d89ee9

mail-client/trojita: Drop 0.7-r5

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r5.ebuild | 89 ---
 1 file changed, 89 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r5.ebuild 
b/mail-client/trojita/trojita-0.7-r5.ebuild
deleted file mode 100644
index f7b60c36636..000
--- a/mail-client/trojita/trojita-0.7-r5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-   inherit git-r3
-else
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-inherit cmake virtualx xdg
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
-
-REQUIRED_USE="password? ( dbus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   zlib? ( virtual/pkgconfig )
-"
-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}
-   test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( README LICENSE )
-
-PATCHES=(
-   "${FILESDIR}/${P}-gpgme.patch"
-   "${FILESDIR}/${P}-gpg-tests.patch"
-   "${FILESDIR}/${P}-qt-5.11b3.patch"
-   "${FILESDIR}/${P}-qt-5.13.patch" # bug 730058
-   "${FILESDIR}/${P}-qt-5.15.patch"
-   "${FILESDIR}/${P}-CVE-2019-10734.patch" # KDE-bug 404697
-   "${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596
-   "${FILESDIR}/${P}-cmake-cxx11.patch"
-   "${FILESDIR}/${P}-desktop-spec-namespace.patch"
-   "${FILESDIR}/${P}-metainfo.patch" # bug 730140
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # the build system is taking a look at `git describe ... --dirty` and
-   # gentoo's modifications to CMakeLists.txt break these
-   sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix 
the version check"
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWITH_RAGEL=OFF # bug 739866, broken by ragel-7
-   -DWITH_CRYPTO_MESSAGES=$(usex crypt)
-   -DWITH_GPGMEPP=$(usex crypt)
-   -DWITH_MIMETIC=$(usex crypt)
-   -DWITH_DBUS=$(usex dbus)
-   -DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
-   -DWITH_TESTS=$(usex test)
-   -DWITH_ZLIB=$(usex zlib)
-   )
-
-   cmake_src_configure
-}
-
-src_test() {
-   virtx cmake_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2017-05-11 Thread Agostino Sarubbo

commit: b6c5910c0d0e82146fd97fbc7983835f220c36cb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May 11 07:50:46 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May 11 07:50:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c5910c

mail-client/trojita: amd64 stable wrt bug #618128

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.7-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index 07a21e42727..c6f704c0d48 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
 if [[ ${PV} !=  ]]; then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2017-05-11 Thread Agostino Sarubbo

commit: f25f5f56c1595ae509bd7d85ecc7daaadafd114e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May 11 08:37:18 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May 11 08:37:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f25f5f56

mail-client/trojita: x86 stable wrt bug #618128

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index c6f704c0d48..f283ed20238 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
 if [[ ${PV} !=  ]]; then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2017-05-11 Thread Andreas Sturmlechner

commit: dc93b8955dfdcdd8420b2a62fcce423cd94a1f7d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 11 18:19:23 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 11 18:43:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc93b895

mail-client/trojita: Drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 mail-client/trojita/trojita-0.7-r1.ebuild | 83 ---
 1 file changed, 83 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r1.ebuild 
b/mail-client/trojita/trojita-0.7-r1.ebuild
deleted file mode 100644
index b68534f9611..000
--- a/mail-client/trojita/trojita-0.7-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 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} ==  ]] && inherit git-r3
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-if [[ ${PV} !=  ]]; 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
-   kde-apps/gpgmepp:5
-   )
-   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
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2017-09-19 Thread Michael Palimaka

commit: c1fcec31e841b0cd6165df14fd0c174e7df76caf
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Sep 19 12:18:39 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Sep 19 12:19:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1fcec31

mail-client/trojita: use HTTPS in EGIT_REPO_URI

Closes: https://bugs.gentoo.org/631350
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 mail-client/trojita/trojita-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 919326db5b1..4988ce563e1 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# 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"
+EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
 inherit cmake-utils fdo-mime gnome2-utils virtualx
 [[ ${PV} ==  ]] && inherit git-r3

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2015-10-01 Thread Michael Palimaka

commit: 5ff6c55db282acdc515849459b3f49a2502e66bc
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Oct  1 13:55:11 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Oct  1 14:20:41 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff6c55d

mail-client/trojita: dev-qt/linguist-tools is a build-time dependency

Package-Manager: portage-2.2.20.1

 mail-client/trojita/trojita-0.5.ebuild  | 2 +-
 mail-client/trojita/trojita-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/trojita/trojita-0.5.ebuild 
b/mail-client/trojita/trojita-0.5.ebuild
index f923d86..b0bfd16 100644
--- a/mail-client/trojita/trojita-0.5.ebuild
+++ b/mail-client/trojita/trojita-0.5.ebuild
@@ -30,7 +30,6 @@ done
 
 RDEPEND="
qt5? (
-   dev-qt/linguist-tools:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtsql:5[sqlite]
@@ -49,6 +48,7 @@ DEPEND="${RDEPEND}
qt5?( dev-libs/qtkeychain[qt5] )
!qt5?   ( dev-libs/qtkeychain[qt4] )
)
+   qt5? ( dev-qt/linguist-tools:5 )
test? (
qt5?( dev-qt/qttest:5 )
!qt5?   ( >=dev-qt/qttest-${QT4_REQUIRED}:4 )

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 4656b55..e7c71ee 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -30,7 +30,6 @@ done
 
 RDEPEND="
qt5? (
-   dev-qt/linguist-tools:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtsql:5[sqlite]
@@ -49,6 +48,7 @@ DEPEND="${RDEPEND}
qt5?( dev-libs/qtkeychain[qt5] )
!qt5?   ( dev-libs/qtkeychain[qt4] )
)
+   qt5? ( dev-qt/linguist-tools:5 )
test? (
qt5?( dev-qt/qttest:5 )
!qt5?   ( >=dev-qt/qttest-${QT4_REQUIRED}:4 )

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-07-17 Thread Michael Palimaka

commit: a0a46fcb8e9631aa2ccbbebb4a33d52fd228af94
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jul 17 18:58:36 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul 17 18:59:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a46fcb

mail-client/trojita: amd64/x86 stable

Gentoo-bug: 588776

Package-Manager: portage-2.3.0

 mail-client/trojita/trojita-0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.7-r1.ebuild 
b/mail-client/trojita/trojita-0.7-r1.ebuild
index 0671174..75095fd 100644
--- a/mail-client/trojita/trojita-0.7-r1.ebuild
+++ b/mail-client/trojita/trojita-0.7-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
 if [[ ${PV} !=  ]]; then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-06-15 Thread Michael Palimaka

commit: 4d48ada1c12f91cee07683ae10e604f833e0d84c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jun 15 13:18:53 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jun 15 13:19:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d48ada1

mail-client/trojita: version bump

Package-Manager: portage-2.3.0_rc1

 mail-client/trojita/Manifest   |  1 +
 mail-client/trojita/trojita-0.7.ebuild | 83 ++
 2 files changed, 84 insertions(+)

diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index 35ffa3a..edec7a0 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -1,3 +1,4 @@
 DIST trojita-0.4.1.tar.bz2 1219460 SHA256 
68a17498e70fd66966917fe4ecb90e6fe6f36f439c714552b8a97c004fe687de SHA512 
f24210d4f8e10cfbca25ab4d62ae3c8eea3e8824c13119cd6dc4511d4cf9b5f82be67586b6494aff5290ab06f869ae3bd1c8a19664bcf0f57059ee8d67d6c81a
 WHIRLPOOL 
47652af26fe24c6fb7fb0dbb1ef7c00710d087903787a847b59dc80d61dcd1725b5c7444aa77e36b357c3bbd6bc64f0566a995ac5b3c53842c3744b1a82127c0
 DIST trojita-0.5.tar.bz2 1421368 SHA256 
21d8f0bf12b7d6dc39344ab70f4a0cb5b1997a3b60dc502841272ac92959458a SHA512 
c3d661b5a49ca083fe7f09f598138f70a6ace5d66760bfe1242b06fcc90cb73abb56a1c27329f8de48eea281a782f8c5b6e1b374e271c33c9907070b5883b904
 WHIRLPOOL 
59a8bb257226edb4e34445766b5e5e500cae7205cf2ecf64fd80216f77d2e662395c4055744b84e0509311c635c93813849ec83b2ed5ec8212cb4553a118cadd
 DIST trojita-0.6.tar.bz2 1409812 SHA256 
4c1083f48b51cc37bb318c5a8ada67b64b38ed95d8ad30b4621755fcf45efa10 SHA512 
de13437b9c046b3db317c62cbf4fbff5607ad807378a7ef9ba239609aba2e49933a2f0aa9645777536e5c03e2af612164b96d15b731570597b0d4de187d1b350
 WHIRLPOOL 
e81ff5a5759ec2182f1e8e68c478b70c80e2715560dda3c7095e7d897eab1e0d5cb45d2f8e15ba133a0bb31351f59b7a507011bdb637401c28147d456b51145d
+DIST trojita-0.7.tar.xz 1038212 SHA256 
e08da881721cafa00ecd772eaef6b99fd37d068cb703eeb532de0ed1ea0136d9 SHA512 
fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8
 WHIRLPOOL 
2df7c34566bfdfff3a66566888ad8a9f9390af9a72eeb4a26dd96b96e46d07597441e8b9d56d7f18e2412f4a2e3b855e17a161ec88f0a9791e4db39117471e20

diff --git a/mail-client/trojita/trojita-0.7.ebuild 
b/mail-client/trojita/trojita-0.7.ebuild
new file mode 100644
index 000..b728ae9
--- /dev/null
+++ b/mail-client/trojita/trojita-0.7.ebuild
@@ -0,0 +1,83 @@
+# 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} ==  ]] && inherit git-r3
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/";
+if [[ ${PV} !=  ]]; 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/qtwebkit:5
+   dev-qt/qtwidgets:5
+   crypt? (
+   dev-libs/mimetic
+   kde-apps/gpgmepp:5
+   )
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-06-15 Thread Michael Palimaka

commit: 414658bf1d78df4a5ccd5b337e5929ce98a9c8ac
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jun 15 13:18:18 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jun 15 13:19:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=414658bf

mail-client/trojita: update SRC_URI

Package-Manager: portage-2.3.0_rc1

 mail-client/trojita/trojita-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index c0bfef7..b728ae9 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -11,7 +11,7 @@ inherit cmake-utils fdo-mime gnome2-utils virtualx
 DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
 if [[ ${PV} !=  ]]; then
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
 fi

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-06-22 Thread Michael Palimaka

commit: 224ae056f5406d86f1b41d8fb3d6807ef5b88911
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jun 22 11:33:10 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jun 22 11:33:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224ae056

mail-client/trojita: add missing dependency

Gentoo-bug: 586482

Package-Manager: portage-2.3.0_rc1

 mail-client/trojita/{trojita-0.7.ebuild => trojita-0.7-r1.ebuild} | 1 +
 mail-client/trojita/trojita-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mail-client/trojita/trojita-0.7.ebuild 
b/mail-client/trojita/trojita-0.7-r1.ebuild
similarity index 99%
rename from mail-client/trojita/trojita-0.7.ebuild
rename to mail-client/trojita/trojita-0.7-r1.ebuild
index b728ae9..0671174 100644
--- a/mail-client/trojita/trojita-0.7.ebuild
+++ b/mail-client/trojita/trojita-0.7-r1.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
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? (

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index b728ae9..0671174 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
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? (

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-01-29 Thread Michael Palimaka

commit: fde5d3c7104d82d3db94b0335fea76cc9a65d3fc
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 29 08:38:09 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Jan 29 08:39:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde5d3c7

mail-client/trojita: version bump

Gentoo-bug: 572894

Package-Manager: portage-2.2.27

 mail-client/trojita/Manifest   |  1 +
 mail-client/trojita/trojita-0.6.ebuild | 97 ++
 2 files changed, 98 insertions(+)

diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index 36538e7..35ffa3a 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -1,2 +1,3 @@
 DIST trojita-0.4.1.tar.bz2 1219460 SHA256 
68a17498e70fd66966917fe4ecb90e6fe6f36f439c714552b8a97c004fe687de SHA512 
f24210d4f8e10cfbca25ab4d62ae3c8eea3e8824c13119cd6dc4511d4cf9b5f82be67586b6494aff5290ab06f869ae3bd1c8a19664bcf0f57059ee8d67d6c81a
 WHIRLPOOL 
47652af26fe24c6fb7fb0dbb1ef7c00710d087903787a847b59dc80d61dcd1725b5c7444aa77e36b357c3bbd6bc64f0566a995ac5b3c53842c3744b1a82127c0
 DIST trojita-0.5.tar.bz2 1421368 SHA256 
21d8f0bf12b7d6dc39344ab70f4a0cb5b1997a3b60dc502841272ac92959458a SHA512 
c3d661b5a49ca083fe7f09f598138f70a6ace5d66760bfe1242b06fcc90cb73abb56a1c27329f8de48eea281a782f8c5b6e1b374e271c33c9907070b5883b904
 WHIRLPOOL 
59a8bb257226edb4e34445766b5e5e500cae7205cf2ecf64fd80216f77d2e662395c4055744b84e0509311c635c93813849ec83b2ed5ec8212cb4553a118cadd
+DIST trojita-0.6.tar.bz2 1409812 SHA256 
4c1083f48b51cc37bb318c5a8ada67b64b38ed95d8ad30b4621755fcf45efa10 SHA512 
de13437b9c046b3db317c62cbf4fbff5607ad807378a7ef9ba239609aba2e49933a2f0aa9645777536e5c03e2af612164b96d15b731570597b0d4de187d1b350
 WHIRLPOOL 
e81ff5a5759ec2182f1e8e68c478b70c80e2715560dda3c7095e7d897eab1e0d5cb45d2f8e15ba133a0bb31351f59b7a507011bdb637401c28147d456b51145d

diff --git a/mail-client/trojita/trojita-0.6.ebuild 
b/mail-client/trojita/trojita-0.6.ebuild
new file mode 100644
index 000..0182235
--- /dev/null
+++ b/mail-client/trojita/trojita-0.6.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+QT4_REQUIRED="4.8.0"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
+inherit cmake-utils fdo-mime gnome2-utils qmake-utils virtualx
+[[ ${PV} ==  ]] && inherit git-r3
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/";
+if [[ ${PV} !=  ]]; then
+   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="debug +dbus +password +qt5 test +zlib"
+
+RDEPEND="
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtsql:5[sqlite]
+   dev-qt/qtwebkit:5
+   dev-qt/qtwidgets:5
+   )
+   !qt5? (
+   >=dev-qt/qtbearer-${QT4_REQUIRED}:4
+   >=dev-qt/qtcore-${QT4_REQUIRED}:4
+   >=dev-qt/qtgui-${QT4_REQUIRED}:4
+   >=dev-qt/qtsql-${QT4_REQUIRED}:4[sqlite]
+   >=dev-qt/qtwebkit-${QT4_REQUIRED}:4
+   )
+   dbus? ( dev-qt/qtdbus:5 )
+   password? (
+   qt5?( dev-libs/qtkeychain[qt5] )
+   !qt5?   ( dev-libs/qtkeychain[qt4] )
+   )
+   zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+   qt5? ( dev-qt/linguist-tools:5 )
+   test? (
+   qt5?( dev-qt/qttest:5 )
+   !qt5?   ( >=dev-qt/qttest-${QT4_REQUIRED}:4 )
+   )
+   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"
+
+   # ensure correct version of binary is used - bug 544108.
+   # this file is only used for qt4 builds
+   sed -i "s|\$ENV{QTDIR}/bin|$(qt4_get_bindir) NO_DEFAULT_PATH|" 
cmake/FindLinguistForTrojita.cmake || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_DBUS=$(usex dbus)
+   -DWITH_QT5=$(usex qt5)
+   -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
+}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-01-29 Thread Michael Palimaka

commit: c04c058c778515b4757693f8371ebcf801b23772
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 29 07:50:11 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Jan 29 08:39:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c04c058c

mail-client/trojita: various live ebuild updates

* Port to EAPI 6
* Drop Qt 4 support as it is being removed upstream
* Drop linguas USE flags as they only control small text iles
* Introduce dbus USE flag
* Add missing dev-qt/qtnetwork USE dependency
* Update icon and mime caches

Gentoo-bug: 572894

Package-Manager: portage-2.2.27

 mail-client/trojita/trojita-.ebuild | 103 ++--
 1 file changed, 45 insertions(+), 58 deletions(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index e7c71ee..32da654 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,89 +1,76 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-QT4_REQUIRED="4.8.0"
 EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
-[[ ${PV} == "" ]] && GIT_ECLASS="git-2"
-
-inherit cmake-utils virtualx ${GIT_ECLASS}
+inherit cmake-utils fdo-mime gnome2-utils virtualx
+[[ ${PV} ==  ]] && inherit git-r3
 
 DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
-if [[ ${PV} == "" ]]; then
-   SRC_URI=""
-   KEYWORDS=""
-else
+if [[ ${PV} !=  ]]; then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-   KEYWORDS="~amd64 ~ppc ~x86"
-   MY_LANGS="ar bs ca cs da de el en_GB es et fi fr ga gl hu ia it ja lt 
mr nb nds nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
+   KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="debug +password qt5 test +zlib"
-for MY_LANG in ${MY_LANGS} ; do
-   IUSE="${IUSE} linguas_${MY_LANG}"
-done
+IUSE="debug +dbus +password test +zlib"
 
 RDEPEND="
-   qt5? (
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsql:5[sqlite]
-   dev-qt/qtwebkit:5
-   dev-qt/qtwidgets:5
-   )
-   !qt5? (
-   >=dev-qt/qtbearer-${QT4_REQUIRED}:4
-   >=dev-qt/qtgui-${QT4_REQUIRED}:4
-   >=dev-qt/qtsql-${QT4_REQUIRED}:4[sqlite]
-   >=dev-qt/qtwebkit-${QT4_REQUIRED}:4
-   )
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtsql:5[sqlite]
+   dev-qt/qtwebkit:5
+   dev-qt/qtwidgets:5
+   dbus? ( dev-qt/qtdbus:5 )
+   password? ( dev-libs/qtkeychain[qt5] )
+   zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}
-   password? (
-   qt5?( dev-libs/qtkeychain[qt5] )
-   !qt5?   ( dev-libs/qtkeychain[qt4] )
-   )
-   qt5? ( dev-qt/linguist-tools:5 )
-   test? (
-   qt5?( dev-qt/qttest:5 )
-   !qt5?   ( >=dev-qt/qttest-${QT4_REQUIRED}:4 )
-   )
-   zlib? (
-   virtual/pkgconfig
-   sys-libs/zlib
-   )
+   dev-qt/linguist-tools:5
+   test? ( dev-qt/qttest:5 )
+   zlib? ( virtual/pkgconfig )
 "
 
 DOCS="README LICENSE"
 
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_with qt5 QT5)
-   $(cmake-utils_use_with password QTKEYCHAIN_PLUGIN)
-   $(cmake-utils_use_with test TESTS)
-   $(cmake-utils_use_with zlib ZLIB)
-   )
-   if [[ ${MY_LANGS} ]]; then
-   rm po/trojita_common_x-test.po
-   for x in po/*.po; do
-   mylang=${x#po/trojita_common_}
-   mylang=${mylang%.po}
-   use linguas_$mylang || rm $x
-   done
-   fi
+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_DBUS=$(usex dbus)
+   -DWITH_QTKEYCHAINPLUGIN=$(usex password)
+   -DWITH_TESTS=$(usex test)
+   -DWITH_ZLIB=$(usex zlib)
+   )
 
cmake-utils_src_configure
 }
 
 src_test() {
-   VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+   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
 }

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-03-18 Thread Michael Palimaka

commit: b3c997001a1cefc5dd27de7df47d4640cb842b05
Author: Jan Kundrát  gentoo  org>
AuthorDate: Fri Mar 18 11:16:17 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Mar 18 11:17:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c99700

mail-client/trojita: introduce crypt USE flag

Gentoo-bug: 577592

Package-Manager: portage-2.2.28

 mail-client/trojita/trojita-.ebuild | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 32da654..c0bfef7 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="debug +dbus +password test +zlib"
+IUSE="+crypt debug +dbus +password test +zlib"
 
 RDEPEND="
dev-qt/qtcore:5
@@ -26,6 +26,10 @@ RDEPEND="
dev-qt/qtsql:5[sqlite]
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
+   crypt? (
+   dev-libs/mimetic
+   kde-apps/gpgmepp:5
+   )
dbus? ( dev-qt/qtdbus:5 )
password? ( dev-libs/qtkeychain[qt5] )
zlib? ( sys-libs/zlib )
@@ -48,6 +52,9 @@ src_prepare() {
 
 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)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-01-05 Thread Agostino Sarubbo

commit: bec108d3c29ce102d5233d9feabb9c2f5cb1ec66
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jan  5 10:55:27 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jan  5 10:55:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec108d3

mail-client/trojita: amd64 stable wrt bug #569928

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.5.ebuild 
b/mail-client/trojita/trojita-0.5.ebuild
index 171063d..ecdcaa8 100644
--- a/mail-client/trojita/trojita-0.5.ebuild
+++ b/mail-client/trojita/trojita-0.5.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "" ]]; then
KEYWORDS=""
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
MY_LANGS="ar bs ca cs da de el en_GB es et fi fr ga gl hu ia it ja lt 
mr nb nds nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
 fi

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-03-06 Thread Mikle Kolyada

commit: cebebab9aac20b7115a2d62ffa7e95a16858b8d6
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Mar  5 22:47:49 2016 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Mar  5 22:48:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cebebab9

mail-client/trojita: x86 stable wrt bug #569928

Package-Manager: portage-2.2.26

 mail-client/trojita/trojita-0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.5.ebuild 
b/mail-client/trojita/trojita-0.5.ebuild
index ecdcaa8..447f6d0 100644
--- a/mail-client/trojita/trojita-0.5.ebuild
+++ b/mail-client/trojita/trojita-0.5.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "" ]]; then
KEYWORDS=""
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
MY_LANGS="ar bs ca cs da de el en_GB es et fi fr ga gl hu ia it ja lt 
mr nb nds nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
 fi

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2018-03-14 Thread Michael Palimaka

commit: 668d90f4d64f9efbbd2c2d454dc97744a1dac81d
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Mar 14 10:44:02 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Mar 14 10:45:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=668d90f4

mail-client/trojita: update maintainer email

Bug: https://bugs.gentoo.org/96455
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 mail-client/trojita/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index 7cf4bb20138..a397e84c737 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -2,7 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 

-   j...@gentoo.org
+   j...@kde.org
Jan Kundrát

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2018-04-10 Thread Andreas Sturmlechner

commit: fb98b5a604384202596d3d1f0730712efa29aebd
Author: Marty E. Plummer  startmail  com>
AuthorDate: Sun Apr  8 18:47:31 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 10 09:22:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb98b5a6

mail-client/trojita: fdo-mime->xdg-utils

Also some minor rearrangement, git://->https://, and DOCS=""->DOCS=()

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7886

 mail-client/trojita/trojita-0.7-r2.ebuild | 10 +-
 mail-client/trojita/trojita-.ebuild   | 10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index bc979f3f5ee..7bdba08a79c 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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
+EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
+inherit cmake-utils gnome2-utils virtualx xdg-utils
 [[ ${PV} ==  ]] && inherit git-r3
 
 DESCRIPTION="A Qt IMAP e-mail client"
@@ -78,11 +78,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-   fdo-mime_desktop_database_update
+   xdg_desktop_database_update
gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-   fdo-mime_desktop_database_update
+   xdg_desktop_database_update
gnome2_icon_cache_update
 }

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 4988ce563e1..f11f733cb3b 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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
+inherit cmake-utils gnome2-utils virtualx xdg-utils
 [[ ${PV} ==  ]] && inherit git-r3
 
 DESCRIPTION="A Qt IMAP e-mail client"
@@ -16,7 +16,7 @@ fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="+crypt debug +dbus +password test +zlib"
+IUSE="+crypt +dbus debug +password test +zlib"
 
 RDEPEND="
dev-qt/qtcore:5
@@ -73,11 +73,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-   fdo-mime_desktop_database_update
+   xdg_desktop_database_update
gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-   fdo-mime_desktop_database_update
+   xdg_desktop_database_update
gnome2_icon_cache_update
 }

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2018-04-10 Thread Andreas Sturmlechner

commit: 8615ebb53f3efafdb59733942e58a8e522308602
Author: Marty E. Plummer  startmail  com>
AuthorDate: Tue Apr 10 07:32:51 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 10 09:22:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8615ebb5

mail-client/trojita: align live ebuild with release

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 mail-client/trojita/trojita-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index f11f733cb3b..070ef4d1f87 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -27,8 +27,8 @@ RDEPEND="
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
crypt? (
-   dev-libs/mimetic
>=app-crypt/gpgme-1.8.0[cxx,qt5]
+   dev-libs/mimetic
)
dbus? ( dev-qt/qtdbus:5 )
password? ( dev-libs/qtkeychain[qt5(+)] )
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
zlib? ( virtual/pkgconfig )
 "
 
-DOCS="README LICENSE"
+DOCS=( README LICENSE )
 
 src_prepare() {
cmake-utils_src_prepare

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2018-04-18 Thread Andreas Sturmlechner

commit: 0ae53846bd673306538f667fe86765e44f979ed0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr 18 17:09:24 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr 18 17:49:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ae53846

mail-client/trojita: Fix USE=password switch, requires USE=dbus

Package-Manager: Portage-2.3.30, Repoman-2.3.9

 mail-client/trojita/trojita-0.7-r2.ebuild | 4 +++-
 mail-client/trojita/trojita-.ebuild   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index 8a1979d7b34..9f0e744cd9c 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -18,6 +18,8 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password test +zlib"
 
+REQUIRED_USE="password? ( dbus )"
+
 RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -62,7 +64,7 @@ src_configure() {
-DWITH_GPGMEPP=$(usex crypt)
-DWITH_MIMETIC=$(usex crypt)
-DWITH_DBUS=$(usex dbus)
-   -DWITH_QTKEYCHAINPLUGIN=$(usex password)
+   -DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
-DWITH_TESTS=$(usex test)
-DWITH_ZLIB=$(usex zlib)
)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 070ef4d1f87..3868e240b41 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -18,6 +18,8 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password test +zlib"
 
+REQUIRED_USE="password? ( dbus )"
+
 RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -56,7 +58,7 @@ src_configure() {
-DWITH_GPGMEPP=$(usex crypt)
-DWITH_MIMETIC=$(usex crypt)
-DWITH_DBUS=$(usex dbus)
-   -DWITH_QTKEYCHAINPLUGIN=$(usex password)
+   -DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
-DWITH_TESTS=$(usex test)
-DWITH_ZLIB=$(usex zlib)
)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-12-21 Thread Michael Palimaka

commit: a68a89a2c50d4b1c4317a5764d01f83dc43aa830
Author: Jan Kundrát  gentoo  org>
AuthorDate: Wed Dec 21 11:08:10 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec 21 12:27:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68a89a2

mail-client/trojita: Upstream has switched to app-crypt/gpgme

There's also a requirement on 1.8.0+ because of some bugs in pthreads in
1.7.0 -- that one also comes from upstream.

 mail-client/trojita/trojita-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 0671174..b014eca 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
dev-qt/qtwidgets:5
crypt? (
dev-libs/mimetic
-   kde-apps/gpgmepp:5
+   >=app-crypt/gpgme-1.8.0[cxx,qt5]
)
dbus? ( dev-qt/qtdbus:5 )
password? ( dev-libs/qtkeychain[qt5] )

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-05-21 Thread Andreas Sturmlechner

commit: 71ec670a93477f0c2b2abd29d4cc44e71eb2c2f1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 21 17:24:47 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 21 18:40:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71ec670a

mail-client/trojita: Add USE spell

Upstream commit aa5698e4a0bfa848ff782263db38b09d25a54384

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 268f9915e76..4e92baebbe7 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
+IUSE="+crypt +dbus debug +password +spell test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
@@ -40,6 +40,7 @@ DEPEND="
)
dbus? ( dev-qt/qtdbus:5 )
password? ( dev-libs/qtkeychain[qt5(+)] )
+   spell? ( kde-frameworks/sonnet:5 )
zlib? ( sys-libs/zlib )
 "
 RDEPEND="${DEPEND}"
@@ -61,6 +62,7 @@ src_configure() {
-DWITH_MIMETIC=$(usex crypt)
-DWITH_DBUS=$(usex dbus)
-DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
+   -DWITH_SONNET_PLUGIN=$(usex spell)
-DWITH_TESTS=$(usex test)
-DWITH_ZLIB=$(usex zlib)
)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-05-21 Thread Andreas Sturmlechner

commit: e0e382d4f934129b82ce13cea8d20bf664801978
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 21 17:36:02 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 21 18:40:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0e382d4

mail-client/trojita: Add USE addressbook

Upstream commit c3a317ac1e085535034ef862d9e9dbf4551cfb99

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/metadata.xml| 1 +
 mail-client/trojita/trojita-.ebuild | 5 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index a397e84c737..7a659b227af 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -14,6 +14,7 @@
Gentoo KDE Project


+   Build kde-apps/akonadi 
addressbook plugin
Store passwords securely via 
dev-libs/qtkeychain



diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 4e92baebbe7..b72987f25f9 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="+crypt +dbus debug +password +spell test +zlib"
+IUSE="addressbook +crypt +dbus debug +password +spell test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
@@ -34,6 +34,7 @@ DEPEND="
dev-qt/qtsvg:5
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
+   addressbook? ( kde-apps/akonadi-contacts:5 )
crypt? (
>=app-crypt/gpgme-1.8.0[cxx,qt5]
dev-libs/mimetic
@@ -57,6 +58,8 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
+   -DWITH_ABOOKADDRESSBOOK_PLUGIN=OFF
+   -DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex addressbook)
-DWITH_CRYPTO_MESSAGES=$(usex crypt)
-DWITH_GPGMEPP=$(usex crypt)
-DWITH_MIMETIC=$(usex crypt)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-05-21 Thread Andreas Sturmlechner

commit: 2785637d1b6d8b8c9f66a98d2f68c00ca4fbf82f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 21 17:37:21 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 21 18:40:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2785637d

mail-client/trojita: Fix USE test cmake param

Upstream commit 925218e09a76f977b3df400555e920ef7b69e351

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index b72987f25f9..7740a0aa6ff 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -66,7 +66,7 @@ src_configure() {
-DWITH_DBUS=$(usex dbus)
-DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
-DWITH_SONNET_PLUGIN=$(usex spell)
-   -DWITH_TESTS=$(usex test)
+   -DBUILD_TESTING=$(usex test)
-DWITH_ZLIB=$(usex zlib)
)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-02-14 Thread Andreas Sturmlechner

commit: 8d88d48f9cfe61c619ecd890f2dc169237f9be2c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 14 18:29:22 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 14 18:36:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d88d48f

mail-client/trojita: Switch from gnome2-utils to xdg, EAPI-7 bump

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 48 +
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 3868e240b41..268f9915e76 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-inherit cmake-utils gnome2-utils virtualx xdg-utils
-[[ ${PV} ==  ]] && inherit git-r3
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-if [[ ${PV} !=  ]]; then
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
+   inherit git-r3
+else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
 fi
+inherit cmake-utils virtualx xdg
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
@@ -20,7 +21,12 @@ IUSE="+crypt +dbus debug +password test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
-RDEPEND="
+BDEPEND="
+   dev-qt/linguist-tools:5
+   test? ( dev-qt/qttest:5 )
+   zlib? ( virtual/pkgconfig )
+"
+DEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5[ssl]
@@ -36,11 +42,7 @@ RDEPEND="
password? ( dev-libs/qtkeychain[qt5(+)] )
zlib? ( sys-libs/zlib )
 "
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   test? ( dev-qt/qttest:5 )
-   zlib? ( virtual/pkgconfig )
-"
+RDEPEND="${DEPEND}"
 
 DOCS=( README LICENSE )
 
@@ -49,7 +51,7 @@ 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"
+   sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix 
the version check"
 }
 
 src_configure() {
@@ -69,17 +71,3 @@ src_configure() {
 src_test() {
virtx cmake-utils_src_test
 }
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-03-18 Thread Michael Palimaka

commit: b3c997001a1cefc5dd27de7df47d4640cb842b05
Author: Jan Kundrát  gentoo  org>
AuthorDate: Fri Mar 18 11:16:17 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Mar 18 11:17:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c99700

mail-client/trojita: introduce crypt USE flag

Gentoo-bug: 577592

Package-Manager: portage-2.2.28

 mail-client/trojita/trojita-.ebuild | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 32da654..c0bfef7 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="debug +dbus +password test +zlib"
+IUSE="+crypt debug +dbus +password test +zlib"
 
 RDEPEND="
dev-qt/qtcore:5
@@ -26,6 +26,10 @@ RDEPEND="
dev-qt/qtsql:5[sqlite]
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
+   crypt? (
+   dev-libs/mimetic
+   kde-apps/gpgmepp:5
+   )
dbus? ( dev-qt/qtdbus:5 )
password? ( dev-libs/qtkeychain[qt5] )
zlib? ( sys-libs/zlib )
@@ -48,6 +52,9 @@ src_prepare() {
 
 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)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-03-06 Thread Mikle Kolyada

commit: cebebab9aac20b7115a2d62ffa7e95a16858b8d6
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Mar  5 22:47:49 2016 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Mar  5 22:48:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cebebab9

mail-client/trojita: x86 stable wrt bug #569928

Package-Manager: portage-2.2.26

 mail-client/trojita/trojita-0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.5.ebuild 
b/mail-client/trojita/trojita-0.5.ebuild
index ecdcaa8..447f6d0 100644
--- a/mail-client/trojita/trojita-0.5.ebuild
+++ b/mail-client/trojita/trojita-0.5.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "" ]]; then
KEYWORDS=""
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
MY_LANGS="ar bs ca cs da de el en_GB es et fi fr ga gl hu ia it ja lt 
mr nb nds nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
 fi

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-01-29 Thread Michael Palimaka

commit: fde5d3c7104d82d3db94b0335fea76cc9a65d3fc
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 29 08:38:09 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Jan 29 08:39:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde5d3c7

mail-client/trojita: version bump

Gentoo-bug: 572894

Package-Manager: portage-2.2.27

 mail-client/trojita/Manifest   |  1 +
 mail-client/trojita/trojita-0.6.ebuild | 97 ++
 2 files changed, 98 insertions(+)

diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index 36538e7..35ffa3a 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -1,2 +1,3 @@
 DIST trojita-0.4.1.tar.bz2 1219460 SHA256 
68a17498e70fd66966917fe4ecb90e6fe6f36f439c714552b8a97c004fe687de SHA512 
f24210d4f8e10cfbca25ab4d62ae3c8eea3e8824c13119cd6dc4511d4cf9b5f82be67586b6494aff5290ab06f869ae3bd1c8a19664bcf0f57059ee8d67d6c81a
 WHIRLPOOL 
47652af26fe24c6fb7fb0dbb1ef7c00710d087903787a847b59dc80d61dcd1725b5c7444aa77e36b357c3bbd6bc64f0566a995ac5b3c53842c3744b1a82127c0
 DIST trojita-0.5.tar.bz2 1421368 SHA256 
21d8f0bf12b7d6dc39344ab70f4a0cb5b1997a3b60dc502841272ac92959458a SHA512 
c3d661b5a49ca083fe7f09f598138f70a6ace5d66760bfe1242b06fcc90cb73abb56a1c27329f8de48eea281a782f8c5b6e1b374e271c33c9907070b5883b904
 WHIRLPOOL 
59a8bb257226edb4e34445766b5e5e500cae7205cf2ecf64fd80216f77d2e662395c4055744b84e0509311c635c93813849ec83b2ed5ec8212cb4553a118cadd
+DIST trojita-0.6.tar.bz2 1409812 SHA256 
4c1083f48b51cc37bb318c5a8ada67b64b38ed95d8ad30b4621755fcf45efa10 SHA512 
de13437b9c046b3db317c62cbf4fbff5607ad807378a7ef9ba239609aba2e49933a2f0aa9645777536e5c03e2af612164b96d15b731570597b0d4de187d1b350
 WHIRLPOOL 
e81ff5a5759ec2182f1e8e68c478b70c80e2715560dda3c7095e7d897eab1e0d5cb45d2f8e15ba133a0bb31351f59b7a507011bdb637401c28147d456b51145d

diff --git a/mail-client/trojita/trojita-0.6.ebuild 
b/mail-client/trojita/trojita-0.6.ebuild
new file mode 100644
index 000..0182235
--- /dev/null
+++ b/mail-client/trojita/trojita-0.6.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+QT4_REQUIRED="4.8.0"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
+inherit cmake-utils fdo-mime gnome2-utils qmake-utils virtualx
+[[ ${PV} ==  ]] && inherit git-r3
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/";
+if [[ ${PV} !=  ]]; then
+   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="debug +dbus +password +qt5 test +zlib"
+
+RDEPEND="
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtsql:5[sqlite]
+   dev-qt/qtwebkit:5
+   dev-qt/qtwidgets:5
+   )
+   !qt5? (
+   >=dev-qt/qtbearer-${QT4_REQUIRED}:4
+   >=dev-qt/qtcore-${QT4_REQUIRED}:4
+   >=dev-qt/qtgui-${QT4_REQUIRED}:4
+   >=dev-qt/qtsql-${QT4_REQUIRED}:4[sqlite]
+   >=dev-qt/qtwebkit-${QT4_REQUIRED}:4
+   )
+   dbus? ( dev-qt/qtdbus:5 )
+   password? (
+   qt5?( dev-libs/qtkeychain[qt5] )
+   !qt5?   ( dev-libs/qtkeychain[qt4] )
+   )
+   zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+   qt5? ( dev-qt/linguist-tools:5 )
+   test? (
+   qt5?( dev-qt/qttest:5 )
+   !qt5?   ( >=dev-qt/qttest-${QT4_REQUIRED}:4 )
+   )
+   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"
+
+   # ensure correct version of binary is used - bug 544108.
+   # this file is only used for qt4 builds
+   sed -i "s|\$ENV{QTDIR}/bin|$(qt4_get_bindir) NO_DEFAULT_PATH|" 
cmake/FindLinguistForTrojita.cmake || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_DBUS=$(usex dbus)
+   -DWITH_QT5=$(usex qt5)
+   -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
+}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-01-29 Thread Michael Palimaka

commit: c04c058c778515b4757693f8371ebcf801b23772
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 29 07:50:11 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Jan 29 08:39:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c04c058c

mail-client/trojita: various live ebuild updates

* Port to EAPI 6
* Drop Qt 4 support as it is being removed upstream
* Drop linguas USE flags as they only control small text iles
* Introduce dbus USE flag
* Add missing dev-qt/qtnetwork USE dependency
* Update icon and mime caches

Gentoo-bug: 572894

Package-Manager: portage-2.2.27

 mail-client/trojita/trojita-.ebuild | 103 ++--
 1 file changed, 45 insertions(+), 58 deletions(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index e7c71ee..32da654 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,89 +1,76 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-QT4_REQUIRED="4.8.0"
 EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
-[[ ${PV} == "" ]] && GIT_ECLASS="git-2"
-
-inherit cmake-utils virtualx ${GIT_ECLASS}
+inherit cmake-utils fdo-mime gnome2-utils virtualx
+[[ ${PV} ==  ]] && inherit git-r3
 
 DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
-if [[ ${PV} == "" ]]; then
-   SRC_URI=""
-   KEYWORDS=""
-else
+if [[ ${PV} !=  ]]; then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-   KEYWORDS="~amd64 ~ppc ~x86"
-   MY_LANGS="ar bs ca cs da de el en_GB es et fi fr ga gl hu ia it ja lt 
mr nb nds nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
+   KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="debug +password qt5 test +zlib"
-for MY_LANG in ${MY_LANGS} ; do
-   IUSE="${IUSE} linguas_${MY_LANG}"
-done
+IUSE="debug +dbus +password test +zlib"
 
 RDEPEND="
-   qt5? (
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsql:5[sqlite]
-   dev-qt/qtwebkit:5
-   dev-qt/qtwidgets:5
-   )
-   !qt5? (
-   >=dev-qt/qtbearer-${QT4_REQUIRED}:4
-   >=dev-qt/qtgui-${QT4_REQUIRED}:4
-   >=dev-qt/qtsql-${QT4_REQUIRED}:4[sqlite]
-   >=dev-qt/qtwebkit-${QT4_REQUIRED}:4
-   )
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtsql:5[sqlite]
+   dev-qt/qtwebkit:5
+   dev-qt/qtwidgets:5
+   dbus? ( dev-qt/qtdbus:5 )
+   password? ( dev-libs/qtkeychain[qt5] )
+   zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}
-   password? (
-   qt5?( dev-libs/qtkeychain[qt5] )
-   !qt5?   ( dev-libs/qtkeychain[qt4] )
-   )
-   qt5? ( dev-qt/linguist-tools:5 )
-   test? (
-   qt5?( dev-qt/qttest:5 )
-   !qt5?   ( >=dev-qt/qttest-${QT4_REQUIRED}:4 )
-   )
-   zlib? (
-   virtual/pkgconfig
-   sys-libs/zlib
-   )
+   dev-qt/linguist-tools:5
+   test? ( dev-qt/qttest:5 )
+   zlib? ( virtual/pkgconfig )
 "
 
 DOCS="README LICENSE"
 
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_with qt5 QT5)
-   $(cmake-utils_use_with password QTKEYCHAIN_PLUGIN)
-   $(cmake-utils_use_with test TESTS)
-   $(cmake-utils_use_with zlib ZLIB)
-   )
-   if [[ ${MY_LANGS} ]]; then
-   rm po/trojita_common_x-test.po
-   for x in po/*.po; do
-   mylang=${x#po/trojita_common_}
-   mylang=${mylang%.po}
-   use linguas_$mylang || rm $x
-   done
-   fi
+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_DBUS=$(usex dbus)
+   -DWITH_QTKEYCHAINPLUGIN=$(usex password)
+   -DWITH_TESTS=$(usex test)
+   -DWITH_ZLIB=$(usex zlib)
+   )
 
cmake-utils_src_configure
 }
 
 src_test() {
-   VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+   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
 }

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2015-10-01 Thread Michael Palimaka

commit: 5ff6c55db282acdc515849459b3f49a2502e66bc
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Oct  1 13:55:11 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Oct  1 14:20:41 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff6c55d

mail-client/trojita: dev-qt/linguist-tools is a build-time dependency

Package-Manager: portage-2.2.20.1

 mail-client/trojita/trojita-0.5.ebuild  | 2 +-
 mail-client/trojita/trojita-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/trojita/trojita-0.5.ebuild 
b/mail-client/trojita/trojita-0.5.ebuild
index f923d86..b0bfd16 100644
--- a/mail-client/trojita/trojita-0.5.ebuild
+++ b/mail-client/trojita/trojita-0.5.ebuild
@@ -30,7 +30,6 @@ done
 
 RDEPEND="
qt5? (
-   dev-qt/linguist-tools:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtsql:5[sqlite]
@@ -49,6 +48,7 @@ DEPEND="${RDEPEND}
qt5?( dev-libs/qtkeychain[qt5] )
!qt5?   ( dev-libs/qtkeychain[qt4] )
)
+   qt5? ( dev-qt/linguist-tools:5 )
test? (
qt5?( dev-qt/qttest:5 )
!qt5?   ( >=dev-qt/qttest-${QT4_REQUIRED}:4 )

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 4656b55..e7c71ee 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -30,7 +30,6 @@ done
 
 RDEPEND="
qt5? (
-   dev-qt/linguist-tools:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtsql:5[sqlite]
@@ -49,6 +48,7 @@ DEPEND="${RDEPEND}
qt5?( dev-libs/qtkeychain[qt5] )
!qt5?   ( dev-libs/qtkeychain[qt4] )
)
+   qt5? ( dev-qt/linguist-tools:5 )
test? (
qt5?( dev-qt/qttest:5 )
!qt5?   ( >=dev-qt/qttest-${QT4_REQUIRED}:4 )

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-01-05 Thread Agostino Sarubbo

commit: bec108d3c29ce102d5233d9feabb9c2f5cb1ec66
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jan  5 10:55:27 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jan  5 10:55:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec108d3

mail-client/trojita: amd64 stable wrt bug #569928

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.5.ebuild 
b/mail-client/trojita/trojita-0.5.ebuild
index 171063d..ecdcaa8 100644
--- a/mail-client/trojita/trojita-0.5.ebuild
+++ b/mail-client/trojita/trojita-0.5.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "" ]]; then
KEYWORDS=""
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
MY_LANGS="ar bs ca cs da de el en_GB es et fi fr ga gl hu ia it ja lt 
mr nb nds nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
 fi

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-07-17 Thread Michael Palimaka

commit: a0a46fcb8e9631aa2ccbbebb4a33d52fd228af94
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jul 17 18:58:36 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul 17 18:59:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a46fcb

mail-client/trojita: amd64/x86 stable

Gentoo-bug: 588776

Package-Manager: portage-2.3.0

 mail-client/trojita/trojita-0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.7-r1.ebuild 
b/mail-client/trojita/trojita-0.7-r1.ebuild
index 0671174..75095fd 100644
--- a/mail-client/trojita/trojita-0.7-r1.ebuild
+++ b/mail-client/trojita/trojita-0.7-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
 if [[ ${PV} !=  ]]; then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-06-15 Thread Michael Palimaka

commit: 4d48ada1c12f91cee07683ae10e604f833e0d84c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jun 15 13:18:53 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jun 15 13:19:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d48ada1

mail-client/trojita: version bump

Package-Manager: portage-2.3.0_rc1

 mail-client/trojita/Manifest   |  1 +
 mail-client/trojita/trojita-0.7.ebuild | 83 ++
 2 files changed, 84 insertions(+)

diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index 35ffa3a..edec7a0 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -1,3 +1,4 @@
 DIST trojita-0.4.1.tar.bz2 1219460 SHA256 
68a17498e70fd66966917fe4ecb90e6fe6f36f439c714552b8a97c004fe687de SHA512 
f24210d4f8e10cfbca25ab4d62ae3c8eea3e8824c13119cd6dc4511d4cf9b5f82be67586b6494aff5290ab06f869ae3bd1c8a19664bcf0f57059ee8d67d6c81a
 WHIRLPOOL 
47652af26fe24c6fb7fb0dbb1ef7c00710d087903787a847b59dc80d61dcd1725b5c7444aa77e36b357c3bbd6bc64f0566a995ac5b3c53842c3744b1a82127c0
 DIST trojita-0.5.tar.bz2 1421368 SHA256 
21d8f0bf12b7d6dc39344ab70f4a0cb5b1997a3b60dc502841272ac92959458a SHA512 
c3d661b5a49ca083fe7f09f598138f70a6ace5d66760bfe1242b06fcc90cb73abb56a1c27329f8de48eea281a782f8c5b6e1b374e271c33c9907070b5883b904
 WHIRLPOOL 
59a8bb257226edb4e34445766b5e5e500cae7205cf2ecf64fd80216f77d2e662395c4055744b84e0509311c635c93813849ec83b2ed5ec8212cb4553a118cadd
 DIST trojita-0.6.tar.bz2 1409812 SHA256 
4c1083f48b51cc37bb318c5a8ada67b64b38ed95d8ad30b4621755fcf45efa10 SHA512 
de13437b9c046b3db317c62cbf4fbff5607ad807378a7ef9ba239609aba2e49933a2f0aa9645777536e5c03e2af612164b96d15b731570597b0d4de187d1b350
 WHIRLPOOL 
e81ff5a5759ec2182f1e8e68c478b70c80e2715560dda3c7095e7d897eab1e0d5cb45d2f8e15ba133a0bb31351f59b7a507011bdb637401c28147d456b51145d
+DIST trojita-0.7.tar.xz 1038212 SHA256 
e08da881721cafa00ecd772eaef6b99fd37d068cb703eeb532de0ed1ea0136d9 SHA512 
fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8
 WHIRLPOOL 
2df7c34566bfdfff3a66566888ad8a9f9390af9a72eeb4a26dd96b96e46d07597441e8b9d56d7f18e2412f4a2e3b855e17a161ec88f0a9791e4db39117471e20

diff --git a/mail-client/trojita/trojita-0.7.ebuild 
b/mail-client/trojita/trojita-0.7.ebuild
new file mode 100644
index 000..b728ae9
--- /dev/null
+++ b/mail-client/trojita/trojita-0.7.ebuild
@@ -0,0 +1,83 @@
+# 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} ==  ]] && inherit git-r3
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/";
+if [[ ${PV} !=  ]]; 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/qtwebkit:5
+   dev-qt/qtwidgets:5
+   crypt? (
+   dev-libs/mimetic
+   kde-apps/gpgmepp:5
+   )
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-06-15 Thread Michael Palimaka

commit: 414658bf1d78df4a5ccd5b337e5929ce98a9c8ac
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jun 15 13:18:18 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jun 15 13:19:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=414658bf

mail-client/trojita: update SRC_URI

Package-Manager: portage-2.3.0_rc1

 mail-client/trojita/trojita-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index c0bfef7..b728ae9 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -11,7 +11,7 @@ inherit cmake-utils fdo-mime gnome2-utils virtualx
 DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
 if [[ ${PV} !=  ]]; then
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
 fi

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-06-22 Thread Michael Palimaka

commit: 224ae056f5406d86f1b41d8fb3d6807ef5b88911
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jun 22 11:33:10 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jun 22 11:33:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224ae056

mail-client/trojita: add missing dependency

Gentoo-bug: 586482

Package-Manager: portage-2.3.0_rc1

 mail-client/trojita/{trojita-0.7.ebuild => trojita-0.7-r1.ebuild} | 1 +
 mail-client/trojita/trojita-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mail-client/trojita/trojita-0.7.ebuild 
b/mail-client/trojita/trojita-0.7-r1.ebuild
similarity index 99%
rename from mail-client/trojita/trojita-0.7.ebuild
rename to mail-client/trojita/trojita-0.7-r1.ebuild
index b728ae9..0671174 100644
--- a/mail-client/trojita/trojita-0.7.ebuild
+++ b/mail-client/trojita/trojita-0.7-r1.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
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? (

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index b728ae9..0671174 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
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? (

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-12-21 Thread Michael Palimaka

commit: a68a89a2c50d4b1c4317a5764d01f83dc43aa830
Author: Jan Kundrát  gentoo  org>
AuthorDate: Wed Dec 21 11:08:10 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec 21 12:27:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68a89a2

mail-client/trojita: Upstream has switched to app-crypt/gpgme

There's also a requirement on 1.8.0+ because of some bugs in pthreads in
1.7.0 -- that one also comes from upstream.

 mail-client/trojita/trojita-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 0671174..b014eca 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
dev-qt/qtwidgets:5
crypt? (
dev-libs/mimetic
-   kde-apps/gpgmepp:5
+   >=app-crypt/gpgme-1.8.0[cxx,qt5]
)
dbus? ( dev-qt/qtdbus:5 )
password? ( dev-libs/qtkeychain[qt5] )

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-05-21 Thread Andreas Sturmlechner

commit: 71ec670a93477f0c2b2abd29d4cc44e71eb2c2f1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 21 17:24:47 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 21 18:40:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71ec670a

mail-client/trojita: Add USE spell

Upstream commit aa5698e4a0bfa848ff782263db38b09d25a54384

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 268f9915e76..4e92baebbe7 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
+IUSE="+crypt +dbus debug +password +spell test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
@@ -40,6 +40,7 @@ DEPEND="
)
dbus? ( dev-qt/qtdbus:5 )
password? ( dev-libs/qtkeychain[qt5(+)] )
+   spell? ( kde-frameworks/sonnet:5 )
zlib? ( sys-libs/zlib )
 "
 RDEPEND="${DEPEND}"
@@ -61,6 +62,7 @@ src_configure() {
-DWITH_MIMETIC=$(usex crypt)
-DWITH_DBUS=$(usex dbus)
-DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
+   -DWITH_SONNET_PLUGIN=$(usex spell)
-DWITH_TESTS=$(usex test)
-DWITH_ZLIB=$(usex zlib)
)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-05-21 Thread Andreas Sturmlechner

commit: e0e382d4f934129b82ce13cea8d20bf664801978
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 21 17:36:02 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 21 18:40:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0e382d4

mail-client/trojita: Add USE addressbook

Upstream commit c3a317ac1e085535034ef862d9e9dbf4551cfb99

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/metadata.xml| 1 +
 mail-client/trojita/trojita-.ebuild | 5 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index a397e84c737..7a659b227af 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -14,6 +14,7 @@
Gentoo KDE Project


+   Build kde-apps/akonadi 
addressbook plugin
Store passwords securely via 
dev-libs/qtkeychain



diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 4e92baebbe7..b72987f25f9 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="+crypt +dbus debug +password +spell test +zlib"
+IUSE="addressbook +crypt +dbus debug +password +spell test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
@@ -34,6 +34,7 @@ DEPEND="
dev-qt/qtsvg:5
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
+   addressbook? ( kde-apps/akonadi-contacts:5 )
crypt? (
>=app-crypt/gpgme-1.8.0[cxx,qt5]
dev-libs/mimetic
@@ -57,6 +58,8 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
+   -DWITH_ABOOKADDRESSBOOK_PLUGIN=OFF
+   -DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex addressbook)
-DWITH_CRYPTO_MESSAGES=$(usex crypt)
-DWITH_GPGMEPP=$(usex crypt)
-DWITH_MIMETIC=$(usex crypt)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-05-21 Thread Andreas Sturmlechner

commit: 2785637d1b6d8b8c9f66a98d2f68c00ca4fbf82f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 21 17:37:21 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 21 18:40:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2785637d

mail-client/trojita: Fix USE test cmake param

Upstream commit 925218e09a76f977b3df400555e920ef7b69e351

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index b72987f25f9..7740a0aa6ff 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -66,7 +66,7 @@ src_configure() {
-DWITH_DBUS=$(usex dbus)
-DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
-DWITH_SONNET_PLUGIN=$(usex spell)
-   -DWITH_TESTS=$(usex test)
+   -DBUILD_TESTING=$(usex test)
-DWITH_ZLIB=$(usex zlib)
)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-02-14 Thread Andreas Sturmlechner

commit: 8d88d48f9cfe61c619ecd890f2dc169237f9be2c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 14 18:29:22 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 14 18:36:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d88d48f

mail-client/trojita: Switch from gnome2-utils to xdg, EAPI-7 bump

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 48 +
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 3868e240b41..268f9915e76 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-inherit cmake-utils gnome2-utils virtualx xdg-utils
-[[ ${PV} ==  ]] && inherit git-r3
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-if [[ ${PV} !=  ]]; then
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
+   inherit git-r3
+else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
 fi
+inherit cmake-utils virtualx xdg
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
@@ -20,7 +21,12 @@ IUSE="+crypt +dbus debug +password test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
-RDEPEND="
+BDEPEND="
+   dev-qt/linguist-tools:5
+   test? ( dev-qt/qttest:5 )
+   zlib? ( virtual/pkgconfig )
+"
+DEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5[ssl]
@@ -36,11 +42,7 @@ RDEPEND="
password? ( dev-libs/qtkeychain[qt5(+)] )
zlib? ( sys-libs/zlib )
 "
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   test? ( dev-qt/qttest:5 )
-   zlib? ( virtual/pkgconfig )
-"
+RDEPEND="${DEPEND}"
 
 DOCS=( README LICENSE )
 
@@ -49,7 +51,7 @@ 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"
+   sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix 
the version check"
 }
 
 src_configure() {
@@ -69,17 +71,3 @@ src_configure() {
 src_test() {
virtx cmake-utils_src_test
 }
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2017-09-19 Thread Michael Palimaka

commit: c1fcec31e841b0cd6165df14fd0c174e7df76caf
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Sep 19 12:18:39 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Sep 19 12:19:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1fcec31

mail-client/trojita: use HTTPS in EGIT_REPO_URI

Closes: https://bugs.gentoo.org/631350
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 mail-client/trojita/trojita-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 919326db5b1..4988ce563e1 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# 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"
+EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
 inherit cmake-utils fdo-mime gnome2-utils virtualx
 [[ ${PV} ==  ]] && inherit git-r3

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2017-05-11 Thread Agostino Sarubbo

commit: b6c5910c0d0e82146fd97fbc7983835f220c36cb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May 11 07:50:46 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May 11 07:50:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c5910c

mail-client/trojita: amd64 stable wrt bug #618128

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.7-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index 07a21e42727..c6f704c0d48 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
 if [[ ${PV} !=  ]]; then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2017-05-11 Thread Agostino Sarubbo

commit: f25f5f56c1595ae509bd7d85ecc7daaadafd114e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May 11 08:37:18 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May 11 08:37:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f25f5f56

mail-client/trojita: x86 stable wrt bug #618128

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index c6f704c0d48..f283ed20238 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
 if [[ ${PV} !=  ]]; then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2017-05-11 Thread Andreas Sturmlechner

commit: dc93b8955dfdcdd8420b2a62fcce423cd94a1f7d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 11 18:19:23 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 11 18:43:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc93b895

mail-client/trojita: Drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 mail-client/trojita/trojita-0.7-r1.ebuild | 83 ---
 1 file changed, 83 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r1.ebuild 
b/mail-client/trojita/trojita-0.7-r1.ebuild
deleted file mode 100644
index b68534f9611..000
--- a/mail-client/trojita/trojita-0.7-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 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} ==  ]] && inherit git-r3
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-if [[ ${PV} !=  ]]; 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
-   kde-apps/gpgmepp:5
-   )
-   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
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2018-03-14 Thread Michael Palimaka

commit: 668d90f4d64f9efbbd2c2d454dc97744a1dac81d
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Mar 14 10:44:02 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Mar 14 10:45:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=668d90f4

mail-client/trojita: update maintainer email

Bug: https://bugs.gentoo.org/96455
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 mail-client/trojita/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index 7cf4bb20138..a397e84c737 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -2,7 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 

-   j...@gentoo.org
+   j...@kde.org
Jan Kundrát

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2018-04-10 Thread Andreas Sturmlechner

commit: fb98b5a604384202596d3d1f0730712efa29aebd
Author: Marty E. Plummer  startmail  com>
AuthorDate: Sun Apr  8 18:47:31 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 10 09:22:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb98b5a6

mail-client/trojita: fdo-mime->xdg-utils

Also some minor rearrangement, git://->https://, and DOCS=""->DOCS=()

Package-Manager: Portage-2.3.28, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/7886

 mail-client/trojita/trojita-0.7-r2.ebuild | 10 +-
 mail-client/trojita/trojita-.ebuild   | 10 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index bc979f3f5ee..7bdba08a79c 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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
+EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
+inherit cmake-utils gnome2-utils virtualx xdg-utils
 [[ ${PV} ==  ]] && inherit git-r3
 
 DESCRIPTION="A Qt IMAP e-mail client"
@@ -78,11 +78,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-   fdo-mime_desktop_database_update
+   xdg_desktop_database_update
gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-   fdo-mime_desktop_database_update
+   xdg_desktop_database_update
gnome2_icon_cache_update
 }

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 4988ce563e1..f11f733cb3b 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 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
+inherit cmake-utils gnome2-utils virtualx xdg-utils
 [[ ${PV} ==  ]] && inherit git-r3
 
 DESCRIPTION="A Qt IMAP e-mail client"
@@ -16,7 +16,7 @@ fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="+crypt debug +dbus +password test +zlib"
+IUSE="+crypt +dbus debug +password test +zlib"
 
 RDEPEND="
dev-qt/qtcore:5
@@ -73,11 +73,11 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-   fdo-mime_desktop_database_update
+   xdg_desktop_database_update
gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-   fdo-mime_desktop_database_update
+   xdg_desktop_database_update
gnome2_icon_cache_update
 }

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2018-04-10 Thread Andreas Sturmlechner

commit: 8615ebb53f3efafdb59733942e58a8e522308602
Author: Marty E. Plummer  startmail  com>
AuthorDate: Tue Apr 10 07:32:51 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 10 09:22:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8615ebb5

mail-client/trojita: align live ebuild with release

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 mail-client/trojita/trojita-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index f11f733cb3b..070ef4d1f87 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -27,8 +27,8 @@ RDEPEND="
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
crypt? (
-   dev-libs/mimetic
>=app-crypt/gpgme-1.8.0[cxx,qt5]
+   dev-libs/mimetic
)
dbus? ( dev-qt/qtdbus:5 )
password? ( dev-libs/qtkeychain[qt5(+)] )
@@ -40,7 +40,7 @@ DEPEND="${RDEPEND}
zlib? ( virtual/pkgconfig )
 "
 
-DOCS="README LICENSE"
+DOCS=( README LICENSE )
 
 src_prepare() {
cmake-utils_src_prepare

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2018-04-18 Thread Andreas Sturmlechner

commit: 0ae53846bd673306538f667fe86765e44f979ed0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr 18 17:09:24 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr 18 17:49:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ae53846

mail-client/trojita: Fix USE=password switch, requires USE=dbus

Package-Manager: Portage-2.3.30, Repoman-2.3.9

 mail-client/trojita/trojita-0.7-r2.ebuild | 4 +++-
 mail-client/trojita/trojita-.ebuild   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index 8a1979d7b34..9f0e744cd9c 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -18,6 +18,8 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password test +zlib"
 
+REQUIRED_USE="password? ( dbus )"
+
 RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -62,7 +64,7 @@ src_configure() {
-DWITH_GPGMEPP=$(usex crypt)
-DWITH_MIMETIC=$(usex crypt)
-DWITH_DBUS=$(usex dbus)
-   -DWITH_QTKEYCHAINPLUGIN=$(usex password)
+   -DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
-DWITH_TESTS=$(usex test)
-DWITH_ZLIB=$(usex zlib)
)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 070ef4d1f87..3868e240b41 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -18,6 +18,8 @@ LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password test +zlib"
 
+REQUIRED_USE="password? ( dbus )"
+
 RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -56,7 +58,7 @@ src_configure() {
-DWITH_GPGMEPP=$(usex crypt)
-DWITH_MIMETIC=$(usex crypt)
-DWITH_DBUS=$(usex dbus)
-   -DWITH_QTKEYCHAINPLUGIN=$(usex password)
+   -DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
-DWITH_TESTS=$(usex test)
-DWITH_ZLIB=$(usex zlib)
)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-01-29 Thread Michael Palimaka

commit: fde5d3c7104d82d3db94b0335fea76cc9a65d3fc
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 29 08:38:09 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Jan 29 08:39:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde5d3c7

mail-client/trojita: version bump

Gentoo-bug: 572894

Package-Manager: portage-2.2.27

 mail-client/trojita/Manifest   |  1 +
 mail-client/trojita/trojita-0.6.ebuild | 97 ++
 2 files changed, 98 insertions(+)

diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index 36538e7..35ffa3a 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -1,2 +1,3 @@
 DIST trojita-0.4.1.tar.bz2 1219460 SHA256 
68a17498e70fd66966917fe4ecb90e6fe6f36f439c714552b8a97c004fe687de SHA512 
f24210d4f8e10cfbca25ab4d62ae3c8eea3e8824c13119cd6dc4511d4cf9b5f82be67586b6494aff5290ab06f869ae3bd1c8a19664bcf0f57059ee8d67d6c81a
 WHIRLPOOL 
47652af26fe24c6fb7fb0dbb1ef7c00710d087903787a847b59dc80d61dcd1725b5c7444aa77e36b357c3bbd6bc64f0566a995ac5b3c53842c3744b1a82127c0
 DIST trojita-0.5.tar.bz2 1421368 SHA256 
21d8f0bf12b7d6dc39344ab70f4a0cb5b1997a3b60dc502841272ac92959458a SHA512 
c3d661b5a49ca083fe7f09f598138f70a6ace5d66760bfe1242b06fcc90cb73abb56a1c27329f8de48eea281a782f8c5b6e1b374e271c33c9907070b5883b904
 WHIRLPOOL 
59a8bb257226edb4e34445766b5e5e500cae7205cf2ecf64fd80216f77d2e662395c4055744b84e0509311c635c93813849ec83b2ed5ec8212cb4553a118cadd
+DIST trojita-0.6.tar.bz2 1409812 SHA256 
4c1083f48b51cc37bb318c5a8ada67b64b38ed95d8ad30b4621755fcf45efa10 SHA512 
de13437b9c046b3db317c62cbf4fbff5607ad807378a7ef9ba239609aba2e49933a2f0aa9645777536e5c03e2af612164b96d15b731570597b0d4de187d1b350
 WHIRLPOOL 
e81ff5a5759ec2182f1e8e68c478b70c80e2715560dda3c7095e7d897eab1e0d5cb45d2f8e15ba133a0bb31351f59b7a507011bdb637401c28147d456b51145d

diff --git a/mail-client/trojita/trojita-0.6.ebuild 
b/mail-client/trojita/trojita-0.6.ebuild
new file mode 100644
index 000..0182235
--- /dev/null
+++ b/mail-client/trojita/trojita-0.6.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+QT4_REQUIRED="4.8.0"
+EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
+inherit cmake-utils fdo-mime gnome2-utils qmake-utils virtualx
+[[ ${PV} ==  ]] && inherit git-r3
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/";
+if [[ ${PV} !=  ]]; then
+   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+IUSE="debug +dbus +password +qt5 test +zlib"
+
+RDEPEND="
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtsql:5[sqlite]
+   dev-qt/qtwebkit:5
+   dev-qt/qtwidgets:5
+   )
+   !qt5? (
+   >=dev-qt/qtbearer-${QT4_REQUIRED}:4
+   >=dev-qt/qtcore-${QT4_REQUIRED}:4
+   >=dev-qt/qtgui-${QT4_REQUIRED}:4
+   >=dev-qt/qtsql-${QT4_REQUIRED}:4[sqlite]
+   >=dev-qt/qtwebkit-${QT4_REQUIRED}:4
+   )
+   dbus? ( dev-qt/qtdbus:5 )
+   password? (
+   qt5?( dev-libs/qtkeychain[qt5] )
+   !qt5?   ( dev-libs/qtkeychain[qt4] )
+   )
+   zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+   qt5? ( dev-qt/linguist-tools:5 )
+   test? (
+   qt5?( dev-qt/qttest:5 )
+   !qt5?   ( >=dev-qt/qttest-${QT4_REQUIRED}:4 )
+   )
+   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"
+
+   # ensure correct version of binary is used - bug 544108.
+   # this file is only used for qt4 builds
+   sed -i "s|\$ENV{QTDIR}/bin|$(qt4_get_bindir) NO_DEFAULT_PATH|" 
cmake/FindLinguistForTrojita.cmake || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DWITH_DBUS=$(usex dbus)
+   -DWITH_QT5=$(usex qt5)
+   -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
+}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-01-29 Thread Michael Palimaka

commit: c04c058c778515b4757693f8371ebcf801b23772
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Jan 29 07:50:11 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Jan 29 08:39:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c04c058c

mail-client/trojita: various live ebuild updates

* Port to EAPI 6
* Drop Qt 4 support as it is being removed upstream
* Drop linguas USE flags as they only control small text iles
* Introduce dbus USE flag
* Add missing dev-qt/qtnetwork USE dependency
* Update icon and mime caches

Gentoo-bug: 572894

Package-Manager: portage-2.2.27

 mail-client/trojita/trojita-.ebuild | 103 ++--
 1 file changed, 45 insertions(+), 58 deletions(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index e7c71ee..32da654 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,89 +1,76 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-QT4_REQUIRED="4.8.0"
 EGIT_REPO_URI="git://anongit.kde.org/${PN}.git"
-[[ ${PV} == "" ]] && GIT_ECLASS="git-2"
-
-inherit cmake-utils virtualx ${GIT_ECLASS}
+inherit cmake-utils fdo-mime gnome2-utils virtualx
+[[ ${PV} ==  ]] && inherit git-r3
 
 DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
-if [[ ${PV} == "" ]]; then
-   SRC_URI=""
-   KEYWORDS=""
-else
+if [[ ${PV} !=  ]]; then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-   KEYWORDS="~amd64 ~ppc ~x86"
-   MY_LANGS="ar bs ca cs da de el en_GB es et fi fr ga gl hu ia it ja lt 
mr nb nds nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
+   KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="debug +password qt5 test +zlib"
-for MY_LANG in ${MY_LANGS} ; do
-   IUSE="${IUSE} linguas_${MY_LANG}"
-done
+IUSE="debug +dbus +password test +zlib"
 
 RDEPEND="
-   qt5? (
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsql:5[sqlite]
-   dev-qt/qtwebkit:5
-   dev-qt/qtwidgets:5
-   )
-   !qt5? (
-   >=dev-qt/qtbearer-${QT4_REQUIRED}:4
-   >=dev-qt/qtgui-${QT4_REQUIRED}:4
-   >=dev-qt/qtsql-${QT4_REQUIRED}:4[sqlite]
-   >=dev-qt/qtwebkit-${QT4_REQUIRED}:4
-   )
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5[ssl]
+   dev-qt/qtsql:5[sqlite]
+   dev-qt/qtwebkit:5
+   dev-qt/qtwidgets:5
+   dbus? ( dev-qt/qtdbus:5 )
+   password? ( dev-libs/qtkeychain[qt5] )
+   zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}
-   password? (
-   qt5?( dev-libs/qtkeychain[qt5] )
-   !qt5?   ( dev-libs/qtkeychain[qt4] )
-   )
-   qt5? ( dev-qt/linguist-tools:5 )
-   test? (
-   qt5?( dev-qt/qttest:5 )
-   !qt5?   ( >=dev-qt/qttest-${QT4_REQUIRED}:4 )
-   )
-   zlib? (
-   virtual/pkgconfig
-   sys-libs/zlib
-   )
+   dev-qt/linguist-tools:5
+   test? ( dev-qt/qttest:5 )
+   zlib? ( virtual/pkgconfig )
 "
 
 DOCS="README LICENSE"
 
-src_configure() {
-   local mycmakeargs=(
-   $(cmake-utils_use_with qt5 QT5)
-   $(cmake-utils_use_with password QTKEYCHAIN_PLUGIN)
-   $(cmake-utils_use_with test TESTS)
-   $(cmake-utils_use_with zlib ZLIB)
-   )
-   if [[ ${MY_LANGS} ]]; then
-   rm po/trojita_common_x-test.po
-   for x in po/*.po; do
-   mylang=${x#po/trojita_common_}
-   mylang=${mylang%.po}
-   use linguas_$mylang || rm $x
-   done
-   fi
+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_DBUS=$(usex dbus)
+   -DWITH_QTKEYCHAINPLUGIN=$(usex password)
+   -DWITH_TESTS=$(usex test)
+   -DWITH_ZLIB=$(usex zlib)
+   )
 
cmake-utils_src_configure
 }
 
 src_test() {
-   VIRTUALX_COMMAND=cmake-utils_src_test virtualmake
+   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
 }

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-03-18 Thread Michael Palimaka

commit: b3c997001a1cefc5dd27de7df47d4640cb842b05
Author: Jan Kundrát  gentoo  org>
AuthorDate: Fri Mar 18 11:16:17 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Mar 18 11:17:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c99700

mail-client/trojita: introduce crypt USE flag

Gentoo-bug: 577592

Package-Manager: portage-2.2.28

 mail-client/trojita/trojita-.ebuild | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 32da654..c0bfef7 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="debug +dbus +password test +zlib"
+IUSE="+crypt debug +dbus +password test +zlib"
 
 RDEPEND="
dev-qt/qtcore:5
@@ -26,6 +26,10 @@ RDEPEND="
dev-qt/qtsql:5[sqlite]
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
+   crypt? (
+   dev-libs/mimetic
+   kde-apps/gpgmepp:5
+   )
dbus? ( dev-qt/qtdbus:5 )
password? ( dev-libs/qtkeychain[qt5] )
zlib? ( sys-libs/zlib )
@@ -48,6 +52,9 @@ src_prepare() {
 
 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)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-03-06 Thread Mikle Kolyada

commit: cebebab9aac20b7115a2d62ffa7e95a16858b8d6
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Mar  5 22:47:49 2016 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Mar  5 22:48:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cebebab9

mail-client/trojita: x86 stable wrt bug #569928

Package-Manager: portage-2.2.26

 mail-client/trojita/trojita-0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.5.ebuild 
b/mail-client/trojita/trojita-0.5.ebuild
index ecdcaa8..447f6d0 100644
--- a/mail-client/trojita/trojita-0.5.ebuild
+++ b/mail-client/trojita/trojita-0.5.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "" ]]; then
KEYWORDS=""
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
MY_LANGS="ar bs ca cs da de el en_GB es et fi fr ga gl hu ia it ja lt 
mr nb nds nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
 fi

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-07-17 Thread Michael Palimaka

commit: a0a46fcb8e9631aa2ccbbebb4a33d52fd228af94
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jul 17 18:58:36 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jul 17 18:59:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a46fcb

mail-client/trojita: amd64/x86 stable

Gentoo-bug: 588776

Package-Manager: portage-2.3.0

 mail-client/trojita/trojita-0.7-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.7-r1.ebuild 
b/mail-client/trojita/trojita-0.7-r1.ebuild
index 0671174..75095fd 100644
--- a/mail-client/trojita/trojita-0.7-r1.ebuild
+++ b/mail-client/trojita/trojita-0.7-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
 if [[ ${PV} !=  ]]; then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-06-15 Thread Michael Palimaka

commit: 4d48ada1c12f91cee07683ae10e604f833e0d84c
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jun 15 13:18:53 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jun 15 13:19:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d48ada1

mail-client/trojita: version bump

Package-Manager: portage-2.3.0_rc1

 mail-client/trojita/Manifest   |  1 +
 mail-client/trojita/trojita-0.7.ebuild | 83 ++
 2 files changed, 84 insertions(+)

diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest
index 35ffa3a..edec7a0 100644
--- a/mail-client/trojita/Manifest
+++ b/mail-client/trojita/Manifest
@@ -1,3 +1,4 @@
 DIST trojita-0.4.1.tar.bz2 1219460 SHA256 
68a17498e70fd66966917fe4ecb90e6fe6f36f439c714552b8a97c004fe687de SHA512 
f24210d4f8e10cfbca25ab4d62ae3c8eea3e8824c13119cd6dc4511d4cf9b5f82be67586b6494aff5290ab06f869ae3bd1c8a19664bcf0f57059ee8d67d6c81a
 WHIRLPOOL 
47652af26fe24c6fb7fb0dbb1ef7c00710d087903787a847b59dc80d61dcd1725b5c7444aa77e36b357c3bbd6bc64f0566a995ac5b3c53842c3744b1a82127c0
 DIST trojita-0.5.tar.bz2 1421368 SHA256 
21d8f0bf12b7d6dc39344ab70f4a0cb5b1997a3b60dc502841272ac92959458a SHA512 
c3d661b5a49ca083fe7f09f598138f70a6ace5d66760bfe1242b06fcc90cb73abb56a1c27329f8de48eea281a782f8c5b6e1b374e271c33c9907070b5883b904
 WHIRLPOOL 
59a8bb257226edb4e34445766b5e5e500cae7205cf2ecf64fd80216f77d2e662395c4055744b84e0509311c635c93813849ec83b2ed5ec8212cb4553a118cadd
 DIST trojita-0.6.tar.bz2 1409812 SHA256 
4c1083f48b51cc37bb318c5a8ada67b64b38ed95d8ad30b4621755fcf45efa10 SHA512 
de13437b9c046b3db317c62cbf4fbff5607ad807378a7ef9ba239609aba2e49933a2f0aa9645777536e5c03e2af612164b96d15b731570597b0d4de187d1b350
 WHIRLPOOL 
e81ff5a5759ec2182f1e8e68c478b70c80e2715560dda3c7095e7d897eab1e0d5cb45d2f8e15ba133a0bb31351f59b7a507011bdb637401c28147d456b51145d
+DIST trojita-0.7.tar.xz 1038212 SHA256 
e08da881721cafa00ecd772eaef6b99fd37d068cb703eeb532de0ed1ea0136d9 SHA512 
fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8
 WHIRLPOOL 
2df7c34566bfdfff3a66566888ad8a9f9390af9a72eeb4a26dd96b96e46d07597441e8b9d56d7f18e2412f4a2e3b855e17a161ec88f0a9791e4db39117471e20

diff --git a/mail-client/trojita/trojita-0.7.ebuild 
b/mail-client/trojita/trojita-0.7.ebuild
new file mode 100644
index 000..b728ae9
--- /dev/null
+++ b/mail-client/trojita/trojita-0.7.ebuild
@@ -0,0 +1,83 @@
+# 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} ==  ]] && inherit git-r3
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/";
+if [[ ${PV} !=  ]]; 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/qtwebkit:5
+   dev-qt/qtwidgets:5
+   crypt? (
+   dev-libs/mimetic
+   kde-apps/gpgmepp:5
+   )
+   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
+}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-06-15 Thread Michael Palimaka

commit: 414658bf1d78df4a5ccd5b337e5929ce98a9c8ac
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jun 15 13:18:18 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jun 15 13:19:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=414658bf

mail-client/trojita: update SRC_URI

Package-Manager: portage-2.3.0_rc1

 mail-client/trojita/trojita-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index c0bfef7..b728ae9 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -11,7 +11,7 @@ inherit cmake-utils fdo-mime gnome2-utils virtualx
 DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
 if [[ ${PV} !=  ]]; then
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
 fi

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-06-22 Thread Michael Palimaka

commit: 224ae056f5406d86f1b41d8fb3d6807ef5b88911
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jun 22 11:33:10 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jun 22 11:33:29 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=224ae056

mail-client/trojita: add missing dependency

Gentoo-bug: 586482

Package-Manager: portage-2.3.0_rc1

 mail-client/trojita/{trojita-0.7.ebuild => trojita-0.7-r1.ebuild} | 1 +
 mail-client/trojita/trojita-.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/mail-client/trojita/trojita-0.7.ebuild 
b/mail-client/trojita/trojita-0.7-r1.ebuild
similarity index 99%
rename from mail-client/trojita/trojita-0.7.ebuild
rename to mail-client/trojita/trojita-0.7-r1.ebuild
index b728ae9..0671174 100644
--- a/mail-client/trojita/trojita-0.7.ebuild
+++ b/mail-client/trojita/trojita-0.7-r1.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
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? (

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index b728ae9..0671174 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
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? (

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2015-10-01 Thread Michael Palimaka

commit: 5ff6c55db282acdc515849459b3f49a2502e66bc
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Oct  1 13:55:11 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Oct  1 14:20:41 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff6c55d

mail-client/trojita: dev-qt/linguist-tools is a build-time dependency

Package-Manager: portage-2.2.20.1

 mail-client/trojita/trojita-0.5.ebuild  | 2 +-
 mail-client/trojita/trojita-.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/trojita/trojita-0.5.ebuild 
b/mail-client/trojita/trojita-0.5.ebuild
index f923d86..b0bfd16 100644
--- a/mail-client/trojita/trojita-0.5.ebuild
+++ b/mail-client/trojita/trojita-0.5.ebuild
@@ -30,7 +30,6 @@ done
 
 RDEPEND="
qt5? (
-   dev-qt/linguist-tools:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtsql:5[sqlite]
@@ -49,6 +48,7 @@ DEPEND="${RDEPEND}
qt5?( dev-libs/qtkeychain[qt5] )
!qt5?   ( dev-libs/qtkeychain[qt4] )
)
+   qt5? ( dev-qt/linguist-tools:5 )
test? (
qt5?( dev-qt/qttest:5 )
!qt5?   ( >=dev-qt/qttest-${QT4_REQUIRED}:4 )

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 4656b55..e7c71ee 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -30,7 +30,6 @@ done
 
 RDEPEND="
qt5? (
-   dev-qt/linguist-tools:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
dev-qt/qtsql:5[sqlite]
@@ -49,6 +48,7 @@ DEPEND="${RDEPEND}
qt5?( dev-libs/qtkeychain[qt5] )
!qt5?   ( dev-libs/qtkeychain[qt4] )
)
+   qt5? ( dev-qt/linguist-tools:5 )
test? (
qt5?( dev-qt/qttest:5 )
!qt5?   ( >=dev-qt/qttest-${QT4_REQUIRED}:4 )

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-01-05 Thread Agostino Sarubbo

commit: bec108d3c29ce102d5233d9feabb9c2f5cb1ec66
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Jan  5 10:55:27 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Jan  5 10:55:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec108d3

mail-client/trojita: amd64 stable wrt bug #569928

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.5.ebuild 
b/mail-client/trojita/trojita-0.5.ebuild
index 171063d..ecdcaa8 100644
--- a/mail-client/trojita/trojita-0.5.ebuild
+++ b/mail-client/trojita/trojita-0.5.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "" ]]; then
KEYWORDS=""
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
MY_LANGS="ar bs ca cs da de el en_GB es et fi fr ga gl hu ia it ja lt 
mr nb nds nl pl pt pt_BR ro sk sv tr ug uk zh_CN zh_TW"
 fi

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-12-07 Thread Andreas Sturmlechner

commit: 46d89ee9796b4a7342b5a0b62542d3fe10d884ac
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec  7 19:09:55 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec  7 19:10:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d89ee9

mail-client/trojita: Drop 0.7-r5

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r5.ebuild | 89 ---
 1 file changed, 89 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r5.ebuild 
b/mail-client/trojita/trojita-0.7-r5.ebuild
deleted file mode 100644
index f7b60c36636..000
--- a/mail-client/trojita/trojita-0.7-r5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-   inherit git-r3
-else
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-inherit cmake virtualx xdg
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
-
-REQUIRED_USE="password? ( dbus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   zlib? ( virtual/pkgconfig )
-"
-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}
-   test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( README LICENSE )
-
-PATCHES=(
-   "${FILESDIR}/${P}-gpgme.patch"
-   "${FILESDIR}/${P}-gpg-tests.patch"
-   "${FILESDIR}/${P}-qt-5.11b3.patch"
-   "${FILESDIR}/${P}-qt-5.13.patch" # bug 730058
-   "${FILESDIR}/${P}-qt-5.15.patch"
-   "${FILESDIR}/${P}-CVE-2019-10734.patch" # KDE-bug 404697
-   "${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596
-   "${FILESDIR}/${P}-cmake-cxx11.patch"
-   "${FILESDIR}/${P}-desktop-spec-namespace.patch"
-   "${FILESDIR}/${P}-metainfo.patch" # bug 730140
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # the build system is taking a look at `git describe ... --dirty` and
-   # gentoo's modifications to CMakeLists.txt break these
-   sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix 
the version check"
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWITH_RAGEL=OFF # bug 739866, broken by ragel-7
-   -DWITH_CRYPTO_MESSAGES=$(usex crypt)
-   -DWITH_GPGMEPP=$(usex crypt)
-   -DWITH_MIMETIC=$(usex crypt)
-   -DWITH_DBUS=$(usex dbus)
-   -DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
-   -DWITH_TESTS=$(usex test)
-   -DWITH_ZLIB=$(usex zlib)
-   )
-
-   cmake_src_configure
-}
-
-src_test() {
-   virtx cmake_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-09-08 Thread Andreas Sturmlechner

commit: c6c53388179e5e54a951db2f2a983684ded2c608
Author: Jan Kundrát  kde  org>
AuthorDate: Mon Aug 26 14:32:40 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  8 16:23:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6c53388

mail-client/trojita: Unconditionally enable the abook plugin

Trojita supports different implementations of an "address book" via
plugins that are loaded at runtime. Only one plugin can be active at a
time, but any number of them can be built and installed. The user can
pick and select an appropriate plugin via a GUI configuration.

There is no need to disable the "abook" plugin, and upstream expects
this plugin to be always available. There are no external dependencies,
and the `abook` binary is not used.

Fixes: e0e382d4f9341 (mail-client/trojita: Add USE addressbook)
Closes: https://bugs.gentoo.org/692214
Signed-off-by: Jan Kundrát  kde.org>
Closes: https://github.com/gentoo/gentoo/pull/12794
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 7740a0aa6ff..75c450faa1e 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -58,7 +58,7 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
-   -DWITH_ABOOKADDRESSBOOK_PLUGIN=OFF
+   -DWITH_ABOOKADDRESSBOOK_PLUGIN=ON
-DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex addressbook)
-DWITH_CRYPTO_MESSAGES=$(usex crypt)
-DWITH_GPGMEPP=$(usex crypt)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-09-08 Thread Andreas Sturmlechner

commit: 5c3995890446ce24d99ca96ee14ebe82ba200323
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  8 16:27:28 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  8 16:27:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c399589

mail-client/trojita: USE addressbook -> pim for kde-apps/akonadi plugin

USE addressbook has become too generic since abook plugin is always being built.

Thanks-to: Jan Kundrát  kde.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/metadata.xml| 2 +-
 mail-client/trojita/trojita-.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index 7a659b227af..d5712067bc9 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -14,8 +14,8 @@
Gentoo KDE Project


-   Build kde-apps/akonadi 
addressbook plugin
Store passwords securely via 
dev-libs/qtkeychain
+   Enable support for KDE PIM resources 
integration via kde-apps/akonadi addressbook plugin


trojita

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 75c450faa1e..78c9bfff1e4 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="addressbook +crypt +dbus debug +password +spell test +zlib"
+IUSE="+crypt +dbus debug +password pim +spell test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
@@ -34,13 +34,13 @@ DEPEND="
dev-qt/qtsvg:5
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
-   addressbook? ( kde-apps/akonadi-contacts:5 )
crypt? (
>=app-crypt/gpgme-1.8.0[cxx,qt5]
dev-libs/mimetic
)
dbus? ( dev-qt/qtdbus:5 )
password? ( dev-libs/qtkeychain[qt5(+)] )
+   pim? ( kde-apps/akonadi-contacts:5 )
spell? ( kde-frameworks/sonnet:5 )
zlib? ( sys-libs/zlib )
 "
@@ -59,12 +59,12 @@ src_prepare() {
 src_configure() {
local mycmakeargs=(
-DWITH_ABOOKADDRESSBOOK_PLUGIN=ON
-   -DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex addressbook)
-DWITH_CRYPTO_MESSAGES=$(usex crypt)
-DWITH_GPGMEPP=$(usex crypt)
-DWITH_MIMETIC=$(usex crypt)
-DWITH_DBUS=$(usex dbus)
-DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
+   -DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex pim)
-DWITH_SONNET_PLUGIN=$(usex spell)
-DBUILD_TESTING=$(usex test)
-DWITH_ZLIB=$(usex zlib)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-09-08 Thread Andreas Sturmlechner

commit: 5ff66409b9e7ee5239952013cb6fd4b2a1edaecf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  8 16:31:17 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  8 16:31:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff66409

mail-client/trojita: Move dev-qt/qttest:5 to DEPEND

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 78c9bfff1e4..fb3c38171e0 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -23,10 +23,9 @@ REQUIRED_USE="password? ( dbus )"
 
 BDEPEND="
dev-qt/linguist-tools:5
-   test? ( dev-qt/qttest:5 )
zlib? ( virtual/pkgconfig )
 "
-DEPEND="
+RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5[ssl]
@@ -44,7 +43,9 @@ DEPEND="
spell? ( kde-frameworks/sonnet:5 )
zlib? ( sys-libs/zlib )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+   test? ( dev-qt/qttest:5 )
+"
 
 DOCS=( README LICENSE )

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-12-07 Thread Andreas Sturmlechner

commit: 46d89ee9796b4a7342b5a0b62542d3fe10d884ac
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec  7 19:09:55 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec  7 19:10:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d89ee9

mail-client/trojita: Drop 0.7-r5

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r5.ebuild | 89 ---
 1 file changed, 89 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r5.ebuild 
b/mail-client/trojita/trojita-0.7-r5.ebuild
deleted file mode 100644
index f7b60c36636..000
--- a/mail-client/trojita/trojita-0.7-r5.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-   inherit git-r3
-else
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-inherit cmake virtualx xdg
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
-
-REQUIRED_USE="password? ( dbus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   zlib? ( virtual/pkgconfig )
-"
-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}
-   test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( README LICENSE )
-
-PATCHES=(
-   "${FILESDIR}/${P}-gpgme.patch"
-   "${FILESDIR}/${P}-gpg-tests.patch"
-   "${FILESDIR}/${P}-qt-5.11b3.patch"
-   "${FILESDIR}/${P}-qt-5.13.patch" # bug 730058
-   "${FILESDIR}/${P}-qt-5.15.patch"
-   "${FILESDIR}/${P}-CVE-2019-10734.patch" # KDE-bug 404697
-   "${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596
-   "${FILESDIR}/${P}-cmake-cxx11.patch"
-   "${FILESDIR}/${P}-desktop-spec-namespace.patch"
-   "${FILESDIR}/${P}-metainfo.patch" # bug 730140
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # the build system is taking a look at `git describe ... --dirty` and
-   # gentoo's modifications to CMakeLists.txt break these
-   sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix 
the version check"
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DWITH_RAGEL=OFF # bug 739866, broken by ragel-7
-   -DWITH_CRYPTO_MESSAGES=$(usex crypt)
-   -DWITH_GPGMEPP=$(usex crypt)
-   -DWITH_MIMETIC=$(usex crypt)
-   -DWITH_DBUS=$(usex dbus)
-   -DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
-   -DWITH_TESTS=$(usex test)
-   -DWITH_ZLIB=$(usex zlib)
-   )
-
-   cmake_src_configure
-}
-
-src_test() {
-   virtx cmake_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-04-19 Thread Andreas Sturmlechner

commit: 2c2ffbe8ad3558d909964fd2e7b55fe35f13e6bc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 19 11:29:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 19 12:01:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c2ffbe8

mail-client/trojita: EAPI-7 bump, use cmake.eclass, xdg.eclass

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r2.ebuild | 47 ---
 mail-client/trojita/trojita-.ebuild   |  4 +--
 2 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index a5904f016e3..f2648fcf92b 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -1,26 +1,31 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-inherit cmake-utils gnome2-utils virtualx xdg-utils
-[[ ${PV} ==  ]] && inherit git-r3
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-if [[ ${PV} !=  ]]; then
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
+   inherit git-r3
+else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
KEYWORDS="amd64 x86"
 fi
+inherit cmake virtualx xdg
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password test +zlib"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="password? ( dbus )"
+RESTRICT="!test? ( test )"
 
+BDEPEND="
+   dev-qt/linguist-tools:5
+   zlib? ( virtual/pkgconfig )
+"
 RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -38,9 +43,7 @@ RDEPEND="
zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
test? ( dev-qt/qttest:5 )
-   zlib? ( virtual/pkgconfig )
 "
 
 DOCS=( README LICENSE )
@@ -53,11 +56,11 @@ PATCHES=(
 )
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_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"
+   sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix 
the version check"
 }
 
 src_configure() {
@@ -71,23 +74,9 @@ src_configure() {
-DWITH_ZLIB=$(usex zlib)
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_test() {
-   virtx cmake-utils_src_test
-}
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
+   virtx cmake_src_test
 }

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index a6f81504d4e..672e67f6cd6 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,9 +18,9 @@ HOMEPAGE="http://trojita.flaska.net/";
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password pim +spell test +zlib"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="password? ( dbus )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
dev-qt/linguist-tools:5

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-09-08 Thread Andreas Sturmlechner

commit: c6c53388179e5e54a951db2f2a983684ded2c608
Author: Jan Kundrát  kde  org>
AuthorDate: Mon Aug 26 14:32:40 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  8 16:23:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6c53388

mail-client/trojita: Unconditionally enable the abook plugin

Trojita supports different implementations of an "address book" via
plugins that are loaded at runtime. Only one plugin can be active at a
time, but any number of them can be built and installed. The user can
pick and select an appropriate plugin via a GUI configuration.

There is no need to disable the "abook" plugin, and upstream expects
this plugin to be always available. There are no external dependencies,
and the `abook` binary is not used.

Fixes: e0e382d4f9341 (mail-client/trojita: Add USE addressbook)
Closes: https://bugs.gentoo.org/692214
Signed-off-by: Jan Kundrát  kde.org>
Closes: https://github.com/gentoo/gentoo/pull/12794
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 7740a0aa6ff..75c450faa1e 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -58,7 +58,7 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
-   -DWITH_ABOOKADDRESSBOOK_PLUGIN=OFF
+   -DWITH_ABOOKADDRESSBOOK_PLUGIN=ON
-DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex addressbook)
-DWITH_CRYPTO_MESSAGES=$(usex crypt)
-DWITH_GPGMEPP=$(usex crypt)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-09-08 Thread Andreas Sturmlechner

commit: 5c3995890446ce24d99ca96ee14ebe82ba200323
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  8 16:27:28 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  8 16:27:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c399589

mail-client/trojita: USE addressbook -> pim for kde-apps/akonadi plugin

USE addressbook has become too generic since abook plugin is always being built.

Thanks-to: Jan Kundrát  kde.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/metadata.xml| 2 +-
 mail-client/trojita/trojita-.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index 7a659b227af..d5712067bc9 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -14,8 +14,8 @@
Gentoo KDE Project


-   Build kde-apps/akonadi 
addressbook plugin
Store passwords securely via 
dev-libs/qtkeychain
+   Enable support for KDE PIM resources 
integration via kde-apps/akonadi addressbook plugin


trojita

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 75c450faa1e..78c9bfff1e4 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="addressbook +crypt +dbus debug +password +spell test +zlib"
+IUSE="+crypt +dbus debug +password pim +spell test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
@@ -34,13 +34,13 @@ DEPEND="
dev-qt/qtsvg:5
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
-   addressbook? ( kde-apps/akonadi-contacts:5 )
crypt? (
>=app-crypt/gpgme-1.8.0[cxx,qt5]
dev-libs/mimetic
)
dbus? ( dev-qt/qtdbus:5 )
password? ( dev-libs/qtkeychain[qt5(+)] )
+   pim? ( kde-apps/akonadi-contacts:5 )
spell? ( kde-frameworks/sonnet:5 )
zlib? ( sys-libs/zlib )
 "
@@ -59,12 +59,12 @@ src_prepare() {
 src_configure() {
local mycmakeargs=(
-DWITH_ABOOKADDRESSBOOK_PLUGIN=ON
-   -DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex addressbook)
-DWITH_CRYPTO_MESSAGES=$(usex crypt)
-DWITH_GPGMEPP=$(usex crypt)
-DWITH_MIMETIC=$(usex crypt)
-DWITH_DBUS=$(usex dbus)
-DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
+   -DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex pim)
-DWITH_SONNET_PLUGIN=$(usex spell)
-DBUILD_TESTING=$(usex test)
-DWITH_ZLIB=$(usex zlib)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-09-08 Thread Andreas Sturmlechner

commit: 5ff66409b9e7ee5239952013cb6fd4b2a1edaecf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  8 16:31:17 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  8 16:31:17 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff66409

mail-client/trojita: Move dev-qt/qttest:5 to DEPEND

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 78c9bfff1e4..fb3c38171e0 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -23,10 +23,9 @@ REQUIRED_USE="password? ( dbus )"
 
 BDEPEND="
dev-qt/linguist-tools:5
-   test? ( dev-qt/qttest:5 )
zlib? ( virtual/pkgconfig )
 "
-DEPEND="
+RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5[ssl]
@@ -44,7 +43,9 @@ DEPEND="
spell? ( kde-frameworks/sonnet:5 )
zlib? ( sys-libs/zlib )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+   test? ( dev-qt/qttest:5 )
+"
 
 DOCS=( README LICENSE )

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-28 Thread Andreas Sturmlechner

commit: 08baa3311287ea39ca35c9b67abe636146728bc8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 28 21:01:24 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 28 21:55:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08baa331

mail-client/trojita: Drop 0.7-r3

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r3.ebuild | 83 ---
 1 file changed, 83 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r3.ebuild 
b/mail-client/trojita/trojita-0.7-r3.ebuild
deleted file mode 100644
index ba129ff4eb4..000
--- a/mail-client/trojita/trojita-0.7-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-   inherit git-r3
-else
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake virtualx xdg
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
-
-REQUIRED_USE="password? ( dbus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   zlib? ( virtual/pkgconfig )
-"
-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}
-   test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( README LICENSE )
-
-PATCHES=(
-   "${FILESDIR}/${P}-gpgme.patch"
-   "${FILESDIR}/${P}-gpg-tests.patch"
-   "${FILESDIR}/${P}-qt-5.11b3.patch"
-   "${FILESDIR}/${P}-qt-5.15.patch"
-   "${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # the build system is taking a look at `git describe ... --dirty` and
-   # gentoo's modifications to CMakeLists.txt break these
-   sed -e "s/--dirty//" -i 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_QTKEYCHAIN_PLUGIN=$(usex password)
-   -DWITH_TESTS=$(usex test)
-   -DWITH_ZLIB=$(usex zlib)
-   )
-
-   cmake_src_configure
-}
-
-src_test() {
-   virtx cmake_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-29 Thread Agostino Sarubbo

commit: 41dc092091ba9620141cf1d5030abc7bc05d180b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun 29 13:34:31 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun 29 13:34:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41dc0920

mail-client/trojita: amd64 stable wrt bug #729596

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.7-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.7-r4.ebuild 
b/mail-client/trojita/trojita-0.7-r4.ebuild
index e9b7c9e515a..199ae853726 100644
--- a/mail-client/trojita/trojita-0.7-r4.ebuild
+++ b/mail-client/trojita/trojita-0.7-r4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
inherit git-r3
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 inherit cmake virtualx xdg

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-29 Thread Agostino Sarubbo

commit: 5801a74755875ba4e54c9e9b089aa029514ff408
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun 29 13:39:05 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun 29 13:39:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5801a747

mail-client/trojita: x86 stable wrt bug #729596

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.7-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.7-r4.ebuild 
b/mail-client/trojita/trojita-0.7-r4.ebuild
index 199ae853726..ec2dd0a0cc5 100644
--- a/mail-client/trojita/trojita-0.7-r4.ebuild
+++ b/mail-client/trojita/trojita-0.7-r4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
inherit git-r3
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 inherit cmake virtualx xdg

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-29 Thread Andreas Sturmlechner

commit: 29dcb5b60c52945652edc27aa1505e0c48760d49
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 29 17:25:47 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 29 17:36:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29dcb5b6

mail-client/trojita: Cleanup vulnerable 0.7-r2

Bug: https://bugs.gentoo.org/729596
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r2.ebuild | 82 ---
 1 file changed, 82 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
deleted file mode 100644
index f2648fcf92b..000
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-   inherit git-r3
-else
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-inherit cmake virtualx xdg
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
-
-REQUIRED_USE="password? ( dbus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   zlib? ( virtual/pkgconfig )
-"
-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}
-   test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( README LICENSE )
-
-PATCHES=(
-   "${FILESDIR}/${P}-gpgme.patch"
-   "${FILESDIR}/${P}-gpg-tests.patch"
-   "${FILESDIR}/${P}-qt-5.11b3.patch"
-   "${FILESDIR}/${P}-qt-5.15.patch"
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # the build system is taking a look at `git describe ... --dirty` and
-   # gentoo's modifications to CMakeLists.txt break these
-   sed -e "s/--dirty//" -i 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_QTKEYCHAIN_PLUGIN=$(usex password)
-   -DWITH_TESTS=$(usex test)
-   -DWITH_ZLIB=$(usex zlib)
-   )
-
-   cmake_src_configure
-}
-
-src_test() {
-   virtx cmake_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-30 Thread Andreas Sturmlechner

commit: 92f86dd3ec45d980c9e1452a0b85d473400e1d22
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 30 19:55:34 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 30 19:56:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f86dd3

mail-client/trojita: Drop 0.7-r4

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r4.ebuild | 86 ---
 1 file changed, 86 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r4.ebuild 
b/mail-client/trojita/trojita-0.7-r4.ebuild
deleted file mode 100644
index ec2dd0a0cc5..000
--- a/mail-client/trojita/trojita-0.7-r4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-   inherit git-r3
-else
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-inherit cmake virtualx xdg
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
-
-REQUIRED_USE="password? ( dbus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   zlib? ( virtual/pkgconfig )
-"
-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}
-   test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( README LICENSE )
-
-PATCHES=(
-   "${FILESDIR}/${P}-gpgme.patch"
-   "${FILESDIR}/${P}-gpg-tests.patch"
-   "${FILESDIR}/${P}-qt-5.11b3.patch"
-   "${FILESDIR}/${P}-qt-5.13.patch" # bug 730058
-   "${FILESDIR}/${P}-qt-5.15.patch"
-   "${FILESDIR}/${P}-CVE-2019-10734.patch" # KDE-bug 404697
-   "${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596
-   "${FILESDIR}/${P}-cmake-cxx11.patch"
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # the build system is taking a look at `git describe ... --dirty` and
-   # gentoo's modifications to CMakeLists.txt break these
-   sed -e "s/--dirty//" -i 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_QTKEYCHAIN_PLUGIN=$(usex password)
-   -DWITH_TESTS=$(usex test)
-   -DWITH_ZLIB=$(usex zlib)
-   )
-
-   cmake_src_configure
-}
-
-src_test() {
-   virtx cmake_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-02-14 Thread Andreas Sturmlechner

commit: 8d88d48f9cfe61c619ecd890f2dc169237f9be2c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb 14 18:29:22 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 14 18:36:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d88d48f

mail-client/trojita: Switch from gnome2-utils to xdg, EAPI-7 bump

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 48 +
 1 file changed, 18 insertions(+), 30 deletions(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 3868e240b41..268f9915e76 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-inherit cmake-utils gnome2-utils virtualx xdg-utils
-[[ ${PV} ==  ]] && inherit git-r3
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-if [[ ${PV} !=  ]]; then
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
+   inherit git-r3
+else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
 fi
+inherit cmake-utils virtualx xdg
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
@@ -20,7 +21,12 @@ IUSE="+crypt +dbus debug +password test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
-RDEPEND="
+BDEPEND="
+   dev-qt/linguist-tools:5
+   test? ( dev-qt/qttest:5 )
+   zlib? ( virtual/pkgconfig )
+"
+DEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5[ssl]
@@ -36,11 +42,7 @@ RDEPEND="
password? ( dev-libs/qtkeychain[qt5(+)] )
zlib? ( sys-libs/zlib )
 "
-DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
-   test? ( dev-qt/qttest:5 )
-   zlib? ( virtual/pkgconfig )
-"
+RDEPEND="${DEPEND}"
 
 DOCS=( README LICENSE )
 
@@ -49,7 +51,7 @@ 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"
+   sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix 
the version check"
 }
 
 src_configure() {
@@ -69,17 +71,3 @@ src_configure() {
 src_test() {
virtx cmake-utils_src_test
 }
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2017-09-19 Thread Michael Palimaka

commit: c1fcec31e841b0cd6165df14fd0c174e7df76caf
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Sep 19 12:18:39 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Sep 19 12:19:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1fcec31

mail-client/trojita: use HTTPS in EGIT_REPO_URI

Closes: https://bugs.gentoo.org/631350
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 mail-client/trojita/trojita-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 919326db5b1..4988ce563e1 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# 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"
+EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
 inherit cmake-utils fdo-mime gnome2-utils virtualx
 [[ ${PV} ==  ]] && inherit git-r3

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-04-19 Thread Andreas Sturmlechner

commit: 2c2ffbe8ad3558d909964fd2e7b55fe35f13e6bc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 19 11:29:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 19 12:01:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c2ffbe8

mail-client/trojita: EAPI-7 bump, use cmake.eclass, xdg.eclass

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r2.ebuild | 47 ---
 mail-client/trojita/trojita-.ebuild   |  4 +--
 2 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index a5904f016e3..f2648fcf92b 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -1,26 +1,31 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-inherit cmake-utils gnome2-utils virtualx xdg-utils
-[[ ${PV} ==  ]] && inherit git-r3
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-if [[ ${PV} !=  ]]; then
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
+   inherit git-r3
+else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
KEYWORDS="amd64 x86"
 fi
+inherit cmake virtualx xdg
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password test +zlib"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="password? ( dbus )"
+RESTRICT="!test? ( test )"
 
+BDEPEND="
+   dev-qt/linguist-tools:5
+   zlib? ( virtual/pkgconfig )
+"
 RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -38,9 +43,7 @@ RDEPEND="
zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
test? ( dev-qt/qttest:5 )
-   zlib? ( virtual/pkgconfig )
 "
 
 DOCS=( README LICENSE )
@@ -53,11 +56,11 @@ PATCHES=(
 )
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_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"
+   sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix 
the version check"
 }
 
 src_configure() {
@@ -71,23 +74,9 @@ src_configure() {
-DWITH_ZLIB=$(usex zlib)
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_test() {
-   virtx cmake-utils_src_test
-}
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
+   virtx cmake_src_test
 }

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index a6f81504d4e..672e67f6cd6 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,9 +18,9 @@ HOMEPAGE="http://trojita.flaska.net/";
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password pim +spell test +zlib"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="password? ( dbus )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
dev-qt/linguist-tools:5

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-28 Thread Andreas Sturmlechner

commit: 08baa3311287ea39ca35c9b67abe636146728bc8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 28 21:01:24 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 28 21:55:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08baa331

mail-client/trojita: Drop 0.7-r3

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r3.ebuild | 83 ---
 1 file changed, 83 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r3.ebuild 
b/mail-client/trojita/trojita-0.7-r3.ebuild
deleted file mode 100644
index ba129ff4eb4..000
--- a/mail-client/trojita/trojita-0.7-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-   inherit git-r3
-else
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake virtualx xdg
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
-
-REQUIRED_USE="password? ( dbus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   zlib? ( virtual/pkgconfig )
-"
-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}
-   test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( README LICENSE )
-
-PATCHES=(
-   "${FILESDIR}/${P}-gpgme.patch"
-   "${FILESDIR}/${P}-gpg-tests.patch"
-   "${FILESDIR}/${P}-qt-5.11b3.patch"
-   "${FILESDIR}/${P}-qt-5.15.patch"
-   "${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # the build system is taking a look at `git describe ... --dirty` and
-   # gentoo's modifications to CMakeLists.txt break these
-   sed -e "s/--dirty//" -i 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_QTKEYCHAIN_PLUGIN=$(usex password)
-   -DWITH_TESTS=$(usex test)
-   -DWITH_ZLIB=$(usex zlib)
-   )
-
-   cmake_src_configure
-}
-
-src_test() {
-   virtx cmake_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-29 Thread Agostino Sarubbo

commit: 41dc092091ba9620141cf1d5030abc7bc05d180b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun 29 13:34:31 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun 29 13:34:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41dc0920

mail-client/trojita: amd64 stable wrt bug #729596

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.7-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.7-r4.ebuild 
b/mail-client/trojita/trojita-0.7-r4.ebuild
index e9b7c9e515a..199ae853726 100644
--- a/mail-client/trojita/trojita-0.7-r4.ebuild
+++ b/mail-client/trojita/trojita-0.7-r4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
inherit git-r3
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 inherit cmake virtualx xdg

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-29 Thread Agostino Sarubbo

commit: 5801a74755875ba4e54c9e9b089aa029514ff408
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun 29 13:39:05 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun 29 13:39:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5801a747

mail-client/trojita: x86 stable wrt bug #729596

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.7-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.7-r4.ebuild 
b/mail-client/trojita/trojita-0.7-r4.ebuild
index 199ae853726..ec2dd0a0cc5 100644
--- a/mail-client/trojita/trojita-0.7-r4.ebuild
+++ b/mail-client/trojita/trojita-0.7-r4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
inherit git-r3
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 inherit cmake virtualx xdg

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-29 Thread Andreas Sturmlechner

commit: 29dcb5b60c52945652edc27aa1505e0c48760d49
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 29 17:25:47 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 29 17:36:43 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29dcb5b6

mail-client/trojita: Cleanup vulnerable 0.7-r2

Bug: https://bugs.gentoo.org/729596
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r2.ebuild | 82 ---
 1 file changed, 82 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
deleted file mode 100644
index f2648fcf92b..000
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-   inherit git-r3
-else
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-inherit cmake virtualx xdg
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
-
-REQUIRED_USE="password? ( dbus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   zlib? ( virtual/pkgconfig )
-"
-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}
-   test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( README LICENSE )
-
-PATCHES=(
-   "${FILESDIR}/${P}-gpgme.patch"
-   "${FILESDIR}/${P}-gpg-tests.patch"
-   "${FILESDIR}/${P}-qt-5.11b3.patch"
-   "${FILESDIR}/${P}-qt-5.15.patch"
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # the build system is taking a look at `git describe ... --dirty` and
-   # gentoo's modifications to CMakeLists.txt break these
-   sed -e "s/--dirty//" -i 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_QTKEYCHAIN_PLUGIN=$(usex password)
-   -DWITH_TESTS=$(usex test)
-   -DWITH_ZLIB=$(usex zlib)
-   )
-
-   cmake_src_configure
-}
-
-src_test() {
-   virtx cmake_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-30 Thread Andreas Sturmlechner

commit: 92f86dd3ec45d980c9e1452a0b85d473400e1d22
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 30 19:55:34 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 30 19:56:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f86dd3

mail-client/trojita: Drop 0.7-r4

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r4.ebuild | 86 ---
 1 file changed, 86 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r4.ebuild 
b/mail-client/trojita/trojita-0.7-r4.ebuild
deleted file mode 100644
index ec2dd0a0cc5..000
--- a/mail-client/trojita/trojita-0.7-r4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-   inherit git-r3
-else
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 x86"
-fi
-inherit cmake virtualx xdg
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
-
-REQUIRED_USE="password? ( dbus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   zlib? ( virtual/pkgconfig )
-"
-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}
-   test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( README LICENSE )
-
-PATCHES=(
-   "${FILESDIR}/${P}-gpgme.patch"
-   "${FILESDIR}/${P}-gpg-tests.patch"
-   "${FILESDIR}/${P}-qt-5.11b3.patch"
-   "${FILESDIR}/${P}-qt-5.13.patch" # bug 730058
-   "${FILESDIR}/${P}-qt-5.15.patch"
-   "${FILESDIR}/${P}-CVE-2019-10734.patch" # KDE-bug 404697
-   "${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596
-   "${FILESDIR}/${P}-cmake-cxx11.patch"
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # the build system is taking a look at `git describe ... --dirty` and
-   # gentoo's modifications to CMakeLists.txt break these
-   sed -e "s/--dirty//" -i 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_QTKEYCHAIN_PLUGIN=$(usex password)
-   -DWITH_TESTS=$(usex test)
-   -DWITH_ZLIB=$(usex zlib)
-   )
-
-   cmake_src_configure
-}
-
-src_test() {
-   virtx cmake_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2017-05-11 Thread Agostino Sarubbo

commit: b6c5910c0d0e82146fd97fbc7983835f220c36cb
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May 11 07:50:46 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May 11 07:50:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c5910c

mail-client/trojita: amd64 stable wrt bug #618128

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.7-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index 07a21e42727..c6f704c0d48 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
 if [[ ${PV} !=  ]]; then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2017-05-11 Thread Agostino Sarubbo

commit: f25f5f56c1595ae509bd7d85ecc7daaadafd114e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu May 11 08:37:18 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu May 11 08:37:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f25f5f56

mail-client/trojita: x86 stable wrt bug #618128

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.7-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index c6f704c0d48..f283ed20238 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/";
 if [[ ${PV} !=  ]]; then
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2017-05-11 Thread Andreas Sturmlechner

commit: dc93b8955dfdcdd8420b2a62fcce423cd94a1f7d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 11 18:19:23 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 11 18:43:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc93b895

mail-client/trojita: Drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 mail-client/trojita/trojita-0.7-r1.ebuild | 83 ---
 1 file changed, 83 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r1.ebuild 
b/mail-client/trojita/trojita-0.7-r1.ebuild
deleted file mode 100644
index b68534f9611..000
--- a/mail-client/trojita/trojita-0.7-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 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} ==  ]] && inherit git-r3
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-if [[ ${PV} !=  ]]; 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
-   kde-apps/gpgmepp:5
-   )
-   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
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2018-03-14 Thread Michael Palimaka

commit: 668d90f4d64f9efbbd2c2d454dc97744a1dac81d
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Mar 14 10:44:02 2018 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Mar 14 10:45:28 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=668d90f4

mail-client/trojita: update maintainer email

Bug: https://bugs.gentoo.org/96455
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 mail-client/trojita/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index 7cf4bb20138..a397e84c737 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -2,7 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 

-   j...@gentoo.org
+   j...@kde.org
Jan Kundrát

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-05-21 Thread Andreas Sturmlechner

commit: 71ec670a93477f0c2b2abd29d4cc44e71eb2c2f1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 21 17:24:47 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 21 18:40:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71ec670a

mail-client/trojita: Add USE spell

Upstream commit aa5698e4a0bfa848ff782263db38b09d25a54384

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 268f9915e76..4e92baebbe7 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
+IUSE="+crypt +dbus debug +password +spell test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
@@ -40,6 +40,7 @@ DEPEND="
)
dbus? ( dev-qt/qtdbus:5 )
password? ( dev-libs/qtkeychain[qt5(+)] )
+   spell? ( kde-frameworks/sonnet:5 )
zlib? ( sys-libs/zlib )
 "
 RDEPEND="${DEPEND}"
@@ -61,6 +62,7 @@ src_configure() {
-DWITH_MIMETIC=$(usex crypt)
-DWITH_DBUS=$(usex dbus)
-DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
+   -DWITH_SONNET_PLUGIN=$(usex spell)
-DWITH_TESTS=$(usex test)
-DWITH_ZLIB=$(usex zlib)
)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-05-21 Thread Andreas Sturmlechner

commit: e0e382d4f934129b82ce13cea8d20bf664801978
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 21 17:36:02 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 21 18:40:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0e382d4

mail-client/trojita: Add USE addressbook

Upstream commit c3a317ac1e085535034ef862d9e9dbf4551cfb99

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/metadata.xml| 1 +
 mail-client/trojita/trojita-.ebuild | 5 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml
index a397e84c737..7a659b227af 100644
--- a/mail-client/trojita/metadata.xml
+++ b/mail-client/trojita/metadata.xml
@@ -14,6 +14,7 @@
Gentoo KDE Project


+   Build kde-apps/akonadi 
addressbook plugin
Store passwords securely via 
dev-libs/qtkeychain



diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 4e92baebbe7..b72987f25f9 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-IUSE="+crypt +dbus debug +password +spell test +zlib"
+IUSE="addressbook +crypt +dbus debug +password +spell test +zlib"
 
 REQUIRED_USE="password? ( dbus )"
 
@@ -34,6 +34,7 @@ DEPEND="
dev-qt/qtsvg:5
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
+   addressbook? ( kde-apps/akonadi-contacts:5 )
crypt? (
>=app-crypt/gpgme-1.8.0[cxx,qt5]
dev-libs/mimetic
@@ -57,6 +58,8 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
+   -DWITH_ABOOKADDRESSBOOK_PLUGIN=OFF
+   -DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex addressbook)
-DWITH_CRYPTO_MESSAGES=$(usex crypt)
-DWITH_GPGMEPP=$(usex crypt)
-DWITH_MIMETIC=$(usex crypt)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2019-05-21 Thread Andreas Sturmlechner

commit: 2785637d1b6d8b8c9f66a98d2f68c00ca4fbf82f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 21 17:37:21 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 21 18:40:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2785637d

mail-client/trojita: Fix USE test cmake param

Upstream commit 925218e09a76f977b3df400555e920ef7b69e351

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index b72987f25f9..7740a0aa6ff 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -66,7 +66,7 @@ src_configure() {
-DWITH_DBUS=$(usex dbus)
-DWITH_QTKEYCHAIN_PLUGIN=$(usex password)
-DWITH_SONNET_PLUGIN=$(usex spell)
-   -DWITH_TESTS=$(usex test)
+   -DBUILD_TESTING=$(usex test)
-DWITH_ZLIB=$(usex zlib)
)

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2016-12-21 Thread Michael Palimaka

commit: a68a89a2c50d4b1c4317a5764d01f83dc43aa830
Author: Jan Kundrát  gentoo  org>
AuthorDate: Wed Dec 21 11:08:10 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Dec 21 12:27:30 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a68a89a2

mail-client/trojita: Upstream has switched to app-crypt/gpgme

There's also a requirement on 1.8.0+ because of some bugs in pthreads in
1.7.0 -- that one also comes from upstream.

 mail-client/trojita/trojita-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index 0671174..b014eca 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
dev-qt/qtwidgets:5
crypt? (
dev-libs/mimetic
-   kde-apps/gpgmepp:5
+   >=app-crypt/gpgme-1.8.0[cxx,qt5]
)
dbus? ( dev-qt/qtdbus:5 )
password? ( dev-libs/qtkeychain[qt5] )

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-04-19 Thread Andreas Sturmlechner

commit: 2c2ffbe8ad3558d909964fd2e7b55fe35f13e6bc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 19 11:29:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 19 12:01:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c2ffbe8

mail-client/trojita: EAPI-7 bump, use cmake.eclass, xdg.eclass

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r2.ebuild | 47 ---
 mail-client/trojita/trojita-.ebuild   |  4 +--
 2 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r2.ebuild 
b/mail-client/trojita/trojita-0.7-r2.ebuild
index a5904f016e3..f2648fcf92b 100644
--- a/mail-client/trojita/trojita-0.7-r2.ebuild
+++ b/mail-client/trojita/trojita-0.7-r2.ebuild
@@ -1,26 +1,31 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-inherit cmake-utils gnome2-utils virtualx xdg-utils
-[[ ${PV} ==  ]] && inherit git-r3
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-if [[ ${PV} !=  ]]; then
+if [[ ${PV} = ** ]]; then
+   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
+   inherit git-r3
+else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
KEYWORDS="amd64 x86"
 fi
+inherit cmake virtualx xdg
+
+DESCRIPTION="A Qt IMAP e-mail client"
+HOMEPAGE="http://trojita.flaska.net/";
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password test +zlib"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="password? ( dbus )"
+RESTRICT="!test? ( test )"
 
+BDEPEND="
+   dev-qt/linguist-tools:5
+   zlib? ( virtual/pkgconfig )
+"
 RDEPEND="
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -38,9 +43,7 @@ RDEPEND="
zlib? ( sys-libs/zlib )
 "
 DEPEND="${RDEPEND}
-   dev-qt/linguist-tools:5
test? ( dev-qt/qttest:5 )
-   zlib? ( virtual/pkgconfig )
 "
 
 DOCS=( README LICENSE )
@@ -53,11 +56,11 @@ PATCHES=(
 )
 
 src_prepare() {
-   cmake-utils_src_prepare
+   cmake_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"
+   sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix 
the version check"
 }
 
 src_configure() {
@@ -71,23 +74,9 @@ src_configure() {
-DWITH_ZLIB=$(usex zlib)
)
 
-   cmake-utils_src_configure
+   cmake_src_configure
 }
 
 src_test() {
-   virtx cmake-utils_src_test
-}
-
-pkg_preinst() {
-   gnome2_icon_savelist
-}
-
-pkg_postinst() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-   xdg_desktop_database_update
-   gnome2_icon_cache_update
+   virtx cmake_src_test
 }

diff --git a/mail-client/trojita/trojita-.ebuild 
b/mail-client/trojita/trojita-.ebuild
index a6f81504d4e..672e67f6cd6 100644
--- a/mail-client/trojita/trojita-.ebuild
+++ b/mail-client/trojita/trojita-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,9 +18,9 @@ HOMEPAGE="http://trojita.flaska.net/";
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
 IUSE="+crypt +dbus debug +password pim +spell test +zlib"
-RESTRICT="!test? ( test )"
 
 REQUIRED_USE="password? ( dbus )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
dev-qt/linguist-tools:5

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-28 Thread Andreas Sturmlechner

commit: 08baa3311287ea39ca35c9b67abe636146728bc8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 28 21:01:24 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 28 21:55:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08baa331

mail-client/trojita: Drop 0.7-r3

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 mail-client/trojita/trojita-0.7-r3.ebuild | 83 ---
 1 file changed, 83 deletions(-)

diff --git a/mail-client/trojita/trojita-0.7-r3.ebuild 
b/mail-client/trojita/trojita-0.7-r3.ebuild
deleted file mode 100644
index ba129ff4eb4..000
--- a/mail-client/trojita/trojita-0.7-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = ** ]]; then
-   EGIT_REPO_URI="https://anongit.kde.org/${PN}.git";
-   inherit git-r3
-else
-   SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
-fi
-inherit cmake virtualx xdg
-
-DESCRIPTION="A Qt IMAP e-mail client"
-HOMEPAGE="http://trojita.flaska.net/";
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-SLOT="0"
-IUSE="+crypt +dbus debug +password test +zlib"
-
-REQUIRED_USE="password? ( dbus )"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-   dev-qt/linguist-tools:5
-   zlib? ( virtual/pkgconfig )
-"
-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}
-   test? ( dev-qt/qttest:5 )
-"
-
-DOCS=( README LICENSE )
-
-PATCHES=(
-   "${FILESDIR}/${P}-gpgme.patch"
-   "${FILESDIR}/${P}-gpg-tests.patch"
-   "${FILESDIR}/${P}-qt-5.11b3.patch"
-   "${FILESDIR}/${P}-qt-5.15.patch"
-   "${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596
-)
-
-src_prepare() {
-   cmake_src_prepare
-
-   # the build system is taking a look at `git describe ... --dirty` and
-   # gentoo's modifications to CMakeLists.txt break these
-   sed -e "s/--dirty//" -i 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_QTKEYCHAIN_PLUGIN=$(usex password)
-   -DWITH_TESTS=$(usex test)
-   -DWITH_ZLIB=$(usex zlib)
-   )
-
-   cmake_src_configure
-}
-
-src_test() {
-   virtx cmake_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-29 Thread Agostino Sarubbo

commit: 41dc092091ba9620141cf1d5030abc7bc05d180b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun 29 13:34:31 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun 29 13:34:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41dc0920

mail-client/trojita: amd64 stable wrt bug #729596

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.7-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.7-r4.ebuild 
b/mail-client/trojita/trojita-0.7-r4.ebuild
index e9b7c9e515a..199ae853726 100644
--- a/mail-client/trojita/trojita-0.7-r4.ebuild
+++ b/mail-client/trojita/trojita-0.7-r4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
inherit git-r3
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 inherit cmake virtualx xdg

[gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/

2020-06-29 Thread Agostino Sarubbo

commit: 5801a74755875ba4e54c9e9b089aa029514ff408
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Jun 29 13:39:05 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Jun 29 13:39:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5801a747

mail-client/trojita: x86 stable wrt bug #729596

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-client/trojita/trojita-0.7-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-client/trojita/trojita-0.7-r4.ebuild 
b/mail-client/trojita/trojita-0.7-r4.ebuild
index 199ae853726..ec2dd0a0cc5 100644
--- a/mail-client/trojita/trojita-0.7-r4.ebuild
+++ b/mail-client/trojita/trojita-0.7-r4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = ** ]]; then
inherit git-r3
 else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 x86"
 fi
 inherit cmake virtualx xdg

1 2 3 4 >

1 - 100 of 350 matches

Mail list logo