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 | db23f853373f4015dff1370d82b1aecc4177b424 (patch) | |
| tree | dc2fc6f8f5245f0fe1980743c65db3ccf54c5046 /sys-libs | |
| parent | 2.1.2_pre2-r1 revbump. This fixes bugs #149527, #149576, and #149645. (diff) | |
| download | historical-db23f853373f4015dff1370d82b1aecc4177b424.tar.gz historical-db23f853373f4015dff1370d82b1aecc4177b424.tar.bz2 historical-db23f853373f4015dff1370d82b1aecc4177b424.zip | |
Fix file collision, bug #149357.
Package-Manager: portage-2.1.2_pre2
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/freeipmi/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/freeipmi/Manifest | 28 | ||||
| -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 |
4 files changed, 29 insertions, 17 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/Manifest b/sys-libs/freeipmi/Manifest index 2517a07e66e7..76b494510f68 100644 --- a/sys-libs/freeipmi/Manifest +++ b/sys-libs/freeipmi/Manifest @@ -1,14 +1,16 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 e82454730ba7f2eccf132fe4f1db75ee freeipmi-0.1.3.ebuild 1298 -MD5 2fd53b9326f15a7e280fef269b4188a0 ChangeLog 705 +DIST freeipmi-0.1.3.tar.gz 888728 RMD160 d5e270299a3890a6bcf1136f901d634b5295e73c SHA1 cfd0d2c58622cd16eeee6423f73c23acaa3bba6d SHA256 a8a8689afbccb837ff396c87563b73cdb158955d23285c288ebe6fb9edd78742 +EBUILD freeipmi-0.1.3.ebuild 1472 RMD160 04762dabfbbdc3e7281d9a99dff913d666ac129b SHA1 8235d547b76b95cfc0712a2da58306d06db4a816 SHA256 2d91a0bead5a2987887051fd2af3b6c48ca7e31f2eee7a5f27ff9a2da112c2e2 +MD5 d39bb5d8dc148cd6a3513bd025f0980d freeipmi-0.1.3.ebuild 1472 +RMD160 04762dabfbbdc3e7281d9a99dff913d666ac129b freeipmi-0.1.3.ebuild 1472 +SHA256 2d91a0bead5a2987887051fd2af3b6c48ca7e31f2eee7a5f27ff9a2da112c2e2 freeipmi-0.1.3.ebuild 1472 +MISC ChangeLog 818 RMD160 ac27fa7cd3aff01906997db0e9bbbed1a37564b5 SHA1 d6ad39bb30f0c87c644c67da214de124dd935bdf SHA256 f1b867b98ec651998e1d328e8d1aa9c74053afd06f2c58c6059d168732be99b0 +MD5 f827573f620be55d970e0dbe0addce63 ChangeLog 818 +RMD160 ac27fa7cd3aff01906997db0e9bbbed1a37564b5 ChangeLog 818 +SHA256 f1b867b98ec651998e1d328e8d1aa9c74053afd06f2c58c6059d168732be99b0 ChangeLog 818 +MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223 -MD5 ea5c577b9e0721b51347c82db9d85c7c files/digest-freeipmi-0.1.3 66 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFC0DNMBXaUFmZvwyMRAgzGAKCftnxBUn8ezIAouUhTFZc+H1/PngCgntvD -QItsbnXONpFbcwRwurx4VLk= -=VB1L ------END PGP SIGNATURE----- +RMD160 ffa99612cf27469c417944deed0e0c9155e64331 metadata.xml 223 +SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44 metadata.xml 223 +MD5 614e2292826ce5bfbba15fd7fc1a7a3d files/digest-freeipmi-0.1.3 244 +RMD160 aab7646739d92feacc65eebf0c9d971f3c337ec3 files/digest-freeipmi-0.1.3 244 +SHA256 fc229624f5e3773093da138b13d91feee2c200dce9ad1de1f5845cbe2bc36527 files/digest-freeipmi-0.1.3 244 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() { |