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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 20655158041 for ; Tue, 5 Mar 2024 10:45:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 512AFE29C2; Tue, 5 Mar 2024 10:45:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2AA80E29C2 for ; Tue, 5 Mar 2024 10:45:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2D86033FE49 for ; Tue, 5 Mar 2024 10:45:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8E3AF119 for ; Tue, 5 Mar 2024 10:45:02 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1709635473.96ac67d842731b333cc310fcbb18e5b55b82e6ee.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/zabbix/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/zabbix/zabbix-5.0.41.ebuild net-analyzer/zabbix/zabbix-6.0.26.ebuild net-analyzer/zabbix/zabbix-6.0.27.ebuild net-analyzer/zabbix/zabbix-6.4.12.ebuild X-VCS-Directories: net-analyzer/zabbix/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 96ac67d842731b333cc310fcbb18e5b55b82e6ee X-VCS-Branch: master Date: Tue, 5 Mar 2024 10:45:02 +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: bb59467d-cc54-4435-aa4c-d5396e245eb3 X-Archives-Hash: 4c85c8cada9520536067d9593f747b45 commit: 96ac67d842731b333cc310fcbb18e5b55b82e6ee Author: Miroslav Šulc gentoo org> AuthorDate: Tue Mar 5 10:44:33 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Tue Mar 5 10:44:33 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ac67d8 net-analyzer/zabbix: fixed ordering of variables Signed-off-by: Miroslav Šulc gentoo.org> net-analyzer/zabbix/zabbix-5.0.41.ebuild | 4 ++-- net-analyzer/zabbix/zabbix-6.0.26.ebuild | 4 ++-- net-analyzer/zabbix/zabbix-6.0.27.ebuild | 4 ++-- net-analyzer/zabbix/zabbix-6.4.12.ebuild | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net-analyzer/zabbix/zabbix-5.0.41.ebuild b/net-analyzer/zabbix/zabbix-5.0.41.ebuild index 4922de26cbb4..ff7c470a27bf 100644 --- a/net-analyzer/zabbix/zabbix-5.0.41.ebuild +++ b/net-analyzer/zabbix/zabbix-5.0.41.ebuild @@ -21,6 +21,8 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) " +S=${WORKDIR}/${MY_P} + LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" WEBAPP_MANUAL_SLOT="yes" @@ -122,8 +124,6 @@ PATCHES=( "${FILESDIR}/${PN}-5.0.22-system.sw.packages.patch" ) -S=${WORKDIR}/${MY_P} - ZABBIXJAVA_BASE="opt/zabbix_java" pkg_setup() { diff --git a/net-analyzer/zabbix/zabbix-6.0.26.ebuild b/net-analyzer/zabbix/zabbix-6.0.26.ebuild index de9271b01335..e79c51a185e1 100644 --- a/net-analyzer/zabbix/zabbix-6.0.26.ebuild +++ b/net-analyzer/zabbix/zabbix-6.0.26.ebuild @@ -21,6 +21,8 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) " +S=${WORKDIR}/${MY_P} + LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" WEBAPP_MANUAL_SLOT="yes" @@ -122,8 +124,6 @@ PATCHES=( "${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch" ) -S=${WORKDIR}/${MY_P} - ZABBIXJAVA_BASE="opt/zabbix_java" pkg_setup() { diff --git a/net-analyzer/zabbix/zabbix-6.0.27.ebuild b/net-analyzer/zabbix/zabbix-6.0.27.ebuild index 1d7887fa3842..186f30cc734e 100644 --- a/net-analyzer/zabbix/zabbix-6.0.27.ebuild +++ b/net-analyzer/zabbix/zabbix-6.0.27.ebuild @@ -21,6 +21,8 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) " +S=${WORKDIR}/${MY_P} + LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" WEBAPP_MANUAL_SLOT="yes" @@ -122,8 +124,6 @@ PATCHES=( "${FILESDIR}/${PN}-6.0.3-system.sw.packages.patch" ) -S=${WORKDIR}/${MY_P} - ZABBIXJAVA_BASE="opt/zabbix_java" pkg_setup() { diff --git a/net-analyzer/zabbix/zabbix-6.4.12.ebuild b/net-analyzer/zabbix/zabbix-6.4.12.ebuild index 1134c7d2321f..2fc51b6f2e74 100644 --- a/net-analyzer/zabbix/zabbix-6.4.12.ebuild +++ b/net-analyzer/zabbix/zabbix-6.4.12.ebuild @@ -21,6 +21,8 @@ SRC_URI="https://cdn.zabbix.com/${PN}/sources/stable/$(ver_cut 1-2)/${P}.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/${P}-go-deps.tar.xz ) " +S=${WORKDIR}/${MY_P} + LICENSE="GPL-2" SLOT="0/$(ver_cut 1-2)" WEBAPP_MANUAL_SLOT="yes" @@ -123,8 +125,6 @@ PATCHES=( "${FILESDIR}/${PN}-6.4.6-clang16-build-fix.patch" ) -S=${WORKDIR}/${MY_P} - ZABBIXJAVA_BASE="opt/zabbix_java" pkg_setup() {