diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2006-10-01 20:28:34 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2006-10-01 20:28:34 +0000 |
| commit | 97aca6b8b1046483d55dc151418440e1283853c4 (patch) | |
| tree | d980d3b9bfca75cb583592c04ea307b34232374e /sys-libs/freeipmi | |
| parent | 2.1.2_pre2-r1 revbump. This fixes bugs #149527, #149576, and #149645. (diff) | |
| download | gentoo-2-97aca6b8b1046483d55dc151418440e1283853c4.tar.gz gentoo-2-97aca6b8b1046483d55dc151418440e1283853c4.tar.bz2 gentoo-2-97aca6b8b1046483d55dc151418440e1283853c4.zip | |
Fix file collision, bug #149357.
(Portage version: 2.1.2_pre2)
Diffstat (limited to 'sys-libs/freeipmi')
| -rw-r--r-- | sys-libs/freeipmi/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/freeipmi/files/digest-freeipmi-0.1.3 | 2 | ||||
| -rw-r--r-- | sys-libs/freeipmi/freeipmi-0.1.3.ebuild | 9 |
3 files changed, 14 insertions, 4 deletions
diff --git a/sys-libs/freeipmi/ChangeLog b/sys-libs/freeipmi/ChangeLog index e6abc934de64..8cb031d3013a 100644 --- a/sys-libs/freeipmi/ChangeLog +++ b/sys-libs/freeipmi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/freeipmi -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.4 2005/05/24 14:24:28 slarti Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/ChangeLog,v 1.5 2006/10/01 20:28:34 robbat2 Exp $ + + 01 Oct 2006; Robin H. Johnson <robbat2@gentoo.org> freeipmi-0.1.3.ebuild: + Fix file collision, bug #149357. 24 May 2005; Tom Martin <slarti@gentoo.org> freeipmi-0.1.3.ebuild: Marked ~amd64 for tigger^. diff --git a/sys-libs/freeipmi/files/digest-freeipmi-0.1.3 b/sys-libs/freeipmi/files/digest-freeipmi-0.1.3 index 6e422a03260f..b0881714ee99 100644 --- a/sys-libs/freeipmi/files/digest-freeipmi-0.1.3 +++ b/sys-libs/freeipmi/files/digest-freeipmi-0.1.3 @@ -1 +1,3 @@ MD5 c4b088f806253971759c60263722e63d freeipmi-0.1.3.tar.gz 888728 +RMD160 d5e270299a3890a6bcf1136f901d634b5295e73c freeipmi-0.1.3.tar.gz 888728 +SHA256 a8a8689afbccb837ff396c87563b73cdb158955d23285c288ebe6fb9edd78742 freeipmi-0.1.3.tar.gz 888728 diff --git a/sys-libs/freeipmi/freeipmi-0.1.3.ebuild b/sys-libs/freeipmi/freeipmi-0.1.3.ebuild index 8683318f37b6..10b7cb2c2453 100644 --- a/sys-libs/freeipmi/freeipmi-0.1.3.ebuild +++ b/sys-libs/freeipmi/freeipmi-0.1.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-0.1.3.ebuild,v 1.6 2005/07/09 20:27:32 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/freeipmi/freeipmi-0.1.3.ebuild,v 1.7 2006/10/01 20:28:34 robbat2 Exp $ inherit flag-o-matic @@ -22,6 +22,11 @@ src_unpack() { unpack ${A} sed 's,auth_type_t,output_type_t,' -i.orig \ "${S}/ipmipower/src/ipmipower_output.c" + # avoid conflict with lm_sensors + sed -i.orig \ + -e '/dist_man_MANS/s,sensors.1,sensors-fish.1,' \ + ${S}/fish/Makefile.in + mv ${S}/fish/sensors.1 ${S}/fish/sensors-fish.1 } src_compile() { |