Version bump from Chromium OS.

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 155 insertions, 19 deletions

diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index c33a6baaed4a..32f4186d0aeb 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-embedded/openocd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.53 2015/05/20 05:42:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.54 2015/05/20 05:51:15 vapier Exp $
+
+*openocd-0.9.0 (20 May 2015)
+
+  20 May 2015; Mike Frysinger <vapier@gentoo.org> +openocd-0.9.0.ebuild,
+  openocd-9999.ebuild:
+  Version bump from Chromium OS.
 
   20 May 2015; Mike Frysinger <vapier@gentoo.org> openocd-0.8.0.ebuild,
   openocd-9999.ebuild:
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index e472d4b37313..16efea4c177c 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -6,27 +6,29 @@ DIST openocd-0.5.0.tar.bz2 2228655 SHA256 0bc122f98a6cd68c4392f6265d480b0e875ff5
 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.tar.gz 4821738 SHA256 e27ce4819e0227e602063f212fd4e795e307d5480095c9d406bd0d305ddf4f67 SHA512 9130b683394c4d99cd4c5365ba2bbe07ca8bdf0d02bdd4504b0f5f376209e787955d725c11d811f8937b7b0fc207c8d02e0b7484607edd2f68b2d00d48250f2c WHIRLPOOL 2e71c4b5965de6e3c0541ca13c100626c1435edc34e2bd81426921fa2fce228b101666f29abb56890d5e7aae7322cbff17f7968c78bd0f8db7a43acc733a0868
+DIST openocd-0.9.0.tar.gz 4970346 SHA256 840ed225216f49f5c07bda8b2cbb5c8384bb4d8724335dcccf26787fa0650513 SHA512 698b43867f8134da43a50f5d2ff2ae33b71df8ccffc45fb5c3d0bd7a6289fcd9e7bb3d89287ad4dbdb02e1871db69f3913db950965335eaf8559247f2e58c227 WHIRLPOOL 4a87f463c944a8508fe1d8276592230cb1341f664591b57f4ba9eebf15ba64bcad61f08ee909b40151fd2b2a83587896b6511092bc3fff5075f38e0d0c367eb2
 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.ebuild 2826 SHA256 3dbf01df18ad74aedea0edc1acce322f4e1277a8bb6a1fbae47d25b8b153fc1f SHA512 355c05dfe8092bd3778d547137c1378e5b72f82c72d705fbdf44fee1e34a6fcd176adc1d3ac9ceebafb141f13ce476ca13eb0556762effe8056f4a85337c6ba9 WHIRLPOOL 6424ddfa87fddaf4c1943f788412112ad469e6d072dec69bb58fa875ed4935852ba099e80a33d0a327373e4eca2ea552dc146586fb445b5ca96fcbe6e0793030
-EBUILD openocd-9999.ebuild 2712 SHA256 7fd3d04e44e7608d85a9397e006f24d893244272c6f42ceaa9038ddede1573c4 SHA512 a4a3756a6f0100f7acc3d791ad5671239726f570a508e3f56e2ffdf28fcff8bea4aca988311324ff6900932a577217e01092dad4bf418f333df71efe2eb25885 WHIRLPOOL 90fbfc14e576992f8c0aa278c52db33e0126db2e22ac6dbcdca194a1e1efa39506915e77f0f56cbeb656cdb3dceb566169c01f1e0e88712c97c7fe86253715ae
-MISC ChangeLog 9160 SHA256 b2e1f6b676b9bc6811de8619b4fedfceb14bab101bdc596b05b900d68fecc6b6 SHA512 511b2045748d086af5b8398d16d0949ac7a8a99304f5c63b788081f7f011f642fbf474cec5367dd49d95b701a9f7f9512f7505ba4f38383df9dafd89bfa71f09 WHIRLPOOL 3b5975fe57c08170ce17fb6960610ac83982b6f2abda3bba46229bebee0d93e27702a036a125e6eb52f02585b7826f9d839a2ec6bae493a3f86572db56e8d21c
+EBUILD openocd-0.9.0.ebuild 2686 SHA256 9a1b595ec6cf51e480c577a74ef38c9a59ce569c4f9ca4a1c13e60ea5ecc7dea SHA512 852b07e8f2992bec381593df1c53686a970e41127bafe5223a79ef1c9a1dbd0026fcdc9e6a7a72b221408c8d6253dd7e6722ff41cefbebcaec00d49244c4df6e WHIRLPOOL edadb00a6e05cb294658a05cf6d7b506a9483da0b71a6cd3fbe46eba64a6f3865dbecf651b42a2739cb3b39a512d76834cab0a52498cd95ff454c1bd6232a88d
+EBUILD openocd-9999.ebuild 2686 SHA256 cbf06498171eb25f8c641a20160aa346e0a7aed34ff079eaef4854c76e2cfa4a SHA512 fecd68e024c235727512ce5259c9245e2dd3a7ad513a467ca68f0493f91efcd73cc9bb0ac6e75b73022544ad1d66f4e935352c1cc6db216655541099283d379d WHIRLPOOL cd5dc8c3dbcd77baec4b798170301ae7867e90fd76c697f68d0c16402fc85135cea0a6091e461cf8f365b6aaa24c80b9f93c15d0c9d63ef3a5787a0e3e798e55
+MISC ChangeLog 9320 SHA256 b8a54ba22026367cca14d5358432f76837ca6c52e0517bed54d499b583a4215c SHA512 d30192297ad90b59cb2f0ec4f2e1799f3e2edea931c01f74588817729caf94dc43de6869f400d90d3c3f3684b35254386c54e77300b2cb935eec6a184f6938dc WHIRLPOOL 4714571301f8f4bb008aaa2fcd1629bf75d4f35142af83b80ad7fbcafab092a5037e2b3454694907ae4e922f9cecd536dd22c009fcf54d032f820ff573a9506e
 MISC metadata.xml 1237 SHA256 4613a2c1466516eceee1e2e196e3c0f725d83e6e711754e1560d9e219ab54fe6 SHA512 b62f0abb0156a23a0d7a1f9de4ced8c795ab7a9e50c73094a9ffae36666606fee46ffa22916afdc7dcc5aa320069fcab4d0413827df640d5b4319fec38bad607 WHIRLPOOL 6b5eda5dc4d58166768ebbf8a055058ef5262c46d783f4fa0a6d0d29a961b5975363a3ff56bcc624b769c4057d6e4768f89928006d2ba8709ff4dfc55cc8bb32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVXB6qAAoJEPGu1DbS6WIA4OwP/0nRKa2UuTRp5nr9k3iXS4Vl
