* [gentoo-commits] gentoo-x86 commit in sys-apps/flashrom: metadata.xml flashrom-0.9.7.ebuild ChangeLog flashrom-9999.ebuild
@ 2013-12-20 19:13 Mike Frysinger (vapier)
0 siblings, 0 replies; only message in thread
From: Mike Frysinger (vapier) @ 2013-12-20 19:13 UTC (permalink / raw
To: gentoo-commits
vapier 13/12/20 19:13:29
Modified: metadata.xml flashrom-0.9.7.ebuild ChangeLog
flashrom-9999.ebuild
Log:
Add support for USE=static from ChromiumOS. Kill off USE=doc as it only installs already generated txt files.
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Revision Changes Path
1.12 sys-apps/flashrom/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/metadata.xml?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/metadata.xml?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/metadata.xml?r1=1.11&r2=1.12
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/flashrom/metadata.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- metadata.xml 9 Nov 2013 20:31:49 -0000 1.11
+++ metadata.xml 20 Dec 2013 19:13:29 -0000 1.12
@@ -20,6 +20,7 @@
<flag name="ft2232_spi">Enable ftdi programmer, flashing through FTDI/SPI USB interface</flag>
<flag name="gfxnvidia">Enable NVIDIA programmer</flag>
<flag name="internal">Enable internal/onboard support</flag>
+ <flag name="linux_spi">Enable support for Linux userspace spidev interface</flag>
<flag name="nic3com">Enable 3Com NIC programmer</flag>
<flag name="nicintel">Support for Intel NICs</flag>
<flag name="nicintel_spi">Support for SPI on Intel NICs</flag>
1.3 sys-apps/flashrom/flashrom-0.9.7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/flashrom-0.9.7.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/flashrom-0.9.7.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/flashrom-0.9.7.ebuild?r1=1.2&r2=1.3
Index: flashrom-0.9.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-0.9.7.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- flashrom-0.9.7.ebuild 1 Dec 2013 06:34:43 -0000 1.2
+++ flashrom-0.9.7.ebuild 20 Dec 2013 19:13:29 -0000 1.3
@@ -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-0.9.7.ebuild,v 1.2 2013/12/01 06:34:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-0.9.7.ebuild,v 1.3 2013/12/20 19:13:29 vapier Exp $
EAPI="5"
@@ -18,31 +18,32 @@
LICENSE="GPL-2"
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 tools usbblaster +wiki"
-
-COMMON_DEPEND="atahpt? ( sys-apps/pciutils )
- dediprog? ( virtual/libusb:0 )
- drkaiser? ( sys-apps/pciutils )
- ft2232_spi? ( dev-embedded/libftdi )
- gfxnvidia? ( sys-apps/pciutils )
- internal? ( sys-apps/pciutils )
- nic3com? ( sys-apps/pciutils )
- nicintel? ( sys-apps/pciutils )
- nicintel_spi? ( sys-apps/pciutils )
- nicnatsemi? ( sys-apps/pciutils )
- nicrealtek? ( sys-apps/pciutils )
- rayer_spi? ( sys-apps/pciutils )
- satasii? ( sys-apps/pciutils )
- satamv? ( sys-apps/pciutils )
- usbblaster? ( dev-embedded/libftdi )
- ogp_spi? ( sys-apps/pciutils )"
-RDEPEND="${COMMON_DEPEND}
- internal? ( sys-apps/dmidecode )"
-DEPEND="${COMMON_DEPEND}
+IUSE="atahpt +bitbang_spi +buspirate_spi +dediprog +drkaiser
++dummy ft2232_spi +gfxnvidia +internal +linux_spi +nic3com +nicintel
++nicintel_spi nicnatsemi nicrealtek +ogp_spi rayer_spi
++pony_spi +satasii satamv +serprog static tools usbblaster +wiki"
+
+LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] )
+ dediprog? ( virtual/libusb:0[static-libs(+)] )
+ drkaiser? ( sys-apps/pciutils[static-libs(+)] )
+ ft2232_spi? ( dev-embedded/libftdi[static-libs(+)] )
+ gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
+ internal? ( sys-apps/pciutils[static-libs(+)] )
+ nic3com? ( sys-apps/pciutils[static-libs(+)] )
+ nicintel? ( sys-apps/pciutils[static-libs(+)] )
+ nicintel_spi? ( sys-apps/pciutils[static-libs(+)] )
+ nicnatsemi? ( sys-apps/pciutils[static-libs(+)] )
+ nicrealtek? ( sys-apps/pciutils[static-libs(+)] )
+ rayer_spi? ( sys-apps/pciutils[static-libs(+)] )
+ satasii? ( sys-apps/pciutils[static-libs(+)] )
+ satamv? ( sys-apps/pciutils[static-libs(+)] )
+ usbblaster? ( dev-embedded/libftdi[static-libs(+)] )
+ ogp_spi? ( sys-apps/pciutils[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )
sys-apps/diffutils"
+RDEPEND+=" internal? ( sys-apps/dmidecode )"
_flashrom_enable() {
local c="CONFIG_${2:-$(echo $1 | tr [:lower:] [:upper:])}"
@@ -60,11 +61,12 @@
# Programmer
flashrom_enable \
atahpt bitbang_spi buspirate_spi dediprog drkaiser \
- ft2232_spi gfxnvidia nic3com nicintel nicintel_spi nicnatsemi nicrealtek \
- ogp_spi rayer_spi pony_spi \
- satasii satamv serprog usbblaster \
+ ft2232_spi gfxnvidia linux_spi nic3com nicintel \
+ nicintel_spi nicnatsemi nicrealtek ogp_spi rayer_spi \
+ pony_spi satasii satamv serprog usbblaster \
internal dummy
_flashrom_enable wiki PRINT_WIKI
+ _flashrom_enable static STATIC
# You have to specify at least one programmer, and if you specify more than
# one programmer you have to include either dummy or internal in the list.
@@ -75,7 +77,7 @@
use ${prog} && : $(( progs++ ))
done
- if [ $progs -ne 1 ] ; then
+ if [[ ${progs} -ne 1 ]] ; then
if ! use internal && ! use dummy ; then
ewarn "You have to specify at least one programmer, and if you specify"
ewarn "more than one programmer, you have to enable either dummy or"
@@ -89,14 +91,18 @@
emake WARNERROR=no ${args}
}
+src_test() {
+ if [[ -d tests ]] ; then
+ pushd tests >/dev/null
+ ./tests.py || die
+ popd >/dev/null
+ fi
+}
+
src_install() {
dosbin flashrom
doman flashrom.8
- dodoc ChangeLog README
-
- if use doc; then
- dodoc Documentation/*.txt
- fi
+ dodoc ChangeLog README Documentation/*.txt
if use tools; then
if use amd64; then
1.40 sys-apps/flashrom/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/ChangeLog?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/ChangeLog?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/ChangeLog?r1=1.39&r2=1.40
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ChangeLog 1 Dec 2013 06:34:43 -0000 1.39
+++ ChangeLog 20 Dec 2013 19:13:29 -0000 1.40
@@ -1,6 +1,11 @@
# 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.39 2013/12/01 06:34:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.40 2013/12/20 19:13:29 vapier Exp $
+
+ 20 Dec 2013; Mike Frysinger <vapier@gentoo.org> flashrom-0.9.7.ebuild,
+ flashrom-9999.ebuild, metadata.xml:
+ Add support for USE=static from ChromiumOS. Kill off USE=doc as it only
+ installs already generated txt files.
01 Dec 2013; Mike Frysinger <vapier@gentoo.org> flashrom-0.9.7.ebuild,
flashrom-9999.ebuild:
1.7 sys-apps/flashrom/flashrom-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild?r1=1.6&r2=1.7
Index: flashrom-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- flashrom-9999.ebuild 1 Dec 2013 06:34:43 -0000 1.6
+++ flashrom-9999.ebuild 20 Dec 2013 19:13:29 -0000 1.7
@@ -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.6 2013/12/01 06:34:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild,v 1.7 2013/12/20 19:13:29 vapier Exp $
EAPI="5"
@@ -18,31 +18,32 @@
LICENSE="GPL-2"
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 tools usbblaster +wiki"
-
-COMMON_DEPEND="atahpt? ( sys-apps/pciutils )
- dediprog? ( virtual/libusb:0 )
- drkaiser? ( sys-apps/pciutils )
- ft2232_spi? ( dev-embedded/libftdi )
- gfxnvidia? ( sys-apps/pciutils )
- internal? ( sys-apps/pciutils )
- nic3com? ( sys-apps/pciutils )
- nicintel? ( sys-apps/pciutils )
- nicintel_spi? ( sys-apps/pciutils )
- nicnatsemi? ( sys-apps/pciutils )
- nicrealtek? ( sys-apps/pciutils )
- rayer_spi? ( sys-apps/pciutils )
- satasii? ( sys-apps/pciutils )
- satamv? ( sys-apps/pciutils )
- usbblaster? ( dev-embedded/libftdi )
- ogp_spi? ( sys-apps/pciutils )"
-RDEPEND="${COMMON_DEPEND}
- internal? ( sys-apps/dmidecode )"
-DEPEND="${COMMON_DEPEND}
+IUSE="atahpt +bitbang_spi +buspirate_spi +dediprog +drkaiser
++dummy ft2232_spi +gfxnvidia +internal +linux_spi +nic3com +nicintel
++nicintel_spi nicnatsemi nicrealtek +ogp_spi rayer_spi
++pony_spi +satasii satamv +serprog static tools usbblaster +wiki"
+
+LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] )
+ dediprog? ( virtual/libusb:0[static-libs(+)] )
+ drkaiser? ( sys-apps/pciutils[static-libs(+)] )
+ ft2232_spi? ( dev-embedded/libftdi[static-libs(+)] )
+ gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
+ internal? ( sys-apps/pciutils[static-libs(+)] )
+ nic3com? ( sys-apps/pciutils[static-libs(+)] )
+ nicintel? ( sys-apps/pciutils[static-libs(+)] )
+ nicintel_spi? ( sys-apps/pciutils[static-libs(+)] )
+ nicnatsemi? ( sys-apps/pciutils[static-libs(+)] )
+ nicrealtek? ( sys-apps/pciutils[static-libs(+)] )
+ rayer_spi? ( sys-apps/pciutils[static-libs(+)] )
+ satasii? ( sys-apps/pciutils[static-libs(+)] )
+ satamv? ( sys-apps/pciutils[static-libs(+)] )
+ usbblaster? ( dev-embedded/libftdi[static-libs(+)] )
+ ogp_spi? ( sys-apps/pciutils[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+ static? ( ${LIB_DEPEND} )
sys-apps/diffutils"
+RDEPEND+=" internal? ( sys-apps/dmidecode )"
_flashrom_enable() {
local c="CONFIG_${2:-$(echo $1 | tr [:lower:] [:upper:])}"
@@ -60,11 +61,12 @@
# Programmer
flashrom_enable \
atahpt bitbang_spi buspirate_spi dediprog drkaiser \
- ft2232_spi gfxnvidia nic3com nicintel nicintel_spi nicnatsemi nicrealtek \
- ogp_spi rayer_spi pony_spi \
- satasii satamv serprog usbblaster \
+ ft2232_spi gfxnvidia linux_spi nic3com nicintel \
+ nicintel_spi nicnatsemi nicrealtek ogp_spi rayer_spi \
+ pony_spi satasii satamv serprog usbblaster \
internal dummy
_flashrom_enable wiki PRINT_WIKI
+ _flashrom_enable static STATIC
# You have to specify at least one programmer, and if you specify more than
# one programmer you have to include either dummy or internal in the list.
@@ -75,7 +77,7 @@
use ${prog} && : $(( progs++ ))
done
- if [ $progs -ne 1 ] ; then
+ if [[ ${progs} -ne 1 ]] ; then
if ! use internal && ! use dummy ; then
ewarn "You have to specify at least one programmer, and if you specify"
ewarn "more than one programmer, you have to enable either dummy or"
@@ -89,14 +91,18 @@
emake WARNERROR=no ${args}
}
+src_test() {
+ if [[ -d tests ]] ; then
+ pushd tests >/dev/null
+ ./tests.py || die
+ popd >/dev/null
+ fi
+}
+
src_install() {
dosbin flashrom
doman flashrom.8
- dodoc ChangeLog README
-
- if use doc; then
- dodoc Documentation/*.txt
- fi
+ dodoc ChangeLog README Documentation/*.txt
if use tools; then
if use amd64; then
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-12-20 19:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-20 19:13 [gentoo-commits] gentoo-x86 commit in sys-apps/flashrom: metadata.xml flashrom-0.9.7.ebuild ChangeLog flashrom-9999.ebuild Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox