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 8F8C215800F for ; Wed, 18 Jan 2023 10:53:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8029E07FE; Wed, 18 Jan 2023 10:53:22 +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 BFA3FE07FE for ; Wed, 18 Jan 2023 10:53:22 +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 E2905340997 for ; Wed, 18 Jan 2023 10:53:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53F4C828 for ; Wed, 18 Jan 2023 10:53:20 +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: <1674039076.8bb7c3cb5b60dcca9fff040680023bcb5fb0ad15.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-r1.ebuild 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: 8bb7c3cb5b60dcca9fff040680023bcb5fb0ad15 X-VCS-Branch: master Date: Wed, 18 Jan 2023 10:53:20 +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: 63b3ca0b-f8cc-4036-a832-fbb1dae6126c X-Archives-Hash: aeefe60830de5199886b272bd37db561 commit: 8bb7c3cb5b60dcca9fff040680023bcb5fb0ad15 Author: Marc Schiffbauer gentoo org> AuthorDate: Wed Jan 18 10:49:46 2023 +0000 Commit: Marc Schiffbauer gentoo org> CommitDate: Wed Jan 18 10:51:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bb7c3cb app-backup/bareos: revbump This revbump eliminates duplicate binaries and replaces them by symlinks Signed-off-by: Marc Schiffbauer gentoo.org> .../bareos/{bareos-21.1.5-r1.ebuild => bareos-21.1.5-r2.ebuild} | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app-backup/bareos/bareos-21.1.5-r1.ebuild b/app-backup/bareos/bareos-21.1.5-r2.ebuild similarity index 97% rename from app-backup/bareos/bareos-21.1.5-r1.ebuild rename to app-backup/bareos/bareos-21.1.5-r2.ebuild index 4a4080f3ed10..a1086b270d5f 100644 --- a/app-backup/bareos/bareos-21.1.5-r1.ebuild +++ b/app-backup/bareos/bareos-21.1.5-r2.ebuild @@ -234,6 +234,13 @@ src_install() { rm -f "${D}"/etc/bareos/bareos-regress.conf rm -f "${D}"/etc/logrotate.d/bareos-dir + # 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 + # get rid of py2 stuff rm -rf "$D"/usr/lib64/python2.7 || die rm -f "$D"/usr/lib64/bareos/plugin/python-fd.so || die