Version bump. Drop older.

(Portage version: 2.2.0_alpha38/cvs/Linux x86_64)

6 files changed, 164 insertions, 227 deletions

diff --git a/sci-geosciences/gmt/ChangeLog b/sci-geosciences/gmt/ChangeLog
index 03929a7f14ab..bc942d02ed8c 100644
--- a/sci-geosciences/gmt/ChangeLog
+++ b/sci-geosciences/gmt/ChangeLog
@@ -1,6 +1,13 @@
 # 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.21 2010/06/24 19:48:35 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/ChangeLog,v 1.22 2011/06/07 13:03:15 scarabeus Exp $
+
+*gmt-4.5.6 (07 Jun 2011)
+
+  07 Jun 2011; Tomáš Chvátal <scarabeus@gentoo.org> -gmt-4.1.1.ebuild,
+  -gmt-4.5.0-r2.ebuild, +gmt-4.5.6.ebuild,
+  +files/gmt-4.5.6-respect-ldflags.patch, metadata.xml:
+  Version bump. Drop older.
 
 *gmt-4.5.0-r2 (24 Jun 2010)
 
diff --git a/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch b/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch
new file mode 100644
index 000000000000..07494380fdfb
--- /dev/null
+++ b/sci-geosciences/gmt/files/gmt-4.5.6-respect-ldflags.patch
@@ -0,0 +1,56 @@
+diff -urN GMT4.5.6/src/Makefile GMT4.5.6.new/src/Makefile
+--- GMT4.5.6/src/Makefile	2011-03-03 22:02:50.000000000 +0100
++++ GMT4.5.6.new/src/Makefile	2011-06-07 14:48:00.969500019 +0200
+@@ -195,13 +195,13 @@
+ 		$(RANLIB) $@
+ 
+ libpsl.$(SL):	libpsl.a
+-		$(LD) $(LD_OPT) pslib.o $(LIBS) -o $@
++		$(LD) $(LD_OPT) $(LDFLAGS) pslib.o $(LIBS) -o $@
+ 
+ libgmt.$(SL):	libgmt.a
+-		$(LD) $(LD_OPT) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) $(NETCDF_LIB) $(GDAL_LIB) $(LIBS) -o $@
++		$(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) $(NETCDF_LIB) $(GDAL_LIB) $(LIBS) -o $@
+ 
+ libgmtps.$(SL):	libgmtps.a libgmt.$(SL) libpsl.$(SL)
+-		$(LD) $(LD_OPT) $(LIBPS_O) libgmt.$(SL) libpsl.$(SL) $(LIBS) -o $@
++		$(LD) $(LD_OPT) $(LDFLAGS) $(LIBPS_O) libgmt.$(SL) libpsl.$(SL) $(LIBS) -o $@
+ 
+ #-------------------------------------------------------------------------------
+ #	program rules
+diff -urN GMT4.5.6/src/mgd77/Makefile GMT4.5.6.new/src/mgd77/Makefile
+--- GMT4.5.6/src/mgd77/Makefile	2010-11-01 23:39:16.000000000 +0100
++++ GMT4.5.6.new/src/mgd77/Makefile	2011-06-07 14:53:46.394181616 +0200
+@@ -93,7 +93,7 @@
+ 		$(RANLIB) $@
+ 
+ libmgd77.$(SL):	libmgd77.a
+-		$(LD) $(LD_OPT) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@
++		$(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@
+ 
+ #-------------------------------------------------------------------------------
+ #	program rules
+diff -urN GMT4.5.6/src/mgg/Makefile GMT4.5.6.new/src/mgg/Makefile
+--- GMT4.5.6/src/mgg/Makefile	2010-11-01 23:39:16.000000000 +0100
++++ GMT4.5.6.new/src/mgg/Makefile	2011-06-07 14:54:48.096410233 +0200
+@@ -95,7 +95,7 @@
+ 		$(RANLIB) $@
+ 
+ libgmt_mgg.$(SL):	libgmt_mgg.a
+-		$(LD) $(LD_OPT) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@
++		$(LD) $(LD_OPT) $(LDFLAGS) $(LIB_O) $(GMT_LIB) $(NETCDF_LIB) $(LIBS) -o $@
+ 
+ #-------------------------------------------------------------------------------
+ #	program rules
+diff -urN GMT4.5.6/src/x2sys/Makefile GMT4.5.6.new/src/x2sys/Makefile
+--- GMT4.5.6/src/x2sys/Makefile	2010-11-01 23:39:16.000000000 +0100
++++ GMT4.5.6.new/src/x2sys/Makefile	2011-06-07 14:54:15.124822433 +0200
+@@ -83,7 +83,7 @@
+ 		$(RANLIB) $@
+ 
+ libx2sys.$(SL):	libx2sys.a
+-		$(LD) $(LD_OPT) x2sys.o $(ALLLIB) -o $@
++		$(LD) $(LD_OPT) $(LDFLAGS) x2sys.o $(ALLLIB) -o $@
+ 
+ #-------------------------------------------------------------------------------
+ #	program rules
diff --git a/sci-geosciences/gmt/gmt-4.1.1.ebuild b/sci-geosciences/gmt/gmt-4.1.1.ebuild
deleted file mode 100644
index 7c9edcf3a59a..000000000000
--- a/sci-geosciences/gmt/gmt-4.1.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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.3 2010/06/24 19:48:35 jlec Exp $
-
-inherit multilib
-
-MAINV="${PV:0:1}"
-
-DESCRIPTION="Powerful map generator"
-HOMEPAGE="http://gmt.soest.hawaii.edu/"
-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"
-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() {
-	use gmtfull && einfo "Please be patient, this will take some time to unpack..."
-	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
-	# In make process will include /lib and /include to NETCDFHOME
-	export NETCDFHOME="/usr"
-
-	local myconf=
-	use gmttria && myconf="${myconf} --enable-triangle"
-	econf \
-		--libdir=/usr/$(get_libdir)/${P} \
-		--includedir=/usr/include/${P} \
-		--datadir=${D}/usr/share/${P} \
-		 ${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/${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 CHANGES README
-	cp -r ${S}/{examples,tutorial} ${D}/usr/share/doc/${PF}/
-	use doc && dodoc ${WORKDIR}/*pdf*
-
-	# 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;"
-}
diff --git a/sci-geosciences/gmt/gmt-4.5.0-r2.ebuild b/sci-geosciences/gmt/gmt-4.5.0-r2.ebuild
deleted file mode 100644
index 56de1b49f2bf..000000000000
--- a/sci-geosciences/gmt/gmt-4.5.0-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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;"
-}
diff --git a/sci-geosciences/gmt/gmt-4.5.6.ebuild b/sci-geosciences/gmt/gmt-4.5.6.ebuild
new file mode 100644
index 000000000000..b333764b1f01
--- /dev/null
+++ b/sci-geosciences/gmt/gmt-4.5.6.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.5.6.ebuild,v 1.1 2011/06/07 13:03:15 scarabeus Exp $
+
+EAPI=4
+
+inherit multilib autotools eutils
+
+GSHHS="GSHHS2.1.1"
+
+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
+	mirror://gmt/GMT${PV}_suppl.tar.bz2
+	doc? ( mirror://gmt/GMT${PV}_doc.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 gmttria? ( Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc debug gmtfull gmthigh gmttria +metric mex +netcdf octave ps"
+
+RDEPEND="
+	!sci-biology/probcons
+	netcdf? ( >=sci-libs/netcdf-4.1 )
+	octave? ( sci-mathematics/octave )
+"
+DEPEND="${RDEPEND}"
+
+RESTRICT="mirror" # for the gmttria
+
+S="${WORKDIR}/GMT${PV}"
+
+# mex can use matlab too which i can't test
+REQUIRED_USE="
+	mex? ( octave )
+	gmthigh? ( !gmtfull ) gmtfull? ( !gmthigh )
+"
+
+# hand written make files that are not parallel safe
+MAKEOPTS+=" -j1"
+
+src_prepare() {
+	mv -f "${WORKDIR}/share/"*  "${S}/share/" || die "Moving sources failed."
+
+	epatch \
+		"${FILESDIR}/${PN}-4.5.0-no-strip.patch" \
+		"${FILESDIR}/${PN}-4.5.6-respect-ldflags.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	# triangle disabled due to non-comercial license
+	econf \
+		--libdir=/usr/$(get_libdir)/${P} \
+		--includedir=/usr/include/${P} \
+		--datadir=/usr/share/${P} \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-update \
+		--disable-debug \
+		--disable-gdal \
+		--disable-matlab \
+		--disable-xgrid \
+		--disable-triangle \
+		--enable-shared \
+		$(use_enable netcdf) \
+		$(use_enable octave) \
+		$(use_enable debug devdebug) \
+		$(use_enable !metric US) \
+		$(use_enable ps eps) \
+		$(use_enable mex)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${ED}" \
+		install-gmt install-data install-suppl install-man
+
+	# remove static libs
+	find "${ED}/usr/$(get_libdir)" -name '*.a' -exec rm -f {} +
+
+	dodoc README
+	use doc && dodoc -r "${S}/share/doc/${PN}/*"
+
+	cat << _EOF_ > "${T}/99gmt"
+GMTHOME=${EPREFIX}/usr/share/${P}
+GMT_SHAREDIR=${EPREFIX}/usr/share/${P}
+_EOF_
+	doenvd "${T}/99gmt"
+}
diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
index f8fa160470d7..f0da9bd3bb9d 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -7,5 +7,9 @@
   <flag name='gmthigh'>Add high resolution bathymetry database</flag>
   <flag name='gmtsuppl'>Supplement functions for GMT</flag>
   <flag name='gmttria'>Non GNU triangulation method, more efficient</flag>
+  <flag name='metric'>Use SI (cm) units instead of US (inches) ones</flag>
+  <flag name='mex'>Enable compilation of mex supplement which requires Octave/Matlab</flag>
+  <flag name='octave'>Enable octave support</flag>
+  <flag name='ps'>Enable rendering EPS files</flag>
 </use>
 </pkgmetadata>