Upgraded the jimtcl, openocd Portage packages
Upgraded dev-lang/jimtcl to version 0.70_pre20110317 on amd64
Upgraded dev-embedded/openocd to version 0.5.0 on amd64
BUG=chrome-os-partner:7420
TEST=flash Link EC using OpenOCD
sudo USE="ftdi" emerge openocd
sudo openocd -f src/platform/ec/chip/lm4/servo_v2.cfg
Change-Id: Ibb8b83fbaa1cc9563c42bc4b1e42449b4a7878ce
Reviewed-on: https://gerrit.chromium.org/gerrit/25546
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index eaf83b9..2a9159b 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1 +1 @@
-DIST openocd-0.4.0.tar.gz 1705028 RMD160 69ce61cec0aebce1300f44af029bf644194ebce9 SHA1 890171d6ffbfc4cfb45040548ffe1422cc07ae6b SHA256 fc4b8b55c25920c0024e6e621c4127e92acbe9f6bafaf72b90fd60a5536e9194
+DIST openocd-0.5.0.tar.bz2 2228655 RMD160 f831b5406e7dd3a25ebaa2ceabb1de80d12bd7cf SHA1 807e4214b005029dccd1ed8af36f3897a5c6f49b SHA256 0bc122f98a6cd68c4392f6265d480b0e875ff54203ec05a5a52d23900903a78d
diff --git a/dev-embedded/openocd/openocd-0.4.0.ebuild b/dev-embedded/openocd/openocd-0.4.0.ebuild
deleted file mode 100644
index dc871c8..0000000
--- a/dev-embedded/openocd/openocd-0.4.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.4.0.ebuild,v 1.2 2011/10/10 20:23:06 hwoarang Exp $
-
-EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
-inherit eutils
-if [[ ${PV} == "9999" ]] ; then
- inherit git-2 autotools
- #KEYWORDS=""
- SRC_URI=""
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="OpenOCD - Open On-Chip Debugger"
-HOMEPAGE="http://openocd.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ftd2xx ftdi parport presto usb"
-RESTRICT="strip" # includes non-native binaries
-
-# libftd2xx is the default because it is reported to work better.
-DEPEND="usb? ( dev-libs/libusb )
- presto? ( dev-embedded/libftd2xx )
- ftd2xx? ( dev-embedded/libftd2xx )
- ftdi? ( dev-embedded/libftdi )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- if use ftdi && use ftd2xx ; then
- ewarn "You can only use one FTDI library at a time, so picking"
- ewarn "USE=ftdi (open source) over USE=ftd2xx (closed source)"
- fi
-}
-
-src_unpack() {
- if [[ ${PV} == "9999" ]] ; then
- git-2_src_unpack
- cd "${S}"
- eautoreconf
- else
- unpack ${A}
- fi
-}
-
-src_compile() {
- if [[ ${PV} == "9999" ]] ; then
- myconf="${myconf} --enable-maintainer-mode"
- fi
- 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 && ! use ftdi && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
- econf \
- --disable-werror \
- --enable-amtjtagaccel \
- --enable-ep93xx \
- --enable-at91rm9200 \
- --enable-gw16012 \
- --enable-oocd_trace \
- $(use_enable parport) \
- $(use_enable presto presto_ftd2xx) \
- $(use_enable ftdi ft2232_libftdi) \
- $(use ftdi || use_enable ftd2xx ft2232_ftd2xx) \
- ${myconf}
- emake || die "Error in emake!"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README TODO
- prepstrip "${D}"/usr/bin
-}
diff --git a/dev-embedded/openocd/openocd-0.5.0.ebuild b/dev-embedded/openocd/openocd-0.5.0.ebuild
new file mode 100644
index 0000000..470cfd6
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.5.0.ebuild
@@ -0,0 +1,77 @@
+# 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.5.0.ebuild,v 1.8 2012/06/01 02:26:43 zmedico 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
+ 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 )"
+
+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-lang/jimtcl/Manifest b/dev-lang/jimtcl/Manifest
new file mode 100644
index 0000000..74fd061
--- /dev/null
+++ b/dev-lang/jimtcl/Manifest
@@ -0,0 +1 @@
+DIST jimtcl-0.70_pre20110317.tar.gz 691917 RMD160 ec278bab283bc2c8292b1c5d3604eca7b5fea4a3 SHA1 df61cfa69a35184ed2d84b2d659b5204e0b254f9 SHA256 28998a03321ef64d23376057c1a3dfb0f2f552ddce19df54d1d1277d3487f70d
diff --git a/dev-lang/jimtcl/jimtcl-0.70_pre20110317.ebuild b/dev-lang/jimtcl/jimtcl-0.70_pre20110317.ebuild
new file mode 100644
index 0000000..8371dff
--- /dev/null
+++ b/dev-lang/jimtcl/jimtcl-0.70_pre20110317.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/jimtcl/jimtcl-0.70_pre20110317.ebuild,v 1.2 2012/05/05 16:51:29 hwoarang Exp $
+
+EAPI="2"
+
+DESCRIPTION="Small footprint implementation of Tcl programming language"
+HOMEPAGE="http://jim.berlios.de/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="static-libs"
+
+src_configure() {
+ ! use static-libs && myconf=--with-jim-shared
+ econf ${myconf} \
+ --with-jim-ext=nvp
+}
+
+src_compile() {
+ emake all docs || die
+}
+
+src_install() {
+ dobin jimsh || die "dobin failed"
+ use static-libs && {
+ dolib.a libjim.a || die "dolib failed"
+ } || {
+ dolib.so libjim.so || die "dolib failed"
+ }
+ insinto /usr/include
+ doins jim.h jimautoconf.h jim-subcmd.h jim-nvp.h jim-signal.h
+ doins jim-win32compat.h jim-eventloop.h jim-config.h
+ dodoc AUTHORS README TODO || die "dodoc failed"
+ dohtml Tcl.html || die "dohtml failed"
+}
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.4.0 b/metadata/md5-cache/dev-embedded/openocd-0.4.0
deleted file mode 100644
index 8b35810..0000000
--- a/metadata/md5-cache/dev-embedded/openocd-0.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install setup unpack
-DEPEND=usb? ( dev-libs/libusb ) presto? ( dev-embedded/libftd2xx ) ftd2xx? ( dev-embedded/libftd2xx ) ftdi? ( dev-embedded/libftdi )
-DESCRIPTION=OpenOCD - Open On-Chip Debugger
-HOMEPAGE=http://openocd.sourceforge.net
-IUSE=ftd2xx ftdi parport presto usb
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=usb? ( dev-libs/libusb ) presto? ( dev-embedded/libftd2xx ) ftd2xx? ( dev-embedded/libftd2xx ) ftdi? ( dev-embedded/libftdi )
-RESTRICT=strip
-SLOT=0
-SRC_URI=mirror://berlios/openocd/openocd-0.4.0.tar.gz
-_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
-_md5_=a3239f278a06ac94b686d4490319db22
diff --git a/metadata/md5-cache/dev-embedded/openocd-0.5.0 b/metadata/md5-cache/dev-embedded/openocd-0.5.0
new file mode 100644
index 0000000..041119c
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/openocd-0.5.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-lang/jimtcl usb? ( virtual/libusb:0 ) presto? ( dev-embedded/libftd2xx ) ftd2xx? ( dev-embedded/libftd2xx ) ftdi? ( dev-embedded/libftdi )
+DESCRIPTION=OpenOCD - Open On-Chip Debugger
+EAPI=4
+HOMEPAGE=http://openocd.sourceforge.net
+IUSE=blaster dummy ftd2xx ftdi minidriver parport presto segger usb versaloon
+KEYWORDS=amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/jimtcl usb? ( virtual/libusb:0 ) presto? ( dev-embedded/libftd2xx ) ftd2xx? ( dev-embedded/libftd2xx ) ftdi? ( dev-embedded/libftdi )
+REQUIRED_USE=blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )
+RESTRICT=strip
+SLOT=0
+SRC_URI=mirror://sourceforge/project/openocd/openocd/0.5.0/openocd-0.5.0.tar.bz2
+_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
+_md5_=2306331dabdb85c5ce1b52eee27c1818
diff --git a/metadata/md5-cache/dev-lang/jimtcl-0.70_pre20110317 b/metadata/md5-cache/dev-lang/jimtcl-0.70_pre20110317
new file mode 100644
index 0000000..9591c63
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/jimtcl-0.70_pre20110317
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install
+DESCRIPTION=Small footprint implementation of Tcl programming language
+EAPI=2
+HOMEPAGE=http://jim.berlios.de/
+IUSE=static-libs
+KEYWORDS=amd64 ~x86
+LICENSE=LGPL-2
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/jimtcl-0.70_pre20110317.tar.gz
+_md5_=8b656a03807eed78178b4dd615561089
