[gentoo-commits] gentoo-x86 commit in sci-geosciences/gmt: ChangeLog gmt-4.0.ebuild gmt-4.5.0-r2.ebuild gmt-4.1.1.ebuild gmt-4.5.0-r1.ebuild

[Justin Lecher (jlec)]

jlec        10/06/24 19:48:35

  Modified:             ChangeLog gmt-4.0.ebuild gmt-4.1.1.ebuild
  Added:                gmt-4.5.0-r2.ebuild
  Removed:              gmt-4.5.0-r1.ebuild
  Log:
  Correct handling of *FLAGS, thanks Martin von Gagern for providing the patch
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.21                 sci-geosciences/gmt/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gmt/ChangeLog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gmt/ChangeLog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gmt/ChangeLog?r1=1.20&r2=1.21

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog	17 Jun 2010 09:48:27 -0000	1.20
+++ ChangeLog	24 Jun 2010 19:48:35 -0000	1.21
@@ -1,6 +1,14 @@
 # ChangeLog for sci-geosciences/gmt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/ChangeLog,v 1.20 2010/06/17 09:48:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/ChangeLog,v 1.21 2010/06/24 19:48:35 jlec Exp $
+
+*gmt-4.5.0-r2 (24 Jun 2010)
+
+  24 Jun 2010; Justin Lecher <jlec@g.o> gmt-4.0.ebuild,
+  gmt-4.1.1.ebuild, -gmt-4.5.0-r1.ebuild, +gmt-4.5.0-r2.ebuild,
+  files/gmt-4.5.0-no-strip.patch:
+  Correct handling of *FLAGS, thanks Martin von Gagern for providing the
+  patch
 
   17 Jun 2010; Justin Lecher <jlec@g.o> gmt-4.0.ebuild,
   gmt-4.1.1.ebuild, gmt-4.5.0-r1.ebuild:



1.8                  sci-geosciences/gmt/gmt-4.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gmt/gmt-4.0.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gmt/gmt-4.0.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gmt/gmt-4.0.ebuild?r1=1.7&r2=1.8

Index: gmt-4.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.0.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gmt-4.0.ebuild	17 Jun 2010 09:48:27 -0000	1.7
+++ gmt-4.0.ebuild	24 Jun 2010 19:48:35 -0000	1.8
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.0.ebuild,v 1.7 2010/06/17 09:48:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.0.ebuild,v 1.8 2010/06/24 19:48:35 jlec Exp $
 
 inherit multilib
 
@@ -8,16 +8,16 @@
 
 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 )"
