Version bump, based on work of Yuta SATOH in bug #476646

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

4 files changed, 147 insertions, 5 deletions

diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog
index f8b581bba839..a3cad2141129 100644
--- a/sys-freebsd/boot0/ChangeLog
+++ b/sys-freebsd/boot0/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-freebsd/boot0
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.43 2013/08/09 15:09:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.44 2013/08/10 02:30:59 aballier Exp $
+
+*boot0-9.2_rc1 (10 Aug 2013)
+
+  10 Aug 2013; Alexis Ballier <aballier@gentoo.org> +boot0-9.2_rc1.ebuild,
+  +files/boot0-9.2-gcc46.patch:
+  Version bump, based on work of Yuta SATOH in bug #476646
 
   09 Aug 2013; Alexis Ballier <aballier@gentoo.org> -boot0-9.0.ebuild:
   remove old
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 1567962d2c99..71d9b2b51606 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -2,18 +2,23 @@
 Hash: SHA256
 
 AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2 WHIRLPOOL ddf074f25ebf256f543cd5ceb8e64934cc045e6dc81f49ef14aad009de69c84309d0b7927c87ff36c75c008fae975e25708b9ec8f21cb083bba77daf3e5107d4
+AUX boot0-9.2-gcc46.patch 2119 SHA256 745245270e8ac2e8a1084f1785bb31ce7a5d2c7242f762260ad9a97fa02970f5 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9 WHIRLPOOL 0c057ffe2baa7cb1b74912cebed5ec5f31adee7780a77993b40bad256e89baf3ed4dc18567c263bfed9a76e63e274072945e37dd729ac62c8538ab7678e4dfe1
 DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee
+DIST freebsd-contrib-9.2_rc1.tar.bz2 56727056 SHA256 5026afa26e434e934cc9934c74628fa79e8b75b7bee1e214e34f9aae8d1b592d SHA512 8a9a4a522bfd3ce573fbe81f758c6e581f3e2d14d6eb58f7d4f821c850882793b334b59591baf94fa4668acb835895c7de2d4380d74851adb1760eb4e20dc124 WHIRLPOOL da92a22ea65fd3985529b5355be8d11622538b73ec2fb57d005d83b95b59e20e7f763d632ada0edc0be73d33c0dec668f31ae4bb90b421ca7d324a2274d01696
 DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0
+DIST freebsd-lib-9.2_rc1.tar.bz2 3255347 SHA256 78f748c2dfc51427dbbcaa1bbce49348cdb98378435e4ab0052458001ce40ae7 SHA512 64a63e2160cff00ec8da32313688a6f86feeed22ec77587991531c4817212300f1c74d97d0e4dba77c61a35fd323fba9d7ba31ae365b4890a1551b3e3e2da54a WHIRLPOOL 1b064e1768f41cca6bcd1c716e9f06179cbd6c196ef2c482e5f8b07375700a8247724375d162f75f9e7cb2b19ff8f10355d0501220f3f4dccdf7c7fb9cb4c626
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
+DIST freebsd-sys-9.2_rc1.tar.bz2 34377450 SHA256 0db609374f4922e026779331a3299cfe542049014e9bdc4de0990aba539b7518 SHA512 ab7e6301180560934da38a3ef1de3623f0e42c6ee5ba2695754784c5af80ab8367b5d5412bbee51e8ba963b7f5835be9c3789b66b33be338bb9194a9de15b2eb WHIRLPOOL 7afbf758f0a02ea0337b58dd8f12876b8b58dbf73d8a3c237e1bfe2c77b72f319080d91a52ef2918e2c133af5924b302712fcc76ebe2cb334c561f18511698b1
 EBUILD boot0-8.2.ebuild 1289 SHA256 40e0e4d5a35139168f684a17063dcc109c2a8b51e24713d90177a057eeba62ce SHA512 79785ee0f577f744dd4087f69333bc76d9624046526d4f9a36f2be9d27e8b68e3d3bb488147996cd95a034ab288274c43bee8ac444776f40c2e9f2f3ed3edb91 WHIRLPOOL b9c59ec699020212e0ce439bde6b3d4acf899e2b6620ce3261f537e1ce05108989b8cff38abd1ab4afc1586e1ba564d1221e420d83c6509ad24f260e1a803d15
 EBUILD boot0-9.1.ebuild 1495 SHA256 140d29c0ec90d5d790c85f8ace671d56190ce979b0924238c3f4aec8c0dd2849 SHA512 26a8b9c0c649866fb2a08f87a5f1a48fdefcabe3450c0addc65fc1d86860c8352986736de02db67bc477453acd04aed71346b9938fc898b69dfafce61ebdfeab WHIRLPOOL 0715d6f4d749f1ce435e65b619c1034cf7dc40114f16eef1c6424a19c8705ab7c9a8ba4e8278466466c2a8cf95c3f5acf90255ba7956f96232da3c08e20b0ef3
