From a430b328b54f201998f9280eca7d6933ed9ae6f3 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Wed, 29 Aug 2012 17:51:45 +0000 Subject: Version bump. Fix jimtcl dependency on live ebuild (Portage version: 2.1.11.12/cvs/Linux x86_64) --- dev-embedded/openocd/ChangeLog | 8 ++- dev-embedded/openocd/openocd-0.6.0_rc1.ebuild | 79 --------------------------- dev-embedded/openocd/openocd-0.6.0_rc2.ebuild | 79 +++++++++++++++++++++++++++ dev-embedded/openocd/openocd-9999.ebuild | 4 +- 4 files changed, 88 insertions(+), 82 deletions(-) delete mode 100644 dev-embedded/openocd/openocd-0.6.0_rc1.ebuild create mode 100644 dev-embedded/openocd/openocd-0.6.0_rc2.ebuild (limited to 'dev-embedded') diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog index 053e10b3a6e3..152967e60257 100644 --- a/dev-embedded/openocd/ChangeLog +++ b/dev-embedded/openocd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-embedded/openocd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.32 2012/08/22 17:29:19 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.33 2012/08/29 17:51:45 hwoarang Exp $ + +*openocd-0.6.0_rc2 (29 Aug 2012) + + 29 Aug 2012; Markos Chandras +openocd-0.6.0_rc2.ebuild, + -openocd-0.6.0_rc1.ebuild, openocd-9999.ebuild: + Version bump. Fix jimtcl dependency on live ebuild 22 Aug 2012; Markos Chandras openocd-0.5.0.ebuild: Fix dependency for jimtcl diff --git a/dev-embedded/openocd/openocd-0.6.0_rc1.ebuild b/dev-embedded/openocd/openocd-0.6.0_rc1.ebuild deleted file mode 100644 index ce8805354f23..000000000000 --- a/dev-embedded/openocd/openocd-0.6.0_rc1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.6.0_rc1.ebuild,v 1.1 2012/08/17 22:26:33 hwoarang Exp $ - -EAPI="4" - -inherit eutils multilib -if [[ ${PV} == "9999" ]] ; then - inherit autotools git-2 - KEYWORDS="" - EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${P/_/-}.tar.bz2" -fi - -DESCRIPTION="OpenOCD - Open On-Chip Debugger" -HOMEPAGE="http://openocd.sourceforge.net" - -LICENSE="GPL-2" -SLOT="0" -IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger usb versaloon" -RESTRICT="strip" # includes non-native binaries - -# libftd2xx is the default because it is reported to work better. -DEPEND=">=dev-lang/jimtcl-0.73 - usb? ( virtual/libusb:0 ) - presto? ( dev-embedded/libftd2xx ) - ftd2xx? ( dev-embedded/libftd2xx ) - ftdi? ( dev-embedded/libftdi )" -RDEPEND="${DEPEND}" - -REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )" - -S="${WORKDIR}"/${P/_/-} - -src_prepare() { - if [[ ${PV} == "9999" ]] ; then - sed -i -e "/@include version.texi/d" doc/${PN}.texi || die - AT_NO_RECURSIVE=yes eautoreconf - fi -} - -src_configure() { - # Here are some defaults - myconf="--enable-buspirate --enable-ioutil --disable-werror - --disable-internal-jimtcl --enable-amtjtagaccel - --enable-ep93xx --enable-at91rm9200 --enable-gw16012 - --enable-oocd_trace" - - if use usb; then - myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \ - --enable-vsllink --enable-arm-jtag-ew" - fi - - # add explicitely the path to libftd2xx - use ftd2xx && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)" - - if use blaster; then - use ftdi && myconf="${myconf} --enable-usb_blaster_libftdi" - use ftd2xx && myconf="${myconf} --enable-usb_blaster_ftd2xx" - fi - econf \ - $(use_enable dummy) \ - $(use_enable ftdi ft2232_libftdi) \ - $(use_enable ftd2xx ft2232_ftd2xx) \ - $(use_enable minidriver minidriver-dummy) \ - $(use_enable parport) \ - $(use_enable presto presto_ftd2xx) \ - $(use_enable segger jlink) \ - $(use_enable versaloon vsllink) \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README TODO || die - prepstrip "${D}"/usr/bin -} diff --git a/dev-embedded/openocd/openocd-0.6.0_rc2.ebuild b/dev-embedded/openocd/openocd-0.6.0_rc2.ebuild new file mode 100644 index 000000000000..81eeb517c4dd --- /dev/null +++ b/dev-embedded/openocd/openocd-0.6.0_rc2.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.6.0_rc2.ebuild,v 1.1 2012/08/29 17:51:45 hwoarang Exp $ + +EAPI="4" + +inherit eutils multilib +if [[ ${PV} == "9999" ]] ; then + inherit autotools git-2 + KEYWORDS="" + EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}" +else + KEYWORDS="~amd64 ~x86" + SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${P/_/-}.tar.bz2" +fi + +DESCRIPTION="OpenOCD - Open On-Chip Debugger" +HOMEPAGE="http://openocd.sourceforge.net" + +LICENSE="GPL-2" +SLOT="0" +IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger usb versaloon" +RESTRICT="strip" # includes non-native binaries + +# libftd2xx is the default because it is reported to work better. +DEPEND=">=dev-lang/jimtcl-0.73 + usb? ( virtual/libusb:0 ) + presto? ( dev-embedded/libftd2xx ) + ftd2xx? ( dev-embedded/libftd2xx ) + ftdi? ( dev-embedded/libftdi )" +RDEPEND="${DEPEND}" + +REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )" + +S="${WORKDIR}"/${P/_/-} + +src_prepare() { + if [[ ${PV} == "9999" ]] ; then + sed -i -e "/@include version.texi/d" doc/${PN}.texi || die + AT_NO_RECURSIVE=yes eautoreconf + fi +} + +src_configure() { + # Here are some defaults + myconf="--enable-buspirate --enable-ioutil --disable-werror + --disable-internal-jimtcl --enable-amtjtagaccel + --enable-ep93xx --enable-at91rm9200 --enable-gw16012 + --enable-oocd_trace" + + if use usb; then + myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \ + --enable-vsllink --enable-arm-jtag-ew" + fi + + # add explicitely the path to libftd2xx + use ftd2xx && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)" + + if use blaster; then + use ftdi && myconf="${myconf} --enable-usb_blaster_libftdi" + use ftd2xx && myconf="${myconf} --enable-usb_blaster_ftd2xx" + fi + econf \ + $(use_enable dummy) \ + $(use_enable ftdi ft2232_libftdi) \ + $(use_enable ftd2xx ft2232_ftd2xx) \ + $(use_enable minidriver minidriver-dummy) \ + $(use_enable parport) \ + $(use_enable presto presto_ftd2xx) \ + $(use_enable segger jlink) \ + $(use_enable versaloon vsllink) \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog NEWS README TODO || die + prepstrip "${D}"/usr/bin +} diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild index d63242e02b18..3995ddc73b08 100644 --- a/dev-embedded/openocd/openocd-9999.ebuild +++ b/dev-embedded/openocd/openocd-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.24 2012/06/01 02:26:43 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.25 2012/08/29 17:51:45 hwoarang Exp $ EAPI="4" @@ -23,7 +23,7 @@ IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger usb versaloon" RESTRICT="strip" # includes non-native binaries # libftd2xx is the default because it is reported to work better. -DEPEND="dev-lang/jimtcl +DEPEND=">=dev-lang/jimtcl-0.73 usb? ( virtual/libusb:0 ) presto? ( dev-embedded/libftd2xx ) ftd2xx? ( dev-embedded/libftd2xx ) -- cgit v1.2.3-65-gdbad