Version bump. Drop older.

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

7 files changed, 180 insertions, 249 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/Manifest b/sci-geosciences/gmt/Manifest
index 4a1d832376a6..a08114aed356 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -2,39 +2,33 @@
 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.1.1_man.tar.bz2 111536 RMD160 fe66e61ab4e29dfa03bfa2d8f9f832c1468d8cea SHA1 83593311dc6c9d62a3d1f8e5f4dc00a7917faddc SHA256 d1cfed4e75016450bf0bf90a1441c6e2850904b8be4c5b416b3efeca9da50a11
-DIST GMT4.1.1_pdf.tar.bz2 10697897 RMD160 fe210b8e0803c7b95e63808c00ee7659289ade70 SHA1 93a4be8cd415e2eaa6fd230be01b1676474390f0 SHA256 9fb4ed61a56333ac570ae0d267bdf54fd2fdeefb6d8a014b5de8931ae9d3c0ec
-DIST GMT4.1.1_progs.tar.bz2 897165 RMD160 0d1099b05270f34841d3aa548b77aef7c0bf9b48 SHA1 42d06938524c10abb0d862424065054a717a6e18 SHA256 f74ea32717960edac09f3cf3629269b9e44a4449c63688075a14440a25ff45e9
-DIST GMT4.1.1_scripts.tar.bz2 3142070 RMD160 9947ceb8d270a32bd59f8b1abb376954139831ce SHA1 66824e7c2b6aa8c8f96730dc73b42303ed68a8f1 SHA256 a797ed2bfbd3de31c2be79fc1be53d0756610e3897d00ef239de555527f493b9
-DIST GMT4.1.1_suppl.tar.bz2 739708 RMD160 e07286bb8f1ccf8ec0ecfb86870f6b37d0c3c04f SHA1 151076e65ab27ec539a0ff0c1efe1fa90829f8cd SHA256 024f832775123c7705b0bf2040e0eef326dc115eb56c057d5f684a9450f9a2c0
-DIST GMT4.1.1_tut.tar.bz2 986365 RMD160 125c38758241d433b6389adb7844723a9e714a28 SHA1 1a0a4e2120775dc5bc8dcbb1ec78ff7ff76836a8 SHA256 4752e4f385ab9eac889bb2878cbe5c9e58c182ce0ad719b73c01f22908ece14e
-DIST GMT4.5.0_doc.tar.bz2 25008913 RMD160 25ced36300f548d40c4b7683d6c64356ab606f5c SHA1 2e7be0424901f0a0df488a3c5cb1b5402e9236dd SHA256 9068ce4f74c9fd151a8af60becdbea7de284d322376e8b3aaed8ba7efcfbf4db
-DIST GMT4.5.0_share.tar.bz2 47466 RMD160 cad7fc66f4c5c74d07fb02cc9c15a65b88d3c440 SHA1 f92cf1f9ea2f339392ec5a2e61a6f8c633f45695 SHA256 5e4c8ca70da6ade12f88f92c61bf88f605afdab60b251582b3a2182aa7f4afd4
-DIST GMT4.5.0_src.tar.bz2 1102928 RMD160 ecc45a7a951e84af503e19598cef9e02b96f55cd SHA1 2896f2258a6e7b5d7b85726e80ff3d409d8760ad SHA256 1be2ba47c44bb1045ab3a27f6d92ab81e5749dbf328cafba261edd0ab5e223d3
-DIST GMT4.5.0_suppl.tar.bz2 4100463 RMD160 2e137e4318c7e74a07fbb6ec7bd42c6af5518d6d SHA1 90d46ebd9880c08261e9d1edb93b6eba2c63acbb SHA256 e9f00fa5868e3f92bf579e328991cbc31b0cd178fef000b5ceeedf830ebc62e9
-DIST GMT4.5.0_triangle.tar.bz2 103387 RMD160 0dc64f48da01c837246dd0cc1ab66766b8327f63 SHA1 8f2cd8381756ab90893b0fe6c264269df9848618 SHA256 396156b6cb00730fc1f53783228d79c51ab5fe67465bd0dcdebb9e022701572f
+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.0_coast.tar.bz2 4226168 RMD160 a099d16cbea6bb7d8c6dddce5280a0c5a3b0064d SHA1 c4d5f72630e877c3f06b1dba5721419f66a46a9a SHA256 c287558cf5c5ad15be6f46be5f3611367c51415243f96490d76cd8bddc30953b
-DIST GSHHS2.0_full.tar.bz2 29518019 RMD160 3bfd0ba09c78da876973336744d1606cb66a0786 SHA1 b8bb2b5c4b9ee49ff92c49717a0bc529d6846e1c SHA256 9a952e8d2916592b393c04e3fbebbbd1d51cebdc558bd2386d2b4fbffe15f0a9
-DIST GSHHS2.0_high.tar.bz2 9411460 RMD160 bc78714e38bbc55d957ce52ea1ba756bcf2dfad7 SHA1 f2e44ffcb18203d4115c422bb45b4f509b6d63f2 SHA256 ee2ef5f57970a6f12005bf4f73be11dac693c4a8af529b186060831c5ad4ae30
+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.1.1.ebuild 3370 RMD160 071179e0745ea5a39f1c772b4ba5e08289eea9d0 SHA1 17202d559af3c8b3a609e4969635a247fadc33e0 SHA256 78f47d8af68a098ca1140c224a6007f2205497bccf57c2a3fde6e4726b39b751
-EBUILD gmt-4.5.0-r2.ebuild 3039 RMD160 1b9ad9700df821f1065a204dcdf8f1d45cb91c64 SHA1 49ba4ad9aed616c635076f5f9050b27021709061 SHA256 8fe5b0ce1de704f2143cb516eb41ba44b1537569ef67f10d5983f20942ae4cbf
-MISC ChangeLog 4661 RMD160 65d43a4f301f11a6f59e5dc7c235cc53838def50 SHA1 9d76ff8570dd47730f1cc1fc3023e762e752f342 SHA256 d29ac3f19a7052bfd25c133257028403fa44fdf08bcda532e8c5fcbea32f30b0
-MISC metadata.xml 452 RMD160 e70c04a9d50d215cd99d37693423527d71ec6ccc SHA1 f16c5be9e455d820c5c48665f55cb7d7f304e753 SHA256 0509f73fc513ea60968d8dd1a94ec77095709475709e64d25a7d52cef2f44789
+EBUILD gmt-4.5.6.ebuild 2345 RMD160 294f6ee7ff88b84c3912e202aefe8986de9ea98c SHA1 24457a16e76fc831ee94539c3c3ed5a650deda20 SHA256 eda662ad83b78f1f284ff9b4ef8a7ee329a6441d9148f33f0036b6a17b35bf78
+MISC ChangeLog 4894 RMD160 388a2152ab463ec4a333fe4a901e19a515a8d403 SHA1 d2049d77b0a32e5da97902e0d85de408744c711c SHA256 bbdf29790bcd670eae7b8a3534cb52562c4c2380931b5e2a68b1497f3b5f5bc6
+MISC metadata.xml 722 RMD160 234d720da186cacdc3fbab7942522d9ae143738e SHA1 adf7474ad60fd9b51adf5d8f36bc5a39df927182 SHA256 434ae1621198b21c7e734c5691fa1434a72e2cb74e080e2d049e510484f58f55
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkwjtpgACgkQgAnW8HDreRbfYACeOppdgXHMzmAaa4Y7U8lO99Eh
-imwAn2j5loVtAS5koritiiJCU29NLLyj
-=LVwQ
+iEYEARECAAYFAk3uIZgACgkQHB6c3gNBRYfCRwCgkLoIEY+Txgb4RqxLjprEx562
+uT8AoI9xGL49DO2mC5BaFqhjUuDwjeIE
+=icPZ
 -----END PGP SIGNATURE-----
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>