Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-embedded/openocd: ChangeLog openocd-9999.ebuild openocd-0.5.0.ebuild
Date: Mon, 31 Oct 2011 03:47:08
Message-Id: 20111031034658.55F0E20033@flycatcher.gentoo.org
1 vapier 11/10/31 03:46:58
2
3 Modified: ChangeLog openocd-9999.ebuild openocd-0.5.0.ebuild
4 Log:
5 Clean up style a bit.
6
7 (Portage version: 2.2.0_alpha71/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.22 dev-embedded/openocd/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?rev=1.22&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?rev=1.22&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/ChangeLog?r1=1.21&r2=1.22
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v
19 retrieving revision 1.21
20 retrieving revision 1.22
21 diff -u -r1.21 -r1.22
22 --- ChangeLog 25 Oct 2011 21:05:29 -0000 1.21
23 +++ ChangeLog 31 Oct 2011 03:46:58 -0000 1.22
24 @@ -1,6 +1,10 @@
25 # ChangeLog for dev-embedded/openocd
26 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.21 2011/10/25 21:05:29 hwoarang Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.22 2011/10/31 03:46:58 vapier Exp $
29 +
30 + 31 Oct 2011; Mike Frysinger <vapier@g.o> openocd-0.5.0.ebuild,
31 + openocd-9999.ebuild:
32 + Clean up style a bit.
33
34 25 Oct 2011; Markos Chandras <hwoarang@g.o> openocd-9999.ebuild:
35 Bring back src_prepare. Thanks to Alexander Stein <alexander.stein@informatik
36
37
38
39 1.19 dev-embedded/openocd/openocd-9999.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?rev=1.19&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?rev=1.19&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild?r1=1.18&r2=1.19
44
45 Index: openocd-9999.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v
48 retrieving revision 1.18
49 retrieving revision 1.19
50 diff -u -r1.18 -r1.19
51 --- openocd-9999.ebuild 25 Oct 2011 21:05:29 -0000 1.18
52 +++ openocd-9999.ebuild 31 Oct 2011 03:46:58 -0000 1.19
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2011 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.18 2011/10/25 21:05:29 hwoarang Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.19 2011/10/31 03:46:58 vapier Exp $
58
59 EAPI="4"
60
61 @@ -19,7 +19,7 @@
62
63 LICENSE="GPL-2"
64 SLOT="0"
65 -IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger versaloon usb"
66 +IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger usb versaloon"
67 RESTRICT="strip" # includes non-native binaries
68
69 # libftd2xx is the default because it is reported to work better.
70 @@ -33,8 +33,10 @@
71 REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )"
72
73 src_prepare() {
74 - sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
75 - AT_NO_RECURSIVE=yes eautoreconf
76 + if [[ ${PV} == "9999" ]] ; then
77 + sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
78 + AT_NO_RECURSIVE=yes eautoreconf
79 + fi
80 }
81
82 src_configure() {
83 @@ -44,7 +46,7 @@
84 --enable-ep93xx --enable-at91rm9200 --enable-gw16012
85 --enable-oocd_trace"
86
87 - if use usb;then
88 + if use usb; then
89 myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \
90 --enable-vsllink --enable-arm-jtag-ew"
91 fi
92
93
94
95 1.3 dev-embedded/openocd/openocd-0.5.0.ebuild
96
97 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-0.5.0.ebuild?rev=1.3&view=markup
98 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-0.5.0.ebuild?rev=1.3&content-type=text/plain
99 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-embedded/openocd/openocd-0.5.0.ebuild?r1=1.2&r2=1.3
100
101 Index: openocd-0.5.0.ebuild
102 ===================================================================
103 RCS file: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.5.0.ebuild,v
104 retrieving revision 1.2
105 retrieving revision 1.3
106 diff -u -r1.2 -r1.3
107 --- openocd-0.5.0.ebuild 19 Oct 2011 20:39:58 -0000 1.2
108 +++ openocd-0.5.0.ebuild 31 Oct 2011 03:46:58 -0000 1.3
109 @@ -1,6 +1,6 @@
110 # Copyright 1999-2011 Gentoo Foundation
111 # Distributed under the terms of the GNU General Public License v2
112 -# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.5.0.ebuild,v 1.2 2011/10/19 20:39:58 hwoarang Exp $
113 +# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.5.0.ebuild,v 1.3 2011/10/31 03:46:58 vapier Exp $
114
115 EAPI="4"
116
117 @@ -19,7 +19,7 @@
118
119 LICENSE="GPL-2"
120 SLOT="0"
121 -IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger versaloon usb"
122 +IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger usb versaloon"
123 RESTRICT="strip" # includes non-native binaries
124
125 # libftd2xx is the default because it is reported to work better.
126 @@ -32,6 +32,13 @@
127
128 REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ftdi? ( !ftd2xx )"
129
130 +src_prepare() {
131 + if [[ ${PV} == "9999" ]] ; then
132 + sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
133 + AT_NO_RECURSIVE=yes eautoreconf
134 + fi
135 +}
136 +
137 src_configure() {
138 # Here are some defaults
139 myconf="--enable-buspirate --enable-ioutil --disable-werror
140 @@ -39,7 +46,7 @@
141 --enable-ep93xx --enable-at91rm9200 --enable-gw16012
142 --enable-oocd_trace"
143
144 - if use usb;then
145 + if use usb; then
146 myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \
147 --enable-vsllink --enable-arm-jtag-ew"
148 fi