Add no-relax to LDFLAGS for alpha, and keyword latest version ~alpha

Package-Manager: portage-2.1.2.7

4 files changed, 26 insertions, 16 deletions

diff --git a/dev-lang/ocaml/ChangeLog b/dev-lang/ocaml/ChangeLog
index 8f1a0fb2c15f..e9a4a297fccb 100644
--- a/dev-lang/ocaml/ChangeLog
+++ b/dev-lang/ocaml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/ocaml
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.114 2007/05/26 16:41:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ChangeLog,v 1.115 2007/05/26 19:05:10 armin76 Exp $
+
+  26 May 2007; Raúl Porcel <armin76@gentoo.org> ocaml-3.09.3-r1.ebuild,
+  ocaml-3.10.0.ebuild:
+  Add no-relax to LDFLAGS for alpha, and keyword latest version ~alpha
 
   26 May 2007; Raúl Porcel <armin76@gentoo.org> ocaml-3.09.3-r1.ebuild:
   Readd ~alpha wrt #178256
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 38a748bcc61f..7135a5d53833 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -62,22 +62,22 @@ EBUILD ocaml-3.09.2.ebuild 2402 RMD160 6bc854705b08c0ef5e9d05d6e6009d6c463f2d33
 MD5 8cb80568d2fffd2db8db680e611b1323 ocaml-3.09.2.ebuild 2402
 RMD160 6bc854705b08c0ef5e9d05d6e6009d6c463f2d33 ocaml-3.09.2.ebuild 2402
 SHA256 8144897559ad397542ece72e1d503d561add45cf8ac3daab8c2fd1020e38a030 ocaml-3.09.2.ebuild 2402
-EBUILD ocaml-3.09.3-r1.ebuild 5445 RMD160 77d5cc8fd2044e6165414b53cc267fddb12d20c7 SHA1 25ab0374bb35a201a95e63e345ab0cd85dcb32f8 SHA256 e5bab1c14f22e3e3db67a31390d31f53f92c280dc553e95b4c6ded1781b2630d
-MD5 ca47b5226f65030140604591d663cb8d ocaml-3.09.3-r1.ebuild 5445
-RMD160 77d5cc8fd2044e6165414b53cc267fddb12d20c7 ocaml-3.09.3-r1.ebuild 5445
-SHA256 e5bab1c14f22e3e3db67a31390d31f53f92c280dc553e95b4c6ded1781b2630d ocaml-3.09.3-r1.ebuild 5445
+EBUILD ocaml-3.09.3-r1.ebuild 5544 RMD160 3750436379cfb66e81f4b678148c2db39a599757 SHA1 c11af4c745f384aaac2695b3ac8fddef9130aaf7 SHA256 79c4ea79494f2fa60e1e2e76cec3c39e40f89dbe3ad36b1a460d3806eb2daf82
+MD5 80d450a5767570b42280197845d6a0d9 ocaml-3.09.3-r1.ebuild 5544
+RMD160 3750436379cfb66e81f4b678148c2db39a599757 ocaml-3.09.3-r1.ebuild 5544
+SHA256 79c4ea79494f2fa60e1e2e76cec3c39e40f89dbe3ad36b1a460d3806eb2daf82 ocaml-3.09.3-r1.ebuild 5544
 EBUILD ocaml-3.09.3.ebuild 2502 RMD160 2a015120aec3b6ce103ffeebdae265e1ced4aa49 SHA1 44bdb0801fe812386f53a75b3ba376ae1b54eee6 SHA256 fad524f73b1a807254283cc48dc742f18a8fec1a5b3123a86435a014cbc2125f
 MD5 e44a3de37fac8ae24a87c9f1d4019c7a ocaml-3.09.3.ebuild 2502
 RMD160 2a015120aec3b6ce103ffeebdae265e1ced4aa49 ocaml-3.09.3.ebuild 2502
 SHA256 fad524f73b1a807254283cc48dc742f18a8fec1a5b3123a86435a014cbc2125f ocaml-3.09.3.ebuild 2502
