bump and build udev rules properly

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

4 files changed, 88 insertions, 32 deletions

diff --git a/net-libs/libhackrf/ChangeLog b/net-libs/libhackrf/ChangeLog
index dcb2ea0a5b10..5838fa06292e 100644
--- a/net-libs/libhackrf/ChangeLog
+++ b/net-libs/libhackrf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libhackrf
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libhackrf/ChangeLog,v 1.9 2014/08/28 20:15:57 zerochaos Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libhackrf/ChangeLog,v 1.10 2015/07/24 16:42:21 zerochaos Exp $
+
+*libhackrf-2015.07.2 (24 Jul 2015)
+
+  24 Jul 2015; Rick Farina <zerochaos@gentoo.org> +libhackrf-2015.07.2.ebuild,
+  libhackrf-9999.ebuild:
+  bump and build udev rules properly
 
 *libhackrf-2014.08.1 (28 Aug 2014)
 
diff --git a/net-libs/libhackrf/Manifest b/net-libs/libhackrf/Manifest
index b85bd75d91e0..c7e79e4090c9 100644
--- a/net-libs/libhackrf/Manifest
+++ b/net-libs/libhackrf/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST hackrf-2014.04.1.tar.xz 14375500 SHA256 83ef987d31d314d6d99a227a18c31c34a44e996a28841234e59e53c5d8ab5a72 SHA512 1929c7af1de0c9ad1afcf56d53c5db13ef362f3ef896f3549841eeea87aec5e1133c63da740688739278b13e772b70d510a4a1035440b5b6aad2e9438a694892 WHIRLPOOL 0fa45438b4aa84e3e16b975949cead0010f6271ec89b8e2f69fcfdbd5c5a722d803a6f7d017b272b3c71773768b32bbeae00a6a43879a9268c7d84315282a93a
 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 libhackrf-2014.04.1.ebuild 794 SHA256 7b0ffa4d14e49cc6067227017b6261ec3d279d459a7e9fc5b5052801646e50f1 SHA512 8357b58ec9f12369b25122efd41a4454b27cbee2aa9319a4a3cebc55382bf49708cd92f29b9a13544ca3276865c2c2f71543d96418f13750a34c38fe413c3510 WHIRLPOOL 31b790cf36f47d684c0cbf47d20ce548680c5ef161530a02b24d49206040ec5908f278a83563cb35d13bace1501867912177dcd8043e7b8248512de64ff535d7
 EBUILD libhackrf-2014.08.1.ebuild 1001 SHA256 8111f65cbeeec53f762470e6c54da313d0a41990ded565d730519baade42c8a5 SHA512 5953817f37c6823818aaf08eab6d54d270f75642e3bbba3aefaa647a92993e9eefd6b27738428eb72c8b8520427ba04d9bc07f106cad199ac02ab7b0d9147b9a WHIRLPOOL 4f8ae7350e8d6237ef9d471fd090fca934f30f8b1f5f084c46dbdb325bb461fb49d06565ecfc2bf05b10471352c1b6f5ab37ac3e36a6bb8737005b3abe344391
