Version bump. Bug #469592

Package-Manager: portage-2.1.12.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

3 files changed, 127 insertions, 16 deletions

diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 9356f0a2f694..89234a6c5b63 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.40 2013/05/24 22:22:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.41 2013/05/25 09:14:03 hwoarang Exp $
+
+*openocd-0.7.0 (25 May 2013)
+
+  25 May 2013; Markos Chandras <hwoarang@gentoo.org> +openocd-0.7.0.ebuild,
+  metadata.xml, openocd-0.6.1.ebuild:
+  Version bump. Bug #469592
 
   24 May 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml,
   openocd-0.6.1.ebuild, openocd-9999.ebuild:
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index 39df0aa2dc3e..d731e5132f91 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -5,29 +5,31 @@ DIST openocd-0.3.1.tar.gz 1584527 SHA256 d88be375e346c6b19f23ca82ae20497bdb1bf88
 DIST openocd-0.4.0.tar.gz 1705028 SHA256 fc4b8b55c25920c0024e6e621c4127e92acbe9f6bafaf72b90fd60a5536e9194 SHA512 7b13aa8764c5d57c42b00521fae1201450d3ad3bcad511d0afc311a98e6032bc776fe76f11a74650137e0d05f64a24d8c52dfc2a228fcefab67c83addf35aeb6 WHIRLPOOL f50d55cd8b588fc5f37da171ad9096b34f37782a5ac3450415dc9d1c23ca7eac96eea342b70425c6a519734f5fc6cc7b773935531acef70490f1de37699b6d11
 DIST openocd-0.5.0.tar.bz2 2228655 SHA256 0bc122f98a6cd68c4392f6265d480b0e875ff54203ec05a5a52d23900903a78d SHA512 8e2e168a35bf3f753683115fd5f4d4c79e54cd0fe5d072921475d43880619e5b4ab60f28d97a4a595d4b77938b9218e689013f66a925ee8007e6499f5b42448c WHIRLPOOL 84b6a4a9089542904865400ede82be00c4417519f0c9fc42cbb25ae671f621651e9b27f57c2a1e7f37102d53095bcb8e37601e8ed47ddf1ea82b76676b35e7aa
 DIST openocd-0.6.1.tar.bz2 3431071 SHA256 f4c4cc7445ad79cfba1bb24208e79c66edf9dc0c46b3c8fca391f4e41c942f2b SHA512 59f35750f761d3f2ce7a32ffdc5028d053fda2bd9424cc4497f528ec628ac1f022662d9f226dd2b04a8cd682a5cd056a09de14d50e1090426a816bb602f98250 WHIRLPOOL 81d43ce9866960edb7fdaefc5ec088852aaa79e86add67ea9682f26eb5f5d3e7c7523fde0729e15949af165470b44ded45b9d79662f651db56fd109db5074cad
