add a small patch to recognize freebsd chosts too, bug #316841

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

4 files changed, 25 insertions, 7 deletions

diff --git a/sys-libs/zlib/ChangeLog b/sys-libs/zlib/ChangeLog
index e39e92e9e8d3..cdd012c96e80 100644
--- a/sys-libs/zlib/ChangeLog
+++ b/sys-libs/zlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/zlib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.80 2010/04/29 17:49:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/ChangeLog,v 1.81 2010/05/01 11:02:10 aballier Exp $
+
+  01 May 2010; Alexis Ballier <aballier@gentoo.org> zlib-1.2.5-r2.ebuild,
+  +files/zlib-1.2.5-fbsd_chosts.patch:
+  add a small patch to recognize freebsd chosts too, bug #316841
 
 *zlib-1.2.5-r2 (29 Apr 2010)
 
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index be1127d663f6..c1aa68ce52ee 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -14,20 +14,21 @@ AUX zlib-1.2.4-LDFLAGS.patch 1352 RMD160 e7679bcc555d9a7257f762efc4f9c24279ee8f1
 AUX zlib-1.2.4-build.patch 493 RMD160 ddde6573caeff6ef99081737d930b5acb5499a8b SHA1 41bea630448dd0a837339c78ddcd94c1bb41d575 SHA256 8ac2727670ddb58cfb4d254b74df8879dd1c9195668138615f1f99fc87ad4501
 AUX zlib-1.2.4-configure-LANG.patch 1142 RMD160 566adf951015fe97e7ce5ff882c8057bd755dcb1 SHA1 ca05f1e512e8ac3985e6be236235c05771e51d7f SHA256 205e4066cdbf85d2455bb7a9220b6d8322e9fdb0dfee9c62750510d197650966
 AUX zlib-1.2.4-visibility-support.patch 1016 RMD160 27d1eee7281e0080c69c6ca04029bc59c0198880 SHA1 ff8e8351e1c7ac97522c523009e1800c5738537c SHA256 395080c33279993fcaf7f78d60a0460349b313d07d122ea8817419185fd08ad2
+AUX zlib-1.2.5-fbsd_chosts.patch 594 RMD160 888718c7fc9a7739d75c6e6eea131c5bfd6f74d0 SHA1 614624044468c3c0880e3899046bf4b6800611b8 SHA256 62316dc8c56e749bfa309bb54b0477e44d2cc8ed828f48506d784450e601f830
 AUX zlib-1.2.5-lfs-decls.patch 575 RMD160 7315510552d3ec059bbe2c29f127189933d8701f SHA1 ddf793bd7eb4c8a01ad5d6c31162ddd2629bcbd3 SHA256 51b252bcaa80283969f99b7d89901fd82334ba2cfd872344748dbf8368ef0037
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
 DIST zlib-1.2.4.tar.bz2 483564 RMD160 8f0f17e33e36fa1427f8186b6d12cf5b2240294a SHA1 8cf10521c1927daa5e12efc5e1725a0d70e579f3 SHA256 d0fc3433bb3ff5bbf1d2db57a328c0be39ac4a74d4b39887af522acf7ecd5ecc
 DIST zlib-1.2.5.tar.bz2 486374 RMD160 c6c4c2a2a205061b21487e69234106f5517b4b32 SHA1 543fa9abff0442edca308772d6cef85557677e02 SHA256 239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307
 EBUILD zlib-1.2.3-r1.ebuild 2109 RMD160 e37d947f42dfbfd8e453feadd13cadf562871c0c SHA1 a583a5a0dc76b1f21cf6bbe38fc25587a451bc3f SHA256 114218e25aeb4bbbe39759f05e5d7d626a96077f0da963dd8249984d726f8bde
 EBUILD zlib-1.2.4.ebuild 1683 RMD160 067dbd6e887aadb8402f7617439bbf0d17c41a69 SHA1 b6026ab98ba060aa39dcd677c7f06591106e5c9a SHA256 1f3d629779e2450a7230caaa3597654904e1c341218e428ff5a8b536739fb707
