From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1348505-garchives=archives.gentoo.org@lists.gentoo.org>
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 4E4CA158086
for <garchives@archives.gentoo.org>; Sun, 12 Dec 2021 09:47:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5A45FE0830;
Sun, 12 Dec 2021 09:47:20 +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 0A7ACE0824
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Dec 2021 09:47:15 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 5E0FE342E26
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Dec 2021 09:47:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 140A81D5
for <gentoo-commits@lists.gentoo.org>; Sun, 12 Dec 2021 09:47:11 +0000 (UTC)
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" <flow@gentoo.org>
Message-ID: <1639302389.4ab2af9616336aa40b8c824916e85f75d150f5d2.flow@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.18-r1.ebuild net-analyzer/zabbix/zabbix-5.0.18.ebuild net-analyzer/zabbix/zabbix-5.4.8-r1.ebuild net-analyzer/zabbix/zabbix-5.4.8.ebuild
X-VCS-Directories: net-analyzer/zabbix/
X-VCS-Committer: flow
X-VCS-Committer-Name: Florian Schmaus
X-VCS-Revision: 4ab2af9616336aa40b8c824916e85f75d150f5d2
X-VCS-Branch: master
Date: Sun, 12 Dec 2021 09:47:11 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 54155d2d-a884-4b4c-a76f-d1cd62d300c7
X-Archives-Hash: 0f18305cbfa5dd97912eb54b7897389c
commit: 4ab2af9616336aa40b8c824916e85f75d150f5d2
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 12 09:24:37 2021 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Dec 12 09:46:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab2af96
net-analyzer/zabbix: use GO_OPTIONAL from go-module eclass
This makes dev-lang/go an optional dependency.
Closes: https://bugs.gentoo.org/775779
Closes: https://github.com/gentoo/gentoo/pull/23261
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
.../zabbix/{zabbix-5.0.18.ebuild => zabbix-5.0.18-r1.ebuild} | 12 ++++++++++++
.../zabbix/{zabbix-5.4.8.ebuild => zabbix-5.4.8-r1.ebuild} | 12 ++++++++++++
2 files changed, 24 insertions(+)
diff --git a/net-analyzer/zabbix/zabbix-5.0.18.ebuild b/net-analyzer/zabbix/zabbix-5.0.18-r1.ebuild
similarity index 99%
rename from net-analyzer/zabbix/zabbix-5.0.18.ebuild
rename to net-analyzer/zabbix/zabbix-5.0.18-r1.ebuild
index 0e9da3be9ad9..de4e218a3299 100644
--- a/net-analyzer/zabbix/zabbix-5.0.18.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.0.18-r1.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+GO_OPTIONAL="yes"
# needed to make webapp-config dep optional
WEBAPP_OPTIONAL="yes"
inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
@@ -312,6 +313,10 @@ DEPEND="${COMMON_DEPEND}
"
BDEPEND="
virtual/pkgconfig
+ agent2? (
+ >=dev-lang/go-1.12
+ app-arch/unzip
+ )
"
# upstream tests fail for agent2
@@ -351,6 +356,13 @@ pkg_setup() {
java-pkg-opt-2_pkg_setup
}
+src_unpack() {
+ default
+ if use agent2; then
+ go-module_src_unpack
+ fi
+}
+
src_prepare() {
default
}
diff --git a/net-analyzer/zabbix/zabbix-5.4.8.ebuild b/net-analyzer/zabbix/zabbix-5.4.8-r1.ebuild
similarity index 99%
rename from net-analyzer/zabbix/zabbix-5.4.8.ebuild
rename to net-analyzer/zabbix/zabbix-5.4.8-r1.ebuild
index 6a0d5e421042..6a6c91266493 100644
--- a/net-analyzer/zabbix/zabbix-5.4.8.ebuild
+++ b/net-analyzer/zabbix/zabbix-5.4.8-r1.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+GO_OPTIONAL="yes"
# needed to make webapp-config dep optional
WEBAPP_OPTIONAL="yes"
inherit webapp java-pkg-opt-2 systemd tmpfiles toolchain-funcs go-module user-info
@@ -337,6 +338,10 @@ DEPEND="${COMMON_DEPEND}
"
BDEPEND="
virtual/pkgconfig
+ agent2? (
+ >=dev-lang/go-1.12
+ app-arch/unzip
+ )
"
# upstream tests fail for agent2
@@ -376,6 +381,13 @@ pkg_setup() {
java-pkg-opt-2_pkg_setup
}
+src_unpack() {
+ default
+ if use agent2; then
+ go-module_src_unpack
+ fi
+}
+
src_prepare() {
default
}