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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 53051158087 for ; Sat, 15 Jan 2022 17:54:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DCE42BC024; Sat, 15 Jan 2022 17:54:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1938C2BC024 for ; Sat, 15 Jan 2022 17:54:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0B95F343341 for ; Sat, 15 Jan 2022 17:54:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 484B82A0 for ; Sat, 15 Jan 2022 17:54:26 +0000 (UTC) From: "Matthew 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, "Matthew Thode" Message-ID: <1642269260.ddcb18f8d2d6e61f6bd78770a978656bdfcf4880.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.13.1.ebuild X-VCS-Directories: net-analyzer/icinga2/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: ddcb18f8d2d6e61f6bd78770a978656bdfcf4880 X-VCS-Branch: master Date: Sat, 15 Jan 2022 17:54:26 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5458004b-8f0a-4e61-a1b4-3014574cc48f X-Archives-Hash: 5a315901b583ed639e58b19434f650ef commit: ddcb18f8d2d6e61f6bd78770a978656bdfcf4880 Author: Matthew Thode gentoo org> AuthorDate: Sat Jan 15 17:51:42 2022 +0000 Commit: Matthew Thode gentoo org> CommitDate: Sat Jan 15 17:54:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddcb18f8 net-analyzer/icinga2: 2.13.1 cleanup Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Matthew Thode gentoo.org> net-analyzer/icinga2/Manifest | 1 - net-analyzer/icinga2/icinga2-2.13.1.ebuild | 147 ----------------------------- 2 files changed, 148 deletions(-) diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest index 5408437a5ecf..257e30c33fe4 100644 --- a/net-analyzer/icinga2/Manifest +++ b/net-analyzer/icinga2/Manifest @@ -1,3 +1,2 @@ -DIST icinga2-2.13.1.tar.gz 7585070 BLAKE2B 5a81d627728f8afb0c19761972d45606db246c132dfeb92d2fb32479631add8aaeb1d0dea66f354d3638ca346a3e8bcc266e8397e5246f984566f75c2b5e8003 SHA512 450df3ee36457006c78ca244331d111f65642ba5e232be28e60f189de998f5bb8ed70f2e1d46ea61374ae7bd6a5cf950e487bada1c7af7064970a149cc86baa7 DIST icinga2-2.13.2-9092.patch 1118 BLAKE2B c63342b8eff6afead9bf3ccec5c6df6583c2e327edb1433731ca14743ce9c6b0bde0797c6f251480e3bbfb5e6cdaae3444ea6ae6f6740bc228bd6aae5380044d SHA512 1056ff8bd66f2da86afb9664e3415d713be03b80def6d256b6db57f0864d150bc26c0fd3ce05d836da126a2616f2c70ecce05a83bb5425c25f6204d7e522ef94 DIST icinga2-2.13.2.tar.gz 7589357 BLAKE2B 6e1ba570e0286f09f37b3cea3b1cd833fd3005c5788e24b750edb100346c46958e97ed5df05947dc47c2bbf856cc6090d661e741072f473b8308aee5e1c0e94e SHA512 39a6f996bca671a2a22fc04e5995714b874e027888a7c9e479d5b526b23104915b7f99afb1220d440af482013043e5b969b0a0145041ac55009d1a81053e2906 diff --git a/net-analyzer/icinga2/icinga2-2.13.1.ebuild b/net-analyzer/icinga2/icinga2-2.13.1.ebuild deleted file mode 100644 index 3e79963a2e64..000000000000 --- a/net-analyzer/icinga2/icinga2-2.13.1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake systemd - -if [[ ${PV} != 9999 ]]; then - SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -else - inherit git-r3 - EGIT_REPO_URI="https://github.com/Icinga/icinga2.git" -fi - -DESCRIPTION="Distributed, general purpose, network monitoring engine" -HOMEPAGE="https://icinga.com/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="console jumbo-build lto mail mariadb minimal +mysql nano-syntax +plugins postgres systemd +vim-syntax" - -# Add accounts to DEPEND because of fowners in src_install -DEPEND=" - dev-libs/openssl:0= - >=dev-libs/boost-1.66.0:=[context] - console? ( dev-libs/libedit ) - mariadb? ( dev-db/mariadb-connector-c:= ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - dev-libs/yajl:= - acct-user/icinga - acct-group/icinga - acct-group/icingacmd" -BDEPEND=" - sys-devel/bison - >=sys-devel/flex-2.5.35" -RDEPEND=" - ${DEPEND} - plugins? ( || ( - net-analyzer/monitoring-plugins - net-analyzer/nagios-plugins - ) ) - mail? ( virtual/mailx ) - acct-group/nagios" - -REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )" - -PATCHES=( - # https://github.com/Icinga/icinga2/issues/8185#issuecomment-680875875 -) - -src_configure() { - local mycmakeargs=( - -DICINGA2_UNITY_BUILD=$(usex jumbo-build) - -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 - -DICINGA2_RUNDIR=/run - -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON - -DUSE_SYSTEMD=$(usex systemd) - -DLOGROTATE_HAS_SU=ON - -DICINGA2_LTO_BUILD=$(usex lto) - ) - # 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) - -DICINGA2_WITH_MYSQL=$(usex mysql yes $(usex mariadb)) - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - newinitd "${FILESDIR}"/icinga2.initd-3 icinga2 - - if use mysql || use mariadb; 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/* - fi - if 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}/run" || die "failed to remove /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 ]]; then - local v - for v in ${REPLACING_VERSIONS}; do - if ver_test "${PV}" -gt "${v}"; then - elog "DB IDO schema upgrade may be required." - elog "https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/" - fi - done - fi -}