Version bump wrt #281139, build without -Werror wrt #268238, update 9999 to git wrt #296139, fix building of docs in 9999 wrt #277358

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 94 insertions, 6 deletions

diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 6e747d635b65..5a2ed582765b 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-embedded/openocd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.7 2009/06/17 10:04:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.8 2009/12/26 20:26:19 armin76 Exp $
+
+*openocd-0.3.1 (26 Dec 2009)
+
+  26 Dec 2009; Raúl Porcel <armin76@gentoo.org> +openocd-0.3.1.ebuild,
+  openocd-9999.ebuild:
+  Version bump wrt #281139, build without -Werror wrt #268238, update 9999
+  to git wrt #296139, fix building of docs in 9999 wrt #277358
 
   17 Jun 2009; Mike Frysinger <vapier@gentoo.org> openocd-0.1.0.ebuild,
   openocd-9999.ebuild, metadata.xml:
diff --git a/dev-embedded/openocd/openocd-0.3.1.ebuild b/dev-embedded/openocd/openocd-0.3.1.ebuild
new file mode 100644
index 000000000000..415189a8eaaa
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.3.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.3.1.ebuild,v 1.1 2009/12/26 20:26:19 armin76 Exp $
+
+EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
+inherit eutils
+if [[ ${PV} == "9999" ]] ; then
+	inherit git autotools
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~x86"
+	SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="OpenOCD - Open On-Chip Debugger"
+HOMEPAGE="http://openocd.berlios.de/web/"
+
+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_src_unpack
+		cd "${S}"
+		eautoreconf
+	else
+		unpack ${A}
+	fi
+}
+
+src_compile() {
+        if [[ ${PV} == "9999" ]] ; then
+		myconf="${myconf} --enable-maintainer-mode"
+	fi
+	
+	econf \
+		--disable-werror \
+		--enable-parport \
+		--enable-parport_ppdev \
+		--enable-amtjtagaccel \
+		--enable-ep93xx \
+		--enable-at91rm9200 \
+		--enable-gw16012 \
+		--enable-oocd_trace \
+		$(use_enable usb usbprog) \
+		$(use_enable parport parport_giveio) \
+		$(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-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 5ad28af4cb26..1f3a08b934a2 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2009 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.6 2009/06/17 10:04:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.7 2009/12/26 20:26:19 armin76 Exp $
 
-ESVN_REPO_URI="http://svn.berlios.de/svnroot/repos/openocd/trunk"
+EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
 inherit eutils
 if [[ ${PV} == "9999" ]] ; then
-	inherit subversion autotools
+	inherit git autotools
 	KEYWORDS=""
 	SRC_URI=""
 else
@@ -37,7 +37,7 @@ pkg_setup() {
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
-		subversion_src_unpack
+		git_src_unpack
 		cd "${S}"
 		eautoreconf
 	else
@@ -46,7 +46,12 @@ src_unpack() {
 }
 
 src_compile() {
+        if [[ ${PV} == "9999" ]] ; then
+		myconf="${myconf} --enable-maintainer-mode"
+	fi
+	
 	econf \
+		--disable-werror \
 		--enable-parport \
 		--enable-parport_ppdev \
 		--enable-amtjtagaccel \
@@ -58,7 +63,8 @@ src_compile() {
 		$(use_enable parport parport_giveio) \
 		$(use_enable presto presto_ftd2xx) \
 		$(use_enable ftdi ft2232_libftdi) \
-		$(use ftdi || use_enable ftd2xx ft2232_ftd2xx)
+		$(use ftdi || use_enable ftd2xx ft2232_ftd2xx) \
+		${myconf}
 	emake || die "Error in emake!"
 }