Update the liblink patch for libcam, bug #480730 by Yuta SATOH

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 24 insertions, 9 deletions

diff --git a/sys-freebsd/freebsd-lib/ChangeLog b/sys-freebsd/freebsd-lib/ChangeLog
index 26ec8adc9a9c..69e0eb7bca77 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.200 2013/08/12 14:53:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/ChangeLog,v 1.201 2013/08/12 15:03:30 aballier Exp $
+
+  12 Aug 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.2_rc1.ebuild,
+  files/freebsd-lib-9.2-liblink.patch:
+  Update the liblink patch for libcam, bug #480730 by Yuta SATOH
 
   12 Aug 2013; Alexis Ballier <aballier@gentoo.org> freebsd-lib-9.2_rc1.ebuild:
   unpack the secure tarball too
diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 10a0f3e6da5d..9cb9433c1608 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -20,7 +20,7 @@ AUX freebsd-lib-9.0-opieincludes.patch 4495 SHA256 0868e7454053170c3399f1a03a68f
 AUX freebsd-lib-9.1-.eh_frame_hdr-fix.patch 695 SHA256 6c6d7a958c989edc6ee76c5b9c2146fa449adda11c3b89b550780c7a78d93190 SHA512 c40270e8890a1152a6f2e705461ac64f8cc44e6d0306d895a0d146017d4fe3553853de88178e0744fc1be4197a4eb35b578c68593c80467dd8cf15c35720413d WHIRLPOOL 1fa3c5cdba333951b918eb5c1eb793ab49921268a6a397e38f2adad383c2c03ccf382892ed8d44e2480f8ca891ce3c3a0b122a026cbf232058ac3bcf2f2d5133
 AUX freebsd-lib-9.1-aligned_alloc.patch 1355 SHA256 379880b3e1be34a145d6388481645af5212eea7830285a7660a56a02e47dc608 SHA512 d9ac6008650efcd02ff1a0f64ac486e413c926681082d4ab9c1cb5abfbf1070e44b723e685a0b5b0e7159ab9071d85c5ee08c9063c9dcda470dfaa06a29391bc WHIRLPOOL fd80089b4b31f0a0d4dcb912d5dde74b3eb9e0530a3dc145f40ac476ef89ae256a0847123b44a0a59966c28f7f7529c401ce0dab493400a7aa24513989853e36
 AUX freebsd-lib-9.1-rmgssapi.patch 699 SHA256 0dc94a565f140beca0800446c72bd874f99c56125181f7a037154dcd898d2615 SHA512 cb0b292cca0c321ed72b1a792a3975be239303b3990efc6665b0c960dfe17fdbb4529405286c0a956c4b4711462d2ee9d7d1c9d343ad3246b43c49edfc87dae0 WHIRLPOOL 55adff8c3436959b4545ba54c0eff3cd640dd4f0d0871bd66dad2501c04e84eb24f27b882dde9050b088dadecc9af6049493e848a1d508646149075180c8c414
-AUX freebsd-lib-9.2-liblink.patch 1420 SHA256 c8fa4315a89d3acc378c89ecd778a43ab5b4824783ef19af1082732f6b2dc3a4 SHA512 88e564e13399c88eb238a10bea1a4959c62a6af6d3c9c41c331878e0c6a1680767ebdb58f555a9f1145a2c47cdfc65e3f98387947f1941327b800cb18983cda4 WHIRLPOOL b6f2654138e9e46b0fe193b1488150e4f84c5f1b14ab1a8f21348a4158570f99499e94c54acaf8244fc1d2cc0775a40c77585b88387cf2a73ed33062335c5255
+AUX freebsd-lib-9.2-liblink.patch 1694 SHA256 7586ac9aed55c833099840fd0f7b7c119ca9fe35fcce9b507b235ae0ae5aceca SHA512 0d9b33b5bd8b661c1403485ba2005d6c7d34341d1ae6c710a4516583ca9bacee050f71e06c039378b826278db570036a4b8f107833d9151c7a3cdab43f64ceb3 WHIRLPOOL 9b2782a936dc5be5f2d789633b6eb9b68d2f199bbe7dc12c7c86a848191abbedbef942370d233e4398688ef5832e114039126662b9821e2ef04bd7e723e6fe8a
 AUX freebsd-lib-bsdxml.patch 339 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9 SHA512 8d14ebc848426cf600cf2206f60b91d3a5e555c738be8bb84707dcf2455be98ea3dd0a6929495b93027f71097ff0232cc85c16be4d5381a167ee0aae5a14d542 WHIRLPOOL dbafb2f98b56cac9c3ec1377c7fae40935ca3c8b1116665ce36b82a55242dbead24dc4fc38d0268cf5af82e7f908543f1376fdd3f7d847bd92dc51438a3934ee
 AUX freebsd-lib-bsdxml2expat.patch 708 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85 SHA512 d3b321062886ee636a09af4b8714ae90317c17eb954a3d491cd21ca90605e26491033df4d6f02a517eda423783db74dad16adf7ee1bdc5557392cc70218ee9c7 WHIRLPOOL 5c262c59aee9e642d3a8929a453b56c7a55ba60f3011d6ac07b750a30297eb992a564ba4db18714b7eac58bbe3ded1ff4249150128947d25dd1344e59e16c9cb
 AUX freebsd-lib-includes.patch 316 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06 SHA512 31b7f368a4d3998e42486cb944a001a8371c365276eac94fa8712e29dbe9a13a7756a2fd77fbff87a1f7f4c19b32721c74bbb099f611d46a8c78b73f92d9255e WHIRLPOOL 8c4c2c6d1e9556303520c4cd8f6996f0f24c8b45985d4326db880c187b6db30e914a6e47b40ea4a79d7a309fdd579b39232329daf74758412ac518b0a9d0a317
