Apply patch to add library search path. #409693; Install library proper place according to requesting binaries' (such as /sbin/zfs) path.

Package-Manager: portage-2.2.0_alpha93/cvs/Linux x86_64

3 files changed, 46 insertions, 15 deletions

diff --git a/sys-freebsd/freebsd-cddl/ChangeLog b/sys-freebsd/freebsd-cddl/ChangeLog
index 37a4f7ede26b..256a50ca85e6 100644
--- a/sys-freebsd/freebsd-cddl/ChangeLog
+++ b/sys-freebsd/freebsd-cddl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-cddl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.16 2012/01/16 16:37:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.17 2012/03/30 09:14:43 naota Exp $
+
+  30 Mar 2012; Naohiro Aota <naota@gentoo.org> freebsd-cddl-9.0.ebuild:
+  Apply patch to add library search path. #409693; Install library proper place
+  according to requesting binaries' (such as /sbin/zfs) path.
 
 *freebsd-cddl-9.0 (16 Jan 2012)
 
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index d90885c48291..5586f4334f18 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX freebsd-cddl-7.1-libpaths.patch 3739 RMD160 93f97c9d820bc875954ab2b18268a7cc4f107a4a SHA1 ca17300a24df00cafcc4e990dd7727375a2992f5 SHA256 f07e90c67926b5ff1af3b1839797fd95f7eeecb7ec5cd938bb3eaf598de05287
 AUX freebsd-cddl-7.1-xdr_header.patch 380 RMD160 84ca8934581eb1e7728b690edbf0609ac5862265 SHA1 e107524735127ee5b290c64aab786e743e583134 SHA256 cb9d14f3770866c3d07d9aa09067428f0f1de432a7ac60567f57089a43704762
@@ -60,16 +60,26 @@ DIST freebsd-ubin-9.0_rc3.tar.bz2 1964021 RMD160 e1f856523f65fc1c9e095cc718b81f7
 EBUILD freebsd-cddl-7.2.ebuild 1415 RMD160 5a5ba653593bc52117d844ef2e7504596e59b0fe SHA1 17fb158ba99fdbcde89f36317a1f5dadef0a4cb7 SHA256 524ebbfa57f1cbcc9a282e05b2bad47a48b7277e4a3dac30388cd43fd681466f
 EBUILD freebsd-cddl-8.0.ebuild 1290 RMD160 32123bd1521f5e43c12157e7374e13062963ddb6 SHA1 6ea0927b177f036e5dbfe6f2272640b58e17b9e1 SHA256 fcc3d6777c67c418d05327d3c92bb012fe40cb0eb250cbc715a4825c1bc41019
 EBUILD freebsd-cddl-8.2.ebuild 1329 RMD160 921799a17c6c74321b2f59d53d99118d4e72a0e0 SHA1 df896573ae32cd1156c2cf5c715faf8ac4df4e5f SHA256 7d5b351f8fbc327746d7871355e93d4b2ea63dba7a2a6c9748c1dc829eafb060
-EBUILD freebsd-cddl-9.0.ebuild 1409 RMD160 8282474da9417ad8f2e3492d62e9f87ac738dfc9 SHA1 1b8b14b25ae8bec1e51f630ce0f7ba673d60365d SHA256 560c60183f5dda1007a9f27951746255723752f6de826770dc1a6b79a77c25fd
+EBUILD freebsd-cddl-9.0.ebuild 1976 RMD160 7c89682028a3697d8ef4f20286a0a9a9994904e3 SHA1 5478a7a4ececf9293ba58a855b45b1ea08ecf977 SHA256 08111a8328591a486d41b5b91343e27234be7f744a702854244f305606154f37
 EBUILD freebsd-cddl-9.0_rc1.ebuild 1413 RMD160 33bb7b25270260415541c1bd73353e7e956a8e3d SHA1 39e3f389b22c3f13144ad002933c6a4d3753455c SHA256 e276686a92c613cce268133111d5ee1f9aac5fcff22477d87fe9dd05f8f6bc8d
 EBUILD freebsd-cddl-9.0_rc2.ebuild 1413 RMD160 0014dc984872a2c15f4a671fdc0d8c89d98139ac SHA1 5750acb706a89d2e4e5b3989551c6a69c7c5aa5b SHA256 bc13231303123066d73607d0df1e74b35b613cff41f635bda14da1fb2ad8a095
 EBUILD freebsd-cddl-9.0_rc3.ebuild 1413 RMD160 13e06fff4d7f62a846f1d939cdce5b703b5f4172 SHA1 bee51f4c31fffbac6a64608049187fea6e4c0e53 SHA256 f948ed4fb4afaaf3dcf367e5c3cfe2c2b98bed7b26c227b758735dc6aacf8280
