Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-metrics/collectd/
Date: Tue, 04 Jan 2022 03:29:28
Message-Id: 1641266921.0d6b26d7906996ac8e2f4fd260afdc55fd418209.sam@gentoo
1 commit: 0d6b26d7906996ac8e2f4fd260afdc55fd418209
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 3 16:01:57 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 4 03:28:41 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6b26d7
7
8 app-metrics/collectd: remove kernel_FreeBSD
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11 Signed-off-by: Sam James <sam <AT> gentoo.org>
12
13 app-metrics/collectd/collectd-5.12.0-r1.ebuild | 22 +++-------------------
14 app-metrics/collectd/collectd-5.12.0-r2.ebuild | 22 +++-------------------
15 2 files changed, 6 insertions(+), 38 deletions(-)
16
17 diff --git a/app-metrics/collectd/collectd-5.12.0-r1.ebuild b/app-metrics/collectd/collectd-5.12.0-r1.ebuild
18 index 1c16631dc941..1c9fdac841d9 100644
19 --- a/app-metrics/collectd/collectd-5.12.0-r1.ebuild
20 +++ b/app-metrics/collectd/collectd-5.12.0-r1.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2021 Gentoo Authors
23 +# Copyright 1999-2022 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI="7"
27 @@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
28 LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
29 SLOT="0"
30 KEYWORDS="~alpha amd64 arm x86"
31 -IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
32 +IUSE="contrib debug java kernel_Darwin kernel_linux perl selinux static-libs udev xfs"
33
34 # The plugin lists have to follow here since they extend IUSE
35
36 @@ -150,15 +150,7 @@ COMMON_DEPEND="
37 collectd_plugins_write_redis? ( dev-libs/hiredis:= )
38 collectd_plugins_write_stackdriver? ( net-misc/curl:0= dev-libs/yajl:= )
39 collectd_plugins_xencpu? ( app-emulation/xen-tools:= )
40 -
41 - kernel_FreeBSD? (
42 - collectd_plugins_disk? ( sys-libs/libstatgrab:= )
43 - collectd_plugins_interface? ( sys-libs/libstatgrab:= )
44 - collectd_plugins_load? ( sys-libs/libstatgrab:= )
45 - collectd_plugins_memory? ( sys-libs/libstatgrab:= )
46 - collectd_plugins_swap? ( sys-libs/libstatgrab:= )
47 - collectd_plugins_users? ( sys-libs/libstatgrab:= )
48 - )"
49 +"
50
51 # FIXME: should virtual/jdk be here as well?
52 BDEPEND="virtual/pkgconfig"
53 @@ -337,9 +329,6 @@ src_configure() {
54 if use kernel_linux; then
55 einfo "Enabling Linux plugins."
56 myos_plugins=${linux_plugins}
57 - elif use kernel_FreeBSD; then
58 - einfo "Enabling FreeBSD plugins."
59 - myos_plugins=${bsd_plugins}
60 elif use kernel_Darwin; then
61 einfo "Enabling Darwin plugins."
62 myos_plugins=${darwin_plugins}
63 @@ -376,11 +365,6 @@ src_configure() {
64 if has ${plugin} ${myos_plugins}; then
65 # ... and available in this os
66 myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
67 - # ... must we link against libstatgrab? Bug #541518
68 - if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
69 - einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
70 - need_libstatgrab=1
71 - fi
72 else
73 # ... and NOT available in this os
74 if use collectd_plugins_${plugin}; then
75
76 diff --git a/app-metrics/collectd/collectd-5.12.0-r2.ebuild b/app-metrics/collectd/collectd-5.12.0-r2.ebuild
77 index c3aaedc933aa..f0ded8dfeb16 100644
78 --- a/app-metrics/collectd/collectd-5.12.0-r2.ebuild
79 +++ b/app-metrics/collectd/collectd-5.12.0-r2.ebuild
80 @@ -1,4 +1,4 @@
81 -# Copyright 1999-2021 Gentoo Authors
82 +# Copyright 1999-2022 Gentoo Authors
83 # Distributed under the terms of the GNU General Public License v2
84
85 EAPI="7"
86 @@ -18,7 +18,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
87 LICENSE="MIT GPL-2 GPL-2+ GPL-3 GPL-3+"
88 SLOT="0"
89 KEYWORDS="~alpha ~amd64 ~arm ~x86"
90 -IUSE="contrib debug java kernel_Darwin kernel_FreeBSD kernel_linux perl selinux static-libs udev xfs"
91 +IUSE="contrib debug java kernel_Darwin kernel_linux perl selinux static-libs udev xfs"
92
93 # The plugin lists have to follow here since they extend IUSE
94
95 @@ -150,15 +150,7 @@ COMMON_DEPEND="
96 collectd_plugins_write_redis? ( dev-libs/hiredis:= )
97 collectd_plugins_write_stackdriver? ( net-misc/curl:0= dev-libs/yajl:= )
98 collectd_plugins_xencpu? ( app-emulation/xen-tools:= )
99 -
100 - kernel_FreeBSD? (
101 - collectd_plugins_disk? ( sys-libs/libstatgrab:= )
102 - collectd_plugins_interface? ( sys-libs/libstatgrab:= )
103 - collectd_plugins_load? ( sys-libs/libstatgrab:= )
104 - collectd_plugins_memory? ( sys-libs/libstatgrab:= )
105 - collectd_plugins_swap? ( sys-libs/libstatgrab:= )
106 - collectd_plugins_users? ( sys-libs/libstatgrab:= )
107 - )"
108 +"
109
110 # FIXME: should virtual/jdk be here as well?
111 BDEPEND="virtual/pkgconfig"
112 @@ -337,9 +329,6 @@ src_configure() {
113 if use kernel_linux; then
114 einfo "Enabling Linux plugins."
115 myos_plugins=${linux_plugins}
116 - elif use kernel_FreeBSD; then
117 - einfo "Enabling FreeBSD plugins."
118 - myos_plugins=${bsd_plugins}
119 elif use kernel_Darwin; then
120 einfo "Enabling Darwin plugins."
121 myos_plugins=${darwin_plugins}
122 @@ -376,11 +365,6 @@ src_configure() {
123 if has ${plugin} ${myos_plugins}; then
124 # ... and available in this os
125 myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
126 - # ... must we link against libstatgrab? Bug #541518
127 - if use kernel_FreeBSD && has ${plugin} ${libstatgrab_plugins}; then
128 - einfo "We must link against libstatgrab due to plugin \"${plugin}\" ..."
129 - need_libstatgrab=1
130 - fi
131 else
132 # ... and NOT available in this os
133 if use collectd_plugins_${plugin}; then
Report Message
Find on MARC Find on Google Groups