Support upgrades from 9.x. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/70 by nigoro.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 25 insertions, 25 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index fc94b605da89..58ae308345d8 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.108 2015/03/14 14:12:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.109 2015/03/15 18:06:56 mgorny Exp $
+
+  15 Mar 2015; Michał Górny <mgorny@gentoo.org> freebsd-sources-10.1-r1.ebuild:
+  Support upgrades from 9.x. https://github.com/gentoo/gentoo-portage-rsync-
+  mirror/pull/70 by nigoro.
 
 *freebsd-sources-10.1-r1 (14 Mar 2015)
 
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index 2078e04f89e5..531a8207d251 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -38,6 +38,7 @@ AUX freebsd-sources-9.1-tcp.patch 1249 SHA256 a51412349a8724931cfc749150e3c07802
 AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea1a30da8878014d0799220557820fd3a4bbe8 SHA512 cf553ad66b5a55dd2383a55c9a3c5c852985c4842244569aef91596a98481ca12c6189dfdd5fb2badcbe7901a87c81a3e0432cbf10add66dfb481ddcf38ebdcf WHIRLPOOL 42be74cafdad3e43815f638144b3ef8e89a7a95d791a312899a24387bf6a9cbc08acb0b30855d45fed607c6b73a3632afe1a44fb2bcd5738f76a7cf444b39218
 AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d
 AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
+DIST freebsd-contrib-10.1.tar.xz 55446392 SHA256 c518005bc333788dfde2c9d67fd7069c7d49e48f8de7c3f44ad9178902705d79 SHA512 b9f36a478f66bae1626c63f5731228e565be7a41576f0ede9d7660cb69d584a3bb5cf37ff7f8dcafbfd737bf4cedf27cff7e97c8e26b4d77db78a9433db8d1cd WHIRLPOOL 359bda77e92699c4adb6641d699b45812933b8f97090e547a1d201cbb358e611961c5dc33b66eb2ff6516c4207a835923b5c3bebd80710ba1966361a54e42f1f
 DIST freebsd-sources-9.1-en-13-03.patch 32571 SHA256 8bafbaba1b23f4651a9e578dbbb3b8d9b4a0a28dc1702f6dc17a40728b861595 SHA512 013a21da3618da9098020c85abe42d99e4eeb8d6b9b818cd5c6d27ee2ea2d31b60ad4521e73cb996f2f5c99fd0f34bd4a35458977264c51e79f4f53bfca6e7cc WHIRLPOOL c7b0a56efd9cebecde56590cacb1ee743845ce13577505255deca44c167d679ce94c759cfb363c26a5f2a9fc16dfc06d17eea18d638fd72c21ec0fdd81a71c5f
 DIST freebsd-sys-10.1.tar.xz 33703720 SHA256 51d19f65846387140744d73ece99a81c35e554ee11b361fabb008e8b0c7451ed SHA512 9625cd876912c303bed6403e1a7694a4b3923783eba306ba19c6e31f2fe5c39c3287746b808d136bec05e11a1eaf5d63e4016797c145140fbeb09c68ae7f4a9b WHIRLPOOL a352b4f846c5e7ba849dfd7acc22637aec8594ce3ac19f975f20659ba6d1a091ca417be4f6973c87d39c8c8d5b0aa1e7cc09afa5cc4ad7cdbc3d47f50e61e428
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
@@ -47,7 +48,7 @@ DIST freebsd-sys-9.2_rc1.tar.bz2 34377450 SHA256 0db609374f4922e026779331a3299cf
 DIST freebsd-sys-9.2_rc2.tar.bz2 34381761 SHA256 2cf28a18adf0d22c0d141f2ee0c7a8b4167a232b2f488389a1b9777c0fc3259f SHA512 1ac4ae1e04f44bbe9687722fc21633e7ea5e0990327f079dfb3239dca1fc6f92a587e4f5d9fa4ec6112b99ce57297f5394303d5907b04f7a3eaeff7a1c71bac0 WHIRLPOOL 734a3911efcc3253bf8e04eb57130b227b38f9e8666aeb50fc608af42ed8ca080016b3062d59ddc585890693bdb64d4a90a0fa7287a0bc62ede4ad445140223f
 DIST freebsd-sys-9.2_rc3.tar.bz2 34386428 SHA256 86fd03137f39a8544174dd26f4096da022c1ecfa447a1e7c9e4e241428b94947 SHA512 233181db24063e6afe1dc3e17280e2b89a39529961814640bd52d6efa1bd9f9212ab2a467266df7cd1c52654e1759f124df5d4fa439862397816623d46f3af40 WHIRLPOOL 4d7a065decda622550b16b2583b133f9b3d42aca4e6707a53012bbac9e5eb62b2fbdfc84d9cc0b666c9685e8f9abd6c9b7c9f46ce23e7b16a90a05530f45cc9b
 DIST freebsd-ubin-10.1.tar.xz 1918648 SHA256 92d09ffb4de7cf955e9937ebd39f1cf0c8ff9e0fe0bdef4f30b6003241849361 SHA512 18507ca084294d9ce6e858914e0d37371217c0aeafda9633268a90b9efc7c8c6709a271e3e2c279d14d74d03162c257ec0ccedeb0f4aae4513baeca82fcec409 WHIRLPOOL 23649e668ff2cadd5f16fe5c2fb2b4e14d261dec32c24c232a41a7e88363cc16c97f7226affc25e35ff31865fa632cfbf49fb1ab2375786942d2e5949670685e
