summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2022-01-03 17:01:57 +0100
committerSam James <sam@gentoo.org>2022-01-04 03:28:41 +0000
commit0d6b26d7906996ac8e2f4fd260afdc55fd418209 (patch)
tree06386ca1dc7ce36f63defa206b99d233d741d2de /app-metrics/collectd
parentapp-emulation/wine-vanilla: remove kernel_FreeBSD (diff)
downloadgentoo-0d6b26d7906996ac8e2f4fd260afdc55fd418209.tar.gz
gentoo-0d6b26d7906996ac8e2f4fd260afdc55fd418209.tar.bz2
gentoo-0d6b26d7906996ac8e2f4fd260afdc55fd418209.zip
app-metrics/collectd: remove kernel_FreeBSD
Signed-off-by: David Seifert <soap@gentoo.org> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-metrics/collectd')
-rw-r--r--app-metrics/collectd/collectd-5.12.0-r1.ebuild22
-rw-r--r--app-metrics/collectd/collectd-5.12.0-r2.ebuild22
2 files changed, 6 insertions, 38 deletions
diff --git a/app-metrics/collectd/collectd-5.12.0-r1.ebuild b/app-metrics/collectd/collectd-5.12.0-r1.ebuild
index 1c16631dc941..1c9fdac841d9 100644
--- a/app-metrics/collectd/collectd-5.12.0-r1.ebuild
+++ b/app-metrics/collectd/collectd-5.12.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
SLOT="0"
KEYWORDS="~alpha amd64 arm x86"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
+IUSE="contrib debug java kernel_Darwin kernel_linux perl selinux static-libs udev xfs"
# The plugin lists have to follow here since they extend IUSE
@@ -150,15 +150,7 @@ COMMON_DEPEND="
collectd_plugins_write_redis? ( dev-libs/hiredis:= )
collectd_plugins_write_stackdriver? ( net-misc/curl:0= dev-libs/yajl:= )
collectd_plugins_xencpu? ( app-emulation/xen-tools:= )
-
- kernel_FreeBSD? (
- collectd_plugins_disk? ( sys-libs/libstatgrab:= )
- collectd_plugins_interface? ( sys-libs/libstatgrab:= )
- collectd_plugins_load? ( sys-libs/libstatgrab:= )
- collectd_plugins_memory? ( sys-libs/libstatgrab:= )
- collectd_plugins_swap? ( sys-libs/libstatgrab:= )
- collectd_plugins_users? ( sys-libs/libstatgrab:= )
- )"
+"
# FIXME: should virtual/jdk be here as well?
BDEPEND="virtual/pkgconfig"
@@ -337,9 +329,6 @@ src_configure() {
if use kernel_linux; then
einfo "Enabling Linux plugins."
myos_plugins=${linux_plugins}
- elif use kernel_FreeBSD; then
- einfo "Enabling FreeBSD plugins."
- myos_plugins=${bsd_plugins}
elif use kernel_Darwin; then
einfo "Enabling Darwin plugins."
myos_plugins=${darwin_plugins}
@@ -376,11 +365,6 @@ src_configure() {
if has ${plugin} ${myos_plugins}; then
# ... and available in this os
myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
- # ... must we link against libstatgrab? Bug #541518
- if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
- einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
- need_libstatgrab=1
- fi
else
# ... and NOT available in this os
if use collectd_plugins_${plugin}; then
diff --git a/app-metrics/collectd/collectd-5.12.0-r2.ebuild b/app-metrics/collectd/collectd-5.12.0-r2.ebuild
index c3aaedc933aa..f0ded8dfeb16 100644
--- a/app-metrics/collectd/collectd-5.12.0-r2.ebuild
+++ b/app-metrics/collectd/collectd-5.12.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~x86"
-IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
+IUSE="contrib debug java kernel_Darwin kernel_linux perl selinux static-libs udev xfs"
# The plugin lists have to follow here since they extend IUSE
@@ -150,15 +150,7 @@ COMMON_DEPEND="
collectd_plugins_write_redis? ( dev-libs/hiredis:= )
collectd_plugins_write_stackdriver? ( net-misc/curl:0= dev-libs/yajl:= )
collectd_plugins_xencpu? ( app-emulation/xen-tools:= )
-
- kernel_FreeBSD? (
- collectd_plugins_disk? ( sys-libs/libstatgrab:= )
- collectd_plugins_interface? ( sys-libs/libstatgrab:= )
- collectd_plugins_load? ( sys-libs/libstatgrab:= )
- collectd_plugins_memory? ( sys-libs/libstatgrab:= )
- collectd_plugins_swap? ( sys-libs/libstatgrab:= )
- collectd_plugins_users? ( sys-libs/libstatgrab:= )
- )"
+"
# FIXME: should virtual/jdk be here as well?
BDEPEND="virtual/pkgconfig"
@@ -337,9 +329,6 @@ src_configure() {
if use kernel_linux; then
einfo "Enabling Linux plugins."
myos_plugins=${linux_plugins}
- elif use kernel_FreeBSD; then
- einfo "Enabling FreeBSD plugins."
- myos_plugins=${bsd_plugins}
elif use kernel_Darwin; then
einfo "Enabling Darwin plugins."
myos_plugins=${darwin_plugins}
@@ -376,11 +365,6 @@ src_configure() {
if has ${plugin} ${myos_plugins}; then
# ... and available in this os
myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
- # ... must we link against libstatgrab? Bug #541518
- if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
- einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
- need_libstatgrab=1
- fi
else
# ... and NOT available in this os
if use collectd_plugins_${plugin}; then