commit:     35662b97bb5556fa3801b9e2258e52c850adacb2
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 19:15:00 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 19:15:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35662b97

net-analyzer/icinga2: cleanup old

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 net-analyzer/icinga2/Manifest              |   2 -
 net-analyzer/icinga2/icinga2-2.11.6.ebuild | 170 -----------------------------
 net-analyzer/icinga2/icinga2-2.12.1.ebuild | 149 -------------------------
 3 files changed, 321 deletions(-)

diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index a70f7885063..e92368b9b6f 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -1,3 +1 @@
-DIST icinga2-2.11.6.tar.gz 7480970 BLAKE2B 
d247a4c0272227e0dfa2df46f91d84c7630c56df8d77d7de30aea715509b68fddbe74ef58c9b50acb4965e7108c3f9c23cf4e9c0f1a572763c34dd87cfaae1ec
 SHA512 
e455d10612721ef6090256618c5a87e2f06e6284c2b2d137b85058bb5cdc30f3524fbcab5559acbe891e37d90f862c1b117115451bb3b59b8a2f67bb9d027e6e
-DIST icinga2-2.12.1.tar.gz 7532104 BLAKE2B 
addb3bb6f81cb41e1ec23e989d6151af6f39fdded5a76a791806114cc2ba46c786b5d6674e9e0e86eb701cb5132f766cdf3cbdfbbcc0f9263db3a7ba844705c6
 SHA512 
8c266db67fb7aa27dc86e9dc28fa0e1ff7b11260ed529d3963c5cf25a5230fc9f02d7d44076948fbde6e39e2cb02f2d99c2c5b72396154baf95aaa5eba461529
 DIST icinga2-2.12.3.tar.gz 7534454 BLAKE2B 
021f940b3885c90cc43b4708c83430685fdb692d5ce95ed0f667a95b7dd2f4817b30fb7b05f1e214ba3aa31cef806af0f83e68447ece94916d806fb95f66526e
 SHA512 
28b87e03a8ffeb7a1d19ddf9555151b826f7bf1fd33b0139c2fc8abe7c89d66d96089d5b32d0aaccc3876040514b2bfbde9970416d5ec4ea3b023b17c0fb1799

diff --git a/net-analyzer/icinga2/icinga2-2.11.6.ebuild 
b/net-analyzer/icinga2/icinga2-2.11.6.ebuild
deleted file mode 100644
index bb0f2605e73..00000000000
--- a/net-analyzer/icinga2/icinga2-2.11.6.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 
wxwidgets
-       SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-       KEYWORDS="~amd64 ~arm64 ~x86"
-else
-       inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs 
wxwidgets
-       EGIT_REPO_URI="https://github.com/Icinga/icinga2.git";
-       EGIT_BRANCH="master"
-fi
-
-DESCRIPTION="Distributed, general purpose, network monitoring engine"
-HOMEPAGE="http://icinga.org/icinga2";
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="console libressl lto mail mariadb minimal +mysql nano-syntax +plugins 
postgres systemd +vim-syntax"
-WX_GTK_VER="3.0"
-
-CDEPEND="
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl: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"
-
-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 )
-       acct-user/icinga
-       acct-group/icinga
-       acct-group/icingacmd
-       acct-group/nagios"
-
-REQUIRED_USE="!minimal? ( || ( mariadb mysql postgres ) )"
-
-want_apache2
-
-pkg_setup() {
-       depend.apache_pkg_setup
-}
-
-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_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=yes
-               -DUSE_SYSTEMD=$(usex systemd ON OFF)
-               -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
-
-       cmake-utils_src_configure
-}
-
-src_install() {
-       BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
-       cd "${BUILDDIR}" || die
-
-       emake DESTDIR="${D}" install
-
-       einstalldocs
-
-       newinitd "${FILESDIR}"/icinga2.initd-3 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/*
-       fi
-       if use mariadb ; then  # same as mysql
-               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 && -n ${REPLACING_VERSIONS} && 
${REPLACING_VERSIONS} != ${PV} ]]; then
-               elog "DB IDO schema upgrade may be required required.
-               
https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/";
-       fi
-}

diff --git a/net-analyzer/icinga2/icinga2-2.12.1.ebuild 
b/net-analyzer/icinga2/icinga2-2.12.1.ebuild
deleted file mode 100644
index ad2f31c9b0f..00000000000
--- a/net-analyzer/icinga2/icinga2-2.12.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2020 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 libressl lto mail mariadb minimal +mysql nano-syntax 
+plugins postgres systemd +vim-syntax"
-
-# Add accounts to DEPEND because of fowners in src_install
-DEPEND="
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl: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
-       "${FILESDIR}/${PN}-2.12.1-boost-1.74.0.patch"
-)
-
-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
-}

Reply via email to