Bump to 0.6.0_rc1

(Portage version: 2.1.11.10/cvs/Linux x86_64)

3 files changed, 88 insertions, 3 deletions

diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 5015364bcc24..9053d3f7658d 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.30 2012/06/01 02:26:43 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.31 2012/08/17 22:26:33 hwoarang Exp $
+
+*openocd-0.6.0_rc1 (17 Aug 2012)
+
+  17 Aug 2012; Markos Chandras <hwoarang@gentoo.org> +openocd-0.6.0_rc1.ebuild,
+  openocd-0.4.0.ebuild, openocd-0.5.0.ebuild:
+  Bump to 0.6.0_rc1
 
   01 Jun 2012; Zac Medico <zmedico@gentoo.org> openocd-0.3.1-r1.ebuild,
   openocd-0.4.0.ebuild, openocd-0.5.0.ebuild, openocd-9999.ebuild:
diff --git a/dev-embedded/openocd/openocd-0.5.0.ebuild b/dev-embedded/openocd/openocd-0.5.0.ebuild
index 5bc2b73056d1..fb7bd19154e5 100644
--- a/dev-embedded/openocd/openocd-0.5.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.5.0.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-0.5.0.ebuild,v 1.8 2012/06/01 02:26:43 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.5.0.ebuild,v 1.9 2012/08/17 22:26:33 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 )
diff --git a/dev-embedded/openocd/openocd-0.6.0_rc1.ebuild b/dev-embedded/openocd/openocd-0.6.0_rc1.ebuild
new file mode 100644
index 000000000000..ce8805354f23
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.6.0_rc1.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_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
+}