-EBUILD freebsd-sources-10.1-r1.ebuild 4180 SHA256 dc595ec94ac8c9f48fd4d707da85fa44f615963436599912d594129b664890c8 SHA512 3c492f46097ea2e9f46aa3d5e6a11dac3cabfbd32a816120e84c750fce4a01746a64ddfbd4b44fc0b91a724d6e1d3992d365da2e9f9c3e1ae6ed31408451fcd3 WHIRLPOOL db94cea0fdc888dfecdbbb78962c397fd15dca2a4f99e472f138452b2161467c8989c90473dfcf1e4c1466ae3938ebe650e98a258fe748973b3060b0f9b7b6d5
+EBUILD freebsd-sources-10.1-r1.ebuild 4126 SHA256 1ed884e398684ad6e5814779c10fe13a60b7b50574a97672304fb5fe4b5f0658 SHA512 f12ad1281060c3fa4dca118d7d8e869108d8ec5220448d824372136598341b23e0fca9c27ac05be67018664c5cc96ecce6c07b17c80fe5d3faa630f4fffd9b47 WHIRLPOOL c8786821d8c0004a19495d00bc41fbfbe1b58d28b130822532335e489df34a5e4e176ab70863bf9ddf38a6293f63f226a2c51442c789ad06c5a576a91478205e
 EBUILD freebsd-sources-8.2-r2.ebuild 3801 SHA256 1766a68e4f3191690a805d89280250a549fdbe0ef08ca9962c0aa46256ff0762 SHA512 85b3793d6042a4db9409dd42e90e37e67d880d5ff5996834b467662c60febab7a63d9f13176b549fa93a8aa4ae212f80e42e0742c16de910e5f3c85b06ef3059 WHIRLPOOL 91deb75cdfb47e561cbf842a2ca70be4ea4af4216c1a97e598f6bdc3b9c796d822c7ba5cba8edced1a6a43a2a9bd15e7d31e8d9b292965d24792bc88a557ac15
 EBUILD freebsd-sources-9.1-r3.ebuild 2648 SHA256 40075f5d40a1f1d1cb53cce9fba58a45cfdf3fc358b379ff5f502bda21e7c010 SHA512 f51c6eb2d56f8207ecf77ccd7630e5fa3c78db6d30bf21dc84d0c602643a68e0b10e67824c161b198a8d1311ad34543ec5ec1c71008c86c21b71c9e05a417272 WHIRLPOOL 9c5f574e177e52cca80466f51a27fa6341c29db4970a70e0d9ab26a76e66328fac70c0ce99df63d2ed8ee26f6153da9f1a4a94c76f1a0aa792094e19e3524e00
 EBUILD freebsd-sources-9.1-r9.ebuild 3189 SHA256 cf16bf2ff54bc8ca37e42581c2d40cff0771c4fa527d08ed4c440817fe98d267 SHA512 a918e8f72abd21851c547c8c86843f8c89c3b1b3e92f7d34a30fbfb7681a4b4dc30690c176b0e8f8840f1ad082bf48de0eeb199062ec475ca8a5708fa8071e90 WHIRLPOOL a00bb3b64f4d0a2952a0df5f4b3bb82103eedbf29adad611f7090fa593f247dcc025613ba1f49c22698e3aeb396bf93843679490071b4e04bdf8498ddb4f09b0
