Stabilise 4.5.6 on amd64 and x86 and remove older.

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

5 files changed, 26 insertions, 147 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/Manifest b/sci-geosciences/gmt/Manifest
index 2bc3775c2c70..f3ea7909d485 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,44 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gmt-4.5.0-no-strip.patch 1963 RMD160 fa0564e2fb2a476288b8690b49f4d8c01e9cff74 SHA1 40bf27ae665bc6fe1a9194eb5ad3b87b178c573b SHA256 c08daec9357087e52026faeec2398a888fc0b7c145511f01016734e41bbc1fea
 AUX gmt-4.5.6-respect-ldflags.patch 2396 RMD160 11b008d2cc4a2a2a9d11988532eb06ea5e7d91c2 SHA1 f9606b12ac6492df5187acf6e73da6bf9d666fe8 SHA256 c690c160cd7fad23a0ce0171aae47a4a275ff03203418de27d77fbab5d2b525a
-DIST GMT4.0_man.tar.bz2 105146 RMD160 685526638dd2b6f4058dd136e043ad0c81a25545 SHA1 51812b72a4542c515305cf5d5b0bbd78f46c8029 SHA256 83d2709a5683a11fd8cae44b2fd5a9316864535d8249d89c2b83716f46c9a9fe
-DIST GMT4.0_pdf.tar.bz2 9578106 RMD160 dea1c7c294aae7c1c96475101e5fa88dd2397e79 SHA1 0e9e0b4f6d42c3e1d488627583e6b28ec2c69f95 SHA256 9b6e529973ce645f1d3d0599677562c3f05812b2895ced1a7d1af9dc7cf8ce30
-DIST GMT4.0_progs.tar.bz2 752349 RMD160 9fd4da238a33b5763c018410bef9300c91e036d7 SHA1 7087960c34b6b3f08856d0da5652ab01faa2a078 SHA256 5d88b6cf7fd69fc3cda9564e6876e1232d816ed50aadb7e45700ddc6e87d0b2f
-DIST GMT4.0_scripts.tar.bz2 3139217 RMD160 476d2fc88c58e77157a21d8da7743faceef97e52 SHA1 f35b084408664fc0a82bd56d091ec29e525cc3a8 SHA256 b09a2795500229de5e86b248b1a5da3e4fc807ac4c240d8e5847fe4f9a24179e
-DIST GMT4.0_suppl.tar.bz2 606149 RMD160 5a76fd0803e6ab7b50bef82d86ea3aacf38222a6 SHA1 5c4465c2d6be7410a5dbe9d47ea67eee6c1a8568 SHA256 cc088d0bfe6cd52f71eeef090727aff19a32763ef98993ea6e56674fb4d89842
-DIST GMT4.0_tut.tar.bz2 986417 RMD160 863a21b55feb9848f04ab10e92d6b33d497aded4 SHA1 8ad4938954b52a694f5e8202648d77d314fd6884 SHA256 9bb5804c9b11928506aade0cc2f8602369130bd2005c296a659279f05b29ba4e
 DIST GMT4.5.6_doc.tar.bz2 25230761 RMD160 180f74d1886b1693c416a98a06afe199929cb386 SHA1 392546398e17910f1f47153e184eb4d8bbcb51e1 SHA256 9fbdf427ef06e666d83871c9e1241e5b578906b82e5c382d38fe75dfb40645dd
 DIST GMT4.5.6_share.tar.bz2 43704 RMD160 5c6fa2f08ae3c4c202501b4c053e55b41465608b SHA1 e1883826db21b4b04560a751d1aeeab23f51692d SHA256 364fcd62e1ed422d40399b92815e1196e916ea86f5a460cc799406754220234d
 DIST GMT4.5.6_src.tar.bz2 1134118 RMD160 284f63b66009b411230fe32315dc3c8d4a8e3f4a SHA1 21c947e386368118a9c0f88bba2de0267c6357a6 SHA256 f58b24320e9ffd2a2196aa68689dbc8b3bf01a13c4efc30a28aba2dd5b65e7b4
 DIST GMT4.5.6_suppl.tar.bz2 4137369 RMD160 f3d355c0e2a0db44bcdbf6d5e892f363808d8ff9 SHA1 fc25a9b13d593dbcc51db5b14f42ec4867df0f1d SHA256 572d23252055ed1e1d72f07e7aee86d92c4cd15b47fd55b0ecf39bfb7f014bee
 DIST GMT4.5.6_triangle.tar.bz2 103426 RMD160 a8fb547530f857ffa8618c49609666d0a7551ebc SHA1 dabb2ab065ed214c1a831fbd84a420cc63360b22 SHA256 0ef5ca66eebd1386b1f59e2577cedb2d7e68c8bff83d4b57a648d1b04026a05c
