--- /usr/portage/sci-geosciences/gmt/gmt-4.1.1.ebuild	2006-04-10 02:28:49.000000000 +0200
+++ gmt-4.2.0.ebuild	2007-05-10 02:54:28.000000000 +0200
@@ -2,23 +2,24 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.1.1.ebuild,v 1.1 2006/04/10 00:28:49 cryos Exp $
 
-inherit multilib
+inherit multilib versionator
 
-MAINV="${PV:0:1}"
+MAINV="$(get_major_version)"
+SUBV="$(get_version_component_range 1-2)"
 
 DESCRIPTION="Powerful map generator"
 HOMEPAGE="http://gmt.soest.hawaii.edu/"
-SRC_URI="ftp://falcon.grdl.noaa.gov/pub/gmt/${MAINV}/GMT${PV}_progs.tar.bz2
-	ftp://falcon.grdl.noaa.gov/pub/gmt/${MAINV}/GMT_share.tar.bz2
-	ftp://falcon.grdl.noaa.gov/pub/gmt/${MAINV}/GMT${PV}_tut.tar.bz2
-	ftp://falcon.grdl.noaa.gov/pub/gmt/${MAINV}/GMT${PV}_scripts.tar.bz2
-	ftp://falcon.grdl.noaa.gov/pub/gmt/${MAINV}/GMT${PV}_man.tar.bz2
-	doc? ( ftp://falcon.grdl.noaa.gov/pub/gmt/${MAINV}/GMT${PV}_pdf.tar.bz2 )
-	gmtsuppl? ( ftp://falcon.grdl.noaa.gov/pub/gmt/${MAINV}/GMT${PV}_suppl.tar.bz2 )
-	gmtfull? ( ftp://falcon.grdl.noaa.gov/pub/gmt/${MAINV}/GMT_full.tar.bz2 )
-	gmthigh? ( ftp://falcon.grdl.noaa.gov/pub/gmt/${MAINV}/GMT_high.tar.bz2 )
-	gmttria? ( ftp://falcon.grdl.noaa.gov/pub/gmt/${MAINV}/triangle.tar.bz2 )"
-# Needed because GMT_share in version 3 is different of that one in version 4, but they have same name.
+SRC_URI="mirror://gmt/${MAINV}/GMT${PV}_src.tar.bz2
+	mirror://gmt/${MAINV}/GMT${SUBV}_coast.tar.bz2
+	mirror://gmt/${MAINV}/GMT${PV}_share.tar.bz2
+	mirror://gmt/${MAINV}/GMT${PV}_tut.tar.bz2
+	mirror://gmt/${MAINV}/GMT${PV}_scripts.tar.bz2
+	mirror://gmt/${MAINV}/GMT${PV}_man.tar.bz2
+	doc? ( mirror://gmt/${MAINV}/GMT${PV}_pdf.tar.bz2 )
+	doc? ( mirror://gmt/${MAINV}/GMT${PV}_web.tar.bz2 )
+	gmtsuppl? ( mirror://gmt/${MAINV}/GMT${PV}_suppl.tar.bz2 )
+	gmtfull? ( mirror://gmt/${MAINV}/GMT${SUBV}_full.tar.bz2 )
+	gmthigh? ( mirror://gmt/${MAINV}/GMT${SUBV}_high.tar.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -36,13 +37,16 @@
 	unpack ${A} || die "Unpacking failed."
 
 	mv -f ${WORKDIR}/share/*  ${S}/share/ || die "Moving sources failed."
-	if use gmttria; then
-		mv -f ${WORKDIR}/src/*  ${S}/src/ || die "Moving gmttria failed."
-	fi
 }
 
 src_compile() {
-	use gmtsuppl && WANT_AUTOCONF=2.5 autoconf # the configure in 3.4.4 is faulty when using gmtsuppl
+	if use gmtsuppl; then # the configure in 3.4.4 is faulty when using gmtsuppl
+		WANT_AUTOCONF=2.5 autoconf || die "Autoconf failed."
+	fi
+
+	# Don't prestrip libs
+	sed -i 's/OPTS="-s "/OPTS=" "/' configure || die "Error disabling stripping"
+
 	# In make process will include /lib and /include to NETCDFHOME
 	export NETCDFHOME="/usr"
 
@@ -51,7 +55,7 @@
 	econf \
 		--libdir=/usr/$(get_libdir)/${P} \
 		--includedir=/usr/include/${P} \
-		--datadir=${D}/usr/share/${P} \
+		--datadir=/usr/share/${P} \
 		 ${myconf} \
 		|| die "Configure failed."
 
@@ -89,8 +93,6 @@
 		rm -rf ${D}/usr/www
 	fi
 
-	dodir /etc/env.d
-	echo "GMTHOME=/usr/share/${P}" > ${D}/etc/env.d/99gmt
 	cd ${D}/usr/share/${P}
 	ln -s . share
 }