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

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

4 files changed, 90 insertions, 27 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/Manifest b/net-wireless/rtl-sdr/Manifest
index e6de0cef0932..04f70ecfb4bf 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -4,14 +4,25 @@ Hash: SHA256
 DIST rtl-sdr-0.5.0.tar.xz 401088 SHA256 d6781fd661b9cf81d05ab0313e2718719a3d6bb1e32c3ce51287e28e967997bd SHA512 5e561002b32b60d251cd0b859f19e104ad5b249e45043c759a7a4d28ba9efbeadb3cb1be42d4e9da425bbe2c4d642f03d2c0f5e4078e62f68b88057adf6482f4 WHIRLPOOL 21f81503c54290a5afd2e9049a630dce693ff81e464623fd0a1a809596b5e1109b0630c56f19d870c42b3bf178605645f3fd0a5286dc228edbfaac8464edf81e
 DIST rtl-sdr-0.5.3.tar.xz 98220 SHA256 7fa6558d318c9895df8b54106f6fc79841e3137aab8e67003b122933c23ea039 SHA512 e87c03d2f7754f59b346cc03ccd374bcb57a9bdc6c8a8fa4cafecb8cb429b161d5a63b9244298caaf654adfe4d6ed4456222f4acae3b98b7a79b5ab50da22900 WHIRLPOOL 3a22e5ccce852cb73d415dbeb1a630eb633583df5608d2f902f2cce12f3c554bd997df9a6b3cf20e0c1a1f44168e4a95244f0921b63c23e6ec3923f9ff070ef9
 EBUILD rtl-sdr-0.5.0.ebuild 1268 SHA256 2df215adf110e97084934ca1090eafd80e2521c84db4d6c9389124fac6b8bc89 SHA512 0a0c0806c13c17a2ca1b71187ddc17637dccdef8cecf69fb174a4d4343bf5cbaa79615f363aff59e3d9064834963e202673f777a8159dca33d942870c20d228b WHIRLPOOL 5f2f2817e5834e5b6faad73f4f4c8dcfa0fd12d698b3f71370f25920c0ec2c933ad128ebe7474977b285fbad526c4b15052dfb192a53a0c30a906e2b8a4d2ba5
+EBUILD rtl-sdr-0.5.3-r1.ebuild 1136 SHA256 82e76013622d459a77b6894f5b5590e3ed4e62a65837587a4fe202ecc38b47fc SHA512 2ec786b93376fde0b48f6bd95e794a236ad87e7139432a07d38d75bf00a5a228d245e83a3d77536ba044e3a43cc6f637570f384c51308e8b1ea982cf5d9f13b0 WHIRLPOOL 33dafea0af661f8efdc64cb765bd9b742d7aa3c273c4505c96a2b66e2ddaed34dd0f2fe0f176cdb4d17132cc7f210d118409e230d08cdc0fd7f505d54f70c9ee
 EBUILD rtl-sdr-0.5.3.ebuild 1355 SHA256 dcbd360cbe5067c599d8db08635a3983cf4f841789e05f867734ab06034cce06 SHA512 f2a07549c6e5ac049322dda3d62b1993636eb16f7fca0d5da96c9394a9373588c7e34289b9d18c51e090648dfcc9aefaf3841a63f7aefa0850560bdc11a0e85b WHIRLPOOL 7784a84214f7725cbe3280f17222646470275daf30d4e593121ea48d14d77502e9964b78709cf66a67ca64a37c871c04f42a507a146dfa57f92250a186c12d73
