Correct handling of *FLAGS, thanks Martin von Gagern for providing the patch

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 106 insertions, 60 deletions

diff --git a/sci-geosciences/gmt/ChangeLog b/sci-geosciences/gmt/ChangeLog
index 6b9e1f204dd3..03929a7f14ab 100644
--- a/sci-geosciences/gmt/ChangeLog
+++ b/sci-geosciences/gmt/ChangeLog
@@ -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@gentoo.org> 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@gentoo.org> gmt-4.0.ebuild,
   gmt-4.1.1.ebuild, gmt-4.5.0-r1.ebuild:
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 58d565a92ff7..4a1d832376a6 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX gmt-4.5.0-no-strip.patch 886 RMD160 f167966962d9fad051afdbc2de09a68bad848f3b SHA1 3ee027b2a0ecfa9449055b2aba44cfc44bc27a11 SHA256 7e84aa704dea1e75dd57bd99953f0002500f00d2fce258f0f9c48c7f04032244
+AUX gmt-4.5.0-no-strip.patch 1963 RMD160 fa0564e2fb2a476288b8690b49f4d8c01e9cff74 SHA1 40bf27ae665bc6fe1a9194eb5ad3b87b178c573b SHA256 c08daec9357087e52026faeec2398a888fc0b7c145511f01016734e41bbc1fea
 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
@@ -26,15 +26,15 @@ DIST GSHHS2.0_coast.tar.bz2 4226168 RMD160 a099d16cbea6bb7d8c6dddce5280a0c5a3b00
 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 triangle.tar.bz2 103116 RMD160 98d55e26393530a03aba3b9c8b1dc04fa96a1a8b SHA1 6430dda9d481121b095d1aa0955519f79a88875d SHA256 798cd5b01ba84dde53cce5bf6fb45ff66a830a9ab83960fd1e050a8e3237f3e9
-EBUILD gmt-4.0.ebuild 3728 RMD160 b018c9de5d38e2ea2a0493b69664fed633acd965 SHA1 fb88b8dda42c3c4a64213435efe74c5e1fccbbfb SHA256 3b4a37133eccc686bd54afd8654b9483466fc3b66f8c3eb8424b7b21d1f35711
-EBUILD gmt-4.1.1.ebuild 3590 RMD160 9f845f4e8188d4fe3301577fb79a179c40865819 SHA1 32d72ae7d0ed8d0ce458792ad00603689fca15d0 SHA256 8ca869202be8bf5e907845a6016c482e4930309741b2bf51190f2c892115c6f3
-EBUILD gmt-4.5.0-r1.ebuild 3215 RMD160 81a217ed19745c21312460376b6574ed975b0faf SHA1 091f3ac2134eec072ef1d3259ef46ca02cda41a6 SHA256 6e5d06381dabc647ebbbe81c582070eb9056b17b05ac9335922a5649f9eb60f3
-MISC ChangeLog 4389 RMD160 b1dd81d3ea76a873e4b9d3a9e771c560b20bd360 SHA1 4334d9bfe1980e9d9ba514dd1684114d31fa98eb SHA256 b7191a429bec7dd6a51e9741ace4824922bd7ae2569a8bf738e2469358fe15cc
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwZ73AACgkQgAnW8HDreRZ68wCfaMAFsg1C8L/vKWvatywa2jIc
-2VYAnjeGmlAB9mOjDmsHE/ih/eGNTb3r
-=mXm5
+iEYEARECAAYFAkwjtpgACgkQgAnW8HDreRbfYACeOppdgXHMzmAaa4Y7U8lO99Eh
+imwAn2j5loVtAS5koritiiJCU29NLLyj
+=LVwQ
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch b/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch
index 463133c657df..f0fe4c3e833e 100644
--- a/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch
+++ b/sci-geosciences/gmt/files/gmt-4.5.0-no-strip.patch
@@ -1,24 +1,62 @@
-diff -ur GMT4.5.0.orig/configure GMT4.5.0/configure
---- GMT4.5.0.orig/configure	2009-07-26 12:11:29.000000000 +0200
-+++ GMT4.5.0/configure	2009-07-26 12:14:56.000000000 +0200
-@@ -11284,8 +11284,6 @@
- 	CFLAGS=`echo $CFLAGS | sed 's/-g//'`
- 	if test "$os" = "Darwin" ; then
- 		LDFLAGS="$LDFLAGS -Wl,-x"
+Drop manipulation of several flags:
+
+* stripping of -g from CFLAGS, as it interferes with deliberate
+  generation of debug symbols and breaks on flags like -ggdb.
+* Addition of -s resp. -Wl,-x to LDFLAGS, as stipping of binaries is
+  done as a separate step on Gentoo (and many other distros) in order
+  to faciliate retention or splitting of debug symbols.
+* Setting of optimization flags, as the user should be free to choose
+  them.
+
+2009-07-27 Martin von Gagern
+
+Reference: http://bugs.gentoo.org/279268
+
+Index: GMT4.5.0/configure
+===================================================================
+--- GMT4.5.0.orig/configure
++++ GMT4.5.0/configure
+@@ -10665,19 +10665,6 @@ if test "X$enable_debug" = "Xyes" ; then
+ echo "${ECHO_T}yes" >&6; }
+ 	CFLAGS="$CFLAGS -g"
+ else
+-	CFLAGS=`echo $CFLAGS | sed 's/-g//'`
+-	if test "$os" = "Darwin" ; then
+-		LDFLAGS="$LDFLAGS -Wl,-x"
 -	else
 -		LDFLAGS="$LDFLAGS -s"
