Version bump. Remove snapshots. Update metadata and homepage

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

9 files changed, 95 insertions, 238 deletions

diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 48ee13896236..3445fd5d5744 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,8 +1,16 @@
 # 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.17 2011/09/20 22:05:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.18 2011/10/10 20:23:06 hwoarang Exp $
 
-  20 Sep 2011; Michał Górny <mgorny@gentoo.org> openocd-9999.ebuild:
+*openocd-0.5.0 (10 Oct 2011)
+
+  10 Oct 2011; Markos Chandras <hwoarang@gentoo.org> -openocd-0.3.1.ebuild,
+  openocd-0.3.1-r1.ebuild, openocd-0.4.0.ebuild,
+  -openocd-0.5.0_pre20110317.ebuild, -openocd-0.5.0_pre20110427.ebuild,
+  +openocd-0.5.0.ebuild, openocd-9999.ebuild, metadata.xml:
+  Version bump. Remove snapshots. Update metadata and homepage
+
+  20 Sep 2011; Michał Górny <mgorny@gentoo.org> openocd-9999.ebuild:
   Migrate to git-2.
 
   12 May 2011; Markos Chandras <hwoarang@gentoo.org> openocd-9999.ebuild:
@@ -41,13 +49,13 @@
   Have USE=parport control parallel port functionality and not autodetected
   windows-specific features #305805 by Peter Abrahamsen.
 
-  12 Feb 2010; Raúl Porcel <armin76@gentoo.org> openocd-0.3.1.ebuild,
+  12 Feb 2010; Raúl Porcel <armin76@gentoo.org> openocd-0.3.1.ebuild,
   openocd-9999.ebuild:
   Add ~amd64
 
 *openocd-0.3.1 (26 Dec 2009)
 
-  26 Dec 2009; Raúl Porcel <armin76@gentoo.org> +openocd-0.3.1.ebuild,
+  26 Dec 2009; Raúl Porcel <armin76@gentoo.org> +openocd-0.3.1.ebuild,
   openocd-9999.ebuild:
   Version bump wrt #281139, build without -Werror wrt #268238, update 9999
   to git wrt #296139, fix building of docs in 9999 wrt #277358
@@ -72,7 +80,7 @@
   05 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
 
-  04 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> openocd-9999.ebuild:
+  04 Jun 2008; Diego Pettenò <flameeyes@gentoo.org> openocd-9999.ebuild:
   Use eautoreconf, not the bootstrap script.
 
 *openocd-9999 (19 Apr 2008)
