Fix bug #383793, proper fix has been sent upstream.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

diff --git a/sys-libs/freeipmi/ChangeLog b/sys-libs/freeipmi/ChangeLog
index 578badee9fe4cbe931a7bc3ed7ea72abb325a66e..5408c3b13422e9e8043725a5d9398b7f5cba9da0 100644 (file)
--- a/sys-libs/freeipmi/ChangeLog
+++ b/sys-libs/freeipmi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/freeipmi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.37 2011/09/07 06:20:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.38 2011/09/26 11:00:28 flameeyes Exp $
+
+*freeipmi-1.0.6-r2 (26 Sep 2011)
+
+  26 Sep 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -freeipmi-1.0.6-r1.ebuild, +freeipmi-1.0.6-r2.ebuild:
+  Fix bug #383793, proper fix has been sent upstream.
 
 *freeipmi-1.0.6-r1 (07 Sep 2011)
 

diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index a60984a9642281064433305f723e8e30d30850ea..a5d8c9f58aef23491cf962dfc497bb66516551b0 100644 (file)
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -11,13 +11,13 @@ AUX ipmidetectd.initd.2 570 RMD160 1f1ee23ea0f797ceb27e7afa956a9ab756a78254 SHA1
 DIST freeipmi-0.8.9.tar.gz 2775329 RMD160 01c9441596502f60b0c3336dae9db9ff3774a132 SHA1 d80fac5de458363f32c589baef12315a9a471b06 SHA256 8c1c18d83b74e2f657b7c6ccbc6be8eb2c0270d7c0424105bee34fdebe794ea0
 DIST freeipmi-1.0.6.tar.gz 3172169 RMD160 7105276e68921831e6d6bd2a3dc513f9f4a134ff SHA1 f008eb53d19f734e91f636c3dbdc1c12a4b8c71e SHA256 662d96010cefcd0b93b2cb9ca2ab62371a5d8f05f33feacabae5853e71f020a5
 EBUILD freeipmi-0.8.9.ebuild 2044 RMD160 c562216c8361aebe7a7ebcde4ac9c1ca82c0fcbf SHA1 5ff432b878f3258e3ccadf25d12b3d9245b48eca SHA256 54bf27c829e21b61bdc3ae7c000b9799c9a53399ac0ed60e8ccf7113a488c210
-EBUILD freeipmi-1.0.6-r1.ebuild 2152 RMD160 d15023765228d977792dc5b6a284fb2d9fe6a627 SHA1 221368aff2e40001b59f0ae1944124933d5bb7f2 SHA256 36e2bb6156c9ebb42163c80af10682c1adb6aefd4727af0f5c510df9a3202a1a
-MISC ChangeLog 6824 RMD160 8cd28e62609e7433ec73c11a33f8b62f0f465ece SHA1 a66b7d007c369afb639d25c1db0c409608618ad1 SHA256 323363282569050cb2a1300ccdd997efebceb2670ddb2da1026187fa89ff3602
+EBUILD freeipmi-1.0.6-r2.ebuild 2252 RMD160 5a58f654d9ff39201bc1278cf60f8236065fa39b SHA1 862d4193653264ac876955171d71a21232e88c1c SHA256 cc0bb78e20a704963e87fa85a2484ad741dc94c5382377d627dba8fad9554e7f
+MISC ChangeLog 7025 RMD160 939e2f8c1aa0967e80f7e44fc0d456075cb18be4 SHA1 701bd51964eec7aa860086c68b4fc146e3f7d63d SHA256 47bb2b32a1eee378987c77b198ec5975e65656373a32c2e89285c601dc663a7c
 MISC metadata.xml 234 RMD160 6498603a1fe3a96823743847afc906df194bb430 SHA1 5ec768281f5435ff5173031bd715fa65ddd274e3 SHA256 73ec73ca73cd98df81c2bbb3e76a83751a3c95802ac103ef21368201d871a9d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5nDUsACgkQAiZjviIA2XhW/QCeKQMZuSoJ9hqSAwL1PQfM6ydw
-t2cAn3n63FYdBC6Y1Fg87PviwTJSn+fB
-=0YVq
+iEYEARECAAYFAk6AW0QACgkQAiZjviIA2Xi4gACg2CGxS3vLvHrvOuj+B1EySGiB
+DuAAoJEp+QUci9bGw6OGcrsW+fss38M2
+=rcXq
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/freeipmi/freeipmi-1.0.6-r1.ebuild b/sys-libs/freeipmi/freeipmi-1.0.6-r2.ebuild
similarity index 93%
rename from sys-libs/freeipmi/freeipmi-1.0.6-r1.ebuild
rename to sys-libs/freeipmi/freeipmi-1.0.6-r2.ebuild
index 6867480c375df47cad224016d49e63e8d8c5b9c8..02f8d4196510c80f95825478fab43323a297c0a4 100644 (file)
--- a/sys-libs/freeipmi/freeipmi-1.0.6-r1.ebuild
+++ b/sys-libs/freeipmi/freeipmi-1.0.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.0.6-r1.ebuild,v 1.1 2011/09/07 06:20:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-1.0.6-r2.ebuild,v 1.1 2011/09/26 11:00:28 flameeyes Exp $
 
 EAPI=4
 
@@ -26,6 +26,10 @@ src_prepare() {
        epatch "${FILESDIR}"/${PN}-1.0.5-strictaliasing.patch
        epatch "${FILESDIR}"/${P}-bmc-watchdog-pidfile.patch
 
+       # bug #383793
+       sed -i -e 's:/usr/local/:/usr/:' \
+               "${S}"/ipmi-sensors/src/ipmimonitoring || die
+
        AT_M4DIR="config" eautoreconf
 }