-MISC ChangeLog 6143 SHA256 2f03a27e46025a869dfa452337485736a9b1650c5c3cf563a984d9f39c970ec5 SHA512 64826fac35cae8ff1e6faa7e38ced1b34eba637b079dda6f8bf33c38c9192b4b529f06aa7630dfacbac03b8004661fd7197f9485ee0bf61ece7384bc221be5f3 WHIRLPOOL 022e3f82b4caf6de313afdc8580b9654be21c19b8582e35e5ce5f6f3daef3105789cc2d6a36b657c85e19358144d64edbf4c8e7815fd7e8b342b1572ff362bd1
+EBUILD boot0-9.2_rc1.ebuild 1602 SHA256 1af021202d0dab9e3a8f0ff6813c13df9c56d495522c53049f3bbf877b19b723 SHA512 5791321c39b57a7d18c52dcfa39bbbc9603520b5d0d4b371d5e0f239f2d3ed2947d515c4399e3e70de1bf43acfdb6977cba0f09531a07b57b82dbbf3ac8dd8e7 WHIRLPOOL cbf4274d5cf879d333498822967f094aa7a9756d2311bdb9e71469d03fdcaaed680cc7c090e356bbd741bdfb2962a75dff89ab0dff1efefdb8315ca370914260
+MISC ChangeLog 6340 SHA256 5976a3699d494b3096c03f1869a0a712ab52f53d3e77d30ac9fbd47fe1bb43ec SHA512 1910adca5d3ca8ec2fac599c8695465a75ee8437c5c17e808e32b5c53aa859319337d7d0c9a0455a51fe3b8ad43ec6df20ca724fc4e19fd796d1146254a1766c WHIRLPOOL 253e1798887bbd50beeb2b4bfe64ba8fcb198030a56644615cf18c4699841ea6e7c47f3cabdd844c9d2c4b2003fee754d8260f53714ec54b06c0cc0ffbc97dff
 MISC metadata.xml 295 SHA256 922f6d4e6468957777d39f1f596b0770e5bae7372d0bf3165e0cff93a838b644 SHA512 5543bbaf2b1d8532edb50462c17ff024af0f34466ed075888742ea0408a3518788684c74738bc2037ebadcace35d5018390dc81f08a2b29a127b2bbce98d73c1 WHIRLPOOL 26819d164c3bdad8c1bea131f5031165f8135b40faf0f2df40bc9b92201eed989975d021309c739f09c753a42ea3ebd31ac203ed32e1ba09df8f8d5b2d27c8d9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIFBkcACgkQvFcC4BYPU0qqIQCfQ93hlzDubczcwxlOWOelBaXa
