app-admin/collectd: Fix up whitespace an useflag consistency

svn path=/sunrise/; revision=10696

4 files changed, 22 insertions, 18 deletions

diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index d8d766853..96495ccff 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Jun 2010; Markus Ullmann <jokey@gentoo.org> collectd-4.9.2.ebuild,
+  collectd-4.10.0.ebuild:
+  Fix up whitespace an useflag consistency
+
   09 May 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   +collectd-4.10.0.ebuild, metadata.xml:
   Simple version bump, adding support for two new plugins. Upstream is still
diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index cc4437273..adfd4b5e3 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -2,7 +2,7 @@ AUX collectd.confd 529 RMD160 d8cdc1db33b611a3bcfbce0fb9723ebc976c4391 SHA1 c7f5
 AUX collectd.initd 661 RMD160 a8a810a3f4970525a9694cd97a02ba703b8bdde6 SHA1 2859d5c0a2d4ad22e91f8eeb35f450690445021c SHA256 87144b300c4d32d2cb36272d035fb1d6760b9708765015140607e3e2b844ffb6
 DIST collectd-4.10.0.tar.bz2 1414078 RMD160 a843012fef64a2c86e95f947de0aaddf9255521b SHA1 eda40d632d24dd5ec3d124a305d5c1a4ac8d62d7 SHA256 4d742f6b15f3dbaf0a05825db4de621c722ae6ecc392a9165d2ab4899786d733
 DIST collectd-4.9.2.tar.bz2 1380570 RMD160 8a363aa7d24d6fc696612e80228250a132094818 SHA1 937f0984e44912e5a282806bcc409de05fc4000b SHA256 862efd284bf191ab4dd0989190c6bdc3836a6a47b617d2031275ee94d21fda42
-EBUILD collectd-4.10.0.ebuild 10517 RMD160 e0301c116d6d3f09491aea95210e7219b5633a1f SHA1 41c751115a2ca27b51eb2589ece3a33864f20698 SHA256 e140f6b441e91555e41f2d6590078cb19d50241d5316677117fac5e347e5ca68
-EBUILD collectd-4.9.2.ebuild 10409 RMD160 fe6eeed0de365e1f05ec08af76a6f9408a6d5013 SHA1 7f029dfef06f93744d18ef9fc2a8adcaa85dc492 SHA256 8b106e08ad47dd57ebdbad87bb0c99d5e4689810d30d7d97e74455bb2ed59326
-MISC ChangeLog 2625 RMD160 b80d46949444645e4b8af4364594856eed9173fa SHA1 2738f09364c3b112b6c76501842a1fcea2d18a8a SHA256 ea2482a986a78b75325339a5ecd2b3453e5916831fa0d722d41ffcc329f95f31
+EBUILD collectd-4.10.0.ebuild 10512 RMD160 ac6e2c94f7104ccec8bbf116e0fb6447f1aefeb5 SHA1 d7741a9a5dffc45137022489617fb05511b549cb SHA256 dfa9417c245ddf167927e3b3f5ed682d40b283339f4d9ae038a3c17f0370fda4
+EBUILD collectd-4.9.2.ebuild 10403 RMD160 8fdcc779e3dc0de724519589c612ce41e6f09eae SHA1 941ad3abe52dedce9c49b49a2a47e7dbda925657 SHA256 140e6028ed92eb5984f15d7a26a0c7925832f80522c430ff02e8982e665cc754
+MISC ChangeLog 2767 RMD160 e83a89849c5b7bdf42ede059ce8647f24c543d71 SHA1 e80d17fdcca27acf127a1f7579d06e88922c58f2 SHA256 ae69263d81e7a3de401c7f876fedc0c920b0ccd0f93a70e77de2627f80a9b8ac
 MISC metadata.xml 7391 RMD160 edc185eccc924522c521b338818f17ddb85a8bef SHA1 99836765a736af91b52b5cfa68ce04a5ff919429 SHA256 b39abce20b04b341a6c3c0e76c0013a3ca074420d1577c149f1b14a3cc3dff3c
diff --git a/app-admin/collectd/collectd-4.10.0.ebuild b/app-admin/collectd/collectd-4.10.0.ebuild
index acba6ee83..a42f398f0 100644
--- a/app-admin/collectd/collectd-4.10.0.ebuild
+++ b/app-admin/collectd/collectd-4.10.0.ebuild
@@ -53,15 +53,15 @@ COMMON_DEPEND="
 	cd_ascent?		( net-misc/curl dev-libs/libxml2 )
 	cd_bind?		( dev-libs/libxml2 )
 	cd_curl?		( net-misc/curl )
-	cd_curl_xml?		( net-misc/curl dev-libs/libxml2 )
+	cd_curl_xml?	( net-misc/curl dev-libs/libxml2 )
 	cd_dbi?			( dev-db/libdbi )
 	cd_dns?			( net-libs/libpcap )
 	cd_gmond?		( sys-cluster/ganglia )
 	cd_ipmi?		( >=sys-libs/openipmi-2.0.11 )
