From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2995E138350 for ; Sun, 19 Apr 2020 12:02:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 619A5E0955; Sun, 19 Apr 2020 12:02:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 185BEE0955 for ; Sun, 19 Apr 2020 12:02:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D304534F01B for ; Sun, 19 Apr 2020 12:02:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBBDE1DD for ; Sun, 19 Apr 2020 12:01:58 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1587297709.2c2ffbe8ad3558d909964fd2e7b55fe35f13e6bc.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-client/trojita/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-client/trojita/trojita-0.7-r2.ebuild mail-client/trojita/trojita-9999.ebuild X-VCS-Directories: mail-client/trojita/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2c2ffbe8ad3558d909964fd2e7b55fe35f13e6bc X-VCS-Branch: master Date: Sun, 19 Apr 2020 12:01:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eac05001-d0d6-4921-9672-fbf4af8e7c0d X-Archives-Hash: 7d084da0a4a6a6e79a64a9e20a5d51c1 commit: 2c2ffbe8ad3558d909964fd2e7b55fe35f13e6bc Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 19 11:29:22 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 19 12:01:49 2020 +0000 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-9999.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} == 9999 ]] && inherit git-r3 - -DESCRIPTION="A Qt IMAP e-mail client" -HOMEPAGE="http://trojita.flaska.net/" -if [[ ${PV} != 9999 ]]; then +if [[ ${PV} = *9999* ]]; 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-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild index a6f81504d4e..672e67f6cd6 100644 --- a/mail-client/trojita/trojita-9999.ebuild +++ b/mail-client/trojita/trojita-9999.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