[app-admin/collectd] Improvements from #gentoo-dev

(Portage version: 2.1.8.3/git/Linux x86_64)
 (Signed Manifest commit)

3 files changed, 25 insertions, 29 deletions

diff --git a/app-admin/collectd/Manifest b/app-admin/collectd/Manifest
index 1df37c7..9034b6b 100644
--- a/app-admin/collectd/Manifest
+++ b/app-admin/collectd/Manifest
@@ -6,24 +6,24 @@ AUX collectd-4.10.1-libperl.patch 917 RMD160 2feb20abbf7fd036e34957c190689f1e668
 AUX collectd.confd 529 RMD160 d8cdc1db33b611a3bcfbce0fb9723ebc976c4391 SHA1 c7f580e256d06f20946cf411e43225f2e3b32064 SHA256 e37808c26a7d1f34fe29f942edb4b798bf9ccf3258e780d0ed3166581b5c71b1
 AUX collectd.initd 661 RMD160 a8a810a3f4970525a9694cd97a02ba703b8bdde6 SHA1 2859d5c0a2d4ad22e91f8eeb35f450690445021c SHA256 87144b300c4d32d2cb36272d035fb1d6760b9708765015140607e3e2b844ffb6
 DIST collectd-4.10.1.tar.bz2 1415626 RMD160 f609f70bd7bb789ab54ca72edd34c3753692ff00 SHA1 bda5c918761b98e82fa18da056f60916703b5805 SHA256 607ea5d22164eaf434223dd39a1df453103e2f3c2f2b8c1dbfc1531eefb6df56
-EBUILD collectd-4.10.1-r1.ebuild 12446 RMD160 6c1d050710a538e07e39514b648b685d07176db3 SHA1 c54dd3cade8d49a6c5b0c6ccaa5e9c6dadc51488 SHA256 5fba498e58756ee24b00d03d643fb191ce6e394191a536a2d3727b65c5204f0f
+EBUILD collectd-4.10.1-r1.ebuild 12283 RMD160 a98aafdbd650c6c80851eb7422c7d4c2e0f75e32 SHA1 32f139a2e7dec651260fce8b0b3a7997db3cb1ba SHA256 9c02accbeba350fae587657575a657fac9f6857b8ddb98ef1f6aa3a83bdf59f3
 MISC ChangeLog 1340 RMD160 47dac2395e92c50ef4810701096b24dbdef180bb SHA1 10b32df181ac1e799553f0549a808a77b48f6a9b SHA256 4f7dcf110949fa871e2d9c444f63722477d919f07404e7ca1b332c54f9247c0d
-MISC metadata.xml 8724 RMD160 5836d0acc0cff11bf2d67464f41c145e075f5de5 SHA1 882bd68ef117a7d73d2e69041b078b766f34c325 SHA256 ae52176f4d66165168425cf1c0910ba54ecff7f564a484f4c599f41b3779d194
+MISC metadata.xml 8612 RMD160 8fd73c86221bfe3b4c1d5b9a56373cdd3a6d026f SHA1 3e89f5dd259567fff5b6403ac95fc62ade6a1297 SHA256 6c4a9cac139f3ddc7644e123c54d2d12b955bd4bee295f65f10eb76214694686
 MISC notes.txt 1510 RMD160 8372cce8a7a3e88325c14c3bdfa843f066bccec6 SHA1 8cd35623ed3d93d8868ee4b79293322040cebf19 SHA256 20d633a56ab86862c70461ab455950b1fa38b0bc8672c7e33a5702367dd14328
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMnPbBAAoJENwGBM22xffeCGQQAIDzr1bGT/WNgeYjANBMfNnu
-nZnG5sCxKmRLRbidDEeL7q8R7IY5pq9/8Q2DUrnnNONyyQYV/2sLG7nj32hTB8im
-xVFldGxDI/9ZKq4BMyVo8n81CUjBXNwZD5EK0YSg+hzjYU6b9b9yV3SnSIyFoc59
-+9eXjIwjsSmkh0BuVYAnXxZGh3BVB7QJ2IwYZgUX+5wmMN7p+KzTpy4FNeVX/R9l
-xgyLa4EKENXIgJmjUEbaG/Z9D3y0nK4kVqENkcTiAIxusAzjYWur1QRxb5CqPWtH
-GEcLDG6U3kihTSWMkl4HmAVKZ0iJ1S+7J7K/rNMw9+eF9P5w1BTkYtlR+73B4Peu
-dJvxiU8L52pmqlNdBnRc2owfpSZRY7XwOXvsuXQP5dt93VagmiP3Jdi1CyE0kXH8
-ouey4oiWAA9CAPASKrG6O8dBesyTtEgAlcsO+MBTNeNvMEcfXEglIaf5LVwjZPbu
-qs7fDQa0liP605SY/RrBaopDHGQN1YDZ+de8m6snMR+M2CmTmYyZBJII6hv6S9kk
-byIHksf7CXJ+ZqysrhGwxCoamOB9fQWJDhc8NF3jUT1Z/79zTj23Y8NowoiMozqj
-9wIZsV0YEWb5p76adWF0mkrOrW308C18HLJ7y63urkdilUf/XWDJu0sD0aeMM3Um
-a4ZecT5Em8+RvXSzLEWy
-=Pf60
+iQIcBAEBAgAGBQJMnPoeAAoJENwGBM22xffeVawP+wfSmyyYQeRjhToNZEV1Yv69
+Q5sFBFzTKUfcO1Y9jrDnANnNfmrVRZjpFsJaa7cPG2qbPXggCo+KXZDif3FVt5s2
+Zhp2id4wo6CYKSgd6xn2uTQcO+O+OW3zDonMs5zuOIBgjCFBA5xwwTFNlzWvcPa3
+ccyWNdKXVVUkAdu3mg14jvTSFRhjHJ2EVgP3dcoBISkIzyl1oF6rUZepnhHeKnFN
+SlJwg8aFejBSOKM88qtCR4i/cbJL/THhlV2EsEpP/z3APYQPmuY0sBC4FW/FW6Rl
+wEI+ybGnLg2MAl54rMckwqOofhEriGWCH1VpmYsjVF/lA5mGxe8DpyH+KhCUbaZ/
+5bVHDklQ+ZY6QcU6j+4wC2XKymgar/rGymH3R4WTVpVhYmAIE+js1CmNIF5Hnrd/
+dlrLiXQ9qrGxD1tDdhzOsdOZ+zKQX0+J6l9YOA4ft09fSSUpkXTA/fHRCFI7gzz8
+VHFCsrnG5MbTZHnl9DRDIIt9Ohko0nyzuT4jZzwvZqJnLfEQ6DmeNPz9cZVT1HmB
+/uC1FAWEHf7kwdSvwg3UsWgCJIG5rc5eNjnXrjztljz8C5aDfZlZpEID+JspQZnA
+QUbRhV+/vX7uI8LsJOYJfcby48qXxx4PsoJ+nHI+tDmwLZEyx/FBJWKyVRJt0yyg
+nJOmKKZ3Ac48Ya6cBKw0
+=XWWO
 -----END PGP SIGNATURE-----
