diff options
| author |   Sebastien Fabbro <bicatali@gentoo.org> | 2009-09-24 00:19:12 +0000 |
|---|---|---|
| committer | Sebastien Fabbro <bicatali@gentoo.org> | 2009-09-24 00:19:12 +0000 |
| commit | edb3a34e310fde34dcb8a662833dc5d3512744cc (patch) | |
| tree | 95fca61dfe092bc075a2d52f60b2b7d1baf61af9 /sci-libs/hdf | |
| parent | Removed masking on basemap-data, now out from the tree (diff) | |
| download | gentoo-2-edb3a34e310fde34dcb8a662833dc5d3512744cc.tar.gz gentoo-2-edb3a34e310fde34dcb8a662833dc5d3512744cc.tar.bz2 gentoo-2-edb3a34e310fde34dcb8a662833dc5d3512744cc.zip | |
Renaming the bncdump and ncgen binaries to avoid conflict with netcdf even with USE=-netcdf, closing bug #286141
(Portage version: 2.2_rc41/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/hdf')
| -rw-r--r-- | sci-libs/hdf/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/hdf/hdf-4.2_p4.ebuild | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sci-libs/hdf/ChangeLog b/sci-libs/hdf/ChangeLog index bb18f3f4cfe2..48c569a799fb 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.16 2009/09/21 01:57:48 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.17 2009/09/24 00:19:12 bicatali Exp $ + + 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 + with USE=-netcdf, closing bug #286141 21 Sep 2009; Sébastien Fabbro <bicatali@gentoo.org> -hdf-4.2.0-r4.ebuild, -files/hdf-4.2.0-shared-libs.patch: diff --git a/sci-libs/hdf/hdf-4.2_p4.ebuild b/sci-libs/hdf/hdf-4.2_p4.ebuild index b566b0e87a85..96ae94a597a4 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 # 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.4 2009/09/20 18:42:29 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/hdf-4.2_p4.ebuild,v 1.5 2009/09/24 00:19:12 bicatali Exp $ EAPI=2 inherit eutils toolchain-funcs autotools flag-o-matic @@ -61,13 +61,13 @@ src_test() { src_install() { emake DESTDIR="${D}" install || die "emake install failed" dodoc README release_notes/*.txt + einfo "Renaming ncdump and ncgen to ncdump-hdf and ncgen-hdf" + cd "${D}"usr + mv bin/ncgen{,-hdf} || die + mv bin/ncdump{,-hdf} || die + mv share/man/man1/ncgen{,-hdf}.1 || die + mv share/man/man1/ncdump{,-hdf}.1 || die if use netcdf; then - einfo "Renaming ncdump and ncgen to ncdump-hdf and ncgen-hdf" - cd "${D}"usr - mv bin/ncgen{,-hdf} || die - mv bin/ncdump{,-hdf} || die - mv share/man/man1/ncgen{,-hdf}.1 || die - mv share/man/man1/ncdump{,-hdf}.1 || die for i in include/netcdf*; do mv ${i} ${i/cdf/cdf-hdf} done |