[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-usbin/, sys-freebsd/freebsd-sources/

[gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/freebsd-usbin/, sys-freebsd/freebsd-sources/

[Yuta SATOH]

commit:     ad69f1973f8c56333b6230fec234389cdc4c3fac
Author:     Yuta SATOH <nigoro <AT> gentoo <DOT> gr <DOT> jp>
AuthorDate: Fri Aug 30 15:52:37 2013 +0000
Commit:     Yuta SATOH <nigoro.gentoo <AT> 0x100 <DOT> com>
CommitDate: Fri Aug 30 15:52:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=ad69f197

freebsd-sources-9999_p255023: update __FreeBSD_cc_version.

---
 sys-freebsd/freebsd-sources/Manifest                            | 2 +-
 sys-freebsd/freebsd-sources/freebsd-sources-9999_p255023.ebuild | 4 ++--
 sys-freebsd/freebsd-usbin/Manifest                              | 2 +-
 sys-freebsd/freebsd-usbin/freebsd-usbin-9999_p255023.ebuild     | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 36c69f9..504dc3b 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -16,4 +16,4 @@ AUX freebsd-sources-9999-gentoo.patch 713 SHA256 13588f0572ba95c86beb755ce3d681c
 AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
 AUX freebsd-sources-cve-2012-4576.patch 561 SHA256 c3ad42e10164eaa3d928fd11a68b5ab490981b5d4684315e7e78c582e680d6c2 SHA512 451fb9be983672fa8d85d34bf13b67e70ac4bbda44da0c16ee484349bcf4e9ad795f66c36b5216bbcf022f709727dc19760e9f23b001a5768d9fa15dbad8122a WHIRLPOOL 2f261add2b2d9014782198b564a807f1a61917e0fbe91354ce5b1a685b27e312e699b7dc799f1653c952864633be84dda110e37f74378a3c5f1c5aacacb6811d
 EBUILD freebsd-sources-9.9999.ebuild 3024 SHA256 c378a97b38a0aa17bd5999db9597622026967b5656f0c994df9d2701fe8c766f SHA512 72a1bac8e7d6171982ff3837fe336e51ae4bb355bb25fc9a72cf46b81b11b69d84d2d84099fb8e5bcb6ad13abe4eaba38e94b5cc57eddb85c873b291cea3a06f WHIRLPOOL 3d41a2874fa61fe78dbd3b9f8612ec3d1f51a53c756c3037450b5be0d2900e160ad8f251720ac1f99e477bde0cb1f1b1fcbd968ef71da172501a53a59142de05
-EBUILD freebsd-sources-9999_p255023.ebuild 2989 SHA256 2dbe561b58e8c0464a3de49e43fc6a3403e58f6ff46da935f5e5f9a039af0c4b SHA512 587d8152cfb332928bd058c11dca9b447c75eff2e1b05fec3cc0e16da604f122ae3d721d0e442abb30573d8b966a4d80a670493c18a37baae2997b01b24bc9b5 WHIRLPOOL fb479030cfa7a2695f20953af7ceed56b594931a6f9d81f8e58b1fa8e9c6a3ee36ef3f8315899d97a66daa76ec56013c06c6d6ec667343fffb7dee3cba75d773
+EBUILD freebsd-sources-9999_p255023.ebuild 2992 SHA256 d2ba977f9066c71736a1c2ce95ee78913e9810ac14dfbb0dc34e345c5d6d2673 SHA512 48e5e3fbfb4aa692be27315674a779aa1add9e3e42768da1c16c5994b4d286f248615b0934c016b59f46dcccfb898d69b5d99d6db857e28f6fd50e231b93216f WHIRLPOOL 92e648d96c825e27ae0e7c102240897a3c8e9f4b72017968d44ddc152fc60f9270cf325f153d5e9be99953670de469dd759ef665058c7211e47860d5008dbf40

diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9999_p255023.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9999_p255023.ebuild
index 7ade4a2..8af30af 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9999_p255023.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9999_p255023.ebuild
@@ -49,8 +49,8 @@ src_prepare() {
 		"${S}/conf/newvers.sh"
 
 	# __FreeBSD_cc_version comes from FreeBSD's gcc.
-	# on 9.0-RELEASE it's 900001.
-	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=900001:g" \
+	# on 10.0-RELEASE it's 1000001.
+	sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1000001:g" \
 		-i "${S}/conf/kern.pre.mk" \
 		-i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version"
 

diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index fdda020..78aaa2e 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -18,4 +18,4 @@ AUX syscons.confd 464 SHA256 7e566edb81fef49b662ad6b84dd0bf4657d5f05efe9791a515b
 AUX syscons.initd 1711 SHA256 16f5ab3ceb67accc10350d21527321c1e559c432f0b52e7b3adf08b67d9f62aa SHA512 41fef393e1fe732de065cb9ac3fdb4bbe73158a86f7c8b6175b496d0a65b9c682d888ce7b34c8a43732909c12626a2f5783457607e4b9bf6b4210589c3397d76 WHIRLPOOL 7a11eed37860db8dce71ad09299bd48427cf2beb349da3799189ef93d4d5c618b4c33b51e60f17cb485989dd3e0480458f5559c61deaa3f542f920df43f89801
 AUX syslogd.initd 571 SHA256 3f0f242197be7c59f36edffd36918935189d17ca7d8f5c2de6238c7a7f52d005 SHA512 0c67138b2461ba3629a7aa87dca35357ee17f2a1c1c13e1951417f4c05054ad006efb7f98dcf7fa24f0b90e0c0331e6fb7d1e3459c1db17f1bc82baa63b3beeb WHIRLPOOL e8dc6a0f402a474bb98c5d4a9a21b331a2a55726d517411c2b7c7adec28219e5a538ebb448c6c27dd1540affb914e935e91160cb0795ca6eb624f4ee163b0e9d
 EBUILD freebsd-usbin-9.9999.ebuild 5492 SHA256 2b9a464f14211c948286939b4ad3c262847cbc3a4f0c00160c7bcf58bf3f7e01 SHA512 3803166af8a0fb30647c739902ac3a5658cd98411d79e369068564b1ee90c2185d1ef7e07a14553977f8ffb0025b58dea5b8ecc275170a54399d3a0b1ae4bb92 WHIRLPOOL bf16a610b7463ee7ba692736d74c7085ffa0ff9ddd7cfed137bf5754ff016761664a8cf3c41336e50c1d6b00403f7215da5a136b236a672f4b8e20e12f856c72
-EBUILD freebsd-usbin-9999_p255023.ebuild 5492 SHA256 2b9a464f14211c948286939b4ad3c262847cbc3a4f0c00160c7bcf58bf3f7e01 SHA512 3803166af8a0fb30647c739902ac3a5658cd98411d79e369068564b1ee90c2185d1ef7e07a14553977f8ffb0025b58dea5b8ecc275170a54399d3a0b1ae4bb92 WHIRLPOOL bf16a610b7463ee7ba692736d74c7085ffa0ff9ddd7cfed137bf5754ff016761664a8cf3c41336e50c1d6b00403f7215da5a136b236a672f4b8e20e12f856c72
+EBUILD freebsd-usbin-9999_p255023.ebuild 5584 SHA256 0c6dfd07054e777051aa6b304aa311aa9ca8a4d20965a1f56623e2efb16d5fb5 SHA512 d7590c7b187aa07fe1e3a2649e057c05f044c7b667703e4b97e1185b4f74eca5189dc344f00e4e31cb2169e4a9d1ed77f455f362dc734256a889402bb241449c WHIRLPOOL 1e9b4f1361aa42e0aa9270d2d4fe95f052888f4f0a1fd8c20bbdfe74278dacd17597fa04b967e93eda87d68426857d5641c3d4e1ae473275fbaf0aac081e56d9

diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-9999_p255023.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-9999_p255023.ebuild
index 1c54d45..1c9d896 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-9999_p255023.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-9999_p255023.ebuild
@@ -95,6 +95,9 @@ src_prepare() {
 	# Don't install mtree format manpage
 	# it's installed by libarchive.
 	sed -e "s: mtree.5::g" -i "${S}"/mtree/Makefile
+
+	# fix Consider setting COMPILER_TYPE.
+	[[ ${PV} == *9999* ]] && rm -rf "${WORKDIR}"/share
 }
 
 src_compile() {