Stabilise 4.5.6 on amd64 and x86 and remove older.

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

4 files changed, 8 insertions, 118 deletions

diff --git a/sci-geosciences/gmt/ChangeLog b/sci-geosciences/gmt/ChangeLog
index c485edb76383..12feb19564b6 100644
--- a/sci-geosciences/gmt/ChangeLog
+++ b/sci-geosciences/gmt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gmt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/ChangeLog,v 1.25 2012/05/12 12:14:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/ChangeLog,v 1.26 2012/05/29 11:51:20 scarabeus Exp $
+
+  29 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> -gmt-4.0.ebuild,
+  gmt-4.5.6.ebuild:
+  Stabilise 4.5.6 on amd64 and x86 and remove older.
 
   12 May 2012; Kacper Kowalik <xarthisius@gentoo.org> gmt-4.5.6.ebuild:
   Fix double prefix install
diff --git a/sci-geosciences/gmt/gmt-4.0.ebuild b/sci-geosciences/gmt/gmt-4.0.ebuild
deleted file mode 100644
index a2b0385f6e10..000000000000
--- a/sci-geosciences/gmt/gmt-4.0.ebuild
+++ /dev/null
@@ -1,113 +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.0.ebuild,v 1.8 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.
-
-# Emailed one of the authors (Paul Wessel) who gave us permission to mirror
-#RESTRICT="mirror"
-
-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 -> Supplement functions for GMT;"
-	einfo "Others GMT flags will be included soon."
-}
diff --git a/sci-geosciences/gmt/gmt-4.5.6.ebuild b/sci-geosciences/gmt/gmt-4.5.6.ebuild
index 637d84b16950..49c4bc8e4f97 100644
--- a/sci-geosciences/gmt/gmt-4.5.6.ebuild
+++ b/sci-geosciences/gmt/gmt-4.5.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.4 2012/05/12 12:14:45 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.5.6.ebuild,v 1.5 2012/05/29 11:51:20 scarabeus Exp $
 
 EAPI=4
 
@@ -21,7 +21,7 @@ SRC_URI="mirror://gmt/GMT${PV}_src.tar.bz2
 
 LICENSE="GPL-2 gmttria? ( Artistic )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc debug gmtfull gmthigh gmttria +metric mex +netcdf octave ps"
 
 RDEPEND="
@@ -45,7 +45,7 @@ REQUIRED_USE="
 MAKEOPTS+=" -j1"
 
 src_prepare() {
-	mv -f "${WORKDIR}/share/"*  "${S}/share/" || die "Moving sources failed."
+	mv -f "${WORKDIR}/share/"* "${S}/share/" || die
 
 	epatch \
 		"${FILESDIR}/${PN}-4.5.0-no-strip.patch" \
diff --git a/sci-geosciences/gmt/metadata.xml b/sci-geosciences/gmt/metadata.xml
index f0da9bd3bb9d..8c519f3c7f84 100644
--- a/sci-geosciences/gmt/metadata.xml
+++ b/sci-geosciences/gmt/metadata.xml
@@ -5,7 +5,6 @@
 <use>
   <flag name='gmtfull'>Full resolution bathymetry database</flag>
   <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>