Fix install_names on Darwin, working around tremendously broken waf-buildsystem, bug #374455, keyworded ~x64-macos

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

3 files changed, 45 insertions, 6 deletions

diff --git a/sys-libs/talloc/ChangeLog b/sys-libs/talloc/ChangeLog
index 8870a99ef5bd..7aa81c506286 100644
--- a/sys-libs/talloc/ChangeLog
+++ b/sys-libs/talloc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/talloc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.26 2011/08/17 16:50:59 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/ChangeLog,v 1.27 2011/08/27 10:28:35 grobian Exp $
+
+  27 Aug 2011; Fabian Groffen <grobian@gentoo.org> talloc-2.0.5.ebuild:
+  Fix install_names on Darwin, working around tremendously broken
+  waf-buildsystem, bug #374455, keyworded ~x64-macos
 
   17 Aug 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   talloc-2.0.5.ebuild:
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index 355ee111c8d8..2e883a2e8347 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX talloc-2.0.0-without-doc.patch 556 RMD160 1eabff0f27530719c46e88bdae7934bbdbcd7884 SHA1 dfafebbf8d2196525333dbf3df03d948b82b9845 SHA256 536ebde695f0a403354ce3e75e83ca551ba37e849cb7a4d3d2f4e256dba98639
 AUX talloc-2.0.1-respect-ldflags.patch 492 RMD160 1233d53b869dd82beec873d191420962508bb3db SHA1 88d7c569a0525683476f664cdcc23cd201daed5e SHA256 1132281334d1a888c934811f27b818d706b1a5e73133bbd5a9e5fa99a7cec89d
 DIST talloc-1.3.0.tar.gz 229969 RMD160 770c3c1f7c0e3f08d3b5906454b9d32dd90f0f2e SHA1 58aff3b238bc0125017b4096ecb7c56a5057e6e4 SHA256 80e5d639496e1aac0838a5ae98c883dda9233c235bf51acb9f436776c7dcf824
@@ -11,6 +14,13 @@ EBUILD talloc-2.0.0-r1.ebuild 1233 RMD160 9f5d47a66e60903d2d5a04a3616240f732a38c
 EBUILD talloc-2.0.0.ebuild 1196 RMD160 459d3e3bce4863cb54843f7defd3cc7cd6cda841 SHA1 0747c77d2d180f2ed193f75a2eaf3c0f212a912d SHA256 d3b23afefe8f5f50f20a117c7c77e8c736c31e66e94552bcc7b8c16ed0b1fce0
 EBUILD talloc-2.0.1-r1.ebuild 1532 RMD160 8ee7135601964612f60334c00c0a551fff860419 SHA1 376884f5e7dd472151c37276b0d402983ccc3da9 SHA256 21b7321c14abc15320b98e9f4eb6562ed1a887926e288560426753b35d423107
 EBUILD talloc-2.0.1.ebuild 1235 RMD160 c541820a899452fb09f6cc9ca4c7f0f22abb7fd3 SHA1 4452a09e7ef669ec996280178190481a839982c7 SHA256 ceaf0d529aef94ec4139d47aee73f7b620a423f4ffe3f4a1f50458aca8d5ca0f
-EBUILD talloc-2.0.5.ebuild 1054 RMD160 8b77cc46546fc8b4ca9323bf3748a5e9f8f9cdd8 SHA1 47e70b2035505b107f518a7868c971cfe107644a SHA256 797bcc9ee5c429c9422dec9637f4af8a9563039df6f9058440d096d6ab714bf2
-MISC ChangeLog 3972 RMD160 928644f52cf4fd6fcd75d7cf65d356d6b45f044b SHA1 adcaee91e9c0dd4bda9eebe413a7a1ee727bc127 SHA256 47c363d9e7592b79454feb607a0ce97bed948ed6a90e3f8c6be8ab11960e0c64
+EBUILD talloc-2.0.5.ebuild 1995 RMD160 dc9ddc4e48b98152cbbf97e6b397b4c4dfc07807 SHA1 82f65363d3e7460a208c0b3689a7dbf6e56b49fd SHA256 84fa1d3e565ab8a6f9ee53682b3873483b988e44279201658b5fc7d2fde16043
+MISC ChangeLog 4163 RMD160 bcc49d28e248a2a874da2d870b956d6c21c3445d SHA1 95784640d022bc56cfefd44a4a4e2a7500113b6b SHA256 f80dc4c206b26250e6de6e98175e40c9034bc3230974524966283edf7f902c40
 MISC metadata.xml 412 RMD160 bc4ce1becbf6d6dbf2eef283f818d97e6d8ff4cd SHA1 9535124e040cf03a385425627b3622c06d97bf06 SHA256 732d4c39c6e7ddd2d4768724ae637ebadb6abff069fd3cf16d41778cf9f9c9dc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (Darwin)
+
+iEYEARECAAYFAk5YxtgACgkQX3X2B8XHTokkSgCfVO2pWniPa6ta2ElSyc5sutqV
+aSUAn3FxrCqmLR6sxswkY9CW8UbdoxoJ
+=sMlH
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/talloc/talloc-2.0.5.ebuild b/sys-libs/talloc/talloc-2.0.5.ebuild
index a4d9ac7a1420..6ee6326e8f14 100644
--- a/sys-libs/talloc/talloc-2.0.5.ebuild
+++ b/sys-libs/talloc/talloc-2.0.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.5.ebuild,v 1.8 2011/08/17 16:50:59 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/talloc/talloc-2.0.5.ebuild,v 1.9 2011/08/27 10:28:35 grobian Exp $
 
 EAPI=3
 PYTHON_DEPEND="python? 2:2.6"
-inherit waf-utils python
+inherit waf-utils python multilib
 
 DESCRIPTION="Samba talloc library"
 HOMEPAGE="http://talloc.samba.org/"
@@ -12,7 +12,7 @@ SRC_URI="http://samba.org/ftp/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
 IUSE="compat python"
 
 RDEPEND="!!<sys-libs/talloc-2.0.5"
@@ -35,3 +35,28 @@ src_configure() {
 	waf-utils_src_configure \
 		${extra_opts}
 }
+
+src_install() {
+	waf-utils_src_install
+
+	# waf is stupid, and no, we can't fix the build-system, since it's provided
+	# as a brilliant binary blob thats decompressed on the fly
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+			"${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
+		if use python ; then
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+			install_name_tool \
+				-change "${S}/bin/default/libtalloc.dylib" \
+					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+			install_name_tool \
+				-change "${S}/bin/default/libtalloc.dylib" \
+					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"$(python_get_sitedir)/talloc.bundle || die
+	   fi
+	fi
+}