-EBUILD rtl-sdr-9999.ebuild 1354 SHA256 ada33b0be71e84b8a4aac3baa2924da73eb09a248139a120f7603c9a6ee133d7 SHA512 84970c0a90853801d6e63d413eba07e121b0ccc5491899e0e917fd40ae7d70512f9ae139a11d2f9eb26b97bf63fc131dc06c67847203be86b0eada225ce48549 WHIRLPOOL 1e8b50023375794cedcc21669bb0708b5ea576f2832c10964ca838d4b9dce8c7e5eba395e6b5e665fd7cb056289413b5cc06d2e9a09a40e3a333dab350b34456
-MISC ChangeLog 1817 SHA256 ba2f1974236d1c8170fa3116922257df7254c447980a238f8b6b40d54faaeedd SHA512 8b7c09dfb78c9203526ddff94c187bdb5b72c0649e908a94dac95f838cca648569370febb4cb89274ec22b05e110b8f1b5ae59b922ebf8ecf038c368599f2057 WHIRLPOOL fd2f722ffcf4e8f7d56b3045d7c9ff265a7d8034fbaaed67c9ce9beca6ac950f78cd8b640c596659716f8ae06169f6708f489a36d0c61135d7de5a5464a63a54
+EBUILD rtl-sdr-9999.ebuild 1132 SHA256 10c19a492e5341907c47cc02fd46cb4c410be664b3bfc79e43c2fbe77543fdf3 SHA512 d661d520734bf6ac5bb8677d193b276bb9018e7a7a3158d16aa6fcee51b4f06198dbf4cf5c13a098f6f15718b0f389e24abc350ebfd226f99f95008e49014c02 WHIRLPOOL 0ba9dbb2467975169c2a23f1b6064f86610ba1ba3214f5069ae416692ce7e4855fb47b830a5867e08b51794053d01b70e269cb8f94a3f54a809965b54c9fde48
+MISC ChangeLog 2179 SHA256 273095102d6bfb09d01ff5b3bc0677396851d7051e16541eedac7134c51acb2f SHA512 4633a39ffd3ac930d67c6aa9ea97587593af14f6f6af5a04fb3f1697e77cc8b491a10c37af2ff7eef3465077575f78e3a166b783bb7a45a29e4e894c824021d0 WHIRLPOOL 45a7d5b33a43fda4fdcd6821e819844e0f79ada9893469404d492bac7a3b17f5e8b34f98647a7f8e61322f0608d03962029f1f1d9962c7852a3d59dc0427f905
 MISC metadata.xml 160 SHA256 85c481a245f23f79fbef161bee8d9b8437f1b1e672a8fdb2dbd20f10c7c69f7b SHA512 6c07e111ed731e33aa9072a2b9297020ded8a259da43d2910a576363055c772d3f8a735e435c6f3136b7e57d489b2ca164e24b490393add3a7c5b3a11e7da507 WHIRLPOOL c3d4674d072eb96840d34218341e427cec657d31392d484fedfa61b6da802ab1e1b7ffb4d8dbc1eb75980e203ce8415609fb733789674250ae7ed91eda2b674f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSZsa4ACgkQQe4uqXYgU9UhkwCgzFsYmm2PkDOB4uHn+/Gt0RCl
-6r4AniCuHi4YOFzFRW63p2pH6zp4s9yF
-=Uw+e
+iQIcBAEBCAAGBQJVDdGAAAoJEKXdFCfdEflKIjkQAICjh/9VHL2HECogiIEU7Trn
+d1gAXi2PFIohjPlpA5ZTetPSn1RP4+O4rzu5m8mohTucbWqKWFrtNh1pUqUqkIkE
+bjR9Xi0i4epvhDRB0LMxC7a3PFQFWveCekY8uC9D2EZCSVbqAlpfnM2McbfaHQTI
+x1zAaI3ttroYmvdHqZcsPLRY30kPQwgBUAeRXxJobVC8sn9HzAl/AQoy04QPbBfb
++7JAYbCYnrGQK5QbjHkpUyJ1eqH17Jmtil9ycirNPxfrbj3Y01kZcknmgm2aMVv0
+lvHIeeoI1EVSnvoGv3/3ESrEXFff8WIITRD1nFJs3OIB9vl3skETTF76cZWy94BI
+b58835WWkeM1znvG6kbUKyvIwO59g5LBLJwNaxSqQEQLZ5csYi559x9MZ1eAaWBF
+drUCAqawc472mQT1fk+FqnRtvFthcHdsEYPsA9N+OOWHn36ME6UNt+OrlXlWzHUw
+h3BSpYkPYwSKizijI0ZEwiLx/pY9lHunzReBoEvAoq1Avl0UINHMiBDfMXLFa5Oc
+7sWnB+LfBJDeLiK+imkQIu3HfARoDTo9vDhgZiyjW7lZC9ijjkWAVltCLOAGwvzD
+1dCubsgg4yMv2aMjxO/kILriyssoLCO8krF8iJuJ0cmn+I6IcGImjVzOYYaQH8tu
+JRfvpida3kR9gOIteKrT
+=Tq16
 -----END PGP SIGNATURE-----
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."
 }