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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A850E138350 for ; Thu, 23 Apr 2020 20:44:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7B2AE0C58; Thu, 23 Apr 2020 20:44:32 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C51BEE0C58 for ; Thu, 23 Apr 2020 20:44:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E17CE34EF83 for ; Thu, 23 Apr 2020 20:44:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DD221F1 for ; Thu, 23 Apr 2020 20:44:30 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1587674662.f5a546c1e2816063003703969cd32de7513fae88.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-cluster/ceph/ceph-14.2.9-r1.ebuild X-VCS-Directories: sys-cluster/ceph/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: f5a546c1e2816063003703969cd32de7513fae88 X-VCS-Branch: master Date: Thu, 23 Apr 2020 20:44:30 +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: 464fc696-b836-4360-87af-744c679b781a X-Archives-Hash: a8374ce9f5e6e08620511edbec5af5e0 commit: f5a546c1e2816063003703969cd32de7513fae88 Author: Patrick McLean sony com> AuthorDate: Thu Apr 23 20:41:00 2020 +0000 Commit: Patrick McLean gentoo org> CommitDate: Thu Apr 23 20:44:22 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5a546c1 sys-cluster/ceph-14.2.9-r1: Remove patch to change boost sonames Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Patrick McLean gentoo.org> sys-cluster/ceph/ceph-14.2.9-r1.ebuild | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys-cluster/ceph/ceph-14.2.9-r1.ebuild b/sys-cluster/ceph/ceph-14.2.9-r1.ebuild index fc084cb8497..795abd75b7c 100644 --- a/sys-cluster/ceph/ceph-14.2.9-r1.ebuild +++ b/sys-cluster/ceph/ceph-14.2.9-r1.ebuild @@ -163,7 +163,7 @@ PATCHES=( "${FILESDIR}/ceph-14.2.5-no-virtualenvs.patch" "${FILESDIR}/ceph-13.2.2-dont-install-sysvinit-script.patch" "${FILESDIR}/ceph-14.2.0-dpdk-cflags.patch" - "${FILESDIR}/ceph-14.2.0-link-crc32-Wstatically.patch" + "${FILESDIR}/ceph-14.2.0-link-crc32-statically.patch" "${FILESDIR}/ceph-14.2.0-cython-0.29.patch" "${FILESDIR}/ceph-14.2.3-dpdk-compile-fix-1.patch" "${FILESDIR}/ceph-14.2.4-python-executable.patch" @@ -197,12 +197,10 @@ src_prepare() { cmake-utils_src_prepare if use system-boost; then - eapply "${FILESDIR}/ceph-14.2.8-boost-sonames.patch" - find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \ | xargs --null sed \ - -e 's|Boost::|Boost_|g' \ - -e 's|Boost_boost|boost_system|g' -i || die + -e 's|Boost::|boost_|g' \ + -e 's|boost_boost|boost_system|g' -i || die fi sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \