Diff minizip-ng-3.0.10 with a minizip-ng-4.0.0-r1

/usr/portage/sys-libs/minizip-ng/minizip-ng-4.0.0-r1.ebuild 2023-10-09 14:52:35.560368503 +0300
6 6
# Worth keeping an eye on 'develop' branch upstream for possible backports,
7 7
# as they copied this practice from sys-libs/zlib upstream.
8 8

  
9
inherit cmake
9
inherit cmake-multilib
10 10

  
11 11
DESCRIPTION="Fork of the popular zip manipulation library found in the zlib distribution"
12 12
HOMEPAGE="https://github.com/zlib-ng/minizip-ng"
13 13
SRC_URI="https://github.com/zlib-ng/minizip-ng/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
14 14

  
15 15
LICENSE="ZLIB"
16
SLOT="0"
16
SLOT="0/4"
17 17
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
18
# TODO: Needs SONAME fixing for compat
19
# https://github.com/zlib-ng/minizip-ng/issues/358#issuecomment-1593970564
18 20
IUSE="compat openssl test zstd"
19 21
RESTRICT="!test? ( test )"
20 22

  
21 23
# Automagically prefers sys-libs/zlib-ng if installed, so let's
22 24
# just depend on it as presumably it's better tested anyway.
23 25
RDEPEND="
24
	app-arch/bzip2
26
	app-arch/bzip2[${MULTILIB_USEDEP}]
25 27
	app-arch/xz-utils
26
	sys-libs/zlib-ng
28
	sys-libs/zlib-ng[${MULTILIB_USEDEP}]
27 29
	virtual/libiconv
28 30
	compat? ( !sys-libs/zlib[minizip] )
29
	openssl? ( dev-libs/openssl:= )
30
	zstd? ( app-arch/zstd:= )
31
	openssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
32
	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
31 33
"
32 34
DEPEND="
33 35
	${RDEPEND}
34 36
	test? ( dev-cpp/gtest )
35 37
"
36 38

  
37
src_configure() {
39
multilib_src_configure() {
38 40
	local mycmakeargs=(
39 41
		-DMZ_COMPAT=$(usex compat)
40 42

  
......
56 58
		-DMZ_WZAES=ON
57 59
		-DMZ_OPENSSL=$(usex openssl)
58 60
		-DMZ_LIBBSD=ON
59
		-DMZ_SIGNING=ON
60 61

  
61 62
		# Character conversion options
62 63
		-DMZ_ICONV=ON
......
65 66
	cmake_src_configure
66 67
}
67 68

  
68
src_test() {
69
multilib_src_test() {
69 70
	local myctestargs=(
70 71
		# TODO: investigate
71 72
		-E "(raw-unzip-pkcrypt|raw-append-unzip-pkcrypt|raw-erase-unzip-pkcrypt|deflate-unzip-pkcrypt|deflate-append-unzip-pkcrypt|deflate-erase-unzip-pkcrypt|bzip2-unzip-pkcrypt|bzip2-append-unzip-pkcrypt|bzip2-erase-unzip-pkcrypt|lzma-unzip-pkcrypt|lzma-append-unzip-pkcrypt|lzma-erase-unzip-pkcrypt|xz-unzip-pkcrypt|xz-append-unzip-pkcrypt|xz-erase-unzip-pkcrypt|zstd-unzip-pkcrypt|zstd-append-unzip-pkcrypt|zstd-erase-unzip-pkcrypt)"
......
77 78
	cmake_src_test -j1
78 79
}
79 80

  
80
src_install() {
81
	cmake_src_install
82

  
83
	if use test ; then
81
multilib_src_install_all() {
82
	if ! use compat && use test ; then
84 83
		# Test binaries, bug #874591
85 84
		rm "${ED}"/usr/bin/minigzip || die
86 85
		rm "${ED}"/usr/bin/minizip-ng || die
87 86
	fi
87
}
88 88

  
89
pkg_postinst() {
89 90
	if use compat ; then
90 91
		ewarn "minizip-ng is experimental and replacing the system zlib[minizip] is dangerous"
91 92
		ewarn "Please be careful!"
Thank you!