summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-11-28 22:05:02 +0000
committerMike Frysinger <vapier@gentoo.org>2013-11-28 22:05:02 +0000
commit8e23cd79bb37166b8c40bf3889091c2c5dad6ab6 (patch)
tree82638ade05bedb40ef0b3e7e0b195b00a1501b22 /sys-apps
parentPull in dejagnu for FEATURES=test #490174 by Nikoli. (diff)
downloadgentoo-2-8e23cd79bb37166b8c40bf3889091c2c5dad6ab6.tar.gz
gentoo-2-8e23cd79bb37166b8c40bf3889091c2c5dad6ab6.tar.bz2
gentoo-2-8e23cd79bb37166b8c40bf3889091c2c5dad6ab6.zip
Sync the 9999 and non-9999 ebuilds.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/flashrom/ChangeLog6
-rw-r--r--sys-apps/flashrom/flashrom-9999.ebuild16
2 files changed, 17 insertions, 5 deletions
diff --git a/sys-apps/flashrom/ChangeLog b/sys-apps/flashrom/ChangeLog
index 92640d968508..561f52e39b5e 100644
--- a/sys-apps/flashrom/ChangeLog
+++ b/sys-apps/flashrom/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/flashrom
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.37 2013/11/09 20:32:49 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.38 2013/11/28 22:05:02 vapier Exp $
+
+ 28 Nov 2013; Mike Frysinger <vapier@gentoo.org> flashrom-0.9.7.ebuild,
+ flashrom-9999.ebuild:
+ Sync the 9999 and non-9999 ebuilds.
09 Nov 2013; Christian Ruppert <idl0r@gentoo.org> -flashrom-0.9.4.ebuild,
-flashrom-0.9.5.2.ebuild, -flashrom-0.9.6.ebuild:
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index f58c18c25be4..efb1ae985b6e 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild,v 1.4 2013/11/09 20:31:49 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild,v 1.5 2013/11/28 22:05:02 vapier Exp $
EAPI="5"
@@ -21,7 +21,7 @@ SLOT="0"
IUSE="atahpt +bitbang_spi +buspirate_spi +dediprog doc +drkaiser
+dummy ft2232_spi +gfxnvidia +internal +nic3com +nicintel +nicintel_spi
nicnatsemi nicrealtek +ogp_spi rayer_spi
-+pony_spi +satasii satamv +serprog usbblaster +wiki"
++pony_spi +satasii satamv +serprog tools usbblaster +wiki"
COMMON_DEPEND="atahpt? ( sys-apps/pciutils )
dediprog? ( virtual/libusb:1 )
@@ -86,15 +86,23 @@ src_compile() {
# WARNERROR=no, bug 347879
tc-export AR CC RANLIB
- emake WARNERROR=no ${args} || die
+ emake WARNERROR=no ${args}
}
src_install() {
- dosbin flashrom || die
+ dosbin flashrom
doman flashrom.8
dodoc ChangeLog README
if use doc; then
dodoc Documentation/*.txt
fi
+
+ if use tools; then
+ if use amd64; then
+ dosbin util/ich_descriptors_tool/ich_descriptors_tool
+ elif use x86; then
+ dosbin util/ich_descriptors_tool/ich_descriptors_tool
+ fi
+ fi
}