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 54CC9158451 for ; Wed, 10 Jan 2024 07:06:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79278E2A5B; Wed, 10 Jan 2024 07:06:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 173F2E2A5B for ; Wed, 10 Jan 2024 07:06:12 +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 E93DD3432BC for ; Wed, 10 Jan 2024 07:06:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3124C13A0 for ; Wed, 10 Jan 2024 07:06:10 +0000 (UTC) From: "YiFei Zhu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "YiFei Zhu" Message-ID: <1704870134.188bd73acc1da7ee73ee8d4f677347f301449d21.zhuyifei1999@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-fs/dwarfs-bin/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-fs/dwarfs-bin/dwarfs-bin-0.7.4-r1.ebuild sys-fs/dwarfs-bin/dwarfs-bin-0.7.4.ebuild X-VCS-Directories: sys-fs/dwarfs-bin/ X-VCS-Committer: zhuyifei1999 X-VCS-Committer-Name: YiFei Zhu X-VCS-Revision: 188bd73acc1da7ee73ee8d4f677347f301449d21 X-VCS-Branch: dev Date: Wed, 10 Jan 2024 07:06:10 +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: 533d33df-e3cc-401c-b840-faa5fb23588f X-Archives-Hash: dd3223798d56b4af87349e5bbaa3c5bd commit: 188bd73acc1da7ee73ee8d4f677347f301449d21 Author: YiFei Zhu gmail com> AuthorDate: Wed Jan 10 07:02:14 2024 +0000 Commit: YiFei Zhu gmail com> CommitDate: Wed Jan 10 07:02:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=188bd73a sys-fs/dwarfs-bin: Install into /opt instead of /usr We don't install binary packages into /usr Signed-off-by: YiFei Zhu gmail.com> ...bin-0.7.4.ebuild => dwarfs-bin-0.7.4-r1.ebuild} | 26 ++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/sys-fs/dwarfs-bin/dwarfs-bin-0.7.4.ebuild b/sys-fs/dwarfs-bin/dwarfs-bin-0.7.4-r1.ebuild similarity index 69% rename from sys-fs/dwarfs-bin/dwarfs-bin-0.7.4.ebuild rename to sys-fs/dwarfs-bin/dwarfs-bin-0.7.4-r1.ebuild index 51a3a351ed..704323a0b3 100644 --- a/sys-fs/dwarfs-bin/dwarfs-bin-0.7.4.ebuild +++ b/sys-fs/dwarfs-bin/dwarfs-bin-0.7.4-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Static version of a fast very high compression read-only FUSE file system" HOMEPAGE="https://github.com/mhx/dwarfs" @@ -17,14 +17,13 @@ KEYWORDS="-* ~amd64 ~arm64" RDEPEND=" ${PYTHON_DEPS} sys-fs/fuse:3 - !sys-fs/dwarfs " DEPEND=" ${RDEPEND} " QA_PREBUILT=" - sbin/dwarfs - bin/* + opt/dwarfs-bin/bin/* + opt/dwarfs-bin/sbin/* " src_unpack() { @@ -41,14 +40,23 @@ src_prepare() { default einfo "Removing legacy fuse2-related stuff..." rm sbin/dwarfs2 sbin/mount.dwarfs2 || die - einfo "Done. Correcting man paths..." - mkdir -p usr/ || die - mv share/ usr/ || die einfo "Done." } src_install(){ - mv "${S}"/* "${D}"/ || die + mkdir -p "${ED}/opt/${PN}" || die + mv "${S}"/* "${ED}/opt/${PN}" || die + + for file in "${ED}/opt/${PN}/bin"/*; do + dosym "../${PN}/bin/$(basename "${file}")" "/opt/bin/$(basename "${file}")" + done + for file in "${ED}/opt/${PN}/sbin"/*; do + dosym "../${PN}/sbin/$(basename "${file}")" "/opt/sbin/$(basename "${file}")" + done + + newenvd - "90${P}" <<-_EOF_ + MANPATH="${EPREFIX}/opt/${PN}/share/man" + _EOF_ } pkg_postinst(){