Trying to sort out unversioned tarball mess, and upstream silent changes, bug 119689.

(Portage version: 2.1_pre3-r1)

6 files changed, 9 insertions, 124 deletions

diff --git a/sci-geosciences/gmt/ChangeLog b/sci-geosciences/gmt/ChangeLog
index 8a1f9eea4573..a3e6f3ca73d1 100644
--- a/sci-geosciences/gmt/ChangeLog
+++ b/sci-geosciences/gmt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gmt
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/ChangeLog,v 1.11 2006/01/10 22:21:44 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/ChangeLog,v 1.12 2006/01/20 18:10:20 cryos Exp $
+
+  20 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> -gmt-3.4.4-r1.ebuild:
+  Trying to sort out unversioned tarball mess, and upstream silent changes,
+  bug 119689.
 
   10 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> gmt-4.1.ebuild:
   Removed the nomirror directive, Paul Wessel confirmed they are no longer
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 840d4e595719..168cfb801359 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 2dd97b3b8d0190457c83292e62f021e6 ChangeLog 3144
-MD5 eb664b10894e3ad4684892cff8b36494 files/digest-gmt-3.4.4-r1 647
-MD5 922748bfd75f599ea7776e58e934b160 files/digest-gmt-4.0 637
-MD5 c00d2f1803318abe9f1ace05a31145eb files/digest-gmt-4.1 638
-MD5 1a5290b5150d12ddd187bc0e2ba34ea7 gmt-3.4.4-r1.ebuild 3185
+MD5 9b3392c7e2aa2c1f5acd0b2d4a7dc057 files/digest-gmt-4.0 637
+MD5 b5c23399f2c56a0c8d6efbbfe3518a3e files/digest-gmt-4.1 638
 MD5 6cf4a893341b030c01d504eba744b569 gmt-4.0.ebuild 3706
 MD5 5824438d1dd183eeb120954b5bb06f2f gmt-4.1.ebuild 3564
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDxDONntT9W3vfTuoRAgpZAJ9tPhOP3GVP81RBUvRSar9geP4cqACeN0Ub
-HtKJc+witGt+82bQTR5dnlE=
-=DGcQ
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/gmt/files/digest-gmt-3.4.4-r1 b/sci-geosciences/gmt/files/digest-gmt-3.4.4-r1
deleted file mode 100644
index e6aff12e574c..000000000000
--- a/sci-geosciences/gmt/files/digest-gmt-3.4.4-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-MD5 91e2c498acf44c9a6e5eb582327a9b5b GMT3.4.4_progs.tar.bz2 571995
-MD5 7375498ea9894255e753bd377ef6eafb GMT_share.tar.bz2 3662062
-MD5 32261b973a15fdd16e973b65e9a22757 GMT3.4.4_tut.tar.bz2 986362
-MD5 3f2c48e93c50503cf5f89eac5a398a99 GMT3.4.4_scripts.tar.bz2 3051755
-MD5 b48c1a6bd92d9e5998703dcc49c71306 GMT3.4.4_man.tar.bz2 85214
-MD5 a0b32b180b7330500ee5bada8c30b4b3 GMT3.4.4_pdf.tar.bz2 6813835
-MD5 fe1163b5bc72233048a68118546da480 GMT3.4.4_suppl.tar.bz2 518872
-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/files/digest-gmt-4.0 b/sci-geosciences/gmt/files/digest-gmt-4.0
index 670c11d1385b..60ed577cebed 100644
--- a/sci-geosciences/gmt/files/digest-gmt-4.0
+++ b/sci-geosciences/gmt/files/digest-gmt-4.0
@@ -6,5 +6,5 @@ MD5 c48cf1331c37b2b849b2bc0a6c53578b GMT4.0_suppl.tar.bz2 606149
 MD5 c166c4ae4e79acc04b16a244fcaac722 GMT4.0_tut.tar.bz2 986417
 MD5 ffef8d3d3308278fe3e7fcd333e8c610 GMT_full.tar.bz2 28792514
 MD5 10f16ecac3eb5435373f76074c847363 GMT_high.tar.bz2 8706163
-MD5 f5f2b272f8c8b575ef96849cb3add36f GMT_share.tar.bz2 3661351
+MD5 7375498ea9894255e753bd377ef6eafb GMT_share.tar.bz2 3662062
 MD5 1d65b96eca53342c659676eda3591527 triangle.tar.bz2 103116