@@ -55,24 +56,24 @@ EBUILD freebsd-sources-9.2.ebuild 3142 SHA256 a2e5782e94e9a309f212e52c5b994a712a
 EBUILD freebsd-sources-9.2_rc1.ebuild 3146 SHA256 a5ff139aa2daf1ee0f7294195b26ac0e3b39c9bab9c25c3bcb2fa361a609bb9b SHA512 a2e9a234d522d858f1a0b5a6ffd26a4742319d36d6034bb2f1d79b343fdc3b67eddda62c38214760ca347a0308685526cbf45149d418bea2e2fe994efa58a30a WHIRLPOOL 02bb6b335165e85597f1227a63cdc55bc7df796819764a74623764e44ec09098cedec2750c3b21d053cfd36acf11eea2a0b19808c858afd4882d82947f2c33e3
 EBUILD freebsd-sources-9.2_rc2.ebuild 3146 SHA256 c70294b76b6ee163b413eed0270bb53294c77d5015d2dabd4d526f49e2c67e7f SHA512 392af1b6eaef5b493ac9fc568a1fe4f067cd12e9bd45f2bf79fd5602cddc4ce7f7543dc243d556e4ecd35733cf5d68573562082c014175a33ea702094c2974f9 WHIRLPOOL db8f01671a1c248e68f1aafa3f814856ef986df06fe02952fff029b6b66f12602edcb962640a2e76574778d40e04ed6bdc822b7daf24d8f2946dc108b8a565d4
 EBUILD freebsd-sources-9.2_rc3.ebuild 3146 SHA256 543d274c0ede9a96e3442cb5c4fe50990b60a5dfd8d597fb9eda9167ee79e38b SHA512 cd1c298137cc28237288e3a03f44a79e50685085784057491400db5fe2b2d3bf2d78f379b65ec7d196522a092c960675829f83ea25cf7fbae29a5ddbc1426e5a WHIRLPOOL f054a506e354216344b8dc3baccf18302267e0f5cbd1e8d3a1bb0749d94268bf157d05d07c6ac93dee20f11d4af6e5c1f76b6f3846fc21ab0c03dc02df0c70fb
-MISC ChangeLog 27465 SHA256 819b1f4753f425107369649c44f49022c5b9f5c187f6a632e908cb7aec60542b SHA512 f54e45a77b05b35f7d0691fe28917ebf611bcf59765ea98337618b34373ef0d9dfde19a33487b31d51512db2570c37f9f8fdd7d29e75d4f503168a2a8a65a92e WHIRLPOOL bdb4ff54b3096a325b0835ae0f018ed4881e6f7c96ed3a331c5ea1a0bac82e0e1a33b0142e1c17e0c7f56afdc14948b80f51655c64cdece16e9f7c74aadbd580
+MISC ChangeLog 27653 SHA256 2f9026875c7fef68e95370bec612f6d4ea925c4e99ebd78132e885dde61b1baf SHA512 501ea9182208e90984a21742540201f3a38be87bac9ae22d38fa501aa095078e79e66e13e5254ef6680d348c204ae1234292dde2d3236ddf4018df7d739602c3 WHIRLPOOL 5307cf3afe0ae01014e10df45e1c524aa076a5ae09a85f992b6b438b3d4c8bd5da41ba2f4aed2da6f18ce4cdb575f17ea5e22b3e5e73f4c28a6a71fe9246a19d
 MISC metadata.xml 442 SHA256 17c155d89c131666e8d51f90a65e90de3c5c7ebcb0d82cf867b88f973636a839 SHA512 8460234a38bd7c449ab40a2053a5f83ebdb633befdd21dab64074ba8c5e7202ebb6bed39e6c65940d4ce35bd806ca0e481159263124e96e01e6f802aeabeaaff WHIRLPOOL 5127cb0e07ff5a52af42b943bc978608ae512af28ce18a0ee319f7143a0b2addb0d0633fe203050a9a8faab66145d2454352dd1367c2c0a21d6d18b9bc8407bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVBEHzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVBcpFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO4cUP/is4cHYVCBzfH3suaVtL7fhv
