gentoo resync : 29.06.2021

7 files changed, 100 insertions, 54 deletions

diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index b6c3d42ed5ab..d717f222b9c7 100644
--- a/sys-firmware/Manifest.gz
+++ b/sys-firmware/Manifest.gz
diff --git a/sys-firmware/edk2-ovmf/Manifest b/sys-firmware/edk2-ovmf/Manifest
index 02a19d59ae5f..a722c2955cea 100644
--- a/sys-firmware/edk2-ovmf/Manifest
+++ b/sys-firmware/edk2-ovmf/Manifest
@@ -1,11 +1,11 @@
 DIST brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz 23855739 BLAKE2B 7406ec5b29ac66afbcd7c1376bb3208f298d19b6592b2869c52173aa64947d58bd443f9a61c67deaf046be910a0e31c0b843e5508e97e0e1f5e7bce100d86904 SHA512 df8e90562c4fd7f0e787949df6bc4f5a165b39bd333f442d27874fe65640fbba268f9350d7113e6761a5acceb66d78e75f1a296e5a89b94574edf28109cdc812
-DIST edk2-ovmf-201905-bin.tar.xz 3017256 BLAKE2B 6a106f111a363f1c2de33c4e7eba48183da6047654512939c286c6d0369e3b4c7705c271e61fa95299ba2b629022be7b5ef665ff096d41373583f5409b5c32fb SHA512 4a174dc1d64769a93de3bf5f9d787e278bfab57e2317699d722aa772e64e8867b3998b7feee58d5e4c66adc79ba9c5023dae2ce786159db7a740b86cf35d923d
-DIST edk2-ovmf-201905-bundled.tar.xz 3538508 BLAKE2B a1766180c84ee83987f50fdb6a6c9891dfb983ff78c98f7bc38635ffe484ebf29d4286ff97d7747080e28a655ff14b5939d4505d75ebe6655ecacc7f9d405469 SHA512 be3d8ef1ffb1ddce64883d9ef8dc598c7026d23d2e33c33949d28de81513b6a7f04f840ccb3d42664e918c6603487fbe594261c327921f3250c3998218572774
-DIST edk2-ovmf-201905.tar.gz 14551747 BLAKE2B 6fb3385445fd01c0dea26295a68de2691524e55c96d8a0e85aab1385a9abddc47c13ce3236b952c1299514e542ad0fa4bc9550cc4527945c05109d227a698293 SHA512 91188923f7d1ab83c0d6abf7ec6d59f357d0341a617ad6a3ae05f3d0e041dff43f62b014b0c5fc5d15e16d8f1c279c581a5cd64b31e3d52b340d7ef90adb50f1
 DIST edk2-ovmf-202008-bin.tar.xz 3486024 BLAKE2B 8283db554ad7024e3a55b62ed0a560ed9f729d728f1dee3806814b1eb8d89dabc4fd70433f7f77656b65d9af7919d036074a53a95190a1aa8b65ab7d73495ffc SHA512 d0c8b249a7a2124e8bb63a4358466e86a3a837e76586565dd4762351998d8561374eabb8a1303dbf71ac269c15552d9e8cff71d65bc6fe8a3a81fb4fb032e0d8
 DIST edk2-ovmf-202008-qemu-firmware.tar.xz 680 BLAKE2B 176f8e94a3f605acc72850634cbf155619490f5998125521a392a8e9c7d2b78841b841f0cb5ea860f14645b124cf1921256bbe46960efbe3401805d89bbfbed6 SHA512 b72f248ab4d49503c3e8e686e22beb77f0e48d2c6c9523f389f20504e0c30fa11fa0fcb5607d7d5bb1ba2433894fa458864c5761335e39de4b2a40b01203f043
 DIST edk2-ovmf-202008.tar.gz 13172590 BLAKE2B 10acf77d0e70e21ca425ea41c0062f8cebe2cc607b93a2a253bcd87cea1546e791776a34d43fbf4f1040f4fc32e3ee413d44873d0f00b9e523816519cfed634e SHA512 c32340104f27b9b85f79e934cc9eeb739d47b01e13975c88f39b053e9bc5a1ecfe579ab3b63fc7747cc328e104b337b53d41deb4470c3f20dbbd5552173a4666
