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 1Q4ha9-0001or-SU for garchives@archives.gentoo.org; Tue, 29 Mar 2011 22:40:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7B02E04ED; Tue, 29 Mar 2011 22:40:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 429D0E04ED for ; Tue, 29 Mar 2011 22:40: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 A46EE1B406C for ; Tue, 29 Mar 2011 22:40:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F299980065 for ; Tue, 29 Mar 2011 22:40:04 +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: Subject: [gentoo-commits] dev/dilfridge:master commit in: app-admin/collectd/, app-admin/collectd/files/ X-VCS-Repository: dev/dilfridge X-VCS-Files: app-admin/collectd/ChangeLog app-admin/collectd/Manifest app-admin/collectd/collectd-4.10.2-r3.ebuild app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch app-admin/collectd/files/collectd-4.10.2-nohal.patch app-admin/collectd/files/collectd.initd X-VCS-Directories: app-admin/collectd/ app-admin/collectd/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Huettel X-VCS-Revision: a142ccd01505a4c49d17d8272b0c15fad04a2a90 Date: Tue, 29 Mar 2011 22:40:04 +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: 54ed67cdcf4bb833768372ecb1119401 commit: a142ccd01505a4c49d17d8272b0c15fad04a2a90 Author: Andreas K. Huettel (dilfridge) akhuettel de> AuthorDate: Tue Mar 29 22:18:41 2011 +0000 Commit: Andreas K. Huettel gentoo org> CommitDate: Tue Mar 29 22:18:41 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/dilfridge.git;= a=3Dcommit;h=3Da142ccd0 [app-admin/collectd] Resync with tree (Portage version: 2.1.9.44/git/Linux x86_64, signed Manifest commit with = key B6C5F7DE) --- app-admin/collectd/ChangeLog | 7 + app-admin/collectd/Manifest | 37 ++- app-admin/collectd/collectd-4.10.2-r3.ebuild | 315 ++++++++++++++= ++++++ .../files/collectd-4.10.2-libnotify-0.7.patch | 27 ++ .../collectd/files/collectd-4.10.2-nohal.patch | 23 ++ app-admin/collectd/files/collectd.initd | 4 +- 6 files changed, 394 insertions(+), 19 deletions(-) diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog index 52ffcee..92300f1 100644 --- a/app-admin/collectd/ChangeLog +++ b/app-admin/collectd/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 +*collectd-4.10.2-r3 (29 Mar 2011) + + 29 Mar 2011; Andreas K. Huettel + +collectd-4.10.2-r3.ebuild, +files/collectd-4.10.2-libnotify-0.7.patch= , + +files/collectd-4.10.2-nohal.patch, files/collectd.initd: + Resync with tree + 28 Jan 2011; Andreas K. Huettel collectd-4.10.2-r2.ebuild: Added hints about new configuration diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest index 0075774..604795f 100644 --- a/app-admin/collectd/Manifest +++ b/app-admin/collectd/Manifest @@ -1,34 +1,37 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA512 =20 AUX collectd-4.10.1-libiptc.patch 534 RMD160 dd6c016797ec4e6e5c7c67bbbed= dd50d1c59badc SHA1 253efd36642f7ab1253bcc307e0f4d0e1a4d8e21 SHA256 f6c63e= 0cb686e4d7a655b9ff0b69e8ba75a9cf40c2ae79c6ec97c1e7377d2f4e AUX collectd-4.10.1-libperl.patch 917 RMD160 2feb20abbf7fd036e34957c1906= 89f1e668ff321 SHA1 1c8312b576faa6a855f4f615995b007b108325ba SHA256 26e3c7= 4392166a2438d7106e94953f871aedfe3b643c866afc8865c1ef7534c7 AUX collectd-4.10.1-noowniptc.patch 837 RMD160 433d936a3c8d22af289ab9ecc= 00a9843ab4634e3 SHA1 c08eb253a5297c9ec69b1923dc2ed173343e0ce8 SHA256 fac8= 0da197b0df38b2544edf7008eed544eac06817d5ead86dea2baf46ee009d +AUX collectd-4.10.2-libnotify-0.7.patch 823 RMD160 f3a0febc8487be06ad1cc= 5ffc61206ad97b2ba37 SHA1 fae5913db9fe0c9243bad1aa9610f0759c1e0abb SHA256 = b7a4baca65b4c68ca46ac95a269071c356ca4674ebfda50e872f665cf2422fe8 AUX collectd-4.10.2-libocci.patch 720 RMD160 c90872f76a771076efe500c78dc= 3e3a5545f8f51 SHA1 40197f33a565ea37774f577c036b1c75ef447cae SHA256 2338b8= 405e46d67bc71ebe4d4f8cba8658047a352cb7b0c3c0f4b15109a9c98b +AUX collectd-4.10.2-nohal.patch 888 RMD160 a7d5969f3119f44eeb1b163d13bfd= 86c727854f3 SHA1 275e928e2bbad3b01d7e129793922d48348334fa SHA256 d1b8fccc= 96289c42e6aa33187bfca250ae0152a44d5cfba41ccf9e941a6aa799 AUX collectd.confd 633 RMD160 46f81e3f73d577c3f59df404012e33c419188acc S= HA1 85f569035bbb6ff7d3e03a4b85c35ccb126c29a4 SHA256 30e41d63f3af1d736d869= 03046e5aac8f8a548714bab0acbbca0ffd6c16ed430 -AUX collectd.initd 1475 RMD160 47950563900702075f1d429c70a9b00bd19addc1 = SHA1 ce61a9ea693a749ba6fe14e9d0bda9124a142f8f SHA256 4f51375e2d8b1543bcbf= 5c72257a45ed5a10edfe29b95d819a9087de307bbfda +AUX collectd.initd 1475 RMD160 13141c68cd0d22ca5ea84ca70187b835c1831783 = SHA1 fca53c6ad12139176033c992fc361a4cf3879245 SHA256 3a322c53b199661eafdf= 11af192cffd9a1ed54d618a0fd29bcbab9e214b1071d 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 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 -MISC ChangeLog 5267 RMD160 b39d57319b957326a7f468f7cf239430db2a5ce4 SHA1= be62152f134131672b5b63fca357f0d912ac8dfd SHA256 e89a5da15de98baa26e02a5c= d1432e4986793c94d6ab3c866021b3427c5b862c +MISC ChangeLog 5513 RMD160 30025630f16b089f90e04479204c2620c425801d SHA1= cf8d6d65d944bb23268df27a0157e3024057a623 SHA256 5950778c0a30ea45a7cf53cc= c10b202f000dc25acf96d15d9061f5c283ee77ed MISC metadata.xml 11374 RMD160 d55c891c2b22898dd8d4f09e635bddbd61988ea9 = SHA1 f725b0c3a45c6c3098dd84b29b39dc7a95a0267f SHA256 f849d03105461a54bce4= e59f96530a8ab9471ab8620efee506076ef4e546eb88 MISC notes.txt 1607 RMD160 298719e43ddce700a2eba689061e9e11344da408 SHA1= 070967029632603b999c1088e9cded260df4014a SHA256 18c9c548d062e9b2dd71f478= 6ae985fa7b9bac7706d34f359c6d4518ac6b956f -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) =20 -iQIcBAEBAgAGBQJNQzUuAAoJENwGBM22xffesTsP/2lsIhwcUFC9sRqzofONpnd3 -HMMr9rWH1uTioat8QEBzHI3oPUV4XT3oyNY36Z0w0YCJhgZ2CRLaQU+YPV3jKmE/ -qp/sR/1lg+Xr0Nv6LHKRjPuadEaVicFCV4kbEs2FMWiOwV2IC7N5TwvAhLL7FEUB -tYYxS0mJDZjVYKVU+ImgsismBRDMCNj1uQlDTcHyubCUNhpSfIGftYWdU2VrYONA -1orIMjlYK0vyeL9XMSUVu0eGap9zYSQwIHKse6pT4rCdh/0E6SDztGhEOe4g90xt -eW+UHbH3UXcr3pcYzB6EVJsj/lpz4Z+nhC5XmcxEhxzGhqwfQ/8ymmIpOz66BBtQ -KVPbs+8lznnIec1Sc5QO8DpbheTl1kszx5prAviYI5adXKIlgQeY3X/OIHidzVes -1WXbksqkPJkmFaR3Vz2Ox2E54nvZTj2BehECZ/e/Db6VV2p/RiqyZ7sNqCRhg5Lp -2vrjyonsZ3CYCMoZ/pr7lpG1BT/tj8mwLFHXUjIpmR5I1jIF51nWcxCPdbs4OHf0 -7Ix0Bh2xM06qE6+xTFkc41vw8BdOQQmnp8FLR9AVUG83gsawml6/AArk006ivx8s -eJS/6fOKiqK5BySICprKF9h8D8Wl5DVOZiWHbbo3WeuRI1l4pVQ8OgOJQcvv2WZV -Gm8HHM/4q8xo/UnEN/0Q -=3Dk5sz +iQIcBAEBCgAGBQJNklrBAAoJENwGBM22xffejPsP/iHLy1wVewtyftX0eTO2yuUw +Gn0VL4qzyM7Rp6nj8Dq0ECXjqBIL/tGzKsTegZZqPIhf39xESiR7jRI6mxRODEjH +F1hlSXbbchOKEtzJAHJtUKo92s3FG397p6Br9J1wX6mF8yxE68tADMPWkswZkUCS +cl5tu/zCdci2LTEDa8JxJodzlUXcVbndfD1Hg3oK2WtupvyjCaEhqX8/RuA9/h21 +NPrT7VY1MpFqb23YYwb4EPnBUbXImjcJPi2Sg3KAMmrugpmOz1umh7uSz0RaYrAw +BocIaqx1bwV27akQsoRQPrwF7EXqAHCJvZ90dHU3No0WhXalbocQYIEY1OhVgzSt +KQUPB0HnKVSrlzw1pGab1og0Bojg6XXDtPPz9snc0/LrzOw7CDVLF+ZNPUoYVyat ++CuE3ilyng+OK7JQv3R5ND1DtP6AhrccLpgtjNbgZ7Km336zmHv8b6T7uFq7IS+f +o8rPKHOoepxLyI2OAHBrJWBI+bQT8+qrMCtz4uqIMJfUZ3uhnmCGr0KmbnK1ggOO +ouIt3hDy9p3do96PXTXjKBV3HAD1BWk3J6RYhkEDPxrk7u5hldsFVU97LtsRheHF +sDPuwkA9z42ahBwUOASDaoUGHnMETmh66GKTQlvvoSLcP2lG3D2G69XS7j0RTsoZ +UsF86E6jwykTqCsclTmX +=3DmpbB -----END PGP SIGNATURE----- diff --git a/app-admin/collectd/collectd-4.10.2-r3.ebuild b/app-admin/col= lectd/collectd-4.10.2-r3.ebuild new file mode 100644 index 0000000..0a92c7d --- /dev/null +++ b/app-admin/collectd/collectd-4.10.2-r3.ebuild @@ -0,0 +1,315 @@ +# 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=3D"2" + +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 nu= t modbus" + +# 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 olsrd + 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_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}/${P}"-{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 + + 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 +} diff --git a/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch= b/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch new file mode 100644 index 0000000..92b01b1 --- /dev/null +++ b/app-admin/collectd/files/collectd-4.10.2-libnotify-0.7.patch @@ -0,0 +1,27 @@ +--- src/notify_desktop.c ++++ src/notify_desktop.c +@@ -31,6 +31,10 @@ + #include + #include +=20 ++#ifndef NOTIFY_CHECK_VERSION ++#define NOTIFY_CHECK_VERSION(x,y,z) 0 ++#endif ++ + #define log_info(...) INFO ("notify_desktop: " __VA_ARGS__) + #define log_warn(...) WARNING ("notify_desktop: " __VA_ARGS__) + #define log_err(...) ERROR ("notify_desktop: " __VA_ARGS__) +@@ -95,7 +99,12 @@ + : (NOTIF_WARNING =3D=3D n->severity) ? "WARNING" + : (NOTIF_OKAY =3D=3D n->severity) ? "OKAY" : "UNKNOWN"); +=20 +- notification =3D notify_notification_new (summary, n->message, NULL, N= ULL); ++ notification =3D notify_notification_new (summary, n->message, NULL ++#if NOTIFY_CHECK_VERSION (0, 7, 0) ++ ); ++#else ++ , NULL); ++#endif + if (NULL =3D=3D notification) { + log_err ("Failed to create a new notification."); + return -1; diff --git a/app-admin/collectd/files/collectd-4.10.2-nohal.patch b/app-a= dmin/collectd/files/collectd-4.10.2-nohal.patch new file mode 100644 index 0000000..a82a3bc --- /dev/null +++ b/app-admin/collectd/files/collectd-4.10.2-nohal.patch @@ -0,0 +1,23 @@ +diff -ruN collectd-4.10.2.orig/configure.in collectd-4.10.2/configure.in +--- collectd-4.10.2.orig/configure.in 2010-11-27 11:10:38.000000000 +010= 0 ++++ collectd-4.10.2/configure.in 2011-02-07 21:55:22.000000000 +0100 +@@ -1109,18 +1109,7 @@ + AM_CONDITIONAL(BUILD_WITH_LIBRESOLV, test "x$with_libresolv" =3D "xyes"= ) +=20 + dnl Check for HAL (hardware abstraction library) +-with_libhal=3D"yes" +-AC_CHECK_LIB(hal,libhal_device_property_exists, +- [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal' library= ])], +- [with_libhal=3D"no"]) +-if test "x$with_libhal" =3D "xyes"; then +- if test "x$PKG_CONFIG" !=3D "x"; then +- BUILD_WITH_LIBHAL_CFLAGS=3D"`pkg-config --cflags hal`" +- BUILD_WITH_LIBHAL_LIBS=3D"`pkg-config --libs hal`" +- AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS) +- AC_SUBST(BUILD_WITH_LIBHAL_LIBS) +- fi +-fi ++with_libhal=3D"no" +=20 + m4_divert_once([HELP_WITH], [ + collectd additional packages:]) diff --git a/app-admin/collectd/files/collectd.initd b/app-admin/collectd= /files/collectd.initd index 8417941..6633348 100644 --- a/app-admin/collectd/files/collectd.initd +++ b/app-admin/collectd/files/collectd.initd @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.ini= td,v 1.2 2010/10/10 19:13:04 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/files/collectd.ini= td,v 1.3 2010/12/16 17:33:45 dilfridge Exp $ =20 : ${COLLECTD_PIDFILE:=3D'/var/run/collectd.pid'} : ${COLLECTD_CFGFILE:=3D'/etc/collectd.conf'}