Version bump.

Package-Manager: portage-2.2.0_alpha175/cvs/Linux x86_64
Manifest-Sign-Key: 0x1CD13C8AD4301342

7 files changed, 23 insertions, 568 deletions

diff --git a/sys-libs/freeipmi/ChangeLog b/sys-libs/freeipmi/ChangeLog
index fa7599c8cad5..409c7748377f 100644
--- a/sys-libs/freeipmi/ChangeLog
+++ b/sys-libs/freeipmi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/freeipmi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.70 2013/05/06 16:37:11 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.71 2013/05/20 19:58:18 flameeyes Exp $
+
+*freeipmi-1.2.7 (20 May 2013)
+
+  20 May 2013; Diego E. Pettenò <flameeyes@gentoo.org> +freeipmi-1.2.7.ebuild,
+  -files/freeipmi-1.1.6-thresholds.patch,
+  -files/freeipmi-1.2.5-out-of-source-build.patch, -files/ipmidetectd.initd.3,
+  -freeipmi-1.1.7.ebuild, -freeipmi-1.2.5.ebuild:
+  Version bump.
 
   06 May 2013; Peter Volkov <pva@gentoo.org> freeipmi-1.2.6.ebuild:
   Fix build failure with automake-1.13, bug #468200 wrt Matt McAdoo.
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index b092b347ae45..92a62825574b 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -5,26 +5,25 @@ AUX bmc-watchdog.confd 1495 SHA256 0f9cbe8090523e3fd4df35fb049d38ee696292892542f
 AUX bmc-watchdog.initd.3 482 SHA256 2d9d9c76f6fb51cd4678e16a00e31905ce6ea701527ad14c687db3c5dd179652 SHA512 ecc572036df0f12a91c03e5a146e6b25b1d89c5f826beb6a2c600d644032d6308b17f2848757ffb99793af4587d9d5c29c574fb3af8b2c778e5e8c2c021fe818 WHIRLPOOL add5cd643a8f934c2196738d812bf59bae054c7140c2314bb6dfa51d655066d21c36f9f3b5a277cabac47a9f7274f05ed21deb107b4ef7f4c56aca1a68f9cbb7
 AUX bmc-watchdog.initd.4 525 SHA256 0b9e01ca03df7e8efc189a5d2758883ac29a8e76b01b34b964403b65cc88e37e SHA512 26ee0d57e93446832efa7be33137850edc7f3a47b23ee509ad4a1e5cec1be7c81f100cd81af7e89eba8ad361b82de858e6d64fb629c02af2ca332f19a075132f WHIRLPOOL ec65f98d7b5c0de0b27cd1f929cd5878e24c531c6897e39b47820c888a4a4bdcb198c2fc3c5c2f1814cd84b718bde531c18dcfef4001deb3c11f57dac6877bad
 AUX freeipmi-1.1.1-strictaliasing.patch 587 SHA256 3f571021a288e62d8d1c537ca15d49d64d92d7c422d451387ec9996c74aca45e SHA512 a8b4dae48cfd767f35d5d2eb39f1ff8c831dce2d03428d2a7ceb371122bded9c85abdee53ece26099af3ad03f90e86871f6c3c9b854de2e7d575a6e618ff0302 WHIRLPOOL a198b7720764466c1d42784f4bc7ad81cc401510120fb0783c53138dafe0f0ae63614ea91f04b88816fdcd7c787f4c1264e55c271d9339d7df31de386498ba5f
-AUX freeipmi-1.1.6-thresholds.patch 16178 SHA256 f370d8764bd9221ccbdd0932d16d4acabd9ccc1285875502815c96117d6cf36d SHA512 c86794ad528f3911d744d6760c4400b5187b2175e32245eb08bdf1d04fd6bb3befc55f3bd3e795441f020a2a4e277de9cc384433ead0f8442fb51b76bc166f6c WHIRLPOOL da952fffc8644b857c4401f701f649d404c7187b20b5d5aa9dd513c0dc54050f5cf183747202f4e4bb01b7acd8958d50c9b4851329f923e532ef53e9d8b108a2
-AUX freeipmi-1.2.5-out-of-source-build.patch 1000 SHA256 79d1898f40455a27b2727878702832b793f76110fef4d2e01920e15a9b09655f SHA512 fffe2ee1c985d18633c9ef63a934cbff47257ef36017ff70f2e8859d5ff189a500136bf43cb45172bb06d9b0b0e9d8e70b92522dbb2806a837071be57dfe38b3 WHIRLPOOL c1a7a5b1799ce5ed87daf8b277cf42d1a42b30dc59c3fd6782e61d06c376cad678aa363942a9660f3e5aa5b76b7a26fec811a2f634dffd8917b8a57edd6fd0d6
 AUX freeipmi.icinga 117 SHA256 ffa3f35d00df5ec38eb82b82062ab1d79778064052e42b0f2f0103fc6dfbc178 SHA512 813aeebe5e663073f3bce7917b35c6ec493f5222bb759d47238aa2b382459661a90165b0bd3a74c2e6e1940d373eccb43ab03a4270d2d2c91a03be361ce46032 WHIRLPOOL 388453b1b1f15a57023739e03297512afecb2cb50dd1f5f46c56cc810f3923ef698da05aba55dfac5b0bd6b3ad1e8f34ee4347a2b4cb458fc70f2ca148a87fef
 AUX ipmidetectd.confd 185 SHA256 6265782b53083c5d6332ac015b580b8f76426dac62ef58e32eb5b2fc74446891 SHA512 f10e908a451c646b2c61338d79e69663c05216a54093745bd2b659041e0b91adb9be4077c92d63f6f3d62cb5510168b6a57e5e86375533e235fd3abb2b72a49c WHIRLPOOL 7236f10b61e6b0ddbba0d2359ce459dedb5bad187f91588116f33ebff8091c6871d7bfb8242001a9d8ecee7f32078e0bb747810fe078b7f2c3d2a34b3d35df61
