commit: 96ac67d842731b333cc310fcbb18e5b55b82e6ee Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Tue Mar 5 10:44:33 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> 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 <fordfrog <AT> 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() {
