add patch to disable pre-amp on hackrf by default, remove old ebuilds to avoid accidental hardware damage

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

5 files changed, 61 insertions, 86 deletions

diff --git a/net-wireless/gr-osmosdr/ChangeLog b/net-wireless/gr-osmosdr/ChangeLog
index 6166a8ec5f46..a9b154d78ff4 100644
--- a/net-wireless/gr-osmosdr/ChangeLog
+++ b/net-wireless/gr-osmosdr/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/gr-osmosdr
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/ChangeLog,v 1.26 2014/08/28 19:58:13 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/ChangeLog,v 1.27 2014/11/04 12:35:24 zerochaos Exp $
+
+*gr-osmosdr-0.1.3-r1 (04 Nov 2014)
+
+  04 Nov 2014; Rick Farina <zerochaos@gentoo.org> +files/hackrf-safety.patch,
+  +gr-osmosdr-0.1.3-r1.ebuild, -gr-osmosdr-0.0.2-r1.ebuild,
+  -gr-osmosdr-0.1.3.ebuild:
+  add patch to disable pre-amp on hackrf by default, remove old ebuilds to avoid
+  accidental hardware damage
 
 *gr-osmosdr-0.1.3 (28 Aug 2014)
 
diff --git a/net-wireless/gr-osmosdr/Manifest b/net-wireless/gr-osmosdr/Manifest
index 8c881f907429..19dd2839663f 100644
--- a/net-wireless/gr-osmosdr/Manifest
+++ b/net-wireless/gr-osmosdr/Manifest
@@ -1,27 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-DIST gr-osmosdr-0.0.2.tar.xz 120768 SHA256 f9e16210761de6e844b6618877f5ccb74f007d319a4b4ade1f5750ca9f279586 SHA512 2a425cbf41611084a1620c5aaec540432652280a6704a1c9d7fdb942721cd53fd10c5c0a8f099b76d4757f2bc92b38308bba3f10311876b99116634bffeb4df9 WHIRLPOOL c7da0d265029adada5c6ff251deb46cb7f212b5b29b94974bbb8c04a533f36bc92f2074e908500f3ce46b56572228c209d87eaae08873f6a7f2a1d046effe43c
+AUX hackrf-safety.patch 1403 SHA256 28c36ea050d7ffc938d744e457163b9a8141ea637b50f02cd48f76e52a9b924e SHA512 caf29acd3511baef90adc7e9af69a60b23c47a906c80c6b77320a4bdd1b9adde858c5424002858603b19bcf6fd0614f7c10861d5c9059260fa7b6064b2d63a28 WHIRLPOOL 09d98a2aa1aa89b82e345d30137897616bfaa518256fd2e181b019de3d7fa703953213ea4db742982de75f3abdf72c75865bb339c0597119473d9a6dce358a19
 DIST gr-osmosdr-0.1.3.tar.xz 141340 SHA256 26624cb63a97958a1ad1c22d08e636f166fd1640c64f593a1fd75adbe1a23dee SHA512 83eb99429784e468b053f7e3bfba75667ba3e1b44e7ce316ad58eda2fd62ba555be28a8d6cb7671c3dfa3fe1ed5fbf6a7a77167fca5b4ce176fe17336499d4d6 WHIRLPOOL 252175efdae3c3dba4b6a6d7b38ed01646249c7d1a4ae21926e6e71c802fc7fe6219e29e9f53f839e7a6c45e8dd39a4038a4578a8f01288b5cc4e61809d29b64