-AUX ipmidetectd.initd.3 361 SHA256 7af59c5b8bd291cc45fc8b499190a1d474a8f88e69243e1232ddb93c0b01a17b SHA512 7facc2929a4e943daf7ac033d7b040e974f38703c66421c60902fa574a0271abf5913f95aa82e742fe616aed08b71b1c8ac7c4a06c1e5b51f0d8fb2cb19b8eb1 WHIRLPOOL 96400b27d73ea2d10aaad35e16913b1459da8cf59785acaf0d42378e07da8c549d0ae158ee0c1e06a66ae75944d1222045eb8219ac7752072d78c5c08e1b1494
 AUX ipmiseld.confd 192 SHA256 bc520fa47e690a72e658d183c47b59e68c7e11a875719f2cf65c88042fe0cee7 SHA512 0a031f29a4692085054d5fc2dfe6d0ad7fb762f7ee96849ce2d562a90d6e3b0f3ae8328ab852dc22bee6221bc5cd8b588bd02075222038fa0f0e2f64ac185799 WHIRLPOOL 482cfad90bcdf0ec6f56a8435f020e625209c0bdf45da6c612d7ae6b45e79d6fe960c0186235fcba816c05fbf2d83aa9275647496e8e1e996ae809466544bc8f
-DIST freeipmi-1.1.7.tar.gz 3080264 SHA256 3b4fc1b514e2052622bfcbfef5b69726d83505aa54109b16ed847a9d0b47bacb SHA512 ea88e2da222d8fee34469f1a5dea02de7c82ce06d9406642cf15b9fdb43d41963e7739e0a4ae82702db044d8e89f9330fd0a23c993dd8595024d3528b6de99f9 WHIRLPOOL 5ce8c2d58a685e4567204ed99542bffea0bdc0b550311720a4685d4516285a37340f94e823d11ee9984d608310fb98a555a12b8b9f4b5da72424d37462fe3ff9
 DIST freeipmi-1.2.2.tar.gz 3031730 SHA256 c8539a8225616e3e647b99903ef1243c5a6a4e1c7bd009399bd8bacf3b263b9c SHA512 86ea9a073ec275b3594e93c7e7fdef2b7214dcd3e696fdec4a017841d4bb7e2179a407d91aa11b26c952cf5b06262801b41293642ed38220d57112a37878a5f4 WHIRLPOOL 763a46cea7bfd1a5e18fae79094a73bd86173a73a8b8d150b3f938bc51c8da6c18db5105ece7ca8f3821254de19bc4e2b2429aac66b260c36426f789be176243
-DIST freeipmi-1.2.5.tar.gz 3052783 SHA256 6d367e315bfa193e69cc925942e370cedfb479fc714a161bb3d5f63af28ec492 SHA512 9b21932803be992246e31aa64d9dc62c9b4fc282f6efbdca188f568c4c3b15d955258c0a0dc85382812b79d9aedd5ac042628f13a1c8a2409e2893ef1d8c37f4 WHIRLPOOL bf2f5b4fdaccfd937bc5977a0bdac90573f0d667d706b2d4f7c22b5216e8c63edeac531a73371d08a8047afa1e9d97f5b62e5b58a2ceddb75302be9cd828290f
 DIST freeipmi-1.2.6.tar.gz 3058219 SHA256 3296cbf3990fff378fac04651c0974c627a6f3a033e200822a65866ef24c4c3a SHA512 77d36a039e3dec4f87a502db98bc840a1553c118085b552d7052a19b9d0ddae0a63371d7140ac17423025c6ac9f472a640115107334d3dad392f0886c25f196c WHIRLPOOL 9b35f01c079cda202ecb1eea4eb26c86d544aade0af3b96a6e3fdb5c4cf02d088e4ad1e4ffef3cb53dfc194cfecbc19a2bb30671666d75564b3bf7c6fbf819a1
-EBUILD freeipmi-1.1.7.ebuild 2016 SHA256 f8b4de0f133994c3560a5a4e8995e5b6c77306407450e24ff5fd3ec7ed5aa617 SHA512 01b53a54d57ae46f98dfe980124142f4dccec5f28eccaa529a91c1ef51bc4ae4a5cc0e8a0f9ea0b198e9ee310db92c21198b9a12557cab10c8c0cad2f90b6d40 WHIRLPOOL d5118596dabbbb1f1a03dfe936b9f3eacd36543fbbdc06bc7ee4113ff3a74dc3b18fe8723b573e2b88ff3a0aed2964de6b9dd834ca1db1304a55c8961ebc2e8e
+DIST freeipmi-1.2.7.tar.gz 3058121 SHA256 e22eed35c98031015f836fa771e59228b45ae78b0c77966aad743a324ab30ae5 SHA512 0a3eac8b4eb710cbf0114eaab1f78647e366915048bf4bbfeee678fff2d63e3758323bae13ee58ae710e79505008f4488a9cc9dd745e0e7f630bcf65d78981d2 WHIRLPOOL 295094315c736d2404139f4b60d6b9125775675d687926926b576ee5e0241c37cfc1b3df10d5f32beec641ff644f7cc63b3a7d68489ea9f9f2bbdbc5659833a2
 EBUILD freeipmi-1.2.2.ebuild 2195 SHA256 9ddbe7476a80eb798e3bd6db1a9e6a2b5e42f423a04d823cad8d94ad8c56b27c SHA512 88b3f5d22ee361cedeead2cf5e2d8955993806075de2f67dd1060e9fca6a025991c3a78d71869d195e537baaa3f07e166db5937ac3d4e253053be277a85512fa WHIRLPOOL d64d9a85c6891dfa04178493af899e7add08378b46e52c1ab57a45f84a42aa239cdc75fa1a0d9261f6e255c29f40a917f62760976ba6e448359b3320c3b95677
