Add initial support for ~amd64-fbsd (aka multilib)

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

3 files changed, 26 insertions, 21 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 160f231f3af8..ec660c84731e 100644
--- a/sys-freebsd/freebsd-lib/ChangeLog
+++ b/sys-freebsd/freebsd-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-lib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.66 2009/02/23 03:11:54 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.67 2009/03/11 18:44:35 drizzt Exp $
+
+  11 Mar 2009; Timothy Redaelli <drizzt@gentoo.org>
+  freebsd-lib-7.1-r2.ebuild:
+  Add initial support for ~amd64-fbsd (aka multilib)
 
   23 Feb 2009; Javier Villavicencio <the_paya@gentoo.org>
   freebsd-lib-7.1-r2.ebuild:
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index f67726f41670..4e72631838bc 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -38,14 +38,14 @@ DIST freebsd-usbin-6.2.tar.bz2 2695872 RMD160 ea6104fcfbf6c0be511a80d0475e5a8f71
 DIST freebsd-usbin-7.1.tar.bz2 2584691 RMD160 cf6adf2f1cc60e667417f647cb99bbc3107c85f6 SHA1 7120dd7e7abed78954889ad4e18e5f8775411621 SHA256 e14cd80187a161153ea5eb6e5441171bf1ca1a8b8e8bdeea7306187c77c52af8
 EBUILD freebsd-lib-6.2-r4.ebuild 9534 RMD160 70d7d2e65c8aa287a0c34ef4bf2be11c2c6d3a6b SHA1 cac825220b60e07e82c509894a7c1de60b591810 SHA256 1da8e2e12b023bf035ddca90222b842b867fb51b0d5c509ed7e7e6654bd8ec1e
 EBUILD freebsd-lib-7.1-r1.ebuild 11547 RMD160 06c4fc87804cff8258afa8a0665d880c3101ad78 SHA1 2f32c62eaabd3bff6e3dcca0d402993a747e16e9 SHA256 ecddf1da2b0633899159bf6b1447ad5bb13b8d4ae2e652bda8b6922f14b7d45a
-EBUILD freebsd-lib-7.1-r2.ebuild 11688 RMD160 a97be2d1fd8f3793b96604a5a0ffa5ff3783d3f7 SHA1 8be285e3f6dccf752ffc9bdfe85dd85e0bb3170c SHA256 ac1ae689f889f90b0b0e0ecf71585d0f8b9174f0aec85af1a39c401a45ec046e
+EBUILD freebsd-lib-7.1-r2.ebuild 11890 RMD160 3043dc4794eacf547a5229dda41e8c6898757b8d SHA1 54a88335496d0e07e5eeef614085be6a9d2609ff SHA256 5588a773915054dd27459107fe9099d9800779fc52685e8ab51717f65ecf0c29
 EBUILD freebsd-lib-7.1.ebuild 11397 RMD160 aebc0adb9b15756bad30f735c5be9387269b0588 SHA1 38f899896b420ee2c519e6afde6f2ec0ec8f4ec2 SHA256 7e5e7933ae52a1ebf7e58dce7cf8ea4b7b9671f9b27e78131e0152d466c64b90
-MISC ChangeLog 17083 RMD160 c6dc7af2b91beb034d2b6e0c505eafeb11601df4 SHA1 1f9bd7b4ad06fbf972bddf576be813554c4e0909 SHA256 1169c22ba58010c22ad860b79dc34cc9aeb7d4018ac59661646c547542442b04
+MISC ChangeLog 17216 RMD160 63507b9317a282c861588ba4ad8b0bc69b25fc49 SHA1 943e3aaac21b85309f4ace605ac23a586c97b9a4 SHA256 9164df2f3910eebda67cce3b5cceeeb25fb095969d3169ac9ac0655ecd60b2ed
 MISC metadata.xml 308 RMD160 5221096ed0702ea4d028ec3d50563f26efb3a5d1 SHA1 b9a5499213f716b87953f225ba9d135cd6d51938 SHA256 740a533b21eefc9b8cd133e22b82e25a24415aafb53d78c4c5fa3d696fa099cf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (FreeBSD)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkmiFA0ACgkQoAP6MIsfg8K+zACgg921uclcBPFPhg5zY8jQFCnF