-f1rXFrEUc7fzWDj8ci9sRrKeIuTL+fs6obb6hVZFnSXxvQbDakjvruZFF+hQslzu
-7No3FKAObFbrPixVOJizp0r7ofeP5V940M+c3fI2xeLwRv5p4FQ8LtDQ0wyyORVm
-DU15hdVSNx1BRWNJ2KXOeA4BgKNYvYXPPY8wYBdtxaaegfz9imLdMfHHsCiIKrkz
-k7oRqNb7VD0pBpgJRneDcgGauDfQA/4UB+F6KILmiWv6+B9s3J4i5YSJSDKQsSvI
-HlgOFzzW3dGr7AKaZuznc9HQ2i71mAgrdsHY2n0JqkGFnUXFN64zX24GmDhmonGU
-u2QZVWncFIrdG4AYIvARibYEr/WI0Usoi5m0csM39lfl+Yww3OHjTDQMftoajDFh
-iPhqvDDoODDbtrmhAqKOemtbyiJq0MV/HjUTBErV1z5F6LcV6k9Wm4rz+KXCE1tQ
-O5sb7FEXkIoFJLXIK2r6MfY3yEqfteyEhdk2epPyNKP/2Q69qS34EmtooppuGa2J
-kqMI+Eb43RITqbm0Oas7HnYeArChvieqfEI5zyazQxT1mmMKUnuP3oXNRSniFeiG
-GWI+eHYyua4+aVFlhkcjk0a+bME92JGfZelMgjYsxIS78o0uEuRvl8G/MLg7iiX+
-wlGvaz7WzXCqTJE5XxO9
-=U2i9
+iQIcBAEBCAAGBQJVXCDVAAoJEPGu1DbS6WIALaAP/1PucvOtMimbOxZVTxswiU0J
+CfSD4PWPbFkQV7ZNMh/RUdZTXiFFF8nSrPqKp64WcVXVpLTvIdSxwsNUyWyxeh2V
+yMXOPJG6gqYyk21BALdTDAUkJKx9yb0Nz/NQjccz4f1v0g9HAuC3fojrGlfOLQOV
+lpvhAwieDLjuKWQCzG3I8MmCWR6++5avcKMm6tsGXJxclJXBbLIsQaNZ2WOjKlLr
+Ojja1aEntXJD6g2ih+Ijtr8XSTBK/3Z/kLAXbt5C3YtW50gPiWWu7VopiEJmnkUp
+E4NRhx0ZIoTh2NxBp/ttDpZCmg4aAvKPVmCqT4dc9mAjCMAbwEhlhr3cPIK9l8tG
+e8botRE1CbBTLycGFK/3vL0XdXyCQ71Myi4JIrll4htBYSbNtJ2AT3QQ6KhVEn9D
+0dDrDTAGwO8IfP2kUNK4oONBSQlWPh4k9rJwZkJWuayG9zshN8AqqnNGqGj9sRd/
+vGFpiCL8TvXiDnQtwynBQ7j3I0nzOHjy859Qfm+Efo78fj1DxG1XE/2zxEie2/rC
+rPSkj3bXpSkpkvY7LFvYGK6KGBNLyd2r1zWGlQW2lu8wZsrctBqntKBZRQi2zDsv
+hIX3PQp1LIS38DL0leAfSEXhDy9brq+wjypV1jcyJP/jfIq1KNrm7vq/TOH2AkG0
+vFQY8F0Mjf570SOlkeIr
+=I7Lf
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/openocd/openocd-0.9.0.ebuild b/dev-embedded/openocd/openocd-0.9.0.ebuild
new file mode 100644
index 000000000000..df570658bfaf
--- /dev/null
+++ b/dev-embedded/openocd/openocd-0.9.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.9.0.ebuild,v 1.1 2015/05/20 05:51:15 vapier Exp $
+
+EAPI="5"
+
+inherit eutils multilib flag-o-matic toolchain-funcs udev
+
+# One ebuild to rule them all
+if [[ ${PV} == "9999" ]] ; then
+	inherit autotools git-2
+	EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
+else
+	MY_PV="${PV/_/-}"
+	MY_P="${PN}-${MY_PV}"
+	S="${WORKDIR}"/${MY_P}
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${MY_PV}/${MY_P}.tar.gz"
+fi
+
+DESCRIPTION="OpenOCD - Open On-Chip Debugger"
+HOMEPAGE="http://openocd.sourceforge.net"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
+RESTRICT="strip" # includes non-native binaries
+
+RDEPEND=">=dev-lang/jimtcl-0.76
+	cmsis-dap? ( dev-libs/hidapi )
+	usb? (
+		virtual/libusb:0
+		virtual/libusb:1
+	)
+	ftdi? ( dev-embedded/libftdi )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch_user
+
+	if [[ ${PV} == "9999" ]] ; then
+		AT_NO_RECURSIVE=yes eautoreconf
+	fi
+}
+
+src_configure() {
+	# Here are some defaults
+	local myconf=(
+		--enable-buspirate
+		--disable-werror
+		--disable-internal-jimtcl
+		--enable-amtjtagaccel
+		--enable-ep93xx
+		--enable-at91rm9200
+		--enable-gw16012
+		--enable-oocd_trace
+		--enable-arm-jtag-ew
+		--enable-sysfsgpio
+		--enable-bcm2835gpio
+	)
+
+	# Adapters requiring usb/libusb-1.X support
+	if use usb; then
+		myconf+=(
+			--enable-aice
+			--enable-usb-blaster-2
+			--enable-ftdi
+			--enable-ti-icdi
+			--enable-ulink
+			--enable-osbdm
+			--enable-opendous
+			--enable-usbprog
+			--enable-jlink
+			--enable-rlink
+			--enable-stlink
+			--enable-vsllink
+			--enable-armjtagew
+			$(use_enable verbose-io verbose-usb-io)
+			$(use_enable verbose-io verbose_usb_comms)
+		)
+	else
+		myconf+=(
+			--disable-aice
+			--disable-usb-blaster-2
+			--disable-ftdi
+			--disable-ti-icdi
+			--disable-ulink
+			--disable-osbdm
+			--disable-opendous
+			--disable-usbprog
+			--disable-jlink
+			--disable-rlink
+			--disable-stlink
+			--disable-vsllink
+			--disable-armjtagew
+		)
+	fi
+
+	if use ftdi; then
+		myconf+=(
+			--enable-usb_blaster_libftdi
+			--enable-openjtag_ftdi
+			--enable-presto_libftdi
+		)
+	else
+		myconf+=(
+			--disable-openjtag_ftdi
+			--disable-presto_libftdi
+			--disable-usb_blaster_libftdi
+		)
+	fi
+
+	econf \
+		$(use_enable dummy) \
+		$(use_enable cmsis-dap) \
+		$(use_enable parport) \
+		$(use_enable parport parport_ppdev) \
+		$(use_enable verbose-io verbose-jtag-io) \
+		"${myconf[@]}"
+}
+
+src_install() {
+	default
+	env -uRESTRICT prepstrip "${ED}"/usr/bin
+	udev_dorules ${D}/usr/share/${PN}/contrib/*.rules
+}
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index e7c0f6f99543..771fe824f137 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.39 2015/05/20 05:42:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.40 2015/05/20 05:51:15 vapier Exp $
 
 EAPI="5"
 
@@ -26,7 +26,7 @@ SLOT="0"
 IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-RDEPEND=">=dev-lang/jimtcl-0.75
+RDEPEND=">=dev-lang/jimtcl-0.76
 	cmsis-dap? ( dev-libs/hidapi )
 	usb? (
 		virtual/libusb:0
@@ -123,6 +123,6 @@ src_configure() {
 
 src_install() {
 	default
-	env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
+	env -uRESTRICT prepstrip "${ED}"/usr/bin
 	udev_dorules ${D}/usr/share/${PN}/contrib/*.rules
 }