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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D759D1581C1 for ; Sat, 6 Jul 2024 09:29:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1FDCCE2BA4; Sat, 6 Jul 2024 09:29:20 +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 031FBE2BA4 for ; Sat, 6 Jul 2024 09:29:20 +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 1AEF0342FA4 for ; Sat, 6 Jul 2024 09:29:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7DB8E1DC6 for ; Sat, 6 Jul 2024 09:29:17 +0000 (UTC) From: "Thomas Beierlein" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Beierlein" Message-ID: <1720258133.1360918a6e371223a097eedddd082367dddcc430.tomjbe@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/thrift/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/thrift/thrift-0.20.0.ebuild X-VCS-Directories: dev-python/thrift/ X-VCS-Committer: tomjbe X-VCS-Committer-Name: Thomas Beierlein X-VCS-Revision: 1360918a6e371223a097eedddd082367dddcc430 X-VCS-Branch: master Date: Sat, 6 Jul 2024 09:29:17 +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: c7c9208d-0a8e-4ac7-8202-d277d1085763 X-Archives-Hash: eecc03fe3e90d18d7c91474635afbfb0 commit: 1360918a6e371223a097eedddd082367dddcc430 Author: Thomas Beierlein gentoo org> AuthorDate: Sat Jul 6 09:28:09 2024 +0000 Commit: Thomas Beierlein gentoo org> CommitDate: Sat Jul 6 09:28:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1360918a dev-python/thrift: Avoid file collision with dev-libs/thrift Closes: https://bugs.gentoo.org/933272 Signed-off-by: Thomas Beierlein gentoo.org> dev-python/thrift/thrift-0.20.0.ebuild | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dev-python/thrift/thrift-0.20.0.ebuild b/dev-python/thrift/thrift-0.20.0.ebuild index 7922b42cbef0..261fd69010bc 100644 --- a/dev-python/thrift/thrift-0.20.0.ebuild +++ b/dev-python/thrift/thrift-0.20.0.ebuild @@ -26,3 +26,10 @@ distutils_enable_tests unittest python_test() { eunittest test } + +src_install() { + distutils-r1_src_install + # avoid file collision with dev-libs/thrift (bug #933272) + mv "${D}"/usr/share/doc/${P}/README.md \ + "${D}"/usr/share/doc/${P}/ReadMe.md || die +}