| 1 |
commit: cb1320023c4b367677cb90fee9cfdfc5099e3bdc |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 12 18:10:15 2018 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 12 18:10:15 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb132002 |
| 7 |
|
| 8 |
net-analyzer/icinga2: more mysql/maria updates |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/665944 |
| 11 |
Package-Manager: Portage-2.3.48, Repoman-2.3.10 |
| 12 |
|
| 13 |
net-analyzer/icinga2/icinga2-9999.ebuild | 19 ++++++++++++------- |
| 14 |
net-analyzer/icinga2/metadata.xml | 1 + |
| 15 |
2 files changed, 13 insertions(+), 7 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild |
| 18 |
index 275130c94d6..c0f291e4ea2 100644 |
| 19 |
--- a/net-analyzer/icinga2/icinga2-9999.ebuild |
| 20 |
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild |
| 21 |
@@ -18,7 +18,7 @@ HOMEPAGE="http://icinga.org/icinga2" |
| 22 |
|
| 23 |
LICENSE="GPL-2" |
| 24 |
SLOT="0" |
| 25 |
-IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax" |
| 26 |
+IUSE="classicui console libressl lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" |
| 27 |
WX_GTK_VER="3.0" |
| 28 |
|
| 29 |
CDEPEND=" |
| 30 |
@@ -26,10 +26,8 @@ CDEPEND=" |
| 31 |
libressl? ( dev-libs/libressl:0= ) |
| 32 |
>=dev-libs/boost-1.58-r1 |
| 33 |
console? ( dev-libs/libedit ) |
| 34 |
- mysql? ( || ( |
| 35 |
- dev-db/mariadb-connector-c |
| 36 |
- dev-db/mysql-connector-c ) |
| 37 |
- ) |
| 38 |
+ mariadb? ( dev-db/mariadb-connector-c:= ) |
| 39 |
+ mysql? ( dev-db/mysql-connector-c:= ) |
| 40 |
postgres? ( dev-db/postgresql:= ) |
| 41 |
dev-libs/yajl" |
| 42 |
|
| 43 |
@@ -47,7 +45,7 @@ RDEPEND=" |
| 44 |
mail? ( virtual/mailx ) |
| 45 |
classicui? ( net-analyzer/icinga[web] )" |
| 46 |
|
| 47 |
-REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" |
| 48 |
+REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" |
| 49 |
|
| 50 |
want_apache2 |
| 51 |
|
| 52 |
@@ -118,7 +116,14 @@ src_install() { |
| 53 |
newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql |
| 54 |
docinto schema/upgrade |
| 55 |
dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* |
| 56 |
- elif use postgres ; then |
| 57 |
+ fi |
| 58 |
+ if use mariadb ; then # same as mysql |
| 59 |
+ docinto schema |
| 60 |
+ newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql |
| 61 |
+ docinto schema/upgrade |
| 62 |
+ dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/* |
| 63 |
+ fi |
| 64 |
+ if use postgres ; then |
| 65 |
docinto schema |
| 66 |
newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql |
| 67 |
docinto schema/upgrade |
| 68 |
|
| 69 |
diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml |
| 70 |
index b03390bc2e5..73dade68872 100644 |
| 71 |
--- a/net-analyzer/icinga2/metadata.xml |
| 72 |
+++ b/net-analyzer/icinga2/metadata.xml |
| 73 |
@@ -10,6 +10,7 @@ |
| 74 |
<flag name="console">Adds support for line-editing in the console</flag> |
| 75 |
<flag name="lto">Adds support for link time optimization</flag> |
| 76 |
<flag name="mail">Allows for mailing of alerts</flag> |
| 77 |
+ <flag name="mariadb">Enable support for the mariadb database backend</flag> |
| 78 |
<flag name="studio">Adds support for Icinga-studio</flag> |
| 79 |
<flag name="nano-syntax">Adds support for syntax used in the nano editor</flag> |
| 80 |
<flag name="plugins">Adds support for nagios plugins</flag> |
Archives