updating ebuild and fixing init file

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index 381080efb756f3cff6bec6f6ac2ee21ba6066241..88b83d3883f076ef54d5cdb16a4299455ce538a9 100644 (file)
--- a/net-analyzer/icinga2/ChangeLog
+++ b/net-analyzer/icinga2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/icinga2
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.20 2014/12/28 16:05:49 titanofold Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.21 2015/01/13 04:42:58 prometheanfire Exp $
+
+*icinga2-2.2.3 (13 Jan 2015)
+
+  13 Jan 2015; Matthew Thode <prometheanfire@gentoo.org> +icinga2-2.2.3.ebuild,
+  -files/icinga2-2.1.0-create_var_cache.patch,
+  -files/icinga2-2.2.1-create_var_cache.patch, -icinga2-2.0.2.ebuild,
+  -icinga2-2.1.0-r3.ebuild, files/icinga2.initd, icinga2-2.2.1-r2.ebuild:
+  updating ebuild and fixing init file
 
   28 Dec 2014; Aaron W. Swenson <titanofold@gentoo.org> icinga2-2.0.2.ebuild,
   icinga2-2.1.0-r3.ebuild, icinga2-2.2.1-r2.ebuild:

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 6caa7a525cb5c6c682a8e0b6a7b2f50448c914f6..b64e57d87d5bdaa2c8717407ff1f978b3f416987 100644 (file)
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,22 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX icinga2-2.1.0-create_var_cache.patch 1191 SHA256 350095704b964473a5584d4dc50f043bb075c5a48bf7a12257ba2dfd778b99dc SHA512 803d6b3ec9b23be3934d022d8c2c3c97c1dfb8d8b0786ee979049df205faffd7001258620b852b56dc1dc06a3c9ce45cc8070007137c92e273d25b1ff8c6f80c WHIRLPOOL 6dce723e209307099fab40e028d8062a56ab94d7c688e814fd3fea8179e824a5f165b0277b318f12de8a627313be0b23ad23ee5272c4f7bbdf8184e926992730
-AUX icinga2-2.2.1-create_var_cache.patch 415 SHA256 aa6c6667e81a0082f6759b7fc15ce9c2c39c18822931ec7732ddc329125fb703 SHA512 c80345d55985304d23abdf97a4c6fd80105b2e1d33f538c09dcf42b993ac26ef5a995cf3c602a5347906ce937a524b6f8a1e658ee81ff08be3859f4ecf0d26e5 WHIRLPOOL 5b0e1e8c2afcc534f9100896dae13eedc3df2964d153dc9d5932a4a6c4c7996ca8f937ce7e70c804a82185be9b8e8717ac9aadb569c0265c10bd170d4740e69e
 AUX icinga2.confd 135 SHA256 ba821687a15008781a9e5953e66b4290891af4f15736902cb2e78cc8b95ae568 SHA512 f194b7a7d202bc5b8a611722b21a5cf8cf91afda15dc1b1b007050b34fbd7462952268fcb6eddd94e05d474364e7873ae691ccf0049b79c89e48f780b03b0520 WHIRLPOOL baa19b2a4bb4361b1ad093ec019b199fb41a64825cb434a9e2e48ff5eb14e82bf3a09fa0167afa86140a774c6f8fa034f2049881f7b84874f5f24702cc09c97e