-DIST GMT_full.tar.bz2 28792514 RMD160 2bf0517295957e2f821ee4fcf4a61c5e45b830a7 SHA1 497e4d4c23091d108cd3a904eae5c17b16626f39 SHA256 07c16ad90d95a27037fc5af6b55b2e61973113894fcb0e3a8a9b32452a01de0a
-DIST GMT_high.tar.bz2 8706163 RMD160 8e4e020d71e4206740f4ca25ed542ed59b560825 SHA1 a6516e44ae8aa8071cff56b3bcb7446d2a23e483 SHA256 9ea624cb622fb05c4c05b23b98122bd29ecb21e618794455c499511494d616e7
-DIST GMT_share.tar.bz2 3662062 RMD160 85d424770771c58a4a997b662e857f188b0da0e8 SHA1 3d3d5cfd75ad3499454dcc902f63099ff1b2cc2c SHA256 7c143f518dc3f7f085e834d528085ebe4156a5debd7abc424536aebfc813119f
 DIST GSHHS2.1.1_coast.tar.bz2 4322743 RMD160 d75a9dcce2a36fa418054ab77b315f5595423a96 SHA1 f54899ad197136271cdf17e0b0edc68a08718d0c SHA256 9d78154cc316553e7ade8c79792d15e97469615f67e256e91b35da4bf0e64730
 DIST GSHHS2.1.1_full.tar.bz2 29916230 RMD160 63f779f17bb5ed54518aac73f723304bba0d394e SHA1 95b26d901796d8bf8a6d7be0142d10e7f29473fb SHA256 a81f6cdf64cad78c36b71c550079f11ebc11305b399f2c5354dc0d4087977938
 DIST GSHHS2.1.1_high.tar.bz2 9712697 RMD160 4a3047276ba25bf20ee0310d0c6dcea8aa5f174c SHA1 599797908ba0258fc00706f634909e1494a55717 SHA256 a19e1e4b205419d56ae3dca98a71dd0001eb5aab2ebc5f436c1d7e6e741945c7
