add detach kernel driver option to co-exist with the kernel rtl driver, switch to cmake build system per upstream default, don't install udev rules, if the user wants 666 rules let's not make it easy to cripple security

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

3 files changed, 74 insertions, 22 deletions

diff --git a/net-wireless/rtl-sdr/ChangeLog b/net-wireless/rtl-sdr/ChangeLog
index 869ee34f5b48..04c70b2ee54f 100644
--- a/net-wireless/rtl-sdr/ChangeLog
+++ b/net-wireless/rtl-sdr/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-wireless/rtl-sdr
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl-sdr/ChangeLog,v 1.10 2014/12/23 18:17:11 tomjbe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl-sdr/ChangeLog,v 1.11 2015/03/21 20:15:48 zerochaos Exp $
+
+*rtl-sdr-0.5.3-r1 (21 Mar 2015)
+
+  21 Mar 2015; Rick Farina <zerochaos@gentoo.org> +rtl-sdr-0.5.3-r1.ebuild,
+  rtl-sdr-9999.ebuild:
+  add detach kernel driver option to co-exist with the kernel rtl driver, switch
+  to cmake build system per upstream default, don't install udev rules, if the
+  user wants 666 rules let's not make it easy to cripple security
 
   23 Dec 2014; Thomas Beierlein <tomjbe@gentoo.org> rtl-sdr-0.5.3.ebuild,
   rtl-sdr-9999.ebuild:
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.3-r1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..357c1302bc05
--- /dev/null
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.5.3-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl-sdr/rtl-sdr-0.5.3-r1.ebuild,v 1.1 2015/03/21 20:15:48 zerochaos Exp $
+
+EAPI=5
+
+inherit cmake-utils multilib
+
+DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
+HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	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-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_configure() {
+	#the udev rules are 666, we don't want that
+	mycmakeargs=(
+		-DINSTALL_UDEV_RULES=OFF
+		-DDETACH_KERNEL_DRIVER=ON
+		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "Only users in the usb group can capture."
+	elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
+}
diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
index 0bd49462b40e..4a9aea5b54ac 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
@@ -1,10 +1,10 @@
-# 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-wireless/rtl-sdr/rtl-sdr-9999.ebuild,v 1.8 2014/12/23 18:17:11 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild,v 1.9 2015/03/21 20:15:48 zerochaos Exp $
 
 EAPI=5
 
-inherit autotools
+inherit cmake-utils multilib
 
 DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
 HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
@@ -23,10 +23,8 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}"
-
-DOCS=( ${PN}.rules )
+DEPEND="virtual/libusb:1"
+RDEPEND="${DEPEND}"
 
 src_unpack() {
 	if [[ ${PV} == 9999* ]]; then
@@ -36,21 +34,17 @@ src_unpack() {
 	fi
 }
 
-src_prepare() {
-	sed -i "s:pkgdocdir:docdir:g" Makefile.am || die
-	eautoreconf
-}
-
 src_configure() {
-	econf --docdir="/usr/share/doc/${PF}"
+	#the udev rules are 666, we don't want that
+	mycmakeargs=(
+		-DINSTALL_UDEV_RULES=OFF
+		-DDETACH_KERNEL_DRIVER=ON
+		-DLIB_INSTALL_DIR=/usr/$(get_libdir)
+	)
+	cmake-utils_src_configure
 }
 
 pkg_postinst() {
-	local rulesfiles=( "${EPREFIX}"/etc/udev/rules.d/*${PN}.rules )
-	if [[ ! -f ${rulesfiles} ]]; then
-		elog "By default, only users in the usb group can capture."
-		elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
-		elog "Or the device can be WORLD readable and writable by installing ${PN}.rules"
-		elog "from the documentation directory to ${EPREFIX}/etc/udev/rules.d/"
-	fi
+	elog "Only users in the usb group can capture."
+	elog "Just run 'gpasswd -a <USER> usb', then have <USER> re-login."
 }