ease following flashing instructions by symlinking original names

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xDD11F94A

4 files changed, 73 insertions, 21 deletions

diff --git a/net-wireless/hackrf-tools/ChangeLog b/net-wireless/hackrf-tools/ChangeLog
index f61871ca49c2..ea20911f6721 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-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/ChangeLog,v 1.14 2015/07/24 16:42:18 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/ChangeLog,v 1.15 2015/07/30 04:58:54 zerochaos Exp $
+
+*hackrf-tools-2015.07.2-r1 (30 Jul 2015)
+
+  30 Jul 2015; Rick Farina <zerochaos@gentoo.org>
+  +hackrf-tools-2015.07.2-r1.ebuild, hackrf-tools-9999.ebuild:
+  ease following flashing instructions by symlinking original names
 
 *hackrf-tools-2015.07.2 (24 Jul 2015)
 
diff --git a/net-wireless/hackrf-tools/Manifest b/net-wireless/hackrf-tools/Manifest
index c77d43ff42aa..d44071e8796e 100644
--- a/net-wireless/hackrf-tools/Manifest
+++ b/net-wireless/hackrf-tools/Manifest
@@ -1,30 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 52-hackrf.rules 99 SHA256 58368244dd3e38b4688c84660257dddf2408b96b4b22d0f07f324709a8f53238 SHA512 3d6fc618510d8c07b733481bf1bf698979e65cee320f7d8bd888284a9474ba601dca9d81521a96f109ef476a4a4632b2850126d4ba4e187b9d72bc7253bf5e6c WHIRLPOOL 9a8c02259651e476b91cb40e4b16264f5f22993fc9e1d17596ed5078ce21e3d755248a59e364e285ca9c727632d1052a9514cdad536bbcd45f9f73c3d6a715e4
 DIST hackrf-2014.08.1.tar.xz 14376904 SHA256 624c46163161896b8347a73e9edeb1188433f032df7cd00eda9a242c2a5bc98a SHA512 2bb2e9398479f635fc4cb73875d9728c689f5d29bfbdcaae661d98ecafe51d38ac8768dd4f38b87766195d9ed08757e76d790030edf6f6f572d547146287c073 WHIRLPOOL c33430279d0757e104f09ecafce2df859f33f8de9139dd6491a11d86ed3e241ba3ef298d1d0994113e695c46ab211daf573262815a8a1fc5349fd44642da3910
 DIST hackrf-2015.07.2.tar.xz 14415212 SHA256 5e3d9c36928b88cdbc0d66ee54e24e8682972dba478abfca0e31069515b870b6 SHA512 a4f7b7800ece9b260d5c8c374f5544aa55cd2e97e10c6a0b33cf476e2ad4811321ffb1308d9dfb2168b2624cd3af616d1c314ad86bcd6f4c3fd0897319fa2cbd WHIRLPOOL 8dfee4fb55be913f44d8ab905fc7c6b1fd703e16b01aa41191e97ab726a3b04d6a78670ae47c2d3bada64e38d42cabcf7f39b646fba55b436cbcab312be1f198
 EBUILD hackrf-tools-2014.08.1.ebuild 1602 SHA256 57c637374ac5ed9babd4d1ab506b6d987d1a2fdddaa96987b6da25c048c079a0 SHA512 57a03ff6127a42eac33d617e8dd61bfb1bdf0f08800adb4e4bfeea876cf3ad25b2b26e094d7835a0b16a879d80f64a9283ab3ea06378a34f849c3dd2f92a18c6 WHIRLPOOL 2efa2327962243c02dba9b6f9e124bde28447400c5074d1e76c4965416cfd34bcf6f4b6037987d61cba7bcfd535fe4895a9edf3cdc1bde633947f6c377327a1b
+EBUILD hackrf-tools-2015.07.2-r1.ebuild 1821 SHA256 573535409099bd1933c694a37003f7f5c8650515281c05e1a5dc569de42f8866 SHA512 4f6831340bbf91ff7070ff746e4e08ba87ac92bff6488ba08a325ae5f9485237366a2771850a927764112aee4d8998a3a3a8ee94fec0305037e9b8f38dd46837 WHIRLPOOL b256e4ddf25ae49f7377dc6df34e3b419141732abbdc1841ea6edc2335c6d786cfc19805b9786d7fa39fba4aedc6a0b220fa14fbdb5ce569fd0541988f33aa03
 EBUILD hackrf-tools-2015.07.2.ebuild 1634 SHA256 fb7154adcf0a859e830951d3647f37a2dc459949befbac5636a30cd9f8a95aa8 SHA512 4836170eae7d4f816a42c932e54dbdb5fe001d06363e29f50fa973e46e94e2d67464b609b66b350290a60985f981ef874e49a0abf381fae42a1e6870b13574e0 WHIRLPOOL 1d335ddc96fd875207430c5e993b6eadd2532d96d6efc790a6dd941f9423f969973028f081e630bcfd50ccde72b6a81abd83b9f9ce0c420665690ffc8bd196c1
