seabios: upgraded package to upstream
Upgraded sys-firmware/seabios to version 1.7.2.2 on amd64
BUG=chromium:220911
TEST=`emerge qemu` works
TEST=`cbuildbot chromiumos-sdk` works
TEST=`cbuildbot {x86-alex,daisy,lumpy}-release` passes
Change-Id: Ibde32458c584c272c2aca580f6f1f04b28c59f23
Reviewed-on: https://chromium-review.googlesource.com/179216
Reviewed-by: Stefan Reinauer <reinauer@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.6.3 b/metadata/md5-cache/sys-firmware/seabios-1.6.3
deleted file mode 100644
index a4a7311..0000000
--- a/metadata/md5-cache/sys-firmware/seabios-1.6.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=!sys-apps/seabios =dev-lang/python-2*
-DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
-EAPI=4
-HOMEPAGE=http://www.seabios.org
-KEYWORDS=amd64 x86
-LICENSE=LGPL-3 GPL-3
-RDEPEND=!sys-apps/seabios !app-emulation/qemu !<=app-emulation/qemu-kvm-0.15.0 =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.linuxtogo.org/~kevin/SeaBIOS/seabios-1.6.3.tar.gz
-_eclasses_=multilib ded93e450747134a079e647d888aa80b python 305197b0aa1194fa3ef67ca21f6faa7e toolchain-funcs 3e30ef439a720915f8f4fd4fe75f704c
-_md5_=411c6067ef76ab3b39efd4308d1bfe49
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.7.2.2 b/metadata/md5-cache/sys-firmware/seabios-1.7.2.2
new file mode 100644
index 0000000..5b6e9bb
--- /dev/null
+++ b/metadata/md5-cache/sys-firmware/seabios-1.7.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare pretend setup
+DEPEND=!binary? ( >=sys-power/iasl-20060912 || ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-2.6.8-r3:2.6 ) )
+DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
+EAPI=5
+HOMEPAGE=http://www.seabios.org
+IUSE=+binary
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-3 GPL-3
+REQUIRED_USE=ppc? ( binary ) ppc64? ( binary )
+SLOT=0
+SRC_URI=http://code.coreboot.org/p/seabios/downloads/get/seabios-1.7.2.2.tar.gz http://code.coreboot.org/p/seabios/downloads/get/bios.bin-1.7.2.2.gz http://dev.gentoo.org/~cardoe/distfiles/seabios-1.7.2.2.tar.gz http://dev.gentoo.org/~cardoe/distfiles/bios.bin-1.7.2.2.gz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib ded93e450747134a079e647d888aa80b python-any-r1 08d3455b23110d650f173ab0a090818b python-utils-r1 49ee0ca5e1019d8f256a23692dad2642 toolchain-funcs 3e30ef439a720915f8f4fd4fe75f704c user 9e552f935106ff0bc92af16da64b4b29
+_md5_=eac7a41c555ddad1c53b43d8120f322a
diff --git a/sys-firmware/seabios/Manifest b/sys-firmware/seabios/Manifest
index 8686eec..9aa32da 100644
--- a/sys-firmware/seabios/Manifest
+++ b/sys-firmware/seabios/Manifest
@@ -1 +1,2 @@
-DIST seabios-1.6.3.tar.gz 438403 RMD160 66f45495af45df6885d3fc987b13b9ccc03cfe0e SHA1 e1fd07a7ca95acc008d051bc0f2526a8eac962ba SHA256 7bca2e6a0972f16dd238d1ead2f4d12d38dc56e1801237c1205f902d5ea4c799
+DIST bios.bin-1.7.2.2.gz 71896 SHA256 c285c3f6c6819ded8e536d2719e28d1840f50730bc4ef790125cc905c91b0416 SHA512 f14a66733a8806d3d12dc3e58dd0969172f1aef9c3826f2b6e87b805cb789cbea7d1e766e8b0e0f1d729e30def575f0ed6515a702ef709e932e78f7e87279db9 WHIRLPOOL 1e9748c768bbc9886e60cb3d6ad091e0193b3e2f9e44867d30bc2270126e8087f04911ab7c9788d3107c067d9ad4929b9a7e9f5fc18e4baa53416a21fbd184d0
+DIST seabios-1.7.2.2.tar.gz 448904 SHA256 5ef40e80c8e4ae825922766e82f28232958056f82912a72916ca5dae2147deaa SHA512 2fbe56d04af92b7e7166d2c4b0af0395750c57449735302ee4ef3794a5789a1d1922f9fce53970d3f1923f8ca82daa1d3e4041caaae884c9366c41e11e316e17 WHIRLPOOL 1ffcdc294f7827f669db34e120ccbf6da183359360010288556157d9287b2f55097c90750c3a3f252560363f2b938e8ce95bfb17300e1bc6549a2ae3216a041e
diff --git a/sys-firmware/seabios/metadata.xml b/sys-firmware/seabios/metadata.xml
new file mode 100644
index 0000000..d7ef91f
--- /dev/null
+++ b/sys-firmware/seabios/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>virtualization</herd>
+ <maintainer>
+ <email>cardoe@gentoo.org</email>
+ <name>Doug Goldstein</name>
+ </maintainer>
+ <use>
+ <flag name='binary'>Use official upstream pre-built binaries</flag>
+ </use>
+</pkgmetadata>
+
diff --git a/sys-firmware/seabios/seabios-1.6.3.ebuild b/sys-firmware/seabios/seabios-1.6.3.ebuild
deleted file mode 100644
index 93f3153..0000000
--- a/sys-firmware/seabios/seabios-1.6.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/seabios/seabios-1.6.3.ebuild,v 1.4 2012/01/24 01:32:19 vapier Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2"
-
-#BACKPORTS=1
-
-if [[ ${PV} = *9999* || ! -z "${EGIT_COMMIT}" ]]; then
- EGIT_REPO_URI="git://git.seabios.org/seabios.git"
- GIT_ECLASS="git-2"
- SRC_URI=""
-else
- SRC_URI="http://www.linuxtogo.org/~kevin/SeaBIOS/${P}.tar.gz
- ${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-bp-${BACKPORTS}.tar.bz2}"
-fi
-
-inherit ${GIT_ECLASS} python
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
-HOMEPAGE="http://www.seabios.org"
-
-LICENSE="LGPL-3 GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="!sys-apps/seabios"
-RDEPEND="${DEPEND}
- !app-emulation/qemu
- !<=app-emulation/qemu-kvm-0.15.0"
-
-pkg_setup() {
- python_set_active_version 2
-}
-
-src_prepare() {
- if [[ -z "${EGIT_COMMIT}" ]]; then
- sed -e "s/VERSION=.*/VERSION=${PV}/" \
- -i "${S}/Makefile"
- else
- sed -e "s/VERSION=.*/VERSION=${PV}_pre${EGIT_COMMIT}/" \
- -i "${S}/Makefile"
- fi
-}
-
-src_configure() {
- :
-}
-
-src_compile() {
- emake out/bios.bin
-# emake out/vgabios.bin
-}
-
-src_install() {
- insinto /usr/share/seabios
- doins out/bios.bin
-# doins out/vgabios.bin
-}
diff --git a/sys-firmware/seabios/seabios-1.7.2.2.ebuild b/sys-firmware/seabios/seabios-1.7.2.2.ebuild
new file mode 100644
index 0000000..792c931
--- /dev/null
+++ b/sys-firmware/seabios/seabios-1.7.2.2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-firmware/seabios/seabios-1.7.2.2.ebuild,v 1.4 2013/09/14 10:04:38 ago Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils python-any-r1
+
+#BACKPORTS=1
+
+# SeaBIOS maintainers don't release stable tarballs or stable binaries
+# to generate the stable tarball the following is necessary:
+# git clone git://git.seabios.org/seabios.git && cd seabios
+# git archive --output seabios-${PV}.tar.gz --prefix seabios-${PV}/ rel-${PV}
+
+if [[ ${PV} = *9999* || ! -z "${EGIT_COMMIT}" ]]; then
+ EGIT_REPO_URI="git://git.seabios.org/seabios.git"
+ inherit git-2
+ KEYWORDS=""
+ SRC_URI=""
+else
+ KEYWORDS="amd64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+ SRC_URI="http://code.coreboot.org/p/seabios/downloads/get/${P}.tar.gz
+ http://code.coreboot.org/p/seabios/downloads/get/bios.bin-${PV}.gz
+ http://dev.gentoo.org/~cardoe/distfiles/${P}.tar.gz
+ http://dev.gentoo.org/~cardoe/distfiles/bios.bin-${PV}.gz
+ ${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
+fi
+
+DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
+HOMEPAGE="http://www.seabios.org"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+IUSE="+binary"
+
+REQUIRED_USE="ppc? ( binary )
+ ppc64? ( binary )"
+
+DEPEND="
+ !binary? (
+ >=sys-power/iasl-20060912
+ ${PYTHON_DEPS}
+ )
+"
+RDEPEND=""
+
+pkg_pretend() {
+ if ! use binary; then
+ ewarn "You have decided to compile your own SeaBIOS. This is not"
+ ewarn "supported by upstream unless you use their recommended"
+ ewarn "toolchain (which you are not)."
+ elog
+ ewarn "If you are intending to use this build with QEMU, realize"
+ ewarn "you will not receive any support if you have compiled your"
+ ewarn "own SeaBIOS. Virtual machines subtly fail based on changes"
+ ewarn "in SeaBIOS."
+ fi
+}
+
+pkg_setup() {
+ if ! use binary; then
+ python-any-r1_pkg_setup
+ fi
+}
+
+src_prepare() {
+ if [[ -z "${EGIT_COMMIT}" ]]; then
+ sed -e "s/VERSION=.*/VERSION=${PV}/" \
+ -i "${S}/Makefile"
+ else
+ sed -e "s/VERSION=.*/VERSION=${PV}_pre${EGIT_COMMIT}/" \
+ -i "${S}/Makefile"
+ fi
+
+ epatch_user
+}
+
+src_configure() {
+ :
+}
+
+src_compile() {
+ if ! use binary ; then
+ LANG=C emake out/bios.bin
+ fi
+}
+
+src_install() {
+ insinto /usr/share/seabios
+ if ! use binary ; then
+ doins out/bios.bin
+ else
+ newins ../bios.bin-${PV} bios.bin
+ fi
+}
