From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 finch.gentoo.org (Postfix) with ESMTPS id 130771584AD for ; Tue, 29 Apr 2025 19:45:26 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id CC5BF33BE26 for ; Tue, 29 Apr 2025 19:45:25 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 1F74B11036B; Tue, 29 Apr 2025 19:45:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 bobolink.gentoo.org (Postfix) with ESMTPS id 1571B11036B for ; Tue, 29 Apr 2025 19:45: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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1076341B52 for ; Tue, 29 Apr 2025 19:45:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4A3B61BAD for ; Tue, 29 Apr 2025 19:45:20 +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: <1745955839.6781dee7f8db901895c470343cf4a0e443ede35a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-arch/rpm/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-arch/rpm/rpm-4.20.1-r1.ebuild app-arch/rpm/rpm-4.20.1.ebuild X-VCS-Directories: app-arch/rpm/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6781dee7f8db901895c470343cf4a0e443ede35a X-VCS-Branch: master Date: Tue, 29 Apr 2025 19:45: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: de82f833-f91b-49ac-9475-4474065a121f X-Archives-Hash: cc79c4956751dd8e02076b2d1f3c19f1 commit: 6781dee7f8db901895c470343cf4a0e443ede35a Author: Takuya Wakazono gmail com> AuthorDate: Sat Apr 26 15:45:12 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 29 19:43:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6781dee7 app-arch/rpm: fix infodir and mandir macros By default, infodir and mandir macros are set to `\${prefix}/${CMAKE_INSTALL_*DIR}`, assuming ${CMAKE_INSTALL_*DIR} are relative paths, but cmake.eclass sets them to absolute paths including prefix. Closes: https://bugs.gentoo.org/954379 Signed-off-by: Takuya Wakazono gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/41772 Closes: https://github.com/gentoo/gentoo/pull/41772 Signed-off-by: Sam James gentoo.org> app-arch/rpm/{rpm-4.20.1.ebuild => rpm-4.20.1-r1.ebuild} | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app-arch/rpm/rpm-4.20.1.ebuild b/app-arch/rpm/rpm-4.20.1-r1.ebuild similarity index 95% rename from app-arch/rpm/rpm-4.20.1.ebuild rename to app-arch/rpm/rpm-4.20.1-r1.ebuild index 9057d8a97182..c065f1a934ec 100644 --- a/app-arch/rpm/rpm-4.20.1.ebuild +++ b/app-arch/rpm/rpm-4.20.1-r1.ebuild @@ -105,6 +105,10 @@ src_configure() { -DWITH_ZSTD=$(usex zstd) -DWITH_LIBLZMA=$(usex lzma) -DWITH_DOXYGEN=$(usex doc) + # Upstream expects these paths to be relative, but cmake.eclass + # sets them as absolute paths. bug #954379 + -DCMAKE_INSTALL_INFODIR=share/info + -DCMAKE_INSTALL_MANDIR=share/man ) # special handling for ASAN