diff --git a/dev-embedded/openocd/Manifest b/dev-embedded/openocd/Manifest
index df26596c8cf6..a0f716fa781e 100644
--- a/dev-embedded/openocd/Manifest
+++ b/dev-embedded/openocd/Manifest
@@ -1,24 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 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_pre20110317.tar.gz 1466486 RMD160 2a72675b39f9274cf57fecc6b0ad247751e319df SHA1 4cab7c9f055436c8fac812eae597219271a99584 SHA256 d17e1cecfee7e2de6a8398e0387f5775daf35d02fa682186dbecc012d0735720
-DIST openocd-0.5.0_pre20110427.tar.gz 1474519 RMD160 e2b5aa3f04c73e3d46a44a356366845773786deb SHA1 0d3178f55a9535ea3008ac027b62123ce1ba8a9c SHA256 27e7155c1a467f09ac6411baf22e112d68c4d2af7f48d0c1f38686586f406dd8
-EBUILD openocd-0.3.1-r1.ebuild 1904 RMD160 ba160e287185b1277fbed6afc8736fd1b520efad SHA1 b29a411e9074b591ac591d537f801a8a8855522a SHA256 9a5d9edd130996698147b5945f7f5c4d3349d6ca466846112260e8022eab8896
-EBUILD openocd-0.3.1.ebuild 1802 RMD160 f9e6ae3182f6fb11b042933fc763f6aa26f7ca67 SHA1 763da8c126fd0c3019b255ffee58b3bac197d9ab SHA256 4988ea6435eb1b04588ac54e1b5a6ef036d7b7525ba6fb9068459fadd8b6d747
-EBUILD openocd-0.4.0.ebuild 2017 RMD160 f8289aedfb820cbfbf66c526500cd4f6b0b2e45c SHA1 e35962eac8bd903a79333630e1125f792ee22f5f SHA256 a968d282985dd47a42d6f45beb82254e8f5d07596a8223d8e3a898f368ea6972
-EBUILD openocd-0.5.0_pre20110317.ebuild 2210 RMD160 d5e62033b45b7275e344f11d7dc6204f85e14d0d SHA1 410f7f56ebe8559a4bb9f8928069eb46d583e504 SHA256 593200386cfb06750bcf43b92a59441d657f29a3d7bc02c3c331a86cc8a475ca
-EBUILD openocd-0.5.0_pre20110427.ebuild 2210 RMD160 4d66872c1fd20057c73ebbaba4da888880346055 SHA1 8613293f8dd4eb1a72c4fb32dbecdd78c579cdfe SHA256 08c635c738471b4d63bc7f983f3ba52e64fe9803e3fb5a72475c011419659ae8
-EBUILD openocd-9999.ebuild 2105 RMD160 30cb7d5e999076b352aed3e91b1ca55bbe36ba19 SHA1 3bbd8603663c516a0d2e36039d9209659fc9a7d1 SHA256 6bda72d01fa0c1fc03efa223f70781d463e38e45c5dc81651ae2209e342874ae
-MISC ChangeLog 3126 RMD160 cec82f283542a3a285a71dbb13c2a3f8bb0c0f36 SHA1 9ebba095225574dcbb1b10250292a3016cbf12f6 SHA256 8d407912704245f1f46aed9ce01dd14fd0fa00e78b8fd4611762467492dc6120
-MISC metadata.xml 861 RMD160 85f16b77d82cbee5527d02762a9c348235eb661c SHA1 c3992c830c95d43f7e3c5b9359b53b7fee63024c SHA256 0b06191bdf02a7370c900a5f4570c80432eb5b67ce7df3602f5ca0a7fe88a917
+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 2069 RMD160 2ba1e83d73c4683b53a105d159a5e936eb2aeb15 SHA1 9ddfa665b51b3c28be63c5461ea46b365fbc1ed3 SHA256 74db94bce5cdf91057ee03e02b98b1fd8eb04f6b5423991a17f51dc849b14173
+EBUILD openocd-9999.ebuild 2069 RMD160 7d9bc6c2a5a616a96c0bc22e60bc9a9aeb00d6f1 SHA1 82b2e15ee28ba35c05747f8bfd9356a26e0523a0 SHA256 2f879cb219a1e75bf65f88cc22bbe810553e522ea65992069dd4c83ad104da3a
+MISC ChangeLog 3489 RMD160 e2dfc5a2e42f1af2acb72af5c202066ded419de0 SHA1 cf7f2d831a7d659363af0e74bed2bc2bf85b4820 SHA256 b52ba16a3d8308e70f2ab8cd2ad017879ec861b255d2c4af75d7d8f859cb79e2
+MISC metadata.xml 944 RMD160 67e4610bb599540c4258eeed1d9a8dd90925d804 SHA1 29593f4259f4f025f5a7539ab56c4e7a75094be8 SHA256 bb50df9261c8d6d81be4b4abdb715d0b940ef3cc8a70a35222f34968f4a7c5bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk55DsgACgkQfXuS5UK5QB06dwP+L75OTiKSpRmccAyl8U+o/szl
-h1zqYy4qhnBR2I/GUCuZG0fx3gNkEoxacQqfdta79JI1Gl6Q3sVdwSOtEZLH+N0z
-V3WpIoej7Tlec8pY4tenHLaAsIG8yKyD2gEqGK3IJpcsNcOn/Nhy8tz1ylRk81nc
-NfntP5srCG83pse1b2c=
-=OS6C
+iQIcBAEBCgAGBQJOk1QwAAoJEPqDWhW0r/LC3vsP/3bS8/76y+kXSHHsc3sNsUNT
+rqCMKxZqc2DTZ9SoYtNrlYGx959DoShFpJc7w5N6tHsjEupnDyTtQx4AJgAlRy5K
+k2Uc7HddFtsHhq0ckGHG/4cFIyuPnTsasNQdUel7DV7FSYm1lGSQfQ+y1MjwwT3m
+3wEEFfS3D5qGKF4/hkUNt4xK1kbYleoecJ/mflmSSFF2uM30G83S0OjOge1quumR
+7BBIZDu1pXqRGDc6EUAyhnqCRS3h940GYU81MvNWh4/JLM7V11ZtfqBo5t+w1VK6
+WV+eAmWV4A3x+aWNAJB0KjpxvRwO/41OMZEQR8GlTFPPkaNuE1aORFT7oUBSLkvG
+Hb6dZuWTuwyQMnfN0hK6qsf77V0QRmhzReaLT0SAuhAx24dMamSrWF2VelBJOUyY
+h/F44HJTXpWWwiJSz081FRTBTkVOoprNTqBAd5m3Tbz62zgARrGXRMIhYDNw7469
+a/nyAGB90bixmqteNLdABSKDFEEIwMSK509k//LDGhQ7V83E99kZCHBnuk6LFiKP
+FqFNQ4DnOpna/V1z8NLXFZes1uJkXL+h6QS1eORjYMS6lLH1/lB3XBNCUaqBH3vD
+rQT0C/JhKDM/1oK3iVkaCrYHX8nSSwo93uKEpUCV+hKa3m+aIVYsUYXVjWOb+GuD
+izz9u7NCnB/bXgrI4Yo6
+=r4ln
 -----END PGP SIGNATURE-----
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index e87232e172cd..8a7fdac5090a 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -8,7 +8,8 @@
 </maintainer>
 <use>
   <flag name='blaster'>Enable support for Altera USE-Blaster</flag>
