Mercurial > hg > portage

changeset 56:baac049cd305

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update collectd to 4.4.2
author holger@hoho.dyndns.org
date Sat, 09 Aug 2008 14:16:03 +0200
parents 11f27faa9896
children 4cd1ebbb3297 92f35dfbf2b8
files app-admin/collectd/Manifest app-admin/collectd/collectd-4.4.1.ebuild app-admin/collectd/collectd-4.4.2.ebuild app-admin/collectd/files/collectd-4.3.3.confd app-admin/collectd/files/collectd-4.3.3.initd app-admin/collectd/files/collectd-4.4.2-ipvs.patch app-admin/collectd/files/collectd-4.4.2-libtool-compatibility.patch app-admin/collectd/files/collectd-4.4.2-localstatedir.patch app-admin/collectd/files/collectd-4.4.2.confd app-admin/collectd/files/collectd-4.4.2.initd
diffstat 10 files changed, 349 insertions(+), 287 deletions(-) [+]
line wrap: on
line diff
--- a/app-admin/collectd/Manifest	Tue Jul 29 18:56:27 2008 +0200
+++ b/app-admin/collectd/Manifest	Sat Aug 09 14:16:03 2008 +0200
@@ -1,4 +1,7 @@
-AUX collectd-4.3.3.confd 519 RMD160 f4f3a699b9e8ce3e11522a3a521089793824fffd SHA1 2477a4acab05455ea7e1072663dcb5c381f175a6 SHA256 f043ad355fd7f5d2f017207d6cec7be5ac8c27d12aca19f1fd6541ea230d24b6
-AUX collectd-4.3.3.initd 801 RMD160 3e195dba9144906e4a364635eb48236f35e81100 SHA1 b4fdf02ea754c6a6067b895213cb9b8ed4a8bb76 SHA256 edf081f989a38c77ec4f5de3050b8e7ee96a8a420e15ac02d1d0bb8546391c8d
-DIST collectd-4.4.1.tar.bz2 921902 RMD160 d12c40e27c7fe6838cd6a490c44661af67abed08 SHA1 d927bbf045179359ad4bd29ed0ad77fd6105e2d4 SHA256 2e0373bb4e9e78f52739975575f1ad4874311853551b59c8562b5848a38eb85a
-EBUILD collectd-4.4.1.ebuild 8672 RMD160 47327f6863cbfebd66cadd0ba63e75e1bb7666b3 SHA1 96d4cf3a718953731ab588a5e8e524b4f2009b43 SHA256 a8a3f810bb0493d966f938908c193df7a942fe701a8d0720049dd49ca9d58fdb
+AUX collectd-4.4.2-ipvs.patch 1640 RMD160 2b76ac06ba80d3476e58c032afeb43f3693fa559 SHA1 1d122491b04a6711c2af58834ed5b27afee316f8 SHA256 5f5112b30c4209241e71ddcfc0a0781a13a94b5b13475b0898e0e04f65691aa3
+AUX collectd-4.4.2-libtool-compatibility.patch 539 RMD160 51e4fa64bf4e46ec20568c1e4001fad481d8a3d3 SHA1 242304facdd97f450cd5af01b89cbb7d0b2fcecf SHA256 64a08960230691bac9fbd1dc5f71da57e63ffa7a1ad0c4ee9587a675579d38d8
+AUX collectd-4.4.2-localstatedir.patch 326 RMD160 af64ae163399a4378586151a8449a58ea8df921f SHA1 7bbfdb7f1605077232804d255aeeb53aa6349002 SHA256 1129ab4006b900df2d81ace6eddb8e42f2a9eda99cb920fbd7ae7def25bfc730
+AUX collectd-4.4.2.confd 519 RMD160 f4f3a699b9e8ce3e11522a3a521089793824fffd SHA1 2477a4acab05455ea7e1072663dcb5c381f175a6 SHA256 f043ad355fd7f5d2f017207d6cec7be5ac8c27d12aca19f1fd6541ea230d24b6
+AUX collectd-4.4.2.initd 801 RMD160 3e195dba9144906e4a364635eb48236f35e81100 SHA1 b4fdf02ea754c6a6067b895213cb9b8ed4a8bb76 SHA256 edf081f989a38c77ec4f5de3050b8e7ee96a8a420e15ac02d1d0bb8546391c8d
+DIST collectd-4.4.2.tar.bz2 931183 RMD160 d75efad3dbc13caeeaf3479764c09f5850e2431b SHA1 13c5658fc8975be4c5d99031999820efa4119eb0 SHA256 d977f58c03d31568a5f5b637cff7399c9be98dea116f0927d4d087350d48838c
+EBUILD collectd-4.4.2.ebuild 5897 RMD160 492afe41ca886eb9c32a93eaf1217831459fdc88 SHA1 0926bd8ed372938e51f887442a68f0945316f38e SHA256 866f7de4e0896b580440ac4551a0818e507148f96436c816e982d055ca33f02a
--- a/app-admin/collectd/collectd-4.4.1.ebuild	Tue Jul 29 18:56:27 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,239 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools eutils flag-o-matic linux-info
-
-DESCRIPTION="A small daemon which collects system performance statistics"
-HOMEPAGE="http://collectd.org/"
-
-SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS="~x86 ~amd64"
-IUSE="
-    apache2 apcups dns email hal hddtemp ithreads lighttpd lm_sensors memcache
-    mysql network nfs nginx ntp nut perl qemu rrdtool snmp syslog vserver xen
-"
-
-DEPEND="
-    apache2?	( >=net-misc/curl-7.17.0 )
-    lighttpd?	( >=net-misc/curl-7.17.0 )
-    nginx?	( >=net-misc/curl-7.17.0 )
-    dns?	( >=net-libs/libpcap-0.9.8 )
-    qemu?	( >=app-emulation/libvirt-0.3.3 )
-    xen?	( >=app-emulation/libvirt-0.3.3 )
-    mysql?	( >=virtual/mysql-5.0 )
-    perl?	( >=dev-lang/perl-5.8.8-r4 )
-    nut?	( >=sys-power/nut-2.2.0 )
-    rrdtool?	( >=net-analyzer/rrdtool-1.2.27 )
-    lm_sensors?	( >=sys-apps/lm_sensors-2.10.4 )
-    snmp?	( >=net-analyzer/net-snmp-5.4.1-r3 )
-    hal?	( >=sys-apps/hal-0.5.9.1-r3 )
-    >=dev-libs/libxml2-2.6.31
-"
-
-RDEPEND="
-    ${DEPEND}
-    apcups?	( >=sys-power/apcupsd-3.14.2 )
-    hddtemp?	( >=app-admin/hddtemp-0.3_beta15-r3 )
-    memcache?	( >=net-misc/memcached-1.2.2-r2 )
-    ntp?	( >=net-misc/ntp-4.2.4_p4 )
-    syslog?	( virtual/logger )
-    !hal?	( >=sys-apps/dmidecode-2.9 )
-"
-
-pkg_setup()
-{
-    linux-info_pkg_setup
-
-    if ( !(linux_chkconfig_present ACPI_BATTERY) ); then einfo
-	ewarn "ACPI_BATTERY needs to be enabled in your kernel for the battery plug-in to work correctly"; fi
-    if ( !(linux_chkconfig_present CPU_FREQ) ); then einfo
-	ewarn "CPU_FREQ needs to be enabled in your kernel for the cpufreq plug-in to work correctly"; fi
-    if ( !(linux_chkconfig_present SERIAL_CORE) ); then einfo
-	ewarn "SERIAL_CORE needs to be enabled in your kernel for the serial plug-in to work correctly"; fi
-    if ( !(linux_chkconfig_present SWAP) ); then einfo
-	ewarn "SWAP needs to be enabled in your kernel for the swap plug-in to work correctly"; fi
-    if ( (use vserver) && !(linux_chkconfig_present IP_VS) ); then einfo
-	ewarn "IP_VS should to be enabled in your kernel when the USE flag vserver is enabled"; fi
-    if (use qemu && !(built_with_use libvirt qemu) ); then
-	die "USE flag qemu requires that libvirt was compiled with the USE flag qemu"; fi
-    if (use xen  && !(built_with_use libvirt xen) ); then
-	die "USE flag xen requires that libvirt was compiled with the USE flag xen"; fi
-
-    if (use perl); then
-	if (use ithreads); then
-	    (built_with_use perl ithreads) \
-	    || die "The perl plug-in requires that libperl was compiled with the USE flag ithreads"
-	else
-	    einfo
-	    ewarn "The perl plug-in requires the ithreads USE flag."
-	fi
-    fi
-    einfo
-
-    if ( !(linux_chkconfig_present PROC_FS) ); then
-	## if ( use network ); then
-	##     die "${P} requires that PROC_FS is enabled in the kernel for the USE flag network"; fi
-	die "${P} requires that PROC_FS is enabled in your kernel"	## UPDATE LATER
-    fi
-
-    if ( !(use network) ); then
-	if ( use dns ); then		die "The USE flag dns requires that the USE flag network is enabled"; fi
-	if ( use email ); then		die "The USE flag email requires that the USE flag network is enabled"; fi
-	if ( use nfs ); then		die "The USE flag nfs requires that the USE flag network is enabled"; fi
-	if ( use ntp ); then		die "The USE flag ntp requires that the USE flag network is enabled"; fi
-	if ( use snmp ); then		die "The USE flag snmp requires that the USE flag network is enabled"; fi
-	if ( use vserver ); then	die "The USE flag vserver requires that the USE flag network is enabled"; fi
-    fi
-}
-
-src_unpack() {
-    if [ "${A}" != "" ]; then
-        unpack ${A}
-    fi
-
-    cd ${S}
-
-    sed -i -e '/^AC_PLUGIN/ s/\ [[].*[]],/[no],/' \
-	configure.in \
-	|| die "sed no-automagic-patch failed"
-
-    eautoreconf \
-	|| die "eautoreconf failed"
-}
-
-src_compile()
-{
-    local myconf
-    local disabled_plugins
-    
-    ### NEEDS TO BE FIXED PROBABLY
-    append-flags -I/usr/src/linux/include
-
-    if ( use apache2 || use lighttpd );
-	then myconf="${myconf} --enable-apache"; fi
-    myconf="${myconf} $(use_enable apcups)"
-    myconf="${myconf} --disable-apple_sensors"		## DISABLED
-	disabled_plugins="${disabled_plugins} apple_sensors"
-    myconf="${myconf} --enable-battery"			## Kernel check PROCFS
-    myconf="${myconf} --enable-cpu"			## PROCFS
-    myconf="${myconf} --enable-cpufreq"			## Kernel check SYSFS
-    myconf="${myconf} --enable-csv"			## no checks
-    myconf="${myconf} --enable-df"			## no checks
-    myconf="${myconf} --enable-disk"			## PROCFS
-    myconf="${myconf} $(use network && use_enable dns)"
-    myconf="${myconf} $(use network && use_enable email)"
-    myconf="${myconf} --enable-entropy"			## PROCFS
-    myconf="${myconf} --disable-exec"			## NEEDS USERS
-	disabled_plugins="${disabled_plugins} exec"
-    myconf="${myconf} $(use_enable hddtemp)"		## PROCFS
-    myconf="${myconf} $(use_enable network interface)"	## PROCFS
-    myconf="${myconf} --disable-iptables"		## BREAKS
-	disabled_plugins="${disabled_plugins} iptables"
-    myconf="${myconf} $(use network && use_enable vserver ipvs)"	## Kernel check NEEDS CFLAGS -I -- FIX LATER
-    myconf="${myconf} --enable-irq"			## PROCFS
-    if ( use qemu || use xen ); then			## NEEDS KERNEL CHECK
-	myconf="${myconf} --enable-libvirt"; fi
-    myconf="${myconf} --enable-load"			## PROCFS
-    myconf="${myconf} --enable-logfile"			## no checks
-    myconf="${myconf} --disable-mbmon"			## COULD NOT FIND DAEMON
-	disabled_plugins="${disabled_plugins} mbmon"
-    myconf="${myconf} $(use_enable memcache memcached)"
-    myconf="${myconf} --enable-memory"			## PROCFS
-    myconf="${myconf} --enable-multimeter"
-    myconf="${myconf} $(use_enable mysql)"
-    myconf="${myconf} --disable-netlink"		## BREAKS
-	disabled_plugins="${disabled_plugins} netlink"
-    myconf="${myconf} $(use_enable network)"		## NO PROCFS
-    myconf="${myconf} $(use network && use_enable nfs)"	## PROCFS
-    myconf="${myconf} $(use_enable nginx)"
-    myconf="${myconf} $(use network && use_enable ntp ntpd)"
-    myconf="${myconf} $(use_enable nut)"
-    myconf="${myconf} $(use ithreads && use_enable perl)"
-    myconf="${myconf} $(use_with perl perl-bindings)"
-    myconf="${myconf} $(use_enable network ping)"
-    myconf="${myconf} --enable-processes"		## PROCFS
-    myconf="${myconf} $(use_enable rrdtool)"
-    myconf="${myconf} $(use_enable lm_sensors sensors)"
-    myconf="${myconf} --enable-serial"			## Kernel check PROCFS
-    myconf="${myconf} $(use network && use_enable snmp)"
-    myconf="${myconf} --enable-swap"			## Kernel check PROCFS
-    myconf="${myconf} $(use_enable syslog)"
-    myconf="${myconf} --disable-tape"			## SOLARIS ???
-	disabled_plugins="${disabled_plugins} tape"
-    myconf="${myconf} $(use_enable network tcpconns)"	## PROCFS
-    myconf="${myconf} $(use_enable network unixsock)"
-    myconf="${myconf} --enable-users"
-    myconf="${myconf} --enable-uuid"			## Depends on hal or dmidecode PROCFS
-    myconf="${myconf} $(use network && use_enable vserver)"		## PROCFS
-    myconf="${myconf} $(use_enable network wireless)" 	## NEEDS KERNEL CHECK ## PROCFS
-    myconf="${myconf} --disable-xmms"			## NOT IN GENTOO
-	disabled_plugins="${disabled_plugins} xmms"
-
-    einfo
-    elog "The following plug-ins have been disabled in the ebuild"
-    elog ${disabled_plugins}
-    einfo
-
-    ### Configure
-    econf \
-	${myconf} \
-	--localstatedir=/var \
-	|| die "econf failed"
-
-    ### Build
-    emake \
-	|| die "emake failed"
-}
-
-src_install()
-{
-    emake \
-	DESTDIR="${D}" \
-	install || die "emake install failed"
-
-    ### Documentation
-    dodoc AUTHORS ChangeLog NEWS README TODO \
-	|| die "dodoc failed"
-
-    docinto contrib/SpamAssassin
-    dodoc contrib/SpamAssassin/* \
-	|| die "dodoc contrib failed"
-
-    docinto contrib/examples
-    dodoc contrib/examples/* \
-	|| die "dodoc contrib failed"
-
-    docinto contrib/iptables
-    dodoc contrib/iptables/* \
-	|| die "dodoc contrib failed"
-    docinto contrib
-
-    docinto contrib
-    dodoc contrib/README contrib/*\.[a-z]* \
-	|| die "dodoc contrib failed"
-
-    
-    keepdir /var/lib/collectd \
-	|| die "keepdir failed"
-
-    newinitd "${FILESDIR}/${PN}-4.3.2.initd" ${PN} \
-	|| die "newinitd failed"
-    
-    newconfd "${FILESDIR}/${PN}-4.3.2.confd" ${PN} \
-	|| die "newconfd failed"
-}
-
-pkg_postinst()
-{
-    einfo
-    einfo "collectd introduced some changes in the new 4.x series."
-    einfo "For further information, read http://collectd.org/migrate-v3-v4.shtml"
-    einfo "The migration script can be found at:"
-    einfo "/usr/share/doc/${P}/contrib/migrate-3-4.px.bz2"
-    einfo
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/collectd/collectd-4.4.2.ebuild	Sat Aug 09 14:16:03 2008 +0200
@@ -0,0 +1,190 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit autotools eutils flag-o-matic linux-info
+
+DESCRIPTION="A small daemon which collects system performance statistics"
+HOMEPAGE="http://collectd.org"
+
+SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~x86"
+HTTP_FLAGS="apache2 lighttpd nginx"
+LIBVIRT_FLAGS="kvm openvz qemu xen"
+IUSE="apcups dns email hal hddtemp ipmi ithreads lm_sensors
+    memcache mysql network nfs ntp nut perl rrdtool snmp
+    syslog vserver wifi ${HTTP_FLAGS} ${LIBVIRT_FLAGS}
+"
+HTTP_DEPEND="
+    apache2?	( >=net-misc/curl-7.17.0 )
+    lighttpd?	( >=net-misc/curl-7.17.0 )
+    nginx?	( >=net-misc/curl-7.17.0 )
+"
+LIBVIRT_DEPEND="
+    kvm?	( >=app-emulation/libvirt-0.3.3 )
+    openvz?	( >=app-emulation/libvirt-0.3.3 )
+    qemu?	( >=app-emulation/libvirt-0.3.3 )
+    xen?	( >=app-emulation/libvirt-0.3.3 )
+"
+COMMON_DEPEND="${HTTP_DEPEND} ${LIBVIRT_DEPEND}
+    dns?	( >=net-libs/libpcap-0.9.8 )
+    hal?	( >=sys-apps/hal-0.5.9.1-r3 )
+    ipmi?	( >=sys-libs/openipmi-2.0.11 )
+    lm_sensors?	( >=sys-apps/lm_sensors-2.10.4 )
+    mysql?	( >=virtual/mysql-5.0 )
+    perl?	( >=dev-lang/perl-5.8.8-r4 )
+    nut?	( >=sys-power/nut-2.2.0 )
+    rrdtool?	( >=net-analyzer/rrdtool-1.2.27 )
+    snmp?	( >=net-analyzer/net-snmp-5.4.1-r3 )
+"
+DEPEND="${COMMON_DEPEND}
+    sys-devel/libtool
+    >=dev-libs/libxml2-2.6.31
+"
+RDEPEND="${COMMON_DEPEND}
+    apcups?	( >=sys-power/apcupsd-3.14.2 )
+    !hal?	( >=sys-apps/dmidecode-2.9 )
+    hddtemp?	( >=app-admin/hddtemp-0.3_beta15-r3 )
+    memcache?	( >=net-misc/memcached-1.2.2-r2 )
+    ntp?	( >=net-misc/ntp-4.2.4_p4 )
+    syslog?	( virtual/logger )
+"
+
+pkg_setup()
+{
+    linux-info_pkg_setup
+    local flag
+
+    (linux_chkconfig_present ACPI_BATTERY) \
+    || ewarn "ACPI_BATTERY needs to be enabled in your kernel for the battery plug-in to work correctly"
+    (linux_chkconfig_present CPU_FREQ) \
+    || ewarn "CPU_FREQ needs to be enabled in your kernel for the cpufreq plug-in to work correctly"
+    (linux_chkconfig_present SERIAL_CORE) \
+    || ewarn "SERIAL_CORE needs to be enabled in your kernel for the serial plug-in to work correctly"
+    (linux_chkconfig_present SWAP) \
+    || ewarn "SWAP needs to be enabled in your kernel for the swap plug-in to work correctly"    
+    (use vserver) && !(linux_chkconfig_present IP_VS) \
+    && ewarn "IP_VS should to be enabled in your kernel when the USE flag vserver is enabled"
+
+    for flag in "${LIBVIRT_FLAGS}"; do
+        (use ${flag}) && !(built_with_use app-emulation/libvirt ${flag}) && \
+	die "USE flag ${flag} requires that libvirt was compiled with the USE flag ${flag}"
+    done    
+    
+    if (use perl); then
+	if (use ithreads); then
+	    (built_with_use perl ithreads) \
+	    || die "The perl plug-in requires that libperl was compiled with the USE flag ithreads"
+	else
+	    ewarn "The perl plug-in requires the ithreads USE flag."
+	fi
+    fi
+
+    ((linux_chkconfig_present PROC_FS) && (linux_chkconfig_present SYSFS)) \
+    || die "${P} requires that PROC_FS and SYSFS are enabled in your kernel"
+}
+
+src_unpack()
+{
+    unpack ${A}
+    cd "${S}"
+
+    ebegin "Applying sed no-automagic-patch"
+    sed -i -e '/^AC_PLUGIN/ s/\ [[].*[]],/[no],/' \
+    configure.in \
+    || die "sed no-automagic-patch failed"
+    eend 0
+
+    epatch "${FILESDIR}/${PN}-4.4.2-ipvs.patch"
+    epatch "${FILESDIR}/${PN}-4.4.2-localstatedir.patch"
+    epatch "${FILESDIR}/${PN}-4.4.2-libtool-compatibility.patch"
+
+    ebegin "Remove provided libtool/libltdl"
+    rm -R ./libltdl \
+    && rm config.guess config.sub install-sh ltmain.sh \
+    || die "removing libtool failed"
+    eend 0
+
+    eautoreconf || die "eautoreconf failed"
+}
+
+src_compile()
+{
+    local flag
+    local myconf
+    local no_check_plugins="csv df logfile multimeter tail users uuid"
+    local proc_sys_fs_plugins="battery cpu cpufreq disk entropy irq load memory processes serial swap vmem"
+    local network_plugins="interface iptables network ping teamspeak2 tcpconns unixsock"
+
+    for flag in ${no_check_plugins} ${proc_sys_fs_plugins}; do
+	myconf+=" --enable-${flag}"
+    done
+
+    if (use network); then
+	for flag in ${network_plugins}; do
+	    myconf+=" --enable-${flag}"
+	done
+    fi
+
+    myconf+="
+    $(( use apache2 || use lighttpd ) && echo --enable-apache)
+    $(use_enable apcups)
+    $(use_enable dns)
+    $(use_enable hddtemp)
+    $(use_enable email)
+    $(use_enable ipmi)
+    $(use_enable vserver ipvs)
+    $(( use kvm || use openvz || use qemu || use xen ) && echo --enable-libvirt)
+    $(use_enable memcache memcached)
+    $(use_enable mysql)
+    $(use_enable nfs)
+    $(use_enable nginx)
+    $(use_enable ntp ntpd)
+    $(use_enable nut)
+    $(use_enable dns powerdns)
+    $(use_enable snmp)
+    $(use_enable syslog)
+    $(use_enable rrdtool)
+    $(use_enable vserver)
+    $(use_enable lm_sensors sensors)
+    $(use_enable wifi wireless)"
+
+    myconf+="
+    $(use ithreads && use_enable perl)
+    $(use_with perl perl-bindings)"
+
+    KERNEL_DIR="${KERNEL_DIR}" econf \
+    --localstatedir=/var ${myconf} \
+    || die "econf failed"
+
+    emake || die "emake failed"
+}
+
+src_install()
+{
+    emake DESTDIR="${D}" install || die "emake install failed"
+
+    dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+
+    insinto /usr/share/doc/${PF}
+    doins -r contrib || die "doins contrib failed"
+
+    keepdir /var/lib/${PN} || die "keepdir failed"
+
+    newinitd "${FILESDIR}/${PN}-4.4.2.initd" ${PN} || die "newinitd failed"
+    newconfd "${FILESDIR}/${PN}-4.4.2.confd" ${PN} || die "newconfd failed"
+}
+
+pkg_postinst()
+{
+    einfo
+    einfo "collectd introduced some changes in the new 4.x series."
+    einfo "For further information, read ${HOMEPAGE}/migrate-v3-v4.shtml"
+    einfo "The migration script can be found at:"
+    einfo "/usr/share/doc/${PF}/contrib/migrate-3-4.px"
+    einfo
+}
--- a/app-admin/collectd/files/collectd-4.3.3.confd	Tue Jul 29 18:56:27 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# File used to store the PID file. Usually you won't need to touch it.
-#COLLECTD_PIDFILE='/var/run/collectd.pid'
-
-# Nice value used to launch collectd, to change priority of the process. As
-# you usually will want to run it in background, a default of 5 is used.
-#COLLECTD_NICE='5'
-
-# Location of configuration file. Modify if you don't like the standard one.
-#COLLECTD_CONFIG='/etc/collectd.conf'
--- a/app-admin/collectd/files/collectd-4.3.3.initd	Tue Jul 29 18:56:27 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# Assign defaults to parameters from /etc/conf.d/collectd
-: ${COLLECTD_PIDFILE:='/var/run/collectd.pid'}
-: ${COLLECTD_NICE:='5'}
-: ${COLLECTD_CONFIG:='/etc/collectd.conf'}
-
-depend()
-{
-    after logger net firewall dns \
-	lm_sensors cpufreqd nfs apache lighttpd nginx mysql
-}
-
-start()
-{
-    ebegin "Starting collectd"
-    start-stop-daemon --start --pidfile ${COLLECTD_PIDFILE} \
-	--nice ${COLLECTD_NICE} --exec /usr/sbin/collectd \
-	-- -P ${COLLECTD_PIDFILE} -C ${COLLECTD_CONFIG}
-    eend $? "Failed to start collectd"
-}
-
-stop()
-{
-    ebegin "Stopping collectd"
-    start-stop-daemon --stop --pidfile ${COLLECTD_PIDFILE}
-    eend $? "Failed to stop collectd"
-}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/collectd/files/collectd-4.4.2-ipvs.patch	Sat Aug 09 14:16:03 2008 +0200
@@ -0,0 +1,70 @@
+--- configure.in.orig	2008-08-05
++++ configure.in	2008-08-05
+@@ -50,6 +50,18 @@
+ esac
+ AC_MSG_RESULT([$ac_system])
+ 
++if test "x$ac_system" = "xLinux"
++then
++	AC_ARG_VAR([KERNEL_DIR], [path to Linux kernel sources])
++	if test -z "$KERNEL_DIR"
++	then
++		KERNEL_DIR="/lib/modules/`uname -r`/source"
++	fi
++
++	KERNEL_CFLAGS="-I$KERNEL_DIR/include"
++	AC_SUBST(KERNEL_CFLAGS)
++fi
++
+ #
+ # Checks for header files.
+ #
+@@ -278,8 +290,13 @@
+ have_ip_vs_h="no"
+ if test "x$ac_system" = "xLinux"
+ then
++	SAVE_CFLAGS=$CFLAGS
++	CFLAGS="$CFLAGS $KERNEL_CFLAGS"
++
+ 	AC_CHECK_HEADERS(net/ip_vs.h, [have_net_ip_vs_h="yes"])
+ 	AC_CHECK_HEADERS(ip_vs.h, [have_ip_vs_h="yes"])
++
++	CFLAGS=$SAVE_CFLAGS
+ fi
+ 
+ # For quota module
+@@ -1599,15 +1616,6 @@
+ 	LDFLAGS=$SAVE_LDFLAGS
+ fi
+ 
+-if test "x$ac_system" = "xLinux"
+-then
+-	AC_ARG_VAR([KERNEL_DIR], [path to Linux kernel sources])
+-	if test -z "$KERNEL_DIR"
+-	then
+-		KERNEL_DIR="/lib/modules/`uname -r`/source"
+-	fi
+-fi
+-
+ with_own_libiptc="no"
+ AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])],
+ [
+@@ -1653,7 +1661,7 @@
+ if test "x$with_libiptc" = "xyes"
+ then
+ 	SAVE_CFLAGS=$CFLAGS
+-	CFLAGS="$CFLAGS -I$KERNEL_DIR/include"
++	CFLAGS="$CFLAGS $KERNEL_CFLAGS"
+ 
+ 	AC_CHECK_HEADERS(linux/netfilter_ipv4/ip_tables.h linux/netfilter_ipv6/ip6_tables.h, [],
+ 	[
+--- src/Makefile.am.orig	2008-08-05
++++ src/Makefile.am	2008-08-05
+@@ -311,6 +311,7 @@
+ if BUILD_PLUGIN_IPVS
+ pkglib_LTLIBRARIES += ipvs.la
+ ipvs_la_SOURCES = ipvs.c
++ipvs_la_CFLAGS = $(KERNEL_CFLAGS)
+ ipvs_la_LDFLAGS = -module -avoid-version
+ collectd_LDADD += "-dlopen" ipvs.la
+ collectd_DEPENDENCIES += ipvs.la
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/collectd/files/collectd-4.4.2-libtool-compatibility.patch	Sat Aug 09 14:16:03 2008 +0200
@@ -0,0 +1,27 @@
+--- configure.in.orig	2008-08-03
++++ configure.in	2008-08-03
+@@ -22,7 +22,7 @@
+ 
+ dnl configure libtool
+ AC_DISABLE_STATIC
+-AC_LIBLTDL_CONVENIENCE
++AC_WITH_LTDL
+ AC_SUBST(LTDLINCL)
+ AC_SUBST(LIBLTDL)
+ AC_LIBTOOL_DLOPEN
+@@ -30,7 +30,6 @@
+ AC_PROG_LEX
+ AC_PROG_YACC
+ PKG_PROG_PKG_CONFIG
+-AC_CONFIG_SUBDIRS(libltdl)
+ 
+ AC_MSG_CHECKING([for kernel type ($host_os)])
+ case $host_os in
+--- Makefile.am.orig	2008-08-03
++++ Makefile.am	2008-08-03
+@@ -1,4 +1,4 @@
+-SUBDIRS = libltdl src bindings
++SUBDIRS = src bindings
+ 
+ INCLUDES = $(LTDLINCL)
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/collectd/files/collectd-4.4.2-localstatedir.patch	Sat Aug 09 14:16:03 2008 +0200
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2008-08-07
++++ Makefile.am	2008-08-07
+@@ -3,8 +3,3 @@
+ INCLUDES = $(LTDLINCL)
+ 
+ EXTRA_DIST = contrib version-gen.sh
+-
+-install-exec-hook:
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/lib/$(PACKAGE_NAME)
+-	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/log
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/collectd/files/collectd-4.4.2.confd	Sat Aug 09 14:16:03 2008 +0200
@@ -0,0 +1,13 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# File used to store the PID file. Usually you won't need to touch it.
+#COLLECTD_PIDFILE='/var/run/collectd.pid'
+
+# Nice value used to launch collectd, to change priority of the process. As
+# you usually will want to run it in background, a default of 5 is used.
+#COLLECTD_NICE='5'
+
+# Location of configuration file. Modify if you don't like the standard one.
+#COLLECTD_CONFIG='/etc/collectd.conf'
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/collectd/files/collectd-4.4.2.initd	Sat Aug 09 14:16:03 2008 +0200
@@ -0,0 +1,31 @@
+#!/sbin/runscript
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# Assign defaults to parameters from /etc/conf.d/collectd
+: ${COLLECTD_PIDFILE:='/var/run/collectd.pid'}
+: ${COLLECTD_NICE:='5'}
+: ${COLLECTD_CONFIG:='/etc/collectd.conf'}
+
+depend()
+{
+    after logger net firewall dns \
+	lm_sensors cpufreqd nfs apache lighttpd nginx mysql
+}
+
+start()
+{
+    ebegin "Starting collectd"
+    start-stop-daemon --start --pidfile ${COLLECTD_PIDFILE} \
+	--nice ${COLLECTD_NICE} --exec /usr/sbin/collectd \
+	-- -P ${COLLECTD_PIDFILE} -C ${COLLECTD_CONFIG}
+    eend $? "Failed to start collectd"
+}
+
+stop()
+{
+    ebegin "Stopping collectd"
+    start-stop-daemon --stop --pidfile ${COLLECTD_PIDFILE}
+    eend $? "Failed to stop collectd"
+}