[gentoo-commits] repo/gentoo:master commit in: net-mail/mailutils/

[David Seifert]

commit:     3ad69e9d174a979e85a1502de5fd20643ba5d525
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 16 09:52:57 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> 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 <soap <AT> 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
 }