-  <flag name='versaloon'></flag>
+  <flag name="dummy">Build the dummy port driver</flag>
+  <flag name="minidriver">Build the dummy minidriver</flag>
   <flag name='ftd2xx'>Enable support for USB FTDI chips via <pkg>dev-embedded/libftd2xx</pkg></flag>
   <flag name='ftdi'>Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
   <flag name='parport'>Enable support for parport JTAG devices</flag>
diff --git a/dev-embedded/openocd/openocd-0.3.1-r1.ebuild b/dev-embedded/openocd/openocd-0.3.1-r1.ebuild
index e681f6854b5b..941b893a582b 100644
--- a/dev-embedded/openocd/openocd-0.3.1-r1.ebuild
+++ b/dev-embedded/openocd/openocd-0.3.1-r1.ebuild
@@ -1,11 +1,11 @@
 # 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.3.1-r1.ebuild,v 1.1 2011/02/22 17:09:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.3.1-r1.ebuild,v 1.2 2011/10/10 20:23:06 hwoarang Exp $
 
-EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
+EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
 inherit eutils
 if [[ ${PV} == "9999" ]] ; then
-	inherit git autotools
+	inherit git-2 autotools
 	#KEYWORDS=""
 	SRC_URI=""
 else
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="OpenOCD - Open On-Chip Debugger"
-HOMEPAGE="http://openocd.berlios.de/web/"
+HOMEPAGE="http://openocd.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -37,7 +37,7 @@ pkg_setup() {
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 		cd "${S}"
 		eautoreconf
 	else