-MISC ChangeLog 2638 RMD160 ecbc3bd700c4be6e9dfda291c64513b88fcb0278 SHA1 3c2087ce6528ba0fcbece56e22af901bf188598e SHA256 69672e58c759de77d40316643ec4bbd8d0b7144f3e782dfce35fd9d6d135973a
+MISC ChangeLog 2850 RMD160 3db28274553fdd48c70fdec6214fcd23b03764dc SHA1 2d177001ae527e5ceac98c125cb50d7df4296dca SHA256 ecf610c22946a2cddcf1cb9abfb410c1dc415ae4a2d4a0c413e7daa53af195c4
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8UUjsACgkQvFcC4BYPU0q7gACfZaXvnpURIfXXT5pBvoTDUJYu
-7MEAoMHbKWxSEgQEvwKrtiWKStcFG7vk
-=958M
+iQIcBAEBCAAGBQJPdXmIAAoJEDYO1FT4VRUUKr8P/j4iPh0VN2Syxnk4ifeTYyjv
+sGlFr3FEe0ZKhj/fcRiScSyfaktP8uSmBdQjCrHMjb39difQqvEyUpPLx2uMrEjI
+hI5CjnHqlmpv7b0Di8jDZ5O6DvkjY/8z881PWXbqVLR7DZanEYMh0DqMWPpRVmAq
+JX69sFP4ZT5CaklAxEGXJ46+eWotGefTYY1IA6lNCeCCS7T0TmmypNcgjDebNTak
+IBABIMAGth6e2IIVU/FbOFyzcnaYbhgFl3iO8xYkV26+Efbjo/el4OaJq7XO54f+
+GLFraClP75Dq/bP8PO7HQKjVEC1CLrI0OOs1M5o2hZ9kCQFqdkaFrLxdN1zOOgVo
+IPG53Ghdj5HBuQ9r4/bKU50gy0yllpxN91sekNue5ZvZbkeV7QTJfm564W4KYAKl
+FCal4varEuPMU1g0f8+IQTqty1hgCMMKXKGEUwxYfypIDjxCuGBZdOK0a4ZZ/Zxr
+w9SdU22l5pxGuMEjYRMp2oKSMx1Jt0sI526jMiwnvnPauNnRilh2f/QHvpzMszgZ
+8md74wE4Z/deXNsznLKl5N5d/DCn0FFSAh9Ie8L9GMveSKao/uSPtzG8Je83hNLh
+2scnh6StM4qOsjXpoWLWTzOqizxAXhiKFmyQ+4XmOBERMgkhGbMjY8Wzz6qAZibX
+QZfTA6yc3AGBinA1iFzE
+=8sPs
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
index 7da41e53976c..01154b3ddd37 100644
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v 1.1 2012/01/16 16:37:08 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v 1.2 2012/03/30 09:14:43 naota Exp $
 
-inherit bsdmk freebsd flag-o-matic eutils
+EAPI=4
+
+inherit bsdmk freebsd toolchain-funcs multilib
 
 DESCRIPTION="FreeBSD CDDL (opensolaris/zfs) extra software"
 SLOT="0"
@@ -34,20 +36,35 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/cddl"
 
 PATCHES=( "${FILESDIR}/${PN}-9.0-bsdxml.patch"
-	"${FILESDIR}/${PN}-9.0-underlink.patch" )
+	"${FILESDIR}/${PN}-9.0-underlink.patch"
+	"${FILESDIR}/${PN}-8.2-libpaths.patch" )
 
 src_unpack() {
 	freebsd_src_unpack
 	# Link in include headers.
 	ln -s "/usr/include" "${WORKDIR}/include" || die "Symlinking /usr/include.."
-	# Force linking to new libraries
-	for i in "${S}/lib/"lib* ; do
-		append-ldflags " -L${i}"
-	done
 }
 
 src_install() {
-	freebsd_src_install
+	# Install libraries proper place
+	local mylibdir=$(get_libdir)
+	for d in libavl libctf libdtrace; do
+		cd "${S}"/lib/$d
+		mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
+	done
+	for d in libnvpair libumem libuutil libzfs libzpool;do
+		cd "${S}"/lib/$d
+		mkinstall SHLIBDIR="/${mylibdir}" LIBDIR="/${mylibdir}" || die
+	done
+	for d in lib/drti sbin usr.bin usr.sbin; do
+		cd "${S}"/$d
+		mkinstall || die
+	done
+	mv "${ED}"/${mylibdir}/lib{nvpair,umem,uutil,zfs}{,_p}.a \
+		"${ED}"/${mylibdir}/libzpool.a \
+		"${ED}"/usr/${mylibdir} || die
+	gen_usr_ldscript libnvpair.so libumem.so libuutil.so libzfs.so libzpool.so
 	# Install zfs volinit script.
+
 	newinitd "${FILESDIR}"/zvol.initd zvol
 }