+DIST openocd-0.7.0.tar.bz2 3493924 SHA256 52237b786530c8460b221556c26fa4779f668b7dcb83ff14b8c5eb2050f38e63 SHA512 bfba267e5cda558b347f6fab1a286353b97d81093c0457ac044667baa369f5cd47a07b3ce6a1ceb66e7992c2e4224765458dd859d0a6fa748ad8e6f80ea541ad WHIRLPOOL eb83e201becb22a72ad954bdd5e66e61e587b42856244e4fdce59af5d263a2879cb8e0d89e10bcff515cff199580997c1c6635064601ad31a803b19dd9c99702
 EBUILD openocd-0.3.1-r1.ebuild 1913 SHA256 46f3da63f1cb879610c4096770f54e9f58dff3697c516d1970ee8da93520090b SHA512 aa3436d04490efbd05ec05233948411db75fc8057948b805c46ece569b195fee9f78f90515be1fc5504ff388a9959378ac5039f89cae60becb74c5b253845e22 WHIRLPOOL ae6b8b253787ccf0ee0f764fb4404b247acf0c809753e669070a713c44df3bb3d0ab76d7d554f8b795967568caf85538915dfa17ffdd7dcb5ddc22cfe2b46157
 EBUILD openocd-0.4.0.ebuild 2026 SHA256 20f5acca7cfaef3c6ae1330f7e4f675f9884989f1353df29255cdd82308f2739 SHA512 a8b4bae98fc518abc1b70432a4b2620fb552b6c70831274e4609bb2a4550b1bbbc6ece9fb25df9fffb7820a15c7bb651755bbc7ad2ab874cb299242a6f86e888 WHIRLPOOL 92a7c4b8bf26aad80111a9f3d4a827650aeb479ab1b8aac58d6417994ac334fbe9b25d0a2dc1ad05a8346f00f113f8ee59fe8713979015bde0f57b04e79cd655
 EBUILD openocd-0.5.0.ebuild 2261 SHA256 45b0475a335157c0466782d40cbf083db2d5616446c3c8ddc83509a8189e17f3 SHA512 a5203b267e8c9a9003f795509fba97d0840e6f374169f2bfb40c762acfb24e3bd9cbfcff7a06df9936aaf66b58ad1ea98ec07c1879cf356a3173e931e0c0bef9 WHIRLPOOL 0e34d928c2483adbdcf27692029710e36a6001c89952ca70198453fa0c9ebe7d505fd0c93c08148d2b08acc014b87788a4eec85e6bb96772fab7e50795d7e40e
 EBUILD openocd-0.6.1.ebuild 2721 SHA256 785a91c7f1a0cb45af30b3ae78ca3804e147d253be10bde805cb52a1978e2341 SHA512 085f3d9ea518b72cc1f539784f3375a9ebc6839c33307d6c4670756f665c67996a1c5682da4b0b3778fb615276a656ef1cc955e81da586f8f6fd1c79313d6422 WHIRLPOOL 8733c668eba45e0b2ad983d1a8f8391271aa5e05c9dda5c8b382ccf3186dfd57060acadcf1694f5ba2534d002e283d11f5ef891d8baad56e14d94c34bb93f643
+EBUILD openocd-0.7.0.ebuild 2723 SHA256 3e98d96ed480ca6aa9663b7611c6d4a25500a89c584383150072bcedeb9231e3 SHA512 df3eff3d00228e86d664d690f03fee6b2463375f33d90c3e95264e75ca53f1c7ba38e016942f300a84a4f3d97aa6533622bfe3ad3aaf4105d600ae5b55375820 WHIRLPOOL 63493ffecaea0322e6fe917fd45221b6f42704db87f43b4d4600fb4829a727761a19e5e29a6b762dbae0f202f162d79b7fc1dfc3e56029da30568abd4e386da9
 EBUILD openocd-9999.ebuild 3105 SHA256 431f205997f810647dded792555f5029d8fe0b95558a8ff42cab556a8bcdbaa5 SHA512 fc17dc029e34ed07f5554c3c2246ff01dc8be1213d8110b248e1b9d09b2eb647c5f83df146f72348cddadecf09526e1430f7fc3a8c017fd9ce5a2ce1aa5941e9 WHIRLPOOL 0dacb65f1dda1d52b6ddc1087a3df3477a020d9d13dd7350faa5781784252fc7ac33d1880351f48de7e4aea43ac3e566d9f1b5ab93322e7a2b1c8aef9065c4db