+DIST edk2-ovmf-202105-qemu-firmware.tar.xz 672 BLAKE2B e87845a84c83f65db836fd054c81a4f3062d5e0fcc51aa0ecf9c2d23c8741f218d38ef737d140f5935ce8d9c34508e5f3b9f54bf9c547a391fa63cdc2ecf1233 SHA512 6100502f26db26e407dacce57c96b1abfd372bcb31767a068332afa09ac435a092fd2a73db27670d27c6e927c26e88315346bbac70578571108434b9683bd00c
+DIST edk2-ovmf-202105-r1-bin.tar.xz 2633188 BLAKE2B 93b4bd1c75da69406b5d27ac32d8b7c63dc8248bcd5d54832e520a4b009be4b7f215eb7d489ecb7cb16d31e02452dfa06b8fa709f37c44e59b4ff70a550076c7 SHA512 356c2110abce43da9c0654324e222cbbab7085e3aa23d1ba4c98011e4d4992a37d61fa45394305b748d119dba12f65d7c7d630b9f8038065ba4672d758c702be
+DIST edk2-ovmf-202105.tar.gz 13702868 BLAKE2B 3ec01d467562380ca2fd3bd807d2f6c55e4637c1afd71533f8f5b22cc634dc4c8cb63dab921677f8b315d17b3c9d0b6b00a0e2f3f8da61107033e9e81bf5a64d SHA512 c263345cbb243c63985f974a61f37c577a139d6a7099d2b8c9e1a553e5ebf16de12fb711b72624081c6bf637f8084bbf71731ab99e5747d81da460388ac25791
 DIST openssl-e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72.tar.gz 9981169 BLAKE2B 33aac7364cdd45fec5654ab6caef84e1a829464380419c8a6bb311055c5a01c0aaff6e046a7c541a87e908fa9d26bae652f5be901461d03df36f2522f9c34b0c SHA512 db2087c04f0b428b3f4e1c8b3ac53cce69e0fd331ed2b86ba00facafd1685864d73f71c13eee48f4fe0af2bddad848f84a2b8ed2a17fabdf7fa2ed7d9eb39371
-EBUILD edk2-ovmf-201905.ebuild 4543 BLAKE2B 043a609693e04d600c69fad1194c92a4f44932c1f7ae987b0f145cfbeaf3f84527d437da9189828896ae321a888686ca04c74341266f81536ccab3bf2dbcfcd1 SHA512 1ef0f6a913faad32432eb437785973ce7625ad9fdbc2bdcfd344a47b3a0b738af75ddc1a62c7560c24c58d695f0739ee3f35c9d6fadf1a214fbff7074fb2c51f
 EBUILD edk2-ovmf-202008.ebuild 5432 BLAKE2B 50240def951163fa1962b99a1467efbb4abc6fc503a447c5b18fa88785ef227850cf63cb361d41e4e523bbf5eb035e55353829a8c9b0cbd434b4ef8ec7c6d75b SHA512 f77b164efff09364e018778798c41e06cfd8c8a1b209d13625ee24bae46b27600cb0a926412c1f207625e106e8b5ef6cd52dc056815020c037035ecff27a5fd4
