| 1 |
commit: 3e101ea929251f2c12ed8f0e26eec578fc2edc0c |
| 2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 22 21:26:28 2012 +0000 |
| 4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 22 21:26:28 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/eva.git;a=commit;h=3e101ea9 |
| 7 |
|
| 8 |
app-admin/collectd: fix repoman warnings and make more use of EAPI 4 |
| 9 |
|
| 10 |
--- |
| 11 |
app-admin/collectd/Manifest | 8 +- |
| 12 |
app-admin/collectd/collectd-4.10.3-r1.ebuild | 16 +++-- |
| 13 |
app-admin/collectd/metadata.xml | 93 ++++++++++++-------------- |
| 14 |
3 files changed, 56 insertions(+), 61 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest |
| 17 |
index a167775..5f5a5a2 100644 |
| 18 |
--- a/app-admin/collectd/Manifest |
| 19 |
+++ b/app-admin/collectd/Manifest |
| 20 |
@@ -1,11 +1,11 @@ |
| 21 |
-----BEGIN PGP SIGNED MESSAGE----- |
| 22 |
Hash: SHA512 |
| 23 |
|
| 24 |
-DIST collectd-4.10.3.tar.bz2 1343806 RMD160 3c6257880de6385ee0ad891b5e8fff0916969be8 SHA1 fbeb672d9e1a32f9eb4a5df535519e2fdb8da636 SHA256 ffd1959273301b302c144057baf68128e62c42bcff156ba941336e7389439b65 |
| 25 |
+DIST collectd-4.10.3.tar.bz2 1343806 SHA256 ffd1959273301b302c144057baf68128e62c42bcff156ba941336e7389439b65 |
| 26 |
-----BEGIN PGP SIGNATURE----- |
| 27 |
Version: GnuPG v2.0.19 (GNU/Linux) |
| 28 |
|
| 29 |
-iEYEAREKAAYFAk+dTHgACgkQ1fmVwcYIWAahowCeMD5p6AO+MzdEwIaTtHIqV7RB |
| 30 |
-gEgAoO3q/DwvpdjEFtnujur97+5/KQgM |
| 31 |
-=YbUC |
| 32 |
+iEYEAREKAAYFAlCumIUACgkQ1fmVwcYIWAZkaACgn7FtMZgUNeW3L8rRqgrSiIMW |
| 33 |
+BrkAoK3C2GVptp2iadCFQ1bBBnqrpRBT |
| 34 |
+=d8oo |
| 35 |
-----END PGP SIGNATURE----- |
| 36 |
|
| 37 |
diff --git a/app-admin/collectd/collectd-4.10.3-r1.ebuild b/app-admin/collectd/collectd-4.10.3-r1.ebuild |
| 38 |
index 8814e00..37a3025 100644 |
| 39 |
--- a/app-admin/collectd/collectd-4.10.3-r1.ebuild |
| 40 |
+++ b/app-admin/collectd/collectd-4.10.3-r1.ebuild |
| 41 |
@@ -1,10 +1,10 @@ |
| 42 |
-# Copyright 1999-2011 Gentoo Foundation |
| 43 |
+# Copyright 1999-2012 Gentoo Foundation |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/Attic/collectd-4.10.3-r1.ebuild,v 1.4 2011/10/22 17:35:40 dilfridge dead $ |
| 46 |
+# $Header: $ |
| 47 |
|
| 48 |
EAPI=4 |
| 49 |
|
| 50 |
-inherit eutils base linux-info perl-app autotools |
| 51 |
+inherit autotools base eutils linux-info perl-app user |
| 52 |
|
| 53 |
DESCRIPTION="A small daemon which collects system performance statistics - with a near-infinite number of plugins" |
| 54 |
HOMEPAGE="http://collectd.org" |
| 55 |
@@ -93,7 +93,7 @@ COMMON_DEPEND=" |
| 56 |
)" |
| 57 |
|
| 58 |
DEPEND="${COMMON_DEPEND} |
| 59 |
- dev-util/pkgconfig |
| 60 |
+ virtual/pkgconfig |
| 61 |
kernel_linux? ( |
| 62 |
collectd_plugins_vserver? ( sys-kernel/vserver-sources ) |
| 63 |
)" |
| 64 |
@@ -176,7 +176,7 @@ collectd_linux_kernel_checks() { |
| 65 |
collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn |
| 66 |
} |
| 67 |
|
| 68 |
-pkg_setup() { |
| 69 |
+pkg_pretend() { |
| 70 |
if use kernel_linux; then |
| 71 |
if linux_config_exists; then |
| 72 |
einfo "Checking your linux kernel configuration:" |
| 73 |
@@ -185,7 +185,9 @@ pkg_setup() { |
| 74 |
elog "Cannot find a linux kernel configuration. Continuing anyway." |
| 75 |
fi |
| 76 |
fi |
| 77 |
+} |
| 78 |
|
| 79 |
+pkg_setup() { |
| 80 |
enewgroup collectd |
| 81 |
enewuser collectd -1 -1 /var/lib/collectd collectd |
| 82 |
} |
| 83 |
@@ -283,11 +285,11 @@ src_configure() { |
| 84 |
} |
| 85 |
|
| 86 |
src_install() { |
| 87 |
- emake DESTDIR="${D}" install || die |
| 88 |
+ default |
| 89 |
|
| 90 |
fixlocalpod |
| 91 |
|
| 92 |
- find "${D}/usr/" -name "*.la" -exec rm -f {} + |
| 93 |
+ prune_libtool_files |
| 94 |
rm "${D}/usr/$(get_libdir)"/collectd/*.a |
| 95 |
|
| 96 |
# use collectd_plugins_ping && setcap cap_net_raw+ep ${D}/usr/sbin/collectd |
| 97 |
|
| 98 |
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml |
| 99 |
index 14bba86..a6755d8 100644 |
| 100 |
--- a/app-admin/collectd/metadata.xml |
| 101 |
+++ b/app-admin/collectd/metadata.xml |
| 102 |
@@ -31,83 +31,76 @@ |
| 103 |
<flag name='collectd_plugins_dns'>Build the dns input plugin (collects statistics of your DNS traffic on port udp/53)</flag> |
| 104 |
<flag name='collectd_plugins_email'>Build the email input plugin (opens a UNIX domain socket and starts accepting connections on that socket)</flag> |
| 105 |
<flag name='collectd_plugins_entropy'>Build the entropy input plugin (available entropy on a system)</flag> |
| 106 |
- <flag name='collectd_plugins_ethstat'>Build the ethstat input plugin (performance statistics of Linux ethernet cards)</flag> |
| 107 |
<flag name='collectd_plugins_exec'>Build the exec input/output plugin (executes scripts / applications and reads values back)</flag> |
| 108 |
<flag name='collectd_plugins_filecount'>Build the filecount input plugin (countd the number of files in a directory and all its subdirectories)</flag> |
| 109 |
<flag name='collectd_plugins_fscache'>Build the fscache input plugin (information about the caching infrastructure for network file-systems etc)</flag> |
| 110 |
<flag name='collectd_plugins_gmond'>Build the gmond input plugin (receive data from gmond, the client daemon of the Ganglia project)</flag> |
| 111 |
<flag name='collectd_plugins_hddtemp'>Build the hddtemp input plugin (temperature of hard disks)</flag> |
| 112 |
<flag name='collectd_plugins_interface'>Build the interface input plugin (information about traffic, packets and errors of interfaces)</flag> |
| 113 |
- <flag name='collectd_plugins_ipmi'>Build the ipmi input plugin (read hardware sensors from servers using the Intelligent Platform Management Interface (IPMI))</flag> |
| 114 |
- <flag name='collectd_plugins_iptables'>Build the iptables input plugin (statistics from a ip_tables based packet filter)</flag> |
| 115 |
- <flag name='collectd_plugins_irq'>Build the irq input plugin (number of times each interrupt has been handled by the os)</flag> |
| 116 |
- <flag name='collectd_plugins_java'>Build the java input plugin (embeds a JVM into collectd for writing plugins)</flag> |
| 117 |
- <flag name='collectd_plugins_libvirt'>Build the libvirt input plugin (statistics about virtualized guests on a system)</flag> |
| 118 |
- <flag name='collectd_plugins_load'>Build the load input plugin (system load)</flag> |
| 119 |
+ <flag name='collectd_plugins_ipmi'>Build the ipmi input plugin (read hardware sensors from servers using the Intelligent Platform Management Interface (IPMI))</flag> |
| 120 |
+ <flag name='collectd_plugins_iptables'>Build the iptables input plugin (statistics from a ip_tables based packet filter)</flag> |
| 121 |
+ <flag name='collectd_plugins_irq'>Build the irq input plugin (number of times each interrupt has been handled by the os)</flag> |
| 122 |
+ <flag name='collectd_plugins_java'>Build the java input plugin (embeds a JVM into collectd for writing plugins)</flag> |
| 123 |
+ <flag name='collectd_plugins_libvirt'>Build the libvirt input plugin (statistics about virtualized guests on a system)</flag> |
| 124 |
+ <flag name='collectd_plugins_load'>Build the load input plugin (system load)</flag> |
| 125 |
<flag name='collectd_plugins_logfile'>Build the logfile output plugin (writes log messages to a text file)</flag> |
| 126 |
- <flag name='collectd_plugins_madwifi'>Build the madwifi input plugin (information about Atheros wireless LAN chipsets)</flag> |
| 127 |
+ <flag name='collectd_plugins_madwifi'>Build the madwifi input plugin (information about Atheros wireless LAN chipsets)</flag> |
| 128 |
<flag name='collectd_plugins_match_empty_counter'>Build the match_empty_counter filter plugin</flag> |
| 129 |
<flag name='collectd_plugins_match_hashed'>Build the match_hashed filter plugin</flag> |
| 130 |
<flag name='collectd_plugins_match_regex'>Build the match_regex filter plugin</flag> |
| 131 |
<flag name='collectd_plugins_match_timediff'>Build the match_timediff filter plugin</flag> |
| 132 |
<flag name='collectd_plugins_match_value'>Build the match_value filter plugin</flag> |
| 133 |
- <flag name='collectd_plugins_mbmon'>Build the mbmon input plugin (information from mainboard sensors)</flag> |
| 134 |
- <flag name='collectd_plugins_md'>Build the md input plugin (disk states in Linux md devices)</flag> |
| 135 |
+ <flag name='collectd_plugins_mbmon'>Build the mbmon input plugin (information from mainboard sensors)</flag> |
| 136 |
<flag name='collectd_plugins_memcachec'>Build the memcachec input plugin (connects to a memcached server)</flag> |
| 137 |
- <flag name='collectd_plugins_memcached'>Build the memcached input plugin (connects to a memcached daemon)</flag> |
| 138 |
- <flag name='collectd_plugins_memory'>Build the memory input plugin (physical memory utilization)</flag> |
| 139 |
- <flag name='collectd_plugins_multimeter'>Build the multimeter input plugin (reads a voltage or current from a multimeter connected to a serial bus)</flag> |
| 140 |
- <flag name='collectd_plugins_mysql'>Build the mysql input plugin (connects to an MySQL-database and issues a SHOW STATUS command)</flag> |
| 141 |
- <flag name='collectd_plugins_netlink'>Build the netlink input plugin (opens a netlink socket to the Linux kernel for getting statistics)</flag> |
| 142 |
- <flag name='collectd_plugins_network'>Build the network input/output plugin (communicates with other instances of collectd)</flag> |
| 143 |
- <flag name='collectd_plugins_nfs'>Build the nfs input plugin (usage of the Network File System)</flag> |
| 144 |
- <flag name='collectd_plugins_nginx'>Build the nginx input plugin (number of requests handled by the nginx daemon)</flag> |
| 145 |
+ <flag name='collectd_plugins_memcached'>Build the memcached input plugin (connects to a memcached daemon)</flag> |
| 146 |
+ <flag name='collectd_plugins_memory'>Build the memory input plugin (physical memory utilization)</flag> |
| 147 |
+ <flag name='collectd_plugins_multimeter'>Build the multimeter input plugin (reads a voltage or current from a multimeter connected to a serial bus)</flag> |
| 148 |
+ <flag name='collectd_plugins_mysql'>Build the mysql input plugin (connects to an MySQL-database and issues a SHOW STATUS command)</flag> |
| 149 |
+ <flag name='collectd_plugins_netlink'>Build the netlink input plugin (opens a netlink socket to the Linux kernel for getting statistics)</flag> |
| 150 |
+ <flag name='collectd_plugins_network'>Build the network input/output plugin (communicates with other instances of collectd)</flag> |
| 151 |
+ <flag name='collectd_plugins_nfs'>Build the nfs input plugin (usage of the Network File System)</flag> |
| 152 |
+ <flag name='collectd_plugins_nginx'>Build the nginx input plugin (number of requests handled by the nginx daemon)</flag> |
| 153 |
<flag name='collectd_plugins_notify_desktop'>Build the notify_desktop output plugin (uses libnotify to display notifications to the user)</flag> |
| 154 |
<flag name='collectd_plugins_notify_email'>Build the notify_email output plugin (uses libESMTP to send notifications to a configured email address)</flag> |
| 155 |
- <flag name='collectd_plugins_ntpd'>Build the ntpd input plugin (queries an NTP server)</flag> |
| 156 |
- <flag name='collectd_plugins_numa'>Build the numa input plugin (statistics of the Linux Non-Uniform Memory Access (NUMA) subsystem)</flag> |
| 157 |
- <flag name='collectd_plugins_nut'>Build the nut input plugin (collects UPS statistics using the Network UPS Tools)</flag> |
| 158 |
+ <flag name='collectd_plugins_ntpd'>Build the ntpd input plugin (queries an NTP server)</flag> |
| 159 |
+ <flag name='collectd_plugins_nut'>Build the nut input plugin (collects UPS statistics using the Network UPS Tools)</flag> |
| 160 |
<flag name='collectd_plugins_oracle'>Build the oracle input plugin (SQL-queries one or more Oracle database systems)</flag> |
| 161 |
<flag name='collectd_plugins_olsrd'>Build the olsrd input plugin (reads information about the Optimized Link State Routing daemon)</flag> |
| 162 |
- <flag name='collectd_plugins_onewire'>Build the onewire input plugin (collects temperature information from sensors)</flag> |
| 163 |
- <flag name='collectd_plugins_openvpn'>Build the openvpn input plugin (reads the status file printed by OpenVPN)</flag> |
| 164 |
- <flag name='collectd_plugins_perl'>Build the perl language binding plugin (embeds a Perl interpreter into collectd for writing plugins)</flag> |
| 165 |
- <flag name='collectd_plugins_ping'>Build the ping input plugin (measures network latency)</flag> |
| 166 |
- <flag name='collectd_plugins_postgresql'>Build the postgresql input plugin (connects to and executes SQL statements on a PostgreSQL database)</flag> |
| 167 |
- <flag name='collectd_plugins_powerdns'>Build the powerdns input plugin (connects to a local PowerDNS instance)</flag> |
| 168 |
- <flag name='collectd_plugins_processes'>Build the processes input plugin (statistics about processes)</flag> |
| 169 |
- <flag name='collectd_plugins_protocols'>Build the protocols input plugin (network protocols)</flag> |
| 170 |
- <flag name='collectd_plugins_python'>Build the python language binding plugin (embeds a Python interpreter into collectd for writing plugins)</flag> |
| 171 |
- <flag name='collectd_plugins_rrdcached'>Build the rrdcached input/output plugin (connects to rrdcached and submits updates for RRD files)</flag> |
| 172 |
+ <flag name='collectd_plugins_onewire'>Build the onewire input plugin (collects temperature information from sensors)</flag> |
| 173 |
+ <flag name='collectd_plugins_openvpn'>Build the openvpn input plugin (reads the status file printed by OpenVPN)</flag> |
| 174 |
+ <flag name='collectd_plugins_perl'>Build the perl language binding plugin (embeds a Perl interpreter into collectd for writing plugins)</flag> |
| 175 |
+ <flag name='collectd_plugins_ping'>Build the ping input plugin (measures network latency)</flag> |
| 176 |
+ <flag name='collectd_plugins_postgresql'>Build the postgresql input plugin (connects to and executes SQL statements on a PostgreSQL database)</flag> |
| 177 |
+ <flag name='collectd_plugins_powerdns'>Build the powerdns input plugin (connects to a local PowerDNS instance)</flag> |
| 178 |
+ <flag name='collectd_plugins_processes'>Build the processes input plugin (statistics about processes)</flag> |
| 179 |
+ <flag name='collectd_plugins_protocols'>Build the protocols input plugin (network protocols)</flag> |
| 180 |
+ <flag name='collectd_plugins_python'>Build the python language binding plugin (embeds a Python interpreter into collectd for writing plugins)</flag> |
| 181 |
+ <flag name='collectd_plugins_rrdcached'>Build the rrdcached input/output plugin (connects to rrdcached and submits updates for RRD files)</flag> |
| 182 |
<flag name='collectd_plugins_rrdtool'>Build the rrdtool output plugin (writes values to RRD-files)</flag> |
| 183 |
- <flag name='collectd_plugins_routeros'>Build the routeros input plugin (collect information on devices running RouterOS)</flag> |
| 184 |
- <flag name='collectd_plugins_sensors'>Build the sensors input plugin (uses lm-sensors to read hardware sensors)</flag> |
| 185 |
- <flag name='collectd_plugins_serial'>Build the serial input plugin (collects the traffic on serial interfaces)</flag> |
| 186 |
- <flag name='collectd_plugins_snmp'>Build the snmp input plugin (read values from network devices using SNMP)</flag> |
| 187 |
- <flag name='collectd_plugins_swap'>Build the swap input plugin (amount of memory currently written to swap)</flag> |
| 188 |
+ <flag name='collectd_plugins_sensors'>Build the sensors input plugin (uses lm-sensors to read hardware sensors)</flag> |
| 189 |
+ <flag name='collectd_plugins_serial'>Build the serial input plugin (collects the traffic on serial interfaces)</flag> |
| 190 |
+ <flag name='collectd_plugins_snmp'>Build the snmp input plugin (read values from network devices using SNMP)</flag> |
| 191 |
+ <flag name='collectd_plugins_swap'>Build the swap input plugin (amount of memory currently written to swap)</flag> |
| 192 |
<flag name='collectd_plugins_syslog'>Build the syslog output plugin (receives messages from collectd and dispatches them to syslog)</flag> |
| 193 |
- <flag name='collectd_plugins_table'>Build the table input plugin (parses table-like structured plain text)</flag> |
| 194 |
- <flag name='collectd_plugins_tail'>Build the tail input plugin (follows logfiles as e.g. tail -f)</flag> |
| 195 |
+ <flag name='collectd_plugins_table'>Build the table input plugin (parses table-like structured plain text)</flag> |
| 196 |
+ <flag name='collectd_plugins_tail'>Build the tail input plugin (follows logfiles as e.g. tail -f)</flag> |
| 197 |
<flag name='collectd_plugins_target_notification'>Build the target_notification filter plugin</flag> |
| 198 |
<flag name='collectd_plugins_target_replace'>Build the target_replace filter plugin</flag> |
| 199 |
<flag name='collectd_plugins_target_scale'>Build the target_scale filter plugin</flag> |
| 200 |
<flag name='collectd_plugins_target_set'>Build the target_set filter plugin</flag> |
| 201 |
- <flag name='collectd_plugins_tcpconns'>Build the tcpconns input plugin (number of TCP connections to or from a specified port)</flag> |
| 202 |
- <flag name='collectd_plugins_teamspeak2'>Build the teamspeak2 input plugin (collects traffic statistics from a teamspeak2 instance)</flag> |
| 203 |
- <flag name='collectd_plugins_ted'>Build the ted input plugin (connects to The Energy Detective and reads the current power over connected power lines)</flag> |
| 204 |
+ <flag name='collectd_plugins_tcpconns'>Build the tcpconns input plugin (number of TCP connections to or from a specified port)</flag> |
| 205 |
+ <flag name='collectd_plugins_teamspeak2'>Build the teamspeak2 input plugin (collects traffic statistics from a teamspeak2 instance)</flag> |
| 206 |
+ <flag name='collectd_plugins_ted'>Build the ted input plugin (connects to The Energy Detective and reads the current power over connected power lines)</flag> |
| 207 |
<flag name='collectd_plugins_thermal'>Build the thermal input plugin (ACPI thermal zone information)</flag> |
| 208 |
- <flag name='collectd_plugins_tokyotyrant'>Build the tokyotyrant input plugin (number of records and file size from a running Tokyo Tyrant server)</flag> |
| 209 |
- <flag name='collectd_plugins_uptime'>Build the uptime input plugin (system uptime)</flag> |
| 210 |
+ <flag name='collectd_plugins_tokyotyrant'>Build the tokyotyrant input plugin (number of records and file size from a running Tokyo Tyrant server)</flag> |
| 211 |
+ <flag name='collectd_plugins_uptime'>Build the uptime input plugin (system uptime)</flag> |
| 212 |
<flag name='collectd_plugins_unixsock'>Build the unixsock output plugin (opens a UNIX domain socket and accepts connections)</flag> |
| 213 |
- <flag name='collectd_plugins_users'>Build the users input plugin (number of users currently logged in)</flag> |
| 214 |
+ <flag name='collectd_plugins_users'>Build the users input plugin (number of users currently logged in)</flag> |
| 215 |
<flag name='collectd_plugins_uuid'>Build the uuid plugin (tries hard to determine the UUID of the system it is running on)</flag> |
| 216 |
- <flag name='collectd_plugins_varnish'>Build the varnish input plugin</flag> |
| 217 |
- <flag name='collectd_plugins_vmem'>Build the vmem input plugin (information about the virtual memory subsystem)</flag> |
| 218 |
- <flag name='collectd_plugins_vserver'>Build the vserver input plugin (virtual servers running on a system)</flag> |
| 219 |
- <flag name='collectd_plugins_wireless'>Build the wireless input plugin (signal quality, signal power and signal-to-noise ratio for wireless LAN cards)</flag> |
| 220 |
- <flag name='collectd_plugins_write_graphite'>Build the write_graphite output plugin (sends the values collected by collectd to Carbon, the storage layer of the Graphite time-series database)</flag> |
| 221 |
+ <flag name='collectd_plugins_vmem'>Build the vmem input plugin (information about the virtual memory subsystem)</flag> |
| 222 |
+ <flag name='collectd_plugins_vserver'>Build the vserver input plugin (virtual servers running on a system)</flag> |
| 223 |
+ <flag name='collectd_plugins_wireless'>Build the wireless input plugin (signal quality, signal power and signal-to-noise ratio for wireless LAN cards)</flag> |
| 224 |
<flag name='collectd_plugins_write_http'>Build the write_http output plugin (sends the values collected by collectd to a web-server)</flag> |
| 225 |
- <flag name='collectd_plugins_write_mongodb'>Build the write_mongodb output plugin (sends the values collected by collectd to a MongoDB)</flag> |
| 226 |
<flag name='contrib'>Install user-contributed files in the doc directory</flag> |
| 227 |
</use> |
| 228 |
</pkgmetadata> |
Archives