Fixed compilation on Darwin, bug #406147

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

4 files changed, 38 insertions, 6 deletions

diff --git a/dev-tcltk/expect/ChangeLog b/dev-tcltk/expect/ChangeLog
index ef0894355d6c..54b31cf8f21e 100644
--- a/dev-tcltk/expect/ChangeLog
+++ b/dev-tcltk/expect/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/expect
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.88 2012/03/01 04:34:56 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/ChangeLog,v 1.89 2012/03/01 19:53:23 grobian Exp $
+
+  01 Mar 2012; Fabian Groffen <grobian@gentoo.org>
+  +files/expect-5.45-darwin-install_name.patch, expect-5.45.ebuild:
+  Fixed compilation on Darwin, bug #406147
 
   01 Mar 2012; Jeremy Olexa <darkside@gentoo.org>
   +files/expect-5.43.0-darwin.patch:
diff --git a/dev-tcltk/expect/Manifest b/dev-tcltk/expect/Manifest
index 2fae9f059615..c041c915fd75 100644
--- a/dev-tcltk/expect/Manifest
+++ b/dev-tcltk/expect/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX expect-5.39.0-libdir.patch 480 RMD160 e58373778379907bf68ce6e61acce5dad4852421 SHA1 f438e6899688f0b3d5bdb854246483ec29848c9a SHA256 971ac5bd88e393d1029ab248c1071529337baf0b50445c53e35f49fdb7c6365a
 AUX expect-5.43.0-avoid-tcl-internals-1.patch 3376 RMD160 2a99f4496dbbb7b1575189fe284e847851b4bedf SHA1 e85341cfd075dc27c9f79c86ac6c035e82203a15 SHA256 2dbfcf569e766d6e5d2b6bc83a7556c0cb189a7da334e07b7201bb0b764fb610
 AUX expect-5.43.0-darwin.patch 476 RMD160 c7606d7879ee1d15b81622481bb8fc7a1c51819b SHA1 56bed7a13ff8b8fa10eb78b9dd0b61efb0c2f7f3 SHA256 d2e32a49f770189b2ceb5245cdd0b5a326ff8ed776cb172618fe8dc2fde53605
@@ -8,6 +11,7 @@ AUX expect-5.44.1.15-gfbsd.patch 659 RMD160 cf566cacac006231459cb13ae4ec53d36253
 AUX expect-5.44.1.15-headers.patch 1879 RMD160 e30840ddc1c84dbcd33c7b353cd1eddd64ee9aae SHA1 173f4a05795a7c6cdc3003423411172c22925382 SHA256 98f6b9607679b81da4d80b00e73c0f4550bfa8ba2c516e109092c42ff705696b
 AUX expect-5.44.1.15-ldflags.patch 360 RMD160 07385db6345811c5f43316e508ea6e2677662197 SHA1 366ecf4a44558819fac92a6f7800961997d060d5 SHA256 2e9d3a614edc020044480ba78802696880be638f5b5dcb0fff02c632e0e738d2
 AUX expect-5.44.1.15_with-tk-no.patch 3471 RMD160 704da66e65df54f66567c62f7e98efea39a21737 SHA1 571d894e59267cd812d727ad3b6f5a4c7b4b98ab SHA256 41e889fc40d1a501285fe0acb1324d8be016654ee92b2a9dcdfe7bd2f3df06a0
+AUX expect-5.45-darwin-install_name.patch 727 RMD160 6f65769f961279052b1e0611e10109d05538dafd SHA1 3790666cf79a9406acbe2dd8bc5dacd6d9f23091 SHA256 40673730c4c47fa9a8284e6d0ebbcda4b2df891bf47668f3a31f923f70ca2ba6
 AUX expect-5.45-gfbsd.patch 996 RMD160 60f815e87f71f92377796cae0f4231ede52377f6 SHA1 9717b5fe55eae6668eba7066a5de4ec5eaca4baa SHA256 5126942c16a7186e7d68b47db80949696f4d53c5fe1c643a68d0f3cd5f939dca
 AUX expect-5.45-headers.patch 2280 RMD160 b06277497f8a8d3572b9da3af1808f1fcbb61d02 SHA1 ec345dc7091a4c57db18e02ecc26588ddfc41868 SHA256 a1c49b2491b0d8d5650afa938521e36e4738a2d486ca1b95df05b084113c493f
 AUX expect.m4 20468 RMD160 b06e075db9afed2b0a59d9b5721f874d74acdef5 SHA1 14d4cfc26131f8231af0bfa126722b123573aac4 SHA256 6b60f18a68792050c1cb8745508fd1595eb2789fd780195af0492e344d00faca
