diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-10-31 03:46:58 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-10-31 03:46:58 +0000 |
| commit | e9be1b0c9b775258c458a3fb66b9d54e95433122 (patch) | |
| tree | 00b088f9d939f0f0529207a93e13453b2c1fa1fc /dev-embedded | |
| parent | Version bump and remove old. (diff) | |
| download | gentoo-2-e9be1b0c9b775258c458a3fb66b9d54e95433122.tar.gz gentoo-2-e9be1b0c9b775258c458a3fb66b9d54e95433122.tar.bz2 gentoo-2-e9be1b0c9b775258c458a3fb66b9d54e95433122.zip | |
Clean up style a bit.
(Portage version: 2.2.0_alpha71/cvs/Linux x86_64)
Diffstat (limited to 'dev-embedded')
| -rw-r--r-- | dev-embedded/openocd/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-embedded/openocd/openocd-0.5.0.ebuild | 13 | ||||
| -rw-r--r-- | dev-embedded/openocd/openocd-9999.ebuild | 12 |
3 files changed, 22 insertions, 9 deletions
diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog index 3bb68891a55e..cfea1f9d6e71 100644 --- a/dev-embedded/openocd/ChangeLog +++ b/dev-embedded/openocd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-embedded/openocd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.21 2011/10/25 21:05:29 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.22 2011/10/31 03:46:58 vapier Exp $ + + 31 Oct 2011; Mike Frysinger <vapier@gentoo.org> openocd-0.5.0.ebuild, + openocd-9999.ebuild: + Clean up style a bit. 25 Oct 2011; Markos Chandras <hwoarang@gentoo.org> openocd-9999.ebuild: Bring back src_prepare. Thanks to Alexander Stein <alexander.stein@informatik diff --git a/dev-embedded/openocd/openocd-0.5.0.ebuild b/dev-embedded/openocd/openocd-0.5.0.ebuild index e674a6efcd12..32174d125b7d 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-2011 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.2 2011/10/19 20:39:58 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.5.0.ebuild,v 1.3 2011/10/31 03:46:58 vapier Exp $ EAPI="4" @@ -19,7 +19,7 @@ HOMEPAGE="http://openocd.sourceforge.net" LICENSE="GPL-2" SLOT="0" -IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger versaloon usb" +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. @@ -32,6 +32,13 @@ RDEPEND="${DEPEND}" REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )" +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 @@ -39,7 +46,7 @@ src_configure() { --enable-ep93xx --enable-at91rm9200 --enable-gw16012 --enable-oocd_trace" - if use usb;then + if use usb; then myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \ --enable-vsllink --enable-arm-jtag-ew" fi diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild index 65f797f8e822..b81adbe676db 100644 --- a/dev-embedded/openocd/openocd-9999.ebuild +++ b/dev-embedded/openocd/openocd-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.18 2011/10/25 21:05:29 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.19 2011/10/31 03:46:58 vapier Exp $ EAPI="4" @@ -19,7 +19,7 @@ HOMEPAGE="http://openocd.sourceforge.net" LICENSE="GPL-2" SLOT="0" -IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger versaloon usb" +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. @@ -33,8 +33,10 @@ RDEPEND="${DEPEND}" REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )" src_prepare() { - sed -i -e "/@include version.texi/d" doc/${PN}.texi || die - AT_NO_RECURSIVE=yes eautoreconf + if [[ ${PV} == "9999" ]] ; then + sed -i -e "/@include version.texi/d" doc/${PN}.texi || die + AT_NO_RECURSIVE=yes eautoreconf + fi } src_configure() { @@ -44,7 +46,7 @@ src_configure() { --enable-ep93xx --enable-at91rm9200 --enable-gw16012 --enable-oocd_trace" - if use usb;then + if use usb; then myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \ --enable-vsllink --enable-arm-jtag-ew" fi |