[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga-web/

2018-01-19 Thread Matt Thode
commit: d8a26ce084d36877958191ab6bc46e78e32378df
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Jan 19 17:17:36 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Fri Jan 19 17:25:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8a26ce0

net-analyzer/icinga-web: drop old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-analyzer/icinga-web/Manifest |   1 -
 net-analyzer/icinga-web/icinga-web-1.14.0.ebuild | 205 ---
 net-analyzer/icinga-web/icinga-web-1.14.1.ebuild |   2 +-
 3 files changed, 1 insertion(+), 207 deletions(-)

diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index d0ad9ec787d..243329639dc 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,2 +1 @@
-DIST icinga-web-1.14.0.tar.gz 14523746 BLAKE2B 
cff22c031ecc8af73690ea69c692b530aebd3f35c7a148999aedd9b142a6c304a88ee62af28ac0f80c09174bde6c1af15131596ad2ae8a7c3238a247261adc60
 SHA512 
9e429ffaf84efb08e0ad009af2dd90179366d4de5720bc09574228d3a6dec967eddc04402f5fac220e7af14761afec4b9021f70255102829e21880591d702d3b
 DIST icinga-web-1.14.1.tar.gz 14524043 BLAKE2B 
0a3bdf9afc77b508dd3967e38050f6babfe01240f8cf8196158abe42818079b09a962513541298d0b0ac2b1497640d292cf1ef4feac24e302c0622f6ef0fafd8
 SHA512 
1ddb1fe128c2ceff20e232d61d84abebbe9578f2ef9bf0c408523c399ab6125dedc7d4e82981fff113aba8959a1ac02712032b4a36e5aa951850c084792a47bb

diff --git a/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild 
b/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
deleted file mode 100644
index 21595801558..000
--- a/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit depend.apache eutils user multilib
-
-DESCRIPTION="Icinga Web - new Web Interface"
-HOMEPAGE="http://www.icinga.org/;
-SRC_URI="https://github.com/icinga/${PN}/archive/v${PV}/${P}.tar.gz;
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="apache2 mysql pnp postgres"
-DEPEND="dev-php/phing
-   dev-db/libdbi-drivers[mysql?,postgres?]
-   || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 )
-   
dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
-   pnp? ( net-analyzer/pnp4nagios )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-   if use apache2 ; then
-   depend.apache_pkg_setup
-   fi
-   enewgroup icinga
-   enewgroup nagios
-   enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-   #removed checks for some php stuff since we have these things called 
use flags
-   sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' 
configure.ac
-   sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
-   autoreconf
-}
-
-src_configure() {
-   local myconf
-
-   myconf="--prefix=/usr/share/icinga/icinga-web
-   --bindir=/usr/sbin
-   --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-   --datarootdir=/usr/share/icinga/htdocs
-   --localstatedir=/var/lib/icinga
-   --sysconfdir=/etc/icinga
-   --libexecdir=/usr/$(get_libdir)/icinga/plugins
-   --with-bin-user=icinga
-   --with-bin-group=nagios
-   --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
-   --with-conf-dir=/etc/icinga-web
-   --with-log-dir=/var/log/icinga-web
-   --with-icinga-objects-dir=/etc/icinga/objects
-   --with-icinga-bin=/usr/sbin/icinga
-   --with-icinga-cfg=/etc/icinga/icinga.cfg"
-
-   if use apache2 ; then
-   myconf+=" --with-web-user=apache
-   --with-web-group=apache
-   --with-web-apache-path=${APACHE_MODULES_CONFDIR}"
-   else
-   myconf+=" --with-web-user=root
-   --with-web-group=root"
-   fi
-
-   if use postgres ; then
-   myconf+=" --with-db-type=pgsql
-   --with-db-port=5432
-   --with-api-subtype=pgsql
-   --with-api-port=5432"
-   fi
-
-   econf ${myconf}
-}
-
-src_install() {
-   dodoc README
-   rm -f README
-
-   emake -j1 DESTDIR="${D}" install
-
-   emake DESTDIR="${D}" install-javascript
-
-   if use apache2 ; then
-   dodir ${APACHE_MODULES_CONFDIR}
-   emake DESTDIR="${D}" install-apache-config
-   echo '' > 
"${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-   cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >> 
"${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-   rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm 
failed"
-   echo '' >> 
"${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-   fi
-
-   insinto /usr/share/icinga/icinga-web/contrib
-   doins -r etc/schema/*
-
-   if use apache2 ; then
-   sed 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga-web/

2017-12-20 Thread Matt Thode
commit: b032ab72ff9057e732a10a970572a170113d2f23
Author: Matthew Thode  gentoo  org>
AuthorDate: Wed Dec 20 23:42:26 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Wed Dec 20 23:42:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b032ab72

net-analyzer/icinga-web: 1.14.1 bup

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 net-analyzer/icinga-web/Manifest |   1 +
 net-analyzer/icinga-web/icinga-web-1.14.1.ebuild | 205 +++
 2 files changed, 206 insertions(+)

diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 7288c6e0f66..d0ad9ec787d 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1 +1,2 @@
 DIST icinga-web-1.14.0.tar.gz 14523746 BLAKE2B 
cff22c031ecc8af73690ea69c692b530aebd3f35c7a148999aedd9b142a6c304a88ee62af28ac0f80c09174bde6c1af15131596ad2ae8a7c3238a247261adc60
 SHA512 
9e429ffaf84efb08e0ad009af2dd90179366d4de5720bc09574228d3a6dec967eddc04402f5fac220e7af14761afec4b9021f70255102829e21880591d702d3b
+DIST icinga-web-1.14.1.tar.gz 14524043 BLAKE2B 
0a3bdf9afc77b508dd3967e38050f6babfe01240f8cf8196158abe42818079b09a962513541298d0b0ac2b1497640d292cf1ef4feac24e302c0622f6ef0fafd8
 SHA512 
1ddb1fe128c2ceff20e232d61d84abebbe9578f2ef9bf0c408523c399ab6125dedc7d4e82981fff113aba8959a1ac02712032b4a36e5aa951850c084792a47bb

diff --git a/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild 
b/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild
new file mode 100644
index 000..cac1bd8c81a
--- /dev/null
+++ b/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit depend.apache eutils user multilib
+
+DESCRIPTION="Icinga Web - new Web Interface"
+HOMEPAGE="http://www.icinga.org/;
+SRC_URI="https://github.com/icinga/${PN}/archive/v${PV}/${P}.tar.gz;
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="apache2 mysql pnp postgres"
+DEPEND="dev-php/phing
+   dev-db/libdbi-drivers[mysql?,postgres?]
+   || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 )
+   
dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
+   pnp? ( net-analyzer/pnp4nagios )"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+   if use apache2 ; then
+   depend.apache_pkg_setup
+   fi
+   enewgroup icinga
+   enewgroup nagios
+   enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+   #removed checks for some php stuff since we have these things called 
use flags
+   sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' 
configure.ac
+   sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
+   autoreconf
+}
+
+src_configure() {
+   local myconf
+
+   myconf="--prefix=/usr/share/icinga/icinga-web
+   --bindir=/usr/sbin
+   --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+   --datarootdir=/usr/share/icinga/htdocs
+   --localstatedir=/var/lib/icinga
+   --sysconfdir=/etc/icinga
+   --libexecdir=/usr/$(get_libdir)/icinga/plugins
+   --with-bin-user=icinga
+   --with-bin-group=nagios
+   --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
+   --with-conf-dir=/etc/icinga-web
+   --with-log-dir=/var/log/icinga-web
+   --with-icinga-objects-dir=/etc/icinga/objects
+   --with-icinga-bin=/usr/sbin/icinga
+   --with-icinga-cfg=/etc/icinga/icinga.cfg"
+
+   if use apache2 ; then
+   myconf+=" --with-web-user=apache
+   --with-web-group=apache
+   --with-web-apache-path=${APACHE_MODULES_CONFDIR}"
+   else
+   myconf+=" --with-web-user=root
+   --with-web-group=root"
+   fi
+
+   if use postgres ; then
+   myconf+=" --with-db-type=pgsql
+   --with-db-port=5432
+   --with-api-subtype=pgsql
+   --with-api-port=5432"
+   fi
+
+   econf ${myconf}
+}
+
+src_install() {
+   dodoc README
+   rm -f README
+
+   emake -j1 DESTDIR="${D}" install
+
+   emake DESTDIR="${D}" install-javascript
+
+   if use apache2 ; then
+   dodir ${APACHE_MODULES_CONFDIR}
+   emake DESTDIR="${D}" install-apache-config
+   echo '' > 
"${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+   cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >> 
"${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+   rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm 
failed"
+   echo '' >> 
"${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
+   fi
+
+   insinto /usr/share/icinga/icinga-web/contrib
+   doins -r etc/schema/*
+
+   if use apache2 ; then
+   sed -i 's/%%USER%%/apache/g'  etc/scheduler/icingaCron
+   else
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga-web/

2016-12-22 Thread Matt Thode
commit: 0240fc01e53aa2c0ec470fccceb828bc9d649b69
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Dec 23 03:14:27 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Fri Dec 23 03:18:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0240fc01

net-analyzer/icinga-web: bup for bug 603536

Package-Manager: portage-2.3.0

 net-analyzer/icinga-web/Manifest |   1 +
 net-analyzer/icinga-web/icinga-web-1.14.0.ebuild | 206 +++
 2 files changed, 207 insertions(+)

diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 3b690ec..9dab8e2 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,2 +1,3 @@
 DIST icinga-web-1.11.2.tar.gz 14133733 SHA256 
726ffb261d3cd5a864b689f96837ff9cc138e9c5d97c19a2c82b110a802eb772 SHA512 
ecfbc6534a87ae52b508b2ca663109bdc201fbfc143ce399fff0fdd4eec456524c5bb86afe0e29c58dc3dfeaccc959817e77af5b0257db6eced2f27592caf5b1
 WHIRLPOOL 
bb1ad4ae5d921a0454afd9e11780d469f89b5414f6edf13db8c1292e72c5da8a0dc66991d45fac36607ead57934331414017fcc716b8eac351a56c43b8780cf5
 DIST icinga-web-1.12.0.tar.gz 14517225 SHA256 
3e802ae0cbcabb9555908bf91b9c40d9c07eb80a8acc70f0c9cbd426e3feb675 SHA512 
07831c62479e2c83929bd86dc8d7e57558d8e3b3dac2952d64e5170dc508d836cfb2e7446019d2ec9bea03740fc1c55e5857d2fd88fe67ea2726375f77246898
 WHIRLPOOL 
85ca6ad8423b72dcf77de6243b29fc9c5fadb09f68b56ae57380637014deea60749ff7c942b43d4965ab23efb2d4d79b9cffb194ed6d21e5262373b856ae9b1a
+DIST icinga-web-1.14.0.tar.gz 14523746 SHA256 
ee57e53417d54ee65b4cabe6c18f15c57cf49750f9fb73691deb9f28b11a740e SHA512 
9e429ffaf84efb08e0ad009af2dd90179366d4de5720bc09574228d3a6dec967eddc04402f5fac220e7af14761afec4b9021f70255102829e21880591d702d3b
 WHIRLPOOL 
628a606e9c9e927258875dc3529e575ccd9c1da7e358bc5cf96b55068741380a36c89935217dc8b3319942c396f26f50dedb428226f9f99dfa003c7ad3809631

diff --git a/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild 
b/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
new file mode 100644
index ..334ba4a
--- /dev/null
+++ b/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit depend.apache eutils user multilib
+
+DESCRIPTION="Icinga Web - new Web Interface"
+HOMEPAGE="http://www.icinga.org/;
+SRC_URI="https://github.com/icinga/${PN}/archive/v${PV}/${P}.tar.gz;
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="apache2 mysql pnp postgres"
+DEPEND="dev-php/phing
+   dev-db/libdbi-drivers[mysql?,postgres?]
+   || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 )
+   
dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
+   pnp? ( net-analyzer/pnp4nagios )"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+   if use apache2 ; then
+   depend.apache_pkg_setup
+   fi
+   enewgroup icinga
+   enewgroup nagios
+   enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+   #removed checks for some php stuff since we have these things called 
use flags
+   sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' 
configure.ac
+   sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
+   autoreconf
+}
+
+src_configure() {
+   local myconf
+
+   myconf="--prefix=/usr/share/icinga/icinga-web
+   --bindir=/usr/sbin
+   --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+   --datarootdir=/usr/share/icinga/htdocs
+   --localstatedir=/var/lib/icinga
+   --sysconfdir=/etc/icinga
+   --libexecdir=/usr/$(get_libdir)/icinga/plugins
+   --with-bin-user=icinga
+   --with-bin-group=nagios
+   --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
+   --with-conf-dir=/etc/icinga-web
+   --with-log-dir=/var/log/icinga-web
+   --with-icinga-objects-dir=/etc/icinga/objects
+   --with-icinga-bin=/usr/sbin/icinga
+   --with-icinga-cfg=/etc/icinga/icinga.cfg"
+
+   if use apache2 ; then
+   myconf+=" --with-web-user=apache
+   --with-web-group=apache
+   --with-web-apache-path=${APACHE_MODULES_CONFDIR}"
+   else
+   myconf+=" --with-web-user=root
+   --with-web-group=root"
+   fi
+
+   if use postgres ; then
+   myconf+=" --with-db-type=pgsql
+   --with-db-port=5432
+   --with-api-subtype=pgsql
+   --with-api-port=5432"
+   fi
+
+   econf ${myconf}
+}
+
+src_install() {
+   dodoc README
+   rm -f README
+
+   emake -j1 DESTDIR="${D}" install
+
+   emake DESTDIR="${D}" install-javascript
+
+   if use apache2 ; then
+   dodir ${APACHE_MODULES_CONFDIR}
+   emake DESTDIR="${D}" install-apache-config
+   echo '' > 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga-web/

2016-12-22 Thread Matt Thode
commit: dceb729f0369d72f1d7820705fd12510b71446d2
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Dec 23 03:17:34 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Fri Dec 23 03:18:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dceb729f

net-analyzer/icinga-web: cleanup for bug 603536

Package-Manager: portage-2.3.0

 net-analyzer/icinga-web/Manifest |   2 -
 net-analyzer/icinga-web/icinga-web-1.11.2.ebuild | 206 ---
 net-analyzer/icinga-web/icinga-web-1.12.0.ebuild | 206 ---
 3 files changed, 414 deletions(-)

diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 9dab8e2..e21f13d 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,3 +1 @@
-DIST icinga-web-1.11.2.tar.gz 14133733 SHA256 
726ffb261d3cd5a864b689f96837ff9cc138e9c5d97c19a2c82b110a802eb772 SHA512 
ecfbc6534a87ae52b508b2ca663109bdc201fbfc143ce399fff0fdd4eec456524c5bb86afe0e29c58dc3dfeaccc959817e77af5b0257db6eced2f27592caf5b1
 WHIRLPOOL 
bb1ad4ae5d921a0454afd9e11780d469f89b5414f6edf13db8c1292e72c5da8a0dc66991d45fac36607ead57934331414017fcc716b8eac351a56c43b8780cf5
-DIST icinga-web-1.12.0.tar.gz 14517225 SHA256 
3e802ae0cbcabb9555908bf91b9c40d9c07eb80a8acc70f0c9cbd426e3feb675 SHA512 
07831c62479e2c83929bd86dc8d7e57558d8e3b3dac2952d64e5170dc508d836cfb2e7446019d2ec9bea03740fc1c55e5857d2fd88fe67ea2726375f77246898
 WHIRLPOOL 
85ca6ad8423b72dcf77de6243b29fc9c5fadb09f68b56ae57380637014deea60749ff7c942b43d4965ab23efb2d4d79b9cffb194ed6d21e5262373b856ae9b1a
 DIST icinga-web-1.14.0.tar.gz 14523746 SHA256 
ee57e53417d54ee65b4cabe6c18f15c57cf49750f9fb73691deb9f28b11a740e SHA512 
9e429ffaf84efb08e0ad009af2dd90179366d4de5720bc09574228d3a6dec967eddc04402f5fac220e7af14761afec4b9021f70255102829e21880591d702d3b
 WHIRLPOOL 
628a606e9c9e927258875dc3529e575ccd9c1da7e358bc5cf96b55068741380a36c89935217dc8b3319942c396f26f50dedb428226f9f99dfa003c7ad3809631

diff --git a/net-analyzer/icinga-web/icinga-web-1.11.2.ebuild 
b/net-analyzer/icinga-web/icinga-web-1.11.2.ebuild
deleted file mode 100644
index 4baca8d..
--- a/net-analyzer/icinga-web/icinga-web-1.11.2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit depend.apache eutils user multilib
-
-DESCRIPTION="Icinga Web - new Web Interface"
-HOMEPAGE="http://www.icinga.org/;
-SRC_URI="https://github.com/icinga/${PN}/releases/download/v${PV}/${P}.tar.gz;
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="apache2 mysql pnp postgres"
-DEPEND="dev-php/phing
-   dev-db/libdbi-drivers[mysql?,postgres?]
-   || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 )
-   
dev-lang/php[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
-   pnp? ( net-analyzer/pnp4nagios )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-   if use apache2 ; then
-   depend.apache_pkg_setup
-   fi
-   enewgroup icinga
-   enewgroup nagios
-   enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-   #removed checks for some php stuff since we have these things called 
use flags
-   sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' 
configure.ac
-   sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
-   autoreconf
-}
-
-src_configure() {
-   local myconf
-
-   myconf="--prefix=/usr/share/icinga/icinga-web
-   --bindir=/usr/sbin
-   --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-   --datarootdir=/usr/share/icinga/htdocs
-   --localstatedir=/var/lib/icinga
-   --sysconfdir=/etc/icinga
-   --libexecdir=/usr/$(get_libdir)/icinga/plugins
-   --with-bin-user=icinga
-   --with-bin-group=nagios
-   --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
-   --with-conf-dir=/etc/icinga-web
-   --with-log-dir=/var/log/icinga-web
-   --with-icinga-objects-dir=/etc/icinga/objects
-   --with-icinga-bin=/usr/sbin/icinga
-   --with-icinga-cfg=/etc/icinga/icinga.cfg"
-
-   if use apache2 ; then
-   myconf+=" --with-web-user=apache
-   --with-web-group=apache
-   --with-web-apache-path=${APACHE_MODULES_CONFDIR}"
-   else
-   myconf+=" --with-web-user=root
-   --with-web-group=root"
-   fi
-
-   if use postgres ; then
-   myconf+=" --with-db-type=pgsql
-   --with-db-port=5432
-   --with-api-subtype=pgsql
-   --with-api-port=5432"
-   fi
-
-   econf ${myconf}
-}
-
-src_install() {
-   dodoc README
-   rm -f README
-
-   emake -j1 DESTDIR="${D}" install
-
-   emake DESTDIR="${D}" install-javascript
-
-   if use apache2 ; then
-   dodir ${APACHE_MODULES_CONFDIR}
-   emake 

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga-web/

2016-10-11 Thread Matt Thode
commit: 9cfe53935dec1ba1efc53eeb2eab7456234158c1
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Oct 11 18:12:22 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Tue Oct 11 18:14:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cfe5393

net-analyzer/icinga-web: bup

Package-Manager: portage-2.3.0

 net-analyzer/icinga-web/Manifest |   1 +
 net-analyzer/icinga-web/icinga-web-1.12.0.ebuild | 206 +++
 2 files changed, 207 insertions(+)

diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 3422e1d..935b9fd 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,4 +1,5 @@
 DIST icinga-web-1.10.0.tar.gz 14245635 SHA256 
fe1b43448bcb6a9e8f565f079122e51283539eb6be214e7001c65653686b7f56 SHA512 
90537ea710dd6408349b734b0901918db595d2d7a281e9245a63ba0150a4b7df4fabbb71755966361440ca6096391470d7399ddd5f4b245d1203000b89d8b368
 WHIRLPOOL 
c72004edb2a76efa4ccbea6363fddfa4c6d30c8c368fa57ee0f865d27927bdc5aea691b42c4415b5fe75a12d946768296feffbeb101ff8945377d92da20059bc
 DIST icinga-web-1.10.1.tar.gz 14247394 SHA256 
b334c063cf4f53fcc1922d99161b5ea5c32c04749c0f9dfe091f376158273664 SHA512 
e155c4c00fde20680ed3286fbf7af4db13dd566693ec677a61c719cf8a0b36862bc51741180aceba204e6f768000d8a6dc4548bfbf7165f28f8bbc81c79bc63c
 WHIRLPOOL 
d4cf2ea128c0e46bf07ce1ae677a4e718405b926250f4972790388d2b45cef5996e16ca5b83dcdd8f8c9a84831a76cb88b76d0839bdce87e222d6712463b6de9
 DIST icinga-web-1.11.2.tar.gz 14133733 SHA256 
726ffb261d3cd5a864b689f96837ff9cc138e9c5d97c19a2c82b110a802eb772 SHA512 
ecfbc6534a87ae52b508b2ca663109bdc201fbfc143ce399fff0fdd4eec456524c5bb86afe0e29c58dc3dfeaccc959817e77af5b0257db6eced2f27592caf5b1
 WHIRLPOOL 
bb1ad4ae5d921a0454afd9e11780d469f89b5414f6edf13db8c1292e72c5da8a0dc66991d45fac36607ead57934331414017fcc716b8eac351a56c43b8780cf5
+DIST icinga-web-1.12.0.tar.gz 14517225 SHA256 
3e802ae0cbcabb9555908bf91b9c40d9c07eb80a8acc70f0c9cbd426e3feb675 SHA512 
07831c62479e2c83929bd86dc8d7e57558d8e3b3dac2952d64e5170dc508d836cfb2e7446019d2ec9bea03740fc1c55e5857d2fd88fe67ea2726375f77246898
 WHIRLPOOL 
85ca6ad8423b72dcf77de6243b29fc9c5fadb09f68b56ae57380637014deea60749ff7c942b43d4965ab23efb2d4d79b9cffb194ed6d21e5262373b856ae9b1a
 DIST icinga-web-1.9.1.tar.gz 14635896 SHA256 
aa5b1aa6962a727a6760f89ef19845a878b7e06ee723b8f1fd7821b6a6b578aa SHA512 
42a3edddae5a287b87fd6d077ac303e7caa0b430af86e9046413e7d04d703cd3de7df881463eebb1e5216315056e06ce9f6dccbef93b6e55d1c3f5fe002447b9
 WHIRLPOOL 
8b5a6bf78794f722952566c82ae238640a716e61022fead31145bbc6fa40ca3bbf439aa593c5839b09873f7d43469cff28422ecd9b93e51cc7124859d1ae8257

diff --git a/net-analyzer/icinga-web/icinga-web-1.12.0.ebuild 
b/net-analyzer/icinga-web/icinga-web-1.12.0.ebuild
new file mode 100644
index ..ae6a04b
--- /dev/null
+++ b/net-analyzer/icinga-web/icinga-web-1.12.0.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit depend.apache eutils user multilib
+
+DESCRIPTION="Icinga Web - new Web Interface"
+HOMEPAGE="http://www.icinga.org/;
+SRC_URI="https://github.com/icinga/${PN}/releases/download/v${PV}/${P}.tar.gz;
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="apache2 mysql pnp postgres"
+DEPEND="dev-php/phing
+   dev-db/libdbi-drivers[mysql?,postgres?]
+   || ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 )
+   
dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
+   pnp? ( net-analyzer/pnp4nagios )"
+RDEPEND="${DEPEND}"
+
+want_apache2
+
+pkg_setup() {
+   if use apache2 ; then
+   depend.apache_pkg_setup
+   fi
+   enewgroup icinga
+   enewgroup nagios
+   enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
+}
+
+src_prepare() {
+   #removed checks for some php stuff since we have these things called 
use flags
+   sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' 
configure.ac
+   sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
+   autoreconf
+}
+
+src_configure() {
+   local myconf
+
+   myconf="--prefix=/usr/share/icinga/icinga-web
+   --bindir=/usr/sbin
+   --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
+   --datarootdir=/usr/share/icinga/htdocs
+   --localstatedir=/var/lib/icinga
+   --sysconfdir=/etc/icinga
+   --libexecdir=/usr/$(get_libdir)/icinga/plugins
+   --with-bin-user=icinga
+   --with-bin-group=nagios
+   --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
+   --with-conf-dir=/etc/icinga-web
+   --with-log-dir=/var/log/icinga-web
+   --with-icinga-objects-dir=/etc/icinga/objects
+   --with-icinga-bin=/usr/sbin/icinga
+   --with-icinga-cfg=/etc/icinga/icinga.cfg"
+
+   if use apache2 ; then
+   myconf+=" --with-web-user=apache
+   

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga-web/

2016-10-11 Thread Matt Thode
commit: b6288f904b64ec7dac4eca9a4311d4f0a11f1d18
Author: Matthew Thode  gentoo  org>
AuthorDate: Tue Oct 11 18:13:27 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Tue Oct 11 18:14:17 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6288f90

net-analyzer/icinga-web: cleanup

Package-Manager: portage-2.3.0

 net-analyzer/icinga-web/Manifest   |   3 -
 .../icinga-web/icinga-web-1.10.0-r1.ebuild | 206 -
 net-analyzer/icinga-web/icinga-web-1.10.0.ebuild   | 206 -
 net-analyzer/icinga-web/icinga-web-1.10.1.ebuild   | 206 -
 net-analyzer/icinga-web/icinga-web-1.9.1-r1.ebuild | 203 
 5 files changed, 824 deletions(-)

diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 935b9fd..3b690ec 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,5 +1,2 @@
-DIST icinga-web-1.10.0.tar.gz 14245635 SHA256 
fe1b43448bcb6a9e8f565f079122e51283539eb6be214e7001c65653686b7f56 SHA512 
90537ea710dd6408349b734b0901918db595d2d7a281e9245a63ba0150a4b7df4fabbb71755966361440ca6096391470d7399ddd5f4b245d1203000b89d8b368
 WHIRLPOOL 
c72004edb2a76efa4ccbea6363fddfa4c6d30c8c368fa57ee0f865d27927bdc5aea691b42c4415b5fe75a12d946768296feffbeb101ff8945377d92da20059bc
-DIST icinga-web-1.10.1.tar.gz 14247394 SHA256 
b334c063cf4f53fcc1922d99161b5ea5c32c04749c0f9dfe091f376158273664 SHA512 
e155c4c00fde20680ed3286fbf7af4db13dd566693ec677a61c719cf8a0b36862bc51741180aceba204e6f768000d8a6dc4548bfbf7165f28f8bbc81c79bc63c
 WHIRLPOOL 
d4cf2ea128c0e46bf07ce1ae677a4e718405b926250f4972790388d2b45cef5996e16ca5b83dcdd8f8c9a84831a76cb88b76d0839bdce87e222d6712463b6de9
 DIST icinga-web-1.11.2.tar.gz 14133733 SHA256 
726ffb261d3cd5a864b689f96837ff9cc138e9c5d97c19a2c82b110a802eb772 SHA512 
ecfbc6534a87ae52b508b2ca663109bdc201fbfc143ce399fff0fdd4eec456524c5bb86afe0e29c58dc3dfeaccc959817e77af5b0257db6eced2f27592caf5b1
 WHIRLPOOL 
bb1ad4ae5d921a0454afd9e11780d469f89b5414f6edf13db8c1292e72c5da8a0dc66991d45fac36607ead57934331414017fcc716b8eac351a56c43b8780cf5
 DIST icinga-web-1.12.0.tar.gz 14517225 SHA256 
3e802ae0cbcabb9555908bf91b9c40d9c07eb80a8acc70f0c9cbd426e3feb675 SHA512 
07831c62479e2c83929bd86dc8d7e57558d8e3b3dac2952d64e5170dc508d836cfb2e7446019d2ec9bea03740fc1c55e5857d2fd88fe67ea2726375f77246898
 WHIRLPOOL 
85ca6ad8423b72dcf77de6243b29fc9c5fadb09f68b56ae57380637014deea60749ff7c942b43d4965ab23efb2d4d79b9cffb194ed6d21e5262373b856ae9b1a
-DIST icinga-web-1.9.1.tar.gz 14635896 SHA256 
aa5b1aa6962a727a6760f89ef19845a878b7e06ee723b8f1fd7821b6a6b578aa SHA512 
42a3edddae5a287b87fd6d077ac303e7caa0b430af86e9046413e7d04d703cd3de7df881463eebb1e5216315056e06ce9f6dccbef93b6e55d1c3f5fe002447b9
 WHIRLPOOL 
8b5a6bf78794f722952566c82ae238640a716e61022fead31145bbc6fa40ca3bbf439aa593c5839b09873f7d43469cff28422ecd9b93e51cc7124859d1ae8257

diff --git a/net-analyzer/icinga-web/icinga-web-1.10.0-r1.ebuild 
b/net-analyzer/icinga-web/icinga-web-1.10.0-r1.ebuild
deleted file mode 100644
index 99c69cc..
--- a/net-analyzer/icinga-web/icinga-web-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit depend.apache eutils user multilib
-
-DESCRIPTION="Icinga Web - new Web Interface"
-HOMEPAGE="http://www.icinga.org/;
-SRC_URI="mirror://sourceforge/icinga/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="apache2 mysql pnp postgres"
-DEPEND="dev-php/phing
-   dev-db/libdbi-drivers[mysql?,postgres?]
-   >=net-analyzer/icinga-1.10.0
-   
dev-lang/php[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
-   pnp? ( net-analyzer/pnp4nagios )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-   if use apache2 ; then
-   depend.apache_pkg_setup
-   fi
-   enewgroup icinga
-   enewgroup nagios
-   enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-   #removed checks for some php stuff since we have these things called 
use flags
-   sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' 
configure.ac
-   sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
-   autoreconf
-}
-
-src_configure() {
-   local myconf
-
-   myconf="--prefix=/usr/share/icinga/icinga-web
-   --bindir=/usr/sbin
-   --sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-   --datarootdir=/usr/share/icinga/htdocs
-   --localstatedir=/var/lib/icinga
-   --sysconfdir=/etc/icinga
-   --libexecdir=/usr/$(get_libdir)/icinga/plugins
-   --with-bin-user=icinga
-   --with-bin-group=nagios
-   --with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
-   --with-conf-dir=/etc/icinga-web
-   --with-log-dir=/var/log/icinga-web
-   --with-icinga-objects-dir=/etc/icinga/objects
-