Version bump. Bump jimtcl dependency to 0.75

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x09BF4F54C2BA7F3C!

5 files changed, 101 insertions, 23 deletions

diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 6e20434f512e..98cd88995dd0 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-embedded/openocd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.49 2014/05/04 10:42:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.50 2014/05/09 20:46:43 hwoarang Exp $
+
+*openocd-0.8.0 (09 May 2014)
+
+  09 May 2014; Markos Chandras <hwoarang@gentoo.org>
+  +files/openocd-0.8.0-jimtcl-0.75.patch, +openocd-0.8.0.ebuild,
+  -openocd-0.8.0_rc2.ebuild, openocd-9999.ebuild:
+  Version bump. Bump jimtcl dependency to 0.75
 
   04 May 2014; Markos Chandras <hwoarang@gentoo.org> metadata.xml,
   openocd-0.8.0_rc2.ebuild, openocd-9999.ebuild:
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index b85a4e711905..d346f4a1cb08 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,33 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX openocd-0.8.0-jimtcl-0.75.patch 2267 SHA256 3eaae17f04ea48e43a14920095510d78e7298164d32e792ffde8a2c67f057411 SHA512 a8f5a680077711826a0bfa83502b216ae254f1a6ad54f94dec1cac89b3f6fdc43cfabbf589074cb469597c606d35f37a03f1f140dc1b9c5ee6e12e805667e2e7 WHIRLPOOL 2c3b6f1147802a53ea9e107f9e35308e8683b096b84d839e20fed3208490b441b288623650dd6218cbf22adf69cd0a746ede6244eb8dd4dbed4eced80f3b96bc
 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
-DIST openocd-0.8.0-rc2.tar.gz 4821958 SHA256 369121a55d723694d6316798050e5160d95a7c012ba1ac015d9a08e9a49c7308 SHA512 b2d32acbee154821c3485874afc2ec8186086767395f256ade8b71766da06553e0cab07f17594c2b11b51ce44b2dd8bcfe347dab211bf8735592aa607252329e WHIRLPOOL e6556b8c9c4bb419c7150b9ffa109fc049c3634aecfbc0c316b80439afba2e49aaf80f7297cd4ae34a88f1754c043e8e56938c3cf3216ad8b2e36cd626b91020
+DIST openocd-0.8.0.tar.gz 4821738 SHA256 e27ce4819e0227e602063f212fd4e795e307d5480095c9d406bd0d305ddf4f67 SHA512 9130b683394c4d99cd4c5365ba2bbe07ca8bdf0d02bdd4504b0f5f376209e787955d725c11d811f8937b7b0fc207c8d02e0b7484607edd2f68b2d00d48250f2c WHIRLPOOL 2e71c4b5965de6e3c0541ca13c100626c1435edc34e2bd81426921fa2fce228b101666f29abb56890d5e7aae7322cbff17f7968c78bd0f8db7a43acc733a0868
 EBUILD openocd-0.5.0.ebuild 2261 SHA256 45b0475a335157c0466782d40cbf083db2d5616446c3c8ddc83509a8189e17f3 SHA512 a5203b267e8c9a9003f795509fba97d0840e6f374169f2bfb40c762acfb24e3bd9cbfcff7a06df9936aaf66b58ad1ea98ec07c1879cf356a3173e931e0c0bef9 WHIRLPOOL 0e34d928c2483adbdcf27692029710e36a6001c89952ca70198453fa0c9ebe7d505fd0c93c08148d2b08acc014b87788a4eec85e6bb96772fab7e50795d7e40e
 EBUILD openocd-0.6.1.ebuild 2755 SHA256 3dd0368f4a75c3c6af195e30f8fa081374aaf094ef0385d60d6b8ddac96c1a93 SHA512 a2c662e89aed2d19d9c172caeea64483402bac10c6a25bad85bf4d34d813b957bd0d657983015ccf97212a589275050f48429403092bae63b3cf5983090f02e6 WHIRLPOOL f15578a0ecef847137b06db9c7b570dcd59e73a5cec1dac4667501bce35e9400c64f29826e7eaba7c39912c3aaf232a2d59bca8a6da38b4790c8f9672bb403f7
 EBUILD openocd-0.7.0-r1.ebuild 3131 SHA256 0db9b11554b6004ca4c5dd425015ab769cf46a98b84f1a4a88cebdd7a27175a8 SHA512 ed410e29503fad36e06306ef618a811ca08c6a2c2cc45541f888fc0df7ba44e6014734c88547282082dbd24f171f1f65d1a4c7574bf79926a2ef385800404fd1 WHIRLPOOL d1b22471290a641bef62400e158ba175a6a680e8af43a2276169f2b24c25f833ba07245766e82fbc68bdfe1af12863ae21ce568b16a2ed4fedd0e8b90c591a50