-EBUILD libhackrf-9999.ebuild 996 SHA256 1bfc74c3978edbaf518256a856a1ddddba287430b821674b9b5aea18b1243647 SHA512 dc3f8b228da4e41c271b50b308b051131d1981e29dcc321a6e8ad9a61fe8b956e159264ae70dd30ded0ed5164f204f0b5f4c8bad9c5979fffe286222fa7304d7 WHIRLPOOL 6282e634e37ba0574b84e4b1fa9c107f48df8418ae47936d1b7fe907b44bcd64c68ad58851347849e928c0d1d927c22a665b3df0f75c01d0ab3fd85cad5ea5d6
-MISC ChangeLog 1490 SHA256 e36aa812893c5ca97b95bfa0ba16f4b5aca39d548ccd20c60031deb2a21189c3 SHA512 0ee3b9a0933f43a1a2b6588197ad03ba2ab36d4bdefb7b974d8f2f495e02b1e26327b9f76417891885e71e2fbb36a5165d072dd0be4ed560fadc1147a6d1ae98 WHIRLPOOL 52c5803ad1bbb638a477ed5f31ba8f575369fe5bd2c9c87aa671c89f1ab7a9e6aee5c211a06c67fa05073cf53ac77930932e6803d460b16a7863f8e4f75155d5
+EBUILD libhackrf-2015.07.2.ebuild 1137 SHA256 b3e25c5156b776beecbbc605532da1a4478ad27d670daa55370ae7f0959dc385 SHA512 0125561ea9de08491455541f02eef8ba5c4ff3ff360db9cad8e0736b00a407fc161b07316cf4bd9e01a6c07c586aeaab25ed356b6de87cc641e8bb7a9f71be5f WHIRLPOOL e4cd35ab3ec92f0cff26b09f454657ec87dedf6807d86a129f806f524c0cb11a086e5828ef763d79413263d448eada58036a62b248225968de37e1b067cf7dea
+EBUILD libhackrf-9999.ebuild 1132 SHA256 1beb48ec8168643b84df548f81446945d078ebb931937bff64837b3dd8f872f9 SHA512 000c2a21b797840832b53f8b8e8cc1a2782ee9a176601bc5a7779a5b43d209d0e99ba0cff5e4b1518be373a2b56009c726a23c7ef21d6f4af9fd56763c109cb9 WHIRLPOOL 9158172796adc657fc093d1a40b42640ee3276b07e86cb3520293a3532f7e81c952bf6de3829a510551219a49f0af5bf4897c03f6771c5ab35adfbe4eac20507
+MISC ChangeLog 1669 SHA256 e1b07cacc714b6b253910379bc6a6e682e92aad9db64f8595f59f2c49984753d SHA512 b124a550959a445a39588c144ea45b663af06a4b21c7cc0bf058d75726019042c30afc9e5bf9e3b3374b3ecb9fc58a0b70fa0f883bc74cca318b9b562e252583 WHIRLPOOL fbbe455335f0689f9efc549cc79395e58a8745b38e474aff3809931f96c0d40b8c87c07dea0e4158d4a87825bc54fdaa2d2bf18ade9e7e7e9a6c1e48133a051b
 MISC metadata.xml 377 SHA256 c23659c059486fb6f76668b87160d2c1d4be83a44eb0a249c286eeae03758122 SHA512 cf06fcb9c091f4af2322114dc6444d53f0d9d9d6186e09e4202539c14799371fcde6885e1e93d481514fcfad48aed12de330a6348708dd9cf403e9c4a35f982b WHIRLPOOL cebe4d272671db8ef2186cac07911cb1bfe3c99446778c30755ccd1cfb5f32613fd5ea9f4a3c90d180b296b40746a39d8768c8f061b9e0038dfcfe919011be47
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfw2YXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiR9oP/AiLANcKNdTr+EJIqIf9Z9PO
-S2pvFAF2eHr4Q6DgkwJB/PkbOcBibWxif/8KYOe2i/t+GmyumYbW8Lz8HXOgmXho
-rtZYlTejFp1nr7wAAJQrzHdSGex9VT6l6SxNdP/QVR+AavVwPBXLakx4DuoXzMWo
-JcHHQn7EBUGcWYIuWGp3AQK99AvRrZkfpnMVZYGBAXKgYX+jSsPlXBPuxuUvUCOp
-DAwXeKs01/dgFWxJijmrMiOW2s++gtU7LvX4/O0w9GYMtn7EGu23sDXLustaOqhr
-0SaF8tk7RlqdC3bDLr98xobz+JG1GoDrGSEwdwTkMpAE5o1LEC2yOR3emj0KKCDy
-1Ur1y48lPugGyAQjxSRG1iJT3se98KbVh+TTy8599cdM4XEvYLdjcSbf0bT4c240
-UTadME/9SympdmoXD1BKmS74w2PCf31IYooIbYP/sTvmbL8T6ZQ/BTQ4g3XxXJ7K
-RT+AuKv84McGOM4l6XkLHPUvsrOOcRnSCgzRUtxgVmN8jTAs5NQ6WXvaId0yFD0U
-cRWLIctHHkkpNveH+qiinKA8ZYDycfAcdlD4CbVXAuwZI0fvzbKObjxNTqwf1BEG
-KcxcMHsQ9Te2ZVJY4X5CmwkCpBwE7UFsJyHoikEQabT5gJvrm35aj6/34jgApR/m
-vY4MzLGT5hYjpJAFOn1x
-=qect
+iQIcBAEBCAAGBQJVsmr/AAoJEKXdFCfdEflKJ/YP/01MpSTAVBFAO/J9Y21Jp+lO
+cREnndlr7o2Ru8TuZ007gN75aVww+uUmedn361+CfpIr2Ad11LBhuROwg/mflOge
+IWktVM77XlKhcv7yWC1csSnc/TX+1nWBzneg1LGZdOp138Nb8ZcLx1bMtd54g/tU
+XHAPYYZ6pJkJdlHJTRtwZNLkLcktSOMDMv82N9eDQs7S7o1IFukPbOISIE4iiD+b
+DPmobhtSHPQHgRfxkJHsGgIROi3wlA7XbiSW32hSpvQn6rZZEUBy/pbsgK1ujaWQ
+JRJHl+oL0jo0os/2nLA0/1Htf39GDlNeMMTwvyvEWkJTdhBQhXhWDDNgviiTnVK6
+72Gcp+Crioe6JLv4GfW5LzZVHiqCz3e3kbYvUlTvLs3A1AY/aATnktOGiJWBP0rA
+8rGt1Sg40Q4QPa+l2zQFekK2NGg8IOhksuSd2j7YtrRj2VJnF0gp9cs4Yo2+BMgX
+prcX8HeyJugscXhVejxS27vCR1pQVLQ2QVzXCZRjbBDrds/lyfb/DHxDGBvTKrQZ
+xR23q66w4hkz+o4Zh82GV0NI21zN/59/Aldlw9JGKj2KlpHTSaE4JhSmwgBLbBLU
+IEyRFUXAxzW1sG5xYSgfeVopAKfQil1ehgbX766uNM1IuoUM57SSYSm7XyRV5S7g
+9l/WhzqPMturOyg8Ochu
+=AjRQ
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libhackrf/libhackrf-2015.07.2.ebuild b/net-libs/libhackrf/libhackrf-2015.07.2.ebuild
new file mode 100644
index 000000000000..a0272f3894b2
--- /dev/null
+++ b/net-libs/libhackrf/libhackrf-2015.07.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libhackrf/libhackrf-2015.07.2.ebuild,v 1.1 2015/07/24 16:42:21 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/libhackrf"
+else
+	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
+	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/${PV}"
+IUSE="+udev"
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_configure(){
+	mycmakeargs=(
+		$(cmake-utils_use_enable udev INSTALL_UDEV_RULES)
+	)
+	if use udev; then
+		mycmakeargs+=(
+			-DUDEV_RULES_GROUP=usb
+			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
+		)
+	fi
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	einfo "Users in the usb group can use hackrf."
+}
diff --git a/net-libs/libhackrf/libhackrf-9999.ebuild b/net-libs/libhackrf/libhackrf-9999.ebuild
index 1efc82681457..6cd39d5b558a 100644
--- a/net-libs/libhackrf/libhackrf-9999.ebuild
+++ b/net-libs/libhackrf/libhackrf-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libhackrf/libhackrf-9999.ebuild,v 1.5 2014/08/28 17:07:36 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libhackrf/libhackrf-9999.ebuild,v 1.6 2015/07/24 16:42:21 zerochaos Exp $
 
 EAPI=5
 
@@ -17,24 +17,28 @@ if [[ ${PV} == "9999" ]] ; then
 	S="${WORKDIR}/hackrf/host/libhackrf"
 else
 	S="${WORKDIR}/hackrf-${PV}/host/libhackrf"
-	SRC_URI="mirror://sourceforge/hackrf/hackrf-${PV}.tar.xz"
+	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/${PV}"
-IUSE=""
+IUSE="+udev"
 
 DEPEND="virtual/libusb:1"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	sed -i 's#plugdev#usb#' 53-hackrf.rules
-}
-
-src_install() {
-	cmake-utils_src_install
-	udev_dorules 53-hackrf.rules
+src_configure(){
+	mycmakeargs=(
+		$(cmake-utils_use_enable udev INSTALL_UDEV_RULES)
+	)
+	if use udev; then
+		mycmakeargs+=(
+			-DUDEV_RULES_GROUP=usb
+			-DUDEV_RULES_PATH="$(get_udevdir)/rules.d"
+		)
+	fi
+	cmake-utils_src_configure
 }
 
 pkg_postinst() {