-EBUILD hackrf-tools-9999.ebuild 1630 SHA256 92723b2187d9f503cbf38b3bd96127f63429f7c889cded71482f21d98b4cf66e SHA512 9a1f1de94826a868d9ef6b2b09cd524c488c807e4e3dd6b39e195da1baceac9c83e615ca66d2e6c1c89beac72a16a0fa9a6511c53c57e703899ca4ba9cca9a77 WHIRLPOOL 205bd15d4f3a779e47e0c8e60d6d3bd45a50ec4df4a56300d4b0d0e7586e6f2ba52e2149579eabc83b77c013c184556743f7e176c1a1c47331bb6d249c3cab46
-MISC ChangeLog 2747 SHA256 b0b491979c3a713d82963a243dbc20980e07b70b31d54a6755c4482f0002e10b SHA512 0db3d8a5248fb2a3c7af73f03091a43bb7168a32f699b972503a1a23b3775b627b31bf8fd2a5ea2143d852d6e05d9a9978ffb0b92a006d68da3a6dce2b69f5ed WHIRLPOOL 2b82ac3cd2c10dcb4be0fc17c37caddef102b244adb8b2f3398ad18bf13a5d95230ba1fa8f245d5a0ced384a4621957284b87dcfcd740bec40c8bc9e69ecb06e
+EBUILD hackrf-tools-9999.ebuild 1814 SHA256 386375d5cbcb6b8450ec771c057c9c8b567eac2bc887ea949c020418678819ec SHA512 52970ef1267daab3e14a9b623b9ffed9308d735c5c128601097714a0716944ecf92381d01db3da5864134f6fc6dd5874dd254c5f428ad1f39e8219290a166aec WHIRLPOOL bf1e91f5ac84765c1fe5b1dacad91e8efdf62e787e96ec6023f8232b09753f14881d1dc55ca4795d95eb09451bb1d0af9d5335aa1f738322b138d60e9a285278
+MISC ChangeLog 2971 SHA256 a7a541da60d840789a9ee5aeb9a91097390d883a39465ce9c75167f2a9aebe59 SHA512 35b318fb0b68324ee13b167b29493a830948d5b2d692a53b07841fb5774667f2cb61ec8ea098dbdd16444029baf33afc3c0003921085b5c748233eb53a905866 WHIRLPOOL 5b7b8a8d5ff661045c84d8998416cc13cb28f93d107ed449c4965d85b738467891e6fa21fe3211c650c1f84abce0a559d08c28579219dbe7dc51ef685d06def0
 MISC metadata.xml 432 SHA256 e6b934fe707c0c1de16f006f8e19171eba4a803aec24d4092484d3e1dd71f626 SHA512 bd4acae72aa42a40afbfa7810e11b04e9b918279d21011d9ee967aef5482b37968fae2a9964ce476e3e129fa7da5e63f3284ecc8e40e71c9528fa901f8289f8c WHIRLPOOL df09dbee6e0f5da3d027ccc76735f3423b655c144aea1bbcf8a15d1e70d9f671fff8137e9864da8e113f52e93275f151314206b249c1d68d80c21c30ba4d8c63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVthAvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiCi8P/iWEvZ2s1dBVFn0SyyRE4TZY
