Massive ebuild improvements and clean up thanks to Paul Fertser <fercerpav@gmail.com> on bug #500350. No need for revbump as this will be removed soon in favor of final 0.8.0

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)

4 files changed, 66 insertions, 75 deletions

diff --git a/dev-embedded/openocd/ChangeLog b/dev-embedded/openocd/ChangeLog
index 6f13abfda033..7f2daaf64fab 100644
--- a/dev-embedded/openocd/ChangeLog
+++ b/dev-embedded/openocd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.47 2014/04/26 11:26:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/ChangeLog,v 1.48 2014/05/03 22:18:55 hwoarang Exp $
+
+  03 May 2014; Markos Chandras <hwoarang@gentoo.org> metadata.xml,
+  openocd-0.8.0_rc2.ebuild, openocd-9999.ebuild:
+  Massive ebuild improvements and clean up thanks to Paul Fertser
+  <fercerpav@gmail.com> on bug #500350. No need for revbump as this will be
+  removed soon in favor of final 0.8.0
 
 *openocd-0.8.0_rc2 (26 Apr 2014)
 
diff --git a/dev-embedded/openocd/metadata.xml b/dev-embedded/openocd/metadata.xml
index 8f16fe14a093..ae5bcfb9ea84 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -4,6 +4,7 @@
 <herd>dev-embedded</herd>
 <use>
   <flag name='blaster'>Enable support for Altera USE-Blaster</flag>
+  <flag name='cmsis-dap'>Support for CMSIS-DAP compliant adapters</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>
diff --git a/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild b/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild
index 669b130620ba..d2b12f45ed57 100644
--- a/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild
+++ b/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild
@@ -1,10 +1,10 @@
 # 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.1 2014/04/26 11:26:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-0.8.0_rc2.ebuild,v 1.2 2014/05/03 22:18:55 hwoarang Exp $
 
 EAPI="5"
 
-inherit eutils multilib flag-o-matic toolchain-funcs
+inherit eutils multilib flag-o-matic toolchain-funcs udev
 
 # One ebuild to rule them all
 if [[ ${PV} == "9999" ]] ; then
@@ -22,23 +22,21 @@ fi
 DESCRIPTION="OpenOCD - Open On-Chip Debugger"
 HOMEPAGE="http://openocd.sourceforge.net"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="blaster dummy ftdi minidriver parport presto segger +usb verbose-io"
+IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-# Pull both libusb:0 and libusb:1 because some device need the former
-# others need the later etc.
-DEPEND=">=dev-lang/jimtcl-0.73
+RDEPEND=">=dev-lang/jimtcl-0.73
+	cmsis-dap? ( dev-libs/hidapi )
 	usb? (
 		virtual/libusb:0
 		virtual/libusb:1
 	)
 	ftdi? ( dev-embedded/libftdi )"
 
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi )"
+DEPEND="${REPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
 	epatch_user
