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 343FF1382C5 for ; Wed, 23 May 2018 18:05:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22DE9E08D6; Wed, 23 May 2018 18:05:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 DB29BE08D6 for ; Wed, 23 May 2018 18:05:38 +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 2BC55335C2E for ; Wed, 23 May 2018 18:05:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB90927A for ; Wed, 23 May 2018 18:05:34 +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: <1527098720.52f41b122867e3d89233afabe090736073f2b3ef.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga2/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/icinga2/Manifest net-analyzer/icinga2/icinga2-2.8.2.ebuild net-analyzer/icinga2/icinga2-2.8.4.ebuild X-VCS-Directories: net-analyzer/icinga2/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matt Thode X-VCS-Revision: 52f41b122867e3d89233afabe090736073f2b3ef X-VCS-Branch: master Date: Wed, 23 May 2018 18:05:34 +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: 5e49f4d0-8cae-4797-b83c-6329dded8bea X-Archives-Hash: e1e55735ae3b93e05fe2d261fa01191c commit: 52f41b122867e3d89233afabe090736073f2b3ef Author: Matthew Thode gentoo org> AuthorDate: Wed May 23 18:00:50 2018 +0000 Commit: Matt Thode gentoo org> CommitDate: Wed May 23 18:05:20 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52f41b12 net-analyzer/icinga2: 2.8.4 stable with cleanup Package-Manager: Portage-2.3.36, Repoman-2.3.9 net-analyzer/icinga2/Manifest | 1 - net-analyzer/icinga2/icinga2-2.8.2.ebuild | 176 ------------------------------ net-analyzer/icinga2/icinga2-2.8.4.ebuild | 2 +- 3 files changed, 1 insertion(+), 178 deletions(-) diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest index 2fedb34d23a..a04866da9ea 100644 --- a/net-analyzer/icinga2/Manifest +++ b/net-analyzer/icinga2/Manifest @@ -1,2 +1 @@ -DIST icinga2-2.8.2.tar.gz 2507304 BLAKE2B 0f2cc58fff6d9f648b302c3af07e24fcf20e0c10c140d4052991477e1dbf5c158157f0c64e8d3aa26a6fadc46db25eb26d7b5d5c791a8a7d91445be10f0cecea SHA512 55a9791fa14d0e3e559b3083ec83ad301b62a677a1b56ad30227b1a3591612e2fe536a34a25705fb935a6ca8e42f45ff006f9856b47103da054db15582455579 DIST icinga2-2.8.4.tar.gz 2510333 BLAKE2B f551a5eadc93d8455612af40e34a0922bc75f41b8064f9989c8f0c28dc2c3fb18963cf9b3272efa29f03973e7cf5824762bebff1bfa1a23c4ba39c93fc29c8e5 SHA512 b2cb5989962ac65da927cbdbac1b3345c913321d507b5113f32dd90bf969b2513478e68d52b9cd4cf255057d74428f9e42067288b7ddc59ad060ca7b84f4f114 diff --git a/net-analyzer/icinga2/icinga2-2.8.2.ebuild b/net-analyzer/icinga2/icinga2-2.8.2.ebuild deleted file mode 100644 index 525aa185b12..00000000000 --- a/net-analyzer/icinga2/icinga2-2.8.2.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -if [[ ${PV} != 9999 ]]; then - inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets - SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" -else - inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets - EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" - EGIT_BRANCH="master" - KEYWORDS="" -fi - -DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="http://icinga.org/icinga2" - -LICENSE="GPL-2" -SLOT="0" -IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins studio +vim-syntax" -WX_GTK_VER="3.0" - -CDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - >=dev-libs/boost-1.58-r1 - console? ( dev-libs/libedit ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql:= )" - -DEPEND=" - ${CDEPEND} - sys-devel/bison - >=sys-devel/flex-2.5.35" - -RDEPEND=" - ${CDEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) ) - mail? ( virtual/mailx ) - classicui? ( net-analyzer/icinga[web] ) - studio? ( x11-libs/wxGTK:3.0 )" - -REQUIRED_USE="!minimal? ( || ( mysql postgres ) )" - -want_apache2 - -pkg_setup() { - depend.apache_pkg_setup - if use studio ; then - setup-wxwidgets - fi - enewgroup icinga - enewgroup icingacmd - enewgroup nagios # for plugins - enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios" -} - -src_configure() { - sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die - local mycmakeargs=( - -DICINGA2_UNITY_BUILD=FALSE - -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_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins" - -DICINGA2_USER=icinga - -DICINGA2_GROUP=icingacmd - -DICINGA2_COMMAND_GROUP=icingacmd - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes - -DLOGROTATE_HAS_SU=ON - ) - # default to off if minimal, allow the flags to be set otherwise - if use minimal; then - mycmakeargs+=( - -DICINGA2_WITH_MYSQL=OFF - -DICINGA2_WITH_PGSQL=OFF - ) - else - mycmakeargs+=( - -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF) - -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF) - ) - fi - # LTO - if use lto; then - mycmakeargs+=( - -DICINGA2_LTO_BUILD=ON - ) - else - mycmakeargs+=( - -DICINGA2_LTO_BUILD=OFF - ) - fi - # STUDIO - if use studio; then - mycmakeargs+=( - -DICINGA2_WITH_STUDIO=ON - ) - else - mycmakeargs+=( - -DICINGA2_WITH_STUDIO=OFF - ) - fi - - cmake-utils_src_configure -} - -src_install() { - BUILDDIR="${WORKDIR}"/icinga2-${PV}_build - cd "${BUILDDIR}" || die - - emake DESTDIR="${D}" install - - einstalldocs - - newinitd "${FILESDIR}"/icinga2.initd icinga2 - - if use mysql ; then - 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/* - elif use postgres ; then - docinto schema - newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql - docinto schema/upgrade - dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/* - 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 - - rm -r "${D}/var/run" || die "failed to remove /var/run" - rm -r "${D}/var/cache" || die "failed to remove /var/cache" - - fowners root:icinga /etc/icinga2 - fperms 0750 /etc/icinga2 - fowners icinga:icinga /var/lib/icinga2 - fowners icinga:icinga /var/spool/icinga2 - fowners -R icinga:icingacmd /var/lib/icinga2/api - fowners icinga:icinga /var/spool/icinga2/perfdata - fowners icinga:icingacmd /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 "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect - doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax - fi - - if use nano-syntax; then - insinto /usr/share/nano - doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc - fi -} - -pkg_postinst() { - if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then - elog "DB IDO schema upgrade may be required required. - http://docs.icinga.org/icinga2/snapshot/doc/module/icinga2/chapter/upgrading-icinga-2" - fi -} diff --git a/net-analyzer/icinga2/icinga2-2.8.4.ebuild b/net-analyzer/icinga2/icinga2-2.8.4.ebuild index 4108f14e414..525aa185b12 100644 --- a/net-analyzer/icinga2/icinga2-2.8.4.ebuild +++ b/net-analyzer/icinga2/icinga2-2.8.4.ebuild @@ -5,7 +5,7 @@ EAPI=6 if [[ ${PV} != 9999 ]]; then inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" else inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"