-EBUILD gr-osmosdr-0.0.2-r1.ebuild 1749 SHA256 84a011eeae61a5afd3c84a13ae6d40d3c026683ceadd81c60cce307643191365 SHA512 2bed2064caf9f04ab3b846561e32abdfbf197bcb1948e0a777fb5058c3c74522f3824e1ff8cb95e908494be32f2471227aa068c2408c721c60ced8f848c87fb1 WHIRLPOOL 60ab03c38ad19fc17027d964a0fc3bdf0d071cebe16c9b8e963fe21cb8897ca3731851ac9eccc1a9736cacefc39bb5fc333647b08b397341bc8aab1f05db0dd5
-EBUILD gr-osmosdr-0.1.3.ebuild 1940 SHA256 637961db8a60f94807bcbd81aa4fc1d160edbb9f1272b65f785933effb5d3262 SHA512 f654033879f378e8ec479db4de474fcd0e1aa14ccdbc8738b99e42b2c63f306733b717abfeb6807aa6f27be39b3d755bc69e52f072eeff74905d339d9fad1d93 WHIRLPOOL 570c5e0cd97715fb52508925fce87c966ad580c09686ecfb455af3955cbad06e2b5bedbe47b33a41a91f16c68e79c10ca938f2eb262ee3681322a28e3f73470f
+EBUILD gr-osmosdr-0.1.3-r1.ebuild 1985 SHA256 0a026228ab5864ffbd8f12a0c85ac27a5613e7bf095c394fc24000ddf1556474 SHA512 7811c4c12566fb4e17d599e9d3360d4cc0bfb7c6de036a134d9103274fb5d42a90c7dad41306723621e24908552bc08ba7e8bc3d9beccc462e0156d7d0fac8fd WHIRLPOOL f70816dc1608ad89f9f4fde55e28f82c993314f06ebc6b0ad3136bc9f230492ae996f48195088c39b0d55d6ac03d88e8cc88c0930fb95c358434889429020681
 EBUILD gr-osmosdr-9999.ebuild 1940 SHA256 61128fb9d98d0578727d550e60835be3a0f69d0c4874f9b620008d443cc108a1 SHA512 bc8eee3a8aa2922cb212a13b3e0846d1b6d5173aa74fceb7d74bdbf3100b255fb4a083bea688907102ce997a9a125f16897e8d8bfde0ce401910d33d7047cb67 WHIRLPOOL 33a01248cc6aa27a8f0f7c3fa3cb6d5ea3da42089e125c43a531d125d57a0aa9b49bf4ec4a59670d5333d7cda701cfbd8ae1e2f3480760df649da0d05d61ff6f
