Gentoo Archives: gentoo-commits

From: Patrick McLean <chutzpah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/ceph/
Date: Thu, 23 Apr 2020 20:44:33
Message-Id: 1587674661.477a392d50f0321453ae5fe7f564a8dbcdbff954.chutzpah@gentoo
1 commit: 477a392d50f0321453ae5fe7f564a8dbcdbff954
2 Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
3 AuthorDate: Thu Apr 23 20:04:52 2020 +0000
4 Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 23 20:44:21 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477a392d
7
8 sys-cluster/ceph-14.2.9: Drop boost-soname patch for sed
9
10 Copyright: Sony Interactive Entertainment Inc.
11 Package-Manager: Portage-2.3.99, Repoman-2.3.22
12 Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
13
14 sys-cluster/ceph/ceph-14.2.9.ebuild | 6 ++----
15 1 file changed, 2 insertions(+), 4 deletions(-)
16
17 diff --git a/sys-cluster/ceph/ceph-14.2.9.ebuild b/sys-cluster/ceph/ceph-14.2.9.ebuild
18 index 95abd364b0f..75b01167a71 100644
19 --- a/sys-cluster/ceph/ceph-14.2.9.ebuild
20 +++ b/sys-cluster/ceph/ceph-14.2.9.ebuild
21 @@ -197,12 +197,10 @@ src_prepare() {
22 cmake-utils_src_prepare
23
24 if use system-boost; then
25 - eapply "${FILESDIR}/ceph-14.2.8-boost-sonames.patch"
26 -
27 find "${S}" -name '*.cmake' -or -name 'CMakeLists.txt' -print0 \
28 | xargs --null sed \
29 - -e 's|Boost::|Boost_|g' \
30 - -e 's|Boost_boost|boost_system|g' -i || die
31 + -e 's|Boost::|boost_|g' \
32 + -e 's|boost_boost|boost_system|g' -i || die
33 fi
34
35 sed -i -r "s:DESTINATION .+\\):DESTINATION $(get_bashcompdir)\\):" \