@@ -47,28 +45,12 @@ src_prepare() {
 		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
@@ -77,12 +59,16 @@ src_configure() {
 		--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
@@ -92,42 +78,47 @@ src_configure() {
 			--enable-rlink
 			--enable-stlink
 			--enable-vsllink
-			--enable-arm-jtag-ew
+			--enable-armjtagew
 			$(use_enable verbose-io verbose-usb-io)
 			$(use_enable verbose-io verbose_usb_comms)
 		)
 	else
 		myconf+=(
 			--disable-aice
-			--disable-stlink
+			--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 blaster; then
+	if use ftdi; then
 		myconf+=(
-			--enable-usb_blaster_libftdi
-			--enable-usb-blaster-2
+			--enable_usb_blaster_libftdi
+			--enable-openjtag_ftdi
+			--enable-presto_libftdi
 		)
 	else
 		myconf+=(
+			--disable-openjtag_ftdi
+			--disable-presto_libftdi
 			--disable-usb_blaster_libftdi
-			--disable-usb-blaster-2
 		)
 	fi
 
 	econf \
 		$(use_enable dummy) \
-		$(use_enable ftdi) \
-		$(use_enable minidriver minidriver-dummy) \
+		$(use_enable cmsis-dap) \
 		$(use_enable parport) \
 		$(use_enable parport parport_ppdev) \
-		$(use_enable parport parport_giveio) \
-		$(use_enable presto presto_libftdi) \
-		$(use_enable segger jlink) \
 		$(use_enable verbose-io verbose-jtag-io) \
 		"${myconf[@]}"
 }
@@ -135,4 +126,5 @@ src_configure() {
 src_install() {
 	default
 	env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
+	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 592a7bf44d03..4f0590a97b75 100644
--- a/dev-embedded/openocd/openocd-9999.ebuild
+++ b/dev-embedded/openocd/openocd-9999.ebuild
@@ -1,10 +1,10 @@
 # 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.33 2014/04/26 11:26:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/openocd/openocd-9999.ebuild,v 1.34 2014/05/03 22:18:55 hwoarang Exp $
 
 EAPI="5"
 
-inherit eutils multilib flag-o-matic toolchain-funcs
+inherit eutils multilib flag-o-matic toolchain-funcs udev
 
 # One ebuild to rule them all
 if [[ ${PV} == "9999" ]] ; then
@@ -22,23 +22,21 @@ fi
 DESCRIPTION="OpenOCD - Open On-Chip Debugger"
 HOMEPAGE="http://openocd.sourceforge.net"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-IUSE="blaster dummy ftdi minidriver parport presto segger +usb verbose-io"
+IUSE="cmsis-dap dummy ftdi parport +usb verbose-io"
 RESTRICT="strip" # includes non-native binaries
 
-# Pull both libusb:0 and libusb:1 because some device need the former
-# others need the later etc.
-DEPEND=">=dev-lang/jimtcl-0.73
+RDEPEND=">=dev-lang/jimtcl-0.73
+	cmsis-dap? ( dev-libs/hidapi )
 	usb? (
 		virtual/libusb:0
 		virtual/libusb:1
 	)
 	ftdi? ( dev-embedded/libftdi )"
 
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="blaster? ( ftdi ) presto? ( ftdi )"
+DEPEND="${REPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
 	epatch_user
@@ -47,28 +45,12 @@ src_prepare() {
 		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
@@ -77,12 +59,16 @@ src_configure() {
 		--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
@@ -92,42 +78,47 @@ src_configure() {
 			--enable-rlink
 			--enable-stlink
 			--enable-vsllink
-			--enable-arm-jtag-ew
+			--enable-armjtagew
 			$(use_enable verbose-io verbose-usb-io)
 			$(use_enable verbose-io verbose_usb_comms)
 		)
 	else
 		myconf+=(
 			--disable-aice
-			--disable-stlink
+			--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 blaster; then
+	if use ftdi; then
 		myconf+=(
-			--enable-usb_blaster_libftdi
-			--enable-usb-blaster-2
+			--enable_usb_blaster_libftdi
+			--enable-openjtag_ftdi
+			--enable-presto_libftdi
 		)
 	else
 		myconf+=(
+			--disable-openjtag_ftdi
+			--disable-presto_libftdi
 			--disable-usb_blaster_libftdi
-			--disable-usb-blaster-2
 		)
 	fi
 
 	econf \
 		$(use_enable dummy) \
-		$(use_enable ftdi) \
-		$(use_enable minidriver minidriver-dummy) \
+		$(use_enable cmsis-dap) \
 		$(use_enable parport) \
 		$(use_enable parport parport_ppdev) \
-		$(use_enable parport parport_giveio) \
-		$(use_enable presto presto_libftdi) \
-		$(use_enable segger jlink) \
 		$(use_enable verbose-io verbose-jtag-io) \
 		"${myconf[@]}"
 }
@@ -135,4 +126,5 @@ src_configure() {
 src_install() {
 	default
 	env -uRESTRICT prepstrip "${ED}"/usr/bin "${ED}"/usr/$(get_libdir)
+	udev_dorules ${D}/usr/share/${PN}/contrib/*.rules
 }