-MISC ChangeLog 6608 SHA256 d90a5da6aace996a59ed3259b7a2f2ee82f439b9a114de1d82294724991c4362 SHA512 3a3f808e7286ec4e798fbd322c38eee51ee210986328fbff0284bf1f84123846341da0fcdfcf91715d1f24273d0a367328a4c2fa8aab51af9e341fdef7833ead WHIRLPOOL 0f321e41312cf95bf21c3281ce6ddc739272317f500df3dfc39ccd3aaa5957fd1c065249f885202eac5cc402152eedab8758ce94db37a53f4004592fcf7ee735
+MISC ChangeLog 6781 SHA256 54afbab3a802276b2e6ca0805f05c9148e4beb36bd71dd7549b1dff9cf81a24a SHA512 e337e714c449b2fe5d10d36fa3c855054edd81db5055dd1d5dc2e539b15bf5e8e33d6898e020f601adba86b33afb158e9ee18edfe8b83444c1fbccea14d9ba67 WHIRLPOOL 49e22364489640deadbe6a562fc067ecf8653519b1856d7e1a34de51396bed1669e173c67c401561a6e045a073025850d3e24e7d3380694a956775eb6724b99d
 MISC metadata.xml 1013 SHA256 a7aa37bc193d23ea4b93db0604167339dee5df08803c2ddbab4defe1a02774e4 SHA512 19c05f0e39b9bd91812aafbdb085ad11630366cc8fab86b2933a3ca476638fa16a045a4e0d8af9df09ba5f58802d5c1994b6be9489792ca6de30dd32d479e000 WHIRLPOOL bd2a2115ae9d450c86aa81dde8eac90e35261a2ab4883507de99e675805218f7f9d15855f0362cc445a07845925bb9a2d759b3e6a424a2fdc1dda05d3628d5c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRn+guXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRoIDcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun887OMP/R3vL2NI+N71WlCQYyJ6AU7b
