diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2010-03-26 01:11:55 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2010-03-26 01:11:55 +0000 |
| commit | b857b3a07dd50882b35e1b30cb46cfcc17df71f7 (patch) | |
| tree | 97dbfd653f196d4b848825e988c3ec790860a2e5 /sci-libs/hdf | |
| parent | Fallback to EAPI=2 and reenable the old BIG FAT timestamp hack, until EAPI=3 ... (diff) | |
| download | historical-b857b3a07dd50882b35e1b30cb46cfcc17df71f7.tar.gz historical-b857b3a07dd50882b35e1b30cb46cfcc17df71f7.tar.bz2 historical-b857b3a07dd50882b35e1b30cb46cfcc17df71f7.zip | |
Fixing headers to avoid conflicts with netcdf, thanks Kacper Kowalik, bug #311237
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'sci-libs/hdf')
| -rw-r--r-- | sci-libs/hdf/ChangeLog | 8 | ||||
| -rw-r--r-- | sci-libs/hdf/Manifest | 12 | ||||
| -rw-r--r-- | sci-libs/hdf/hdf-4.2_p4.ebuild | 7 |
3 files changed, 17 insertions, 10 deletions
diff --git a/sci-libs/hdf/ChangeLog b/sci-libs/hdf/ChangeLog index 48c569a799fb..a19278827721 100644 --- a/sci-libs/hdf/ChangeLog +++ b/sci-libs/hdf/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/hdf -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.17 2009/09/24 00:19:12 bicatali Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.18 2010/03/26 01:11:55 bicatali Exp $ + + 26 Mar 2010; Sébastien Fabbro <bicatali@gentoo.org> hdf-4.2_p4.ebuild: + Fixing headers to avoid conflicts with netcdf, thanks Kacper Kowalik, bug + #311237 24 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> hdf-4.2_p4.ebuild: Renaming the bncdump and ncgen binaries to avoid conflict with netcdf even diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest index 87139f495862..afab9db9c9e1 100644 --- a/sci-libs/hdf/Manifest +++ b/sci-libs/hdf/Manifest @@ -3,13 +3,13 @@ Hash: SHA1 DIST HDF4.2r4.tar.gz 3914118 RMD160 13274858f1fa0c339fab83b1f9c37314bd10d624 SHA1 000fa1be9c355c490cceed786feeb269a0d355a7 SHA256 39695c85e15c391e589cfdcb98ecc9a72fbb7447f0575bff4d030d53a62e689d DIST hdf-4.2_p4-patches.tar.bz2 6914 RMD160 de251f3f54c635187d507743a2bb9afb70052dfa SHA1 02575337706c2a3e4256702be7e461c40fdba026 SHA256 e04ece17fab9739f145099ee78e926ca790177033bfa102f12b328b66bbac390 -EBUILD hdf-4.2_p4.ebuild 2020 RMD160 e7c93c7b84585156e07f5c778c61762ac15d624c SHA1 907bf927fefa18529957fafcbf7086807fe3dda6 SHA256 6a94eba0bbe2c47899b385800bd6a8fae8526ca7e520a1d3c5529e525a2a614c -MISC ChangeLog 4025 RMD160 3738c4cb3dbcb273c38cae10d4747c095c32d00d SHA1 fdf50ba4ece96c0b4713d9e868759af539d5f245 SHA256 5889572512fd4b2f1594c98fb059d8789c693b25b96775e33255b1aa9692a099 +EBUILD hdf-4.2_p4.ebuild 2148 RMD160 57ba11317b3a8d2cf875846c9067e127e47e143d SHA1 63f93044d876ade2b765f1cf9a43c5762cb41fc7 SHA256 ccd74a1f493e32f673df410490ff430f0544ceb9bc31ee0fe3f2ca011fd27959 +MISC ChangeLog 4186 RMD160 737e5d9b0fa11f8a7c89e9c4e56730a4f6b32f0a SHA1 e73c4fff134cdd953d8de5059189c44cc7cb0a02 SHA256 598bfb87d72824a07af42b3db3bc2ed9105e738e12de71ae360099fd47ab99bc MISC metadata.xml 760 RMD160 4ef5d149f44169242bf9425d6c0b3a2e512fe0a1 SHA1 4c0c294751b93851300fd03ea9121f6d9f36a8d2 SHA256 a753e7be3b3935681d6aa925d90c6eff98d764b8a8dbf30ed0dfc4046df39def -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkq6uwoACgkQ1ycZbhPLE2DgHwCcDk0cGsHBEeiZ+fC8vMEHZTLm -yYoAn3b4dmUFk4QbEjw7SCMdqbu6eLHM -=Foau +iEYEARECAAYFAkusFMgACgkQ1ycZbhPLE2CLjwCeP5iwl8s3wT8LbQKzkyNoPM4q +O9MAnj/RYevPjTml3+5hfrkTcBipEYyc +=gxvN -----END PGP SIGNATURE----- diff --git a/sci-libs/hdf/hdf-4.2_p4.ebuild b/sci-libs/hdf/hdf-4.2_p4.ebuild index 96ae94a597a4..a8072df9efce 100644 --- a/sci-libs/hdf/hdf-4.2_p4.ebuild +++ b/sci-libs/hdf/hdf-4.2_p4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/hdf-4.2_p4.ebuild,v 1.5 2009/09/24 00:19:12 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/hdf-4.2_p4.ebuild,v 1.6 2010/03/26 01:11:55 bicatali Exp $ EAPI=2 inherit eutils toolchain-funcs autotools flag-o-matic @@ -71,5 +71,8 @@ src_install() { for i in include/netcdf*; do mv ${i} ${i/cdf/cdf-hdf} done + for i in "include/mfhdf.h include/local_nc.h"; do + sed -i -e 's:"netcdf.h":"netcdf-hdf.h":' ${i} || die "sed failed" + done fi } |