@@ -62,13 +62,13 @@ DIST freebsd-usbin-9.2_rc1.tar.bz2 2867186 SHA256 e96c38c632e1ff4a98a922709d92c9
 EBUILD freebsd-lib-8.2-r1.ebuild 15816 SHA256 0d7ffdafe52db8b8c0c13741d15cf5ef32d808179bcfd05915afc4b5557a618a SHA512 2623c08ceb9f09d655d742860ca66f26669fb4ac5674e2b36fbe5a737580a16f404ff5abacaa42dd61a5b104805b29cc83f5c37b17f6c94865772cae169dea3a WHIRLPOOL 9b5780f01ca7980b456449fd8bec36e681ee6fb491839d6b7d7655efe31b57c000214e031c389b58e465349a845846860a1d24e8104ea9692bea37a080d7f8af
 EBUILD freebsd-lib-9.1-r10.ebuild 18642 SHA256 41a975236bb1e408812f34298e7397203df33afc6f0d5094aa0ebe42c7eb145f SHA512 fba0026b631d722c69a7fb8d5effcbee66c81970fa971b79a430b2e6657dfa4eea8407bdbf55f737f93d212daf9298320adb296bc58b9c0de141ecc07a926f27 WHIRLPOOL cb575e984e63b133ea9be545ff510183199104b091b742818af3a7c49801b8307d539a9b26e0253fb1d3dfe774c7f76ec12333ae82672bc5d31506a7d9195dd7
 EBUILD freebsd-lib-9.1-r11.ebuild 18835 SHA256 54fadb822046b0172afd21e33d10f4541d68a72dff03245ca34e55f43b1118f4 SHA512 d8163b6e08921ac2e8635df670068a1ec2c5fce2136bee33327d5b89fd5d062bc5c505c6c71738dd9c080f1c18ce1744bdb7a6a398eee0b549b0cd37f3eef99c WHIRLPOOL 2838eaf36618e0770b630a174e34aa5d7647758e6a0503a27a7f58883f21d277c5fed003526c068cb9d7358ee496bc09a079f533c2f9976c3233da07f1f121df