diff --git a/dev-embedded/openocd/openocd-0.3.1.ebuild b/dev-embedded/openocd/openocd-0.3.1.ebuild
deleted file mode 100644
index e0ce172110d3..000000000000
--- a/dev-embedded/openocd/openocd-0.3.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.3.1.ebuild,v 1.4 2010/03/07 04:44:21 vapier Exp $
-
-EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
-inherit eutils
-if [[ ${PV} == "9999" ]] ; then
-	inherit git autotools
-	#KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="OpenOCD - Open On-Chip Debugger"
-HOMEPAGE="http://openocd.berlios.de/web/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ftd2xx ftdi parport presto usb"
-RESTRICT="strip" # includes non-native binaries
-
-# libftd2xx is the default because it is reported to work better.
-DEPEND="usb? ( dev-libs/libusb )
-	presto? ( dev-embedded/libftd2xx )
-	ftd2xx? ( dev-embedded/libftd2xx )
-	ftdi? ( dev-embedded/libftdi )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use ftdi && use ftd2xx ; then
-		ewarn "You can only use one FTDI library at a time, so picking"
-		ewarn "USE=ftdi (open source) over USE=ftd2xx (closed source)"
-	fi
-}
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
-		cd "${S}"
-		eautoreconf
-	else
-		unpack ${A}
-	fi
-}
-
-src_compile() {
-	if [[ ${PV} == "9999" ]] ; then
-		myconf="${myconf} --enable-maintainer-mode"
-	fi
-
-	econf \
-		--disable-werror \
-		--enable-amtjtagaccel \
-		--enable-ep93xx \
-		--enable-at91rm9200 \
-		--enable-gw16012 \
-		--enable-oocd_trace \
-		$(use_enable usb usbprog) \
-		$(use_enable parport) \
-		$(use_enable presto presto_ftd2xx) \
-		$(use_enable ftdi ft2232_libftdi) \
-		$(use ftdi || use_enable ftd2xx ft2232_ftd2xx) \
-		${myconf}
-	emake || die "Error in emake!"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	prepstrip "${D}"/usr/bin
-}
diff --git a/dev-embedded/openocd/openocd-0.4.0.ebuild b/dev-embedded/openocd/openocd-0.4.0.ebuild
index 32707f91fd0a..dc871c82fe6f 100644
--- a/dev-embedded/openocd/openocd-0.4.0.ebuild
+++ b/dev-embedded/openocd/openocd-0.4.0.ebuild
@@ -1,11 +1,11 @@
 # 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.4.0.ebuild,v 1.1 2011/02/22 17:09:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.4.0.ebuild,v 1.2 2011/10/10 20:23:06 hwoarang Exp $
 
-EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
+EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
 inherit eutils
 if [[ ${PV} == "9999" ]] ; then
-	inherit git autotools
+	inherit git-2 autotools
 	#KEYWORDS=""
 	SRC_URI=""
 else
@@ -14,7 +14,7 @@ else
 fi
 
 DESCRIPTION="OpenOCD - Open On-Chip Debugger"
-HOMEPAGE="http://openocd.berlios.de/web/"
+HOMEPAGE="http://openocd.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -37,7 +37,7 @@ pkg_setup() {
 
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 		cd "${S}"
 		eautoreconf
 	else
diff --git a/dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild b/dev-embedded/openocd/openocd-0.5.0.ebuild
index 0d57a4c3d089..9acc694a37ab 100644
--- a/dev-embedded/openocd/openocd-0.5.0_pre20110317.ebuild
+++ b/dev-embedded/openocd/openocd-0.5.0.ebuild
@@ -1,25 +1,25 @@
 # 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_pre20110317.ebuild,v 1.2 2011/03/17 12:50:00 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.5.0.ebuild,v 1.1 2011/10/10 20:23:06 hwoarang Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit autotools eutils
+inherit eutils
 if [[ ${PV} == "9999" ]] ; then
-	inherit git
+	inherit git-2
 	KEYWORDS=""
-	EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
+	EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
 fi
 
 DESCRIPTION="OpenOCD - Open On-Chip Debugger"
-HOMEPAGE="http://openocd.berlios.de/web/"
+HOMEPAGE="http://openocd.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="blaster ftd2xx ftdi parport presto segger versaloon usb"
+IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger versaloon usb"
 RESTRICT="strip" # includes non-native binaries
 
 # libftd2xx is the default because it is reported to work better.
