# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1218324762 -7200
# Node ID 4cd1ebbb3297c4446eacbeecee96c6097ec16603
# Parent  665fb2df350f8c25d102cb49810acae0e4a3724b# Parent  baac049cd30595f2e313f5b4d64e9a881651c580
pull changes from Holgi's portage repository

diff -r 665fb2df350f -r 4cd1ebbb3297 app-admin/collectd/Manifest
--- a/app-admin/collectd/Manifest	Mon Aug 04 10:31:59 2008 +0200
+++ b/app-admin/collectd/Manifest	Sun Aug 10 01:32:42 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
diff -r 665fb2df350f -r 4cd1ebbb3297 app-admin/collectd/collectd-4.4.1.ebuild
--- a/app-admin/collectd/collectd-4.4.1.ebuild	Mon Aug 04 10:31:59 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
-}
diff -r 665fb2df350f -r 4cd1ebbb3297 app-admin/collectd/collectd-4.4.2.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/collectd/collectd-4.4.2.ebuild	Sun Aug 10 01:32:42 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
+}
diff -r 665fb2df350f -r 4cd1ebbb3297 app-admin/collectd/files/collectd-4.3.3.confd
--- a/app-admin/collectd/files/collectd-4.3.3.confd	Mon Aug 04 10:31:59 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'
diff -r 665fb2df350f -r 4cd1ebbb3297 app-admin/collectd/files/collectd-4.3.3.initd
--- a/app-admin/collectd/files/collectd-4.3.3.initd	Mon Aug 04 10:31:59 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"
-}
diff -r 665fb2df350f -r 4cd1ebbb3297 app-admin/collectd/files/collectd-4.4.2-ipvs.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/collectd/files/collectd-4.4.2-ipvs.patch	Sun Aug 10 01:32:42 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
diff -r 665fb2df350f -r 4cd1ebbb3297 app-admin/collectd/files/collectd-4.4.2-libtool-compatibility.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/collectd/files/collectd-4.4.2-libtool-compatibility.patch	Sun Aug 10 01:32:42 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)
+ 
diff -r 665fb2df350f -r 4cd1ebbb3297 app-admin/collectd/files/collectd-4.4.2-localstatedir.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/collectd/files/collectd-4.4.2-localstatedir.patch	Sun Aug 10 01:32:42 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
diff -r 665fb2df350f -r 4cd1ebbb3297 app-admin/collectd/files/collectd-4.4.2.confd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/collectd/files/collectd-4.4.2.confd	Sun Aug 10 01:32:42 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'
diff -r 665fb2df350f -r 4cd1ebbb3297 app-admin/collectd/files/collectd-4.4.2.initd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app-admin/collectd/files/collectd-4.4.2.initd	Sun Aug 10 01:32:42 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"
+}
diff -r 665fb2df350f -r 4cd1ebbb3297 net-misc/e1000/Manifest
--- a/net-misc/e1000/Manifest	Mon Aug 04 10:31:59 2008 +0200
+++ b/net-misc/e1000/Manifest	Sun Aug 10 01:32:42 2008 +0200
@@ -1,2 +1,2 @@
-DIST e1000-8.0.1.tar.gz 197425 RMD160 1ca429ea1569aff91ab6bff8ac81c9442032c5c5 SHA1 46ea822156326445f25477cc51b2c9e81e9608dc SHA256 21d2782db2db897fefa222df05258541934d2dfdef4d577cd0dc1dd77e4bafd1
-EBUILD e1000-8.0.1.ebuild 1378 RMD160 d36ce4380b793c12c5e15b1b994e53c3aca38fb4 SHA1 0a1df1551fca9cccff44672524b012dfa472cce6 SHA256 9c8e7d27e571b2ef41b840803c46a2e3f9068874054809fee2ff3795032c1ecd
+DIST e1000-8.0.3.1.tar.gz 199029 RMD160 a07d3b52f80c8f7c6e3a0e8a20db38431822397f SHA1 6fef2b7f9636c70d003789593f8e211217264416 SHA256 0751afb6d5191eef568f44c0b57b6d39271df28b3f8ff1eecbc5d35373c00a59
+EBUILD e1000-8.0.3.1.ebuild 1378 RMD160 d36ce4380b793c12c5e15b1b994e53c3aca38fb4 SHA1 0a1df1551fca9cccff44672524b012dfa472cce6 SHA256 9c8e7d27e571b2ef41b840803c46a2e3f9068874054809fee2ff3795032c1ecd
diff -r 665fb2df350f -r 4cd1ebbb3297 net-misc/e1000/e1000-8.0.1.ebuild
--- a/net-misc/e1000/e1000-8.0.1.ebuild	Mon Aug 04 10:31:59 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Kernel driver for Intel Pro/1000 ethernet adapters."
-HOMEPAGE="http://support.intel.com/support/network/adapter/1000/index.htm"
-LICENSE="GPL-2"
-DEPEND="virtual/linux-sources"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-
-src_unpack() {
-    unpack ${A}
-    cd ${S}/src
-    # rem out the DEPVER line, since it would cause a sandbox violation and
-    # since it is only needed by RPM ;-)
-    sed -i "/^DEPVER :=/ d" Makefile
-}
-
-
-src_compile() {
-    check_KV
-    cd "${S}/src"
-
-    # workaround needed for some ethernet controllers to work with low end switches
-    if [[ ${USE_INCOMPATIBLE_SWITCH} ]]
-        then CFLAGS_EXTRA="CFLAGS_EXTRA=-DE_1000_MASTER_SLAVE=1"
-        else CFLAGS_EXTRA=""
-    fi
-
-    make ${CFLAGS_EXTRA} KSRC=/usr/src/linux
-}
-
-
-src_install() {
-    insinto "/lib/modules/${KV}/kernel/drivers/net/e1000"
-    doins "${S}/src/e1000.ko"
-    doman e1000.7
-    dodoc LICENSE README SUMS e1000.spec ldistrib.txt ${FILESDIR}/README.Gentoo
-    einfo ""
-    einfo "In case you have problems when loading the module, try to run depmod -A"
-    einfo ""
-    einfo "If you experience problems with low-end switches, read"
-    einfo "/usr/share/doc/${PF}/README.Gentoo.gz for a possible workaround"
-    einfo ""
-}
diff -r 665fb2df350f -r 4cd1ebbb3297 net-misc/e1000/e1000-8.0.3.1.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/e1000/e1000-8.0.3.1.ebuild	Sun Aug 10 01:32:42 2008 +0200
@@ -0,0 +1,49 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Kernel driver for Intel Pro/1000 ethernet adapters."
+HOMEPAGE="http://support.intel.com/support/network/adapter/1000/index.htm"
+LICENSE="GPL-2"
+DEPEND="virtual/linux-sources"
+
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+
+src_unpack() {
+    unpack ${A}
+    cd ${S}/src
+    # rem out the DEPVER line, since it would cause a sandbox violation and
+    # since it is only needed by RPM ;-)
+    sed -i "/^DEPVER :=/ d" Makefile
+}
+
+
+src_compile() {
+    check_KV
+    cd "${S}/src"
+
+    # workaround needed for some ethernet controllers to work with low end switches
+    if [[ ${USE_INCOMPATIBLE_SWITCH} ]]
+        then CFLAGS_EXTRA="CFLAGS_EXTRA=-DE_1000_MASTER_SLAVE=1"
+        else CFLAGS_EXTRA=""
+    fi
+
+    make ${CFLAGS_EXTRA} KSRC=/usr/src/linux
+}
+
+
+src_install() {
+    insinto "/lib/modules/${KV}/kernel/drivers/net/e1000"
+    doins "${S}/src/e1000.ko"
+    doman e1000.7
+    dodoc LICENSE README SUMS e1000.spec ldistrib.txt ${FILESDIR}/README.Gentoo
+    einfo ""
+    einfo "In case you have problems when loading the module, try to run depmod -A"
+    einfo ""
+    einfo "If you experience problems with low-end switches, read"
+    einfo "/usr/share/doc/${PF}/README.Gentoo.gz for a possible workaround"
+    einfo ""
+}
diff -r 665fb2df350f -r 4cd1ebbb3297 net-misc/e1000e/Manifest
--- a/net-misc/e1000e/Manifest	Mon Aug 04 10:31:59 2008 +0200
+++ b/net-misc/e1000e/Manifest	Sun Aug 10 01:32:42 2008 +0200
@@ -1,3 +1,2 @@
-DIST e1000e-0.2.9.5.tar.gz 175390 RMD160 0234455b22b4cb61e2956d4729503a68a178db7c SHA1 e050692d0854b1308b9eb5042f166d34e33a75fa SHA256 051861bc49a759a519f77b10a7835059f270c280423c10f8da00a835430c62a9
-EBUILD e1000e-0.2.9.5.ebuild 1187 RMD160 39892b555fbfae0f5a921640b9f7a6672a5d269a SHA1 6c992484bb31def68606054e69fb9978f27cd220 SHA256 319fb813eef746f8263ff84df28529b67733afecfd97c5fbcac8fcf4eb713c14
-MISC e1000e-0.2.9.5.ebuild~ 1200 RMD160 e6a381ceb28719e3da28745df2330d54d5942b72 SHA1 c8fbac1d72eb1d353f3aaff189ab286857987aac SHA256 82856e774e3ec5ae3b07d6d52d82fc23bcd37a63f7d213e08e33d46901d7f598
+DIST e1000e-0.4.1.7.tar.gz 200496 RMD160 e03441ffaa7bac2d0b7b0f1b0d8c8434641af935 SHA1 b919215aa566ff00e52425447a7ec43af6170ba8 SHA256 95bd9b275166ead953ebc828597433044ea708093ede6864ed2aac4b64a62175
+EBUILD e1000e-0.4.1.7.ebuild 1187 RMD160 39892b555fbfae0f5a921640b9f7a6672a5d269a SHA1 6c992484bb31def68606054e69fb9978f27cd220 SHA256 319fb813eef746f8263ff84df28529b67733afecfd97c5fbcac8fcf4eb713c14
diff -r 665fb2df350f -r 4cd1ebbb3297 net-misc/e1000e/e1000e-0.2.9.5.ebuild
--- a/net-misc/e1000e/e1000e-0.2.9.5.ebuild	Mon Aug 04 10:31:59 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DESCRIPTION="Kernel driver for Intel Pro/1000 ethernet adapters."
-HOMEPAGE="http://support.intel.com/support/network/adapter/1000/index.htm"
-LICENSE="GPL-2"
-DEPEND="virtual/linux-sources"
-
-SRC_URI="mirror://sourceforge/e1000/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-
-src_unpack() {
-    unpack ${A}
-    cd ${S}/src
-    # rem out the DEPVER line, since it would cause a sandbox violation and
-    # since it is only needed by RPM ;-)
-    sed -i "/^DEPVER :=/ d" Makefile
-}
-
-
-src_compile() {
-    check_KV
-    cd "${S}/src"
-
-    # workaround needed for some ethernet controllers to work with low end switches
-    if [[ ${USE_INCOMPATIBLE_SWITCH} ]]
-        then CFLAGS_EXTRA="CFLAGS_EXTRA=-DE_1000_MASTER_SLAVE=1"
-        else CFLAGS_EXTRA=""
-    fi
-
-    make ${CFLAGS_EXTRA} KSRC=/usr/src/linux
-}
-
-
-src_install() {
-    insinto "/lib/modules/${KV}/kernel/drivers/net/e1000e"
-    doins "${S}/src/e1000e.ko"
-    doman e1000e.7
-    dodoc COPYING README SUMS e1000e.spec
-    einfo ""
-    einfo "In case you have problems when loading the module, try to run depmod -A"
-    einfo ""
-}
diff -r 665fb2df350f -r 4cd1ebbb3297 net-misc/e1000e/e1000e-0.4.1.7.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/e1000e/e1000e-0.4.1.7.ebuild	Sun Aug 10 01:32:42 2008 +0200
@@ -0,0 +1,46 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Kernel driver for Intel Pro/1000 ethernet adapters."
+HOMEPAGE="http://support.intel.com/support/network/adapter/1000/index.htm"
+LICENSE="GPL-2"
+DEPEND="virtual/linux-sources"
+
+SRC_URI="mirror://sourceforge/e1000/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+
+src_unpack() {
+    unpack ${A}
+    cd ${S}/src
+    # rem out the DEPVER line, since it would cause a sandbox violation and
+    # since it is only needed by RPM ;-)
+    sed -i "/^DEPVER :=/ d" Makefile
+}
+
+
+src_compile() {
+    check_KV
+    cd "${S}/src"
+
+    # workaround needed for some ethernet controllers to work with low end switches
+    if [[ ${USE_INCOMPATIBLE_SWITCH} ]]
+        then CFLAGS_EXTRA="CFLAGS_EXTRA=-DE_1000_MASTER_SLAVE=1"
+        else CFLAGS_EXTRA=""
+    fi
+
+    make ${CFLAGS_EXTRA} KSRC=/usr/src/linux
+}
+
+
+src_install() {
+    insinto "/lib/modules/${KV}/kernel/drivers/net/e1000e"
+    doins "${S}/src/e1000e.ko"
+    doman e1000e.7
+    dodoc COPYING README SUMS e1000e.spec
+    einfo ""
+    einfo "In case you have problems when loading the module, try to run depmod -A"
+    einfo ""
+}
diff -r 665fb2df350f -r 4cd1ebbb3297 net-misc/rabbitmq-server/Manifest
--- a/net-misc/rabbitmq-server/Manifest	Mon Aug 04 10:31:59 2008 +0200
+++ b/net-misc/rabbitmq-server/Manifest	Sun Aug 10 01:32:42 2008 +0200
@@ -1,3 +1,2 @@
-DIST rabbitmq-server-1.3.0.tar.gz 389061 RMD160 745436552148aa06c7296e2603d3d0a1e58017b7 SHA1 7003956bac301d9af14a209ee5a855c46307312e SHA256 75ad3fbbb55d0e75372be59982625d349075d96b78093aaa18cd82649fb0d283
-EBUILD rabbitmq-server-1.3.0.ebuild 7599 RMD160 5ef0a21e11769b659a6f5e17c9b975767bc26a04 SHA1 76336937c5803c115bef859674e8aa70720c7303 SHA256 86c8cf150405bc2b26a06faebbf9c16ea954ca5ac5fc1549c14d3aecfecb6cf4
-MISC rabbitmq-server-1.3.0.ebuild~ 7591 RMD160 5c3504487d9a01352d19891b72d1950974e2088a SHA1 c9244dbb64b08811b70d1c0529b28bd828149ef8 SHA256 c26e2d95eb8d2e4cee73717da0ec21be49aa003ea4d5351d409a0ef929628943
+DIST rabbitmq-server-generic-unix-1.4.0.tar.gz 394991 RMD160 f3ced06ec6f8ced09a9e0f5c60f0b73954ea8634 SHA1 bea27fa2255324f13e343ed82c50e69c6983628a SHA256 642ffe9cdca8ac5bd030647d24d60cca388df20f1d6a5913c3a2ae036f75018e
+EBUILD rabbitmq-server-1.4.0.ebuild 7680 RMD160 d66d21153bdef80641510d118ae3948c088e67e0 SHA1 4888a5cad90ee282817dd0e134b4dc4d4e858ef7 SHA256 db327700e6d7d348cfa19c1f595822bc19b694f1416bb9144661cd23d87c79ba
diff -r 665fb2df350f -r 4cd1ebbb3297 net-misc/rabbitmq-server/rabbitmq-server-1.3.0.ebuild
--- a/net-misc/rabbitmq-server/rabbitmq-server-1.3.0.ebuild	Mon Aug 04 10:31:59 2008 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-# NOTE: The comments in this file are for instruction and documentation.
-# They're not meant to appear with your final, production ebuild.  Please
-# remember to remove them before submitting or committing your ebuild.  That
-# doesn't mean you can't add your own comments though.
-
-# The 'Header' on the third line should just be left alone.  When your ebuild
-# will be committed to cvs, the details on that line will be automatically
-# generated to contain the correct data.
-
-# The EAPI variable tells the ebuild format in use.
-# Defaults to 0 if not specified. The current PMS draft contains details on
-# a proposed EAPI=0 definition but is not finalized yet.
-# Eclasses will test for this variable if they need to use EAPI > 0 features.
-# Ebuilds should not define EAPI > 0 unless they absolutely need to use
-# features added in that version.
-#EAPI=0
-
-# inherit lists eclasses to inherit functions from. Almost all ebuilds should
-# inherit eutils, as a large amount of important functionality has been
-# moved there. For example, the $(get_libdir) mentioned below wont work
-# without the following line:
-inherit eutils
-# A well-used example of an eclass function that needs eutils is epatch. If
-# your source needs patches applied, it's suggested to put your patch in the
-# 'files' directory and use:
-#
-#   epatch ${FILESDIR}/patch-name-here
-#
-# eclasses tend to list descriptions of how to use their functions properly.
-# take a look at /usr/portage/eclasses/ for more examples.
-
-# Short one-line description of this package.
-DESCRIPTION="This is a sample skeleton ebuild file"
-
-# Homepage, not used by Portage directly but handy for developer reference
-HOMEPAGE="http://www.rabbitmq.com/"
-
-# Point to any required sources; these will be automatically downloaded by
-# Portage.
-SRC_URI="http://www.rabbitmq.com/releases/binary/${PN}-${PV}.tar.gz"
-
-# License of the package.  This must match the name of file(s) in
-# /usr/portage/licenses/.  For complex license combination see the developer
-# docs on gentoo.org for details.
-LICENSE="MPL"
-
-# The SLOT variable is used to tell Portage if it's OK to keep multiple
-# versions of the same package installed at the same time.  For example,
-# if we have a libfoo-1.2.2 and libfoo-1.3.2 (which is not compatible
-# with 1.2.2), it would be optimal to instruct Portage to not remove
-# libfoo-1.2.2 if we decide to upgrade to libfoo-1.3.2.  To do this,
-# we specify SLOT="1.2" in libfoo-1.2.2 and SLOT="1.3" in libfoo-1.3.2.
-# emerge clean understands SLOTs, and will keep the most recent version
-# of each SLOT and remove everything else.
-# Note that normal applications should use SLOT="0" if possible, since
-# there should only be exactly one version installed at a time.
-# DO NOT USE SLOT=""! This tells Portage to disable SLOTs for this package.
-SLOT="0"
-
-# Using KEYWORDS, we can record masking information *inside* an ebuild
-# instead of relying on an external package.mask file.  Right now, you should
-# set the KEYWORDS variable for every ebuild so that it contains the names of
-# all the architectures with which the ebuild works.  All of the official
-# architectures can be found in the keywords.desc file which is in
-# /usr/portage/profiles/.  Usually you should just set this to "~x86".  The ~
-# in front of the architecture indicates that the package is new and should be
-# considered unstable until testing proves its stability.  So, if you've
-# confirmed that your ebuild works on x86 and ppc, you'd specify:
-# KEYWORDS="~x86 ~ppc"
-# Once packages go stable, the ~ prefix is removed.
-# For binary packages, use -* and then list the archs the bin package
-# exists for.  If the package was for an x86 binary package, then
-# KEYWORDS would be set like this: KEYWORDS="-* x86"
-# DO NOT USE KEYWORDS="*".  This is deprecated and only for backward
-# compatibility reasons.
-KEYWORDS="~x86"
-
-# Comprehensive list of any and all USE flags leveraged in the ebuild,
-# with the exception of any ARCH specific flags, i.e. "ppc", "sparc",
-# "x86" and "alpha".  This is a required variable.  If the ebuild doesn't
-# use any USE flags, set to "".
-IUSE=""
-
-# A space delimited list of portage features to restrict. man 5 ebuild
-# for details.  Usually not needed.
-#RESTRICT="strip"
-
-# Build-time dependencies, such as
-#    ssl? ( >=dev-libs/openssl-0.9.6b )
-#    >=dev-lang/perl-5.6.1-r1
-# It is advisable to use the >= syntax show above, to reflect what you
-# had installed on your system when you tested the package.  Then
-# other users hopefully won't be caught without the right version of
-# a dependency.
-DEPEND="dev-lang/erlang"
-
-# Run-time dependencies. Must be defined to whatever this depends on to run.
-# The below is valid if the same run-time depends are required to compile.
-RDEPEND="${DEPEND}"
-
-# Source directory; the dir where the sources can be found (automatically
-# unpacked) inside ${WORKDIR}.  The default value for S is ${WORKDIR}/${P}
-# If you don't need to change it, leave the S= line out of the ebuild
-# to keep it tidy.
-#S="${WORKDIR}/${P}"
-
-src_compile() {
-	# Most open-source packages use GNU autoconf for configuration.
-	# The quickest (and preferred) way of running configure is:
-	econf || die "econf failed"
-	#
-	# You could use something similar to the following lines to
-	# configure your package before compilation.  The "|| die" portion
-	# at the end will stop the build process if the command fails.
-	# You should use this at the end of critical commands in the build
-	# process.  (Hint: Most commands are critical, that is, the build
-	# process should abort if they aren't successful.)
-	#./configure \
-	#	--host=${CHOST} \
-	#	--prefix=/usr \
-	#	--infodir=/usr/share/info \
-	#	--mandir=/usr/share/man || die "./configure failed"
-	# Note the use of --infodir and --mandir, above. This is to make
-	# this package FHS 2.2-compliant.  For more information, see
-	#   http://www.pathname.com/fhs/
-
-	# emake (previously known as pmake) is a script that calls the
-	# standard GNU make with parallel building options for speedier
-	# builds (especially on SMP systems).  Try emake first.  It might
-	# not work for some packages, because some makefiles have bugs
-	# related to parallelism, in these cases, use emake -j1 to limit
-	# make to a single process.  The -j1 is a visual clue to others
-	# that the makefiles have bugs that have been worked around.
-	emake || die "emake failed"
-}
-
-src_install() {
-	# You must *personally verify* that this trick doesn't install
-	# anything outside of DESTDIR; do this by reading and
-	# understanding the install part of the Makefiles.
-	# This is the preferred way to install.
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# When you hit a failure with emake, do not just use make. It is
-	# better to fix the Makefiles to allow proper parallelization.
-	# If you fail with that, use "emake -j1", it's still better than make.
-
-	# For Makefiles that don't make proper use of DESTDIR, setting
-	# prefix is often an alternative.  However if you do this, then
-	# you also need to specify mandir and infodir, since they were
-	# passed to ./configure as absolute paths (overriding the prefix
-	# setting).
-	#emake \
-	#	prefix="${D}"/usr \
-	#	mandir="${D}"/usr/share/man \
-	#	infodir="${D}"/usr/share/info \
-	#	libdir="${D}"/usr/$(get_libdir) \
-	#	install || die "emake install failed"
-	# Again, verify the Makefiles!  We don't want anything falling
-	# outside of ${D}.
-
-	# The portage shortcut to the above command is simply:
-	#
-	#einstall || die "einstall failed"
-}
diff -r 665fb2df350f -r 4cd1ebbb3297 net-misc/rabbitmq-server/rabbitmq-server-1.4.0.ebuild
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/net-misc/rabbitmq-server/rabbitmq-server-1.4.0.ebuild	Sun Aug 10 01:32:42 2008 +0200
@@ -0,0 +1,169 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+# NOTE: The comments in this file are for instruction and documentation.
+# They're not meant to appear with your final, production ebuild.  Please
+# remember to remove them before submitting or committing your ebuild.  That
+# doesn't mean you can't add your own comments though.
+
+# The 'Header' on the third line should just be left alone.  When your ebuild
+# will be committed to cvs, the details on that line will be automatically
+# generated to contain the correct data.
+
+# The EAPI variable tells the ebuild format in use.
+# Defaults to 0 if not specified. The current PMS draft contains details on
+# a proposed EAPI=0 definition but is not finalized yet.
+# Eclasses will test for this variable if they need to use EAPI > 0 features.
+# Ebuilds should not define EAPI > 0 unless they absolutely need to use
+# features added in that version.
+#EAPI=0
+
+# inherit lists eclasses to inherit functions from. Almost all ebuilds should
+# inherit eutils, as a large amount of important functionality has been
+# moved there. For example, the $(get_libdir) mentioned below wont work
+# without the following line:
+inherit eutils
+# A well-used example of an eclass function that needs eutils is epatch. If
+# your source needs patches applied, it's suggested to put your patch in the
+# 'files' directory and use:
+#
+#   epatch ${FILESDIR}/patch-name-here
+#
+# eclasses tend to list descriptions of how to use their functions properly.
+# take a look at /usr/portage/eclasses/ for more examples.
+
+# Short one-line description of this package.
+DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang."
+
+# Homepage, not used by Portage directly but handy for developer reference
+HOMEPAGE="http://www.rabbitmq.com/"
+
+# Point to any required sources; these will be automatically downloaded by
+# Portage.
+SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-generic-unix-${PV}.tar.gz"
+
+# License of the package.  This must match the name of file(s) in
+# /usr/portage/licenses/.  For complex license combination see the developer
+# docs on gentoo.org for details.
+LICENSE="MPL"
+
+# The SLOT variable is used to tell Portage if it's OK to keep multiple
+# versions of the same package installed at the same time.  For example,
+# if we have a libfoo-1.2.2 and libfoo-1.3.2 (which is not compatible
+# with 1.2.2), it would be optimal to instruct Portage to not remove
+# libfoo-1.2.2 if we decide to upgrade to libfoo-1.3.2.  To do this,
+# we specify SLOT="1.2" in libfoo-1.2.2 and SLOT="1.3" in libfoo-1.3.2.
+# emerge clean understands SLOTs, and will keep the most recent version
+# of each SLOT and remove everything else.
+# Note that normal applications should use SLOT="0" if possible, since
+# there should only be exactly one version installed at a time.
+# DO NOT USE SLOT=""! This tells Portage to disable SLOTs for this package.
+SLOT="0"
+
+# Using KEYWORDS, we can record masking information *inside* an ebuild
+# instead of relying on an external package.mask file.  Right now, you should
+# set the KEYWORDS variable for every ebuild so that it contains the names of
+# all the architectures with which the ebuild works.  All of the official
+# architectures can be found in the keywords.desc file which is in
+# /usr/portage/profiles/.  Usually you should just set this to "~x86".  The ~
+# in front of the architecture indicates that the package is new and should be
+# considered unstable until testing proves its stability.  So, if you've
+# confirmed that your ebuild works on x86 and ppc, you'd specify:
+# KEYWORDS="~x86 ~ppc"
+# Once packages go stable, the ~ prefix is removed.
+# For binary packages, use -* and then list the archs the bin package
+# exists for.  If the package was for an x86 binary package, then
+# KEYWORDS would be set like this: KEYWORDS="-* x86"
+# DO NOT USE KEYWORDS="*".  This is deprecated and only for backward
+# compatibility reasons.
+KEYWORDS="~x86"
+
+# Comprehensive list of any and all USE flags leveraged in the ebuild,
+# with the exception of any ARCH specific flags, i.e. "ppc", "sparc",
+# "x86" and "alpha".  This is a required variable.  If the ebuild doesn't
+# use any USE flags, set to "".
+IUSE=""
+
+# A space delimited list of portage features to restrict. man 5 ebuild
+# for details.  Usually not needed.
+#RESTRICT="strip"
+
+# Build-time dependencies, such as
+#    ssl? ( >=dev-libs/openssl-0.9.6b )
+#    >=dev-lang/perl-5.6.1-r1
+# It is advisable to use the >= syntax show above, to reflect what you
+# had installed on your system when you tested the package.  Then
+# other users hopefully won't be caught without the right version of
+# a dependency.
+DEPEND="dev-lang/erlang"
+
+# Run-time dependencies. Must be defined to whatever this depends on to run.
+# The below is valid if the same run-time depends are required to compile.
+RDEPEND="${DEPEND}"
+
+# Source directory; the dir where the sources can be found (automatically
+# unpacked) inside ${WORKDIR}.  The default value for S is ${WORKDIR}/${P}
+# If you don't need to change it, leave the S= line out of the ebuild
+# to keep it tidy.
+#S="${WORKDIR}/${P}"
+
+src_compile() {
+	# Most open-source packages use GNU autoconf for configuration.
+	# The quickest (and preferred) way of running configure is:
+	econf || die "econf failed"
+	#
+	# You could use something similar to the following lines to
+	# configure your package before compilation.  The "|| die" portion
+	# at the end will stop the build process if the command fails.
+	# You should use this at the end of critical commands in the build
+	# process.  (Hint: Most commands are critical, that is, the build
+	# process should abort if they aren't successful.)
+	#./configure \
+	#	--host=${CHOST} \
+	#	--prefix=/usr \
+	#	--infodir=/usr/share/info \
+	#	--mandir=/usr/share/man || die "./configure failed"
+	# Note the use of --infodir and --mandir, above. This is to make
+	# this package FHS 2.2-compliant.  For more information, see
+	#   http://www.pathname.com/fhs/
+
+	# emake (previously known as pmake) is a script that calls the
+	# standard GNU make with parallel building options for speedier
+	# builds (especially on SMP systems).  Try emake first.  It might
+	# not work for some packages, because some makefiles have bugs
+	# related to parallelism, in these cases, use emake -j1 to limit
+	# make to a single process.  The -j1 is a visual clue to others
+	# that the makefiles have bugs that have been worked around.
+	emake || die "emake failed"
+}
+
+src_install() {
+	# You must *personally verify* that this trick doesn't install
+	# anything outside of DESTDIR; do this by reading and
+	# understanding the install part of the Makefiles.
+	# This is the preferred way to install.
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# When you hit a failure with emake, do not just use make. It is
+	# better to fix the Makefiles to allow proper parallelization.
+	# If you fail with that, use "emake -j1", it's still better than make.
+
+	# For Makefiles that don't make proper use of DESTDIR, setting
+	# prefix is often an alternative.  However if you do this, then
+	# you also need to specify mandir and infodir, since they were
+	# passed to ./configure as absolute paths (overriding the prefix
+	# setting).
+	#emake \
+	#	prefix="${D}"/usr \
+	#	mandir="${D}"/usr/share/man \
+	#	infodir="${D}"/usr/share/info \
+	#	libdir="${D}"/usr/$(get_libdir) \
+	#	install || die "emake install failed"
+	# Again, verify the Makefiles!  We don't want anything falling
+	# outside of ${D}.
+
+	# The portage shortcut to the above command is simply:
+	#
+	#einstall || die "einstall failed"
+}