-LvQAn29so/aEkn3QPp9nRRZ5qX8SX4rF
-=gKts
+iEYEARECAAYFAkm4BpwACgkQl4DfQEcjpw3yHwCfVEOXrX/3oiQAnXndkUsDwYoo
+njEAn3Nbhknl2I6kQXrAXaa5+gR6s/PA
+=awFg
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild
index 7eac4a0634a0..29a2bd0410ef 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild,v 1.2 2009/02/23 03:11:54 the_paya Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-7.1-r2.ebuild,v 1.3 2009/03/11 18:44:35 drizzt Exp $
 
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
+inherit bsdmk freebsd flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="FreeBSD's base system libraries"
 SLOT="7.0"
@@ -261,7 +261,8 @@ src_install() {
 		dosym "usr/include" "/usr/${CTARGET}/sys-include"
 	else
 		cd "${S}"
-		mkinstall || die "Install failed"
+		# Set SHLIBDIR and LIBDIR for multilib
+		SHLIBDIR="/$(get_libdir)" LIBDIR="/usr/$(get_libdir)" mkinstall || die "Install failed"
 	fi
 
 	# Don't install the rest of the configuration files if crosscompiling
@@ -274,21 +275,21 @@ src_install() {
 
 	# Add symlinks (-> libthr) for legacy threading libraries, since these are
 	# not built by us (they are disabled in FreeBSD-7 anyway).
-	dosym libthr.a /usr/lib/libpthread.a
-	dosym libthr.so /usr/lib/libpthread.so
-	dosym libthr.a /usr/lib/libc_r.a
-	dosym libthr.so /usr/lib/libc_r.so
+	dosym libthr.a /usr/$(get_libdir)/libpthread.a
+	dosym libthr.so /usr/$(get_libdir)/libpthread.so
+	dosym libthr.a /usr/$(get_libdir)/libc_r.a
+	dosym libthr.so /usr/$(get_libdir)/libc_r.so
 
 	# Add symlink (-> libthr) so previously built binaries still work.
-	dosym libthr.so.3 /lib/libpthread.so.2
-	dosym libthr.so.3 /lib/libc_r.so.6
+	dosym libthr.so.3 /$(get_libdir)/libpthread.so.2
+	dosym libthr.so.3 /$(get_libdir)/libc_r.so.6
 
 	# Compatibility symlinks to run FreeBSD 5.x binaries (ABI is mostly
 	# identical, remove when problems will actually happen)
-	dosym /lib/libc.so.7 /usr/lib/libc.so.6
-	dosym /lib/libc.so.6 /usr/lib/libc.so.5
-	dosym /lib/libm.so.4 /usr/lib/libm.so.3
-	dosym /lib/libm.so.5 /usr/lib/libm.so.4
+	dosym /lib/libc.so.7 /usr/$(get_libdir)/libc.so.6
+	dosym /lib/libc.so.6 /usr/$(get_libdir)/libc.so.5
+	dosym /lib/libm.so.4 /usr/$(get_libdir)/libm.so.3
+	dosym /lib/libm.so.5 /usr/$(get_libdir)/libm.so.4
 
 	# install libstand files
 	dodir /usr/include/libstand
@@ -307,7 +308,6 @@ src_install() {
 	fi
 	doins "etc.${MACHINE}"/*
 
-	dodir /etc/sandbox.d
 
 	# Generate ldscripts, otherwise bad thigs are supposed to happen
 	gen_usr_ldscript libalias_cuseeme.so libalias_dummy.so libalias_ftp.so \
@@ -319,6 +319,7 @@ src_install() {
 	#	libipsec.so libipx.so libkiconv.so libkvm.so libmd.so libsbuf.so libufs.so \
 	#	libutil.so
 
+	dodir /etc/sandbox.d
 	cat - > "${D}"/etc/sandbox.d/00freebsd <<EOF
 # /dev/crypto is used mostly by OpenSSL on *BSD platforms
 # leave it available as packages might use OpenSSL commands