Diff zabbix-5.0.38 with a zabbix-6.0.19

/usr/portage/net-analyzer/zabbix/zabbix-6.0.19.ebuild 2023-10-09 14:52:33.348368447 +0300
24 24
LICENSE="GPL-2"
25 25
SLOT="0/$(ver_cut 1-2)"
26 26
WEBAPP_MANUAL_SLOT="yes"
27
KEYWORDS="~amd64 ~x86"
28
IUSE="+agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
27
KEYWORDS="amd64 x86"
28
IUSE="agent +agent2 curl frontend gnutls ipv6 java ldap libxml2 mysql odbc openipmi +openssl oracle +postgres proxy selinux server snmp sqlite ssh static"
29 29
REQUIRED_USE="|| ( agent agent2 frontend proxy server )
30 30
	?? ( gnutls openssl )
31 31
	agent2? ( !gnutls )
......
68 68
	java? ( >=virtual/jre-1.8:* )
69 69
	mysql? ( virtual/mysql )
70 70
	proxy? (
71
		dev-libs/libpcre
71
		dev-libs/libpcre2:=
72 72
		net-analyzer/fping[suid]
73 73
	)
74 74
	selinux? ( sec-policy/selinux-zabbix )
75 75
	server? (
76 76
		app-admin/webapp-config
77
		dev-libs/libpcre
77
		dev-libs/libpcre2:=
78 78
		net-analyzer/fping[suid]
79 79
	)
80 80
	frontend? (
......
119 119
PATCHES=(
120 120
	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
121 121
	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.patch"
122
	"${FILESDIR}/${PN}-5.0.22-system.sw.packages.patch"
122
	"${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch"
123 123
)
124 124

  
125 125
S=${WORKDIR}/${MY_P}
......
150 150
}
151 151

  
152 152
src_configure() {
153
	econf \
154
		$(use_enable agent) \
155
		$(use_enable agent2) \
156
		$(use_enable ipv6) \
157
		$(use_enable java) \
158
		$(use_enable proxy) \
159
		$(use_enable server) \
160
		$(use_enable static) \
161
		$(use_with curl libcurl) \
162
		$(use_with gnutls) \
163
		$(use_with ldap) \
164
		$(use_with libxml2) \
165
		$(use_with mysql) \
166
		$(use_with odbc unixodbc) \
167
		$(use_with openipmi openipmi) \
168
		$(use_with openssl) \
169
		$(use_with oracle) \
170
		$(use_with postgres postgresql) \
171
		$(use_with snmp net-snmp) \
172
		$(use_with sqlite sqlite3) \
173
		$(use_with ssh ssh2)
153
	local econf_args=(
154
		--with-libpcre2
155
		"$(use_enable agent)"
156
		"$(use_enable agent2)"
157
		"$(use_enable ipv6)"
158
		"$(use_enable java)"
159
		"$(use_enable proxy)"
160
		"$(use_enable server)"
161
		"$(use_enable static)"
162
		"$(use_with curl libcurl)"
163
		"$(use_with gnutls)"
164
		"$(use_with ldap)"
165
		"$(use_with libxml2)"
166
		"$(use_with mysql)"
167
		"$(use_with odbc unixodbc)"
168
		"$(use_with openipmi openipmi)"
169
		"$(use_with openssl)"
170
		"$(use_with oracle)"
171
		"$(use_with postgres postgresql)"
172
		"$(use_with snmp net-snmp)"
173
		"$(use_with sqlite sqlite3)"
174
		"$(use_with ssh ssh2)"
175
	)
176

  
177
	econf ${econf_args[@]}
174 178
}
175 179

  
176 180
src_compile() {
......
191 195
	)
192 196

  
193 197
	for dir in "${dirs[@]}"; do
194
		dodir "${dir}"
195 198
		keepdir "${dir}"
196 199
	done
197 200

  
......
245 248
		systemd_dounit "${FILESDIR}"/zabbix-agentd.service
246 249
		newtmpfiles "${FILESDIR}"/zabbix-agentd.tmpfiles zabbix-agentd.conf
247 250
	fi
248

  
249 251
	if use agent2; then
250 252
		insinto /etc/zabbix
251 253
		doins "${S}"/src/go/conf/zabbix_agent2.conf
252 254
		fperms 0640 /etc/zabbix/zabbix_agent2.conf
253 255
		fowners root:zabbix /etc/zabbix/zabbix_agent2.conf
256
		keepdir /etc/zabbix/zabbix_agent2.d/plugins.d
254 257

  
255 258
		newinitd "${FILESDIR}"/zabbix-agent2.init zabbix-agent2
256 259

  
......
300 303
			/${ZABBIXJAVA_BASE}/lib
301 304
		keepdir /${ZABBIXJAVA_BASE}
302 305
		exeinto /${ZABBIXJAVA_BASE}/bin
303
		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
306
		doexe src/zabbix_java/bin/zabbix-java-gateway-"${MY_PV}".jar
304 307
		exeinto /${ZABBIXJAVA_BASE}/lib
305 308
		doexe \
306 309
			src/zabbix_java/lib/logback-classic-1.2.9.jar \
......
323 326

  
324 327
		zabbix_homedir=$(egethome zabbix)
325 328
		if [ -n "${zabbix_homedir}" ] && \
326
		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
329
			[ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
327 330
			ewarn
328 331
			ewarn "The user 'zabbix' should have his homedir changed"
329 332
			ewarn "to /var/lib/zabbix/home if you want to use"
Thank you!