@@ -30,37 +30,32 @@ DEPEND="dev-lang/jimtcl
 	ftdi? ( dev-embedded/libftdi )"
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	if use ftdi && use ftd2xx ; then
-		ewarn "You can only use one FTDI library at a time, so picking"
-		ewarn "USE=ftdi (open source) over USE=ftd2xx (closed source)"
-	fi
-}
-
-src_prepare() {
-		[[ ${PV} != "9999" ]]  && sed -i -e "/@include version.texi/d" doc/${PN}.texi
-		AT_NO_RECURSIVE=yes eautoreconf
-}
+REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ^^ ( ftdi ftd2xx )"
 
 src_configure() {
+	# Here are some defaults
+	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="${myconf} --enable-usbprog --enable-jlink --enable-rlink \
 			--enable-vsllink --enable-arm-jtag-ew"
 	fi
-	[[ ${PV} != "9999" ]] && myconf="${myconf} --enable-maintainer-mode"
+
 	# add explicitely the path to libftd2xx
-	use ftd2xx && ! use ftdi && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
+	use ftd2xx && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
+
+	if use blaster; then
+		use ftdi && myconf="${myconf} --use_blaster_libftdi"
+		use ftd2xx && myconf="${myconf} --use_blaster_ftd2xx"
+	fi
 	econf \
-		--disable-werror \
-		--disable-internal-jimtcl \
-		--enable-amtjtagaccel \
-		--enable-ep93xx \
-		--enable-at91rm9200 \
-		--enable-gw16012 \
-		--enable-oocd_trace \
-		$(use_enable blaster usb_flaster_libftdi) \
+		$(use_enable dummy) \
 		$(use_enable ftdi ft2232_libftdi) \
-		$(use ftdi || use_enable ftd2xx ft2232_ftd2xx) \
+		$(use_enable ftd2xx ft2232_ftd2xx) \
+		$(use_enable minidriver minidriver-dummy) \
 		$(use_enable parport) \
 		$(use_enable presto presto_ftd2xx) \
 		$(use_enable segger jlink) \
diff --git a/dev-embedded/openocd/openocd-0.5.0_pre20110427.ebuild b/dev-embedded/openocd/openocd-0.5.0_pre20110427.ebuild
deleted file mode 100644
index 11cae7b1fa31..000000000000
--- a/dev-embedded/openocd/openocd-0.5.0_pre20110427.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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_pre20110427.ebuild,v 1.1 2011/04/28 00:30:20 hwoarang Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-if [[ ${PV} == "9999" ]] ; then
-	inherit git
-	KEYWORDS=""
-	EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/openocd/openocd"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
-fi
-
-DESCRIPTION="OpenOCD - Open On-Chip Debugger"
-HOMEPAGE="http://openocd.berlios.de/web/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="blaster ftd2xx ftdi parport presto segger versaloon usb"
-RESTRICT="strip" # includes non-native binaries
-
-# libftd2xx is the default because it is reported to work better.
-DEPEND="dev-lang/jimtcl
-	usb? ( dev-libs/libusb )
-	presto? ( dev-embedded/libftd2xx )
-	ftd2xx? ( dev-embedded/libftd2xx )
-	ftdi? ( dev-embedded/libftdi )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if use ftdi && use ftd2xx ; then
-		ewarn "You can only use one FTDI library at a time, so picking"
-		ewarn "USE=ftdi (open source) over USE=ftd2xx (closed source)"
-	fi
-}
-
-src_prepare() {
-		[[ ${PV} != "9999" ]]  && sed -i -e "/@include version.texi/d" doc/${PN}.texi
-		AT_NO_RECURSIVE=yes eautoreconf
-}
-
-src_configure() {
-	if use usb;then
-		myconf="${myconf} --enable-usbprog --enable-jlink --enable-rlink \
-			--enable-vsllink --enable-arm-jtag-ew"
-	fi
-	[[ ${PV} != "9999" ]] && myconf="${myconf} --enable-maintainer-mode"
-	# add explicitely the path to libftd2xx
-	use ftd2xx && ! use ftdi && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
-	econf \
-		--disable-werror \
-		--disable-internal-jimtcl \
-		--enable-amtjtagaccel \
-		--enable-ep93xx \
-		--enable-at91rm9200 \
-		--enable-gw16012 \
-		--enable-oocd_trace \
-		$(use_enable blaster usb_flaster_libftdi) \
-		$(use_enable ftdi ft2232_libftdi) \
-		$(use ftdi || use_enable ftd2xx ft2232_ftd2xx) \
-		$(use_enable parport) \
-		$(use_enable presto presto_ftd2xx) \
-		$(use_enable segger jlink) \
-		$(use_enable versaloon vsllink) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
-	prepstrip "${D}"/usr/bin
-}
diff --git a/dev-embedded/openocd/openocd-9999.ebuild b/dev-embedded/openocd/openocd-9999.ebuild
index 69b8ac276354..c952df5931d8 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,25 +1,25 @@
 # 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.15 2011/09/20 22:05:51 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.16 2011/10/10 20:23:06 hwoarang Exp $
 
