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

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

commit:     372787b3ee091a1065c6cda39098fd309ddfe433
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Tue Sep 18 15:45:58 2012 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Tue Sep 18 15:45:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=372787b3

freebsd-lib-9.1_rc1 -- for upgrades (including rev bump), use the include files itself. Bug #435422

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

diff --git a/sys-freebsd/freebsd-lib/Manifest b/sys-freebsd/freebsd-lib/Manifest
new file mode 100644
index 0000000..2a97b17
--- /dev/null
+++ b/sys-freebsd/freebsd-lib/Manifest
@@ -0,0 +1,34 @@
+AUX freebsd-lib-6.0-flex-2.5.31.patch 421 RMD160 6ef83c6b09e31a81ba3c25772b02aef34540dbe8 SHA1 1408a36a967b0ff5ba94e23921357f4296e31bc2 SHA256 1d46cf13e1059ae3731ba5555764e020fcf4de7db5abf039fac83423e05d53c4
+AUX freebsd-lib-6.0-gccfloat.patch 542 RMD160 564f5a1b1aba59479c22f91570635de717e8b7bf SHA1 94f463f123fdc3009d4ca1d5ab351aa76d768c6b SHA256 d549125f174c86c2d5e7e1f1c99cf1303b84e91ce8ee51db8c962be48b7a7951
+AUX freebsd-lib-6.0-pmc.patch 338 RMD160 bb284cc2f9eafd3f65090087af215c3da679fefa SHA1 18343fc612bd231ec722b579dff61c887542b1c2 SHA256 36ca464f0aa1ed8784c8f1edc4a3580704c9a7813963684305250d806000075f
+AUX freebsd-lib-6.1-csu.patch 655 RMD160 d4fa9ade913ef3ce90351ae368f0944265eae2e4 SHA1 b165b704258d2ce600bcd2a900363d851a4a2a77 SHA256 e6fe72a4183227b275815a75eec9639321046dc1e02b80c507ae6bf902a58cf1
+AUX freebsd-lib-6.2-bluetooth.patch 243 RMD160 eaaeafc3f8305d4755070d9d1354289a140bf6a1 SHA1 6988dfc998b18efd7a91e86a827e921cdabf4997 SHA256 4c90cb6d45fa24a07e21255949f219cc561a94011f645c58bce2a68027db6658
+AUX freebsd-lib-7.0-CVE-2008-1391.patch 344 RMD160 44e20da80ab544895d8dd65b5c6bcdf693c2dd7a SHA1 50105f89d3296793857230a27f909f9c0d713293 SHA256 662a6f26d99257221fa686423fd9fe22862b827cd9ae146c2add5e5ac85290cc
+AUX freebsd-lib-7.1-types.h-fix.patch 371 RMD160 d514196ccf1ba246a158b5f421f009d96d2dd8c4 SHA1 b04bec25903446c20bdfd144796fe9924f9ba39f SHA256 9e745fcfe046c405a365d8d0db8763867f0a618952f7d6bab4c76a8c82273473
+AUX freebsd-lib-7.2-rtldnoload.patch 1037 RMD160 f7f0e833a4ba182f17731eb77ccd6dc8e39f8fad SHA1 2158d4a5183875d52acd0cd538630685d609fac6 SHA256 b9ba0e322f15d8761bb33cf9199b95cc61d6a9b5129d08399f49c89fdeaa095b
+AUX freebsd-lib-8.0-gcc45.patch 1264 RMD160 c2c6b5a3fa8efe0bcb3487cc71117a9411d18f73 SHA1 55e96a2f3a31f3a58ec5fc509a5d15ec47868773 SHA256 5288e313beffa0e50fc0301e859c59f1a95302d546d27eae50b97c4a98c81c4d
+AUX freebsd-lib-8.0-log2.patch 667 RMD160 63f115ff4262cbcb46377f7bfb2fc7a01167e50b SHA1 7daafed62b95bc8c2aeb19e3c0b1e697a152187d SHA256 dc421c3d92790da46360225de2dd4d707c314e962ecb95650799ee12f166a214
+AUX freebsd-lib-8.0-rpcsec_gss.patch 298 RMD160 155eeb638eedb291ea739ad64993817e5d985f7b SHA1 005d80f43b2558d1c8ecc41192b28e1dff53b39a SHA256 170d07c44d02a6b4dde1d0d209c57f3bbab567a5c4a592a82b270140a2a1d7f1
+AUX freebsd-lib-8.2-liblink.patch 510 RMD160 99364b405782a3cd7d7c4f84db9c74e976c0c8ba SHA1 54810b4414733691020ffd8db648fe46a8beef9f SHA256 38f967683e9d335ff7860150b2e6ae4d749266937ba195c6747d42d64c8e31ee
+AUX freebsd-lib-8.2-nlm_syscall.patch 385 RMD160 c3466ada961bd75248d0a62219898d5f936b33ce SHA1 a7bed1eff5f1cda67076b5661cf7ac3e8694ff82 SHA256 4b26be44718cb3deb7fb295d403e892ed73ceba7ba43499a889bd49a5e43852b
+AUX freebsd-lib-9.0-liblink.patch 627 RMD160 ea3f0d6f35457d70ee22461d5c6a5cf34285df93 SHA1 e4670e2c34f96f1e725ab10d3a38e2e6f742e7c5 SHA256 b0c71ae271e4a7a621bdf437254256afb80c3053961a8ad187ba28bc9084e813
+AUX freebsd-lib-9.0-opieincludes.patch 4495 RMD160 d7ffb8dbab8effbd0ca0b69708b99a9361ca3962 SHA1 848b66bd435a48d56e2e3593684ee9b30dd71d4f SHA256 0868e7454053170c3399f1a03a68f3e70410c79db865e7e2f2b51f5961b5718b
+AUX freebsd-lib-9.0-trylock-adaptive.patch 439 RMD160 056ea3082ef46645c5af0374aa092f8fe68221ae SHA1 759dc8dd9975a448c79f5fffafac1838ead91516 SHA256 af501c40124e628c2f739d88a4efa7ef3513694bd79ab44db30e4b3f73864612
+AUX freebsd-lib-bsdxml.patch 339 RMD160 27b501cda2ac76230a72dfc3ee6593cb50f8d4b0 SHA1 3b456d272de5d0c56bc650fe60f38524857f8b31 SHA256 c1ac47d6c7176475f0f4b86bb17288a980b44a799fb6f4e7b1920f69e0447dc9
+AUX freebsd-lib-bsdxml2expat.patch 708 RMD160 4a973e39a5860bd7b0fbba438302c65ec2b66e33 SHA1 95ed47baf5e189865d3989fad625a2160d2abe13 SHA256 0c3ec3657155c5032479181119c488d43a479ab0dfe7a7d7ed0dabce16853e85
+AUX freebsd-lib-includes.patch 316 RMD160 655d20a7a86715983469dbda678bca0ae726c069 SHA1 65cd796b0f8747d8d063b1f6e3ea53f82cdcdbe1 SHA256 be4dd4c905715c2d165be282cf377f799b32ccb76986947bc0bf1b5730b57b06
+AUX freebsd-lib-new_as.patch 1494 RMD160 36ac871434f9994d5a0d7e1b73765c055d49948a SHA1 10e2e6b7b27459548a17809ada287520e3ffeeea SHA256 6021f34246dcf768a94ffe7273ea2f5590adf6d82ce7fb555234f8012bdbd982
+AUX freebsd-sources-9.0-sysctluint.patch 403 RMD160 46bb18c424ea7011db86341e427fd095495c4bcc SHA1 9d3c1606c886d96a88c89283bc18a2717c87fc76 SHA256 884fbc5d6d3766ea3d4609946f56072f36f95368dc13ee316c330a46d42f0c9e
+AUX libmap.conf 201 RMD160 ad0ab6c08b5c541e0e45636dcbbaa468bbae2f95 SHA1 df81db07a94d988f1c41b4696b4d3b0058e73f83 SHA256 36a1bd56965f171cbb058f6e1762801e3b92c083fe36f6fe046bd669beed9742
+AUX libusb.pc.in 208 RMD160 13c7e5587c565453fc6a11d156da302fa7590ee0 SHA1 f0f9815fa27a8f1cf8405c1a8987df5d5d6a6b1b SHA256 9bfe398a335f8b9b1c3dd167ab0c9206fe3bdd4e1da318ece977e20f3c2d7c56
+DIST freebsd-cddl-9.1_rc1.tar.bz2 899168 RMD160 8c9f94e80b999485f84f4b0d028dc3e3f0ee49c3 SHA1 3091df8d95f3e1bce885f5d5eb3cdf4a1406401d SHA256 966eb6b9dccb0f00381e68cf6fe4b56e485ac4e44914b655e3e4f7106053fb22
+DIST freebsd-contrib-9.1_rc1.tar.bz2 54751775 RMD160 34aa7ac4cf35b8c0924c711e1383b717f7a0a326 SHA1 77beb4040d309a2ea09dc5cf3c1813e59d10f259 SHA256 ecef816eb33391e120baea101d2f06d1d229dfc1f929eab4527fdbe424b42190
+DIST freebsd-crypto-9.1_rc1.tar.bz2 5680649 RMD160 2b6c61c9fe332439d884ff939341127ed4d29519 SHA1 05801d078d4044871893a2023d5d9f773bdfe76e SHA256 a6b7b7aba5dfca7ffae79c7691ed24cd632fa07d8ed73808d3f9e72c63afab8d
+DIST freebsd-etc-9.1_rc1.tar.bz2 207859 RMD160 4f6a63edf07e9a18425cece068e122bbbcadd0bd SHA1 5c0345d701fb8ea528d8bcc4643fcf2db0f66495 SHA256 84d7bc249fb9646fb3550e22041d2856825ea499d1e841c9afaa07d12dbbfb30
+DIST freebsd-gnu-9.1_rc1.tar.bz2 795320 RMD160 5ecd1e98bbe719584a8ddb8ae40b083d4b457993 SHA1 92e106be91f2fb2f0d04789d439c742f658ace8d SHA256 ac444e3019c602020e0177fdfacecd274e6df6e7602519468e84564b52f1c413
+DIST freebsd-include-9.1_rc1.tar.bz2 146833 RMD160 b7d2b285bc116807ad2b5a299258e8a310d3c497 SHA1 2f3cbc158fcb208ce1d489ac251c7ac8b6376e53 SHA256 2f9f98bafb48ba143e05348cefb28b2a1a6095dc3f973c4258fe56635094522a
+DIST freebsd-lib-9.1_rc1.tar.bz2 3205820 RMD160 1d1b7aa837aad9a25feec5a1667fdaaf4cbecfca SHA1 c6ce46a2c0965ce64bad46cf30b3a3f49fff5f90 SHA256 a01031b645a3e9cc80c74d362682244434fc93b2af15c6db7854cb0ac2cdcb87
+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

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 39bb356..7863590 100644
--- a/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild
+++ b/sys-freebsd/freebsd-lib/freebsd-lib-9.1_rc1.ebuild
@@ -21,8 +21,7 @@ SRC_URI="mirror://gentoo/${LIB}.tar.bz2
 		mirror://gentoo/${INCLUDE}.tar.bz2
 		mirror://gentoo/${USBIN}.tar.bz2
 		mirror://gentoo/${GNU}.tar.bz2
-		build? (
-			mirror://gentoo/${SYS}.tar.bz2 )
+		mirror://gentoo/${SYS}.tar.bz2
 		zfs? (
 			mirror://gentoo/${CDDL}.tar.bz2 )"
 
@@ -163,7 +162,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; then
+	if use build || has_version "<${CATEGORY}/${PF}" ; 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)
@@ -241,7 +240,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}/${P}"
+	is_crosscompile || use build || ! is_native_abi || has_version "<${CATEGORY}/${PF}"
 }
 
 # Get the subdirs we are building.
@@ -365,7 +364,9 @@ src_compile() {
 			if ! is_native_abi ; then
 				mymakeopts="${mymakeopts} COMPAT_32BIT="
 			else
-				use build || CFLAGS="${CFLAGS} -isystem /usr/include";
+				if ! has_version "<${CATEGORY}/${PF}" ; then
+					use build || CFLAGS="${CFLAGS} -isystem /usr/include";
+				fi
 			fi
 
 			einfo "Building for ABI ${ABI} and TARGET=$(tc-arch-kernel ${CHOST})"