diff options
Diffstat (limited to 'sys-apps/flashrom')
-rw-r--r-- | sys-apps/flashrom/ChangeLog | 8 | ||||
-rw-r--r-- | sys-apps/flashrom/flashrom-0.9.5.1.ebuild (renamed from sys-apps/flashrom/flashrom-0.9.5.ebuild) | 20 | ||||
-rw-r--r-- | sys-apps/flashrom/flashrom-9999.ebuild | 12 |
3 files changed, 28 insertions, 12 deletions
diff --git a/sys-apps/flashrom/ChangeLog b/sys-apps/flashrom/ChangeLog index 2f83afd681c7..71b45f34bc57 100644 --- a/sys-apps/flashrom/ChangeLog +++ b/sys-apps/flashrom/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/flashrom # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.20 2012/02/18 18:58:02 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.21 2012/03/02 01:47:54 idl0r Exp $ + +*flashrom-0.9.5.1 (02 Mar 2012) + + 02 Mar 2012; Christian Ruppert <idl0r@gentoo.org> -flashrom-0.9.5.ebuild, + +flashrom-0.9.5.1.ebuild, flashrom-9999.ebuild: + Version bump. Sync with the live ebuild. *flashrom-0.9.5 (18 Feb 2012) diff --git a/sys-apps/flashrom/flashrom-0.9.5.ebuild b/sys-apps/flashrom/flashrom-0.9.5.1.ebuild index 673faea22496..34cc3b2c50be 100644 --- a/sys-apps/flashrom/flashrom-0.9.5.ebuild +++ b/sys-apps/flashrom/flashrom-0.9.5.1.ebuild @@ -1,18 +1,23 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-0.9.5.ebuild,v 1.1 2012/02/18 18:58:02 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-0.9.5.1.ebuild,v 1.1 2012/03/02 01:47:54 idl0r Exp $ -EAPI="3" +EAPI="4" -inherit toolchain-funcs +inherit eutils toolchain-funcs +if [[ ${PV} == "9999" ]] ; then + ESVN_REPO_URI="svn://coreboot.org/flashrom/trunk" + inherit subversion +else + SRC_URI="http://download.flashrom.org/releases/${P}.tar.bz2" + KEYWORDS="~amd64 ~arm ~x86" +fi DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips" HOMEPAGE="http://flashrom.org/" -SRC_URI="http://download.flashrom.org/releases/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" IUSE="+atahpt +bitbang_spi +buspirate_spi dediprog doc +drkaiser +dummy ft2232_spi +gfxnvidia +internal +nic3com +nicintel +nicintel_spi +nicnatsemi +nicrealtek +ogp_spi +rayer_spi @@ -40,7 +45,7 @@ DEPEND="${COMMON_DEPEND} _flashrom_enable() { local c="CONFIG_${2:-$(echo $1 | tr [:lower:] [:upper:])}" - args+=" $c=`use $1 && echo yes || echo no`" + args+=" $c=$(usex $1 yes no)" } flashrom_enable() { local u @@ -79,7 +84,8 @@ src_compile() { fi # WARNERROR=no, bug 347879 - emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" WARNERROR=no ${args} || die + tc-export AR CC RANLIB + emake WARNERROR=no ${args} || die } src_install() { diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild index f599dd34a916..10496be628ad 100644 --- a/sys-apps/flashrom/flashrom-9999.ebuild +++ b/sys-apps/flashrom/flashrom-9999.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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.1 2011/10/14 18:54:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild,v 1.2 2012/03/02 01:47:54 idl0r Exp $ -EAPI="3" +EAPI="4" inherit eutils toolchain-funcs if [[ ${PV} == "9999" ]] ; then @@ -18,7 +18,7 @@ HOMEPAGE="http://flashrom.org/" LICENSE="GPL-2" SLOT="0" -IUSE="+atahpt +bitbang_spi +buspirate_spi dediprog +drkaiser +IUSE="+atahpt +bitbang_spi +buspirate_spi dediprog doc +drkaiser +dummy ft2232_spi +gfxnvidia +internal +nic3com +nicintel +nicintel_spi +nicnatsemi +nicrealtek +ogp_spi +rayer_spi +satasii +satamv +serprog +wiki" @@ -92,4 +92,8 @@ src_install() { dosbin flashrom || die doman flashrom.8 dodoc ChangeLog README + + if use doc; then + dodoc Documentation/*.txt + fi } |