adding dfu recovery firmware, moving location as requested by upstream, fixing udev rule

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

5 files changed, 34 insertions, 86 deletions

diff --git a/net-wireless/hackrf-tools/ChangeLog b/net-wireless/hackrf-tools/ChangeLog
index fe0b5748f826..e10ef562af6c 100644
--- a/net-wireless/hackrf-tools/ChangeLog
+++ b/net-wireless/hackrf-tools/ChangeLog
@@ -1,6 +1,15 @@
 # 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.8 2014/05/01 14:41:53 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/ChangeLog,v 1.9 2014/08/21 20:10:13 zerochaos Exp $
+
+*hackrf-tools-2014.04.1-r1 (21 Aug 2014)
+
+  21 Aug 2014; Rick Farina <zerochaos@gentoo.org>
+  +hackrf-tools-2014.04.1-r1.ebuild, -hackrf-tools-2013.06.1-r1.ebuild,
+  -hackrf-tools-2013.07.1.ebuild, -hackrf-tools-2014.04.1.ebuild,
+  hackrf-tools-9999.ebuild:
+  adding dfu recovery firmware, moving location as requested by upstream, fixing
+  udev rule
 
 *hackrf-tools-2014.04.1 (01 May 2014)
 
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2013.06.1-r1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2013.06.1-r1.ebuild
deleted file mode 100644
index 9134d422e325..000000000000
--- a/net-wireless/hackrf-tools/hackrf-tools-2013.06.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/hackrf-tools-2013.06.1-r1.ebuild,v 1.1 2013/06/27 04:46:10 zerochaos Exp $
-
-EAPI=5
-
-inherit cmake-utils udev
-
-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:="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	if [[ ${PV} != "9999" ]] ; then
-		insinto /lib/firmware
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_usb_rom_to_ram.bin" hackrf_usb_rom_to_ram-${PV}.bin
-	fi
-	udev_dorules "${FILESDIR}"/52-hackrf.rules
-}
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2013.07.1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2013.07.1.ebuild
deleted file mode 100644
index 0bc4e3c79de5..000000000000
--- a/net-wireless/hackrf-tools/hackrf-tools-2013.07.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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-2013.07.1.ebuild,v 1.2 2014/05/01 14:41:52 zerochaos Exp $
-
-EAPI=5
-
-inherit cmake-utils udev
-
-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-2013*:="
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	if [[ ${PV} != "9999" ]] ; then
-		insinto /lib/firmware
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_usb_rom_to_ram.bin" hackrf_usb_rom_to_ram-${PV}.bin
-	fi
-	udev_dorules 52-hackrf.rules
-}
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2014.04.1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2014.04.1-r1.ebuild
index 66d2fa42e758..6f6f9824aaac 100644
--- a/net-wireless/hackrf-tools/hackrf-tools-2014.04.1.ebuild
+++ b/net-wireless/hackrf-tools/hackrf-tools-2014.04.1-r1.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-2014.04.1.ebuild,v 1.1 2014/05/01 14:41:52 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/hackrf-tools-2014.04.1-r1.ebuild,v 1.1 2014/08/21 20:10:13 zerochaos Exp $
 
 EAPI=5
 
@@ -29,12 +29,20 @@ DEPEND="virtual/libusb:1
 	=net-libs/libhackrf-${PV}:="
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	sed -i 's#plugdev#usb#' 52-hackrf.rules
+}
+
 src_install() {
 	cmake-utils_src_install
 	if [[ ${PV} != "9999" ]] ; then
-		insinto /lib/firmware
+		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_hackrf_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_hackrf_usb_ram.dfu-${PV}.bin
+	else
+		ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this."
 	fi
 	udev_dorules 52-hackrf.rules
 }
diff --git a/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild b/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild
index f23dfe2e6cd3..b3425c5811a6 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-2013 Gentoo Foundation
+# 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.4 2013/06/27 04:41:49 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild,v 1.5 2014/08/21 20:10:13 zerochaos Exp $
 
 EAPI=5
 
@@ -26,14 +26,23 @@ SLOT="0"
 IUSE=""
 
 DEPEND="virtual/libusb:1
-	net-libs/libhackrf:="
+	=net-libs/libhackrf-${PV}:="
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	sed -i 's#plugdev#usb#' 52-hackrf.rules
+}
+
 src_install() {
 	cmake-utils_src_install
 	if [[ ${PV} != "9999" ]] ; then
-		insinto /lib/firmware
-		newins "${WORKDIR}/hackrf-${PV}/firmware-bin/hackrf_usb_rom_to_ram.bin" hackrf_usb_rom_to_ram-${PV}.bin
+		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_hackrf_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_hackrf_usb_ram.dfu-${PV}.bin
+	else
+		ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this."
 	fi
 	udev_dorules 52-hackrf.rules
 }