-AUX icinga2.initd 2176 SHA256 4dfe16ec3b1c13676ac4120617ada82ebe41c9f474b9ee39f83b1ec38228ece2 SHA512 0fc0d680da7e5c37286d4f252faecd0e2f21697186b6a32ef898c690b53eef7961e8cb5175c86955b1ffd664fd1ea2c27120f51118fd4b6d22b5663817a17c69 WHIRLPOOL 034ab09ae7ff52b34f844afec8f91a7b6a28e90690fa23fc536621ba743bf57b37d900759fca25c331e6a7fc5aa54b3f729c5f6ede7fbed712df7d71128c4a59
-DIST icinga2-2.0.2.tar.gz 546107 SHA256 b21c4c4bc2152ed3850d34ef3eed03588e508a9080c10f15750e9a115d856ced SHA512 2d754f605dafbcf0290566241d776c20269f13f243ba509ddf33cf86c012e633c78beb226b904b487c6180a1fe6c5e50816e33960f1cba7c3df901649e4f0c7d WHIRLPOOL 0a5e61343a528fd88828a5b1acd2e704554af71eb750cc52dd92fd7c4cc390a752943041a6723d23d5c79dc23b3bcdcb2eeb42047ba226e4e2c905589502b60c
-DIST icinga2-2.1.0.tar.gz 567861 SHA256 6aad43c69385db3463ca0a3f14f7373d03a967451eb976a89955d1c99f9300e6 SHA512 683bd8944eced5036b328ca7f942b43620ba9d2e1ae2c7ad067416b778c693e97d95e082240cb293826b4e6241de9fd2fe97afacd385c5f578e47b821d358a3d WHIRLPOOL f10844592c0ebc41e15346f49ef3760d69980a8b742cae3c2d5b21f5075e2959c60499890d29d7e4893e740c133f09a5202565b6a91223cabaedc6afe88d49cb
+AUX icinga2.initd 2003 SHA256 3a41a4d5a730838f8779f87e9d2eb0b5e0e229ed9af04156e7f050430c445f58 SHA512 5ba05ae3a619014a22d0da4ea0cc82d01d0471a4827bb4b7e4134b12a18d1aa226c8e81f14345a95f8e7f11a33ea4295e6c2a3a46aba8b15ee6cdf3e641b6e67 WHIRLPOOL c1284f49b4ac5119eda0f96089452a097f5a02855bd27da22c45db62d8f9c4a3315433ca2da02af6b57c037ad62b6c9a708e3cc6af3beb58bf6970efe086598d
 DIST icinga2-2.2.1.tar.gz 683579 SHA256 3daf73b30cfeca6b29c8ca715c006b4e612324165a0583eb072a51d0925eea6d SHA512 0cf80b67129b989fff9c2faf3e7455fe941b30bc48e337ba1a29294974d18e4b0462b2d1b11b8508add2c76340b7044e4575ef3d189bedb4e1a31daf80dfc2d3 WHIRLPOOL 880e13f9e0ce69433342a564c8a5e5f45a513a30334d40a349d8463c263066986205537a62d279b0ef3894c12dd2ff981a7ac6a0667d76b3fc4c4aebf76c1412
