Fixed compilation for x64-macos, keyworded, thanks to Jan Rieger in bug #413961

Package-Manager: portage-2.2.01.20430-prefix/cvs/Darwin i386

3 files changed, 15 insertions, 15 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index 8d41bf9e7182..bed90a06f4ad 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.215 2012/03/01 10:09:32 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.216 2012/04/29 09:57:06 grobian Exp $
+
+  29 Apr 2012; Fabian Groffen <grobian@gentoo.org> erlang-15.2.ebuild:
+  Fixed compilation for x64-macos, keyworded, thanks to Jan Rieger in bug
+  #413961
 
   01 Mar 2012; Dirkjan Ochtman <djc@gentoo.org> -erlang-14.2.2-r1.ebuild,
   -erlang-14.2.3.ebuild:
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 2936b729a025..d3b3d11e8202 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 50erlang-gentoo.el 134 RMD160 a453ad18f47d20e5ea5ecd1f4e4054d00eab5c35 SHA1 7c17979f533654ef05bbfcc8ae30554e7843923b SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4
 AUX epmd.init 515 RMD160 7f5927b020809ec9013a6f0e997fc0232489162a SHA1 dd32584a9e4971fac65881ce2e215afb570a5292 SHA256 d60df142ee0e47e9d55f543effe99b057dbf763586cadffb05a82ce74edeb494
@@ -15,13 +15,13 @@ DIST otp_src_R14B04.tar.gz 70773703 RMD160 1619a05e7d3df9cb5f9c41e32d9cfb0d8b4ed
 DIST otp_src_R15B.tar.gz 74100507 RMD160 022ed91978e85f5a446a90825aa686dd608061a9 SHA1 8177a5d40e4a3d7eb8dc7f7898241a034f35ea72 SHA256 5bc34fc34fc890f84bae7ff1f7c81fbec2c9aa28a0ef51a57d7a8192204d8aa2
 EBUILD erlang-13.2.4.ebuild 5166 RMD160 a7fc56ff7fda05ba9e9984b9e21ac692845e3fdf SHA1 30c7c49873f07f9451dd698f3e7e6a3571e9f6e4 SHA256 101dfc49700c02666afef4bbc48fc7dddb175099eaedc2e4daecdfd814c42b2d
 EBUILD erlang-14.2.4.ebuild 5423 RMD160 3901359b18658cec5366c6cdf978958ad5568737 SHA1 7338235ca60f8022d8298fc35c10ad67cc58add6 SHA256 90f1cbf7efff54a0d3fb5e2d83b1c7a7632fe89ba39a3a5abae567a6ac614e1f
-EBUILD erlang-15.2.ebuild 5515 RMD160 70ec519b1695923b43f03921fb5f99873cba66a8 SHA1 32a011cf0f39c33d859eba52eb1e0b2322b9e3cf SHA256 c54698ee1e8e920cd574cd428ea7cfbdc1873997d2be7011aa09d7045f14ee31
-MISC ChangeLog 34685 RMD160 f2307920fa9c22d261584241cbed796464b21ce6 SHA1 f9885c6147a7a35c819415c697baa59bf45bad69 SHA256 9822e5ffeab46cbd149dc394f8bd12f6e8d88037055c8bdb2d738a0de1266756
+EBUILD erlang-15.2.ebuild 5364 RMD160 7eb4fdea8462b7ea2e93ba704e1c412088f6fc2b SHA1 ffd753b786808150fb59034fceb4529293268937 SHA256 d0cb3346f07161298715084dad188668e38896ac8ad669bb2f01840d21c24606
+MISC ChangeLog 34845 RMD160 a9a0954413b2a3ed3af342c97cc50ff396be1b22 SHA1 41faf0af3f6cad118ddba3ded272c0626c795753 SHA256 54945279992cb47b1b51dd4133e7fa59cd4256dc8c8714152a1062873fde3d10
 MISC metadata.xml 852 RMD160 23b6c329ba522bbe8ff4198713967d5331fbd952 SHA1 3f79d6a608037384d2b28dbcaeef49c9bd0d4bc2 SHA256 5782640d216cf818d9088bd5eb963002210d83e9eb47e98edfd3844fe579dc27
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (Darwin)
 
-iEYEAREKAAYFAk9PSzEACgkQxeMuLWsGW/v8vwCfe0l5UKRJiDUH2gubZLGImRgs
-Z1EAn0ejYlQ9poQEa1HVw0jtiz4uGKRk
-=3kcC
+iEYEARECAAYFAk+dEKEACgkQX3X2B8XHTolxZgCgm/K5Zrwf8aCt6vDzCyFSmU28
+K/wAn2a1kVuSNkh9y0vgGorX8QCX8EBO
+=vG0r
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-15.2.ebuild b/dev-lang/erlang/erlang-15.2.ebuild
index 1a4136761bba..bfc2a97eb6cb 100644
--- a/dev-lang/erlang/erlang-15.2.ebuild
+++ b/dev-lang/erlang/erlang-15.2.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/dev-lang/erlang/erlang-15.2.ebuild,v 1.1 2012/03/01 10:03:53 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-15.2.ebuild,v 1.2 2012/04/29 09:57:06 grobian Exp $
 
 EAPI=3
 WX_GTK_VER="2.8"
@@ -29,7 +29,7 @@ SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz
 
 LICENSE="ErlPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="compat-ethread doc emacs halfword hipe java kpoll odbc smp sctp ssl tk wxwidgets"
 
 RDEPEND=">=dev-lang/perl-5.6.1
@@ -67,11 +67,6 @@ src_prepare() {
 	# Nasty workaround, reported upstream
 	cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in || die
 
-	# prevent configure from injecting -m32 by default on Darwin, bug #334155
-	# Nasty hack
-	sed -i -e 's/Darwin-i386/Darwin-NO/' configure.in || die
-	sed -i -e '/\<\(LD\|C\)FLAGS="-m32/s/-m32//' erts/configure.in || die
-
 	# bug 383697
 	sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c || die
 }
@@ -90,6 +85,7 @@ src_configure() {
 		$(use_enable kpoll kernel-poll) \
 		$(use_enable smp smp-support) \
 		$(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
+		$(use x64-macos && echo "--enable-darwin-64bit") \
 		|| die
 }