-	cd_iptables?		( net-firewall/iptables )
+	cd_iptables?	( net-firewall/iptables )
 	cd_java?		( virtual/jre dev-java/java-config-wrapper )
 	cd_libvirt?		( app-emulation/libvirt dev-libs/libxml2 )
-	cd_memcachec?		( dev-libs/libmemcached )
+	cd_memcachec?	( dev-libs/libmemcached )
 	cd_modbus?		( dev-libs/libmodbus )
 	cd_mysql?		( >=virtual/mysql-5.0 )
 	cd_netlink?		( sys-apps/iproute2 )
@@ -73,15 +73,15 @@ COMMON_DEPEND="
 	cd_onewire?		( sys-fs/owfs )
 	cd_oracle?		( >=dev-db/oracle-instantclient-basic-11.1.0.7.0 )
 	cd_perl?		( dev-lang/perl[ithreads] sys-devel/libperl[ithreads] )
-	cd_postgres?		( >=virtual/postgresql-base-8.2 )
+	cd_postgresql?	( >=virtual/postgresql-base-8.2 )
 	cd_python?		( || ( dev-lang/python:2.4  dev-lang/python:2.5 dev-lang/python:2.6 ) )
 	cd_rrdcached?		( >=net-analyzer/rrdtool-1.4 )
 	cd_rrdtool?		( >=net-analyzer/rrdtool-1.2.27 )
 	cd_sensors?		( sys-apps/lm_sensors )
 	cd_snmp?		( net-analyzer/net-snmp )
-	cd_tokyotyrant?		( net-misc/tokyotyrant )
-	cd_uuid? 		( sys-apps/hal )
-	cd_write_http?		( net-misc/curl )
+	cd_tokyotyrant?	( net-misc/tokyotyrant )
+	cd_uuid?		( sys-apps/hal )
+	cd_write_http?	( net-misc/curl )
 
 	kernel_FreeBSD?	(
 		cd_disk?	( >=sys-libs/libstatgrab-0.16 )
diff --git a/app-admin/collectd/collectd-4.9.2.ebuild b/app-admin/collectd/collectd-4.9.2.ebuild
index 08fb2ee5c..c050e1883 100644
--- a/app-admin/collectd/collectd-4.9.2.ebuild
+++ b/app-admin/collectd/collectd-4.9.2.ebuild
@@ -57,10 +57,10 @@ COMMON_DEPEND="
 	cd_dns?			( net-libs/libpcap )
 	cd_gmond?		( sys-cluster/ganglia )
 	cd_ipmi?		( >=sys-libs/openipmi-2.0.11 )
-	cd_iptables?		( net-firewall/iptables )
+	cd_iptables?	( net-firewall/iptables )
 	cd_java?		( virtual/jre dev-java/java-config-wrapper )
 	cd_libvirt?		( app-emulation/libvirt dev-libs/libxml2 )
-	cd_memcachec?		( dev-libs/libmemcached )
+	cd_memcachec?	( dev-libs/libmemcached )
 	cd_mysql?		( >=virtual/mysql-5.0 )
 	cd_netlink?		( sys-apps/iproute2 )
 	cd_network?		( dev-libs/libgcrypt )
@@ -71,15 +71,15 @@ COMMON_DEPEND="
 	cd_onewire?		( sys-fs/owfs )
 	cd_oracle?		( >=dev-db/oracle-instantclient-basic-11.1.0.7.0 )
 	cd_perl?		( dev-lang/perl[ithreads] sys-devel/libperl[ithreads] )
-	cd_postgres?		( >=virtual/postgresql-base-8.2 )
+	cd_postgresql?	( >=virtual/postgresql-base-8.2 )
 	cd_python?		( || ( dev-lang/python:2.4  dev-lang/python:2.5 dev-lang/python:2.6 ) )
-	cd_rrdcached?		( >=net-analyzer/rrdtool-1.4 )
+	cd_rrdcached?	( >=net-analyzer/rrdtool-1.4 )
 	cd_rrdtool?		( >=net-analyzer/rrdtool-1.2.27 )
 	cd_sensors?		( sys-apps/lm_sensors )
 	cd_snmp?		( net-analyzer/net-snmp )
-	cd_tokyotyrant?		( net-misc/tokyotyrant )
-	cd_uuid? 		( sys-apps/hal )
-	cd_write_http?		( net-misc/curl )
+	cd_tokyotyrant?	( net-misc/tokyotyrant )
+	cd_uuid?		( sys-apps/hal )
+	cd_write_http?	( net-misc/curl )
 
 	kernel_FreeBSD?	(
 		cd_disk?	( >=sys-libs/libstatgrab-0.16 )
@@ -233,7 +233,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# There's some strange prefix handling in the default config file, resulting in 
+	# There's some strange prefix handling in the default config file, resulting in
 	# paths like "/usr/var/..."
 	sed -i -e "s:@prefix@/var:/var:g" src/collectd.conf.in || die
 }