Fixing #79805

(Portage version: 2.0.51-r15)

4 files changed, 11 insertions, 107 deletions

diff --git a/sci-geosciences/gmt/ChangeLog b/sci-geosciences/gmt/ChangeLog
index d41b43fd3c39..07b618e722de 100644
--- a/sci-geosciences/gmt/ChangeLog
+++ b/sci-geosciences/gmt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/gmt
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/ChangeLog,v 1.2 2004/12/29 10:13:50 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/ChangeLog,v 1.3 2005/02/04 13:33:47 phosphan Exp $
+
+  04 Feb 2005; Patrick Kursawe <phosphan@gentoo.org> gmt-3.4.4-r1.ebuild,
+  -gmt-3.4.3.ebuild:
+  When using gmtsuppl it needs autoconf-2.13 (see bug #79805)
+  Removed old version.
 
 *gmt-3.4.4-r1 (28 Dec 2004)
 
diff --git a/sci-geosciences/gmt/files/digest-gmt-3.4.3 b/sci-geosciences/gmt/files/digest-gmt-3.4.3
deleted file mode 100644
index 999b2328de69..000000000000
--- a/sci-geosciences/gmt/files/digest-gmt-3.4.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 5c6d329c7ec810ff22238a2df818307d GMT3.4.3_progs.tar.bz2 558935
-MD5 7375498ea9894255e753bd377ef6eafb GMT_share.tar.bz2 3662062
-MD5 e0dae08d68590834810d0f5e577999f5 GMT3.4.3_tut.tar.bz2 986401
-MD5 62a6966aa3a72475fcb403d99b7de33f GMT3.4.3_scripts.tar.bz2 3051535
-MD5 e693d32653d6764ce1d1a0781b3260d3 GMT3.4.3_man.tar.bz2 86380
-MD5 f6b62419d59eb94f84bd276008377b01 GMT3.4.3_suppl.tar.bz2 521583
-MD5 6f7d5721167e037b03c2bed9f4bb8725 GMT_full.tar.bz2 28789894
-MD5 63217a3ca2ebcf3b918f085651a91e12 GMT_high.tar.bz2 8641460
-MD5 3361f8dbf09443814c0c68fb9cfda1b5 triangle.tar.bz2 90342
diff --git a/sci-geosciences/gmt/gmt-3.4.3.ebuild b/sci-geosciences/gmt/gmt-3.4.3.ebuild
deleted file mode 100644
index 9d6eb2b92710..000000000000
--- a/sci-geosciences/gmt/gmt-3.4.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-3.4.3.ebuild,v 1.1 2004/12/29 01:29:52 ribosome Exp $
-
-DESCRIPTION="Powerful map generator"
-HOMEPAGE="http://gmt.soest.hawaii.edu/"
-SRC_URI="ftp://gmt.soest.hawaii.edu/pub/gmt/GMT${PV}_progs.tar.bz2
-	ftp://gmt.soest.hawaii.edu/pub/gmt/GMT_share.tar.bz2
-	ftp://gmt.soest.hawaii.edu/pub/gmt/GMT${PV}_tut.tar.bz2
-	ftp://gmt.soest.hawaii.edu/pub/gmt/GMT${PV}_scripts.tar.bz2
-	ftp://gmt.soest.hawaii.edu/pub/gmt/GMT${PV}_man.tar.bz2
-	gmtsuppl? ( ftp://gmt.soest.hawaii.edu/pub/gmt/GMT${PV}_suppl.tar.bz2)
-	gmtfull? ( ftp://gmt.soest.hawaii.edu/pub/gmt/GMT_full.tar.bz2 )
-	gmthigh? ( ftp://gmt.soest.hawaii.edu/pub/gmt/GMT_high.tar.bz2 )
-	gmttria? ( ftp://gmt.soest.hawaii.edu/pub/gmt/triangle.tar.bz2 )"
-	#gmtpdf? ( ftp://gmt.soest.hawaii.edu/pub/gmt/GMT${PV}_pdf.tar.bz2 )
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="gmtsuppl gmtfull gmthigh gmttria doc"
-
-#Need to include gcc and bzip??
-DEPEND=">=sci-libs/netcdf-3.5.0"
-#RDEPEND=""
-
-S="${WORKDIR}/GMT${PV}"
-
-pkg_setup() {
-	einfo "The default instalation is the cleanest one. To include more "
-	einfo "resources take a look at ebuild file."
-}
-
-src_unpack() {
-
-	unpack ${A} || die
-
-	mv -f ${WORKDIR}/share/*  ${S}/share/ || die
-	if use gmttria ; then
-		mv -f ${WORKDIR}/src/*  ${S}/src/ || die
-	fi
-}
-
-src_compile() {
-	#In make process will include /lib and /include to NETCDFHOME
-	export NETCDFHOME="/usr"
-
-	local myconf=
-	use gmttria && myconf="${myconf} --enable-triangle"
-	econf \
-		--libdir=/usr/lib/gmt-${PV}·\
-		--includedir=/usr/include/gmt-${PV}·\
-		 ${myconf} \
-		|| die "configure failed"
-
-	local mymake=
-	use gmtsuppl && mymake="${mymake} suppl"
-	make gmt ${mymake} || die "make ${mymake} failed"
-}
-
-src_install() {
-	local mymake=
-	use gmtsuppl && mymake="${mymake} install-suppl"
-	use doc && mymake="${mymake} install-www"
-
-	einstall \
-		includedir=${D}/usr/include/gmt-${PV} \
-		libdir=${D}/usr/lib/gmt-${PV}·\
-		install \
-		install-data \
-		install-man \
-		${mymake} \
-		|| die "install failed"
-
-	#now some docs
-	dodoc CHANGES COPYING README
-	cp -r ${S}/{examples,tutorial} ${D}/usr/share/doc/${PF}/
-}
-
-pkg_postinst() {
-	einfo "The default instalation is the cleanest one"
-	einfo "To include more resources use the syntax:"
-	einfo "env USE=\"\${USE} gmt_flags\" emerge gmt"
-	einfo "Possible GMT flags are:"
-	#einfo "gmtman -> man documents;"
-	#einfo "gmtpdf -> PDF documents;"#Not right setted yet
-	einfo "gmthigh -> High resolution bathimetry data base;"
-	einfo "gmtfull -> Full resolution bathimetry data base;"
-	einfo "gmttria -> Non GNU triangulate method, but more efficient;"
-	einfo "gmtsuppl -> Supplement functions for GMT;"
-	einfo "Others GMT flags will be included soon."
-}
diff --git a/sci-geosciences/gmt/gmt-3.4.4-r1.ebuild b/sci-geosciences/gmt/gmt-3.4.4-r1.ebuild
index 7aed3af02716..d5c2c980a603 100644
--- a/sci-geosciences/gmt/gmt-3.4.4-r1.ebuild
+++ b/sci-geosciences/gmt/gmt-3.4.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-3.4.4-r1.ebuild,v 1.1 2004/12/29 01:29:52 ribosome Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-3.4.4-r1.ebuild,v 1.2 2005/02/04 13:33:47 phosphan Exp $
 
 MAINV="${PV:0:1}"
 
@@ -25,7 +25,7 @@ IUSE="gmtsuppl gmtfull gmthigh gmttria doc"
 
 RDEPEND=">=sci-libs/netcdf-3.5.0"
 DEPEND="${RDEPEND}
-	gmtsuppl? ( >=sys-devel/autoconf-2.58 )"
+	gmtsuppl? ( =sys-devel/autoconf-2.13* )"
 
 S="${WORKDIR}/GMT${PV}"
 
@@ -40,7 +40,7 @@ src_unpack() {
 }
 
 src_compile() {
-	use gmtsuppl && autoconf # the configure in 3.4.4 is faulty when using gmtsuppl
+	use gmtsuppl && autoconf-2.13 # the configure in 3.4.4 is faulty when using gmtsuppl
 	#In make process will include /lib and /include to NETCDFHOME
 	export NETCDFHOME="/usr"