[patch] Another way to resolve netcdf conflict and ...

hdf-4.2.0-r1.patch (text/plain), 866 bytes, created by Castelão on 2004-03-25 19:30:33 UTC

3c3
< # $Header: /home/cvsroot/gentoo-x86/dev-libs/hdf/hdf-4.2.0-r1.ebuild,v 1.1 2004/02/11 11:06:16 phosphan Exp $
---
> # $Header: $
19c19
< IUSE=""
---
> IUSE="noszip"
21,24c21,24
< DEPEND="sys-libs/zlib
< 		media-libs/jpeg
< 		dev-libs/szip
< 		app-sci/netcdf
---
> DEPEND=">=sys-libs/zlib-1.1.4-r2
> 		>=media-libs/jpeg-6b-r3
> 		!noszip? ( >=dev-libs/szip-1.1 )
> 		>=app-sci/netcdf-3.5.0-r3
28c28,29
< 	local myconf="--enable-production --with-szlib=/usr"
---
> 	local myconf="--enable-production --program-transform-name=s,nc,hdf4-nc,"
> 	use noszip && myconf="${myconf} --with-szlib=/usr"
36,43d36
< 	cd ${D}
< 	if has_version app-sci/netcdf; then
< 		einfo app-sci/netcdf is already installed - not installing netcdf related files
< 		rm -v usr/bin/nc*
< 		rm -v usr/share/man/man1/nc*
< 		rm -v usr/include/netcdf.inc
< 		rm -v usr/include/netcdf.h
< 	fi