-EBUILD icinga2-2.0.2.ebuild 3307 SHA256 3ee43a7843e6a36a113b0d0f8f945b5af745eeeb729b2c8c77fa967d06fb683d SHA512 7b5787f375dff845ae0cc61b1c1c4564b0140a8bbbbc00c5b0f86c840a01644668410e74e9dcf52558a7c8209836900274539a440c5e8457061acaf12632eee6 WHIRLPOOL e1af3da7ae61bfba5e3a1930b656fd4387eef9e9e2caeb4bde3694770fe702fd03c96a4b379f2135b5156f998d362234b8a0b2f4b9efa3277d313e4f998de185
-EBUILD icinga2-2.1.0-r3.ebuild 4079 SHA256 ac231bbbded47abadcec5dcd6cb32de0b4c41a381f8280c859c113b5172bd751 SHA512 c7e008a57375a047b5b060e15728e5e9986c638e23708c1f1382966bf4e86c3defa01aab56dca4551840d0435f48ed380353681c7e0385bdd8831adfe44ae03b WHIRLPOOL be88dfe874f721ca0da02fffc03ce1b7e78361322f387b98e8017ad10267099b4b5d39e500c979b2ac6e8ff5638689f843e29d053b434e927b044c3cf103536a
-EBUILD icinga2-2.2.1-r2.ebuild 4248 SHA256 133349437ccfe7939ed99f13139325a300f7b8b42fb9b33e121d22f068f1fbfa SHA512 ce646e62981e53331b8dfe27c21e09246faad2e4933f9addb9cf5fb1e8174775d72bdda40dac6352092bf8d4e48b2f7be081f76c27f2096b19852adfba5cebec WHIRLPOOL d9c32d25c22117056fcad40d8b6b82227e407f016df292ec4a009504c53b2607e9ea648e00db4ba975fba6544362e14a6c400ebc9bc73582533e187f1ef75b61
-MISC ChangeLog 3410 SHA256 b35e7258501e1d716a3b3acd6b25589fb14bf1b327299ee09b984158464adee8 SHA512 27db4755f2d16ebd8abc831ebe0e52f69eee6ed3bb9c51d59c3d3ebc9529d221afee1f499315dcabc533b7cb13cd4516985c46f184d2163c96621111126fa00e WHIRLPOOL d92fbb5da4f697e79244fad46414867a5f8c3ee4aae412cc602d68b0c7630aa680e847248dc89e173bcee78d251d59c057c924ed109e01fd345fd1296b67ab95
+DIST icinga2-2.2.3.tar.gz 690095 SHA256 1cd6eebc5f9427d03ed12f188f73af0fe26b5b34f2bbdf29fe31024a0d8846b1 SHA512 0d1fc86fa90e5aa5d82515da490db1292e873fe2115d90239defeefa88f2045981464fd0193900fcf21c7a3dc961f6dd2da4cbd0fc8bd03002b182908af62603 WHIRLPOOL a04267d4d23e32fb20b53f14c2816d670afe335bf6854d9d0c1216a40d4163d32161a9ba7fd3540093c9202805fd71c72aacddad27ca97a00f3363a5305abe47
+EBUILD icinga2-2.2.1-r2.ebuild 4252 SHA256 61eaecea0bbf1bcd0ba39a848b391f328e116692d81e9d9613887923c654045c SHA512 41115eb7e64f1fff55382b5244a42a3ec711308b1e68132937c860009525b36e4ed0dc0602799910d0949b8c98c4e0e312a52d729bc28b338f93368705920ad2 WHIRLPOOL f72927eedf8f81b612ebc5e4cca035e309ffed8693c65bd24d7dcad6095983a381786b3cf7415623f912e06cab65af2cdef8080c0d1973e18c739ac8fc4d3faf
+EBUILD icinga2-2.2.3.ebuild 4249 SHA256 230e3a445971fb104c24ec89c3ec5945fd4f7c7c9e776b0753b0b523d372c77d SHA512 c73fba24289e1a75e1c076c442e1e4b62617091fdfe6f91f55e3ebf3efbeab704a10ddc72e1920eaf5a46dc816d8210f395ae9067cc87172a098658283448732 WHIRLPOOL f56f1a246ecfd3f22145fcc43ba4de8ff774ee81ba5f0fe8ccd8d35e819b08a64b968db71f21c8850c00489ec167a59a1460d2c1f6b62101ed99b36547eb9de9
+MISC ChangeLog 3755 SHA256 afebf5e67f8a119383907a717e2fe1e2f225949cdb67645a394c355e9c926447 SHA512 d4f0a79d4211c7b7f9cec4c8d0ca0a0245b8f7688549a7b579bb01461ef20907b235104df7f761c2ee12f4c9e987ec11e7f651b0c403338402c2a785ce83e34a WHIRLPOOL b055958a40ebe883ef6ccc482b9934a67b2426815d62f827f866736868bc6889da438bd444ac3cd7d473783e861b40c4143d4fdbef435a77b7604e8a8d810746
 MISC metadata.xml 564 SHA256 daa07d6dcd6d70107892b050d674f083db74476ffa98623ebbe5d22fe752fe93 SHA512 635f538b78ad2e2b18c49959c7b2b7c06582270738522f10bf7bcac0820fd0222761af4e80ab6756d0e98d11fd6a66763cd9cbc1ccd261694d2de25d68817f8f WHIRLPOOL 513a2dd6f6d39994720e9f62275f840e5efedd77115d033b0957de3b5d21b82efb315a8e3efd386a409aeee254ec05f7aa0fff2ec14888a5c45a2533b3e15c7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSgKl8ACgkQVxOqA9G7/aA6EAD/aH/n8atS450yw5ur7SZz8chM