+SRC_URI="mirror://gmt/${MAINV}/GMT${PV}_progs.tar.bz2
+	mirror://gmt/${MAINV}/GMT_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 )
+	gmtsuppl? ( mirror://gmt/${MAINV}/GMT${PV}_suppl.tar.bz2 )
+	gmtfull? ( mirror://gmt/${MAINV}/GMT_full.tar.bz2 )
+	gmthigh? ( mirror://gmt/${MAINV}/GMT_high.tar.bz2 )
+	gmttria? ( mirror://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.
 
 # Emailed one of the authors (Paul Wessel) who gave us permission to mirror



1.3                  sci-geosciences/gmt/gmt-4.1.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gmt/gmt-4.1.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gmt/gmt-4.1.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gmt/gmt-4.1.1.ebuild?r1=1.2&r2=1.3

Index: gmt-4.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.1.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gmt-4.1.1.ebuild	17 Jun 2010 09:48:27 -0000	1.2
+++ gmt-4.1.1.ebuild	24 Jun 2010 19:48:35 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # 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.2 2010/06/17 09:48:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.1.1.ebuild,v 1.3 2010/06/24 19:48:35 jlec Exp $
 
 inherit multilib
 
@@ -8,16 +8,16 @@
 
 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 )"
+SRC_URI="mirror://gmt/${MAINV}/GMT${PV}_progs.tar.bz2
+	mirror://gmt/${MAINV}/GMT_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 )
+	gmtsuppl? ( mirror://gmt/${MAINV}/GMT${PV}_suppl.tar.bz2 )
+	gmtfull? ( mirror://gmt/${MAINV}/GMT_full.tar.bz2 )
+	gmthigh? ( mirror://gmt/${MAINV}/GMT_high.tar.bz2 )
+	gmttria? ( mirror://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.
 
 LICENSE="GPL-2"



1.1                  sci-geosciences/gmt/gmt-4.5.0-r2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gmt/gmt-4.5.0-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/gmt/gmt-4.5.0-r2.ebuild?rev=1.1&content-type=text/plain

Index: gmt-4.5.0-r2.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.5.0-r2.ebuild,v 1.1 2010/06/24 19:48:35 jlec Exp $

inherit multilib autotools eutils

GSHHS="GSHHS2.0"

DESCRIPTION="Powerful map generator"
HOMEPAGE="http://gmt.soest.hawaii.edu/"
SRC_URI="mirror://gmt/GMT${PV}_src.tar.bz2
	mirror://gmt/GMT${PV}_share.tar.bz2
	mirror://gmt/${GSHHS}_coast.tar.bz2
	doc? ( mirror://gmt/GMT${PV}_doc.tar.bz2 )
	gmtsuppl? ( mirror://gmt/GMT${PV}_suppl.tar.bz2 )
	gmtfull? ( mirror://gmt/${GSHHS}_full.tar.bz2 )
	gmthigh? ( mirror://gmt/${GSHHS}_high.tar.bz2 )
	gmttria? ( mirror://gmt/GMT${PV}_triangle.tar.bz2 )"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gmtsuppl gmtfull gmthigh gmttria doc"

RDEPEND="
	!sci-biology/probcons
	>=sci-libs/netcdf-3.5.0"
DEPEND="${RDEPEND}
	gmtsuppl? ( >=sys-devel/autoconf-2.58 )"

S="${WORKDIR}/GMT${PV}"

src_unpack() {
	unpack ${A} || die "Unpacking failed."
	epatch "${FILESDIR}/${P}-no-strip.patch"
	mv -f "${WORKDIR}/share/"*  "${S}/share/" || die "Moving sources failed."
	cd "${S}"
	if use gmtsuppl; then
		WANT_AUTOCONF=2.5 eautoreconf || die "autoconf failed."
	fi
}

src_compile() {

	# In make process will include /lib and /include to NETCDFHOME
	export NETCDFHOME="/usr"

	local myconf=""

	if use gmttria; then
		myconf="${myconf} --enable-triangle"
	fi

	econf \
		--libdir=/usr/$(get_libdir)/${P} \
		--includedir=/usr/include/${P} \
		--datadir=/usr/share/${P} \
		 ${myconf} \
		|| die "Configure failed."

	local mymake=
	if use gmtsuppl; then
		mymake="${mymake} suppl"
	fi

	emake gmt ${mymake} || die "Make ${mymake} failed."
}

src_install() {
	local mymake=
	if use gmtsuppl; then
		mymake="${mymake} install-suppl"
	fi
	if use doc; then
		mymake="${mymake} install-doc"
		mkdir -p www/gmt/doc/html
	fi

	einstall \
		includedir=${D}/usr/include/${P} \
		libdir=${D}/usr/$(get_libdir)/${P} \
		datadir=${D}/usr/share/${P} \
		install \
		install-data \
		install-man \
		${mymake} \
		|| die "Make install failed."

	#now some docs
	dodoc README
	cp -r "${S}/{examples,tutorial}" "${D}/usr/share/doc/${PF}/"

	# Move the HTML and PDF docs to the docs directory. Old location breaks FHS
	# compliance, and is not used by web servers generally.
	if use doc; then
		mv "${D}/usr/www/gmt/doc/pdf/*.pdf" "${D}/usr/share/doc/${PF}/"
		mv "${D}/usr/www/gmt/doc/html" "${D}/usr/share/doc/${PF}/"
		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
}

pkg_postinst() {
	einfo "The default installation is the cleanest one"
	einfo "To include more resources use the syntax:"
	einfo "USE=\"gmt_flags\" emerge gmt"
	einfo "Possible GMT flags are:"
	einfo "gmthigh -> High resolution bathimetry database;"
	einfo "gmtfull -> Full resolution bathimetry database;"
	einfo "gmttria -> Non GNU triangulate method, but more efficient;"
	einfo "gmtsuppl -> Supplementary functions for GMT;"
}