fix installation, bug #414879 and simplify ebuild

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

3 files changed, 15 insertions, 35 deletions

diff --git a/sys-freebsd/freebsd-cddl/ChangeLog b/sys-freebsd/freebsd-cddl/ChangeLog
index 73634cddcd12..ab2691acce4f 100644
--- a/sys-freebsd/freebsd-cddl/ChangeLog
+++ b/sys-freebsd/freebsd-cddl/ChangeLog
@@ -1,6 +1,9 @@
 # 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.21 2012/05/12 07:57:13 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/ChangeLog,v 1.22 2012/05/12 14:59:29 aballier Exp $
+
+  12 May 2012; Alexis Ballier <aballier@gentoo.org> freebsd-cddl-9.0.ebuild:
+  fix installation, bug #414879 and simplify ebuild
 
   12 May 2012; Naohiro Aota <naota@gentoo.org> +files/zvol.initd-9.0,
   freebsd-cddl-9.0.ebuild:
diff --git a/sys-freebsd/freebsd-cddl/Manifest b/sys-freebsd/freebsd-cddl/Manifest
index 5c2534e6a0bc..fba68c7429a4 100644
--- a/sys-freebsd/freebsd-cddl/Manifest
+++ b/sys-freebsd/freebsd-cddl/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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
@@ -41,23 +41,13 @@ DIST freebsd-ubin-9.0.tar.bz2 1962957 RMD160 0e01edf7896057b95ee2630ab1472329009
 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 1992 RMD160 d713da7eff39332321f87dbf18def457448d429d SHA1 4c3e94aafcdecf31a9e59d2d6f354d5fc0af1c18 SHA256 109cc13e8c69d737d6147a9b5ed6dd0a04603ae3771e80e569d8b5bf5dcc0bc3
-MISC ChangeLog 3438 RMD160 91f1186e8efc31e5eeb999af0cd5ee552807e731 SHA1 feda7aa851d4dc4d841d30c5ca6b65c67f44444c SHA256 c021bbf538600203b77f7193efacb02a0f4f3904fd64f8e7923c2a71b54d36f7
+EBUILD freebsd-cddl-9.0.ebuild 1546 RMD160 176b92755386ba60b4e309e77980490fd7a0a644 SHA1 38f019cd63d3d2857d74b5d90018885b49908c1b SHA256 e59bcd76b8296679de06b65235bd8442db1f57d1580cfdfaa86be4261f183bc0
+MISC ChangeLog 3571 RMD160 ac679d1318a6e6f0d2f176d7dfe435f29f741c06 SHA1 8697869105454e9e6bbf8e88dd57833622df61db SHA256 52001596ac62dc32f25c3b512c137d91850884e937014ace35806a4dfc8f46fc
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPrhfMAAoJEDYO1FT4VRUUob4P/0MXTCpv70JzjuFj538o81C6
-03EIV6/aGh2o8F0izo/r7jF5mRxq9Z3IuSVQBhuR2RjAbGZLlEF70rWbwn0hv3bt
-jpYVySJFQb5Bj4ZpHHOSUlonZr+iXsSznTd5BZieFC4+/rXtTWAnHN5EmvIcNt9m
-Bq1StCdi0SNWP6ZsQK6aNcHP1eRC5EzcCyw9AvGX6aevMBElsZcvnGDD5Z7Y5xXn
-9bzGs6hEbPgDc/+5BL0T6R4dtj+b0f1/uk/ra/EiWk3KgmIfVcyT7Ex6zxBomnBA
-vqn3ma18G7SHmaJvlDqPARDXmCCk5bPdzffjoL+gRqZdCGO0pKezVhOWoylMf+r/
-t9LU0IDzPxWgiujlxwisaxTeCRbkE/UKX+z5DAYFANY12tHme7f5qZKwE/wsKfUM
-iZB3yRBqjz8Ncv4dsnOIUPUghj4tjtXL+OokctFoSlRPDcfTJjHg7lsWWSlDNKUU
-KCg/er+J6XmvJTZCWk8MOMfLUtB+tQGM5McmUD7BWIeeLqRRIMbI7QfOSWlv3y69
-Boh+kI1U+KE9sDhjvTClvYBiVh5itcYB2l447qcvX62yFsB2lEDSN60jw1QCj1d4
-hcNdX4suacbXchN4ayMmwirWM8e1cF85nXpHlPf8pnNJ9uBEamMROs5ES3owYZw6
-toTvcSk1wPjFY0X51fPF
-=IiFE
+iEYEARECAAYFAk+uetYACgkQvFcC4BYPU0qAdQCeKEg/YoPHHh8QuEG/lfME29iy
+s5EAoJsbDOBw5AcxRvsokOx8LL0TPNXv
+=XMzj
 -----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 0d57fd42ee85..e116fa008a01 100644
--- a/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
+++ b/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2012/05/12 07:57:13 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-cddl/freebsd-cddl-9.0.ebuild,v 1.6 2012/05/12 14:59:29 aballier Exp $
 
 EAPI=4
 
@@ -48,23 +48,10 @@ src_unpack() {
 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.
+	mkinstall SHLIBDIR="/usr/${mylibdir}" LIBDIR="/usr/${mylibdir}" || die
+
+	gen_usr_ldscript -a nvpair umem uutil zfs zpool
 
+	# Install zfs volinit script.
 	newinitd "${FILESDIR}"/zvol.initd-9.0 zvol
 }