Diff galera-26.4.14 with a galera-26.4.15

/usr/portage/sys-cluster/galera/galera-26.4.15.ebuild 2023-10-09 14:52:35.456368501 +0300
3 3

  
4 4
EAPI=8
5 5

  
6
PYTHON_COMPAT=( python3_{9..11} )
7

  
8
inherit python-any-r1 scons-utils toolchain-funcs
6
inherit cmake
9 7

  
10 8
MY_PN="${PN}-4"
11 9
MY_P="${MY_PN}-${PV}"
......
18 16
LICENSE="GPL-2 BSD"
19 17
SLOT="0"
20 18
KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
21
IUSE="cpu_flags_x86_sse4_2 garbd test"
22
RESTRICT="!test? ( test )"
19
IUSE="garbd ssl"
23 20

  
24 21
RDEPEND="
25
	dev-libs/openssl:=
22
	ssl? ( dev-libs/openssl:= )
26 23
	dev-libs/boost:=
27 24
"
25
# TODO: Make check dep optional
28 26
DEPEND="
29 27
	${RDEPEND}
30
	dev-libs/check
31 28
	>=dev-cpp/asio-1.22
29
	dev-libs/check
32 30
"
33 31

  
34
PATCHES=(
35
	"${FILESDIR}"/${PN}-26.4.6-strip-extra-cflags.patch
36
	"${FILESDIR}"/${PN}-26.4.8-respect-toolchain.patch
37
	"${FILESDIR}"/${PN}-26.4.13-asio.patch
38
	"${FILESDIR}"/${PN}-26.4.13-tests.patch
39
)
40

  
41 32
src_prepare() {
42
	default
33
	cmake_src_prepare
43 34

  
44 35
	# Remove bundled dev-cpp/asio
45 36
	rm -r asio || die "Failed to remove bundled asio"
......
47 38
	# Remove optional garbd daemon
48 39
	if ! use garbd ; then
49 40
		rm -r garb || die "Failed to remove garbd daemon"
41
		sed -i '/add_subdirectory(garb)/d' CMakeLists.txt || die
50 42
	fi
51 43
}
52 44

  
53 45
src_configure() {
54
	tc-export AR CC CXX OBJDUMP
55

  
56
	# strict_build_flags=0 disables -Werror, -pedantic, -Weffc++,
57
	# and -Wold-style-cast
58
	MYSCONS=(
59
		crc32c_no_hardware=$(usex cpu_flags_x86_sse4_2 0 1)
60
		tests=$(usex test 1 0)
61
		strict_build_flags=0
62
		system_asio=1
46
	local mycmakeargs=(
47
		-DGALERA_WITH_SSL=$(usex ssl)
63 48
	)
64
}
65 49

  
66
src_compile() {
67
	escons --warn=no-missing-sconscript "${MYSCONS[@]}"
50
	cmake_src_configure
68 51
}
69 52

  
70 53
src_install() {
71 54
	dodoc scripts/packages/README scripts/packages/README-MySQL
72 55

  
73 56
	if use garbd ; then
74
		dobin garb/garbd
75 57
		newconfd "${FILESDIR}"/garb.cnf garbd
76 58
		newinitd "${FILESDIR}"/garb.init garbd
77 59
		doman man/garbd.8
60

  
61
		pushd "${BUILD_DIR}" || die
62
		dobin garb/garbd
78 63
	fi
79 64

  
65
	pushd "${BUILD_DIR}" || die
80 66
	exeinto /usr/$(get_libdir)/galera
81 67
	doexe libgalera_smm.so
82 68
}
Thank you!