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 C9439138334 for ; Wed, 16 Oct 2019 09:53:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F32C8E08FA; Wed, 16 Oct 2019 09:53:15 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 CDD75E08FA for ; Wed, 16 Oct 2019 09:53:15 +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 6A8BB34BDEF for ; Wed, 16 Oct 2019 09:53:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3139572F for ; Wed, 16 Oct 2019 09:53:12 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1571219577.3ad69e9d174a979e85a1502de5fd20643ba5d525.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-mail/mailutils/mailutils-3.4-r3.ebuild net-mail/mailutils/mailutils-3.7.ebuild X-VCS-Directories: net-mail/mailutils/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 3ad69e9d174a979e85a1502de5fd20643ba5d525 X-VCS-Branch: master Date: Wed, 16 Oct 2019 09:53:12 +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: b71d3dcf-c961-48a1-83ce-919d4e3fffb1 X-Archives-Hash: e6144f45682587ab30c1647394cafd56 commit: 3ad69e9d174a979e85a1502de5fd20643ba5d525 Author: David Seifert gentoo org> AuthorDate: Wed Oct 16 09:52:57 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Wed Oct 16 09:52:57 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ad69e9d net-mail/mailutils: [QA] Multiple fixes * Use relative symlinks for better chroot * Use proper || die * Honour USE="-split-usr" systems properly Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: David Seifert gentoo.org> net-mail/mailutils/mailutils-3.4-r3.ebuild | 14 ++++++++------ net-mail/mailutils/mailutils-3.7.ebuild | 11 +++++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/net-mail/mailutils/mailutils-3.4-r3.ebuild b/net-mail/mailutils/mailutils-3.4-r3.ebuild index ab5c356f37f..41d2ec0c56f 100644 --- a/net-mail/mailutils/mailutils-3.4-r3.ebuild +++ b/net-mail/mailutils/mailutils-3.4-r3.ebuild @@ -14,7 +14,7 @@ LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~ppc-macos ~x64-macos ~x86-macos" IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \ - ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd \ + ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \ tokyocabinet" RDEPEND="!mail-client/nmh @@ -105,7 +105,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install + default insinto /etc # bug 613112 @@ -127,10 +127,12 @@ src_install() { newinitd "${FILESDIR}"/comsatd.initd comsatd fi - dodoc AUTHORS ChangeLog NEWS README* THANKS TODO - # compatibility link - use clients && dosym /usr/bin/mail /bin/mail + if use clients && use split-usr; then + dosym ../usr/bin/mail /bin/mail + fi - use static-libs || find "${D}" -name "*.la" -delete + if ! use static-libs; then + find "${D}" -name "*.la" -delete || die + fi } diff --git a/net-mail/mailutils/mailutils-3.7.ebuild b/net-mail/mailutils/mailutils-3.7.ebuild index 76cd4bd9c81..493ba4d9f40 100644 --- a/net-mail/mailutils/mailutils-3.7.ebuild +++ b/net-mail/mailutils/mailutils-3.7.ebuild @@ -14,7 +14,7 @@ LICENSE="GPL-2 LGPL-2.1" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos" IUSE="berkdb bidi +clients emacs gdbm sasl guile ipv6 kerberos kyotocabinet \ - ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd \ + ldap mysql nls pam postgres python servers split-usr ssl static-libs +threads tcpd \ tokyocabinet" RDEPEND="!mail-client/nmh @@ -105,7 +105,6 @@ src_configure() { src_install() { default - emake DESTDIR="${D}" install insinto /etc # bug 613112 @@ -128,7 +127,11 @@ src_install() { fi # compatibility link - use clients && dosym /usr/bin/mail /bin/mail + if use clients && use split-usr; then + dosym ../usr/bin/mail /bin/mail + fi - use static-libs || find "${D}" -name "*.la" -delete + if ! use static-libs; then + find "${D}" -name "*.la" -delete || die + fi }