From 92cde7c1bca0dfad306b0ea35bb3821fb364e44a Mon Sep 17 00:00:00 2001
From: Matthew Thode <prometheanfire@gentoo.org>
Date: Thu, 11 Dec 2014 16:51:01 +0000
Subject: the init script is for icinga2, not icinga... bug 532116

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
---
 net-analyzer/icinga2/ChangeLog               |   8 +-
 net-analyzer/icinga2/icinga2-2.2.1-r1.ebuild | 156 +++++++++++++++++++++++++++
 net-analyzer/icinga2/icinga2-2.2.1.ebuild    | 156 ---------------------------
 3 files changed, 163 insertions(+), 157 deletions(-)
 create mode 100644 net-analyzer/icinga2/icinga2-2.2.1-r1.ebuild
 delete mode 100644 net-analyzer/icinga2/icinga2-2.2.1.ebuild

(limited to 'net-analyzer/icinga2')

diff --git a/net-analyzer/icinga2/ChangeLog b/net-analyzer/icinga2/ChangeLog
index 9d2cd126a5d1..1c83d9a507be 100644
--- a/net-analyzer/icinga2/ChangeLog
+++ b/net-analyzer/icinga2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.14 2014/12/10 05:18:46 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga2/ChangeLog,v 1.15 2014/12/11 16:51:01 prometheanfire Exp $
+
+*icinga2-2.2.1-r1 (11 Dec 2014)
+
+  11 Dec 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +icinga2-2.2.1-r1.ebuild, -icinga2-2.2.1.ebuild:
+  the init script is for icinga2, not icinga... bug 532116
 
   10 Dec 2014; Matthew Thode <prometheanfire@gentoo.org> icinga2-2.2.1.ebuild:
   fixing sql schema source location
diff --git a/net-analyzer/icinga2/icinga2-2.2.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..7642592f803a
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.2.1-r1.ebuild
@@ -0,0 +1,156 @@
+# 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.2.1-r1.ebuild,v 1.1 2014/12/11 16:51:01 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit depend.apache distutils-r1 eutils cmake-utils toolchain-funcs user versionator systemd
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+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 nano-syntax +plugins +vim-syntax"
+
+DEPEND="dev-util/cmake
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-libs/openssl
+		>=dev-libs/boost-1.41
+		sys-devel/bison
+		>=sys-devel/flex-2.5.35
+		mysql? ( virtual/mysql )
+		postgres? ( virtual/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
+	enewgroup nagios  # for plugins
+	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_prepare() {
+#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
+	epatch_user
+}
+
+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
+	)
+	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
+}
+
+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
+
+	newinitd "${FILESDIR}"/icinga2.initd icinga2
+	newconfd "${FILESDIR}"/icinga2.confd icinga2
+
+	if use mysql ; then
+		docinto schema
+		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}/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
+
+	keepdir /etc/icinga2
+	keepdir /var/lib/icinga2/api/zones
+	keepdir /var/lib/icinga2/api/repository
+	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"
+
+	fperms ug+rwX,o-rwx /etc/icinga2
+	fperms ug+rwX,o-rwx /var/lib/icinga2
+	fperms ug+rwX,o-rwx /var/spool/icinga2
+	fperms ug+rwX,o-rwx /var/log/icinga2
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r tools/syntax/vim/ftdetect
+		doins -r tools/syntax/vim/syntax
+	fi
+
+	if use nano-syntax; then
+		insinto /usr/share/nano
+		doins tools/syntax/nano/icinga2.nanorc
+	fi
+}
+
+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.ebuild b/net-analyzer/icinga2/icinga2-2.2.1.ebuild
deleted file mode 100644
index a9ec968d5d65..000000000000
--- a/net-analyzer/icinga2/icinga2-2.2.1.ebuild
+++ /dev/null
@@ -1,156 +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.2.1.ebuild,v 1.4 2014/12/10 05:18:46 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit depend.apache distutils-r1 eutils cmake-utils toolchain-funcs user versionator systemd
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-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 nano-syntax +plugins +vim-syntax"
-
-DEPEND="dev-util/cmake
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-libs/openssl
-		>=dev-libs/boost-1.41
-		sys-devel/bison
-		>=sys-devel/flex-2.5.35
-		mysql? ( virtual/mysql )
-		postgres? ( virtual/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
-	enewgroup nagios  # for plugins
-	enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
-}
-
-src_prepare() {
-#	epatch "${FILESDIR}/${P}-create_var_cache.patch"
-	epatch_user
-}
-
-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
-	)
-	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
-}
-
-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
-
-	newinitd "${FILESDIR}"/icinga2.initd icinga
-	newconfd "${FILESDIR}"/icinga2.confd icinga
-
-	if use mysql ; then
-		docinto schema
-		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}/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
-
-	keepdir /etc/icinga2
-	keepdir /var/lib/icinga2/api/zones
-	keepdir /var/lib/icinga2/api/repository
-	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"
-
-	fperms ug+rwX,o-rwx /etc/icinga2
-	fperms ug+rwX,o-rwx /var/lib/icinga2
-	fperms ug+rwX,o-rwx /var/spool/icinga2
-	fperms ug+rwX,o-rwx /var/log/icinga2
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles
-		doins -r tools/syntax/vim/ftdetect
-		doins -r tools/syntax/vim/syntax
-	fi
-
-	if use nano-syntax; then
-		insinto /usr/share/nano
-		doins tools/syntax/nano/icinga2.nanorc
-	fi
-}
-
-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"
-}
-- 
cgit v1.2.3-65-gdbad