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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 93E6215800F for ; Sun, 22 Jan 2023 18:00:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D762EE07A5; Sun, 22 Jan 2023 18:00:14 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BE912E07A5 for ; Sun, 22 Jan 2023 18:00:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00682340D43 for ; Sun, 22 Jan 2023 18:00:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 59D834C8 for ; Sun, 22 Jan 2023 18:00:11 +0000 (UTC) From: "Marc Schiffbauer" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marc Schiffbauer" Message-ID: <1674410398.c2ec3031fb80299c547af6025b0993a3c1673d62.mschiff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-backup/bareos/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-backup/bareos/bareos-21.1.5-r2.ebuild X-VCS-Directories: app-backup/bareos/ X-VCS-Committer: mschiff X-VCS-Committer-Name: Marc Schiffbauer X-VCS-Revision: c2ec3031fb80299c547af6025b0993a3c1673d62 X-VCS-Branch: master Date: Sun, 22 Jan 2023 18:00:11 +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: 1b91ba1c-fa82-4921-9d7e-bfa5825b13cf X-Archives-Hash: d96d62d7f3eaa161e641ea7f56acac87 commit: c2ec3031fb80299c547af6025b0993a3c1673d62 Author: Marc Schiffbauer gentoo org> AuthorDate: Sun Jan 22 17:59:18 2023 +0000 Commit: Marc Schiffbauer gentoo org> CommitDate: Sun Jan 22 17:59:58 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ec3031 app-backup/bareos: fix install for IUSE=merged-usr Signed-off-by: Marc Schiffbauer gentoo.org> app-backup/bareos/bareos-21.1.5-r2.ebuild | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app-backup/bareos/bareos-21.1.5-r2.ebuild b/app-backup/bareos/bareos-21.1.5-r2.ebuild index a1086b270d5f..787f2a50e2f4 100644 --- a/app-backup/bareos/bareos-21.1.5-r2.ebuild +++ b/app-backup/bareos/bareos-21.1.5-r2.ebuild @@ -24,7 +24,7 @@ LICENSE="AGPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="X acl ceph clientonly +director glusterfs ipv6 lmdb - logwatch ndmp readline scsi-crypto + logwatch ndmp readline scsi-crypto split-usr static +storage-daemon systemd tcpd test vim-syntax vmware xattr" # get cmake variables from core/cmake/BareosSetVariableDefaults.cmake @@ -236,10 +236,12 @@ src_install() { # remove duplicate binaries being installed in /usr/sbin and replace # them by symlinks to not break systems that still use split-usr - for f in bwild bregex bsmtp bconsole; do - rm -f "${D}/usr/sbin/$f" || die - ln -s "../bin/$f" "${D}/usr/sbin/$f" || die - done + if use split-usr; then + for f in bwild bregex bsmtp bconsole; do + rm -f "${D}/usr/sbin/$f" || die + ln -s "../bin/$f" "${D}/usr/sbin/$f" || die + done + fi # get rid of py2 stuff rm -rf "$D"/usr/lib64/python2.7 || die