-PcUAnj6LsWpn3fd5WTlEzRDB7O33FSlG
-=PFWH
+iEYEAREIAAYFAlIFpeUACgkQvFcC4BYPU0onegCfeU5KA12nJ4JPTkTyCANHDkE0
+CH8An0k3V82l7Lz+vhGc/38vlbbNpCgQ
+=cofO
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/boot0/boot0-9.2_rc1.ebuild b/sys-freebsd/boot0/boot0-9.2_rc1.ebuild
new file mode 100644
index 000000000000..3f608483a906
--- /dev/null
+++ b/sys-freebsd/boot0/boot0-9.2_rc1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-9.2_rc1.ebuild,v 1.1 2013/08/10 02:30:59 aballier Exp $
+
+EAPI=2
+
+inherit bsdmk freebsd flag-o-matic toolchain-funcs
+
+DESCRIPTION="FreeBSD's bootloader"
+SLOT="0"
+
+IUSE="bzip2 ieee1394 tftp zfs"
+
+if [[ ${PV} != *9999* ]]; then
+	KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	SRC_URI="mirror://gentoo/${SYS}.tar.bz2
+		mirror://gentoo/${LIB}.tar.bz2
+		mirror://gentoo/${CONTRIB}.tar.bz2"
+fi
+
+RDEPEND=""
+DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
+	=sys-freebsd/freebsd-lib-${RV}*"
+
+S="${WORKDIR}/sys/boot"
+
+PATCHES=( "${FILESDIR}/${PN}-9.2-gcc46.patch" )
+
+boot0_use_enable() {
+	use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
+}
+
+pkg_setup() {
+	boot0_use_enable ieee1394 FIREWIRE
+	boot0_use_enable zfs ZFS
+	boot0_use_enable tftp TFTP
+	boot0_use_enable bzip2 BZIP2
+}
+
+src_prepare() {
+	sed -e '/-fomit-frame-pointer/d' -e '/-mno-align-long-strings/d' \
+		-i "${S}"/i386/boot2/Makefile \
+		-i "${S}"/i386/gptboot/Makefile \
+		-i "${S}"/i386/gptzfsboot/Makefile \
+		-i "${S}"/i386/zfsboot/Makefile || die
+}
+
+src_compile() {
+	strip-flags
+	append-flags "-fno-strict-aliasing"
+
+	cd "${WORKDIR}/lib/libstand" || die
+	freebsd_src_compile
+
+	cd "${S}"
+	CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand"
+	LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand"
+	export LIBSTAND="${WORKDIR}/lib/libstand/libstand.a"
+	NOFLAGSTRIP="yes" freebsd_src_compile
+}
+
+src_install() {
+	dodir /boot/defaults
+	mkinstall FILESDIR=/boot || die "mkinstall failed"
+}
diff --git a/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch b/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch
new file mode 100644
index 000000000000..ffd9f4351d1f
--- /dev/null
+++ b/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch
@@ -0,0 +1,66 @@
+diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc
+index f5faec7..a9cf593 100644
+--- a/sys/boot/i386/Makefile.inc
++++ b/sys/boot/i386/Makefile.inc
+@@ -12,7 +12,6 @@ LDFLAGS+=	-nostdlib
+ .if ${MACHINE_CPUARCH} == "amd64"
+ CFLAGS+=	-m32
+ ACFLAGS+=	-m32
+-LDFLAGS+=	-m elf_i386_fbsd
+ AFLAGS+=	--32
+ .endif
+ 
+diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
+index 65815a5..61840dd 100644
+--- a/sys/boot/i386/boot2/Makefile
++++ b/sys/boot/i386/boot2/Makefile
+@@ -109,3 +109,10 @@ machine:
+ # XXX: clang integrated-as doesn't grok .codeNN directives yet
+ CFLAGS.boot1.S=		${CLANG_NO_IAS}
+ CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
++
++# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build.
++CFLAGS+=		-fno-asynchronous-unwind-tables
++
++.if ${MACHINE_CPUARCH} == "amd64"
++LDFLAGS+=		-m elf_i386_fbsd
++.endif
+diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile
+index e1a640a..29886cc 100644
+--- a/sys/boot/i386/gptboot/Makefile
++++ b/sys/boot/i386/gptboot/Makefile
+@@ -78,3 +78,8 @@ machine:
+ # XXX: clang integrated-as doesn't grok .codeNN directives yet
+ CFLAGS.gptldr.S=	${CLANG_NO_IAS}
+ CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
++
++.if ${MACHINE_CPUARCH} == "amd64"
++LDFLAGS+=		-m elf_i386_fbsd
++.endif
++
+diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile
+index a2b8fcc..107f531 100644
+--- a/sys/boot/i386/gptzfsboot/Makefile
++++ b/sys/boot/i386/gptzfsboot/Makefile
+@@ -76,3 +76,8 @@ machine:
+ # XXX: clang integrated-as doesn't grok .codeNN directives yet
+ CFLAGS.gptldr.S=	${CLANG_NO_IAS}
+ CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
++
++.if ${MACHINE_CPUARCH} == "amd64"
++LDFLAGS+=		-m elf_i386_fbsd
++.endif
++
+diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile
+index b2db778..252dc62 100644
+--- a/sys/boot/i386/zfsboot/Makefile
++++ b/sys/boot/i386/zfsboot/Makefile
+@@ -89,3 +89,8 @@ machine:
+ # XXX: clang integrated-as doesn't grok .codeNN directives yet
+ CFLAGS.zfsldr.S=	${CLANG_NO_IAS}
+ CFLAGS+=		${CFLAGS.${.IMPSRC:T}}
++
++.if ${MACHINE_CPUARCH} == "amd64"
++LDFLAGS+=		-m elf_i386_fbsd
++.endif
++