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 AC9FE1382C5 for ; Wed, 16 Jun 2021 07:40:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0CC8E082B; Wed, 16 Jun 2021 07:40:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 957BAE082B for ; Wed, 16 Jun 2021 07:40:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 BD278335D72 for ; Wed, 16 Jun 2021 07:40:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0EE077AC for ; Wed, 16 Jun 2021 07:40:15 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1623829130.f97ac1fff7ef25c941663425bb615db7b4dc7752.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/opensmtpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: mail-mta/opensmtpd/opensmtpd-6.8.0_p2.ebuild X-VCS-Directories: mail-mta/opensmtpd/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: f97ac1fff7ef25c941663425bb615db7b4dc7752 X-VCS-Branch: master Date: Wed, 16 Jun 2021 07:40:15 +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: 493f720d-5bc9-42dc-8365-1fa97023eaf9 X-Archives-Hash: 7264d132a195d9ad84270e411e4fb34f commit: f97ac1fff7ef25c941663425bb615db7b4dc7752 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Jun 16 07:38:08 2021 +0000 Commit: Georgy Yakovlev gentoo 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 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