-1OWA4NUtmgSG1NgRwCIA/30OxLzal2Y69YTOaDcj5s1VF69JmLUpMX02IEiWWd78
-=ZCt1
+iQIcBAEBCAAGBQJUtKJaAAoJEGSje+quGaToYEAP/0QKKfzT6zs1bGp2D6mA737I
+Oks9pIWdufCd9++/xtOgIrKBFhPQj0Y+CCc+9GGPiZTJwGcf+KKtEyatIVKcxUFV
+eQYc0meJkMVrYZWQabFNQjcBqhWTUc5IKDOpfMR/VWnqxGAu9ba4jzcylBdfHY40
+/9r0d198WaEok6TuTqzobOKdchjp5AmfNGbCOfRzeH7DNMHEvuYmjtNbNe8ab73c
+0EbUgYXPjirEG1/UlYfabsMrxgtZ4ftoyuelSkSjWDCYoxo4TqZzwDj7bn1EsfVR
+ddGiZoN18M6/J4gwobH4qW/QnOTPqM32Yi9uofDcdxivsKeT68a1P2o8pPqQrErd
+m8KC8hkqtvck/l9JvCfNYXxqfJ4LKkkFDb02bdEHR7qfYVDxPx5ZQxOAlGIDl2Hi
+YVyTSxjf+0YZUlIMK8Y8ETsnp1+z0shu1Thhd6AT3r9UFc5lrF8Erp4wpmX2wKOG
+6Ohi9gauRFpuNntdLvAXnIZLuD/wd49SIKAEUn8F2FFIMYsyl77XpVg0ClLmbYEc
+yfnoVm9NKpYkhrulmNl27SZCyLk39ED0U/fflTCzfWH9L50t7euUfHg5LQwtdLMA
+uHkxeAPgj90Qn7zAuMv1jnCTSOX+PbPTHt7FgRer4zXG7fnjP+qWNgBQ7AzSM8WJ
+pHUm6TwDaDIh3Wfhw/qP
+=hyIm
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/icinga2/files/icinga2-2.1.0-create_var_cache.patch b/net-analyzer/icinga2/files/icinga2-2.1.0-create_var_cache.patch
deleted file mode 100644 (file)
index e4bee6c..0000000
--- a/net-analyzer/icinga2/files/icinga2-2.1.0-create_var_cache.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/etc/initsystem/icinga2-prepare-dirs
-+++ b/etc/initsystem/icinga2-prepare-dirs
-@@ -31,3 +31,7 @@
- mkdir -p $ICINGA2_RUN_DIR/icinga2/cmd
- chown $ICINGA2_USER:$ICINGA2_COMMAND_GROUP $ICINGA2_RUN_DIR/icinga2/cmd
- chmod 2750 $ICINGA2_RUN_DIR/icinga2/cmd
-+
-+mkdir -p $ICINGA2_STATE_DIR/cache/icinga2
-+chown $ICINGA2_USER:$ICINGA2_COMMAND_GROUP $ICINGA2_STATE_DIR/cache/icinga2
-+chmod 750 $ICINGA2_STATE_DIR/cache/icinga2
---- a/etc/initsystem/icinga2.init.d.cmake
-+++ b/etc/initsystem/icinga2.init.d.cmake
-@@ -46,7 +46,6 @@
- # Start Icinga 2
- start() {
-       printf "Starting Icinga 2: "
--      @CMAKE_INSTALL_FULL_SBINDIR@/icinga2-prepare-dirs $SYSCONFIGFILE
- 
-       if ! $DAEMON -c $ICINGA2_CONFIG_FILE -d -e $ICINGA2_ERROR_LOG -u $ICINGA2_USER -g $ICINGA2_GROUP > $ICINGA2_STARTUP_LOG 2>&1; then
-               echo "Error starting Icinga. Check '$ICINGA2_STARTUP_LOG' for details."
-@@ -105,6 +106,7 @@
- # Check the Icinga 2 configuration
- checkconfig() {
-       printf "Checking configuration: "
-+      @CMAKE_INSTALL_FULL_SBINDIR@/icinga2-prepare-dirs $SYSCONFIGFILE
- 
-       if ! $DAEMON -c $ICINGA2_CONFIG_FILE -C -u $ICINGA2_USER -g $ICINGA2_GROUP > $ICINGA2_STARTUP_LOG 2>&1; then
-                 if [ "x$1" = "x" ]; then

diff --git a/net-analyzer/icinga2/files/icinga2-2.2.1-create_var_cache.patch b/net-analyzer/icinga2/files/icinga2-2.2.1-create_var_cache.patch
deleted file mode 100644 (file)
index beb6b28..0000000
--- a/net-analyzer/icinga2/files/icinga2-2.2.1-create_var_cache.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/etc/initsystem/prepare-dirs\r
-+++ b/etc/initsystem/prepare-dirs\r
-@@ -31,3 +31,7 @@\r
- mkdir -p $ICINGA2_RUN_DIR/icinga2/cmd\r
- chown $ICINGA2_USER:$ICINGA2_COMMAND_GROUP $ICINGA2_RUN_DIR/icinga2/cmd\r
- chmod 2750 $ICINGA2_RUN_DIR/icinga2/cmd\r
-+\r
-+mkdir -p $ICINGA2_STATE_DIR/cache/icinga2\r
-+chown $ICINGA2_USER:$ICINGA2_COMMAND_GROUP $ICINGA2_STATE_DIR/cache/icinga2\r
-+chmod 750 $ICINGA2_STATE_DIR/cache/icinga2\r

diff --git a/net-analyzer/icinga2/files/icinga2.initd b/net-analyzer/icinga2/files/icinga2.initd
index 7945b46617e6303666198daebf61579ff1aca9ea..5dc89d08dacbf0c2c104401303cb9d7f0dd42e8a 100644 (file)
--- a/net-analyzer/icinga2/files/icinga2.initd
+++ b/net-analyzer/icinga2/files/icinga2.initd
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 DAEMON="/usr/sbin/icinga2"
@@ -7,7 +7,7 @@ ICINGA2_CONFIG_FILE="/etc/icinga2/icinga2.conf"
 ICINGA2_RUN_DIR="/run/icinga2"
 ICINGA2_STATE_DIR="/var/cache/icinga2"
 ICINGA2_CMD_DIR="${ICINGA2_RUN_DIR}/cmd"
-ICINGA2_PID_FILE="${ICINGA2_RUN_DIR}/icinga2/icinga2.pid"
+ICINGA2_PID_FILE="${ICINGA2_RUN_DIR}/icinga2.pid"
 ICINGA2_DAEMON_ARGS="daemon -c $ICINGA2_CONFIG_FILE -e $ICINGA2_ERROR_LOG -d"
 
 depend() {
@@ -64,14 +64,3 @@ stop() {
         --progress
     eend $?
 }
-
-status() {
-    [ ! -f "$ICINGA2_PID_FILE" ] && return 1
-
-    if ps -p $(cat "$ICINGA2_PID_FILE") > /dev/null; then
-        eend 0
-    else
-        eend 1
-    fi
-}
-

diff --git a/net-analyzer/icinga2/icinga2-2.0.2.ebuild b/net-analyzer/icinga2/icinga2-2.0.2.ebuild
deleted file mode 100644 (file)
index 29481d8..0000000
--- a/net-analyzer/icinga2/icinga2-2.0.2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.0.2.ebuild,v 1.3 2014/12/28 16:05:49 titanofold Exp $
-
-EAPI=5
-inherit depend.apache eutils cmake-utils toolchain-funcs user versionator systemd
-
-DESCRIPTION="Nagios Fork - Check daemon, CGIs, docs, IDOutils. Reloaded"
-HOMEPAGE="http://icinga.org/icinga2"
-#PV=$(replace_version_separator 3 '-')
-SRC_URI="http://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-#S="${WORKDIR}/${PN}-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+mysql postgres classicui +plugins"
-
-DEPEND="dev-util/cmake
-               dev-libs/openssl
-               dev-libs/boost
-               sys-devel/bison
-               sys-devel/flex
-               mysql? ( virtual/mysql )
-               postgres? ( dev-db/postgresql )"
-
-RDEPEND="${DEPEND}
-       plugins? ( net-analyzer/nagios-plugins )
-       classicui? ( net-analyzer/icinga[web] )"
-
-REQUIRED_USE="|| ( mysql postgres )"
-
-want_apache2
-
-pkg_setup() {
-       enewgroup icinga
-       enewgroup icingacmd
-       enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd"
-}
-
-src_configure() {
-       local mycmakeargs=(
-               -DCMAKE_VERBOSE_MAKEFILE=ON
-               -DCMAKE_BUILD_TYPE=None
-               -DCMAKE_INSTALL_PREFIX=/usr
-               -DCMAKE_INSTALL_SYSCONFDIR=/etc
-               -DCMAKE_INSTALL_LOCALSTATEDIR=/var
-               -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
-               -DICINGA2_USER=icinga
-               -DICINGA2_GROUP=icingacmd
-               -DICINGA2_COMMAND_USER=icinga
-               -DICINGA2_COMMAND_GROUP=icingacmd
-               -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
-       )
-       cmake-utils_src_configure
-}
-
-src_install() {
-       BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-       cd $BUILDDIR
-
-       #if [[ -f Makefile ]] || [[ -f GNUmakefile ]] || [[ -f makefile ]] ; then
-
-               emake DESTDIR="${D}" install
-       #fi
-
-       cd "${WORKDIR}"/icinga2-${PV}
-       if ! declare -p DOCS >/dev/null 2>&1 ; then
-               local d
-               for d in README* ChangeLog AUTHORS NEWS TODO CHANGES THANKS BUGS \
-                               FAQ CREDITS CHANGELOG ; do
-                       [[ -s "${d}" ]] && dodoc "${d}"
-               done
-       elif declare -p DOCS | grep -q "^declare -a " ; then
-               dodoc "${DOCS[@]}"
-       else
-               dodoc ${DOCS}
-       fi
-
-       if use mysql ; then
-               docinto schema
-               newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/mysql.sql mysql.sql
-               docinto schema/upgrade
-               #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
-       elif use postgres ; then
-               docinto schema
-               newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/pgsql.sql pgsql.sql
-               docinto schema/upgrade
-               #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
-       fi
-
-       keepdir /etc/icinga2
-       keepdir /var/lib/icinga
-       keepdir /var/lib/icinga/archives
-       keepdir /var/lib/icinga/rw
-       keepdir /var/lib/icinga/spool/checkresults
-
-       #remove dirs that shouldn't be installed
-       rm -r "${D}var/run" || die "failed to remove  /var/run"
-       rm -r "${D}var/cache" || die "failed to remove /var/cache"
-
-       fowners icinga:icinga /var/lib/icinga || die "Failed chown of /var/lib/icinga"
-       fowners icinga:icinga /var/lib/icinga2 || die "Failed chown of /var/lib/icinga2"
-}
-
-pkg_postinst() {
-       elog "DB IDO schema upgrade required. http://docs.icinga.org/icinga2/snapshot/chapter-2.html#upgrading-the-mysql-database"
-       elog "You will need to update your configuration files, see https://dev.icinga.org/issues/5909"
-}

diff --git a/net-analyzer/icinga2/icinga2-2.2.1-r2.ebuild b/net-analyzer/icinga2/icinga2-2.2.1-r2.ebuild
index 0772d7defe5205d0f0a95a23c379b5ec91d945ca..86534fac8d3480725f7abd99a544e5627b80bef0 100644 (file)
--- a/net-analyzer/icinga2/icinga2-2.2.1-r2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.2.1-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1-r2.ebuild,v 1.2 2014/12/28 16:05:49 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.1-r2.ebuild,v 1.3 2015/01/13 04:42:58 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )

diff --git a/net-analyzer/icinga2/icinga2-2.1.0-r3.ebuild b/net-analyzer/icinga2/icinga2-2.2.3.ebuild
similarity index 78%
rename from net-analyzer/icinga2/icinga2-2.1.0-r3.ebuild
rename to net-analyzer/icinga2/icinga2-2.2.3.ebuild
index c7f9feb0d353527b815a10b623f7530b6af93222..10f83e075f8e652d0f210360a64c63b053edcd89 100644 (file)
--- a/net-analyzer/icinga2/icinga2-2.1.0-r3.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.1.0-r3.ebuild,v 1.3 2014/12/28 16:05:49 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/icinga2-2.2.3.ebuild,v 1.1 2015/01/13 04:42:58 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -37,11 +37,12 @@ want_apache2
 pkg_setup() {
        enewgroup icinga
        enewgroup icingacmd
-       enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd"
+       enewgroup nagios  # for plugins
+       enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
 }
 
 src_prepare() {
-       epatch "${FILESDIR}/${P}-create_var_cache.patch"
+#      epatch "${FILESDIR}/${P}-create_var_cache.patch"
        epatch_user
 }
 
@@ -59,6 +60,24 @@ src_configure() {
                -DICINGA2_COMMAND_GROUP=icingacmd
                -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
        )
+       if use postgres; then
+               mycmakeargs+=(
+                       -DICINGA2_WITH_PGSQL=ON
+               )
+       else
+               mycmakeargs+=(
+                       -DICINGA2_WITH_PGSQL=OFF
+               )
+       fi
+       if use mysql; then
+               mycmakeargs+=(
+                       -DICINGA2_WITH_MYSQL=ON
+               )
+       else
+               mycmakeargs+=(
+                       -DICINGA2_WITH_MYSQL=OFF
+               )
+       fi
        cmake-utils_src_configure
 }
 
@@ -84,14 +103,17 @@ src_install() {
                dodoc ${DOCS}
        fi
 
+       newinitd "${FILESDIR}"/icinga2.initd icinga2
+       newconfd "${FILESDIR}"/icinga2.confd icinga2
+
        if use mysql ; then
                docinto schema
-               newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/mysql.sql mysql.sql
+               newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
                docinto schema/upgrade
                #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_mysql/schema/upgrade/0.0.11.sql mysql-upgrade-1.12.0.sql
        elif use postgres ; then
                docinto schema
-               newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+               newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
                docinto schema/upgrade
                #newdoc "${WORKDIR}"/icinga2-${PV}/components/db_ido_pgsql/schema/upgrade/0.0.11.sql pgsql-upgrade-1.12.0.sql
        fi
@@ -102,14 +124,13 @@ src_install() {
        keepdir /var/lib/icinga2/api/log
        keepdir /var/spool/icinga2/perfdata
 
-       #remove dirs that shouldn't be installed
        rm -r "${D}var/run" || die "failed to remove  /var/run"
        rm -r "${D}var/cache" || die "failed to remove /var/cache"
 
-       fowners icinga:icinga /etc/icinga2 || die "Failed chown of /etc/icinga2"
-       fowners icinga:icinga /var/lib/icinga2 || die "Failed chown of /var/lib/icinga2"
-       fowners icinga:icinga /var/spool/icinga2 || die "Failed chown of /var/spool/icinga2"
-       fowners icinga:icingacmd /var/log/icinga2 || die "Failed chown of /var/log/icinga2"
+       fowners icinga:icinga /etc/icinga2
+       fowners icinga:icinga /var/lib/icinga2
+       fowners icinga:icinga /var/spool/icinga2
+       fowners icinga:icingacmd /var/log/icinga2
 
        fperms ug+rwX,o-rwx /etc/icinga2
        fperms ug+rwX,o-rwx /var/lib/icinga2