[gentoo-commits] gentoo-x86 commit in dev-embedded/openocd: ChangeLog openocd-0.3.1.ebuild openocd-9999.ebuild

[Raul Porcel (armin76)]

armin76     09/12/26 20:26:19

  Modified:             ChangeLog openocd-9999.ebuild
  Added:                openocd-0.3.1.ebuild
  Log:
  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)

Revision  Changes    Path
1.8                  dev-embedded/openocd/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/ChangeLog?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/ChangeLog?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/ChangeLog?r1=1.7&r2=1.8

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog	17 Jun 2009 10:04:16 -0000	1.7
+++ ChangeLog	26 Dec 2009 20:26:19 -0000	1.8
@@ -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@g.o> +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@g.o> openocd-0.1.0.ebuild,
   openocd-9999.ebuild, metadata.xml:



1.7                  dev-embedded/openocd/openocd-9999.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?r1=1.6&r2=1.7

Index: openocd-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- openocd-9999.ebuild	17 Jun 2009 10:04:16 -0000	1.6
+++ openocd-9999.ebuild	26 Dec 2009 20:26:19 -0000	1.7
@@ -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 @@
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
-		subversion_src_unpack
+		git_src_unpack
 		cd "${S}"
 		eautoreconf
 	else
@@ -46,7 +46,12 @@
 }
 
 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 @@
 		$(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!"
 }
 



1.1                  dev-embedded/openocd/openocd-0.3.1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/openocd-0.3.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-embedded/openocd/openocd-0.3.1.ebuild?rev=1.1&content-type=text/plain

Index: openocd-0.3.1.ebuild
===================================================================
# 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
}