Version bump. Remove snapshots. Update metadata and homepage

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

8 files changed, 74 insertions, 222 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/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) \