diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2013-05-27 20:31:30 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2013-05-27 20:31:30 +0000 |
| commit | 2c854a0762001bc99ac8c496e1490c638f829ad4 (patch) | |
| tree | def26e225164bff8a9ca3b4291e1a50579fa8dc9 /dev-embedded | |
| parent | Add 2.17.4_pre755 (rc1) snapshot, update live ebuild. Thanks to Nikoli. (diff) | |
| download | gentoo-2-2c854a0762001bc99ac8c496e1490c638f829ad4.tar.gz gentoo-2-2c854a0762001bc99ac8c496e1490c638f829ad4.tar.bz2 gentoo-2-2c854a0762001bc99ac8c496e1490c638f829ad4.zip | |
Sync ebuild with 9999. Fixes bug 471382
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key B4AFF2C2)
Diffstat (limited to 'dev-embedded')
| -rw-r--r-- | dev-embedded/openocd/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-embedded/openocd/openocd-0.7.0.ebuild | 23 |
2 files changed, 23 insertions, 5 deletions
diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog index 89234a6c5b63..c301141634f6 100644 --- a/dev-embedded/openocd/ChangeLog +++ b/dev-embedded/openocd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-embedded/openocd # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.41 2013/05/25 09:14:03 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.42 2013/05/27 20:31:30 hwoarang Exp $ + + 27 May 2013; Markos Chandras <hwoarang@gentoo.org> openocd-0.7.0.ebuild: + Sync ebuild with 9999. Fixes bug 471382 *openocd-0.7.0 (25 May 2013) diff --git a/dev-embedded/openocd/openocd-0.7.0.ebuild b/dev-embedded/openocd/openocd-0.7.0.ebuild index 74891888d83a..a5a9fc2dac34 100644 --- a/dev-embedded/openocd/openocd-0.7.0.ebuild +++ b/dev-embedded/openocd/openocd-0.7.0.ebuild @@ -1,14 +1,16 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.7.0.ebuild,v 1.1 2013/05/25 09:14:03 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.7.0.ebuild,v 1.2 2013/05/27 20:31:30 hwoarang Exp $ -EAPI="4" +EAPI="5" inherit eutils multilib flag-o-matic toolchain-funcs + +# One ebuild to rule them all if [[ ${PV} == "9999" ]] ; then inherit autotools git-2 KEYWORDS="" - EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}" + EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" else KEYWORDS="~amd64 ~x86" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2" @@ -19,7 +21,7 @@ HOMEPAGE="http://openocd.sourceforge.net" LICENSE="GPL-2" SLOT="0" -IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger usb versaloon" +IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger stlink usb versaloon verbose-io" RESTRICT="strip" # includes non-native binaries # libftd2xx is the default because it is reported to work better. @@ -33,6 +35,8 @@ RDEPEND="${DEPEND}" REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )" src_prepare() { + epatch_user + if [[ ${PV} == "9999" ]] ; then sed -i -e "/@include version.texi/d" doc/${PN}.texi || die AT_NO_RECURSIVE=yes eautoreconf @@ -66,6 +70,11 @@ src_configure() { --enable-at91rm9200 --enable-gw16012 --enable-oocd_trace + --enable-ulink + --enable-arm-jtag-ew + --enable-ti-icdi + --enable-osbdm + --enable-opendous ) if use usb; then @@ -75,6 +84,8 @@ src_configure() { --enable-rlink --enable-vsllink --enable-arm-jtag-ew + $(use_enable verbose-io verbose-usb-io) + $(use_enable verbose-io verbose_usb_comms) ) fi @@ -91,9 +102,13 @@ src_configure() { $(use_enable ftd2xx ft2232_ftd2xx) \ $(use_enable minidriver minidriver-dummy) \ $(use_enable parport) \ + $(use_enable parport parport_ppdev) \ + $(use_enable parport parport_giveio) \ $(use_enable presto presto_ftd2xx) \ $(use_enable segger jlink) \ + $(use_enable stlink) \ $(use_enable versaloon vsllink) \ + $(use_enable verbose-io verbose-jtag-io) \ "${myconf[@]}" } |