-EBUILD ocaml-3.10.0.ebuild 5082 RMD160 9e35c1e983dddba37a58f3db976e1ffc34ef330b SHA1 ede543dcea8f4fc98b19b97aafc9887b00838fe7 SHA256 32df7807583cdc53913db7c0d85bc24a5c4a31ff8ddf682cd0e3a2f8674f80c4
-MD5 2336b8438e20fe8b16d333cd4cac1f91 ocaml-3.10.0.ebuild 5082
-RMD160 9e35c1e983dddba37a58f3db976e1ffc34ef330b ocaml-3.10.0.ebuild 5082
-SHA256 32df7807583cdc53913db7c0d85bc24a5c4a31ff8ddf682cd0e3a2f8674f80c4 ocaml-3.10.0.ebuild 5082
-MISC ChangeLog 18059 RMD160 fe99652ff7fc45689c097c15f42bbe73e4f2f067 SHA1 426e906ebe72bb9896882e5a476205c3e8fc287d SHA256 5e98f176b47975fd619bb03f31a9e2d006b91a373a469be72e052192322ee5e5
-MD5 beeae36d128f600d8089baebc5017386 ChangeLog 18059
-RMD160 fe99652ff7fc45689c097c15f42bbe73e4f2f067 ChangeLog 18059
-SHA256 5e98f176b47975fd619bb03f31a9e2d006b91a373a469be72e052192322ee5e5 ChangeLog 18059
+EBUILD ocaml-3.10.0.ebuild 5187 RMD160 60b2b57a9664826466118551a833ea3c9597c71b SHA1 c9e2ef4d724e9c4e18b9b9feaf283e6e298c180f SHA256 e35e241d1ed3e694cfb61f195a4c5d9bfbde6b0071dc76ce5c7780a0a7152e13
+MD5 0a763f2a8d72daa19f72c7d49a394185 ocaml-3.10.0.ebuild 5187
+RMD160 60b2b57a9664826466118551a833ea3c9597c71b ocaml-3.10.0.ebuild 5187
+SHA256 e35e241d1ed3e694cfb61f195a4c5d9bfbde6b0071dc76ce5c7780a0a7152e13 ocaml-3.10.0.ebuild 5187
+MISC ChangeLog 18227 RMD160 9a868b89b48d6b01122e2479f841871294a0b1d3 SHA1 661d0afd0c45f988a8c241e529f6ed5a432cbed4 SHA256 da843174608e08c8757e88acaf7c924f546266fb424780611aaebe253c5c5155
+MD5 002cd70b10e9f827996d7dc911f54b43 ChangeLog 18227
+RMD160 9a868b89b48d6b01122e2479f841871294a0b1d3 ChangeLog 18227
+SHA256 da843174608e08c8757e88acaf7c924f546266fb424780611aaebe253c5c5155 ChangeLog 18227
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 RMD160 dfaa057e679b01302a807c75a32a910098b26809 metadata.xml 155
diff --git a/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild b/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild
index f20dab11efac..85c5388c4464 100644
--- a/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild,v 1.14 2007/05/26 16:41:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.09.3-r1.ebuild,v 1.15 2007/05/26 19:05:10 armin76 Exp $
 
 inherit flag-o-matic eutils multilib pax-utils versionator toolchain-funcs
 
@@ -80,6 +80,9 @@ src_compile() {
 	strip-flags
 	replace-flags "-O?" -O2
 
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
 	use tk || myconf="${myconf} -no-tk"
 	use ncurses || myconf="${myconf} -no-curses"
 	use X || myconf="${myconf} -no-graph"
diff --git a/dev-lang/ocaml/ocaml-3.10.0.ebuild b/dev-lang/ocaml/ocaml-3.10.0.ebuild
index 50c99105ce02..5dd3f612a63e 100644
--- a/dev-lang/ocaml/ocaml-3.10.0.ebuild
+++ b/dev-lang/ocaml/ocaml-3.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.0.ebuild,v 1.2 2007/05/26 13:36:50 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ocaml/ocaml-3.10.0.ebuild,v 1.3 2007/05/26 19:05:10 armin76 Exp $
 
 inherit flag-o-matic eutils multilib pax-utils versionator toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://caml.inria.fr/distrib/ocaml-$( get_version_component_range 1-2)/
 
 LICENSE="QPL-1.0 LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="gdbm ncurses tk latex X"
 
 DEPEND="tk? ( >=dev-lang/tk-3.3.3 )
@@ -69,6 +69,9 @@ src_compile() {
 	strip-flags
 	replace-flags "-O?" -O2
 
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
 	use tk || myconf="${myconf} -no-tk"
 	use ncurses || myconf="${myconf} -no-curses"
 	use X || myconf="${myconf} -no-graph"