-LX3hNlwLojAQ1BQ51ozaunv+qu5SFNhZugK0ZC49kaQyt5nKpU5BtEHYmvI1CgR6
-LmtG4qNwXNO/bIDqU/FFxPPm3hgs1xUToDTjyBXwAQ0xpXtPSQWVYTRwOeYbz0fB
-G0nyFsETUS3VZpwLb/fwZm94NOTmZi+OagASC+I3E2LGfltA2B+dQ6s20p1ciwkk
-5C93blU6hMn2BfkrtD1nXYYyvQUQYTIFi5q3oSReHG2CY7y+DzdbzfY3BcXrYXS8
-BXOmsW9gjcXtxlOAI/iWY3Q/wRH6XEWy7Ra+2EFsO/N+G10mVZz3EMd7q/VG1EB9
-U49sUEqZFLZyzfpkr4hWr6oJslGFXZ7h7MMYgysjAvIH8fMnoYInmjfBi5zHyrgs
-udmIuL1oJAFjppb++JJC3oWvpUjivGthwd6gt6h8izDs6wP+cjT0tbH6iTVeKjmK
-ZjEuzKIyFErSFeqHAQ2C++6usmyu8/MNbtnvrpmqpnW6UcY0ZoTK7PSi4p1xpvN4
-BSVHsSqy/YJIh4QC48SDOLKCqp43kyuon5HnecoCFvL93ZOb6yLDiwj6Wn95GCh1
-vokPNm6bfqBUs5KQdXErb/sTLth86wfRMXiyE7uJyfGPcHAM4biWCVeDKJ1yOgJ2
-PvyaJA+0ZnLMOViGTRj0
-=OHVc
+iQIcBAEBCAAGBQJVua8SAAoJEKXdFCfdEflKUEoP/jhLYy+OmHCYti/j9oHvRJbM
+EEYr4kB+xeRiQx4eyoTchAfk1yRonxN+1MBtn2mqcGb4/SR35KkeKsW8l9yKxBEU
+YPTTVBkVIB6QslPOn6oEOY0KhBI1lBDfSiAeCSISKB48JcCcjBl2BUgv/cPHD9jj
+n8NfLAbESdCPGyI+fMR387F+YE7piXVHlyjoX/49eIlXvI96pntshfvBKO4GMpZq
+bDB77Amq9JRDhKPPcyCogoLIZfEAKJAUzTBkPSjP1/jtqz1zBKOz2PbTwe3dR9om
+VmDp/4l2+RoqRpZvdUbMXQD/hcUNHcp6mPpE8Yqs8w1PeicdPsqPM9M89l1yPHg1
+JNAGjIaiHgl5/y0ap2wPw2BII6j9LfrjL9vfajW/BCenMLx5D4dR0/XZjEuzG18O
+CWjZifoWNvT6GyTLcwy229VW9t23iFwUUK5nsPBCgJUpbEib+3Y1ts/H6G/Nayvc
+RKOP9J8CBJv5SueBwTpj2m5BS+LmkRRn5UVl5ITHLUc+ZbzbVBiEoAr+zxrpSrSl
+kmmNhj1vrXFfGmxUGKLSXF53IpjXUGfN3X4RBdWuqAO60BgXOwWWP6UM3ZPjuHA2
+Q5l7WeB81ftoXC3y9YoXy9eivUBubXBKn/Y/1Y8bA4HqSFiRLQvS3EQTJ37Nr1/I
+OlQSGHeev4eNC59Tig7u
+=OWJ4
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/hackrf-tools/hackrf-tools-2015.07.2-r1.ebuild b/net-wireless/hackrf-tools/hackrf-tools-2015.07.2-r1.ebuild
new file mode 100644
index 000000000000..89809589e97d
--- /dev/null
+++ b/net-wireless/hackrf-tools/hackrf-tools-2015.07.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/hackrf-tools-2015.07.2-r1.ebuild,v 1.1 2015/07/30 04:58:54 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="https://github.com/mossmann/hackrf/releases/download/v${PV}/hackrf-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+DEPEND="=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
+		ln -s hackrf_one_usb_rom_to_ram-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin"
+		ln -s hackrf_one_usb_ram-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu"
+	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 35343551151f..c618c5cf682d 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-2015 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.10 2015/07/24 16:42:18 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/hackrf-tools/hackrf-tools-9999.ebuild,v 1.11 2015/07/30 04:58:54 zerochaos Exp $
 
 EAPI=5
 
@@ -37,6 +37,8 @@ src_install() {
 		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
+		ln -s hackrf_one_usb_rom_to_ram-${PV}.bin "${ED}/usr/share/hackrf/hackrf_one_usb_rom_to_ram.bin"
+		ln -s hackrf_one_usb_ram-${PV}.dfu "${ED}/usr/share/hackrf/hackrf_one_usb_ram.dfu"
 	else
 		ewarn "The compiled firmware files are only available in the versioned releases, you are on your own for this."
 	fi