From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q53Yl-0000gs-5t for garchives@archives.gentoo.org; Wed, 30 Mar 2011 22:08:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52B531C019; Wed, 30 Mar 2011 22:08:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E4CC11C019 for ; Wed, 30 Mar 2011 22:08:06 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 69F051B409A for ; Wed, 30 Mar 2011 22:08:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C914180065 for ; Wed, 30 Mar 2011 22:08:05 +0000 (UTC) From: "Andreas K. Huettel" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Huettel" Message-ID: <6e47568d0a35cced1a6177b2ba5a8f7a9ac53183.dilfridge@gentoo> Subject: [gentoo-commits] dev/dilfridge:master commit in: app-admin/collectd/ X-VCS-Repository: dev/dilfridge X-VCS-Files: app-admin/collectd/ChangeLog app-admin/collectd/Manifest app-admin/collectd/collectd-5.0.0.ebuild X-VCS-Directories: app-admin/collectd/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Huettel X-VCS-Revision: 6e47568d0a35cced1a6177b2ba5a8f7a9ac53183 Date: Wed, 30 Mar 2011 22:08:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d2b1a50815ecb09e142c732566da84fd commit: 6e47568d0a35cced1a6177b2ba5a8f7a9ac53183 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Wed Mar 30 22:07:56 2011 +0000 Commit: Andreas K. Huettel gentoo org> CommitDate: Wed Mar 30 22:07:56 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3D6e47568d [app-admin/collectd] Version bump, for now disabling all new plugins (Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with = key B6C5F7DE) --- app-admin/collectd/ChangeLog | 6 + app-admin/collectd/Manifest | 30 ++-- app-admin/collectd/collectd-5.0.0.ebuild | 319 ++++++++++++++++++++++++= ++++++ 3 files changed, 341 insertions(+), 14 deletions(-) diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog index a3b0a9f..f2e083b 100644 --- a/app-admin/collectd/ChangeLog +++ b/app-admin/collectd/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 +*collectd-5.0.0 (30 Mar 2011) + + 30 Mar 2011; Andreas K. Huettel + +collectd-5.0.0.ebuild: + Version bump, for now disabling all new plugins + 30 Mar 2011; Andreas K. Huettel collectd-4.10.3.ebuild, metadata.xml: Added support for sys-power/nut diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest index 2349048..1e4588c 100644 --- a/app-admin/collectd/Manifest +++ b/app-admin/collectd/Manifest @@ -12,28 +12,30 @@ AUX collectd.initd 1475 RMD160 13141c68cd0d22ca5ea84c= a70187b835c1831783 SHA1 fca AUX logrotate 115 RMD160 bc70b0fbacde2021a96851f781e096597b161f8c SHA1 4= c9f65faab5a43b142fe7f34163ca6d07b8ed704 SHA256 eb359631805b6bfb9f2a9ae5ed= 21be8f8b3b6f1ffeed8d506231043c9a77262c DIST collectd-4.10.2.tar.bz2 1419603 RMD160 13db504beb5cd560d60014183b67= ce768fe4293e SHA1 8d83dd2d68ac4c0871774af99079564880abb5ef SHA256 17cd674= 1c360cb2544f00fbe902ec3e9aa0d04a7ab6a744e3e8ea5615bb794be DIST collectd-4.10.3.tar.bz2 1343806 RMD160 3c6257880de6385ee0ad891b5e8f= ff0916969be8 SHA1 fbeb672d9e1a32f9eb4a5df535519e2fdb8da636 SHA256 ffd1959= 273301b302c144057baf68128e62c42bcff156ba941336e7389439b65 +DIST collectd-5.0.0.tar.bz2 1372805 RMD160 7b0b9060a4dbde937fa2263076fdd= 81f328f46aa SHA1 720746ee2542ddec9ef7b42b5f3e00412d1b3b43 SHA256 2df6ef3b= 90d588b82a16da479ad652fdd5837fb9e6fd04b728c6427a3d767e3c EBUILD collectd-4.10.2-r1.ebuild 10640 RMD160 fbb7533f826bada4ba457d42e4= e2f648852389d3 SHA1 c68a33cf1c5382bdfdf6910405683e2993e6af65 SHA256 fff8f= 6c361a5e731dacfa65aa6679c8ea25b35956a5e8d68a686b9c13b11f82e EBUILD collectd-4.10.2-r2.ebuild 11168 RMD160 17cdc2cf5c63248bc78f36f83e= 1f415e8ecc0a1c SHA1 35d8baabcedbf9939744a36f27016dc64e7e1d43 SHA256 d2341= b470bf93465e3a322edfe2d7ba810a8b9ea8041cf13034ebda20494a3bb EBUILD collectd-4.10.2-r3.ebuild 11214 RMD160 09dbcb98d4c40d3bf7647ecc69= 4a546c7a245763 SHA1 432001d9d8b610cb4c5c22c4aef66f8ec274c4d3 SHA256 afcc4= a0f5a34937b92a0384954def40d3635be8853703770fdd7f16e42be5814 EBUILD collectd-4.10.2.ebuild 10592 RMD160 16570e9e090eecb4c9c69d4b331d5= 29f6074d188 SHA1 e2c9c909abaa0436eced0cfbb62dd1b3359036dd SHA256 eac5dcbe= bcefa18d510466047055d1578d760245a2b5e69632db786cb350c357 EBUILD collectd-4.10.3.ebuild 11383 RMD160 d1ca4225cd5ebe4d4726eff46dac1= 8b0d3f02535 SHA1 8caf55275c051ef6cb095ae1608ffca6d4cf2c98 SHA256 2eabc4f4= 0e56e746f81ff1050a15f2f6a01475a30374969c438c27e36b7ce898 -MISC ChangeLog 5950 RMD160 3ea07fbce63980876ee7a8a68997784bd0138333 SHA1= 73da294e1887c2826476eafbb8587d8b32265923 SHA256 883129fc7a98c684492fd862= 9273c8ec44187d631afaf094841d0744d3b1dad9 +EBUILD collectd-5.0.0.ebuild 11460 RMD160 ff6d362705fbae6a28026e22286f77= 90b6e3d6de SHA1 946f1b678f57afb8c766abcb378e3121f319ec6f SHA256 29f526442= 12a4bae4b3dd2443381129b52c083bae4d2acc630667ab50d7ae15c +MISC ChangeLog 6115 RMD160 807824078ea2f95905f62d68dc0609589959fa1f SHA1= d4b430e7d51a686ba8431bad14b08aeabaf7febd SHA256 c2f5ca3e04b79192603fdb51= 8903ea76fda346cf4f95d5de8b53eb761d96070d MISC metadata.xml 11499 RMD160 91369dcd7b9a2b5920ff1ea2d9e82f51b9032b7a = SHA1 6742b43d634ce58b252c1232f5d86e6784e9881d SHA256 dcf8cb5d991f766895a4= d2a70ec964cb1bde2fa94c666ebda299c29a327490dc MISC notes.txt 1607 RMD160 298719e43ddce700a2eba689061e9e11344da408 SHA1= 070967029632603b999c1088e9cded260df4014a SHA256 18c9c548d062e9b2dd71f478= 6ae985fa7b9bac7706d34f359c6d4518ac6b956f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iQIcBAEBCgAGBQJNk5KBAAoJENwGBM22xffeZsoQAKfgGm1UP/JiQcXVAUipOo0M -6m88aYvwBHwbDyaFOYoDzuidgypLcxSktso/LlV9sv6dWX8sATqGYykiRgoaWHGU -4ov04Rm+F7eXo/bu30lSreGzcgbK48RGcWGnu4GIyBJtqdCquDJd9MwA6WYrmthS -qxGaMAkj0PezdbI04ckw317l2MrLnUnKH1mVwSHwkOCq8V4xJHXBPJBQzW6qaZgf -rR1B4ZbeAgV7Xuv9HRWdqcKoxEKCsKRdigNqng4CRjuiIUfIgHP/kBuIrfAS7NCF -FxSc/goKuHQFB9vu3QXD0PWveY31dXQhDCTSniwjTgMYncPuNjpUJ2T92To7IFFG -ZXYlEwMjJSdLz8GHkkn8srMFPcbXGUVOM5IjefjLR0wKszbM82R8IGVa23quDXjU -acj1N7kfheXokHoXayc0b9iTu8nYqXsAgEC4ISFw8ykwJL4S1Chf7CWefw2dh33U -r22fcAJfB3msRxJXpzaOEtJJufk2ugf7K4sf1E+7+RQWnLWetXhSeG9d/JBpzXC+ -24yqsXGjlruSMYljrRVhh2ivif8A5kWdXH8fXbNaAz80BXQwAEWPU0q6rstKc2Ve -cw4bRzpJSnyFfcUYnEhPsUSfYS4a4v6USBWDR2ooJ1jH0IX6IK2kMOwUUrWNoilB -W+yKO2vjc84KDpYCfPOU -=3D17IF +iQIcBAEBCgAGBQJNk6m8AAoJENwGBM22xffeLjQP/2EBhpBkmKnyEX2gKbc9HnaN +94TCVUaUlr4MwICYy2eyWJsHuEoMe4KvZ37u0ShIQFexX+kIrPaoxFWkhvDLwyxO +muuNgq34V+0EdVLzTiJbsxUtrZkz9gLKU7YY33+cm6x0tZCU76r+nABhfZyaj/gI +hrs8/m+qDBQVRJfZBgSSVshMF7Kviy6pljCbhl7SSme787nUzheWc2GWC8IB6Emp +oQhEuNYywOqeFcz+0sSXtgGq9m7XdNOq1WMLdw2S9P+2taf7T/X8IfU3rYuUlOYw +l9QkAKS6df/N3DdDfcru8NGxGpqjod0JZRCuT+RAPFczHJoDAykuNcEGzsNxRVO1 +R620+5sXBAFiEYJm+Hd7iev1JfWXOIiyHj8Av3ebSicrBzrsTero1gGzCQH6oR5q +hmeLmmjvWShFCx8CQp+U8xjUcbbc2EuwO1T6BnFAEHnw0VIAuqIN2KMGIA99Y+JZ +YkvVAT+FEwb1GIEK6CBC456z2YmOgcW1eY5GSo+oaHZ3HYq9jJMQvnd92NLrgtQo +CCxMCFc+8xiDkhTQU0iykGP383hf1lX4i8pLkeheDsFBxuJ/nx4QyGXBUZyEr/l3 +ZGpAQbTRi/vXuMOct+PeT9383V3rXSiB62cOeoiJKZ9EWLx0kwcosAwX8JV/AhB/ +4yBU/CpSBGzJALZbWPBm +=3DgPC5 -----END PGP SIGNATURE----- diff --git a/app-admin/collectd/collectd-5.0.0.ebuild b/app-admin/collect= d/collectd-5.0.0.ebuild new file mode 100644 index 0000000..b25d77e --- /dev/null +++ b/app-admin/collectd/collectd-5.0.0.ebuild @@ -0,0 +1,319 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-4.10.2-r3= .ebuild,v 1.1 2011/02/07 21:21:52 dilfridge Exp $ + +EAPI=3D4 + +inherit eutils base linux-info perl-app autotools + +DESCRIPTION=3D"A small daemon which collects system performance statisti= cs - with a near-infinite number of plugins" +HOMEPAGE=3D"http://collectd.org" +SRC_URI=3D"${HOMEPAGE}/files/${P}.tar.bz2" + +LICENSE=3D"GPL-2" +SLOT=3D"0" +KEYWORDS=3D"~amd64 ~x86" +IUSE=3D"contrib debug kernel_linux kernel_FreeBSD kernel_Darwin" + +# The plugin lists have to follow here since they extend IUSE + +# Plugins that to my knowledge cannot be supported (eg. dependencies not= in gentoo) +COLLECTD_IMPOSSIBLE_PLUGINS=3D"netapp pinba xmms" + +# Plugins that still need some work +COLLECTD_UNTESTED_PLUGINS=3D"ipvs apple_sensors routeros tape zfs_arc mo= dbus amqp genericjmx lpar redis threshold varnish write_redis v5upgrade" + +# Plugins that have been (compile) tested and can be enabled via COLLECT= D_PLUGINS +COLLECTD_TESTED_PLUGINS=3D"apache apcups ascent battery bind conntrack c= ontextswitch + cpu cpufreq curl curl_json curl_xml dbi df disk dns email entropy exec = filecount fscache gmond + hddtemp interface ipmi iptables irq java libvirt load madwifi mbmon mem= cachec + memcached memory multimeter mysql netlink network nfs nginx ntpd nut ol= srd + onewire openvpn perl ping postgresql powerdns processes protocols pytho= n + rrdcached sensors serial snmp swap table tail tcpconns teamspeak2 ted t= hermal + tokyotyrant uptime users vmem vserver wireless csv exec logfile network + notify_desktop notify_email oracle perl python rrdcached rrdtool syslog= unixsock write_http + match_empty_counter match_hashed match_regex match_timediff match_value + target_notification target_replace target_scale target_set uuid" + +COLLECTD_DISABLED_PLUGINS=3D"${COLLECTD_IMPOSSIBLE_PLUGINS} ${COLLECTD_U= NTESTED_PLUGINS}" + +COLLECTD_ALL_PLUGINS=3D${COLLECTD_TESTED_PLUGINS} + +for plugin in ${COLLECTD_ALL_PLUGINS}; do + IUSE=3D"${IUSE} collectd_plugins_${plugin}" +done +unset plugin + +# Now come the dependencies. + +COMMON_DEPEND=3D" + collectd_plugins_apache? ( net-misc/curl ) + collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 ) + collectd_plugins_bind? ( dev-libs/libxml2 ) + collectd_plugins_curl? ( net-misc/curl ) + collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl ) + collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2 ) + collectd_plugins_dbi? ( dev-db/libdbi ) + collectd_plugins_dns? ( net-libs/libpcap ) + collectd_plugins_gmond? ( sys-cluster/ganglia ) + collectd_plugins_ipmi? ( >=3Dsys-libs/openipmi-2.0.16-r1 ) + collectd_plugins_iptables? ( >=3Dnet-firewall/iptables-1.4.9.1-r2 ) + collectd_plugins_java? ( virtual/jre dev-java/java-config-wrapper ) + collectd_plugins_libvirt? ( app-emulation/libvirt dev-libs/libxml2 ) + collectd_plugins_memcachec? ( dev-libs/libmemcached ) + collectd_plugins_mysql? ( >=3Dvirtual/mysql-5.0 ) + collectd_plugins_netlink? ( >=3Dsys-apps/iproute2-2.6.34 ) + collectd_plugins_network? ( dev-libs/libgcrypt ) + collectd_plugins_nginx? ( net-misc/curl ) + collectd_plugins_notify_desktop? ( x11-libs/libnotify ) + collectd_plugins_notify_email? ( >=3Dnet-libs/libesmtp-1.0.4 dev-libs/= openssl ) + collectd_plugins_nut? ( sys-power/nut ) + collectd_plugins_onewire? ( sys-fs/owfs ) + collectd_plugins_oracle? ( >=3Ddev-db/oracle-instantclient-basic-11.2.= 0.1.0 ) + collectd_plugins_perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/lib= perl[ithreads] >=3Dsys-devel/libperl-5.10 ) ) ) + collectd_plugins_ping? ( net-libs/liboping ) + collectd_plugins_postgresql? ( >=3Ddev-db/postgresql-base-8.2 ) + collectd_plugins_python? ( =3Ddev-lang/python-2* ) + collectd_plugins_rrdcached? ( >=3Dnet-analyzer/rrdtool-1.4 ) + collectd_plugins_rrdtool? ( >=3Dnet-analyzer/rrdtool-1.2.27 ) + collectd_plugins_sensors? ( sys-apps/lm_sensors ) + collectd_plugins_snmp? ( net-analyzer/net-snmp ) + collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) + collectd_plugins_write_http? ( net-misc/curl ) + + kernel_FreeBSD? ( + collectd_plugins_disk? ( >=3Dsys-libs/libstatgrab-0.16 ) + collectd_plugins_interface? ( >=3Dsys-libs/libstatgrab-0.16 ) + collectd_plugins_load? ( >=3Dsys-libs/libstatgrab-0.16 ) + collectd_plugins_memory? ( >=3Dsys-libs/libstatgrab-0.16 ) + collectd_plugins_swap? ( >=3Dsys-libs/libstatgrab-0.16 ) + collectd_plugins_users? ( >=3Dsys-libs/libstatgrab-0.16 ) + )" + +DEPEND=3D"${COMMON_DEPEND} + dev-util/pkgconfig + kernel_linux? ( + collectd_plugins_vserver? ( sys-kernel/vserver-sources ) + )" + +RDEPEND=3D"${COMMON_DEPEND} + collectd_plugins_syslog? ( virtual/logger )" + +PATCHES=3D( + "${FILESDIR}/${PN}-4.10.1"-{libperl,libiptc,noowniptc}.patch + "${FILESDIR}/${PN}-4.10.2"-{libocci,libnotify-0.7,nohal}.patch + ) + +# @FUNCTION: collectd_plugin_kernel_linux +# @DESCRIPTION: +# USAGE: +# kernel_options is a list of kernel configurations options; the check t= ests whether at least +# one of them is enabled. If no, depending on the third argument an el= og, ewarn, or eerror message +# is emitted. +collectd_plugin_kernel_linux() { + local multi_opt opt + if has ${1} ${COLLECTD_ALL_PLUGINS}; then + if use collectd_plugins_${1}; then + for opt in ${2}; do + if linux_chkconfig_present ${opt}; then return 0; fi + done + multi_opt=3D${2//\ /\ or\ } + case ${3} in + (info) + elog "The ${1} plug-in can use kernel features that are disabled no= w; enable ${multi_opt} in your kernel" + ;; + (warn) + ewarn "The ${1} plug-in uses kernel features that are disabled now;= enable ${multi_opt} in your kernel" + ;; + (error) + eerror "The ${1} plug-in needs kernel features that are disabled no= w; enable ${multi_opt} in your kernel" + ;; + (*) + die "function collectd_plugin_kernel_linux called with invalid thir= d argument" + ;; + esac + fi + fi +} + +collectd_linux_kernel_checks() { + linux-info_pkg_setup + + # battery.c:/proc/pmu/battery_%i + # battery.c:/proc/acpi/battery + collectd_plugin_kernel_linux battery ACPI_BATTERY warn + + # cpufreq.c:/sys/devices/system/cpu/cpu%d/cpufreq/ + collectd_plugin_kernel_linux cpufreq SYSFS warn + collectd_plugin_kernel_linux cpufreq CPU_FREQ_STAT warn + + # nfs.c:/proc/net/rpc/nfs + # nfs.c:/proc/net/rpc/nfsd + collectd_plugin_kernel_linux nfs NFS_COMMON warn + + # serial.c:/proc/tty/driver/serial + # serial.c:/proc/tty/driver/ttyS + collectd_plugin_kernel_linux serial SERIAL_CORE warn + + # swap.c:/proc/meminfo + collectd_plugin_kernel_linux swap SWAP warn + + # thermal.c:/proc/acpi/thermal_zone + # thermal.c:/sys/class/thermal + collectd_plugin_kernel_linux thermal "PROC_FS SYSFS" warn + collectd_plugin_kernel_linux thermal ACPI_THERMAL warn + + # vmem.c:/proc/vmstat + collectd_plugin_kernel_linux vmem VM_EVENT_COUNTERS warn + + # uuid.c:/sys/hypervisor/uuid + collectd_plugin_kernel_linux uuid SYSFS info + + # wireless.c:/proc/net/wireless + collectd_plugin_kernel_linux wireless "MAC80211 IEEE80211" warn +} + +pkg_setup() { + if use kernel_linux; then + if linux_config_exists; then + einfo "Checking your linux kernel configuration:" + collectd_linux_kernel_checks + else + elog "Cannot find a linux kernel configuration. Continuing anyway." + fi + fi + + enewgroup collectd +} + +src_prepare() { + base_src_prepare + + # There's some strange prefix handling in the default config file, resu= lting in + # paths like "/usr/var/..." + sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die + + # the tarball of 4.10.3 and 5.0.0 was generated with a different set of= autotools, leading to odd problems + _elibtoolize --ltdl + + eautoreconf +} + +src_configure() { + # Now come the lists of os-dependent plugins. Any plugin that is not li= sted anywhere here + # should work independent of the operating system. + + local linux_plugins=3D"battery cpu cpufreq disk entropy interface iptab= les ipvs irq load + memory netlink nfs processes serial swap tcpconns thermal users vmem v= server + wireless" + + local libstatgrab_plugins=3D"cpu disk interface load memory swap users" + local bsd_plugins=3D"cpu tcpconns ${libstatgrab_plugins}" + + local darwin_plugins=3D"apple_sensors battery cpu disk interface memory= processes tcpconns" + + local osdependent_plugins=3D"${linux_plugins} ${bsd_plugins} ${darwin_p= lugins}" + local myos_plugins=3D"" + if use kernel_linux; then + einfo "Enabling Linux plugins." + myos_plugins=3D${linux_plugins} + elif use kernel_FreeBSD; then + einfo "Enabling FreeBSD plugins." + myos_plugins=3D${bsd_plugins} + elif use kernel_Darwin; then + einfo "Enabling Darwin plugins." + myos_plugins=3D${darwin_plugins} + fi + + # Do we debug? + local myconf=3D"$(use_enable debug)" + + local plugin + + # Disable what needs to be disabled. + for plugin in ${COLLECTD_DISABLED_PLUGINS}; do + myconf+=3D" --disable-${plugin}" + done + + # Set enable/disable for each single plugin. + for plugin in ${COLLECTD_ALL_PLUGINS}; do + if has ${plugin} ${osdependent_plugins}; then + # plugin is os-dependent ... + if has ${plugin} ${myos_plugins}; then + # ... and available in this os + myconf+=3D" $(use_enable collectd_plugins_${plugin} ${plugin})" + else + # ... and NOT available in this os + if use collectd_plugins_${plugin}; then + ewarn "You try to enable the ${plugin} plugin, but it is not availa= ble for this" + ewarn "kernel. Disabling it automatically." + fi + myconf+=3D" --disable-${plugin}" + fi + else + myconf+=3D" $(use_enable collectd_plugins_${plugin} ${plugin})" + fi + done + + # Need JAVA_HOME for java. + if use collectd_plugins_java; then + myconf+=3D" --with-java=3D$(java-config -g JAVA_HOME)" + fi + + # Need libiptc ONLY for iptables. If we try to use it otherwise bug 340= 109 happens. + if ! use collectd_plugins_iptables; then + myconf+=3D" --with-libiptc=3Dno" + fi + + # Finally, run econf. + KERNEL_DIR=3D"${KERNEL_DIR}" econf --config-cache --without-included-lt= dl --disable-static --localstatedir=3D/var ${myconf} +} + +src_install() { + emake DESTDIR=3D"${D}" install || die + + fixlocalpod + + find "${D}/usr/" -name "*.la" -exec rm -f {} + + + dodoc AUTHORS ChangeLog NEWS README TODO || die + + if use contrib ; then + insinto /usr/share/doc/${PF} + doins -r contrib || die + fi + + keepdir /var/lib/${PN} || die + + newinitd "${FILESDIR}/${PN}.initd" ${PN} || die + newconfd "${FILESDIR}/${PN}.confd" ${PN} || die + + insinto /etc/logrotate.d + newins "${FILESDIR}/logrotate" collectd || die + + sed -i -e 's:^.*LoadPlugin perl$:# The new, correct way to load the per= l plugin -- \n# \n# Globals true\n# :' "$= {D}"/etc/collectd.conf || die + sed -i -e 's:^.*LoadPlugin python$:# The new, correct way to load the p= ython plugin -- \n# \n# Globals true\n# :' "${D}"/etc/collectd.conf || die +} + +collectd_rdeps() { + if (use collectd_plugins_${1} && ! has_version "${2}"); then + elog "The ${1} plug-in needs ${2} to be installed locally or remotely = to work." + fi +} + +pkg_postinst() { + collectd_rdeps apcups sys-power/apcupsd + collectd_rdeps hddtemp app-admin/hddtemp + collectd_rdeps mbmon sys-apps/xmbmon + collectd_rdeps memcached ">=3Dnet-misc/memcached-1.2.2-r2" + collectd_rdeps ntpd net-misc/ntp + collectd_rdeps openvpn ">=3Dnet-misc/openvpn-2.0.9" + + if use collectd_plugins_email; then + ewarn "The email plug-in is deprecated. To submit statistics please us= e the unixsock plugin." + fi + if use contrib; then + elog "The scripts in /usr/share/doc/${PF}/collection3 for generating g= raphs need dev-perl/HTML-Parser," + elog "dev-perl/config-general, dev-perl/regexp-common, and net-analyze= r/rrdtool[perl] to be installed." + fi +}