-EBUILD zlib-1.2.5-r2.ebuild 1482 RMD160 ef9a0ac94bff1a2c959fe3f90c68384603b3e792 SHA1 4196e3299b14f4abd3904e3c6a76a978bf3312ed SHA256 a7ae2e7e3fca145b9a188c6a0b3ed5068243f6297f29a9d589c5f4eb6b55d673
+EBUILD zlib-1.2.5-r2.ebuild 1541 RMD160 4bb5093642e3e7b6af0044b13ea3a907f8f38792 SHA1 9039b738286ae869da82b21ffe19c610fc9f0ea3 SHA256 0067c062aa4eef138a7b402a412b5bc1facfd9f34723c4e7fe4fb41889ab3d8a
 EBUILD zlib-1.2.5.ebuild 1417 RMD160 2e29976fd45df00f3e9baeea6e2889920ad51291 SHA1 9d8b2632fd361e4f1e48419feed8a07e58c2c27d SHA256 911f3f41415dac202c1819aea8b5cf21dcc7f91d4c573022f6aede9181e388ef
-MISC ChangeLog 11595 RMD160 2c82615daea9a23a017fb116c0b24cb9b2238232 SHA1 8f7ad9fb426f16d8dcd28d795b12a261fcdc16ef SHA256 ab5f2fef2c054eebf4baad49794d4043e0eb92a8a538f9b3828143467fe85885
+MISC ChangeLog 11773 RMD160 9b43cb58a08205946cb5b6ff2c3be0877cac71f7 SHA1 542421c592515a6a45a53d1847bbd78059ad8ab4 SHA256 98fb4cf1997fe86f98aa4e24889ea2f639267ddd3113d308eb796138319050e7
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvZxnUACgkQAiZjviIA2XjkZgCg9JcXkDLq2rByaKh8CSy8/L8g
-b1oAoJEJMVPUH4v/Z0gTqCEsK+l9IiqB
-=10E4
+iEYEARECAAYFAkvcCjgACgkQvFcC4BYPU0oOYQCfUaxTXpAnEbgxMZ2IeKIdVkZL
+TDIAnRwZKjTZku8jXxCeRqGlB/NGnfz1
+=7IFC
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch b/sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch
new file mode 100644
index 000000000000..9a37f7488bc5
--- /dev/null
+++ b/sys-libs/zlib/files/zlib-1.2.5-fbsd_chosts.patch
@@ -0,0 +1,11 @@
+--- zlib-1.2.5/configure.in	2010-05-01 12:45:30.000000000 +0200
++++ zlib-1.2.5/configure	2010-05-01 12:45:55.000000000 +0200
+@@ -118,7 +118,7 @@
+     uname=`(uname -s || echo unknown) 2>/dev/null`
+   fi
+   case "$uname" in
+-  Linux* | linux* | GNU | GNU/* | *BSD | DragonFly) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
++  Linux* | linux* | GNU | GNU/* | *BSD | DragonFly | freebsd* ) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
+   CYGWIN* | Cygwin* | cygwin* | OS/2*)
+         EXE='.exe' ;;
+   MINGW*|mingw*)
diff --git a/sys-libs/zlib/zlib-1.2.5-r2.ebuild b/sys-libs/zlib/zlib-1.2.5-r2.ebuild
index f42f8cb7a903..ccf962254c33 100644
--- a/sys-libs/zlib/zlib-1.2.5-r2.ebuild
+++ b/sys-libs/zlib/zlib-1.2.5-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/sys-libs/zlib/zlib-1.2.5-r2.ebuild,v 1.1 2010/04/29 17:49:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5-r2.ebuild,v 1.2 2010/05/01 11:02:10 aballier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -27,6 +27,8 @@ src_unpack() {
 
 	# bug #316377
 	epatch "${FILESDIR}"/${P}-lfs-decls.patch
+	# bug #316841
+	epatch "${FILESDIR}"/${P}-fbsd_chosts.patch
 }
 
 src_compile() {