sys-app/seabios:

	fixed a bug in 1.7.0

4 files changed, 150 insertions, 7 deletions

diff --git a/sys-apps/seabios/ChangeLog b/sys-apps/seabios/ChangeLog
index b19c599..666443c 100644
--- a/sys-apps/seabios/ChangeLog
+++ b/sys-apps/seabios/ChangeLog
@@ -2,7 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/sys-apps/seabios/ChangeLog,v 1.13 2012/06/28 15:09:36 cardoe Exp $
 
-*seabios-1.7.0-r1 (30 Jun 2012)
+*seabios-1.7.0-r3 (01 Jul 2012)
+
+  01 Jul 2012; Stefan Kuhn <wuodan@hispeed.ch> +seabios-1.7.0-r3.ebuild:
+    Combined new flags from 1.7.0-r1 with fix from -r2.
+
+  01 Jul 2012; Stefan Kuhn <wuodan@hispeed.ch> +seabios-1.7.0-r2.ebuild:
+    Fixed a warning in 1.7.0.
 
   30 Jun 2012; Stefan Kuhn <wuodan@hispeed.ch> +seabios-1.7.0-r1.ebuild:
     Added 2 new flags. bug #415665
diff --git a/sys-apps/seabios/Manifest b/sys-apps/seabios/Manifest
index b1004cf..702e613 100644
--- a/sys-apps/seabios/Manifest
+++ b/sys-apps/seabios/Manifest
@@ -1,6 +1,8 @@
-DIST seabios-1.6.3.tar.gz 438403 RMD160 66f45495af45df6885d3fc987b13b9ccc03cfe0e SHA1 e1fd07a7ca95acc008d051bc0f2526a8eac962ba SHA256 7bca2e6a0972f16dd238d1ead2f4d12d38dc56e1801237c1205f902d5ea4c799
-DIST seabios-1.7.0.tar.gz 450977 RMD160 1ee3b63576bdcfee81185009fd165765d9badeca SHA1 bece7ef5ee9a7823d3908bfb1fffc48e97cbdafd SHA256 54113c953be055e5ad2e54a32bdd9c9b109b50a7a18bbca70d148807ba2f2cd6
-EBUILD seabios-1.6.3-r1.ebuild 1727 RMD160 c1abf76e83b616f19cceb3debc8d250ed43869b5 SHA1 0c8b1f2ce4a932c4634498265341513fdbdf6adf SHA256 ab96cff9d8d365fe7a5c8510255d91a8f2158ec78a0f2510c6e66c787eaadf5b
-EBUILD seabios-1.7.0-r1.ebuild 1682 RMD160 5354e000fd5d5e9c37aafd7a7f00459cd74129b5 SHA1 0d1aa1fdb495c613c8ff2ab65ee8b595b698b32f SHA256 785e6f64f64e62fc8b288a9ce67efa1ae24d6988f5ba149971c2e39188995a8f
-MISC ChangeLog 2164 RMD160 9884eefbd2a723e8ee8472611a63c0f4b194c439 SHA1 2a5ecbce0bc4599cd63fba106db61ab860aa885e SHA256 7046926aa65c16e2e91a404f649ffa3f6aa315dd78185bfd5a4799966a78e4ce
-MISC metadata.xml 658 RMD160 898b2da3c1c85376203bc3c0b0035ba1db6fc6ef SHA1 68a23854dfc4d37f85165584da6d3d2b1032638b SHA256 5150b3d3fdb300b8eec80ea7c82927f727eb91693bb8ca0ff71603fa8c1c290d
+DIST seabios-1.6.3.tar.gz 438403 SHA1 e1fd07a7ca95acc008d051bc0f2526a8eac962ba SHA256 7bca2e6a0972f16dd238d1ead2f4d12d38dc56e1801237c1205f902d5ea4c799
+DIST seabios-1.7.0.tar.gz 450977 SHA1 bece7ef5ee9a7823d3908bfb1fffc48e97cbdafd SHA256 54113c953be055e5ad2e54a32bdd9c9b109b50a7a18bbca70d148807ba2f2cd6
+EBUILD seabios-1.6.3-r1.ebuild 1727 SHA1 0c8b1f2ce4a932c4634498265341513fdbdf6adf SHA256 ab96cff9d8d365fe7a5c8510255d91a8f2158ec78a0f2510c6e66c787eaadf5b
+EBUILD seabios-1.7.0-r1.ebuild 1682 SHA1 0d1aa1fdb495c613c8ff2ab65ee8b595b698b32f SHA256 785e6f64f64e62fc8b288a9ce67efa1ae24d6988f5ba149971c2e39188995a8f
+EBUILD seabios-1.7.0-r2.ebuild 1322 SHA1 1324cff4bd0565067e0068fcf0c7e77b3adbd350 SHA256 a6396fe1e8f0ab3533741e59a8fd49fe8109943e4f84327da42a59304fc76375
+EBUILD seabios-1.7.0-r3.ebuild 1736 SHA1 83f2cc646b6f7dd9ab22dc998bfb44f353d2c2b3 SHA256 4961458558dcbaa9d9fa955428de206bbc98a04894dbdec458c1e8dc7b1d3858
+MISC ChangeLog 2398 SHA1 46b8a5cbc5639a560b658deaf91da00cc9e15233 SHA256 2076899f742ab566952e1f208936e231910f95e7df08aacfdc4ad03234784534
+MISC metadata.xml 658 SHA1 68a23854dfc4d37f85165584da6d3d2b1032638b SHA256 5150b3d3fdb300b8eec80ea7c82927f727eb91693bb8ca0ff71603fa8c1c290d
diff --git a/sys-apps/seabios/seabios-1.7.0-r2.ebuild b/sys-apps/seabios/seabios-1.7.0-r2.ebuild
new file mode 100644
index 0000000..8eab911
--- /dev/null
+++ b/sys-apps/seabios/seabios-1.7.0-r2.ebuild
@@ -0,0 +1,64 @@
+# 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.7.0.ebuild,v 1.1 2012/06/28 15:09:36 cardoe Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit python
+
+#BACKPORTS=1
+
+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"
+	SRC_URI="http://www.linuxtogo.org/~kevin/SeaBIOS/${PN}-${PV}.tar.gz
+	${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${PN}-${PV}-bp-${BACKPORTS}.tar.bz2}"
+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=""
+RDEPEND="${DEPEND}
+	!app-emulation/qemu
+	!<=app-emulation/qemu-kvm-0.15.0"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	sed 's/$(Q)$(MAKE)/$(Q)+$(MAKE)/' -i "${S}/Makefile"
+	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-apps/seabios/seabios-1.7.0-r3.ebuild b/sys-apps/seabios/seabios-1.7.0-r3.ebuild
new file mode 100644
index 0000000..9c0f7a2
--- /dev/null
+++ b/sys-apps/seabios/seabios-1.7.0-r3.ebuild
@@ -0,0 +1,71 @@
+# 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.7.0.ebuild,v 1.1 2012/06/28 15:09:36 cardoe Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit python
+
+#BACKPORTS=1
+
+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"
+	SRC_URI="http://www.linuxtogo.org/~kevin/SeaBIOS/${PN}-${PV}.tar.gz
+	${BACKPORTS:+http://dev.gentoo.org/~cardoe/distfiles/${PN}-${PV}-bp-${BACKPORTS}.tar.bz2}"
+fi
+
+DESCRIPTION="Open Source implementation of a 16-bit x86 BIOS"
+HOMEPAGE="http://www.seabios.org"
+
+LICENSE="LGPL-3 GPL-3"
+SLOT="0"
+IUSE="debug-serial-port thread-optionroms"
+
+RDEPEND="
+	!app-emulation/qemu
+	!<=app-emulation/qemu-kvm-0.15.0"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	sed 's/$(Q)$(MAKE)/$(Q)+$(MAKE)/' -i "${S}/Makefile"
+	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() {
+	if use debug-serial-port || use thread-optionroms; then
+		emake defconfig || die "Creating default config for ${PN} failed"
+		use debug-serial-port && \
+			sed 's/^# CONFIG_DEBUG_SERIAL is not set$/CONFIG_DEBUG_SERIAL=y\nCONFIG_DEBUG_SERIAL_PORT=0x3f8/' \
+				-i .config
+		use thread-optionroms && \
+			sed 's/^# CONFIG_THREAD_OPTIONROMS is not set$/CONFIG_THREAD_OPTIONROMS=y/' \
+				-i .config
+	fi
+}
+
+src_compile() {
+	emake out/bios.bin
+#	emake out/vgabios.bin
+}
+
+src_install() {
+	insinto /usr/share/seabios
+	doins out/bios.bin
+#	doins out/vgabios.bin
+}