- 	fi
- 	if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then
- 		CFLAGS="$CFLAGS -O2"
-diff -ur GMT4.5.0.orig/configure.ac GMT4.5.0/configure.ac
---- GMT4.5.0.orig/configure.ac	2009-07-26 12:11:29.000000000 +0200
-+++ GMT4.5.0/configure.ac	2009-07-26 12:15:15.000000000 +0200
-@@ -530,8 +530,6 @@
- 	CFLAGS=`echo $CFLAGS | sed 's/-g//'`
- 	if test "$os" = "Darwin" ; then
- 		LDFLAGS="$LDFLAGS -Wl,-x"
+-	fi
+-	if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then
+-		CFLAGS="$CFLAGS -O2"
+-	elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then
+-		CFLAGS="$CFLAGS"
+-	else
+-		CFLAGS="$CFLAGS -O"
+-	fi
+ 	{ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+Index: GMT4.5.0/configure.ac
+===================================================================
+--- GMT4.5.0.orig/configure.ac
++++ GMT4.5.0/configure.ac
+@@ -527,19 +527,6 @@ if test "X$enable_debug" = "Xyes" ; then
+ 	AC_MSG_RESULT(yes)
+ 	CFLAGS="$CFLAGS -g"
+ else
+-	CFLAGS=`echo $CFLAGS | sed 's/-g//'`
+-	if test "$os" = "Darwin" ; then
+-		LDFLAGS="$LDFLAGS -Wl,-x"
 -	else
 -		LDFLAGS="$LDFLAGS -s"
- 	fi
- 	if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then
- 		CFLAGS="$CFLAGS -O2"
+-	fi
+-	if test "$GCC" = "yes" || test "$os" = "Linux" || test "$os" = "AIX"; then
+-		CFLAGS="$CFLAGS -O2"
+-	elif test "$chip" = "alpha" || test "$os" = "AUX" || test "$os" = "HP-UX"; then
+-		CFLAGS="$CFLAGS"
+-	else
+-		CFLAGS="$CFLAGS -O"
+-	fi
+ 	AC_MSG_RESULT(no)
+ fi
+ dnl -----------------------------------------------------------------
diff --git a/sci-geosciences/gmt/gmt-4.0.ebuild b/sci-geosciences/gmt/gmt-4.0.ebuild
index d41674f57eaf..a2b0385f6e10 100644
--- a/sci-geosciences/gmt/gmt-4.0.ebuild
+++ b/sci-geosciences/gmt/gmt-4.0.ebuild
@@ -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 @@ MAINV="${PV:0:1}"
 
 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
diff --git a/sci-geosciences/gmt/gmt-4.1.1.ebuild b/sci-geosciences/gmt/gmt-4.1.1.ebuild
index fb2b01ee1ef2..7c9edcf3a59a 100644
--- a/sci-geosciences/gmt/gmt-4.1.1.ebuild
+++ b/sci-geosciences/gmt/gmt-4.1.1.ebuild
@@ -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 @@ MAINV="${PV:0:1}"
 
 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"
diff --git a/sci-geosciences/gmt/gmt-4.5.0-r1.ebuild b/sci-geosciences/gmt/gmt-4.5.0-r2.ebuild
index 4df2f36af5f3..56de1b49f2bf 100644
--- a/sci-geosciences/gmt/gmt-4.5.0-r1.ebuild
+++ b/sci-geosciences/gmt/gmt-4.5.0-r2.ebuild
@@ -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.5.0-r1.ebuild,v 1.2 2010/06/17 09:48:27 jlec Exp $
+# $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
 
@@ -8,14 +8,14 @@ GSHHS="GSHHS2.0"
 
 DESCRIPTION="Powerful map generator"
 HOMEPAGE="http://gmt.soest.hawaii.edu/"
-SRC_URI="ftp://falcon.grdl.noaa.gov/pub/gmt/GMT${PV}_src.tar.bz2
-	ftp://falcon.grdl.noaa.gov/pub/gmt/GMT${PV}_share.tar.bz2
-	ftp://falcon.grdl.noaa.gov/pub/gmt/${GSHHS}_coast.tar.bz2
-	doc? ( ftp://falcon.grdl.noaa.gov/pub/gmt/GMT${PV}_doc.tar.bz2 )
-	gmtsuppl? ( ftp://falcon.grdl.noaa.gov/pub/gmt/GMT${PV}_suppl.tar.bz2 )
-	gmtfull? ( ftp://falcon.grdl.noaa.gov/pub/gmt/${GSHHS}_full.tar.bz2 )
-	gmthigh? ( ftp://falcon.grdl.noaa.gov/pub/gmt/${GSHHS}_high.tar.bz2 )
-	gmttria? ( ftp://falcon.grdl.noaa.gov/pub/gmt/GMT${PV}_triangle.tar.bz2 )"
+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"