vapier 15/04/18 03:18:44 Modified: metadata.xml flashrom-9999.ebuild ChangeLog Added: flashrom-0.9.8.ebuild Log: Version bump. (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.13 sys-apps/flashrom/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/metadata.xml?rev=1.13&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/metadata.xml?rev=1.13&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/metadata.xml?r1=1.12&r2=1.13 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/flashrom/metadata.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- metadata.xml 20 Dec 2013 19:13:29 -0000 1.12 +++ metadata.xml 18 Apr 2015 03:18:44 -0000 1.13 @@ -12,6 +12,7 @@ </maintainer> <use> <flag name="atahpt">Highpoint (HPT) ATA/RAID controller support</flag> + <flag name="atavia">Support for VIA VT6421A SATA controllers</flag> <flag name="bitbang_spi">Bitbanging SPI infrastructure</flag> <flag name="buspirate_spi">Enable Bus Pirate SPI programmer</flag> <flag name="dediprog">Dediprog SF100 support</flag> @@ -20,13 +21,18 @@ <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="internal_dmi">Enable internal DMI decoding rather than use <pkg>sys-apps/dmidecode</pkg></flag> + <flag name="it8212">Support for ITE IT8212F ATA/RAID controllers</flag> <flag name="linux_spi">Enable support for Linux userspace spidev interface</flag> + <flag name="mstarddc_spi">Support for SPI flash ROMs accessible through DDC in MSTAR-equipped displays</flag> <flag name="nic3com">Enable 3Com NIC programmer</flag> <flag name="nicintel">Support for Intel NICs</flag> + <flag name="nicintel_eeprom">Support for EEPROMs on Intel Gigabit network cards</flag> <flag name="nicintel_spi">Support for SPI on Intel NICs</flag> <flag name="nicnatsemi">Support for National Semiconductor NICs</flag> <flag name="nicrealtek">Support for Realtek NICs</flag> <flag name="ogp_spi">Enable support for OGP (Open Graphics Project) SPI flashing</flag> + <flag name="pickit2_spi">SUpport for SPI flash ROMs accessible via Microchip PICkit2</flag> <flag name="pony_spi">Enable support for SI-Prog like hardware by Lancos</flag> <flag name="rayer_spi">RayeR SPIPGM hardware support</flag> <flag name="satasii">Enable programmer for SiI SATA controllers</flag> @@ -34,6 +40,7 @@ <flag name="serprog">Enable Serial Flasher programmer</flag> <flag name="tools">Install additional tools</flag> <flag name="usbblaster">Enable support for Altera USB-Blaster dongles</flag> + <flag name="usbblaster_spi">Enable support for Altera USB-Blaster dongles</flag> <flag name="wiki">Enable wiki informations, like supported devices etc.</flag> </use> <longdescription lang="en"> 1.11 sys-apps/flashrom/flashrom-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild?rev=1.11&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild?rev=1.11&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild?r1=1.10&r2=1.11 Index: flashrom-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- flashrom-9999.ebuild 4 Aug 2014 02:13:47 -0000 1.10 +++ flashrom-9999.ebuild 18 Apr 2015 03:18:44 -0000 1.11 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 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.10 2014/08/04 02:13:47 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-9999.ebuild,v 1.11 2015/04/18 03:18:44 vapier Exp $ EAPI="5" @@ -10,7 +10,7 @@ inherit subversion else SRC_URI="http://download.flashrom.org/releases/${P}.tar.bz2"; - KEYWORDS="~amd64 ~arm ~mips ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86" fi DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips" @@ -18,77 +18,91 @@ LICENSE="GPL-2" SLOT="0" -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" +# The defaults match the upstream Makefile. +# Note: Do not list bitbang_spi as it is not a programmer; it's a backend used +# by some other spi programmers. +IUSE_PROGRAMMERS="atahpt +atavia +buspirate_spi dediprog +drkaiser +dummy ++ft2232_spi +gfxnvidia +internal +it8212 +linux_spi mstarddc_spi +nic3com ++nicintel +nicintel_eeprom +nicintel_spi nicnatsemi +nicrealtek +ogp_spi ++pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog +usbblaster_spi" +IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki" LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] ) + atavia? ( 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(+)] ) + it8212? ( sys-apps/pciutils[static-libs(+)] ) internal? ( sys-apps/pciutils[static-libs(+)] ) nic3com? ( sys-apps/pciutils[static-libs(+)] ) nicintel? ( sys-apps/pciutils[static-libs(+)] ) + nicintel_eeprom? ( sys-apps/pciutils[static-libs(+)] ) nicintel_spi? ( sys-apps/pciutils[static-libs(+)] ) nicnatsemi? ( sys-apps/pciutils[static-libs(+)] ) nicrealtek? ( sys-apps/pciutils[static-libs(+)] ) + ogp_spi? ( sys-apps/pciutils[static-libs(+)] ) + pickit2_spi? ( virtual/libusb:0[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(+)] )" + satasii? ( sys-apps/pciutils[static-libs(+)] ) + usbblaster_spi? ( dev-embedded/libftdi[static-libs(+)] )" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) sys-apps/diffutils" -RDEPEND+=" internal? ( sys-apps/dmidecode )" +RDEPEND+=" !internal_dmi? ( sys-apps/dmidecode )" _flashrom_enable() { - local c="CONFIG_${2:-$(echo $1 | tr [:lower:] [:upper:])}" - args+=" $c=$(usex $1 yes no)" + local c="CONFIG_${2:-$(echo "$1" | tr [:lower:] [:upper:])}" + args+=( "${c}=$(usex $1 yes no)" ) } flashrom_enable() { local u - for u in "$@" ; do _flashrom_enable $u ; done + for u ; do _flashrom_enable "${u}" ; done +} + +src_prepare() { + sed -i \ + -e 's:pkg-config:$(PKG_CONFIG):' \ + Makefile || die } src_compile() { - local progs=0 - local args="" + # Help keep things in sync. + local sprogs=$(echo $( + grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \ + sort -u | \ + sed 's:^CONFIG_::' | \ + tr '[:upper:]' '[:lower:]')) + local eprogs=$(echo ${IUSE_PROGRAMMERS//[+-]}) + if [[ ${sprogs} != "${eprogs}" ]] ; then + eerror "The ebuild needs to be kept in sync." + eerror "IUSE set to: ${eprogs}" + eerror "flashrom.c : ${sprogs}" + die "sync IUSE to the list of source programmers" + fi - # Programmer - flashrom_enable \ - atahpt bitbang_spi buspirate_spi dediprog drkaiser \ - ft2232_spi gfxnvidia linux_spi nic3com nicintel \ - nicintel_spi nicnatsemi nicrealtek ogp_spi rayer_spi \ - pony_spi satasii satamv serprog usbblaster \ - internal dummy + # Turn USE flags into CONFIG_xxx settings. + local args=() + flashrom_enable ${eprogs} _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. - for prog in ${IUSE//[+-]} ; do - case ${prog} in - internal|dummy|wiki) continue ;; - esac - - use ${prog} && : $(( progs++ )) - done - if [[ ${progs} -ne 1 ]] ; then - if ! use internal && ! use dummy ; then + # We pick dummy as the default because internal requires libpci. + if ! use internal && ! use dummy ; then + if [[ ${#args[@]} -ne 1 ]] ; 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" - ewarn "internal as well. 'internal' will be the default now." - args+=" CONFIG_INTERNAL=yes" + ewarn "internal as well. 'dummy' will be the default now." + args+=( CONFIG_DUMMY=yes ) fi fi - # WARNERROR=no, bug 347879 - tc-export AR CC RANLIB - emake WARNERROR=no ${args} + tc-export AR CC PKG_CONFIG RANLIB + emake WARNERROR=no "${args[@]}" } src_test() { @@ -102,12 +116,12 @@ src_install() { dosbin flashrom doman flashrom.8 - dodoc README Documentation/*.txt + dodoc ChangeLog README Documentation/*.txt - if use tools; then - if use amd64; then + if use tools ; then + if use amd64 ; then dosbin util/ich_descriptors_tool/ich_descriptors_tool - elif use x86; then + elif use x86 ; then dosbin util/ich_descriptors_tool/ich_descriptors_tool fi fi 1.47 sys-apps/flashrom/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/ChangeLog?rev=1.47&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/ChangeLog?rev=1.47&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/ChangeLog?r1=1.46&r2=1.47 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- ChangeLog 4 Aug 2014 02:13:47 -0000 1.46 +++ ChangeLog 18 Apr 2015 03:18:44 -0000 1.47 @@ -1,6 +1,12 @@ # ChangeLog for sys-apps/flashrom -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.46 2014/08/04 02:13:47 vapier Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/ChangeLog,v 1.47 2015/04/18 03:18:44 vapier Exp $ + +*flashrom-0.9.8 (18 Apr 2015) + + 18 Apr 2015; Mike Frysinger <[email protected]> +flashrom-0.9.8.ebuild, + flashrom-9999.ebuild, metadata.xml: + Version bump. 04 Aug 2014; Mike Frysinger <[email protected]> flashrom-0.9.7.ebuild, flashrom-9999.ebuild: 1.1 sys-apps/flashrom/flashrom-0.9.8.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/flashrom-0.9.8.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/flashrom/flashrom-0.9.8.ebuild?rev=1.1&content-type=text/plain Index: flashrom-0.9.8.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-apps/flashrom/flashrom-0.9.8.ebuild,v 1.1 2015/04/18 03:18:44 vapier Exp $ EAPI="5" inherit eutils toolchain-funcs if [[ ${PV} == "9999" ]] ; then ESVN_REPO_URI="svn://flashrom.org/flashrom/trunk" inherit subversion else SRC_URI="http://download.flashrom.org/releases/${P}.tar.bz2"; KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86" fi DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips" HOMEPAGE="http://flashrom.org/"; LICENSE="GPL-2" SLOT="0" # The defaults match the upstream Makefile. # Note: Do not list bitbang_spi as it is not a programmer; it's a backend used # by some other spi programmers. IUSE_PROGRAMMERS="atahpt +atavia +buspirate_spi dediprog +drkaiser +dummy +ft2232_spi +gfxnvidia +internal +it8212 +linux_spi mstarddc_spi +nic3com +nicintel +nicintel_eeprom +nicintel_spi nicnatsemi +nicrealtek +ogp_spi +pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog +usbblaster_spi" IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki" LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] ) atavia? ( 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(+)] ) it8212? ( sys-apps/pciutils[static-libs(+)] ) internal? ( sys-apps/pciutils[static-libs(+)] ) nic3com? ( sys-apps/pciutils[static-libs(+)] ) nicintel? ( sys-apps/pciutils[static-libs(+)] ) nicintel_eeprom? ( sys-apps/pciutils[static-libs(+)] ) nicintel_spi? ( sys-apps/pciutils[static-libs(+)] ) nicnatsemi? ( sys-apps/pciutils[static-libs(+)] ) nicrealtek? ( sys-apps/pciutils[static-libs(+)] ) ogp_spi? ( sys-apps/pciutils[static-libs(+)] ) pickit2_spi? ( virtual/libusb:0[static-libs(+)] ) rayer_spi? ( sys-apps/pciutils[static-libs(+)] ) satamv? ( sys-apps/pciutils[static-libs(+)] ) satasii? ( sys-apps/pciutils[static-libs(+)] ) usbblaster_spi? ( dev-embedded/libftdi[static-libs(+)] )" RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" DEPEND="${RDEPEND} static? ( ${LIB_DEPEND} ) sys-apps/diffutils" RDEPEND+=" !internal_dmi? ( sys-apps/dmidecode )" _flashrom_enable() { local c="CONFIG_${2:-$(echo "$1" | tr [:lower:] [:upper:])}" args+=( "${c}=$(usex $1 yes no)" ) } flashrom_enable() { local u for u ; do _flashrom_enable "${u}" ; done } src_prepare() { sed -i \ -e 's:pkg-config:$(PKG_CONFIG):' \ Makefile || die } src_compile() { # Help keep things in sync. local sprogs=$(echo $( grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \ sort -u | \ sed 's:^CONFIG_::' | \ tr '[:upper:]' '[:lower:]')) local eprogs=$(echo ${IUSE_PROGRAMMERS//[+-]}) if [[ ${sprogs} != "${eprogs}" ]] ; then eerror "The ebuild needs to be kept in sync." eerror "IUSE set to: ${eprogs}" eerror "flashrom.c : ${sprogs}" die "sync IUSE to the list of source programmers" fi # Turn USE flags into CONFIG_xxx settings. local args=() flashrom_enable ${eprogs} _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. # We pick dummy as the default because internal requires libpci. if ! use internal && ! use dummy ; then if [[ ${#args[@]} -ne 1 ]] ; 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" ewarn "internal as well. 'dummy' will be the default now." args+=( CONFIG_DUMMY=yes ) fi fi tc-export AR CC PKG_CONFIG RANLIB 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 Documentation/*.txt 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 }