-DIST triangle.tar.bz2 103116 RMD160 98d55e26393530a03aba3b9c8b1dc04fa96a1a8b SHA1 6430dda9d481121b095d1aa0955519f79a88875d SHA256 798cd5b01ba84dde53cce5bf6fb45ff66a830a9ab83960fd1e050a8e3237f3e9
-EBUILD gmt-4.0.ebuild 3508 RMD160 5c938553234786e460520cf4079e6028a34271ef SHA1 2fd5e889b0dc740dd16358703bd1f2b585902b63 SHA256 6100586b53975be75b9a53c4cd1532e65ad1bb25bbc5c08ce071fa20ffc97f4a
-EBUILD gmt-4.5.6.ebuild 2356 RMD160 fd132f2c22ddf9b4b67a867b32b53fd818ced531 SHA1 c65e0456e7fe21af21cc03eec8cdc3fc1127d4d0 SHA256 77f02b4c17cf3106f99dc590ffafaceedaf4ca7209c08ee3dfab1fb12b195570
-MISC ChangeLog 5248 RMD160 e9f1700dbc72cd3196ba21e8cc7bec4200e25cfa SHA1 7a13dad58b2264127e6798f38ee0a7e76054be01 SHA256 d2880d4aab006e59c92cd884a1c8d10b24bd7abc449ddd5ff6d8bd4f091f0d8d
-MISC metadata.xml 722 RMD160 234d720da186cacdc3fbab7942522d9ae143738e SHA1 adf7474ad60fd9b51adf5d8f36bc5a39df927182 SHA256 434ae1621198b21c7e734c5691fa1434a72e2cb74e080e2d049e510484f58f55
+EBUILD gmt-4.5.6.ebuild 2327 RMD160 29f34b12891a3b234ebd86df7cc193e34cabe6fe SHA1 e44b05dbeb9282fb6b47dd1cb47e0c137625f0c7 SHA256 2a0057241adf8bde388d44a5753b8a8be7f1410d7b829e5b2689c2f991a54f24
+MISC ChangeLog 5393 RMD160 39b4b4481ba6bee40f26d59a83f9440c19c73aec SHA1 09c5f47a6acf772b27f6b86751b675f33ba3e2ed SHA256 8509a5e37c3fe7f765189a7d57f6e1346d1a62be176b470699be3f693c185f99
+MISC metadata.xml 662 RMD160 bc9eca7a8885a34cf1a182a9814eb6f947e035d4 SHA1 29a81c37730fad30d2106d7dc5c411cab2f3c034 SHA256 0f121cf40c6ef5a10cd6392d1896eb55abe121888166004307c3957404e196c3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPrlQ+AAoJEF0huFKJUZL5oqIQAKskXp+JHC4YDoidigBbRoFF
-tLAYBRvtFlD8uI838E710UiehLAlgTGADBK8ipqis5r+URQ0dPgAaGXmrjhsNHGR
-SHO3VgmskBlmPWU6ExOyDhviT4EWvR1Pu7RD6SNttHQF1EdMR4jHnDBUjiSn+6+c
-tIbWJBF62csXt+NUgrj/4DSSquohYw4whXNI0dcmvBfSCZrhPTysaAHo6e/3wjZE
-urZcrmbWkkFtjmtplUEX9K4TacL1Iy5WgWQ6FrGgCKm38fs51vlZUpZFnrgCTFir
-0oVNPZzQPjfWffwfmhR8hhguLo98BdsGpM+1GXrxLtb+cZHa/SKw8vXIjo5VdQCm
-+kfZn+l692hW/cbzk76ywCF/ypHVgWPCLta81SsT1K2a+dtwEXIG8F7IR/BgFI1p
-JCUDWh//UyDcNlgCJ3J4DvioRR0dSRWcJwL0wdkLEuI1qfxCXAk4QQC689CHAT/G
-9G5yVLOnsXw7nF61bqYZ+CjbeBJ3KnrF3Zmu1bW+FXUCa9GcDOTbrvp00C0DPEoL
-TXQHrDUwt6gKHRw1e3Wp8MaV3EoQGslWkltal3FEHeSaqcpweSilkGU1ITGL0tSN
-579HymObLod/OxP5P0BN01pNTo5xSBg4dhJRNL0fkuXKopI6V5GbZR1NfNy0kwlA
-yLURXIXumTzuDmfeQNxY
-=3QKQ
+iQIcBAEBAgAGBQJPxLhAAAoJEOSiRoyO7jvoTA4P/3o0GJThnR+JMZkXLeRE74HT
+faWdQF+3lS6RoVnVLW9vaG54VIJnaRg4+SyX0agV6U1lOJ6Z8MlMFwiMP4BHkE0l
+ePvc2BJ90hKdDhCfpQq4tukrAf56LoFRT2ljpUXdLy4wTK+ndfGSyUin0KUkTDxP
+4t0v74AuH5IksuP5nyNbZOKYAaQG8aCUa/47gMtkNwqZNxQybltonkvTLM70eDR/
+NGIQjrBiw2r00/Kt4qCZp9e7Fx+sTS9OZV4Qk0ixj2RY1sHLEw4Bl0l5c5Fblgim
+AK/3pzMy8//iq2b/podz9/CeIoG5tTHZzZdqA2GDBwhKF0PTKd3MoTRJqDjm9HBK
+FHKgNbbuNyz7C8lkQSGt+3bZIhBjfD0uFDURx1xLix0JavTdKL8d+PqpnTKR21lh
+iknDyqHb8yoRx8estiDeMwZkhpM/ZwIcueGznEPkJdCiWxiSNjmbYEO0vS+omMAU
+6zabPHzsa8tLixyGvn2cb4DUSrFgJPYFzIX8lS+2zxXKfP3X0rE24iZhZ89nZbg4
+YKvNQpvDfyo7xjFdWVGQjbsaV1kxNbCHPNXpSJin+zs4vgeQb+EZDwKB15FaJASU
+WJuNKsDJGeGzoa1RGzAQ5aBuiAUp+BXmIn0o+KhmCsYlKmMLu4SJF8n54+9m0690
+lET8s+/0ScZ8Dej7xBLR
+=bWv3
 -----END PGP SIGNATURE-----
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>