Fix gethostbyname problem on FreeBSD and keyword ~x86-fbsd, #182001 thanks to Pierre Guinoiseau.

Package-Manager: portage-2.1.3.3

4 files changed, 42 insertions, 21 deletions

diff --git a/dev-lang/erlang/ChangeLog b/dev-lang/erlang/ChangeLog
index eb2c4225ee47..b4f24d539da3 100644
--- a/dev-lang/erlang/ChangeLog
+++ b/dev-lang/erlang/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/erlang
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.67 2007/07/17 21:47:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/ChangeLog,v 1.68 2007/08/06 14:46:05 uberlord Exp $
+
+  06 Aug 2007; Roy Marples <uberlord@gentoo.org>
+  +files/erlang-11.2.5-gethostbyname.patch, erlang-11.2.5.ebuild:
+  Fix gethostbyname problem on FreeBSD and keyword ~x86-fbsd, #182001 thanks
+  to Pierre Guinoiseau.
 
   17 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> erlang-11.2.5.ebuild:
   Stable on sparc wrt security #184592
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index d72e3ea617cb..e4263ee79ee5 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 10.2.6-manpage-emacs-gentoo.patch 1348 RMD160 9b71f1253a400a8a8e99db0a1761d10a40e19e7a SHA1 c02e5a195ae42de5e26547e8f9ba13c5bf198b8b SHA256 3c8981e860600447c077a090fbafb2467fbf9da6e15f43825c7f2e9b8702adbb
 MD5 34433096e1c6e84b5dbb4a50a4e3c2e8 files/10.2.6-manpage-emacs-gentoo.patch 1348
 RMD160 9b71f1253a400a8a8e99db0a1761d10a40e19e7a files/10.2.6-manpage-emacs-gentoo.patch 1348
@@ -13,6 +10,10 @@ AUX erlang-10.2.6-export-TARGET.patch 242 RMD160 5f8443e482920358c6c13f85b1c5549
 MD5 b1f610dc1caa7c176d7da4919bcabba9 files/erlang-10.2.6-export-TARGET.patch 242
 RMD160 5f8443e482920358c6c13f85b1c554977bfcc950 files/erlang-10.2.6-export-TARGET.patch 242
 SHA256 8e8ae39cb84c3196fbb773275f0aaaf68fb07fade632682f1866d2185b4dd54b files/erlang-10.2.6-export-TARGET.patch 242
+AUX erlang-11.2.5-gethostbyname.patch 755 RMD160 49fc401143ec996cabc7a06c57794ef4ca7a662a SHA1 d36d1cdb7928083676742e909dff133447104d4d SHA256 8746bf418163a2ee3491b18bd57f3a4c8d0bf80008f4470b1aeee67d768afd55
+MD5 40674d039d403ee17908fe7a1952f249 files/erlang-11.2.5-gethostbyname.patch 755
+RMD160 49fc401143ec996cabc7a06c57794ef4ca7a662a files/erlang-11.2.5-gethostbyname.patch 755
+SHA256 8746bf418163a2ee3491b18bd57f3a4c8d0bf80008f4470b1aeee67d768afd55 files/erlang-11.2.5-gethostbyname.patch 755
 DIST otp_doc_html_R11B-1.tar.gz 4717809 RMD160 2a7425f55245b12037a02082ace85411c04c5bb6 SHA1 1c1734482ebce4fab096b24ac8b91d33966a47cd SHA256 225212891e2290d0ea21e489445113d7f79ad51e4b3e3e4f0042f8876383a7bc
 DIST otp_doc_html_R11B-4.tar.gz 4902864 RMD160 36d8ed3e0523f651f57caa8588f12f0500344f0e SHA1 12f74f4553fa62dcb94d1a89b91551d57d744505 SHA256 fa1f313a0d3f79239ee2930159288419c6c4348d095cf58557ff799712d3a60f
 DIST otp_doc_html_R11B-5.tar.gz 4968176 RMD160 73f8056b66f3bc6ec6b93c3c3dbfdf47074f8974 SHA1 a44439ec924c35896b3cdb534f5001daf6e2e8dd SHA256 7dea67980b958ffebf7a94f3d94bd9c874e041f4f5ee574c56aab62c54a71d28
