commit: f97ac1fff7ef25c941663425bb615db7b4dc7752 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Wed Jun 16 07:38:08 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Wed Jun 16 07:38:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f97ac1ff
mail-mta/opensmtpd: fix collision on merged /usr systems Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild b/mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild index 53f82ac4248..9adcaa46b33 100644 --- a/mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild +++ b/mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz"; LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" SLOT="0" KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" -IUSE="pam +mta berkdb" +IUSE="berkdb +mta pam split-usr" DEPEND=" acct-user/smtpd @@ -66,7 +66,9 @@ src_install() { if use mta ; then dodir /usr/sbin dosym smtpctl /usr/sbin/sendmail - dosym ../sbin/smtpctl /usr/bin/sendmail + # on USE="-split-usr" system sbin and bin are merged + # so symlink made above will collide with one below + use split-usr && dosym ../sbin/smtpctl /usr/bin/sendmail mkdir -p "${ED}"/usr/$(get_libdir) || die ln -s --relative "${ED}"/usr/sbin/smtpctl "${ED}"/usr/$(get_libdir)/sendmail || die fi