@@ -17,6 +21,13 @@ DIST expect5.45.tar.gz 628808 RMD160 edffe881ee45abe6e9aa150ea5958a04d0ffeab0 SH
 EBUILD expect-5.43.0-r1.ebuild 3820 RMD160 49a753c043884ebebe8018b964de122f111f7d78 SHA1 8bd6235c2e20d34664973bc4aec95f567f8d29c7 SHA256 de5dcecfa85e53ae9166711673bfba1bf308439b523e49faf7baae279fe1f25a
 EBUILD expect-5.43.0.ebuild 3539 RMD160 9b361ac2065c322c017271b7931c4c809bdcd9db SHA1 5d8a4211466e0d49d777afb1e11a5f305787788f SHA256 b68fcde292800697bb761562efc4682ac6fa8c77b6a807f639bbf404a9d3bac9
 EBUILD expect-5.44.1.15.ebuild 3146 RMD160 b4c0380663533d09c7562b1db18d01d195c536a5 SHA1 460d1cb9aff832d49a429c50694d4890a0151562 SHA256 f3529bcd30ce6c352499c4f80ca8aa807c22b45a7553382059dc873fbb38f962
-EBUILD expect-5.45.ebuild 2234 RMD160 0954c29dfcdf669b4bc89fa787da7f59f983df30 SHA1 a202e76ff923077fbe81cae8d79ea0d1085b56d5 SHA256 711c8007a7fe4f06fb0b5311fbf4f420d0128380c56e831065aec33e8e4b6950
-MISC ChangeLog 12751 RMD160 6826e5c84c3ddb85681e2d294ed6477c1f8504fb SHA1 b11aeeca9c40f5e86f4eea092ba2e1fc9a52fcfd SHA256 1abbe19f7eaa64f4d1b237470418a5397435494b120270593395971dc9d62527
+EBUILD expect-5.45.ebuild 2367 RMD160 ed09abd1168038bf82dd14a1ff30ce472cc8c1b5 SHA1 860afc15c9808ad9c34d2d95309a14b5342ad359 SHA256 84f4b04bf2cbbe418991a4c6cee291f55ab23198568e754d130142b051b18cc3
+MISC ChangeLog 12913 RMD160 9bb2ac1230ed649e9de07104f4b35aceeb2947dc SHA1 9d20990d617ab722be976585a474cfcbc9d272f1 SHA256 53763703c27381a084913cfc3ae0f8bbacffa03070f81b1a8b3049dfafe7c9a6
 MISC metadata.xml 159 RMD160 0b3f1c7d1bf45f7283ab23b3d8fa0a02c688a044 SHA1 0446a3db32f76d33bf9f76b5229b2fd9900d08c6 SHA256 fe5eea9a276e11191a0c8e266e6dc128c3dd73347bb01020814acb0863316029
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (Darwin)
+
+iEYEARECAAYFAk9P07gACgkQX3X2B8XHToljVgCdG3ySgnP3ICOgeCrtAQBO2dSn
+1r8AmQHCT9zIaMMSPh9LQG+SwROK3fbe
+=PpoG
+-----END PGP SIGNATURE-----
diff --git a/dev-tcltk/expect/expect-5.45.ebuild b/dev-tcltk/expect/expect-5.45.ebuild
index 3dddb76bdb58..6fa64924c562 100644
--- a/dev-tcltk/expect/expect-5.45.ebuild
+++ b/dev-tcltk/expect/expect-5.45.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.45.ebuild,v 1.2 2011/12/27 08:16:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/expect/expect-5.45.ebuild,v 1.3 2012/03/01 19:53:23 grobian Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug doc threads"
 
 # We need dejagnu for src_test, but dejagnu needs expect
@@ -37,6 +37,10 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.45-headers.patch #337943
 	sed -i 's:ifdef HAVE_SYS_WAIT_H:ifndef NO_SYS_WAIT_H:' *.c
 
+	# fix install_name on darwin
+	[[ ${CHOST} == *-darwin* ]] && \
+		epatch "${FILESDIR}"/${P}-darwin-install_name.patch
+
 	eautoconf
 }
 
diff --git a/dev-tcltk/expect/files/expect-5.45-darwin-install_name.patch b/dev-tcltk/expect/files/expect-5.45-darwin-install_name.patch
new file mode 100644
index 000000000000..f5470aadb88e
--- /dev/null
+++ b/dev-tcltk/expect/files/expect-5.45-darwin-install_name.patch
@@ -0,0 +1,13 @@
+Add install_name (soname)
+
+--- tclconfig/tcl.m4
++++ tclconfig/tcl.m4
+@@ -1703,7 +1703,7 @@
+ 	    ])
+ 	    # TEA specific: link shlib with current and compatiblity version flags
+ 	    vers=`echo ${PACKAGE_VERSION} | sed -e 's/^\([[0-9]]\{1,5\}\)\(\(\.[[0-9]]\{1,3\}\)\{0,2\}\).*$/\1\2/p' -e d`
+-	    SHLIB_LD="${SHLIB_LD} -current_version ${vers:-0} -compatibility_version ${vers:-0}"
++	    SHLIB_LD="${SHLIB_LD} -install_name \$(pkglibdir)/\$(PKG_LIB_FILE) -current_version ${vers:-0} -compatibility_version ${vers:-0}"
+ 	    SHLIB_SUFFIX=".dylib"
+ 	    # Don't use -prebind when building for Mac OS X 10.4 or later only:
+ 	    AS_IF([test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int([$]2)}'`" -lt 4 -a \