@@ -30,14 +31,14 @@ EBUILD erlang-11.2.4-r1.ebuild 4590 RMD160 f07dca05b0f3bd3d3992a6c900828adbe8be9
 MD5 dda7b2b50052b41e0c33d6aaaba6cd49 erlang-11.2.4-r1.ebuild 4590
 RMD160 f07dca05b0f3bd3d3992a6c900828adbe8be95c6 erlang-11.2.4-r1.ebuild 4590
 SHA256 4fdc633e853be9bd3fd0365029f2b522a60676886c6a3103bfcb3ca4aec5fa3a erlang-11.2.4-r1.ebuild 4590
-EBUILD erlang-11.2.5.ebuild 4423 RMD160 02f4882e5d8002c0b2af6917dd7fdcc70d57d11c SHA1 3fc02f66a6069e170918adaf26d7b60caf646350 SHA256 5df829a4f2ee71ba7442a66168bce41e8c4d1c445ee5d3067e842bb6cc0c4bc5
-MD5 0959875d3ddff9b82e3b39b0eadb93c2 erlang-11.2.5.ebuild 4423
-RMD160 02f4882e5d8002c0b2af6917dd7fdcc70d57d11c erlang-11.2.5.ebuild 4423
-SHA256 5df829a4f2ee71ba7442a66168bce41e8c4d1c445ee5d3067e842bb6cc0c4bc5 erlang-11.2.5.ebuild 4423
-MISC ChangeLog 12199 RMD160 157e54b84780ae1ba753f732937ed2fa8b65660b SHA1 6bb8e9a40003600da20df327be59caf912d1ff9e SHA256 f75fb1874f57e84ed3d1cb21a0b8ee003811e5dfb1b87d4e001b04c805cff1fc
-MD5 ecb392db2af1fc6e5b4a9ec5a6346d98 ChangeLog 12199
-RMD160 157e54b84780ae1ba753f732937ed2fa8b65660b ChangeLog 12199
-SHA256 f75fb1874f57e84ed3d1cb21a0b8ee003811e5dfb1b87d4e001b04c805cff1fc ChangeLog 12199
+EBUILD erlang-11.2.5.ebuild 4510 RMD160 64bb640d844ec16d0d5da97e63fcded3577f97a2 SHA1 bd6fa32526e5eb48e00d3c6d027541fd0370cdd9 SHA256 dcc9c292af0ec19539f701decaa64d73380942c093718f112d4d70a31f2ee1cf
+MD5 6ab7bf39f1622ec935636e9b093bc92a erlang-11.2.5.ebuild 4510
+RMD160 64bb640d844ec16d0d5da97e63fcded3577f97a2 erlang-11.2.5.ebuild 4510
+SHA256 dcc9c292af0ec19539f701decaa64d73380942c093718f112d4d70a31f2ee1cf erlang-11.2.5.ebuild 4510
+MISC ChangeLog 12416 RMD160 934b4e61236b097d63e14f6a032ff12b6d3d8678 SHA1 aea5a3c6375ebd22ac5ea7947653c3bfc5003f7d SHA256 6b5f105dced3fab77fdfe0be5883f58b69401dabd6478c68e064fc18da07275d
+MD5 cf32a59224edd4b9b643f3f900db5dfa ChangeLog 12416
+RMD160 934b4e61236b097d63e14f6a032ff12b6d3d8678 ChangeLog 12416
+SHA256 6b5f105dced3fab77fdfe0be5883f58b69401dabd6478c68e064fc18da07275d ChangeLog 12416
 MISC metadata.xml 402 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 SHA1 2a45564353e8d0c2b9555294a6a269e56e0b6056 SHA256 c713a207afd5d65ef21d1c1e5fd3b867ce063dd9e46fc53db0734ad19f59ffe7
 MD5 aea374917adc11a2d42b0b9d1bba3598 metadata.xml 402
 RMD160 3d4e0e7953d95f43de89f62eacb37969caa29336 metadata.xml 402
