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 43B7813835A for ; Wed, 17 Mar 2021 02:13:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8869FE0828; Wed, 17 Mar 2021 02:13:15 +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 71887E0828 for ; Wed, 17 Mar 2021 02:13:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6686F340E74 for ; Wed, 17 Mar 2021 02:13:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD4515B9 for ; Wed, 17 Mar 2021 02:13:12 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1615947185.de1f26b3bd4f5cee5c8fe7ed5e04046dfd8471f5.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/drbd-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/drbd-utils/drbd-utils-9.15.1-r1.ebuild sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild X-VCS-Directories: sys-cluster/drbd-utils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: de1f26b3bd4f5cee5c8fe7ed5e04046dfd8471f5 X-VCS-Branch: master Date: Wed, 17 Mar 2021 02:13:12 +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: 69e96215-6b76-42a5-99b1-1d2088142cee X-Archives-Hash: fa2b84a26b6bef528cf9f0641b4176e8 commit: de1f26b3bd4f5cee5c8fe7ed5e04046dfd8471f5 Author: Sam James gentoo org> AuthorDate: Wed Mar 17 02:09:46 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Mar 17 02:13:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de1f26b3 sys-cluster/drbd-utils: fix systemd unit libdir Closes: https://bugs.gentoo.org/698304 Signed-off-by: Sam James gentoo.org> .../{drbd-utils-9.15.1.ebuild => drbd-utils-9.15.1-r1.ebuild} | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild b/sys-cluster/drbd-utils/drbd-utils-9.15.1-r1.ebuild similarity index 97% rename from sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild rename to sys-cluster/drbd-utils/drbd-utils-9.15.1-r1.ebuild index adb7a23c4af..f8a1b38d22f 100644 --- a/sys-cluster/drbd-utils/drbd-utils-9.15.1.ebuild +++ b/sys-cluster/drbd-utils/drbd-utils-9.15.1-r1.ebuild @@ -34,12 +34,15 @@ src_prepare() { -i user/*/Makefile.in || die # respect multilib + # bug #698304 sed -i -e "s:/lib/:/$(get_libdir)/:g" \ Makefile.in scripts/{Makefile.in,global_common.conf,drbd.conf.example} || die sed -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \ -e "s:(DESTDIR)/lib:(DESTDIR)/$(get_libdir):" \ -i user/*/Makefile.in || die + sed -i -e "s/lib/$(get_libdir)/" scripts/drbd.service || die + # correct install paths (really correct this time) sed -i -e "s:\$(sysconfdir)/bash_completion.d:$(get_bashcompdir):" \ scripts/Makefile.in || die