-MISC ChangeLog 4562 SHA256 752be0459b24d2e1d7079ef329cae215528dc3f7a9ed649d67acf3b141316820 SHA512 cfac191dc914b85f6b16841436b292233bd806163c10078f6b00dfe557e075efd2cb4ecef377c8e37692c0e7239a24988e2721dd69d1aa5c1c3d6d6828b9c906 WHIRLPOOL b26e350e479f35aabadb04a8554b79b5fde1f9ff26808e9839baaccd72b58e2108e74c63ca54f7d54c694a2dec0602bb0eb827263daec625a51c07c913d705b6
+MISC ChangeLog 4875 SHA256 0eaca25107f47c3b560f5729b34c953116bba8ec44d8dc15fa5a8a9e947503c8 SHA512 02bebed7a90f81d7eeedb0d1a0ca5395954541156568b0eb71a5c1d7743fcb229ddb39d49d15b6e26b963fbc52f6cc6c8f3b216f34515c83634971fa7fba2204 WHIRLPOOL 7c5a686d5354b5a3781ebaa6b33a19729934f767aa7a467d1718880b34d58bceb85cf72fb17d6b47a67ec7d841829ba861bde6b21e6827584ebf2dec7135b7f4
 MISC metadata.xml 676 SHA256 a3a4bd404e47b37e2c33f89cb4095f5a16decd1c4cd40c9884d3d1144545dea9 SHA512 75ccff0380eec65dcb6a59f5373a1ab2b3fd65df212429133289b678ffc6bedc96adb2b8f2e2053876475bc8dcf1338cbbb96f19d76c1fc03e9a4d7c81011993 WHIRLPOOL 2217cfde0f7b6929fc641ade6a638a2855684cf32e6c96e83852263cf13a0b9fffa7e02eeee87138c982f69366c7fe47e250ce6eb94c2825a2beb77d855fc0df
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCgAGBQJT/4nuAAoJEKXdFCfdEflKvI0P/3vWPNhiAdpdXVQkZonXjhcc
-pxiPXmpmLUG5MWIKl2hnt9iBQUjLCp5iE1Fs8alNh9Ih+Q6c3beQja59cIxZ4+xN
-HoyoQhQReAliNNsBysznXwZx7lSs1DP91g5IuWHMKld6F09DCsPXDOnSCJrCuzr6
-+RE/kKgxbGm6vMeLDjesmqt6hvLYL4ifbW724DKawHDmBiWChtf4c/RnpV5HU1lp
-N8fsfUHO6t49t0Ao6CmydZNMfHrw03iWiewx71el5TnnvlZJ75sQuaVuVsRJd68n
-/Vd6sX8dN76GR5SWB7rsmjAAX8eaz0FJhrG8wxVvmfiOaBKZMwcfWQOS8WIlosbg
-rEoz2VOWrxMZOgRu1w9XwO7UFwcAj9KOtbxLDkeZLlOCC8ahOWt58+nrWfGlXpkm
-kPn4mcaWRcXfvbqMReVWT9U876aZE7cGL0oVagJhu8Otga6WdmtGOALv7iMQnDZa
-Vo/iXhVZJgwpbE/R8EmBLY/ubri52Sm6j3ff9DnBVEx2vHQ9d+H3aDw6tfTw1Ai+
-+arX8vefpD+DpZ9nQhpGesct7BEmHX67tjRD9sd/YZ4EYYcoST14AsRp8P5PW6PR
-PGKjHDU23FYRMIb/szNNn9NMxqu6a0Atxxb+Ruh1/bqma93fPKUTxrh3hYfYF0Ac
-I7aGTrcFbYQJKN/852bt
-=Uv0R
+iQIcBAEBCgAGBQJUWMizAAoJEKXdFCfdEflKu+EP/1D3CBfcA4MG6VHHLoutea0X
+zolEQ11coRs0hz1IfR8OnSY/jOw+Bb4zeowcAmM0P0KQLuFp2MbI9qsDV7zpT9+V
+p4Mh58PwGPmrKbcyMB+bt8a4Yaa84gWRgelwmcL432CdSTwQHXH3ewpoxq4E1mDZ
+DSdg1El9olS77KXI1oenXAkq8pAGJ9kwuymfLQ/hQFe4wDL8ObvE50lm46Cm0aZt
+ea8QSR/iDVh0QpfBzabL7GF3vqjix3X2D6WKimxQEVr68QMUBXVFrYbiZMf63n/T
+i3O4LYxvs1vierqDcwzqPu35PAMhi1qMlvUQEpr6l/wdAJdzwAqFV7U1rEMBJMTs
+Zz2yo3XOMtawn6s1cHy2hQ9YlW3aHufpF2RZMW+UBEWrbG42pfPNHCsZRHDyt3XA
+k2gINHo4IM48uDjWbe+vhjoD+90Auc23kzPiETDH4ZRWNn1fIZ7MnuQFfMzI9LMf
+i1iK0b5JsgD3moYkTK5ikHvu7sqPcqUmi/rEZWunrCytZ7Qjpwocl0QstyAYXbEC
+rl5VR7nVoT64GKiye1rW9FWpjck2M9Hbfwirdf5cCVNPGhKDVm0Pll7Lnj+az48F
+3D89cudPWtNzpBCA9sogliy1ltNE5BLFam99fEOOPZyutKIxP0fvAj1ZPKrO07K/
+KD9xCNYwVgXXqMYyw2pt
+=qTaQ
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/gr-osmosdr/files/hackrf-safety.patch b/net-wireless/gr-osmosdr/files/hackrf-safety.patch
new file mode 100644
index 000000000000..fc04fc0c50ed
--- /dev/null
+++ b/net-wireless/gr-osmosdr/files/hackrf-safety.patch
@@ -0,0 +1,34 @@
+commit 39230788d7f4b0a8d6d3ab32039073ed53e74af6
+Author: Dimitri Stolnikov <horiz0n@gmx.net>
+Date:   Tue Oct 21 22:10:40 2014 +0200
+
+    hackrf: disable AMP gain stage by default to protect it from damage
+    
+    patch proivided by Paul Connolly
+
+diff --git a/lib/hackrf/hackrf_sink_c.cc b/lib/hackrf/hackrf_sink_c.cc
+index 120b271..3a1e7da 100644
+--- a/lib/hackrf/hackrf_sink_c.cc
++++ b/lib/hackrf/hackrf_sink_c.cc
+@@ -213,7 +213,7 @@ hackrf_sink_c::hackrf_sink_c (const std::string &args)
+   set_sample_rate( get_sample_rates().start() );
+   set_bandwidth( 0 );
+ 
+-  set_gain( 14 ); /* enable AMP gain stage by default */
++  set_gain( 0 ); /* disable AMP gain stage by default to protect full sprectrum pre-amp from physical damage */
+ 
+   set_if_gain( 16 ); /* preset to a reasonable default (non-GRC use case) */
+ 
+diff --git a/lib/hackrf/hackrf_source_c.cc b/lib/hackrf/hackrf_source_c.cc
+index f647b80..e3b3ea4 100644
+--- a/lib/hackrf/hackrf_source_c.cc
++++ b/lib/hackrf/hackrf_source_c.cc
+@@ -168,7 +168,7 @@ hackrf_source_c::hackrf_source_c (const std::string &args)
+   set_sample_rate( get_sample_rates().start() );
+   set_bandwidth( 0 );
+ 
+-  set_gain( 14 ); /* enable AMP gain stage by default */
++  set_gain( 0 ); /* disable AMP gain stage by default to protect full sprectrum pre-amp from physical damage */
+ 
+   set_if_gain( 16 ); /* preset to a reasonable default (non-GRC use case) */
+ 
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.0.2-r1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.0.2-r1.ebuild
deleted file mode 100644
index 71fdd5b075c7..000000000000
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.0.2-r1.ebuild
+++ /dev/null
@@ -1,67 +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/gr-osmosdr/gr-osmosdr-0.0.2-r1.ebuild,v 1.1 2013/09/16 16:03:12 zerochaos Exp $
-
-EAPI=5
-PYTHON_DEPEND="python? 2"
-
-inherit cmake-utils python
-
-DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
-HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-IUSE="fcd hackrf iqbalance python rtlsdr uhd"
-#IUSE="fcd hackrf iqbalance osmosdr python rtlsdr uhd"
-
-#	osmosdr? ( net-libs/libosmosdr:= )
-RDEPEND="<net-wireless/gnuradio-3.7_rc:0=[fcd?]
-	hackrf? ( net-libs/libhackrf:= )
-	iqbalance? ( =net-wireless/gr-iqbal-0.36.0:= )
-	rtlsdr? ( net-wireless/rtl-sdr:= )
-	uhd? ( net-wireless/uhd:= )"
-DEPEND="${RDEPEND}
-	dev-python/cheetah"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -q -r 2 "${S}"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DEFAULT=OFF
-		$(cmake-utils_use_enable fcd)
-		$(cmake-utils_use_enable hackrf)
-		$(cmake-utils_use_enable iqbalance)
-		$(cmake-utils_use_enable python)
-		$(cmake-utils_use_enable rtlsdr RTL)
-		$(cmake-utils_use_enable rtlsdr RTL_TCP)
-		$(cmake-utils_use_enable uhd)
-	)
-#		$(cmake-utils_use_enable osmosdr)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if use !rtlsdr && has 0.0.1 ${REPLACING_VERSIONS}; then
-		ewarn "RTL-SDR support is no longer enabled by default."
-		ewarn "Set USE=\"rtlsdr\" if you need it."
-	fi
-}
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.3.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.3-r1.ebuild
index 5faa1c02453f..215c084c6dad 100644
--- a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.3.ebuild
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.3-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/gr-osmosdr/gr-osmosdr-0.1.3.ebuild,v 1.1 2014/08/28 19:58:13 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gr-osmosdr/gr-osmosdr-0.1.3-r1.ebuild,v 1.1 2014/11/04 12:35:24 zerochaos Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -42,6 +42,7 @@ DEPEND="${RDEPEND}
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_prepare() {
+	epatch "${FILESDIR}/hackrf-safety.patch"
 	epatch_user
 }