-EBUILD freeipmi-1.2.5.ebuild 2684 SHA256 3024fc863b64429067f42666fc84a7afe78a8283c57039169d23aef9cf53a4c4 SHA512 0102be3439234662bef6354f233238558c80258eb2cdc24e8862c3ae3c887e1ea0056e9dd8e3e615cc06c155f1b6a471613691a973cf978cbb0fa8b64696cf8d WHIRLPOOL 5177e25329418b04c3266bed4e19a52f0e28f0dafb419f8e3edb93e05e9953b1e516a2622dc2b93dd4c18e682571bfa9480fafdabf189ef1bd51e0463d5a21c5
 EBUILD freeipmi-1.2.6.ebuild 2700 SHA256 afdfb7b8079ce0f8b356b9bda750fd0c200c31ec5b705d00d13c6fdbf365aab2 SHA512 eb11418b1bba4154995bb29209f0031c25c6d110bd3007623f925e0cc1dc9423846b5c19746783e793ccb6230797e4998cd2dde526474df4d1ca20243c6f500f WHIRLPOOL 3467295dbfa50c36a04c256318b1c018d22338dec27dfe68d28c5f2af6b20ee17268e3e945b00b13fb2f10345d891b7f3fa4fd3c0ef5f220d88a0fc538716f35
