Clean up style a bit.

Package-Manager: portage-2.2.0_alpha71/cvs/Linux x86_64

4 files changed, 29 insertions, 26 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/Manifest b/dev-embedded/openocd/Manifest
index ddd9df0b488b..8f9f607944d5 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,29 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST openocd-0.3.1.tar.gz 1584527 RMD160 fba1c2db055cce7652afa28773be3162b46eb204 SHA1 ccc543d44a65e9d5e6ae44145c6dca8c59b43f2e SHA256 d88be375e346c6b19f23ca82ae20497bdb1bf88a05eba3e6ed7d2cff8c1916b4
 DIST openocd-0.4.0.tar.gz 1705028 RMD160 69ce61cec0aebce1300f44af029bf644194ebce9 SHA1 890171d6ffbfc4cfb45040548ffe1422cc07ae6b SHA256 fc4b8b55c25920c0024e6e621c4127e92acbe9f6bafaf72b90fd60a5536e9194
 DIST openocd-0.5.0.tar.bz2 2228655 RMD160 f831b5406e7dd3a25ebaa2ceabb1de80d12bd7cf SHA1 807e4214b005029dccd1ed8af36f3897a5c6f49b SHA256 0bc122f98a6cd68c4392f6265d480b0e875ff54203ec05a5a52d23900903a78d
 EBUILD openocd-0.3.1-r1.ebuild 1902 RMD160 9e49c935c369ce47384ece428f8d9c27876d165f SHA1 616553a77b24a03a8ded109ea2949c8af704985d SHA256 a1144accef62d68079e5d4cb28d179af9713dcbffc7b4f8fc6e5cdcd651db20d
 EBUILD openocd-0.4.0.ebuild 2015 RMD160 6290fd5e6fa1441c4e3bc40c2d2f321b9c3d197d SHA1 aa4e980b319dddcad2c2f1600749649ea35c8e60 SHA256 ae7be6d5a28d085ee1fc0b7409d0b031e4239b32c2e8c45df7b2dbc10c6d5a06
-EBUILD openocd-0.5.0.ebuild 2068 RMD160 b872763a61253afdce08b068ad70879ee47a6752 SHA1 fb9fe6ca2f6e3bcee76acdf3172a89f162e1ca65 SHA256 81590a1a2ad22db5ad5061f7b91d505a883842dde9eb7f7cf71fd3308c1a21f5
-EBUILD openocd-9999.ebuild 2180 RMD160 e42352df79c14c92f57d7ab5c2f54149a8d72f2e SHA1 685ebcc49ca483e9f5a3e09f2cd1a19cef494a8e SHA256 8049764e6ee7faa58a494479a17021af6b7064c476d76d2a247c828534c80c0b
-MISC ChangeLog 3826 RMD160 92cff1fe902dcdad1ef2c5808d997543df7ad99b SHA1 31900faaf91239b7b9abf0ab9679703068ac4b1c SHA256 9dcc9ecf4b9b642c15c96415ae52847f8a008592b4d9b6c1970adb7bf10ce8f9
+EBUILD openocd-0.5.0.ebuild 2218 RMD160 61638dcb4b8c5bdd6d897937e4e14913c0847cb2 SHA1 f4cbedca2f2e1f23cff8b75f8cf467d49b5252a4 SHA256 d44ed61c04a48b1ca3139cce2b7fa9eb082579ad655380074f2bc2b822191e62
+EBUILD openocd-9999.ebuild 2218 RMD160 66620746b123bedb395978cf1fd6919aa241666a SHA1 2f6758277f05977bad98ce7fea137218f9076f42 SHA256 c5d070254756bba76b1dd6077d2b2682e4516a1958a5596f16b4a1740cc588bf
+MISC ChangeLog 3944 RMD160 f0daab54263e01b84253e38534595d4d2f099fb8 SHA1 3a626d61adb08fb5ee7d6b5d4bdd5c9672bc9442 SHA256 1e240e2c4a23c3251322f8dbdf0ab3de69035e5be44cbe7ce5635b3ee1b99dcc
 MISC metadata.xml 944 RMD160 67e4610bb599540c4258eeed1d9a8dd90925d804 SHA1 29593f4259f4f025f5a7539ab56c4e7a75094be8 SHA256 bb50df9261c8d6d81be4b4abdb715d0b940ef3cc8a70a35222f34968f4a7c5bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOpySgAAoJEPqDWhW0r/LCGsEQAJ8kBbQclxBDmy84MyQxEMdn
-AsLA9+XPdxR3Chr90cobxop4I+yPpyZhdHnB4hfR0KRm9xnrYe09ld510IQKfTHM
-oz5gEDGIx89ejANzOsp/w/KU7f/+M74/oU/XBxP6C/gT83m+qpI1yaCvx8/1Bo+S
-3mhUKhndRIAidl542PAleMzbWGx6IjyT0QEPOtwQcxBrjLw+IeFNehb2N/p8HgqL
-auKf5bS9WtYIVoZkIjCa08w52/tr5sqEWVrdjuSdebcH5mVRKId2bjZ/qSWD2uTZ
-4HV9MHyl6beRDVPviF0vnHs+pfxQAE1XqibR17xlGp/g3XNL3d/5leE1hnNW7pcE
-ZR+1S2+EjeSaQfZzY5cUJDizU7pQZyBm/YQxv513NvLD1ERtlvlO9YW3PJV0V/ge
-oVjTU9N8mf31cn2WdXeYUIa2rst0t0jpw/NSd8n1b6l5lfM81PcgRS+7OiSyclQ/
-aTB4i3PJWfaZUxMdAISkn8wqcRQqVtruzQtIqGitXnj49dyZkvlFQeJRh+1RkKto
-rUpCQMtU/iDMyyfGe6KSJ3vAKt4O5b2zYcdV0kuITup1zEPRNoUYuoESCh+Gq5G7
-flUu3roW3z8kNn5hyZkmx2gpN3239KO9soXNGk5UzVM8OFTJvID7tyQVABKXXprN
-Hy8LuGsM/+4jUVCR+YJN
-=ZJ/h
+iF4EAREIAAYFAk6uGisACgkQaC/OocHi7JafMAEAjadq8A+eSn+6mD3FPAKsjLa3
+UiqeEAwC9pUimJeGWJoBAINQUP8VtOcY+wXlxjCQdCp6aVxEZbmbMDLJ8stXqNYn
+=+4/v
 -----END PGP SIGNATURE-----
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