diff --git a/sci-geosciences/gmt/files/digest-gmt-4.1 b/sci-geosciences/gmt/files/digest-gmt-4.1
index d5f593078c3b..b85d4b57fcb8 100644
--- a/sci-geosciences/gmt/files/digest-gmt-4.1
+++ b/sci-geosciences/gmt/files/digest-gmt-4.1
@@ -6,5 +6,5 @@ MD5 1838ca6802103b593f1161563a23ace1 GMT4.1_suppl.tar.bz2 689281
 MD5 bb6bf91a0d24e4cba409ea598f136f5a GMT4.1_tut.tar.bz2 986405
 MD5 ffef8d3d3308278fe3e7fcd333e8c610 GMT_full.tar.bz2 28792514
 MD5 10f16ecac3eb5435373f76074c847363 GMT_high.tar.bz2 8706163
-MD5 f5f2b272f8c8b575ef96849cb3add36f GMT_share.tar.bz2 3661351
+MD5 7375498ea9894255e753bd377ef6eafb GMT_share.tar.bz2 3662062
 MD5 1d65b96eca53342c659676eda3591527 triangle.tar.bz2 103116
diff --git a/sci-geosciences/gmt/gmt-3.4.4-r1.ebuild b/sci-geosciences/gmt/gmt-3.4.4-r1.ebuild
deleted file mode 100644
index 3841f824afbd..000000000000
--- a/sci-geosciences/gmt/gmt-3.4.4-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.3 2005/06/09 13:38:01 swegener Exp $
-
-MAINV="${PV:0:1}"
-
-DESCRIPTION="Powerful map generator"
-HOMEPAGE="http://gmt.soest.hawaii.edu/"
-SRC_URI="ftp://gmt.soest.hawaii.edu/pub/gmt/${MAINV}/GMT${PV}_progs.tar.bz2
-	ftp://gmt.soest.hawaii.edu/pub/gmt/${MAINV}/GMT_share.tar.bz2
-	ftp://gmt.soest.hawaii.edu/pub/gmt/${MAINV}/GMT${PV}_tut.tar.bz2
-	ftp://gmt.soest.hawaii.edu/pub/gmt/${MAINV}/GMT${PV}_scripts.tar.bz2
-	ftp://gmt.soest.hawaii.edu/pub/gmt/${MAINV}/GMT${PV}_man.tar.bz2
-	doc? ( ftp://gmt.soest.hawaii.edu/pub/gmt/${MAINV}/GMT${PV}_pdf.tar.bz2 )
-	gmtsuppl? ( ftp://gmt.soest.hawaii.edu/pub/gmt/${MAINV}/GMT${PV}_suppl.tar.bz2 )
-	gmtfull? ( ftp://gmt.soest.hawaii.edu/pub/gmt/${MAINV}/GMT_full.tar.bz2 )
-	gmthigh? ( ftp://gmt.soest.hawaii.edu/pub/gmt/${MAINV}/GMT_high.tar.bz2 )
-	gmttria? ( ftp://gmt.soest.hawaii.edu/pub/gmt/${MAINV}/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"
-
-RDEPEND=">=sci-libs/netcdf-3.5.0"
-DEPEND="${RDEPEND}
-	gmtsuppl? ( =sys-devel/autoconf-2.13* )"
-
-S="${WORKDIR}/GMT${PV}"
-
-src_unpack() {
-	use gmtfull && einfo "Please be patient, this will take some time to 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() {
-	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"
-
-	local myconf=
-	use gmttria && myconf="${myconf} --enable-triangle"
-	econf \
-		--libdir=/usr/lib/${PF} \
-		--includedir=/usr/include/${PF} \
-		--datadir=${D}/usr/share/${PF} \
-		 ${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"
-	mkdir -p www/gmt/doc/html
-	use doc && mymake="${mymake} install-www"
-
-	einstall \
-		includedir=${D}/usr/include/gmt-${PV} \
-		libdir=${D}/usr/lib/gmt-${PV} \
-		datadir=${D}/usr/share/${PF} \
-		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}/
-	use doc && dodoc ${WORKDIR}/*pdf*
-	dodir /etc/env.d
-	echo "GMTHOME=/usr/share/${PF}" > ${D}/etc/env.d/99gmt
-	cd ${D}/usr/share/${PF}
-	ln -s . share
-}
-
-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 "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."
-}