split plugin categories like upstream and add some default use flags

2 files changed, 33 insertions, 15 deletions

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index ec46ac9..ea0e4ef 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -1,4 +1,4 @@
 AUX collectd.confd 529 RMD160 59ab4aa9eab3db05d025676a4c59d6bc4769cfdf SHA1 496c7b3aadcc1483d6cf1741f92c9a67d3f09ebc SHA256 f4200b094b8e5eaea2f9aba94cdf75cdc8731c346f590e6530917e0dd5f2f903
 AUX collectd.initd 659 RMD160 98d3ba6f160a928b9358ceb5a7759c335a459fcd SHA1 45bead8031f01f2a179c623b66ee63ee556d3c82 SHA256 3965a97e764d4459b7b1f6663fcb0287a7b262afcc93e4ce2158470b6f136aa9
 DIST collectd-4.10.1.tar.bz2 1415626 RMD160 f609f70bd7bb789ab54ca72edd34c3753692ff00 SHA1 bda5c918761b98e82fa18da056f60916703b5805 SHA256 607ea5d22164eaf434223dd39a1df453103e2f3c2f2b8c1dbfc1531eefb6df56
-EBUILD collectd-4.10.1.ebuild 10517 RMD160 e0301c116d6d3f09491aea95210e7219b5633a1f SHA1 41c751115a2ca27b51eb2589ece3a33864f20698 SHA256 e140f6b441e91555e41f2d6590078cb19d50241d5316677117fac5e347e5ca68
+EBUILD collectd-4.10.1.ebuild 10801 RMD160 6366dd1a2caf0b5b8fd5b9faea454513be634e78 SHA1 d52080112841ad3ec4119d2a7804b857f40ddcbd SHA256 54d76278c5a241ff99f8705fdb13ee7f3021d223041ce1feb876dcd4d5352e8f
diff --git a/app-admin/collectd/collectd-4.10.1.ebuild b/app-admin/collectd/collectd-4.10.1.ebuild
index acba6ee..649dc58 100644
--- a/app-admin/collectd/collectd-4.10.1.ebuild
+++ b/app-admin/collectd/collectd-4.10.1.ebuild
@@ -21,29 +21,47 @@ IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin"
 
 # The plugin lists have to follow here since they extend IUSE
 
-COLLECTD_SOURCE_PLUGINS="apache apcups apple_sensors ascent battery bind conntrack contextswitch
-	cpu cpufreq curl curl_xml dbi df disk dns email entropy exec filecount fscache gmond
-	hddtemp interface ipmi iptables ipvs irq java libvirt load madwifi mbmon memcachec
-	memcached memory modbus multimeter mysql netlink network nfs nginx ntpd nut olsrd
-	onewire openvpn oracle perl postgresql powerdns processes protocols python routeros
-	rrdcached sensors serial snmp swap table tail tape tcpconns teamspeak2 ted thermal
-	tokyotyrant uptime users vmem vserver wireless zfs_arc"
+COLLECTD_READ_PLUGINS="apache apcups apple_sensors ascent battery bind conntrack
++contextswitch +cpu cpufreq curl curl_xml dbi +df +disk dns email +entropy exec
+filecount fscache gmond +hddtemp +interface ipmi iptables ipvs irq libvirt +load
+madwifi mbmon memcachec memcached +memory modbus multimeter mysql netlink
+network nfs nginx ntpd nut olsrd onewire openvpn oracle postgresql powerdns
++processes protocols routeros rrdcached sensors serial snmp +swap table tail
+tape tcpconns teamspeak2 ted thermal tokyotyrant uptime users vmem vserver
+wireless zfs_arc"
 
-COLLECTD_TARGET_PLUGINS="csv exec logfile network notify_desktop notify_email perl python
-	rrdcached rrdtool syslog unixsock write_http"
+COLLECT_BINDING_PLUGINS="java perl python"
 
-COLLECTD_FILTER_PLUGINS="match_empty_counter match_hashed match_regex match_timediff match_value
-	target_notification target_replace target_scale target_set"
+COLLECTD_WRITE_PLUGINS="csv rrdcached +rrdtool write_http"
+
+COLLECTD_NETWORK_PLUGINS="+network +unixsock"
+
+COLLECTD_NOTIFY_PLUGINS="notify_desktop notify_email"
+
+COLLECTD_LOGGING_PLUGINS="+logfile +syslog"
+
+COLLECTD_MATCH_PLUGINS="match_empty_counter match_hashed match_regex
+match_timediff match_value"
+
+COLLECTD_TARGET_PLUGINS="target_notification target_replace target_scale
+target_set"
 
 COLLECTD_MISC_PLUGINS="uuid"
 
-COLLECTD_PLUGINS="${COLLECTD_SOURCE_PLUGINS} ${COLLECTD_TARGET_PLUGINS}
-	${COLLECTD_FILTER_PLUGINS} ${COLLECTD_MISC_PLUGINS}"
+COLLECTD_PLUGINS="${COLLECTD_READ_PLUGINS}
+	${COLLECTD_BINDING_PLUGINS}
+	${COLLECTD_WRITE_PLUGINS}
+	${COLLECTD_NETWORK_PLUGINS}
+	${COLLECTD_NOTIFY_PLUGINS}
+	${COLLECTD_LOGGING_PLUGINS}
+	${COLLECTD_MATCH_PLUGINS}
+	${COLLECTD_TARGET_PLUGINS}
+	${COLLECTD_MISC_PLUGINS}"
 
 COLLECTD_DISABLED_PLUGINS="curl_json netapp pinba ping xmms"
 
 for plugin in ${COLLECTD_PLUGINS}; do
-	IUSE="${IUSE} cd_${plugin}"
+	IUSE="${IUSE} ${plugin%%[a-z]*}cd_${plugin#+}"
 done
 
 # Now come the dependencies.