-M9yj+V0PnKv6DRpCuruyO/pEc0oCRhK5JuncSgqcAHF53q9EAD4No6dqpelRYhdJ
-LWvk9R+VXO0nuMJcPxIwvFR8cbAp5I6j1rI7CVBaxNDcycEybknR/LPODfG/gzgg
-via0ZZOs8HFkPkQeU6NCV9Hw5YJu35R4Uk8xkSi/YfOL5qXvu79WQ5Fpj9JN3SRL
-VnxQpiIS6Bp/tPjuWPsbxss9eFlOAhn7Fj/RKws+jcNTKAK9kgx84UH7IhJlY0Kn
-v7XUQnPmlrx8wAt1rTNdtvuivNOYMVZy/QaEevVUEvBZotSwd88Vb29b7103dbFt
-z8P43kHqAuswocP+NphCW5Y7ReRvBgrDfF6i00JGgbgkCSJZezrDZo3VLe9jdkNX
-Hi7K6Y6hXzz7VmQln8uWKpdZzAw9OeBDvkRZFPZhyNs6NekLDK9+wgydFxYtBOk5
-dMQ8T9bb7wKFIzYcBseKlR1Fn1V36KvjywV6aoHBdQP8YP/CLy8o9bvmFjLTwjW2
-DwmdRvqd8R95y9x7rCyixICTSLtYGM0WtV63OwA9ggR723+cbuVo81+OY0PstJSg
-jvtZVPAmo3gDxnArC16DHEdvdRJjiMGenChZMA7s2IB/Cyzgppmmu+mLS8Lf4C9O
-DqHOEE9vUt5Ok3FGHXyi
-=17fn
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun883sAP/3HetsantAqJWMobk1/KFOyE
+RRmXeaay/QJMYY2q+E1LFJWQswbEnqVeGNKnowAHQ/ZIxPvKZ2wjIadvMU3Xf5LZ
+ZlWwUgScMl4aSzAgKFu3brweZQ86P920VKvYhJK0X5WPFbCiVSGQq9CsPQN3tgjz
+33YA3v1neZuEMO7TXYZ79YdD0qxu7um6GbBei+/OQRB/fD5s9MqKBrA1FnYNtBn9
+vQuAifHW4tf8qIYmUYWMFwzE0tHqnU6QisklW17dq6/jWbuQB7RshA7Zaatc4dN3
+o6oyLqu12kt/SstpCTS31myFAQaBEx0l/AjerEEhlA4fpsu8SW2AcSu0scZ+f8+D
+J1cjUC3YIIxXMyyBeEbflXwF5Pe84BQoZuhlUaBRj3iN1FrgHN1TlsEHi8WL+pLU
+l7DR+cWYplANfxcyIDNYmSfoQ5Vj9AIj/Uca1YtW5vAjMYMtcD+LeqJ3td5qabGp
+mihNS4iCY6+L6Zo6G95gbpAI3rPcnw5u10od4MRdpqGxEMwyXO4o/MDoAComtJcl
+zAJGhvkIrxArmt9gDdy11/CWjOO7UM3vB7csCXAo+bC4vAcA8j/IfEb3PJ5uOVGK
+crfWl4qd8kHbw09ngZ4xueav6riI3giN2epF0UTm/Nudf/NTO9xnUyAIgimcPywe
+l560nG4TYmy3lbpUQrwZ
+=sdX9
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/openocd/openocd-0.7.0.ebuild b/dev-embedded/openocd/openocd-0.7.0.ebuild
new file mode 100644
index 000000000000..74891888d83a
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.7.0.ebuild
@@ -0,0 +1,103 @@
+# 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 $
+
+EAPI="4"
+
+inherit eutils multilib flag-o-matic toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	inherit autotools git-2
+	KEYWORDS=""
+	EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
+fi
+
+DESCRIPTION="OpenOCD - Open On-Chip Debugger"
+HOMEPAGE="http://openocd.sourceforge.net"
+
+LICENSE="GPL-2"
+SLOT="0"
+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.
+DEPEND=">=dev-lang/jimtcl-0.73
+	usb? ( virtual/libusb:0 )
+	presto? ( dev-embedded/libftd2xx )
+	ftd2xx? ( dev-embedded/libftd2xx )
+	ftdi? ( dev-embedded/libftdi )"
+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
+
+	# Disable craptastic build settings.
+	sed -i \
+		-e 's:if test "[$]OCDxprefix" != "[$]ac_default_prefix":if false:' \
+		configure || die
+
+	if use ftdi ; then
+		local pc="libftdi$(has_version '=dev-embedded/libftdi-1*' && echo 1)"
+		# Use libftdi-1 paths #460916
+		local libs=$($(tc-getPKG_CONFIG) --libs ${pc})
+		sed -i \
+			-e "s:-lftdi -lusb:${libs}:" \
+			configure src/Makefile.in || die
+		append-cppflags $($(tc-getPKG_CONFIG) --cflags ${pc})
+	fi
+}
+
+src_configure() {
+	# Here are some defaults
+	local myconf=(
+		--enable-buspirate
+		--enable-ioutil
+		--disable-werror
+		--disable-internal-jimtcl
+		--enable-amtjtagaccel
+		--enable-ep93xx
+		--enable-at91rm9200
+		--enable-gw16012
+		--enable-oocd_trace
+	)
+
+	if use usb; then
+		myconf+=(
+			--enable-usbprog
+			--enable-jlink
+			--enable-rlink
+			--enable-vsllink
+			--enable-arm-jtag-ew
+		)
+	fi
+
+	# add explicitely the path to libftd2xx
+	use ftd2xx && append-ldflags -L/opt/$(get_libdir)
+
+	if use blaster; then
+		use ftdi && myconf+=( --enable-usb_blaster_libftdi )
+		use ftd2xx && myconf+=( --enable-usb_blaster_ftd2xx )
+	fi
+	econf \
+		$(use_enable dummy) \
+		$(use_enable ftdi ft2232_libftdi) \
+		$(use_enable ftd2xx ft2232_ftd2xx) \
+		$(use_enable minidriver minidriver-dummy) \
+		$(use_enable parport) \
+		$(use_enable presto presto_ftd2xx) \
+		$(use_enable segger jlink) \
+		$(use_enable versaloon vsllink) \
+		"${myconf[@]}"
+}
+
+src_install() {
+	default
+	env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
+}