remove old ebuild, remove udev rule in favor of improved elog messages

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

5 files changed, 20 insertions, 107 deletions

diff --git a/net-wireless/rtl-sdr/ChangeLog b/net-wireless/rtl-sdr/ChangeLog
index fd5f1e16174b..5c86525a9adc 100644
--- a/net-wireless/rtl-sdr/ChangeLog
+++ b/net-wireless/rtl-sdr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/rtl-sdr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl-sdr/ChangeLog,v 1.7 2013/06/27 04:25:33 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl-sdr/ChangeLog,v 1.8 2013/06/28 22:13:36 zerochaos Exp $
+
+  28 Jun 2013; Rick Farina <zerochaos@gentoo.org> -rtl-sdr-0.5.0-r1.ebuild,
+  -rtl-sdr-0_pre20130414.ebuild, rtl-sdr-0.5.0.ebuild, rtl-sdr-9999.ebuild:
+  remove old ebuild, remove udev rule in favor of improved elog messages
 
 *rtl-sdr-0.5.0-r1 (27 Jun 2013)
 
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.0-r1.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.0-r1.ebuild
deleted file mode 100644
index d19a712873a7..000000000000
--- a/net-wireless/rtl-sdr/rtl-sdr-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,48 +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/rtl-sdr/rtl-sdr-0.5.0-r1.ebuild,v 1.1 2013/06/27 04:25:33 zerochaos Exp $
-
-EAPI=5
-
-inherit autotools udev
-
-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-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-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}"
-
-DOCS=( ${PN}.rules )
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-2_src_unpack
-	else
-		default
-		mv ${PN} ${P} || die
-	fi
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_install() {
-	udev_dorules rtl-sdr.rules
-	default
-	rm "${ED}"/usr/share/doc/${PF}/rtl-sdr.rules
-}
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0.5.0.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0.5.0.ebuild
index d5fd8be32ea6..910e55580f0c 100644
--- a/net-wireless/rtl-sdr/rtl-sdr-0.5.0.ebuild
+++ b/net-wireless/rtl-sdr/rtl-sdr-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.0.ebuild,v 1.2 2013/06/05 15:38:09 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl-sdr/rtl-sdr-0.5.0.ebuild,v 1.3 2013/06/28 22:13:36 zerochaos Exp $
 
 EAPI=5
 inherit autotools
@@ -43,7 +43,9 @@ src_prepare() {
 pkg_postinst() {
 	local rulesfiles=( "${EPREFIX}"/etc/udev/rules.d/*${PN}.rules )
 	if [[ ! -f ${rulesfiles} ]]; then
-		elog "In order to allow users outside the usb group to capture samples, install"
-		elog "${PN}.rules from the documentation directory to ${EPREFIX}/etc/udev/rules.d/"
+		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
 }
diff --git a/net-wireless/rtl-sdr/rtl-sdr-0_pre20130414.ebuild b/net-wireless/rtl-sdr/rtl-sdr-0_pre20130414.ebuild
deleted file mode 100644
index 1035fe48c63f..000000000000
--- a/net-wireless/rtl-sdr/rtl-sdr-0_pre20130414.ebuild
+++ /dev/null
@@ -1,49 +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/rtl-sdr/rtl-sdr-0_pre20130414.ebuild,v 1.1 2013/06/01 12:56:33 chithanh Exp $
-
-EAPI=5
-inherit autotools
-
-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-2
-	SRC_URI=""
-	EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="virtual/libusb:1"
-DEPEND="${RDEPEND}"
-
-DOCS=( ${PN}.rules )
-
-src_unpack() {
-	if [[ ${PV} == 9999* ]]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-		mv ${PN}-*/ ${P} || die
-	fi
-}
-
-src_prepare() {
-	eautoreconf
-}
-
-pkg_postinst() {
-	local rulesfiles=( "${EPREFIX}"/etc/udev/rules.d/*${PN}.rules )
-	if [[ ! -f ${rulesfiles} ]]; then
-		elog "In order to allow users outside the usb group to capture samples, install"
-		elog "${PN}.rules from the documentation directory to ${EPREFIX}/etc/udev/rules.d/"
-	fi
-}
diff --git a/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild b/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild
index db1ec5b5da33..ae0168cd0dca 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-2013 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.5 2013/06/27 04:25:33 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rtl-sdr/rtl-sdr-9999.ebuild,v 1.6 2013/06/28 22:13:36 zerochaos Exp $
 
 EAPI=5
 
-inherit autotools udev
+inherit autotools
 
 DESCRIPTION="turns your Realtek RTL2832 based DVB dongle into a SDR receiver"
 HOMEPAGE="http://sdr.osmocom.org/trac/wiki/rtl-sdr"
@@ -41,8 +41,12 @@ src_prepare() {
 	eautoreconf
 }
 
-src_install() {
-	udev_dorules rtl-sdr.rules
-	default
-	rm "${ED}"/usr/share/doc/${PF}/rtl-sdr.rules
+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
 }