+EBUILD edk2-ovmf-202105-r1.ebuild 4936 BLAKE2B 95a607fb3426ae35d5506b94dadde5d79dc485e7b203e8b36ea6074f1f3d71a66d4e43642ef493f6ced04d627cff6b4d0e5094bbf0f4cc763cc16116d1a65e6e SHA512 b4185ce7ca7ae249ff70480957a97cf13fcfbc59d65f3408cdb232b641fa13120b287aedf08acfa0f11ad9b2d6c4873754acdf714c3f3228140f6099d36327ca
 MISC metadata.xml 435 BLAKE2B b33371654b280e097ad5d112081f115446cb01a0efcf3e712bcad7e5a51d95b77f55d0e218c4767803675b71d24b405616849f57051fda492acf5d3c0e8fd1dc SHA512 d1e6233650fc1ea3a25bead14091877b9f507d2bc78cec6436e1b6e17477e40517b74da66e26b6bd39259e4ca308d724324296f1a6c353fed2f8bf112029b90f
diff --git a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
index 845ce19c2dbc..11376aff5d43 100644
--- a/sys-firmware/edk2-ovmf/edk2-ovmf-201905.ebuild
+++ b/sys-firmware/edk2-ovmf/edk2-ovmf-202105-r1.ebuild
@@ -4,55 +4,57 @@
 EAPI=7
 
 PYTHON_REQ_USE="sqlite"
-PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit python-any-r1 readme.gentoo-r1
 
 DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines"
 HOMEPAGE="https://github.com/tianocore/edk2"
 
