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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AC5DF138334 for ; Wed, 12 Sep 2018 18:10:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84929E0BFF; Wed, 12 Sep 2018 18:10:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4324BE0BFF for ; Wed, 12 Sep 2018 18:10:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B9C18335D14 for ; Wed, 12 Sep 2018 18:10:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0204A3D3 for ; Wed, 12 Sep 2018 18:10:41 +0000 (UTC) From: "Matt Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Thode" Message-ID: <1536775815.cb1320023c4b367677cb90fee9cfdfc5099e3bdc.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/icinga2/icinga2-9999.ebuild net-analyzer/icinga2/metadata.xml X-VCS-Directories: net-analyzer/icinga2/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: cb1320023c4b367677cb90fee9cfdfc5099e3bdc X-VCS-Branch: master Date: Wed, 12 Sep 2018 18:10:41 +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-Archives-Salt: 7aa966b0-3586-4bff-be05-3a189d9003be X-Archives-Hash: 976f9c1d17bfb1adfd04e7afcc0ec0e1 commit: cb1320023c4b367677cb90fee9cfdfc5099e3bdc Author: Matthew Thode gentoo org> AuthorDate: Wed Sep 12 18:10:15 2018 +0000 Commit: Matt Thode gentoo org> CommitDate: Wed Sep 12 18:10:15 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb132002 net-analyzer/icinga2: more mysql/maria updates Bug: https://bugs.gentoo.org/665944 Package-Manager: Portage-2.3.48, Repoman-2.3.10 net-analyzer/icinga2/icinga2-9999.ebuild | 19 ++++++++++++------- net-analyzer/icinga2/metadata.xml | 1 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild index 275130c94d6..c0f291e4ea2 100644 --- a/net-analyzer/icinga2/icinga2-9999.ebuild +++ b/net-analyzer/icinga2/icinga2-9999.ebuild @@ -18,7 +18,7 @@ HOMEPAGE="http://icinga.org/icinga2" LICENSE="GPL-2" SLOT="0" -IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax" +IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" WX_GTK_VER="3.0" CDEPEND=" @@ -26,10 +26,8 @@ CDEPEND=" libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) - mysql? ( || ( - dev-db/mariadb-connector-c - dev-db/mysql-connector-c ) - ) + mariadb? ( dev-db/mariadb-connector-c:= ) + mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl" @@ -47,7 +45,7 @@ RDEPEND=" mail? ( virtual/mailx ) classicui? ( net-analyzer/icinga[web] )" -REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" +REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" want_apache2 @@ -118,7 +116,14 @@ src_install() { newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql docinto schema/upgrade dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* - elif use postgres ; then + fi + if use mariadb ; then # same as mysql + docinto schema + newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql + docinto schema/upgrade + dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* + fi + if use postgres ; then docinto schema newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql docinto schema/upgrade diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml index b03390bc2e5..73dade68872 100644 --- a/net-analyzer/icinga2/metadata.xml +++ b/net-analyzer/icinga2/metadata.xml @@ -10,6 +10,7 @@ Adds support for line-editing in the console Adds support for link time optimization Allows for mailing of alerts + Enable support for the mariadb database backend Adds support for Icinga-studio Adds support for syntax used in the nano editor Adds support for nagios plugins