-MISC ChangeLog 12445 SHA256 87dc8d6f8078428eafdb5c64ba1a72b5859049389f7f18f47f08a0a23305910f SHA512 8b798dec86cf2c01f00af08dfe0513bb7f2c973714e22d627a61fc3b5dd1d3146ad5a19af55265f639cf1d70ff0c4c4cbe77d8bec7591138ee866431a52fcabb WHIRLPOOL 7f53e88d0e4942ff1c1dc59fa5768743ea500643d2c01cc8d880266c51d736de8a0122beb4d03f5f48604f277d22a02b2ffca7fea50b5fedce1eebdcbde6776a
+EBUILD freeipmi-1.2.7.ebuild 2706 SHA256 18b72f2d45f2a1144b97c7aec4aadec9059d5e2305a99bab64842ad40c945fc6 SHA512 26dbabcdcfb1712d4bac31c7e3b5c5e63a403e845175fc4d9f8837733e9895025d8209724b5ea6ddac3585a7e3ff61d952e89e88bf08c1bb4062b16d80e08e86 WHIRLPOOL c3aaf4c147e993fe906b28a6f373219050ce859bf00931a3b6d0600542dbb2bae3964acb5943a648735548964855ee68ba116cd0df0b1f2e2c0138cba54ee55b
+MISC ChangeLog 12750 SHA256 2375cd61cab69bc271a9bf5247f393cdb06bb82925a7629b1cd0ca0d7a9b845e SHA512 12b1f8f7307c00eb00ce3496beda1f7fee8a8e3cef747c4bb5664eec17fd169f64cc54be945303697a9903c9827d6ab126073358bb9ebc66cbf4374114c2b886 WHIRLPOOL 21009f50602f78b9b681a498f739e58f3405ce85704a6364659a22dd9546e26a6ffc950e055e222809be99bdebbeb834d24ef17fbb34b48679512f334b31a4ae
 MISC metadata.xml 274 SHA256 1ca668d9614d18bdaa3b1b36f50e52e4a167d52af993f5d698ae9b87b8df7b97 SHA512 312a8ca4224c271714cb64fbc0057209946db59a2dbe052fb3cfaa104bab777fc2e799ad5dfda551350d110e99f978a774114f5ad35aeccc491bb49fe3fce684 WHIRLPOOL 51458c6917423d34b3b229c8cd6a057e546e540ade2e6be9617faf30fee42110bf870974d0a9ce3983da28df11edb95cdd602784bd9cd73219179e179d5104ce
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGH3EAACgkQGrk+8vGYmwdwIQEAt5dAxVch6kp2O116xN2mZAqN
-QOcgxtmHnM2gdgwJMsQA/in+34XSoOkdQ81gd4IUAg3ujbsZNJgOc9VvoiiT9qqP
-=Jbgu
+iQEcBAEBCAAGBQJRmoCeAAoJEBzRPIrUMBNCS8gH/2npcfVn85d01sXW0BddesfH
+stvvwpLLEkqk6NaV+6dbbN54xM+8Bi/Ei7WvnnxG7rr2Q0r0fHVXTYg5wEQxmI3+
+Syvzz5sapsLtrHbilqcMm9tjPMiMZ2jtbdOj7POW/v98Jp0GgfxFVsZW1z23xXte
+71c0O/DfXzdEsYUmin00suQhr+jPlwPsw1LrDO49t3ojvPHyNnUU5RROb7rsuLtn
+bEF7+WZmhUcqM5PvWTxvsYxvXxYEPIlV/7rHGs4SX5a8XOnAXUvfivneqyqgyJE5
+rwIdfwS6IRy3GLLzbsRBgoYjblJlucmmzbxifI0GPpbw++21kdJ4Q9s2Nms4zAw=
+=pUpM
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/freeipmi/files/freeipmi-1.1.6-thresholds.patch b/sys-libs/freeipmi/files/freeipmi-1.1.6-thresholds.patch
deleted file mode 100644
index 96a1fc8835d6..000000000000
--- a/sys-libs/freeipmi/files/freeipmi-1.1.6-thresholds.patch
+++ /dev/null
@@ -1,442 +0,0 @@
-diff --git a/common/toolcommon/tool-config-file-common.c b/common/toolcommon/tool-config-file-common.c
-index 27974ea..7ba77ee 100644
---- a/common/toolcommon/tool-config-file-common.c
-+++ b/common/toolcommon/tool-config-file-common.c
-@@ -3592,7 +3592,6 @@ config_file_parse (const char *filename,
-         &(ipmi_sensors_data.sensor_state_config_file),
-         0
-       },
--
-       {
-         "ipmi-sensors-entity-sensor-names",
-         CONFFILE_OPTION_BOOL,
-@@ -3605,6 +3604,17 @@ config_file_parse (const char *filename,
-         0,
-       },
-       {
-+        "ipmi-sensors-output-sensor-thresholds",
-+        CONFFILE_OPTION_BOOL,
-+        -1,
-+        _config_file_bool,
-+        1,
-+        0,
-+        &(ipmi_sensors_data.output_sensor_thresholds_count),
-+        &(ipmi_sensors_data.output_sensor_thresholds),
-+        0,
-+      },
-+      {
-         "ipmi-sensors-no-sensor-type-output",
-         CONFFILE_OPTION_BOOL,
-         -1,
-diff --git a/common/toolcommon/tool-config-file-common.h b/common/toolcommon/tool-config-file-common.h
-index 219ff2a..06ec454 100644
---- a/common/toolcommon/tool-config-file-common.h
-+++ b/common/toolcommon/tool-config-file-common.h
-@@ -229,6 +229,8 @@ struct config_file_data_ipmi_sensors
-   int output_sensor_state_count;
-   char *sensor_state_config_file;
-   int sensor_state_config_file_count;
-+  int output_sensor_thresholds;
-+  int output_sensor_thresholds_count;
-   int no_sensor_type_output;
-   int no_sensor_type_output_count;
-   int comma_separated_output_count;
-diff --git a/etc/freeipmi.conf b/etc/freeipmi.conf
-index eafe147..9d99116 100644
---- a/etc/freeipmi.conf
-+++ b/etc/freeipmi.conf
-@@ -472,6 +472,8 @@
- #
- # ipmi-sensors-entity-sensor-names DISABLE
- #
-+# ipmi-sensors-output-sensor-thresholds DISABLE
-+#
- # ipmi-sensors-no-sensor-type-output DISABLE
- #
- # ipmi-sensors-comma-separated-output DISABLE
-diff --git a/ipmi-sensors/ipmi-sensors-argp.c b/ipmi-sensors/ipmi-sensors-argp.c
-index 455f316..28836e0 100644
---- a/ipmi-sensors/ipmi-sensors-argp.c
-+++ b/ipmi-sensors/ipmi-sensors-argp.c
-@@ -127,19 +127,21 @@ static struct argp_option cmdline_options[] =
-       "Specify an alternate sensor state configuration  file.", 52},
-     { "entity-sensor-names", ENTITY_SENSOR_NAMES_KEY, NULL, 0,
-       "Output sensor names with entity ids and instances.", 53},
-+    { "output-sensor-thresholds", OUTPUT_SENSOR_THRESHOLDS_KEY, NULL, 0,
-+      "Output sensor thresholds in output.", 54},
-     { "no-sensor-type-output", NO_SENSOR_TYPE_OUTPUT_KEY, 0, 0,
--      "Do not show sensor type output.", 54},
-+      "Do not show sensor type output.", 55},
-     { "comma-separated-output", COMMA_SEPARATED_OUTPUT_KEY, 0, 0,
--      "Output fields in comma separated format.", 55},
-+      "Output fields in comma separated format.", 56},
-     { "no-header-output", NO_HEADER_OUTPUT_KEY, 0, 0,
--      "Do not output column headers.", 56},
-+      "Do not output column headers.", 57},
-     { "non-abbreviated-units", NON_ABBREVIATED_UNITS_KEY, 0, 0,
--      "Output non-abbreviated units (e.g. 'Amps' insetead of 'A').", 57},
-+      "Output non-abbreviated units (e.g. 'Amps' insetead of 'A').", 58},
-     { "legacy-output", LEGACY_OUTPUT_KEY, 0, 0,
--      "Output in legacy format.", 58},
-+      "Output in legacy format.", 59},
-     /* ipmimonitoring legacy support */
-     { "ipmimonitoring-legacy-output", IPMIMONITORING_LEGACY_OUTPUT_KEY, 0, 0,
--      "Output in ipmimonitoring legacy format.", 58},
-+      "Output in ipmimonitoring legacy format.", 60},
-     { NULL, 0, NULL, 0, NULL, 0}
-   };
- 
-@@ -294,6 +296,9 @@ cmdline_parse (int key, char *arg, struct argp_state *state)
-     case ENTITY_SENSOR_NAMES_KEY:
-       cmd_args->entity_sensor_names = 1;
-       break;
-+    case OUTPUT_SENSOR_THRESHOLDS_KEY:
-+      cmd_args->output_sensor_thresholds = 1;
-+      break;
-     case NO_SENSOR_TYPE_OUTPUT_KEY:
-       cmd_args->no_sensor_type_output = 1;
-       break;
-@@ -415,6 +420,8 @@ _ipmi_sensors_config_file_parse (struct ipmi_sensors_arguments *cmd_args)
-     cmd_args->sensor_state_config_file = config_file_data.sensor_state_config_file;
-   if (config_file_data.entity_sensor_names_count)
-     cmd_args->entity_sensor_names = config_file_data.entity_sensor_names;
-+  if (config_file_data.output_sensor_thresholds_count)
-+    cmd_args->output_sensor_thresholds = config_file_data.output_sensor_thresholds;
-   if (config_file_data.no_sensor_type_output_count)
-     cmd_args->no_sensor_type_output = config_file_data.no_sensor_type_output;
-   if (config_file_data.comma_separated_output_count)
-@@ -497,6 +504,7 @@ ipmi_sensors_argp_parse (int argc, char **argv, struct ipmi_sensors_arguments *c
-   cmd_args->output_sensor_state = 0;
-   cmd_args->sensor_state_config_file = NULL;
-   cmd_args->entity_sensor_names = 0;
-+  cmd_args->output_sensor_thresholds = 0;
-   cmd_args->no_sensor_type_output = 0;
-   cmd_args->comma_separated_output = 0;
-   cmd_args->no_header_output = 0;
-diff --git a/ipmi-sensors/ipmi-sensors-simple-output.c b/ipmi-sensors/ipmi-sensors-simple-output.c
-index 07ef472..8314b18 100644
---- a/ipmi-sensors/ipmi-sensors-simple-output.c
-+++ b/ipmi-sensors/ipmi-sensors-simple-output.c
-@@ -683,6 +683,12 @@ _simple_output_full_record (ipmi_sensors_state_data_t *state_data,
- {
-   char fmt[IPMI_SENSORS_FMT_BUFLEN + 1];
-   uint8_t event_reading_type_code;
-+  double *lower_non_critical_threshold = NULL;
-+  double *upper_non_critical_threshold = NULL;
-+  double *lower_critical_threshold = NULL;
-+  double *upper_critical_threshold = NULL;
-+  double *lower_non_recoverable_threshold = NULL;
-+  double *upper_non_recoverable_threshold = NULL;
-   int rv = -1;
- 
-   assert (state_data);
-@@ -760,6 +766,100 @@ _simple_output_full_record (ipmi_sensors_state_data_t *state_data,
-             }
-         }
- 
-+      if (state_data->prog_data->args->output_sensor_thresholds)
-+	{
-+	  char thresholdfmt[IPMI_SENSORS_FMT_BUFLEN + 1];
-+	  char nafmt[IPMI_SENSORS_FMT_BUFLEN + 1];
-+
-+          if (ipmi_sensors_get_thresholds (state_data,
-+                                           sdr_record,
-+                                           sdr_record_len,
-+                                           &lower_non_critical_threshold,
-+                                           &lower_critical_threshold,
-+                                           &lower_non_recoverable_threshold,
-+                                           &upper_non_critical_threshold,
-+                                           &upper_critical_threshold,
-+                                           &upper_non_recoverable_threshold) < 0)
-+            goto cleanup;
-+
-+          memset (fmt, '\0', IPMI_SENSORS_FMT_BUFLEN + 1);
-+
-+	  if (state_data->prog_data->args->comma_separated_output)
-+	    {
-+	      snprintf (thresholdfmt,
-+			IPMI_SENSORS_FMT_BUFLEN,
-+			",%%.2f");
-+
-+	      snprintf (nafmt,
-+			IPMI_SENSORS_FMT_BUFLEN,
-+			",%%s");
-+	    }
-+	  else
-+	    {
-+	      snprintf (thresholdfmt,
-+			IPMI_SENSORS_FMT_BUFLEN,
-+			" | %%-10.2f");
-+
-+	      snprintf (nafmt,
-+			IPMI_SENSORS_FMT_BUFLEN,
-+			" | %%-10s");
-+	    }
-+
-+	  if (lower_non_recoverable_threshold)
-+	    pstdout_printf (state_data->pstate,
-+			    thresholdfmt,
-+			    *lower_non_recoverable_threshold);
-+	  else
-+	    pstdout_printf (state_data->pstate,
-+			    nafmt,
-+			    IPMI_SENSORS_NA_STRING);
-+
-+	  if (lower_critical_threshold)
-+	    pstdout_printf (state_data->pstate,
-+			    thresholdfmt,
-+			    *lower_critical_threshold);
-+	  else
-+	    pstdout_printf (state_data->pstate,
-+			    nafmt,
-+			    IPMI_SENSORS_NA_STRING);
-+
-+	  if (lower_non_critical_threshold)
-+	    pstdout_printf (state_data->pstate,
-+			    thresholdfmt,
-+			    *lower_non_critical_threshold);
-+	  else
-+	    pstdout_printf (state_data->pstate,
-+			    nafmt,
-+			    IPMI_SENSORS_NA_STRING);
-+			  
-+	  if (upper_non_critical_threshold)
-+	    pstdout_printf (state_data->pstate,
-+			    thresholdfmt,
-+			    *upper_non_critical_threshold);
-+	  else
-+	    pstdout_printf (state_data->pstate,
-+			    nafmt,
-+			    IPMI_SENSORS_NA_STRING);
-+
-+	  if (upper_critical_threshold)
-+	    pstdout_printf (state_data->pstate,
-+			    thresholdfmt,
-+			    *upper_critical_threshold);
-+	  else
-+	    pstdout_printf (state_data->pstate,
-+			    nafmt,
-+			    IPMI_SENSORS_NA_STRING);
-+
-+	  if (upper_non_recoverable_threshold)
-+	    pstdout_printf (state_data->pstate,
-+			    thresholdfmt,
-+			    *upper_non_recoverable_threshold);
-+	  else
-+	    pstdout_printf (state_data->pstate,
-+			    nafmt,
-+			    IPMI_SENSORS_NA_STRING);
-+	}
-+
-       if (state_data->prog_data->args->comma_separated_output)
-         pstdout_printf (state_data->pstate, ",");
-       else
-@@ -799,11 +897,11 @@ _simple_output_full_record (ipmi_sensors_state_data_t *state_data,
- 	      if (state_data->prog_data->args->comma_separated_output)
- 		snprintf (fmt,
- 			  IPMI_SENSORS_FMT_BUFLEN,
--			  ",%%.2f,%%s,");
-+			  ",%%.2f,%%s");
- 	      else
- 		snprintf (fmt,
- 			  IPMI_SENSORS_FMT_BUFLEN,
--			  " | %%-10.2f | %%-%ds | ",
-+			  " | %%-10.2f | %%-%ds",
- 			  state_data->column_width.sensor_units);
- 		  
- 	      pstdout_printf (state_data->pstate,
-@@ -818,11 +916,11 @@ _simple_output_full_record (ipmi_sensors_state_data_t *state_data,
- 	      if (state_data->prog_data->args->comma_separated_output)
- 		snprintf (fmt,
- 			  IPMI_SENSORS_FMT_BUFLEN,
--			  ",%%s,%%s,");
-+			  ",%%s,%%s");
- 	      else
- 		snprintf (fmt,
- 			  IPMI_SENSORS_FMT_BUFLEN,
--			  " | %%-10s | %%-%ds | ",
-+			  " | %%-10s | %%-%ds",
- 			  state_data->column_width.sensor_units);
- 	      
- 	      pstdout_printf (state_data->pstate,
-@@ -831,13 +929,33 @@ _simple_output_full_record (ipmi_sensors_state_data_t *state_data,
- 			      IPMI_SENSORS_NA_STRING);
- 	    }
-         }
--      else
-+
-+      if (state_data->prog_data->args->output_sensor_thresholds)
-         {
-           if (state_data->prog_data->args->comma_separated_output)
-+	    pstdout_printf (state_data->pstate,
-+			    ",%s,%s,%s,%s,%s,%s",
-+			    IPMI_SENSORS_NA_STRING,
-+			    IPMI_SENSORS_NA_STRING,
-+			    IPMI_SENSORS_NA_STRING,
-+			    IPMI_SENSORS_NA_STRING,
-+			    IPMI_SENSORS_NA_STRING,
-+			    IPMI_SENSORS_NA_STRING);
-+	  else
-+	    pstdout_printf (state_data->pstate,
-+			    " | %-10s | %-10s | %-10s | %-10s | %-10s | %-10s",
-+			    IPMI_SENSORS_NA_STRING,
-+			    IPMI_SENSORS_NA_STRING,
-+			    IPMI_SENSORS_NA_STRING,
-+			    IPMI_SENSORS_NA_STRING,
-+			    IPMI_SENSORS_NA_STRING,
-+			    IPMI_SENSORS_NA_STRING);
-+	}
-+ 
-+      if (state_data->prog_data->args->comma_separated_output)
-             pstdout_printf (state_data->pstate, ",");
-           else
-             pstdout_printf (state_data->pstate, " | ");
--        }
- 
-       if (ipmi_sensors_output_event_message_list (state_data,
-                                                   event_message_output_type,
-@@ -852,6 +970,12 @@ _simple_output_full_record (ipmi_sensors_state_data_t *state_data,
- 
-   rv = 0;
-  cleanup:
-+  free (lower_non_critical_threshold);
-+  free (upper_non_critical_threshold);
-+  free (lower_critical_threshold);
-+  free (upper_critical_threshold);
-+  free (lower_non_recoverable_threshold);
-+  free (upper_non_recoverable_threshold);
-   return (rv);
- }
- 
-@@ -883,11 +1007,11 @@ _simple_output_compact_record (ipmi_sensors_state_data_t *state_data,
-       if (state_data->prog_data->args->comma_separated_output)
-         snprintf (fmt,
-                   IPMI_SENSORS_FMT_BUFLEN,
--                  ",%%s,%%s,");
-+                  ",%%s,%%s");
-       else
-         snprintf (fmt,
-                   IPMI_SENSORS_FMT_BUFLEN,
--                  " | %%-10s | %%-%ds | ",
-+                  " | %%-10s | %%-%ds",
-                   state_data->column_width.sensor_units);
- 
-       pstdout_printf (state_data->pstate,
-@@ -895,13 +1019,33 @@ _simple_output_compact_record (ipmi_sensors_state_data_t *state_data,
-                       IPMI_SENSORS_NA_STRING,
-                       IPMI_SENSORS_NA_STRING);
-     }
--  else
-+
-+  if (state_data->prog_data->args->output_sensor_thresholds)
-     {
-       if (state_data->prog_data->args->comma_separated_output)
-+	pstdout_printf (state_data->pstate,
-+			",%s,%s,%s,%s,%s,%s",
-+			IPMI_SENSORS_NA_STRING,
-+			IPMI_SENSORS_NA_STRING,
-+			IPMI_SENSORS_NA_STRING,
-+			IPMI_SENSORS_NA_STRING,
-+			IPMI_SENSORS_NA_STRING,
-+			IPMI_SENSORS_NA_STRING);
-+      else
-+	pstdout_printf (state_data->pstate,
-+			" | %-10s | %-10s | %-10s | %-10s | %-10s | %-10s",
-+			IPMI_SENSORS_NA_STRING,
-+			IPMI_SENSORS_NA_STRING,
-+			IPMI_SENSORS_NA_STRING,
-+			IPMI_SENSORS_NA_STRING,
-+			IPMI_SENSORS_NA_STRING,
-+			IPMI_SENSORS_NA_STRING);
-+    }
-+ 
-+  if (state_data->prog_data->args->comma_separated_output)
-         pstdout_printf (state_data->pstate, ",");
-       else
-         pstdout_printf (state_data->pstate, " | ");
--    }
- 
-   if (ipmi_sensors_output_event_message_list (state_data,
-                                               event_message_output_type,
-@@ -1027,6 +1171,16 @@ _output_headers (ipmi_sensors_state_data_t *state_data)
-                       SENSORS_HEADER_UNITS_STR);
-     }
- 
-+  if (state_data->prog_data->args->output_sensor_thresholds)
-+    {
-+      if (state_data->prog_data->args->comma_separated_output)
-+        pstdout_printf (state_data->pstate,
-+			",Lower NR,Lower C,Lower NC,Upper NC,Upper C,Upper NR");
-+      else
-+        pstdout_printf (state_data->pstate,
-+			" | Lower NR   | Lower C    | Lower NC   | Upper NC   | Upper C    | Upper NR  ");
-+    }
-+
-   if (state_data->prog_data->args->comma_separated_output)
-     pstdout_printf (state_data->pstate,
-                     ",%s\n",
-diff --git a/ipmi-sensors/ipmi-sensors.h b/ipmi-sensors/ipmi-sensors.h
-index bfc246e..e385510 100644
---- a/ipmi-sensors/ipmi-sensors.h
-+++ b/ipmi-sensors/ipmi-sensors.h
-@@ -51,12 +51,13 @@ enum ipmi_sensors_argp_option_keys
-     OUTPUT_SENSOR_STATE_KEY = 169,
-     SENSOR_STATE_CONFIG_FILE_KEY = 170,
-     ENTITY_SENSOR_NAMES_KEY = 171,
--    NO_SENSOR_TYPE_OUTPUT_KEY = 172,
--    COMMA_SEPARATED_OUTPUT_KEY = 173,
--    NO_HEADER_OUTPUT_KEY = 174,
--    NON_ABBREVIATED_UNITS_KEY = 175,
--    LEGACY_OUTPUT_KEY = 176,
--    IPMIMONITORING_LEGACY_OUTPUT_KEY = 177,
-+    OUTPUT_SENSOR_THRESHOLDS_KEY = 172,
-+    NO_SENSOR_TYPE_OUTPUT_KEY = 173,
-+    COMMA_SEPARATED_OUTPUT_KEY = 174,
-+    NO_HEADER_OUTPUT_KEY = 175,
-+    NON_ABBREVIATED_UNITS_KEY = 176,
-+    LEGACY_OUTPUT_KEY = 177,
-+    IPMIMONITORING_LEGACY_OUTPUT_KEY = 178,
-   };
- 
- struct ipmi_sensors_arguments
-@@ -83,6 +84,7 @@ struct ipmi_sensors_arguments
-   int output_sensor_state;
-   char *sensor_state_config_file;
-   int entity_sensor_names;
-+  int output_sensor_thresholds;
-   int no_sensor_type_output;
-   int comma_separated_output;
-   int no_header_output;
-diff --git a/man/freeipmi.conf.5.pre.in b/man/freeipmi.conf.5.pre.in
-index 9b4bf96..af1047f 100644
---- a/man/freeipmi.conf.5.pre.in
-+++ b/man/freeipmi.conf.5.pre.in
-@@ -1184,6 +1184,11 @@ Specify the default sensor state configuration file.
- Specify if output of sensor names should include entity ids and
- instances by default or not.
- .TP
-+\fBipmi\-sensors\-output\-sensor\-thresholds\fR \fIENABLE|DISABLE\fR
-+Specify if
-+.B ipmi-sensors
-+should output sensor thresholds by default.
-+.TP
- \fBipmi\-sensors\-no\-sensor\-type\-output\fR \fIENABLE|DISABLE\fR
- Specify if output of the sensor type should be output by default or
- not.
-diff --git a/man/ipmi-sensors.8.pre.in b/man/ipmi-sensors.8.pre.in
-index d0950d0..bcd13f7 100644
---- a/man/ipmi-sensors.8.pre.in
-+++ b/man/ipmi-sensors.8.pre.in
-@@ -156,6 +156,12 @@ previously output by
- Specify an alternate sensor state configuration file.  Option ignored
- if \fB\-\-output\-sensor\-state\fR not specified.
- #include <@top_srcdir@/man/manpage-common-entity-sensor-names.man>
-+.TP
-+\fB\-\-output\-sensor\-thresholds\fR
-+Output sensor thresholds in output.  This will add columns to the
-+default output for lower non-recoverable, lower critical, lower
-+non-critical, upper non-critical, upper critical, and upper
-+non-recoverable thresholds.
- #include <@top_srcdir@/man/manpage-common-no-sensor-type-output.man>
- #include <@top_srcdir@/man/manpage-common-comma-separated-output.man>
- #include <@top_srcdir@/man/manpage-common-no-header-output.man>
diff --git a/sys-libs/freeipmi/files/freeipmi-1.2.5-out-of-source-build.patch b/sys-libs/freeipmi/files/freeipmi-1.2.5-out-of-source-build.patch
deleted file mode 100644
index 1387af1d4fb0..000000000000
--- a/sys-libs/freeipmi/files/freeipmi-1.2.5-out-of-source-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: common/toolcommon/Makefile.am
-===================================================================
---- common/toolcommon/Makefile.am	(revision 9592)
-+++ common/toolcommon/Makefile.am	(working copy)
-@@ -8,7 +8,7 @@
- 	-I$(top_srcdir)/common/miscutil \
- 	-I$(top_srcdir)/common/parsecommon \
- 	-I$(top_srcdir)/common/portability \
--	-I$(top_srcdir)/libipmidetect \
-+	-I$(top_builddir)/libipmidetect \
- 	-I$(top_builddir)/libfreeipmi/include \
- 	-I$(top_srcdir)/libfreeipmi/include \
- 	-D_GNU_SOURCE \
-Index: ipmipower/Makefile.am
-===================================================================
---- ipmipower/Makefile.am	(revision 9592)
-+++ ipmipower/Makefile.am	(working copy)
-@@ -6,7 +6,7 @@
- 	-I$(top_srcdir)/common/miscutil \
- 	-I$(top_srcdir)/common/parsecommon \
- 	-I$(top_srcdir)/common/portability \
--	-I$(top_srcdir)/libipmidetect \
-+	-I$(top_builddir)/libipmidetect \
- 	-I$(top_builddir)/libfreeipmi/include \
- 	-I$(top_srcdir)/libfreeipmi/include \
- 	-DWITH_LSD_FATAL_ERROR_FUNC=1 \
diff --git a/sys-libs/freeipmi/files/ipmidetectd.initd.3 b/sys-libs/freeipmi/files/ipmidetectd.initd.3
deleted file mode 100644
index aba99d371f9f..000000000000
--- a/sys-libs/freeipmi/files/ipmidetectd.initd.3
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/files/ipmidetectd.initd.3,v 1.1 2011/10/18 09:01:08 flameeyes Exp $
-
-command="/usr/sbin/${SVCNAME}"
-pidfile=/var/run/$SVCNAME.pid
-start_stop_daemon_args="--background --make-pidfile"
diff --git a/sys-libs/freeipmi/freeipmi-1.1.7.ebuild b/sys-libs/freeipmi/freeipmi-1.1.7.ebuild
deleted file mode 100644
index 8a2e199c95c4..000000000000
--- a/sys-libs/freeipmi/freeipmi-1.1.7.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.1.7.ebuild,v 1.3 2012/08/26 13:36:34 idl0r Exp $
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
-HOMEPAGE="http://www.gnu.org/software/freeipmi/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
-	http://ftp.gluster.com/pub/${PN}/${PV}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/libgcrypt"
-DEPEND="${RDEPEND}
-		virtual/os-headers"
-RDEPEND="${RDEPEND}
-	sys-apps/openrc"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.1.1-strictaliasing.patch \
-		"${FILESDIR}"/${PN}-1.1.6-thresholds.patch
-
-	AT_M4DIR="config" eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		--disable-static \
-		--disable-init-scripts \
-		--enable-logrotate-config \
-		--localstatedir=/var
-}
-
-# There are no tests
-src_test() { :; }
-
-src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
-	find "${D}" -name '*.la' -delete
-
-	# freeipmi by defaults install _all_ commands to /usr/sbin, but
-	# quite a few can be run remotely as standard user, so move them
-	# in /usr/bin afterwards.
-	dodir /usr/bin
-	for file in ipmi{detect,ping,power,console}; do
-		mv "${D}"/usr/{s,}bin/${file} || die
-
-		# The default install symlinks these commands to add a dash
-		# after the ipmi prefix; we repeat those after move for
-		# consistency.
-		rm "${D}"/usr/sbin/${file/ipmi/ipmi-}
-		dosym ${file} /usr/bin/${file/ipmi/ipmi-}
-	done
-
-	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO doc/*.txt
-
-	keepdir \
-		/var/cache/ipmimonitoringsdrcache \
-		/var/lib/freeipmi \
-		/var/log/{freeipmi,ipmiconsole}
-
-	newinitd "${FILESDIR}"/ipmidetectd.initd.3 ipmidetectd
-
-	newinitd "${FILESDIR}"/bmc-watchdog.initd.3 bmc-watchdog
-	newconfd "${FILESDIR}"/bmc-watchdog.confd bmc-watchdog
-}
diff --git a/sys-libs/freeipmi/freeipmi-1.2.5.ebuild b/sys-libs/freeipmi/freeipmi-1.2.7.ebuild
index ccc2532dee73..c44e05c2662f 100644
--- a/sys-libs/freeipmi/freeipmi-1.2.5.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.2.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.2.5.ebuild,v 1.3 2013/03/24 07:38:57 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.2.7.ebuild,v 1.1 2013/05/20 19:58:18 flameeyes Exp $
 
 EAPI=5
 
@@ -30,9 +30,8 @@ RDEPEND="${RDEPEND}
 	sys-apps/openrc"
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.1.1-strictaliasing.patch \
-		"${FILESDIR}"/${P}-out-of-source-build.patch
+	epatch "${FILESDIR}"/${PN}-1.1.1-strictaliasing.patch
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
 
 	AT_M4DIR="config" eautoreconf
 }