-EBUILD openocd-0.8.0_rc2.ebuild 2726 SHA256 8914c637704e694a47edb872d8fbe11b696bafb4d40c721793f2818e53fd3b42 SHA512 c96ddbc5489d012950b76f1da6967f0f17687ee86772c9dbde36195a87d67dbe82dcb46e9e9c5516d985f572f6b37bc0d9ed1c182a1a9e9327198fa4a060bdb7 WHIRLPOOL 85bcd3b975a3b727944f8258334e336f6c382b52731e67fa6fab48cca62147259b00c8ff7b87c56a8b346ba5581e8e7ec4e1adf9e4f0b9fb49973c6f7d38bdee
-EBUILD openocd-9999.ebuild 2722 SHA256 772b7263269abee252a8ac6c7d4c2e2c74f12c4a116311d8afa3929b10fd87d6 SHA512 c6efb8352e32f5df538f5f9fc024e903f83b097df05abc1d82dd62c02c65ca2ea5bb96a96423b348fa2ee6e181b88aa35021c74ebb6d394b0d97474605c03819 WHIRLPOOL b66b94e1a99d99d858c4cf5e8dbe7ab8db4bb4e30dd5c98cfa13084ed265ba731e41b7dd5baa0183b6237bff7e0da12b94aae36e069309d92009fd242309db0e
-MISC ChangeLog 8451 SHA256 864fa88293b418ba24bc5730420b8ec4013383c2a1fe045ee93cc729f2d32e76 SHA512 027e19b618979bf6603bdb4bc7d5bd5c695bdf584cff2442c94e23ebbbec3707fd15a9d5d8ca587ba034fe7062e0ddd17ce59f4fe5f39eb565c838624f436c23 WHIRLPOOL 9f8a8b1a34a130e5b7bdee638e31c2bc99f5e62fb1e57eae6fad62aff1ddcdb517c646c95cd64878c5109da49bf68dce9bbf4b7faa2d1c97859b59ae08d06a82
+EBUILD openocd-0.8.0.ebuild 2836 SHA256 5030c2cb01734a9cd967e860714de7b664e218b28e7cbbbe4a6cd0a2ee6fca67 SHA512 d5cf0914853c68e01f3178bcd577bd79a9f02e55d9a91b3d6ad8eda655661703c27beaa6b55215fd45b6237134edd5555460b6b15a7671a6fd4e3581a68dc485 WHIRLPOOL 0fd5e8f3c85a3242c77f8f0b0bed9862ad78ee87cb930c5252ca0193b705873dd2c3f68d479eb06314f9302511894aa7ef5ed75a1697291a9516e0bee824cc5a
+EBUILD openocd-9999.ebuild 2722 SHA256 ba70d866cdb08a3158581a0c642c1dc23c6daa1d9e3fcb8097019eb4b528cf74 SHA512 4e921f456b8c33da6c48973471e125d3105411ae42bc684d1c21fd776cb66c9e01adf59f9f207d1fb309ae35be9bb7b295de4eec9bacbaa23397be4fdf12273d WHIRLPOOL 24a4925e8c37460c9a6afc143687ff240d2a6666ec4e8b6190a5576e9ab3f8b911a9590099b2bb50a4fa9b70a558ce3823c121ee39ded03e0e76e4e8eadb5d76
+MISC ChangeLog 8697 SHA256 ce313c5678e5e53f2c68d04342150bfcc1077b589493d47f160e23eb7c12f4ce SHA512 f3fa7ad31ddcdef2e05378ae412810ce479c462507acec400eec54ce8f7dbb98b30b7778cf4e5132d91e8f2f6aa51df6891c92740bb19f46d32557c0b9e7ab6d WHIRLPOOL f371845d5d9edf79ca3e1cfc48c1494459a6362e560f65d70ede78eb1fa66c502a54a6fb42b4ac0a284e72710b0bc34386eb1cd66ad32e027630e0e46965bbd0
 MISC metadata.xml 1237 SHA256 4613a2c1466516eceee1e2e196e3c0f725d83e6e711754e1560d9e219ab54fe6 SHA512 b62f0abb0156a23a0d7a1f9de4ced8c795ab7a9e50c73094a9ffae36666606fee46ffa22916afdc7dcc5aa320069fcab4d0413827df640d5b4319fec38bad607 WHIRLPOOL 6b5eda5dc4d58166768ebbf8a055058ef5262c46d783f4fa0a6d0d29a961b5975363a3ff56bcc624b769c4057d6e4768f89928006d2ba8709ff4dfc55cc8bb32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTZhlQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTbT5RXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun881TsP/R6ZGZm1+IJqULZ/fUukvQci
