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

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 98 insertions, 18 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/Manifest b/dev-embedded/openocd/Manifest
index 522b5ed9bbf9..32fab15a971a 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST openocd-0.1.0.tar.gz 985328 RMD160 164ae54191d4e7b1908ecab7b9882938b3189402 SHA1 149f8581c1e2482283d3126c4aac5793c2065db8 SHA256 e468c907355727f7aede5623afd77721eb75abe7686af7f2f388f41a7c0f2911
+DIST openocd-0.3.1.tar.gz 1584527 RMD160 fba1c2db055cce7652afa28773be3162b46eb204 SHA1 ccc543d44a65e9d5e6ae44145c6dca8c59b43f2e SHA256 d88be375e346c6b19f23ca82ae20497bdb1bf88a05eba3e6ed7d2cff8c1916b4
 EBUILD openocd-0.1.0.ebuild 1744 RMD160 d2f5f98be623bd3a412c1c696d54d084b0defc81 SHA1 ac5e69617ccd178e5e0d58a06e31d8efb5a3cc29 SHA256 e5801f2a8d86b3c7fdf36bc48cd90e688d5b167a4a8e99da30cb8312b7c2c8f3
-EBUILD openocd-9999.ebuild 1743 RMD160 062e24c0c60460b07451925ab1063de61469a4d8 SHA1 a90e42e6e3c25593efefb5c0d53d18566e685795 SHA256 1a10947fd934c949ea0cee36117e56f2a2be1eb05f2bc84d5de74de7cc5fb147
-MISC ChangeLog 1273 RMD160 3f958fb6be9c0c637e500d1502d6d387ddadc0c8 SHA1 6ee75ab8cf15db8e06a5191b6f4cb85d32455c9b SHA256 5ecd15fc567480bcb07dce662a3fd075c9ec244ab396a47fe66c5555011805a9
+EBUILD openocd-0.3.1.ebuild 1866 RMD160 c60157555f6e1d4d2c1701368070be65e49e9ee3 SHA1 643ef19078034704123d28ab48ab2b10571faf03 SHA256 dad70bdd31d1be032bd60a7e7a117a0e728f0df2f864ed9a45a54c8b7cd47830
+EBUILD openocd-9999.ebuild 1865 RMD160 52013404bf2c92401e0b8b1dadf223ef7a7a5a6b SHA1 8c1839bbfdd210eaf5d082770194acdc4ba2ca7f SHA256 abb49308b7395529b3ad4c69d10e513445b898495bd2b0ac2dd8cf28dcf4263b
+MISC ChangeLog 1538 RMD160 a0dcbc662c982c6e4db161603342638fca0132f5 SHA1 176aee158633ffd9a2d23e81198bd8e3e5852a0f SHA256 dbd640abb5f065d85347e5f6f55ff5dc6649f487f801654f59358750c6649450
 MISC metadata.xml 514 RMD160 76bbd3e76a0366d922fbd8397d3aaf3eb79defff SHA1 0187884b641f16ad466a2e90f7ef2ac098c0bf14 SHA256 8eef0b8622a31dc3dde67db2e0e2056bf403a0312758defad6f3154baec62b64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAko4v6YACgkQn/5bYzqsSmEK0gCggWCFjk2VbyIBPPBlX14A26oK
-jdMAniEWmnTj5asbxdbnqAaTJXYvsAXK
-=YVSV
------END PGP SIGNATURE-----
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!"
 }