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 2C1BA158087 for ; Tue, 25 Jan 2022 22:16:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 015122BC01B; Tue, 25 Jan 2022 22:16:14 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 954182BC01B for ; Tue, 25 Jan 2022 22:16:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 A0034342CB2 for ; Tue, 25 Jan 2022 22:16:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5D4001F0 for ; Tue, 25 Jan 2022 22:16:11 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1643148959.6494db7558c59865210047862093f49e5cf06dc2.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-portage/metagen/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-portage/metagen/metagen-0.7.3.ebuild X-VCS-Directories: app-portage/metagen/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 6494db7558c59865210047862093f49e5cf06dc2 X-VCS-Branch: master Date: Tue, 25 Jan 2022 22:16:11 +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: 2fdc76cc-23b2-4cf6-87ae-b4e345b7bab5 X-Archives-Hash: 8e84186a7ac4674a017e0c54ef8a6c5d commit: 6494db7558c59865210047862093f49e5cf06dc2 Author: Sebastian Pipping gentoo org> AuthorDate: Tue Jan 25 22:13:08 2022 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Tue Jan 25 22:15:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6494db75 app-portage/metagen: Fix 0.7.3 install Closes: https://bugs.gentoo.org/832069 Signed-off-by: Sebastian Pipping gentoo.org> Package-Manager: Portage-3.0.30, Repoman-3.0.3 app-portage/metagen/metagen-0.7.3.ebuild | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app-portage/metagen/metagen-0.7.3.ebuild b/app-portage/metagen/metagen-0.7.3.ebuild index 27aa691fbac3..f369cca5158a 100644 --- a/app-portage/metagen/metagen-0.7.3.ebuild +++ b/app-portage/metagen/metagen-0.7.3.ebuild @@ -23,9 +23,11 @@ python_install_all() { distutils-r1_python_install_all doman docs/metagen.1 - # Bug 814545 - mv "${ED}"/usr/share/doc/${P}/* "${ED}"/usr/share/doc/${PF}/ || die - rmdir "${ED}"/usr/share/doc/${P}/ || die + # Bug 814545 and 832069 + if [[ ${PF} != ${P} ]]; then # to be robust across bumps + mv "${ED}"/usr/share/doc/${P}/* "${ED}"/usr/share/doc/${PF}/ || die + rmdir "${ED}"/usr/share/doc/${P}/ || die + fi } python_test() {