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 BB3B11581D3 for ; Sun, 2 Jun 2024 00:32:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 08AE1E2A9B; Sun, 2 Jun 2024 00:32:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5BCFE2A9B for ; Sun, 2 Jun 2024 00:32:10 +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 392F6343010 for ; Sun, 2 Jun 2024 00:32:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 73DC41C02 for ; Sun, 2 Jun 2024 00:32:08 +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: <1717288133.5d7c36cf37f85f10bb440da0eab736bb97e6f269.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/mergerfs/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/mergerfs/mergerfs-2.40.2.ebuild X-VCS-Directories: sys-fs/mergerfs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5d7c36cf37f85f10bb440da0eab736bb97e6f269 X-VCS-Branch: master Date: Sun, 2 Jun 2024 00:32:08 +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: f5b43c4b-b187-421f-b509-ac065b964ba6 X-Archives-Hash: b4cdbe66ad7e428bb49cc92d2c67ddb1 commit: 5d7c36cf37f85f10bb440da0eab736bb97e6f269 Author: Sam James gentoo org> AuthorDate: Sun Jun 2 00:28:53 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jun 2 00:28:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d7c36cf sys-fs/mergerfs: simplify & fix version setting * Use heredoc rather than two consecutive echos to the same file, simpler w/o escaping too * Fix path to update-version script, it moved directories * Style tweaks Signed-off-by: Sam James gentoo.org> sys-fs/mergerfs/mergerfs-2.40.2.ebuild | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys-fs/mergerfs/mergerfs-2.40.2.ebuild b/sys-fs/mergerfs/mergerfs-2.40.2.ebuild index 6946ee8428b0..12c52da625d1 100644 --- a/sys-fs/mergerfs/mergerfs-2.40.2.ebuild +++ b/sys-fs/mergerfs/mergerfs-2.40.2.ebuild @@ -18,21 +18,21 @@ IUSE="+xattr" DEPEND=" xattr? ( sys-apps/attr ) " - RDEPEND="${DEPEND}" - BDEPEND="sys-devel/gettext" src_prepare() { default - # Hand made build system at it's finest. - echo -e "#!/bin/sh\ntrue" >tools/update-version || die - echo "#pragma once" >src/version.hpp || die - echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die + # Hand made build system at its finest. + echo -e "#!/bin/sh\ntrue" > buildtools/update-version || die + cat <<-EOF > src/version.hpp || die + #pragma once + static const char MERGERFS_VERSION[] = "${PV}"; + EOF if ! use xattr; then - sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die + sed -i -e 's%USE_XATTR = 1%USE_XATTR = 0%g' Makefile || die fi }