version bump, include cpld, correct dfu firmware names

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

3 files changed, 57 insertions, 6 deletions

diff --git a/net-wireless/hackrf-tools/ChangeLog b/net-wireless/hackrf-tools/ChangeLog
index bbdb492a8778..e4218cfda71d 100644
--- a/net-wireless/hackrf-tools/ChangeLog
+++ b/net-wireless/hackrf-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/hackrf-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/ChangeLog,v 1.11 2014/08/28 14:48:35 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/ChangeLog,v 1.12 2014/08/28 20:16:17 zerochaos Exp $
+
+*hackrf-tools-2014.08.1 (28 Aug 2014)
+
+  28 Aug 2014; Rick Farina <zerochaos@gentoo.org>
+  +hackrf-tools-2014.08.1.ebuild, hackrf-tools-9999.ebuild:
+  version bump, include cpld, correct dfu firmware names
 
   28 Aug 2014; Rick Farina <zerochaos@gentoo.org> hackrf-tools-9999.ebuild:
   udev rules moved from hackrf-tools to libhackrf
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2014.08.1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2014.08.1.ebuild
new file mode 100644
index 000000000000..261bd35ff52d
--- /dev/null
+++ b/net-wireless/hackrf-tools/hackrf-tools-2014.08.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/hackrf-tools-2014.08.1.ebuild,v 1.1 2014/08/28 20:16:17 zerochaos Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="library for communicating with HackRF SDR platform"
+HOMEPAGE="http://greatscottgadgets.com/hackrf/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/mossmann/hackrf.git"
+	inherit git-2
+	KEYWORDS=""
+	EGIT_SOURCEDIR="${WORKDIR}/hackrf"
+	S="${WORKDIR}/hackrf/host/hackrf-tools"
+else
+	S="${WORKDIR}/hackrf-${PV}/host/hackrf-tools"
+	SRC_URI="mirror://sourceforge/hackrf/hackrf-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="virtual/libusb:1
+	=net-libs/libhackrf-${PV}:="
+RDEPEND="${DEPEND}"
+
+src_install() {
+	cmake-utils_src_install
+	if [[ ${PV} != "9999" ]] ; then
+		insinto /usr/share/hackrf
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb_rom_to_ram.bin" hackrf_jawbreaker_usb_rom_to_ram-${PV}.bin
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb_ram.dfu" hackrf_jawbreaker_usb_ram-${PV}.dfu
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb_rom_to_ram.bin" hackrf_one_usb_rom_to_ram-${PV}.bin
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb_ram.dfu" hackrf_one_usb_ram-${PV}.dfu
+		newins "${WORKDIR}/hackrf-${PV}/firmware/cpld/sgpio_if/default.xsvf" hackrf_cpld_default-${PV}.xsvf
+	else
+		ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this."
+	fi
+}
diff --git a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild
index 67b78edc5b56..521dd15f641c 100644
--- a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild
+++ b/net-wireless/hackrf-tools/hackrf-tools-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/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild,v 1.7 2014/08/28 14:48:35 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild,v 1.8 2014/08/28 20:16:17 zerochaos Exp $
 
 EAPI=5
 
@@ -33,10 +33,11 @@ src_install() {
 	cmake-utils_src_install
 	if [[ ${PV} != "9999" ]] ; then
 		insinto /usr/share/hackrf
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/jawbreaker/hackrf_usb_rom_to_ram.bin" hackrf_jawbreaker_usb_rom_to_ram-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/jawbreaker/hackrf_usb_ram.dfu" hackrf_jawbreaker_usb_ram.dfu-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf-one/hackrf_usb_rom_to_ram.bin" hackrf_one_usb_rom_to_ram-${PV}.bin
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf-one/hackrf_usb_ram.dfu" hackrf_one_usb_ram.dfu-${PV}.bin
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb_rom_to_ram.bin" hackrf_jawbreaker_usb_rom_to_ram-${PV}.bin
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_jawbreaker_usb_ram.dfu" hackrf_jawbreaker_usb_ram-${PV}.dfu
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb_rom_to_ram.bin" hackrf_one_usb_rom_to_ram-${PV}.bin
+		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_one_usb_ram.dfu" hackrf_one_usb_ram-${PV}.dfu
+		newins "${WORKDIR}/hackrf-${PV}/firmware/cpld/sgpio_if/default.xsvf" hackrf_cpld_default-${PV}.xsvf
 	else
 		ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this."
 	fi