[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-lib/

["Yuta SATOH" <nigoro.gentoo@0x100.com>]

commit:     35aa4ae8340391fba88fcc489d607c6d7767e365
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Wed Sep 19 15:25:25 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Wed Sep 19 15:25:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=35aa4ae8

freebsd-lib-9.1_rc1 -- update on attached patch to Bug #435422

---
 sys-freebsd/freebsd-lib/Manifest                   |    2 +-
 sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
index 2a97b17..2915277 100644
--- a/sys-freebsd/freebsd-lib/Manifest
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -31,4 +31,4 @@ DIST freebsd-lib-9.1_rc1.tar.bz2 3205820 RMD160 1d1b7aa837aad9a25feec5a1667fdaaf
 DIST freebsd-libexec-9.1_rc1.tar.bz2 304745 RMD160 01f0132f3d39d11de4f08c62746fc92e5bc60aeb SHA1 cce74926fcba8cc5640cb8d08765fb8e4325c336 SHA256 191aa176de7b21cf82f84a1671ce7641e29c139d039040fd8368bf41e17eb15c
 DIST freebsd-sys-9.1_rc1.tar.bz2 32607060 RMD160 1e5c930de245ae9eab01f8baba57c910b7c89544 SHA1 35d03b142a65e75ae4deb271517b454a6b7c8da9 SHA256 0f375b358f5c407c16308a4884207b97022a7a5466e0291087642685f3c83957
 DIST freebsd-usbin-9.1_rc1.tar.bz2 2667842 RMD160 0e667af2dd418c624c093b45b3a5de6033b808f1 SHA1 6881483917f39d18c2f348a035b45b9e31dbabce SHA256 6f567fcacbe185d1fb0441b830621260970846534e39d767c92b448e2bb8ca60
-EBUILD freebsd-lib-9.1_rc1.ebuild 17279 RMD160 883162705e7cb6aa97386e74c9970b027e7d0d21 SHA1 a0bddde2ce62b9ff9730f74a0f4abc2beed61013 SHA256 b17e01afaf48c48bab57578672a2493f8c9fbf250321cc3c846eeb390bd6740a
+EBUILD freebsd-lib-9.1_rc1.ebuild 17255 RMD160 6fb76fccaaea0c5aca7e0cff41401c57b9135aba SHA1 267ccb80d7c47eca4c1f16223332282b56fc2f68 SHA256 d28313a4fec383387d65465aa15911b051d619a9f98dc414ee0aca652f8e6fa5

diff --git a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild
index 7863590..66be4c8 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild
@@ -21,7 +21,8 @@ SRC_URI="mirror://gentoo/${LIB}.tar.bz2
 		mirror://gentoo/${INCLUDE}.tar.bz2
 		mirror://gentoo/${USBIN}.tar.bz2
 		mirror://gentoo/${GNU}.tar.bz2
-		mirror://gentoo/${SYS}.tar.bz2
+		build? (
+			mirror://gentoo/${SYS}.tar.bz2 )
 		zfs? (
 			mirror://gentoo/${CDDL}.tar.bz2 )"
 
@@ -162,7 +163,7 @@ src_prepare() {
 	sed -e 's/LDFLAGS/RAW_LDFLAGS/g' \
 		-i "${S}/csu/i386-elf/Makefile" \
 		-i "${S}/csu/ia64/Makefile" || die
-	if use build || has_version "<${CATEGORY}/${PF}" ; then
+	if use build; then
 		cd "${WORKDIR}"
 		# This patch has to be applied on ${WORKDIR}/sys, so we do it here since it
 		# shouldn't be a symlink to /usr/src/sys (which should be already patched)
@@ -240,7 +241,7 @@ is_native_abi() {
 
 # Do we need to bootstrap the csu and libssp_nonshared?
 need_bootstrap() {
-	is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${PF}"
+	is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${P}"
 }
 
 # Get the subdirs we are building.