-qrmBBw+oyh/fOC1GcTHXcoyx2ilSb7/4vgsVZVceQzOG91Rr2ah1Lpv66BMMf6XU
-1wN63X753Jrc4Me6LDjShHN8J7sfL4ZpS1sNJwJPblpK/Bz2S4qD/0rl8WPAY85I
-xUi//CiS5d+P6rJXa+06BgCjop7CRRT/pxSaLJZ9Snis6+Rbd+JyRueXYmt8zOLO
-OXtH0QtW7S+QRBJ1HONxwjONO/BC0b//krOIZgibiiVmU4ZzLaHksyyTsHdAL8h5
-aCVKkeknc1tSUoEokDQgL5N72cpvyY6CXDuR7Gu8NpjSABFGsWZu2B69A/vz/roB
-DM72NvCqwxq3T/tcZZi7WOO+Gy3ZnT2kas+/iiBmyn0m8pk9OhnkrE1hQF24Ge0A
-8i2+YPr/gegOG/He/P220a0XF2/Y9Qcc0HGOc52+/pCnXqLy0SsOD0LA3kTXU2zw
-m2GVFwAlgPvpoevPzIakLLCHnfCOd7R7j/StVYWeY1MYFbEyWF+HqLNWE7Pd1mGA
-wEThy4MEyAAEmqNhTqKM0+w2bp1y2gNcjMy0tbGwxmqpWJEBi9tIP6vC7CahR9a6
-N8w3Z9Lu+y9+5sCy5oSYwlmKVGRqc68l+5J4o9xSDLrkEQBnBSWxMX74FGIdnwjN
-ll3iZUqy2hImKmxgf9H7
-=j1Ua
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOkEIP/04eu0hKWBwtAsSNwrJVWAHW
+2DuFQbViRIrjzfHgV3e1NC0390tgTlRfuovk47Wv5+MRs3bHZADmVcdHN8mZQzJ+
+NQ3vx9clAY6kfzDX3hdbLJZrn5B9/VP5+KNDcVXhf+Q5aeqYL7xisemmtxyJj1bS
+EaYINx7E+Nvva/A/6nz4bJgMq6e7KzPqZHyWMTBXQ4afosnY5uCQt4y6lWRfp6dZ
+EDYJ9xGftlgsIeNDwnvVjUFd5QOIWeSgSg0G8+tk+cn4wWNzKHjU+CHs71CvUisP
+E232x8fcRN183kNo+7Ngtyo2rFW9y6+iz3BGNYNmdX6V4DKT/7tflYv1MpGbpMqT
+0lmAX+WPwp3p2tOft+mXQSnFmpA+vuiyL+UdPZKAx8iq9EgqupUmpLo5I27uVntK
+ZrteTHcpjAiTTCwJPYP9UCnimtW9TNJsFCC1cbWgTZJE8XPjY8uk/+AvZVxJr9Y2
+pfekQjBTc4Kybu5gzU5msqvA3qfLBIRNYyPJj7t0QOTOF6kWt9aqj7Q/5NahCSIa
+FPrlL7Qo0H6mXwAVYX7dOID4GQyWCyDt9PIKRShPcJ+PpqOglyCZD/lDZs8K4crj
+23Sft5cdt6k3DAomt6sSpfP32wnXW9wQpYJvVbXnmKI2mtUs+EVrNE4VHyEbjvWc
+LJhL38yJs9DvGyoFJPo5
+=Esc8
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r1.ebuild
index 909d5423859a..c54b8bdb8f24 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r1.ebuild,v 1.1 2015/03/14 14:12:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-10.1-r1.ebuild,v 1.2 2015/03/15 18:06:56 mgorny Exp $
 
 EAPI=5
 
@@ -14,6 +14,7 @@ IUSE="+build-kernel debug dtrace profile zfs"
 if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 	SRC_URI="http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${SYS}.tar.xz
+		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${CONTRIB}.tar.xz
 		http://dev.gentoo.org/~mgorny/dist/freebsd/${RV}/${UBIN}.tar.xz"
 fi
 
@@ -96,13 +97,7 @@ src_compile() {
 	if use build-kernel ; then
 		if has_version "<sys-freebsd/freebsd-ubin-10.0"; then
 			cd "${WORKDIR}"/usr.bin/bmake || die
-			if [[ -e /usr/lib/libgcc.a ]] ; then
-				freebsd_src_compile
-			else
-				local CC_SAVE="${CC}"
-				CC=gcc freebsd_src_compile
-				export CC="${CC_SAVE}"
-			fi
+			CC=${CHOST}-gcc freebsd_src_compile
 			export BMAKE="${WORKDIR}/usr.bin/bmake/make"
 		fi
 		cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die