+BUNDLED_OPENSSL_SUBMODULE_SHA="e2e09d9fba1187f8d6aafaa34d4172f56f1ffb72"
+BUNDLED_BROTLI_SUBMODULE_SHA="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
+
+# TODO: talk with tamiko about unbundling (mva)
+
+# TODO: the binary 202105 package currently lacks the preseeded
+#       OVMF_VARS.secboot.fd file (that we typically get from fedora)
+
+SRC_URI="
+	!binary? (
+		https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
+		https://github.com/openssl/openssl/archive/${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz -> openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}.tar.gz
+		https://github.com/google/brotli/archive/${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz -> brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}.tar.gz
+	)
+	binary? ( https://dev.gentoo.org/~tamiko/distfiles/${PF}-bin.tar.xz )
+	https://dev.gentoo.org/~tamiko/distfiles/${P}-qemu-firmware.tar.xz
+"
+
+LICENSE="BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="+binary"
+REQUIRED_USE+="
+	!amd64? ( binary )
+"
+
 NON_BINARY_DEPEND="
 	app-emulation/qemu
 	>=dev-lang/nasm-2.0.7
 	>=sys-power/iasl-20160729
 	${PYTHON_DEPS}
 "
-DEPEND=""
-RDEPEND=""
-if [[ ${PV} == "999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/tianocore/edk2"
-	DEPEND+="
-		${NON_BINARY_DEPEND}
-	"
-else
-	# Binary versions taken from fedora:
-	# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
-	#   edk2-ovmf-20190501stable-2.fc31.noarch.rpm
-	SRC_URI="
-		!binary? (
-			https://github.com/tianocore/edk2/archive/edk2-stable${PV}.tar.gz -> ${P}.tar.gz
-			https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.xz
+
+DEPEND+="
+	!binary? (
+		amd64? (
+			${NON_BINARY_DEPEND}
 		)
-		binary? ( https://dev.gentoo.org/~tamiko/distfiles/${P}-bin.tar.xz )
-		"
-	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-	IUSE="+binary"
-	REQUIRED_USE+="
-		!amd64? ( binary )
-	"
-	DEPEND+="
-		!binary? (
-			amd64? (
-				${NON_BINARY_DEPEND}
-			)
-		)"
-	PATCHES=(
-	)
-fi
+	)"
+RDEPEND=""
 
-LICENSE="BSD-2 MIT"
-SLOT="0"
+PATCHES=(
+)
 
 S="${WORKDIR}/edk2-edk2-stable${PV}"
 
@@ -83,29 +85,27 @@ In order to use the firmware you can run qemu the following way
 
 	$ qemu-system-x86_64 \
 		-drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \
-		...
-
-You can register the firmware for use in libvirt by adding to /etc/libvirt/qemu.conf:
-	nvram = [
-		\"/usr/share/edk2-ovmf/OVMF_CODE.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-		\"/usr/share/edk2-ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2-ovmf/OVMF_VARS.fd\"
-	]"
+		..."
 
 pkg_setup() {
 	[[ ${PV} != "999999" ]] && use binary || python-any-r1_pkg_setup
 }
 
 src_prepare() {
-	if ! use binary; then
+	if use binary; then
+		eapply_user
+	else
+		# Bundled submodules
+		cp -rl "${WORKDIR}/openssl-${BUNDLED_OPENSSL_SUBMODULE_SHA}"/* "CryptoPkg/Library/OpensslLib/openssl/"
+		cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "BaseTools/Source/C/BrotliCompress/brotli/"
+		cp -rl "${WORKDIR}/brotli-${BUNDLED_BROTLI_SUBMODULE_SHA}"/* "MdeModulePkg/Library/BrotliCustomDecompressLib/brotli/"
+
 		sed -i -r \
 			-e "/function SetupPython3/,/\}/{s,\\\$\(whereis python3\),${EPYTHON},g}" \
 			"${S}"/edksetup.sh || die "Fixing for correct Python3 support failed"
+
+		default
 	fi
-	if  [[ ${PV} != "999999" ]] && use binary; then
-		eapply_user
-		return
-	fi
-	default
 }
 
 src_compile() {
@@ -116,6 +116,8 @@ src_compile() {
 	BUILD_FLAGS="-D TLS_ENABLE \
 		-D HTTP_BOOT_ENABLE \
 		-D NETWORK_IP6_ENABLE \
+		-D TPM_ENABLE \
+		-D TPM2_ENABLE -D TPM2_CONFIG_ENABLE \
 		-D FD_SIZE_2MB"
 
 	SECUREBOOT_BUILD_FLAGS="${BUILD_FLAGS} \
@@ -162,6 +164,9 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins ovmf/*
 
+	insinto /usr/share/qemu/firmware
+	doins qemu/*
+
 	readme.gentoo_create_doc
 }
 
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index bf474d02c8d0..42770fd096f7 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -16,6 +16,6 @@ DIST seabios-1.14.0.tar.gz 628985 BLAKE2B cc1126925dab1551a655680d20d06ebf28c12c
 EBUILD seabios-1.12.0-r1.ebuild 4058 BLAKE2B 960efadabb9000c6aecde46e41760d414f92f7b915ae546faf831cd52954b8f78e98419faeb54200189d0210c2d72057fa05997fa848fc10a42cbdff3d665a47 SHA512 9a9fe25e5766f9fc88fc22ac3fe796a3229a36bdba5c08a7648df8dcea0e8502fa9ada2ab3ab1aee2466f67bbb678e3e500ee99e2fe24b3e8b77c4bdded33a32
 EBUILD seabios-1.12.0.ebuild 3439 BLAKE2B 4e88e25af3df5c52d44259b8078f2c6a7baf5d88dfd572ab7e25c1d0a35737eca941002fb2e111a70143d95af61b012bbeb1da7e33a1b900471a4c3720cd6f70 SHA512 7e9a0e45766736bfc4aa71736aeee1e5301a044cb84f0ea7060be4cfc2e6f7da97ca789d136b85911d05a25aa1abcc6f644ebdf2da3c5e7a4371171d18614423
 EBUILD seabios-1.14.0-r1.ebuild 3921 BLAKE2B a09d2c72a1403fd258a62e6b7af04efa19316ba3a9c042467ad1afba80176391c27b8e5f10d45ba7fa5894b541c3c7af1d4e4878d076a93ea530b96e14f26535 SHA512 8b9793cd7d7dada46e7b6e25c314e5227950e7eeed7608ecc2768b9f640c7d10a91db2b6e6d8b54e36c2c196ac907db781023b440ec360caf7dbeae6c6a9cff3
-EBUILD seabios-1.14.0-r2.ebuild 4305 BLAKE2B c7076b9093cbe51872db6bd06ae19b8cfd54375c975467594c78e2679a89f554cf0c905d5c1e3329be5d1d2952c0fa0f4066a0b263d39b62fbcf413095792c21 SHA512 48c4513833991f4ed1b3c40c4c1be88d668c8d19298bf5a6b6ba22868e85d120e4fa46ae798f3efb0fe91d8fbe3e97a79a0aabb62663e58f931671e7db3c2339
+EBUILD seabios-1.14.0-r2.ebuild 4302 BLAKE2B 64da89e0d6a92cf8f5518e864cffa0f1642691540bd8e71222fa92a462dfac2ef8b71f40f34b97c3cd7e231a423aa73f3986656ac4d508ba691053381900dbdf SHA512 3b1906a83ddcd0c09254d483194f3ab2497d70fe669070159ce2ffbf44d7f71fcdd072eb2bd2ab43179611e9ba919c33d5d3ebc22e5d41a4568c65d5cc312f71
 EBUILD seabios-1.14.0.ebuild 3772 BLAKE2B d85c7bcbf55536018caf679e2d611eedf5536557aa6e6f7a76e664b9db3922fcb40b4d19c8dd2f29b711f9afbea824537dc7029dfd3595ef388c8fa04e6d482d SHA512 7b67858c146b4e7a515269d32363fc2cdbee0f4a36b094ddf60b9f2c8fc34f74d82d9364d19c6dffe3d1d56f158b2c232b4b3b114e37c13d0f84907cd87dd033
 MISC metadata.xml 551 BLAKE2B 1bc4f5bcc0dd85ff4e14ededc83e631c942995a8f0ba9534d72b6d5b671ad471eeb0c43a02ce4cf7c0b79d7f0d5583d419c46aaa8c297f1544353b8f42cdefa4 SHA512 5a580198036d96152d46c79b19317e35e5ba15f998ccaeade825189ee640a6ca50552a46f56f783ebba288df3953d461695039539c47baa27e3c9da1f8b1ccc0
diff --git a/sys-firmware/seabios/seabios-1.14.0-r2.ebuild b/sys-firmware/seabios/seabios-1.14.0-r2.ebuild
index 1e33e9260a57..1982195e9d1b 100644
--- a/sys-firmware/seabios/seabios-1.14.0-r2.ebuild
+++ b/sys-firmware/seabios/seabios-1.14.0-r2.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
 	EGIT_REPO_URI="git://git.seabios.org/seabios.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86"
 
 	SRC_URI="
 		!binary? ( https://www.seabios.org/downloads/${P}.tar.gz )
diff --git a/sys-firmware/vgabios/Manifest b/sys-firmware/vgabios/Manifest
index ea8da3038688..c0c09721f00d 100644
--- a/sys-firmware/vgabios/Manifest
+++ b/sys-firmware/vgabios/Manifest
@@ -1,5 +1,7 @@
 DIST vgabios-0.7a-fixes-1.tar.bz2 2602 BLAKE2B 68fbd29e6c660dc69ea110e00ff75fc9d14f10bd11b9be89bd373281852a3133c73ee0f2a7ecdf026b29979e4c20bcdbad0baf9f80d013ffeb24dda892725778 SHA512 30992efac011d4b99301960df08cdc69d9503aa6b61feed01fca2c5a910460269d9500650cb394a0737318e977a282c5e0ab613a8b2bc28b9f0c6528a9a77d73
 DIST vgabios-0.7a.tgz 1506655 BLAKE2B fb9b99ab385423b4ef103a56de140591556d2f49fffebfdd508a462551b1a9def9d8dc50c947a88ef6d47c43ff62dbe3d97fef969d985c49b9e78671eaefd34e SHA512 35d789b1b39f8f05b757b6c3379a1b2c33dc27b244720471530325f3e215b5f4fa97cfbfc131f813013f4640fe85be912e7b4cb924fa87ed35e68b6966424874
+DIST vgabios-0.8a.tgz 174452 BLAKE2B b8c63d0375a2d08b5e0d55e25844ed8c09066ee3a3582d6be8de84fdac98b59b86e2db764f5b01e29703bf188cee631b84d3807678b2f8452f87b590d06bbf3a SHA512 bc0028ec9ed39659a65b1135d3803a1d1b48a4e2e6622d87a9c85f0c5099bb69602ad51c38f9915420554bce41599d41ac8a333e0502bd17acaa9ee2db70b662
 EBUILD vgabios-0.7a-r1.ebuild 1669 BLAKE2B c6f596bbf7b9ef22634de6c2d44e16b479ab8cf0284572ff5e493647f62696e52e8345b6d1c87b38a0e71515e879ecfb1591a457b9ccaa2f91f2494c39ddd8a9 SHA512 b24e3472a46c86ac510628a3266eebb61ca34792d8bf55450796919300ac75b13e8cb4735234fcedac50aa982ec8fb015e7c721e8633819886ded3c6ea39be84
 EBUILD vgabios-0.7a.ebuild 1635 BLAKE2B 9ced20787c35a6c9b73508d274e17e1869e7b27456b5c82a377d117f210c933dc42250bdd5ef142f43a48c0a98420d4c502ce8ea56c232272fe83b71428e4ea5 SHA512 7577d3a41ea5acaf929c9095c50ff9143e91c449414fc1c315358b2d77e67b8ccb43727892d44498b1eb32272093d42e4e7650ee674e65438cdfd1c0f0153f6b
+EBUILD vgabios-0.8a.ebuild 925 BLAKE2B 67073016fce8aaed21a55d8b03e4ad216743017b10d5e16b2f36976c9420066ae90e662d54a27740a23d35c886ee92c70ba1d20f6b01472fdbdd0ee31d55041a SHA512 ac682b4d860ee0f5b06fd4796555c90341aeb18168bf90ddbe96f280e72b528c4e623a96e864f968f6b078dd4554b185c551a3fd8167447b80267acb64dad7e0
 MISC metadata.xml 497 BLAKE2B 486ae4d9758667855e7920cc589aa1a284c0be89387f78c2c226701fa2f32bc20a6769b909d63f9c04483aa900d0d0858fec2db4e49fe6e710cf9dd6df458263 SHA512 c7f5fb5b3c08c0cd3d7460d4ada18ce829dadd3c286782cc064ce18af5b427e20c5be8925b8ed179ceb2ee2405aa0a85593b268c1d98dfae5d55f06587d6de47
diff --git a/sys-firmware/vgabios/vgabios-0.8a.ebuild b/sys-firmware/vgabios/vgabios-0.8a.ebuild
new file mode 100644
index 000000000000..b6e76ce21a67
--- /dev/null
+++ b/sys-firmware/vgabios/vgabios-0.8a.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="VGA BIOS implementation"
+HOMEPAGE="http://www.nongnu.org/vgabios/"
+SRC_URI="https://savannah.gnu.org/download/${PN}/${P}.tgz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="binary debug"
+BDEPEND="!binary? ( sys-devel/dev86 )"
+
+src_compile() {
+	if ! use binary ; then
+		emake clean # Necessary to clean up the pre-built pieces
+		emake biossums
+		emake
+	fi
+}
+
+src_install() {
+	insinto /usr/share/vgabios
+
+	# Stock VGABIOS
+	newins VGABIOS-lgpl-latest.bin vgabios.bin
+	use debug && newins VGABIOS-lgpl-latest.debug.bin vgabios.debug.bin
+
+	# Cirrus
+	newins VGABIOS-lgpl-latest.cirrus.bin vgabios-cirrus.bin
+	use debug && newins VGABIOS-lgpl-latest.cirrus.debug.bin \
+		vgabios-cirrus.debug.bin
+
+	# Banshee
+	newins VGABIOS-lgpl-latest.banshee.bin vgabios-banshee.bin
+
+}