gentoo resync : 19.01.2018

13 files changed, 314 insertions, 323 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index e2986ca3ae24..79578e3293f9 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/icinga-web/Manifest b/net-analyzer/icinga-web/Manifest
index 5fbbd92aaf10..95225e216cf7 100644
--- a/net-analyzer/icinga-web/Manifest
+++ b/net-analyzer/icinga-web/Manifest
@@ -1,5 +1,3 @@
-DIST icinga-web-1.14.0.tar.gz 14523746 BLAKE2B cff22c031ecc8af73690ea69c692b530aebd3f35c7a148999aedd9b142a6c304a88ee62af28ac0f80c09174bde6c1af15131596ad2ae8a7c3238a247261adc60 SHA512 9e429ffaf84efb08e0ad009af2dd90179366d4de5720bc09574228d3a6dec967eddc04402f5fac220e7af14761afec4b9021f70255102829e21880591d702d3b
 DIST icinga-web-1.14.1.tar.gz 14524043 BLAKE2B 0a3bdf9afc77b508dd3967e38050f6babfe01240f8cf8196158abe42818079b09a962513541298d0b0ac2b1497640d292cf1ef4feac24e302c0622f6ef0fafd8 SHA512 1ddb1fe128c2ceff20e232d61d84abebbe9578f2ef9bf0c408523c399ab6125dedc7d4e82981fff113aba8959a1ac02712032b4a36e5aa951850c084792a47bb
-EBUILD icinga-web-1.14.0.ebuild 6360 BLAKE2B 361c749beca799db709a9dce0bc449e668a61cedab1d03b2a974dcc523918aa9a20aa48042a6f3446e236d24645707ca57dd2a44b562b390eefe436fb71733e0 SHA512 2f0e86345412a2af5541fe9dfb949abef6f7fd53018c65b876ef9d1a64b3c7cac015f49f8f4f8716f28fe2a6d4136dff3da448ce8f92e7816d86ce2c80e1fc2b
-EBUILD icinga-web-1.14.1.ebuild 6360 BLAKE2B f8962deafc94072f82cab470c1259b523be0bbdbfddb29fd821d8861117e5c10c481c15de2a5f97f081ba99ad7a3eeb77730a2eda7f8b3d2317a0a54ba55a5d7 SHA512 2f16087f01e522ebcfda874a5cdd7cbcf9778dc0d032009212717cb9a28eae1fb0df3f9f8cd89705af13a66e9bce3f20c004684de6891bef6e457043844f1f07
+EBUILD icinga-web-1.14.1.ebuild 6360 BLAKE2B 5845a7721f786e19b202c0bb15f0e53cfdfedb11d1e8674fbe4e1c3a16fab2714be6a298a2e5ffd9f5fa134e4975ba63e11432af2c8cebe9703cc6037454ac7e SHA512 7ae63a1a3461fe43aed12d31729adbc82cee15319d259c1f78e308b262601b2b150f871bb4fb97f1e1a1632fc6442a6e79cbe0947ed34e26b2dc733baa0f0638
 MISC metadata.xml 565 BLAKE2B 8f3d66d10fc929779bccaed43db56800be1cd81ed044b0244e8db73b89d9587b9554a59915477dccf5fb0bd7d4f96d9b6330a9309c0e79d20bbd458d827bdfbe SHA512 534f181a73fff13650cd97081c748cf0d75424bab7826ac83eda2a09e6cd3737fd447db3ad9a0207b2cdb24cc84f0515ad5282de2024ec6eddae2a85be41a084