diff --git a/app-admin/collectd/collectd-4.10.1-r1.ebuild b/app-admin/collectd/collectd-4.10.1-r1.ebuild
index fef20fe..84c782b 100644
--- a/app-admin/collectd/collectd-4.10.1-r1.ebuild
+++ b/app-admin/collectd/collectd-4.10.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="allplugins contrib debug kernel_linux kernel_FreeBSD kernel_Darwin"
+IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin"
 
 # The plugin lists have to follow here since they extend IUSE
 
@@ -58,11 +58,7 @@ COLLECTD_MISC_PLUGINS="uuid"
 COLLECTD_ALL_PLUGINS=${COLLECTD_TESTED_PLUGINS}
 
 for plugin in ${COLLECTD_TESTED_PLUGINS}; do
-	if use allplugins ; then
-		IUSE="${IUSE} +collectd_plugins_${plugin}"
-	else
-		IUSE="${IUSE} collectd_plugins_${plugin}"
-	fi
+	IUSE="${IUSE} collectd_plugins_${plugin}"
 done
 
 # Now come the dependencies.
@@ -93,7 +89,7 @@ COMMON_DEPEND="
 	collectd_plugins_oracle?		( >=dev-db/oracle-instantclient-basic-11.1.0.7.0 )
 	collectd_plugins_perl?			( dev-lang/perl[ithreads] sys-devel/libperl[ithreads] )
 	collectd_plugins_postgresql?		( >=dev-db/postgresql-base-8.2 )
-	collectd_plugins_python?		( || ( dev-lang/python:2.4  dev-lang/python:2.5 dev-lang/python:2.6 ) )
+	collectd_plugins_python?		( =dev-lang/python-2* )
 	collectd_plugins_rrdcached?		( >=net-analyzer/rrdtool-1.4 )
 	collectd_plugins_rrdtool?		( >=net-analyzer/rrdtool-1.2.27 )
 	collectd_plugins_sensors?		( sys-apps/lm_sensors )
@@ -129,7 +125,7 @@ PATCHES=( "${FILESDIR}/${P}"-{libperl,libiptc}.patch )
 #   one of them is enabled. If no, depending on the third argument an elog, ewarn, or eerror message
 #   is emitted.
 collectd_plugin_kernel_linux() {
-	local multi_opt
+	local multi_opt opt
 	if use collectd_plugins_${1}; then
 		for opt in ${2}; do
 			if linux_chkconfig_present ${opt}; then return 0; fi
@@ -293,32 +289,33 @@ src_configure() {
 
 	# Disable what needs to be disabled.
 	for plugin in ${COLLECTD_DISABLED_PLUGINS}; do
-		myconf="${myconf} --disable-${plugin}"
+		myconf+=" --disable-${plugin}"
 	done
 
 	# Set enable/disable for each single plugin.
+	local 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="${myconf} $(use_enable collectd_plugins_${plugin} ${plugin})"
+				myconf+=" $(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 available for this"
 					ewarn "kernel. Disabling it automatically."
 				fi
-				myconf="${myconf} --disable-${plugin}"
+				myconf+=" --disable-${plugin}"
 			fi
 		else
-			myconf="${myconf} $(use_enable collectd_plugins_${plugin} ${plugin})"
+			myconf+=" $(use_enable collectd_plugins_${plugin} ${plugin})"
 		fi
 	done
 
 	# Need JAVA_HOME for java.
 	if use collectd_plugins_java; then
-		myconf="${myconf} --with-java=$(java-config -g JAVA_HOME)"
+		myconf+=" --with-java=$(java-config -g JAVA_HOME)"
 	fi
 
 	# Finally, run econf.
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index fa2cff6..7bd2394 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -7,7 +7,6 @@
 Yes I know many of the use flag descriptions are not particularly useful right now. Will fill in
 something more descriptive soon... dilfridge
 -->
-		<flag name='allplugins'>Enable all plugins by default. Single plugins can still be disabled using -...</flag>
 		<flag name='collectd_plugins_apache'>Build the apache input plugin (transferred bytes, handled requests, detailed scoreboard statistics)</flag>
 		<flag name='collectd_plugins_apcups'>Build the apcups input plugin (UPS charge, load, input/output/battery voltage, etc.)</flag>
 		<flag name='collectd_plugins_apple_sensors'>Build the apple_sensors input plugin (temperature, fanspeed and voltage)</flag>