@@ -51,10 +52,3 @@ SHA256 f15898a27c4a05cc51f2427f731936b431ab3628a07af4d39836d9b3291360ec files/di
 MD5 1bab88718439744f53d32f7d72c73616 files/digest-erlang-11.2.5 768
 RMD160 8083c995b3c8a3d87af4ffbeedfbb2c7848ca23d files/digest-erlang-11.2.5 768
 SHA256 ddcd6020ee9b5c4ec63c6532dde43970e1701b576a2c6662bd7177e2c971d3f4 files/digest-erlang-11.2.5 768
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFGnTkBKRy60XGEcJIRAnRKAKCKcuUEWZ6C7FiWKI6McJhu7Ms5tACgri4F
-Y47ydo9nmsyfZW4L1zyyyi8=
-=loYi
------END PGP SIGNATURE-----
diff --git a/dev-lang/erlang/erlang-11.2.5.ebuild b/dev-lang/erlang/erlang-11.2.5.ebuild
index 8be188d69672..f6043d826a76 100644
--- a/dev-lang/erlang/erlang-11.2.5.ebuild
+++ b/dev-lang/erlang/erlang-11.2.5.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/erlang/erlang-11.2.5.ebuild,v 1.4 2007/07/17 21:47:48 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-11.2.5.ebuild,v 1.5 2007/08/06 14:46:05 uberlord Exp $
 
 inherit elisp-common eutils flag-o-matic multilib versionator
 
@@ -25,7 +25,7 @@ SRC_URI="http://www.erlang.org/download/${MY_P}.tar.gz
 
 LICENSE="EPL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ppc ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="doc emacs hipe java kpoll odbc smp ssl tk"
 
 RDEPEND=">=dev-lang/perl-5.6.1
@@ -50,6 +50,8 @@ src_unpack() {
 
 	# needed for amd64
 	epatch "${FILESDIR}/${PN}-10.2.6-export-TARGET.patch"
+	# needed for FreeBSD
+	epatch "${FILESDIR}/${PN}-11.2.5-gethostbyname.patch"
 	use odbc || sed -i 's: odbc : :' lib/Makefile
 
 	if use hipe; then
diff --git a/dev-lang/erlang/files/erlang-11.2.5-gethostbyname.patch b/dev-lang/erlang/files/erlang-11.2.5-gethostbyname.patch
new file mode 100644
index 000000000000..8bef15046edc
--- /dev/null
+++ b/dev-lang/erlang/files/erlang-11.2.5-gethostbyname.patch
@@ -0,0 +1,20 @@
+diff -Naur otp_src_R11B-4.orig/lib/erl_interface/src/connect/ei_resolve.c otp_src_R11B-4/lib/erl_interface/src/connect/ei_resolve.c
+--- otp_src_R11B-4.orig/lib/erl_interface/src/connect/ei_resolve.c	2006-11-06 14:53:29 +0100
++++ otp_src_R11B-4/lib/erl_interface/src/connect/ei_resolve.c	2007-06-13 23:14:06 +0200
+@@ -44,6 +44,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
++#include <sys/param.h>
+ #endif 
+ 
+ /* common to all platforms */
+@@ -614,7 +615,7 @@
+ #ifndef HAVE_GETHOSTBYNAME_R
+   return my_gethostbyname_r(name,hostp,buffer,buflen,h_errnop);
+ #else
+-#ifdef __GLIBC__
++#if (defined(__GLIBC__) || (__FreeBSD_version >= 602000))
+   struct hostent *result;
+ 
+   gethostbyname_r(name, hostp, buffer, buflen, &result, h_errnop);