diff --git a/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild b/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
deleted file mode 100644
index 215958015581..000000000000
--- a/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit depend.apache eutils user multilib
-
-DESCRIPTION="Icinga Web - new Web Interface"
-HOMEPAGE="http://www.icinga.org/"
-SRC_URI="https://github.com/icinga/${PN}/archive/v${PV}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="apache2 mysql pnp postgres"
-DEPEND="dev-php/phing
-		dev-db/libdbi-drivers[mysql?,postgres?]
-		|| ( >=net-analyzer/icinga-1.10.0 >=net-analyzer/icinga2-2.1.1 )
-		dev-lang/php:=[apache2?,cli,json,mysql?,pdo,postgres?,sockets,xslt,xml]
-		pnp? ( net-analyzer/pnp4nagios )"
-RDEPEND="${DEPEND}"
-
-want_apache2
-
-pkg_setup() {
-	if use apache2 ; then
-		depend.apache_pkg_setup
-	fi
-	enewgroup icinga
-	enewgroup nagios
-	enewuser icinga -1 -1 /var/lib/icinga "icinga,nagios"
-}
-
-src_prepare() {
-	#removed checks for some php stuff since we have these things called use flags
-	sed -i 's/ACICINGA_CHECK_PHP_MODULE/\#ACICINGA_CHECK_PHP_MODULE/g' configure.ac
-	sed -i 's/make\ /make\ \-j1\ /g' lib/Makefile.in
-	autoreconf
-}
-
-src_configure() {
-	local myconf
-
-	myconf="--prefix=/usr/share/icinga/icinga-web
-	--bindir=/usr/sbin
-	--sbindir=/usr/$(get_libdir)/icinga/cgi-bin
-	--datarootdir=/usr/share/icinga/htdocs
-	--localstatedir=/var/lib/icinga
-	--sysconfdir=/etc/icinga
-	--libexecdir=/usr/$(get_libdir)/icinga/plugins
-	--with-bin-user=icinga
-	--with-bin-group=nagios
-	--with-api-cmd-file=/var/lib/icinga/rw/icinga.cmd
-	--with-conf-dir=/etc/icinga-web
-	--with-log-dir=/var/log/icinga-web
-	--with-icinga-objects-dir=/etc/icinga/objects
-	--with-icinga-bin=/usr/sbin/icinga
-	--with-icinga-cfg=/etc/icinga/icinga.cfg"
-
-	if use apache2 ; then
-		myconf+=" --with-web-user=apache
-		--with-web-group=apache
-		--with-web-apache-path=${APACHE_MODULES_CONFDIR}"
-	else
-		myconf+=" --with-web-user=root
-		--with-web-group=root"
-	fi
-
-	if use postgres ; then
-		myconf+=" --with-db-type=pgsql
-		--with-db-port=5432
-		--with-api-subtype=pgsql
-		--with-api-port=5432"
-	fi
-
-	econf ${myconf}
-}
-
-src_install() {
-	dodoc README
-	rm -f README
-
-	emake -j1 DESTDIR="${D}" install
-
-	emake DESTDIR="${D}" install-javascript
-
-	if use apache2 ; then
-		dodir ${APACHE_MODULES_CONFDIR}
-		emake DESTDIR="${D}" install-apache-config
-		echo '<IfDefine ICINGA_WEB>' > "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-		cat "${WORKDIR}/${P}/etc/apache2/icinga-web.conf" >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-		rm "${D}/${APACHE_MODULES_CONFDIR}/icinga-web.conf" || die "rm failed"
-		echo '</IfDefine>' >> "${D}/${APACHE_MODULES_CONFDIR}/99_icinga-web.conf"
-	fi
-
-	insinto /usr/share/icinga/icinga-web/contrib
-	doins -r etc/schema/*
-
-	if use apache2 ; then
-		sed -i 's/%%USER%%/apache/g'  etc/scheduler/icingaCron
-	else
-		sed -i 's/%%USER%%/root/g'  etc/scheduler/icingaCron
-	fi
-	sed -i 's/%%PATH%%/\/usr\/share\/icinga\/icinga-web/g' etc/scheduler/icingaCron
-
-	dodir /usr/share/icinga/icinga-web/cron/
-	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/crontab <<EOF
-# Force the shell to bash
-SHELL=/bin/bash
-#mail to root
-MAILTO=root
-
-#runs every minute
-* * * * * /usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
-EOF
-
-	cat - >> "${D}"/usr/share/icinga/icinga-web/cron/fcrontab <<EOF
-# Mail reports to root
-!mailto(root)
-
-#runs every minute
-@ 1		/usr/bin/php /usr/share/icinga/icinga-web/lib/icingaScheduler/icingaCron.php --useAgavi --exec >> /var/log/icinga-web/cron_error.log
-EOF
-
-	if use apache2 ; then
-		diropts -o apache -g apache
-	else
-		diropts -o root -g root
-	fi
-	dodir /var/log/icinga-web
-
-	if use apache2 ; then
-		fowners apache:apache /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
-	else
-		fowners root:root /usr/share/icinga/icinga-web/lib/icingaScheduler/res/storage.dat
-	fi
-
-	if use pnp ; then
-		insinto /usr/share/icinga/icinga-web/app/modules/Cronks/data/xml/extensions/
-		doins contrib/PNP_Integration/templateExtensions/pnp-host-extension.xml
-		doins contrib/PNP_Integration/templateExtensions/pnp-service-extension.xml
-	fi
-}
-
-pkg_config() {
-	einfo "press enter to install the icinga-web crontab"
-	einfo "installation from /usr/share/icinga/icinga-web/cron/icingaCron"
-	einfo
-	read
-
-	if has_version sys-process/fcron; then
-		fcrontab - -u root < /usr/share/icinga/icinga-web/cron/fcrontab
-	else
-		crontab - -u root < /usr/share/icinga/icinga-web/cron/crontab
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If this is a new install, you must create a new database for it, e.g. icinga_web."
-	einfo "You can find the database scripts in /usr/share/icinga/icinga-web/contrib/."
-	einfo
-	einfo "Additionally, you need to setup a database user."
-	einfo "The user must have default data privileges like SELECT, UPDATE, INSERT, DELETE."
-	einfo
-	einfo "Example for a MySQL database:"
-	einfo "  echo \"CREATE DATABASE icinga_web;\" | mysql"
-	einfo "  echo \"GRANT SELECT,UPDATE,INSERT,DELETE ON icinga_web.* TO 'icinga_web'@'localhost' IDENTIFIED BY 'xxxxxx';\" | mysql"
-	einfo "  echo \"FLUSH PRIVILEGES;\" | mysql"
-	einfo
-	einfo "  cat /usr/share/icinga/icinga-web/contrib/mysql.sql | mysql icinga_web"
-	einfo
-
-	ewarn
-	ewarn "If you're upgrading from a previous release, you must upgrade your database schema."
-	ewarn "You can find upgrade scripts in /usr/share/icinga/icinga-web/contrib/updates/."
-	ewarn
-	ewarn "IMPORTANT: If you are upgrading from an older version and there are other versions in between,"
-	ewarn "           be advised that you need to apply those upgrade files with incremental steps!"
-	ewarn
-	ewarn "Example to upgrade a MySQL database:"
-	ewarn "  cat  /usr/share/icinga/icinga-web/contrib/updates/mysql_<oldversion>_to_<newversion>.sql | mysql icinga_web"
-	ewarn
-	ewarn "Don't forget to clear the config cache."
-	ewarn "  /usr/share/icinga/icinga-web/bin/clearcache.sh"
-	ewarn
-
-	einfo
-	einfo "Please note that the magic_quotes_gpc setting must be disabled (in both apache and cli php.ini)."
-	einfo
-
-	if use apache2 ; then
-		einfo
-		einfo "apache config was installed into"
-		einfo "/etc/apache2/modules.d/99_icinga-web.conf"
-		einfo
-		einfo "The apache config value for \'ServerTokens\' must be set to at"
-		einfo "least \'Min\'."
-		einfo
-	else
-		einfo
-		einfo "If you are not using apache you may need to change some"
-		einfo "permissions, so that your web server can access files and logs"
-		einfo
-	fi
-}
diff --git a/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild b/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild
index cac1bd8c81a5..23df79b6d767 100644
--- a/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild
+++ b/net-analyzer/icinga-web/icinga-web-1.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
diff --git a/net-analyzer/icinga2/Manifest b/net-analyzer/icinga2/Manifest
index 80449f084003..5dcd7900dbf0 100644
--- a/net-analyzer/icinga2/Manifest
+++ b/net-analyzer/icinga2/Manifest
@@ -5,9 +5,11 @@ DIST icinga2-2.7.0.tar.gz 2435398 BLAKE2B 06a717f818a7c51972d2d095ea1c588ff8d494
 DIST icinga2-2.7.1.tar.gz 2475348 BLAKE2B 2e19a3c199b5cbcac78490a9ee1961c8e54f15787d08fa22150a977fb16aa7e736e76b97b66749ebd4070e9d0bfb0c8a484b8430288845de9ac456771d875682 SHA512 8233c33b7191706569a236d583fff689b35eba750fca01a06cfd14ef636b01314b6b142d78777987bd08a9df1cc53f42652fd1c900532b73f0a0363aa220c6cd
 DIST icinga2-2.7.2.tar.gz 2471098 BLAKE2B 362897613616a15114577a044d56f01093246fa421c307faff1c6208a01e2c62dda2d1ff3aabc2e57b58c1cc6d4cb841a51758f0572945be2eced22390eb98ae SHA512 69cd7c56eaae832712723fcd21e2177b8180b3975bcf773223ca52d3817d1ca538cfd620002bd7a9ccf2e89deffa80d07e6281111146295b21377de99170302d
 DIST icinga2-2.8.0.tar.gz 2497043 BLAKE2B 06472b30ad1fa008796fb149ac067cf92062443d4c6ef62043b6e53b901e1c282c68d1949a3ac6eabc33456c3863bb5dfe45cd668b23ac22e705e3e346afbd59 SHA512 20399251c91aa3b07a0e884e0c52fa2540b645d24fd46cdb550fcc5accfbfa23a703f7d310ccde4fa68008c44e8dc6bcdc5351a21e82181e39b1add5a92d90c6
+DIST icinga2-2.8.1.tar.gz 2501182 BLAKE2B a32e60f8888d43eacedaee3cb33b719e2e405a6123710f7806b6c82eccb80eeb0ab0318a34302a5f3b310b258702214148f34719f166b3a3807ef2c9d4b28fa0 SHA512 27dcd2de1a9fa81327fa9cf25f25171e471715b4506dfd312bcd6c10408520cef86d260762f4340a00aaa7824c8ab65baadf541b7e104bd378204667dc92f762
 EBUILD icinga2-2.7.0-r1.ebuild 4648 BLAKE2B 08a2478b8dae25efdfc9cd05c0221b6121c8c0a82a656c7cc6cbae9435fc0bb0a5e404b9363d89bfc5c2705550e8bf64905934175c38108eece05b2076bf43db SHA512 aa2c2ac86a697c75a4ef4c14a8ae1f57164d7614e06082aadbed2b43bcd8762938ac8afd9beb64c982bfb4e29dc5d08b530987248132e218247b8c930195837f
 EBUILD icinga2-2.7.1-r1.ebuild 4758 BLAKE2B e5699067582e9bfac6012fee8a84dfa7885b7987c8992eb1047f1c8a014120ad1b6d6f6501bfcbf3c841b0f0fcad9f2355a0f5ca06b07a2fc797f23f7861534f SHA512 62084a343b8362cbb2b6a2d25e10366e6739316a90152b57e8542b53026dde020196b96e67d20cd9dce199cf551d2d2a34685d6ea3b97878fe76524e5212a280
 EBUILD icinga2-2.7.2.ebuild 4760 BLAKE2B 2ee60166986809c528dd1c09c42a99dbd3a61f16e90540ca2fa6d3c6fbfba140679e663a333247c22ded647b6579bd2d392d4a3b5707cda167c9be95ad57f49d SHA512 87fa97f3731c5c5c4e6801fd40d2a235fd43039ecf2ab78f969cea26c8115a20dc42d4499a9bfe987335131ceb053e6f7994db806466d932a9fe54119e34c734
 EBUILD icinga2-2.8.0.ebuild 4640 BLAKE2B e504abae176dafdbcaa9f5a75377d257d8eb58695ced25a72acc4acb3230825fee0f1ad2502f094cad6991bde8a79a55ca4c76487d1dd5b1a32ab36697cc855c SHA512 a16c826b90c384188dadfd4eefc9de838d9bb073f5bbca9639ef83fd1c5e857059a78a2690b281060a3ee52768c3384ac44c5a4731457bd368b6234d307ae45d
+EBUILD icinga2-2.8.1.ebuild 4608 BLAKE2B fece3f6c999aa2d077c4d26902ab7daa7a1feaf4f554e063dfa7b14510f45b6fda846320de9c33c05918590cb5d9c4ef2c54d8fb071029627623dad02213a901 SHA512 de52b22493334703c55619b633650090217d6f0dae8095a9abb8ef3bf67d84b243738c0c9035ae090599734699c3336f1b2415f95edfdae72da63010270f3909
 EBUILD icinga2-9999.ebuild 4608 BLAKE2B e3c3b8c7c93458ee579764b087395cc004855dee56cc463a22d2787c541661e5963cf8d7b9d70374c302d1a82e3453a750c16d51d55daed81496b998335d9cc8 SHA512 d6d1d15e9e3e7bfb461c9eee901448cd489bb2fd86575291790e463c16d133ec1ecf15f72f3a67e5a9ee3de4dba450ad51b6940c5b966ae688d8a9d51ba4d5fc
 MISC metadata.xml 816 BLAKE2B 6d820358c90a580be01149ae631f40dbeb5f50ce0df937ac484269c9a58f21a450d3861dce3b34ee0882b3b61d981da8162af735c5a3de90bb7b74dae9523d08 SHA512 0d3ac2d9233f7ce53a8105caed0231cefa402861e26c760de3fb23163ea68c21b97f5ec0de65bc6953aaf2dd8fa90a9edc045a2fea8b622efdd1336959e9e60b
diff --git a/net-analyzer/icinga2/icinga2-2.8.1.ebuild b/net-analyzer/icinga2/icinga2-2.8.1.ebuild
new file mode 100644
index 000000000000..81a25cd01f1d
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.8.1.ebuild
@@ -0,0 +1,178 @@
+# 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"
+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 ) )"
+
+PATCHES=(
+)
+
+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/iftop/Manifest b/net-analyzer/iftop/Manifest
index 8b452bcc1b12..51455f573c2b 100644
--- a/net-analyzer/iftop/Manifest
+++ b/net-analyzer/iftop/Manifest
@@ -1,11 +1,10 @@
 AUX ax_pthread.m4 12983 BLAKE2B b1cbb45242493f9bf998ec82cf754b894d77ee4e1d3ed33b2e44e52c63c3114809ad4e42253579f9b3177a2b3de60aa8dac26311191b0ce7e82cf1f25f1a2123 SHA512 93c7ba3bb00712308de95273563f41814d05a6650ae2eec25f2b198f757b7f0206ae2e5679ff436da939be9bd962f37317978759ac08c1d14df0beb03440f84a
 AUX iftop-1.0_pre4-Makefile.am.patch 378 BLAKE2B 52029c14bc6afcd4d8cb86099fa78f00720af3d26384cdf059d005d768b8c226b459b5c1ebe2c936f20bb1afa033aa4560c488f98400b6cef162ebdcff3b7e03 SHA512 c7a81669de83701054493ee0f9979da8bfa481bd0769a501364598889cfb5aa762473e5099904ee13dad9052bfdd27913306df8ad4a91132532ac874504321fa
 AUX iftop-1.0_pre4-configure.ac.patch 9916 BLAKE2B deab542e4b33905e0ad215aa70498671cf5c4f7118a1ab3b8639bd992f540068a0cd3c7f846120686662825db864be9e3307cc1691b1ef86c8bc73b0e847d0f0 SHA512 5b83cdb69805d3ed8b188b1390d1d536dc99732312fa49951fad38810c7eb9c931d04daaaea7152d5289352dd3d167907ac5a25a994e4b1584b7b5a578fc0698
-AUX iftop-1.0_pre4-pthread.patch 1462 BLAKE2B 4345e571afe5830b51da3798df6c8ad1e2417f4d0579cc86750f51b9dc4ed3a1dfd92e5a3e792db467564c363f63beb2d6bfbac9a616ac6a80d37aafbf995e5e SHA512 0befb38a673d826f25319517d64e4aecea641cdc8626ab51bd468dc0e2f23c779854fbfd9e7cfe51e30ecdf04e3c831fc793ab5e402df3c8153044c679add2b8
-AUX iftop-1.0_pre4-tinfo.patch 1560 BLAKE2B d9c3d6363c718fba0148753acfe0c99e04f2fe447fe0f7b03459bc37818b7654322c26eafd3f21ccd03ee323d855a2d20c17828ad4d17250df3cea49f8fdc40a SHA512 d47095fdc65f0dea60471d0c927ab7bf4d51129826bfbf1cc95233054a8d17d36de7e86042c7d2ac0faa0b27f3ced169b5063cc8d36dcf78c548a920ae59f4e2
+AUX iftop-1.0_pre4-ip6.arpa.patch 1857 BLAKE2B 920b5393366d0fe1ccf7619a862fb6a919abcaf578babc2d7de05b7828a7c847a2ad65ece44e91bab29aead849d0f65bffae0ed680e03fe07f218a15cefe13fd SHA512 8fed0043412a25a702d252f0bbf36b199c9222c18ac9bb47ef725885a9faaacb12bf6e5debd5885544ace68065bfda12c2b6ccf7e11f2834cf3f86f6657bfcba
 AUX iftop-1.0_pre4-tsent-set-but-not-used.patch 229 BLAKE2B 42318fa63e40a2a0b3f50d33c6ca3fef69c837290272f132d63dde276a4302254378f8ab31ab49dbb0b50e821594a2979c713f9119eb4ec852971b585648b344 SHA512 06d26d9497c6afc6b7eb5db508def08c8945408e89127f3938667973f8a8b7884dc0e7b005c115a7acd66d62107de5d47d49a869b89f25f24dd999161b0fb0bf
 AUX iftoprc 1391 BLAKE2B b2558509d0f8e9dfade1bcb1a1b50569510cada2629fb3b0cb772d2fa0642455ed6e4c18024a19b656bb9d42eefd4e2db2ea066dae28528ad51f12b439307f0a SHA512 01373add0177399e7cf4ae0ecba893fdd9c73bad5243478b4ac9ac5e936647738a22906ee1e8b22b51d541cc4150d0e0619f134666a1e3d0cb78a59a5c04b95b
 DIST iftop-1.0pre4.tar.gz 204665 BLAKE2B 181385c3fbf43abd4ead975aac11b5ff196de94d9a8d6f195b3f0068aba6ae953067995d19f0175b49ab15c447c99d531542ae786603ee390e080e79bdcd7ae3 SHA512 abd74e8025bb82fef9ebab4997b1d018201a523d47c0128128ca37797490046538d74758dc4471735c22b890e5bd238ad6b2a30776d465138ede367cdd263d22
 EBUILD iftop-1.0_pre4-r2.ebuild 942 BLAKE2B 15e691dc44693bba16bf4a326419f69bb0fef3698262f017e4becb3828e3fec88f5818997da86dd39fd021d316087a4b32fe0c8c6120ab0902f665b43312a8de SHA512 99a36fad0f615711d836ee6e8aa8c4c370c609944cd8fd0d66e40cb3b0b4f8bd0605a5c193a33f1a557ec13a74d63288c4e93a76669f45398183f02bbdfe7898
-EBUILD iftop-1.0_pre4.ebuild 878 BLAKE2B 33e5de1fabe37241a52c18f47168187be9321197bf8513f6b92fea4002dc16567864c55603b39c6b37e1e8c7068b365a5a1edf6c9dfe5e5ef1c822bc86a6b1fa SHA512 343e55b2ce782d9c7e15d9c0e12620c16ae222a5666258215eac083f6a87721fa64ecadfaa83b39bf691b65925ed11f82c6044421f751da5fc2bf7a3bff8705c
+EBUILD iftop-1.0_pre4-r3.ebuild 977 BLAKE2B 942285e9896f3cd1b4431a41ce75ac55131dfe2ae7b0978596327a9df4d238d9088e2952f958a5eca725e99f4f0c8b7a06533020c7531b6e5ef3393cbd74084e SHA512 9d3e84519fcd745d055dc8c1fea5525f25d08ddf30bb8894cef7d2af3631d2d5fa5aa5368026c5092f5bce2a60f663db7245de2d82ede451eb57ff06d4f78ac1
 MISC metadata.xml 286 BLAKE2B a278f67a760b977849da10dfbc6f2da19da66b553e51f6a7f32403dbb8eca85432dcec745815bc9b55596bf5eece7916ddd7657360d110d91a83b6077eec2619 SHA512 cfd1ca7999686b831b0b459f5b06ea80fd28b4f24d3404a8ad90bb4d6461a011f6a2b338ebbf45c2eac621ec828dcc397b26c2ae82068e5b703271a85c76e760
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-ip6.arpa.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-ip6.arpa.patch
new file mode 100644
index 000000000000..706db4546db9
--- /dev/null
+++ b/net-analyzer/iftop/files/iftop-1.0_pre4-ip6.arpa.patch
@@ -0,0 +1,48 @@
+From 35af3cf65f17961d173b31fd3b00166ec095c226 Mon Sep 17 00:00:00 2001
+From: Paul Warren <pdw@mythic-beasts.com>
+Date: Mon, 6 Feb 2017 21:35:37 +0000
+Subject: [PATCH] Fix bug with DNS resolution. https://bugzilla.redhat.com/show_bug.cgi?id=1120254
+
+---
+ resolver.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/resolver.c b/resolver.c
+index adddbc1..a3123bd 100644
+--- a/resolver.c
++++ b/resolver.c
+@@ -438,11 +438,11 @@ void resolver_worker(void* ptr) {
+ 		    char **ch_pp;
+ 		    void **void_pp;
+ 		} u_old = { &old };
+-                if(hash_find(ns_hash, &addr, u_old.void_pp) == HASH_STATUS_OK) {
++                if(hash_find(ns_hash, &addr.as_addr6, u_old.void_pp) == HASH_STATUS_OK) {
+                     hash_delete(ns_hash, &addr);
+                     xfree(old);
+                 }
+-                hash_insert(ns_hash, &addr, (void*)hostname);
++                hash_insert(ns_hash, &addr.as_addr6, (void*)hostname);
+             }
+ 
+         }
+@@ -488,7 +488,7 @@ void resolve(int af, void* addr, char* result, int buflen) {
+ 
+         pthread_mutex_lock(&resolver_queue_mutex);
+ 
+-        if(hash_find(ns_hash, raddr, u_hostname.void_pp) == HASH_STATUS_OK) {
++        if(hash_find(ns_hash, &raddr->as_addr6, u_hostname.void_pp) == HASH_STATUS_OK) {
+             /* Found => already resolved, or on the queue, no need to keep
+ 	     * it around */
+             free(raddr);
+@@ -497,7 +497,7 @@ void resolve(int af, void* addr, char* result, int buflen) {
+             hostname = xmalloc(INET6_ADDRSTRLEN);
+             inet_ntop(af, &raddr->addr, hostname, INET6_ADDRSTRLEN);
+ 
+-            hash_insert(ns_hash, raddr, hostname);
++            hash_insert(ns_hash, &raddr->as_addr6, hostname);
+ 
+             if(((head + 1) % RESOLVE_QUEUE_LENGTH) == tail) {
+                 /* queue full */
+--
+libgit2 0.26.0
+
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch
deleted file mode 100644
index ce04c46a65ef..000000000000
--- a/net-analyzer/iftop/files/iftop-1.0_pre4-pthread.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -383,39 +383,10 @@
- dnl libraries, etc. We use a test program to figure this stuff out.
- dnl
- 
--AC_MSG_CHECKING([POSIX threads compilation])
--thrfail=1
--oldCFLAGS=$CFLAGS
--oldLIBS=$LIBS
--for flag in "" -mt -pthread -thread ; do
--    CFLAGS="$oldCFLAGS $flag"
--    for lib in "" -lpthread "-lpthread -lposix4" ; do
--        LIBS="$oldLIBS $lib"
--        AC_LINK_IFELSE([AC_LANG_SOURCE([`cat config/pthread.c`])], [
--            foundthrlib=$lib
--            foundthrflag=$flag
--            thrfail=0
--            break
--            ])
--    done
--    if test $thrfail = 0 ; then
--        break
--    fi
--done
--
--if test $thrfail = 1 ; then
--    AC_MSG_RESULT([no idea])
--    AC_MSG_ERROR([can't figure out how to compile with POSIX threads
--  If your system actually supports POSIX threads, this means we've messed up.])
--fi
--
--AC_MSG_RESULT([CFLAGS=$foundthrflag and LIBS=$foundthrlib])
--AC_MSG_CHECKING([POSIX threads usability])
--AC_RUN_IFELSE([AC_LANG_SOURCE([`cat config/pthread.c`])],
--	      [AC_MSG_RESULT([yes])],
--              [AC_MSG_ERROR(
--	       [it fails.  We probably guessed the wrong CFLAGS.])],
--	      [AC_MSG_RESULT([can't test because we are cross-compiling])])
-+AX_PTHREAD(
-+  [LIBS="$PTHREAD_LIBS $LIBS"
-+  CFLAGS="$CFLAGS $PTHREAD_CFLAGS"],
-+  AC_MSG_ERROR([Could not find out how to enable POSIX threads]))
- 
- dnl
- dnl Are we on a system (like Solaris) that requires promiscuous mode in order to
diff --git a/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch b/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch
deleted file mode 100644
index bb14b3c6ca47..000000000000
--- a/net-analyzer/iftop/files/iftop-1.0_pre4-tinfo.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -25,7 +25,7 @@ iftop_SOURCES = addr_hash.c edline.c hash.c iftop.c ns_hash.c \
- #		 addrs_ioctl.c addrs_dlpi.c dlcommon.c \
- #		 stringmap.c cfgfile.c 
- 
--
-+iftop_LDADD = $(ncurses_LIBS)
- 
- noinst_HEADERS = addr_hash.h ether.h ethertype.h extract.h hash.h iftop.h \
-                  integers.h ip.h llc.h ns_hash.h options.h resolver.h \
---- a/configure.ac
-+++ b/configure.ac
-@@ -348,29 +348,27 @@
- dnl AC_SEARCH_LIBS....
- dnl
- 
--AC_MSG_CHECKING([for a curses library containing mvchgat])
--oldLIBS=$LIBS
--for curseslib in ncursesw curses ncurses ; do
--    LIBS="$oldLIBS -l$curseslib"
--    AC_TRY_LINK([
-+PKG_CHECK_MODULES([ncurses], [ncursesw], [foundcurseslib="$ncurses_LIBS"], [
-+    PKG_CHECK_MODULES([ncurses], [ncurses], [foundcurseslib="$ncurses_LIBS"], [
-+    AC_MSG_CHECKING([for a curses library containing mvchgat])
-+    oldLIBS=$LIBS
-+    for curseslib in ncursesw curses ncurses ; do
-+        LIBS="$oldLIBS -l$curseslib"
-+        AC_TRY_LINK([
- #include <$curseslib.h>
-         ], [
-         mvchgat(0, 0, 1, A_REVERSE, 0, NULL)
-         ], [
--        foundcurseslib=$curseslib
-+        foundcurseslib=-l$curseslib
-         break
-         ])
--done
--
--if test x$foundcurseslib = x ; then
--    AC_MSG_RESULT([none found])
-+    done
-+	],
-     AC_MSG_ERROR([Curses! Foiled again!
-   (Can't find a curses library supporting mvchgat.)
-   Consider installing ncurses.])
--else
--    AC_MSG_RESULT([-l$foundcurseslib])
--fi
--
-+	)
-+])
- 
- dnl
- dnl POSIX threads. Different systems like different combinations of flags,
diff --git a/net-analyzer/iftop/iftop-1.0_pre4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild
index 84f5ff4d23af..037c80722a7e 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-r3.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
+EAPI=6
 inherit autotools eutils
 
 DESCRIPTION="display bandwidth usage on an interface"
@@ -11,25 +10,28 @@ HOMEPAGE="http://www.ex-parrot.com/pdw/iftop/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 RDEPEND="
 	net-libs/libpcap
-	sys-libs/ncurses:0="
+	sys-libs/ncurses:0=
+"
 DEPEND="
 	${RDEPEND}
 	virtual/pkgconfig
 "
-
 S="${WORKDIR}"/${P/_/}
+PATCHES=(
+	"${FILESDIR}"/${P}-configure.ac.patch
+	"${FILESDIR}"/${P}-Makefile.am.patch
+	"${FILESDIR}"/${P}-tsent-set-but-not-used.patch
+	"${FILESDIR}"/${P}-ip6.arpa.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-tinfo.patch
-
+	default
 	# bug 490168
 	cat "${FILESDIR}"/ax_pthread.m4 >> "${S}"/acinclude.m4 || die
-	epatch "${FILESDIR}"/${P}-pthread.patch
 
 	eautoreconf
 }
diff --git a/net-analyzer/prometheus/Manifest b/net-analyzer/prometheus/Manifest
index 2aae03d7e3fb..95ceb22ca1d0 100644
--- a/net-analyzer/prometheus/Manifest
+++ b/net-analyzer/prometheus/Manifest
@@ -1,5 +1,7 @@
 AUX prometheus-3.initd 851 BLAKE2B 600d9e541206f99c0ddddc0f5a1d37d9bea69d8f45ce6562a2d3c040a75c3665d9862829fc44134db2fbbbbf1d38b7dc4010c9c284f5af38f0dd2cf4be1f9d11 SHA512 7d3650ef5b632507ade4cfb00a167ec7c2d3d8e91551ef8f4550f9947038df0b22a3dd0a33e093296eeb0ca88f1d12ae40e73c7fec4df03e5dcc7630893ded59
 AUX prometheus.confd 43 BLAKE2B c83afa8ad1133c9e93abd40c862ff5b3ac9a3b3c4447b915ae1482d92096dec9f200d089de2458a6cdb0e72d2bf0652d56e3afd6d5a3cd8a3ed7a6c9a0e3e42c SHA512 37468e897cd34b50b0edc65ada3f0c2e05459c3d96bb7f82d58b6de5bf10a127f1bf7912af93d83d94e3ea7287cfeb2311e36535f291d01a11d152a0b438591c
 DIST prometheus-2.0.0.tar.gz 5603884 BLAKE2B 0e2c7ee267f4f817fe84105b89fa2951c07212ca75bf540c67afe900c1df62641919f2ad9d2ce24932a946a0c3db8da6847184c56578ef9626db1f55c1ea3080 SHA512 9d23e10b3eb12755781b9edc5c32a0cb1e99055a8a905517619d992a174a8621ebc1e82999ce2412e7fc3e2e0af8a0dfe1eded8bcd2701a5aaaffce79c7fbcc5
+DIST prometheus-2.1.0.tar.gz 5669858 BLAKE2B 96b9d7b1eb13017806cb2745cb874468a419550c7372aa8abada9d1a4e7fe386785f05abe8fd5681745db4a0c17260d5fde704a3b3ac5807107da0a935177264 SHA512 8adbbfcf6cf5b0bdd4a96f51f6c179c828d75a231b35f9ef40db6c07bcb8ffa6a3eb969b55a52ac70528ad5c8fe486be866db6ae174006220e0cfaa1da624346
 EBUILD prometheus-2.0.0-r1.ebuild 2000 BLAKE2B 13fbd2811ab3feefcb1018cdce480b0e1b663e42d631db5c27a003544399fdf99a3df1dd0ede40c8e552a47ab5a0e4f577121c5112c8e7ed43acd8d9892c7f81 SHA512 d08dd4d8056ea966a9b50e4faa21bd00804b8f6402ac8557f3a12a90451a6bda62731638488aaefb15de1250e360e10bbcd72c22f91f7f7a88f0645e4b7a2b77
+EBUILD prometheus-2.1.0.ebuild 2000 BLAKE2B 2cfc7d475c7d51dde9b0dfd914bd4a835d463c7228859a888a3dcf73f21bfcbeff721d35837cb2b73b019c22e2d887191f0d3cbb80583b8db65d10775e96c860 SHA512 68e73fa3684510f0da380a211db0bc09e396795ee4424217afc3179a1c57531e21873ac82109bba916ca8bdf1f3f0f16d030dc15c7f462d96b943f383ac9a5e8
 MISC metadata.xml 331 BLAKE2B 80bf59233349fc1fdc6c102fb65ba146bcde2c5c2a6039ec9b9f50f21a36fb1e8c864cba422e721d01216c792ffcf0429a3a840540305442b5e516ac09c03850 SHA512 06fd0da413c0280a902bbdf50e1e0557375d2208021fda3c3081d8a25a4b17ad1ca647d994dd97ba2d838ea5c87148d3ffd13a8a54cb8dc007b45927df8de47a
diff --git a/net-analyzer/prometheus/prometheus-2.1.0.ebuild b/net-analyzer/prometheus/prometheus-2.1.0.ebuild
new file mode 100644
index 000000000000..f6d36b877433
--- /dev/null
+++ b/net-analyzer/prometheus/prometheus-2.1.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/prometheus"
+MY_PV=${PV/_rc/-rc.}
+EGIT_COMMIT="v${MY_PV}"
+PROMETHEUS_COMMIT="85f23d8"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup prometheus
+	enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${PROMETHEUS_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${S}" promu build -v || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin promtool prometheus
+	dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+	insinto /etc/prometheus
+	doins documentation/examples/prometheus.yml
+	insinto /usr/share/prometheus
+	doins -r console_libraries consoles
+	dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+	dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+	popd || die
+
+	newinitd "${FILESDIR}"/prometheus-3.initd prometheus
+	newconfd "${FILESDIR}"/prometheus.confd prometheus
+	keepdir /var/log/prometheus /var/lib/prometheus
+	fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+	if has_version '<net-analyzer/prometheus-2.0.0_rc0'; then
+		ewarn "Old prometheus 1.x TSDB won't be converted to the new prometheus 2.0 format"
+		ewarn "Be aware that the old data currently cannot be accessed with prometheus 2.0"
+		ewarn "This release requires a clean storage directory and is not compatible with"
+		ewarn "files created by previous beta releases"
+	fi
+}