-EAPI="2"
+EAPI="4"
 
-inherit autotools eutils
+inherit eutils
 if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 	KEYWORDS=""
-	EGIT_REPO_URI="git://openocd.git.sourceforge.net/gitroot/${PN}/${PN}"
+	EGIT_REPO_URI="git://${PN}.git.sourceforge.net/gitroot/${PN}/${PN}"
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+	SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
 fi
 
 DESCRIPTION="OpenOCD - Open On-Chip Debugger"
-HOMEPAGE="http://openocd.berlios.de/web/"
+HOMEPAGE="http://openocd.sourceforge.net"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="blaster ftd2xx ftdi parport presto segger versaloon usb"
+IUSE="blaster dummy ftd2xx ftdi minidriver parport presto segger versaloon usb"
 RESTRICT="strip" # includes non-native binaries
 
 # libftd2xx is the default because it is reported to work better.
@@ -30,36 +30,32 @@ DEPEND="dev-lang/jimtcl
 	ftdi? ( dev-embedded/libftdi )"
 RDEPEND="${DEPEND}"
 
-pkg_setup() {
-	if use ftdi && use ftd2xx ; then
-		ewarn "You can only use one FTDI library at a time, so picking"
-		ewarn "USE=ftdi (open source) over USE=ftd2xx (closed source)"
-	fi
-}
-
-src_prepare() {
-		sed -i -e "/@include version.texi/d" doc/${PN}.texi || die
-		AT_NO_RECURSIVE=yes eautoreconf
-}
+REQUIRED_USE="blaster? ( || ( ftdi ftd2xx ) ) ^^ ( ftdi ftd2xx )"
 
 src_configure() {
+	# Here are some defaults
+	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="${myconf} --enable-usbprog --enable-jlink --enable-rlink \
 			--enable-vsllink --enable-arm-jtag-ew"
 	fi
+
 	# add explicitely the path to libftd2xx
-	use ftd2xx && ! use ftdi && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
+	use ftd2xx && LDFLAGS="${LDFLAGS} -L/opt/$(get_libdir)"
+
+	if use blaster; then
+		use ftdi && myconf="${myconf} --use_blaster_libftdi"
+		use ftd2xx && myconf="${myconf} --use_blaster_ftd2xx"
+	fi
 	econf \
-		--disable-werror \
-		--disable-internal-jimtcl \
-		--enable-amtjtagaccel \
-		--enable-ep93xx \
-		--enable-at91rm9200 \
-		--enable-gw16012 \
-		--enable-oocd_trace \
-		$(use_enable blaster usb_flaster_libftdi) \
+		$(use_enable dummy) \
 		$(use_enable ftdi ft2232_libftdi) \
-		$(use ftdi || use_enable ftd2xx ft2232_ftd2xx) \
+		$(use_enable ftd2xx ft2232_ftd2xx) \
+		$(use_enable minidriver minidriver-dummy) \
 		$(use_enable parport) \
 		$(use_enable presto presto_ftd2xx) \
 		$(use_enable segger jlink) \