gentoo resync : 29.05.2018

3 files changed, 0 insertions, 134 deletions

diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index f589e18cea3e..fefa03a93960 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,10 +1,5 @@
 AUX boot0-11.0-gcc46.patch 481 BLAKE2B 32b905518fbb8c4016afe4296715369b344ab0397d4df7c3255d5b64d2600d1b1715a071ff720de74f44bb89bd623b850f0e11d7f7acd587c550b30d4dfe704c SHA512 114580260572d03ae145f38d9e7552e18d1d9eace430c102dbc73de055e453fdff9fd81e1ee6f4237d36b87800ff1da63b78ecdd17208ecf8969919fa245cf01
-AUX boot0-9.2-gcc46.patch 2119 BLAKE2B bbe757cddd6808b0df4769a63e78ef4e83364a7bbe9b2c738e80bff50bc7e90d5203fdadf8aa1ad96411564ce229818c286606d2cb1eed87e7dd577e626c3474 SHA512 ee834269bdc4a79da6854f59fe896b8e13efd1f60d97aefc8829cd1137f8f84810bba4344aac79424a4f31503a1a8579caf468e83a60d127d81f5d10fcbc4ae9
 AUX boot0-add-nossp-cflags.patch 341 BLAKE2B 71eecc9af36e07b331ef842d1cd52688d5c8e152b54a44c7598253bc7078ab8f84a5b8aaa54a796ae88aae9d262546a65a86a35445f41ea1772b4434bf194e0d SHA512 980a6b8f247f0d51724f409627c81e5e089e4b2a7b11732bc3cf569f87a5c308e7c2e5985ce3ba32c61c489a5a1e16596bde43ef3c260b0730ec67e50f42e9bb
-DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
-DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
 DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
-DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
 EBUILD boot0-11.1.ebuild 1928 BLAKE2B bcec8c212cbf66cb521010b5a91e6f5c3189c69821ba98139f90aba64efde512e9890803ad6ce9798a754bb39ca1b08e37154d1e520758183cdb6fc745c0ce72 SHA512 d68766eaeae64385bbc4d241704f8099b7a81bd38c56f63b2b9302666874f3876f4958d23b43d3046fedbfbb126e1aed7f09af13f05c346045c58f952ce7a135
-EBUILD boot0-9.1.ebuild 1465 BLAKE2B f1cc0b6d2207a102005e1022315d9f0254e02683a936e8f81ae1d269535589c8d08fa6d76ab235f83976852adeb896068bdcf0c740799c0c2b53fe1ecd870726 SHA512 bab0d5a99eaeeb5ed3a47903f9a28c277bd8047cdbe5d8affb4e32a22c0af3360f073a4d4f41d7a893263b724b1fe46ab4df978f210118db00523d25d73644a5
 MISC metadata.xml 385 BLAKE2B d91b401fe4cbcbe6eeb2e0621e7dc26f0c5a26e11219828fd0df652231d7ccf809b2824eb995463cac8e14056e3065a189667f2351d24510fe0980ca6b2a77f8 SHA512 b65045bfb5e261f1a26102c00ff576065570701658bc643ded73761de269e72fb8843ce38231e92def5c7823720e1ec687b8cce575307097847d10dd35b8a808
diff --git a/sys-freebsd/boot0/boot0-9.1.ebuild b/sys-freebsd/boot0/boot0-9.1.ebuild
deleted file mode 100644
index 54793cef68a1..000000000000
--- a/sys-freebsd/boot0/boot0-9.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-inherit bsdmk freebsd flag-o-matic
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-KEYWORDS="~amd64-fbsd ~x86-fbsd"
-
-IUSE="bzip2 ieee1394 tftp zfs"
-
-SRC_URI="mirror://gentoo/${SYS}.tar.bz2
-	mirror://gentoo/${LIB}.tar.bz2
-	mirror://gentoo/${CONTRIB}.tar.bz2"
-
-RDEPEND=""
-DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
-	=sys-freebsd/freebsd-lib-${RV}*"
-
-S="${WORKDIR}/sys/boot"
-
-PATCHES=( "${FILESDIR}/${PN}-9.2-gcc46.patch"
-	"${FILESDIR}/${PN}-add-nossp-cflags.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
deleted file mode 100644
index ffd9f4351d1f..000000000000
--- a/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-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
-+