From 13ed9bcdf8ea5c67237afd792981907d09032db5 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Sat, 26 Apr 2014 11:26:17 +0000 Subject: Version bump. Drop versaloon use flag and merge it to the usb one. Update live ebuild (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!) --- dev-embedded/openocd/ChangeLog | 9 +- dev-embedded/openocd/openocd-0.8.0_rc1.ebuild | 140 -------------------------- dev-embedded/openocd/openocd-0.8.0_rc2.ebuild | 138 +++++++++++++++++++++++++ dev-embedded/openocd/openocd-9999.ebuild | 14 ++- 4 files changed, 152 insertions(+), 149 deletions(-) delete mode 100644 dev-embedded/openocd/openocd-0.8.0_rc1.ebuild create mode 100644 dev-embedded/openocd/openocd-0.8.0_rc2.ebuild (limited to 'dev-embedded/openocd') diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog index 13223b1be3c2..6f13abfda033 100644 --- a/dev-embedded/openocd/ChangeLog +++ b/dev-embedded/openocd/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-embedded/openocd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.46 2014/04/06 16:02:36 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.47 2014/04/26 11:26:17 hwoarang Exp $ + +*openocd-0.8.0_rc2 (26 Apr 2014) + + 26 Apr 2014; Markos Chandras +openocd-0.8.0_rc2.ebuild, + -openocd-0.8.0_rc1.ebuild, openocd-9999.ebuild: + Version bump. Drop versaloon use flag and merge it to the usb one. Update live + ebuild *openocd-0.8.0_rc1 (06 Apr 2014) diff --git a/dev-embedded/openocd/openocd-0.8.0_rc1.ebuild b/dev-embedded/openocd/openocd-0.8.0_rc1.ebuild deleted file mode 100644 index 1c4fe894cfea..000000000000 --- a/dev-embedded/openocd/openocd-0.8.0_rc1.ebuild +++ /dev/null @@ -1,140 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc1.ebuild,v 1.1 2014/04/06 16:02:36 hwoarang Exp $ - -EAPI="5" - -inherit eutils multilib flag-o-matic toolchain-funcs - -# One ebuild to rule them all -if [[ ${PV} == "9999" ]] ; then - inherit autotools git-2 - KEYWORDS="" - EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" -else - MY_PV="${PV/_/-}" - MY_P="${PN}-${MY_PV}" - S="${WORKDIR}"/${MY_P} - KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" -fi - -DESCRIPTION="OpenOCD - Open On-Chip Debugger" -HOMEPAGE="http://openocd.sourceforge.net" - -LICENSE="GPL-2" -SLOT="0" -IUSE="blaster dummy ftdi minidriver parport presto segger +usb versaloon verbose-io" -RESTRICT="strip" # includes non-native binaries - -# versaloon needs libusb:0 but the rest of the devices need libusb:1 -# Therefore, treat versaloon as a special case and always pull libusb:1 -# so most of the devices are supported by default. -DEPEND=">=dev-lang/jimtcl-0.73 - usb? ( - versaloon? ( virtual/libusb:0 ) - virtual/libusb:1 - ) - ftdi? ( dev-embedded/libftdi )" - -RDEPEND="${DEPEND}" - -REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi ) versaloon? ( usb )" - -src_prepare() { - epatch_user - - if [[ ${PV} == "9999" ]] ; then - sed -i -e "/@include version.texi/d" doc/${PN}.texi || die - AT_NO_RECURSIVE=yes eautoreconf - fi - - # Disable craptastic build settings. - sed -i \ - -e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if false:' \ - configure || die - - if use ftdi ; then - local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)" - # Use libftdi-1 paths #460916 - local libs=$($(tc-getPKG_CONFIG) --libs ${pc}) - sed -i \ - -e "s:-lftdi -lusb:${libs}:" \ - configure src/Makefile.in || die - append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc}) - fi -} - -src_configure() { - # Here are some defaults - local myconf=( - --enable-buspirate - --enable-ioutil - --disable-werror - --disable-internal-jimtcl - --enable-amtjtagaccel - --enable-ep93xx - --enable-at91rm9200 - --enable-gw16012 - --enable-oocd_trace - --enable-arm-jtag-ew - ) - - # Adapters requiring usb/libusb-1.X support - if use usb; then - myconf+=( - --enable-aice - --enable-ti-icdi - --enable-ulink - --enable-osbdm - --enable-opendous - --enable-usbprog - --enable-jlink - --enable-rlink - --enable-stlink - --enable-vsllink - --enable-arm-jtag-ew - $(use_enable verbose-io verbose-usb-io) - $(use_enable verbose-io verbose_usb_comms) - ) - else - myconf+=( - --disable-aice - --disable-stlink - --disable-ti-icdi - --disable-ulink - --disable-osbdm - --disable-opendous - ) - fi - - if use blaster; then - myconf+=( - --enable-usb_blaster_libftdi - --enable-usb-blaster-2 - ) - else - myconf+=( - --disable-usb_blaster_libftdi - --disable-usb-blaster-2 - ) - fi - - econf \ - $(use_enable dummy) \ - $(use_enable ftdi) \ - $(use_enable minidriver minidriver-dummy) \ - $(use_enable parport) \ - $(use_enable parport parport_ppdev) \ - $(use_enable parport parport_giveio) \ - $(use_enable presto presto_libftdi) \ - $(use_enable segger jlink) \ - $(use_enable versaloon vsllink) \ - $(use_enable verbose-io verbose-jtag-io) \ - "${myconf[@]}" -} - -src_install() { - default - env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir) -} diff --git a/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild b/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild new file mode 100644 index 000000000000..669b130620ba --- /dev/null +++ b/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild,v 1.1 2014/04/26 11:26:17 hwoarang Exp $ + +EAPI="5" + +inherit eutils multilib flag-o-matic toolchain-funcs + +# One ebuild to rule them all +if [[ ${PV} == "9999" ]] ; then + inherit autotools git-2 + KEYWORDS="" + EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" +else + MY_PV="${PV/_/-}" + MY_P="${PN}-${MY_PV}" + S="${WORKDIR}"/${MY_P} + KEYWORDS="~amd64 ~x86" + SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz" +fi + +DESCRIPTION="OpenOCD - Open On-Chip Debugger" +HOMEPAGE="http://openocd.sourceforge.net" + +LICENSE="GPL-2" +SLOT="0" +IUSE="blaster dummy ftdi minidriver parport presto segger +usb verbose-io" +RESTRICT="strip" # includes non-native binaries + +# Pull both libusb:0 and libusb:1 because some device need the former +# others need the later etc. +DEPEND=">=dev-lang/jimtcl-0.73 + usb? ( + virtual/libusb:0 + virtual/libusb:1 + ) + ftdi? ( dev-embedded/libftdi )" + +RDEPEND="${DEPEND}" + +REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi )" + +src_prepare() { + epatch_user + + if [[ ${PV} == "9999" ]] ; then + sed -i -e "/@include version.texi/d" doc/${PN}.texi || die + AT_NO_RECURSIVE=yes eautoreconf + fi + + # Disable craptastic build settings. + sed -i \ + -e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if false:' \ + configure || die + + if use ftdi ; then + local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)" + # Use libftdi-1 paths #460916 + local libs=$($(tc-getPKG_CONFIG) --libs ${pc}) + sed -i \ + -e "s:-lftdi -lusb:${libs}:" \ + configure src/Makefile.in || die + append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc}) + fi +} + +src_configure() { + # Here are some defaults + local myconf=( + --enable-buspirate + --enable-ioutil + --disable-werror + --disable-internal-jimtcl + --enable-amtjtagaccel + --enable-ep93xx + --enable-at91rm9200 + --enable-gw16012 + --enable-oocd_trace + --enable-arm-jtag-ew + ) + + # Adapters requiring usb/libusb-1.X support + if use usb; then + myconf+=( + --enable-aice + --enable-ti-icdi + --enable-ulink + --enable-osbdm + --enable-opendous + --enable-usbprog + --enable-jlink + --enable-rlink + --enable-stlink + --enable-vsllink + --enable-arm-jtag-ew + $(use_enable verbose-io verbose-usb-io) + $(use_enable verbose-io verbose_usb_comms) + ) + else + myconf+=( + --disable-aice + --disable-stlink + --disable-ti-icdi + --disable-ulink + --disable-osbdm + --disable-opendous + ) + fi + + if use blaster; then + myconf+=( + --enable-usb_blaster_libftdi + --enable-usb-blaster-2 + ) + else + myconf+=( + --disable-usb_blaster_libftdi + --disable-usb-blaster-2 + ) + fi + + econf \ + $(use_enable dummy) \ + $(use_enable ftdi) \ + $(use_enable minidriver minidriver-dummy) \ + $(use_enable parport) \ + $(use_enable parport parport_ppdev) \ + $(use_enable parport parport_giveio) \ + $(use_enable presto presto_libftdi) \ + $(use_enable segger jlink) \ + $(use_enable verbose-io verbose-jtag-io) \ + "${myconf[@]}" +} + +src_install() { + default + env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir) +} diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild index b29cb8243035..592a7bf44d03 100644 --- a/dev-embedded/openocd/openocd-9999.ebuild +++ b/dev-embedded/openocd/openocd-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.32 2014/04/06 16:02:36 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.33 2014/04/26 11:26:17 hwoarang Exp $ EAPI="5" @@ -24,22 +24,21 @@ HOMEPAGE="http://openocd.sourceforge.net" LICENSE="GPL-2" SLOT="0" -IUSE="blaster dummy ftdi minidriver parport presto segger +usb versaloon verbose-io" +IUSE="blaster dummy ftdi minidriver parport presto segger +usb verbose-io" RESTRICT="strip" # includes non-native binaries -# versaloon needs libusb:0 but the rest of the devices need libusb:1 -# Therefore, treat versaloon as a special case and always pull libusb:1 -# so most of the devices are supported by default. +# Pull both libusb:0 and libusb:1 because some device need the former +# others need the later etc. DEPEND=">=dev-lang/jimtcl-0.73 usb? ( - versaloon? ( virtual/libusb:0 ) + virtual/libusb:0 virtual/libusb:1 ) ftdi? ( dev-embedded/libftdi )" RDEPEND="${DEPEND}" -REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi ) versaloon? ( usb )" +REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi )" src_prepare() { epatch_user @@ -129,7 +128,6 @@ src_configure() { $(use_enable parport parport_giveio) \ $(use_enable presto presto_libftdi) \ $(use_enable segger jlink) \ - $(use_enable versaloon vsllink) \ $(use_enable verbose-io verbose-jtag-io) \ "${myconf[@]}" } -- cgit v1.2.3-65-gdbad