-EBUILD freebsd-lib-9.2_rc1.ebuild 18310 SHA256 60bdabf9c9e0976645346e37c9cb206723d991319069e6dd2acb25e7d6fc4d32 SHA512 c6721d5d4584e5c1be708bbc7d68834fed4f580b781f53151ae4d0490a108fdfe9325ea6e6e4e2d82d5cd4d8a7aaeeca64d1682d629c19db9e5b45e49c5eabfc WHIRLPOOL 6b67766edba2a9af9f92bd83d83ecd0c3a331001037973edea92d4964cabd8483746e3dac6f9050456e8081902044cdf241a1afb0d01b621f1a28d73d2669091
-MISC ChangeLog 40795 SHA256 74cd971daa9daf2ad644ecdf008f48cae386ab3e45d01f110cd8352798e8a38d SHA512 0f9b7e876ca95d748ae37db85d5b7ff8fcd2b66c4b26a4dfb3df936dd968ca95a81883b145249a14d44f41ad7df1b7b8fd369152f37de6932b21ce0d2b099d4f WHIRLPOOL 56ef36a0d767dddcc22016126cefa8d5a05d34468f3a1445bd48857c0635dfb7a47b4631fb1287af865f14141f481e8a9def3f47ecf1fa1677b67751d2fce60f
+EBUILD freebsd-lib-9.2_rc1.ebuild 18262 SHA256 9138c54845f1889e165098717e1e676cd819ce69262f21d3d9211a13934e6fd5 SHA512 62c2ec6cd9f4cbb24fbaa736625bf71567fde0fba197078fb4f6cda649e7288ce7c9e980083d2ef6fc15c0127c2afef2ffbe41401f2aec77ef93b5ac4cf7fb88 WHIRLPOOL d9b8a4680a3675810acd3c67e3130199022afc7bf7fe5eae1ccdd702d25368774be4f36f4a1d1d09fc4109fa679a04c17a4688c0a07d2fdbfe3bb3b02da00c6c
+MISC ChangeLog 40980 SHA256 ee70c4c8a77831426a04b6d0a13b7bf87d6d5e933cb6b70f0c42143e701f8e96 SHA512 deb5071b4eb93c380973de60695553168c25908e8986f128c9480a614a2cee1712ebcc9cc1b3bf5d8de594f130e2c82d8b699a8f73f357813d7660072ab9e854 WHIRLPOOL 74f90bcab61e28d19d2a7b987c0f3fbeda64775f24fedba3599504cb46108ab0c76cd4966e5a5e4260efac655aaec9fa51898790b923ae6bef3013d41fb8fe12
 MISC metadata.xml 410 SHA256 0ea0a391db3018afdf230e293ffedbc313b4a20db703c8c83fdf144a28c6c246 SHA512 de2a427cd8fcc2c0d7c0a1821f4cc916a280d9c0e21d83fdb7c35d110b48e96854baffc7d469e3461c2a6ee81eaec14d105c45cafbd3aaa37100a525bc60b7af WHIRLPOOL 3b2f587e647dafdb68bdb147bb0d5fecea0e728b52eabb61deb2623641117be6ac0871405666d7616ae1d60eaacf0b621cba8175dca463e9344ad83a4daf5865
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlII9wQACgkQvFcC4BYPU0oIRACfXPOVDYd3TLgGTl031Jl6ytvQ
-qt8AoMSUR41rXl2zqwlPud3KuA6Da6p4
-=7SeI
+iEYEAREIAAYFAlII+UQACgkQvFcC4BYPU0rStQCgmnakgjvXeiWm3ya9Wo/SmmCc
+A0cAoJv/B+w1rBxzqS637TE/qt/jc5rb
+=az5H
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
index cfc7181e3409..3759c91f0a89 100644
--- a/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
+++ b/sys-freebsd/freebsd-lib/files/freebsd-lib-9.2-liblink.patch
@@ -53,3 +53,15 @@ diff -uNr lib.old/libprocstat/Makefile lib/libprocstat/Makefile
  CFLAGS+=	-I. -I${.CURDIR} -D_KVM_VNODE
  SHLIB_MAJOR=	1
  
+diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile
+index fcb16de..6d0312b 100644
+--- a/lib/libcam/Makefile
++++ b/lib/libcam/Makefile
+@@ -8,6 +8,7 @@ INCS=		camlib.h
+ 
+ DPADD=		${LIBSBUF}
+ LDADD=		-lsbuf
++LDFLAGS+=	-L${.OBJDIR}/../libsbuf
+ 
+ MAN=		cam.3 cam_cdbparse.3
+ 
diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild
index 3eb9c9aa4a9e..c75a6f5307d4 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild,v 1.6 2013/08/12 14:53:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-lib/freebsd-lib-9.2_rc1.ebuild,v 1.7 2013/08/12 15:03:30 aballier Exp $
 
 EAPI=5
 
@@ -308,7 +308,6 @@ do_bootstrap() {
 	is_crosscompile && bootstrap_lib "lib/libc"
 	is_crosscompile || is_native_abi || bootstrap_libgcc
 	is_native_abi   || bootstrap_libthr
-	is_native_abi   || bootstrap_lib "lib/libsbuf"
 }
 
 # Compile it. Assume we have the toolchain setup correctly.