-xmhzSOntZw/LcTeinHweqYx/JVbfbC57wnUQnEMGERBBDpERpKZNho6gy4BFVz/X
-nWMEFLg1e2DWijHKyqdgagUs4x9vFVmQYv6hHocbIuxFmPzgi0YMe147Q3ub85B9
-ZW7FtjApv+Hr6fhBagV9vNvcuWogSweX/XxAAERJc2SRHHQydfnMypXIBuS2oT8U
-zHSDceFgOHCwdNcSX8a+s00MKO5qWz1S7Bj89nJlU7WN6FDBXYPsJmqtbC/toEuC
-uRg5lEdITodxaDiQ6iPTi/zIN5D4TpduOfFIj9FI/evqQCD0A5Y43zOHdUeET/Ca
-Mj8lok6yUAkHih0QS9/D8BzPLwW7A5ZVhyQjFveX+IC9/QDKU9/qM5y9kws3gPyh
-JOXIJk068fw/bneoLZ6eiBVARwNQLikTgRcHJSxyoFNE3es+uMrCiMUNdAhyE2ZQ
-FKjGvq1XQkjlx0SnF1wKQkDlTDu2NIjcmL9XjB3kJRKrzKU0H5LykgCbQx5xL0Po
-z5vEWmOFwT6SxZCPprPRegXlkqY/xqEdxPTjBrNth4p4my5F8iRfrPc2h+GAe88z
-K5+SeJ2KcQGXUhNhzLGmiClUerGBX0MO5ZyISqk4HvyQMvRtF5o2xAGDCD4rEhh7
-1i9mQ2EP0OmoZAe/HKy7
-=mkFi
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88CfkP/3u4ssYbEYm8y6GteHt6uQmW
+TJs1te035XWRsKPwGcliYrNRUbJSSGkcXpDfX31rBOr09nom0gbUAZtSXODt5pKX
+ydPeTOmAt1r2Ln8jEcAc04Q4F4stTVv5wgbyEQZFGRpEoCD+RNXrJAHYFZYWJNtX
+Ot2aosJGMusZIdzwfWVIrj0SNgqGdah4GAfBIi+T3h/W/ZnH2Iov/oENZrAxZmvF
+UmQ0N00ScDEeDnBO5gSrbxCvpiZhF1gKIMs3KHoJ/m0BdGNQw5/OsKVSvL5wuNY1
+81RIsQmCjrduG/JIMZFxug4SnkRmJ+Sna2ar36/URUurJbs7e1pleSEMpvzDa77f
+LvWaImKZ1kgaRedrQE36DBzUYPEICOJmM5CHi1hHB0JAEBqyg5SDh13JW66SWmpt
+bzkv7cde6odQ828KndAQopXiGWShxTo6TBCFfZK0mZAKjwz9crgiCcSCCbsaoUNA
+a73qHluvLUncmw9VM78HsQk9CL9ascfvmk3vIvQnyQw3kf5lqkAdgSIPceXkO0cs
+fhTQIzoeOsZQX/SPxCCv3pRmZ/YLq6tN/X1L/wRTbtQzaoipcsTs5oJ5Ieh1UJX1
+ZZG+FFwT8UZitFLoQqUQHZYpZo1jwKbZMKByrOji4TnblxUhNTwaAwsewEyhBIbD
+nYhNIgjxZJLmc7uQDB4D
+=MVJU
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/openocd/files/openocd-0.8.0-jimtcl-0.75.patch b/dev-embedded/openocd/files/openocd-0.8.0-jimtcl-0.75.patch
new file mode 100644
index 000000000000..1791cabc66fb
--- /dev/null
+++ b/dev-embedded/openocd/files/openocd-0.8.0-jimtcl-0.75.patch
@@ -0,0 +1,66 @@
+Apply upstream patch for jimtcl-0.75 compatibility
+
+X-Gentoo-Bug: 509902
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=509902
+Link: http://repo.or.cz/w/openocd.git/commitdiff/92ea548aafee840e1507306a3ffb38625f427ec5
+
+Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
+
+From 92ea548aafee840e1507306a3ffb38625f427ec5 Mon Sep 17 00:00:00 2001
+From: Paul Fertser <fercerpav@gmail.com>
+Date: Mon, 28 Apr 2014 14:34:47 +0400
+Subject: [PATCH] Update to the current Jim Tcl
+
+This is a post-release version but hopefully some fixes that went in
+are worth it; also the changes here make OpenOCD compatible with stock
+0.75 version if a distro maintainer decides to use it.
+
+Change-Id: I7ad1814c7c4868198475cdca4750c3d0ee4f5f8b
+Signed-off-by: Paul Fertser <fercerpav@gmail.com>
+Reviewed-on: http://openocd.zylin.com/2121
+Tested-by: jenkins
+Reviewed-by: Freddie Chopin <freddie.chopin@gmail.com>
+---
+ jimtcl               |    2 +-
+ src/helper/command.c |    2 +-
+ src/helper/command.h |    4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/helper/command.c b/src/helper/command.c
+index 21362a6..137ac7e 100644
+--- a/src/helper/command.c
++++ b/src/helper/command.c
+@@ -365,7 +365,7 @@ static int register_command_handler(struct command_context *cmd_ctx,
+ 
+ 	LOG_DEBUG("registering '%s'...", ocd_name);
+ 
+-	Jim_CmdProc func = c->handler ? &script_command : &command_unknown;
++	Jim_CmdProc *func = c->handler ? &script_command : &command_unknown;
+ 	int retval = Jim_CreateCommand(interp, ocd_name, func, c, NULL);
+ 	free(ocd_name);
+ 	if (JIM_OK != retval)
+diff --git a/src/helper/command.h b/src/helper/command.h
+index 0f0edbb..0eda5b5 100644
+--- a/src/helper/command.h
++++ b/src/helper/command.h
+@@ -168,7 +168,7 @@ struct command {
+ 	struct command *parent;
+ 	struct command *children;
+ 	command_handler_t handler;
+-	Jim_CmdProc jim_handler;
++	Jim_CmdProc *jim_handler;
+ 	void *jim_handler_data;
+ 	enum command_mode mode;
+ 	struct command *next;
+@@ -204,7 +204,7 @@ char *command_name(struct command *c, char delim);
+ struct command_registration {
+ 	const char *name;
+ 	command_handler_t handler;
+-	Jim_CmdProc jim_handler;
++	Jim_CmdProc *jim_handler;
+ 	void *jim_handler_data;
+ 	enum command_mode mode;
+ 	const char *help;
+-- 
+1.7.6.6.GIT
+
diff --git a/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild b/dev-embedded/openocd/openocd-0.8.0.ebuild
index fb6b42f8e77e..3b3eb2727e89 100644
--- a/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild
+++ b/dev-embedded/openocd/openocd-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild,v 1.3 2014/05/04 10:42:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.8.0.ebuild,v 1.1 2014/05/09 20:46:43 hwoarang Exp $
 
 EAPI="5"
 
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-RDEPEND=">=dev-lang/jimtcl-0.73
+RDEPEND=">=dev-lang/jimtcl-0.75
 	cmsis-dap? ( dev-libs/hidapi )
 	usb? (
 		virtual/libusb:0
@@ -41,6 +41,10 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch_user
 
+	# jimtcl-0.75 compatibility. Remove it on the
+	# next version bump
+	epatch "${FILESDIR}"/${P}-jimtcl-0.75.patch
+
 	if [[ ${PV} == "9999" ]] ; then
 		AT_NO_RECURSIVE=yes eautoreconf
 	fi
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 2887231ebb1f..754066cefccd 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.35 2014/05/04 10:42:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.36 2014/05/09 20:46:43 hwoarang Exp $
 
 EAPI="5"
 
@@ -27,7 +27,7 @@ SLOT="0"
 IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-RDEPEND=">=dev-lang/jimtcl-0.73
+RDEPEND=">=dev-lang/jimtcl-0.75
 	cmsis-dap? ( dev-libs/hidapi )
 	usb? (
 		virtual/libusb:0