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

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

6 files changed, 36 insertions, 126 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/Manifest b/net-wireless/rtl-sdr/Manifest
index 87a29ba531ed..e5f26f8527fd 100644
--- a/net-wireless/rtl-sdr/Manifest
+++ b/net-wireless/rtl-sdr/Manifest
@@ -2,27 +2,24 @@
 Hash: SHA512
 
 DIST rtl-sdr-0.5.0.tar.xz 401088 SHA256 d6781fd661b9cf81d05ab0313e2718719a3d6bb1e32c3ce51287e28e967997bd SHA512 5e561002b32b60d251cd0b859f19e104ad5b249e45043c759a7a4d28ba9efbeadb3cb1be42d4e9da425bbe2c4d642f03d2c0f5e4078e62f68b88057adf6482f4 WHIRLPOOL 21f81503c54290a5afd2e9049a630dce693ff81e464623fd0a1a809596b5e1109b0630c56f19d870c42b3bf178605645f3fd0a5286dc228edbfaac8464edf81e
-DIST rtl-sdr-0_pre20130414.tar.xz 93400 SHA256 fb76dc42e0c98667b54f864fec60ffe14e62224e9f30a8a83978a14caaeb738e SHA512 9a1ba2119ecfbc354aa018b912df1eb349e3c372914698d8aac0a56220db3dd68f18131fa51f48aedd429099d7871a69c1b54e0f4ab1c816f3c10e83cd9d5b4d WHIRLPOOL dcc253a05528767c82273a1d39f1a65af394b4c0dd44427f1811f3d95cc983e2b0a61d98be0ffecf31eb061a6e5a7f3192eb97261d9aa384f76f190eb2b4c418
-EBUILD rtl-sdr-0.5.0-r1.ebuild 965 SHA256 b87bd659dcdcf12dd056dfc88e72099c748af3ff60c8dd3a7110dc819076da5b SHA512 439801264f8580a0b0717c40bad2aadc12a2d25ba3356c41d535962a264bffb3de1a255761148b77494278db67278583d51ba401d2731d196c2ef6504c6fe7ff WHIRLPOOL 6521f70dfe76d3c3e07946baed36465fdd509f4254550ba758f6fc77d6c2a75490c38cbe68568c3fa5565238e16e19aabbd44ee880525f81f9bc5a14183b8fa7
-EBUILD rtl-sdr-0.5.0.ebuild 1147 SHA256 c2277f3b29cb11e9164f19bb6b26854a9c895910adb3310a06367f60d11f0dd2 SHA512 8b3c7989ed9cd7dbb02ee8e85eb710de31818c141a2c586a1e15dbe7398032df9b07e7761b10dbb162fa6dff18ea0efdafec7ec2214bce70e15817af5d855723 WHIRLPOOL ac5252a21e5eb33ed69e6afb26be2dd6ea39d4870a5b380dbe94ca2ef871e4f97b487ca666c354ec2815350caef658d990f3334cdf05c8e1a398aa40ab3bc135
-EBUILD rtl-sdr-0_pre20130414.ebuild 1128 SHA256 cac32a5a7105195523e9f94a1816ec76d834728e0ba540f26c647dc3cc227bcd SHA512 2e3004c3c388063ea8f1be0066f758c9023f29dd75ab35feca42df73b565a211331af6987a67444cf4eba99e7f1ee494dd565f871f40fe4bf2164a0471ab50fa WHIRLPOOL 132324f8abe1c166db2f0ea5265fe607594d1065ef076bf633ed7baafd85336c381f721de1d53697321c8af28648819ef5ac2e6d89fa09cc1e53268a2e0d6288
-EBUILD rtl-sdr-9999.ebuild 933 SHA256 87310909a917685f278c804768e81343ced0ca6595c6eae65ae18a6d68b380b8 SHA512 41412a870ccbc65bc6d50668601cbf03d6bb9c36a6a637b506856a906f671f94760e810312a05744881c575681885b03e9990b386f37a1e1a2ec00111bf5b8f6 WHIRLPOOL cfecf3b0eabd75e95f93f6fd786d26d6ab7199cd79950a0185d6b94e3f3b9aaff6e1c01d556ed3d051efbd81cc0ae4711993c8fe718733fe4f00d033615c12bf
-MISC ChangeLog 1327 SHA256 237deea3c6d7b0f5800173e9b44e5db6b28f860facdbad669ce6dc0b2abeeb32 SHA512 79adb034a3a938b81e50ba925b7f45e088bd44282b455da1020bfaebcda7b21c966104c5cef576a6e4e8822f2ac116741bf055fa06b85e8abd0e396f6978ec4f WHIRLPOOL c67fec1d9a2c0a7eb18312be953c8f878f3753b130f36c26f2befb7dc7db087b9dbf3be36e4a739123a34ff1abbcf9ffb181f21788882d850014ebfea7464f8f
+EBUILD rtl-sdr-0.5.0.ebuild 1268 SHA256 2df215adf110e97084934ca1090eafd80e2521c84db4d6c9389124fac6b8bc89 SHA512 0a0c0806c13c17a2ca1b71187ddc17637dccdef8cecf69fb174a4d4343bf5cbaa79615f363aff59e3d9064834963e202673f777a8159dca33d942870c20d228b WHIRLPOOL 5f2f2817e5834e5b6faad73f4f4c8dcfa0fd12d698b3f71370f25920c0ec2c933ad128ebe7474977b285fbad526c4b15052dfb192a53a0c30a906e2b8a4d2ba5
+EBUILD rtl-sdr-9999.ebuild 1240 SHA256 f143e0f8a4c857a05ac7d32ed9257804934f77658184d9b8f3e92173dc3f58cc SHA512 d4c38f7a678c797143a4b4e31551125f0d7da16493b12a5a31b19379dc248adb21d1055d9f0726e18a94b705c996ccc61c71c213d156f05b7a0f7c1c79d9b39a WHIRLPOOL 9f6b0b7bd989ba634ea04f1c9eb5f72c5bbf158421083230944c7ab812e835c5751198a2167418d1d469c24c5f34c37e40e81436d9d764513182d445c2697709
+MISC ChangeLog 1553 SHA256 8af810427afe99f89c0ff93ac95b5b278af3ba45a2689ea39d596e45c6d2e9d0 SHA512 00c89e8be211ccb2b89f852c6a35159d40eb0f0ea695c9494e9b4c1a751d1300afc7b6d554f81192a28cf3dbfd49d41f0cd0aebaab42fcd9ffede5e48a35bfec WHIRLPOOL ed89370ab4342f8fa57f8ea9c011b6744d187446e6c68c7b72f5e0542612dbc20b640562f6cc4d75e403a97f380c683f64aee9a927b6c140f4f3ba15eb3c544d
 MISC metadata.xml 160 SHA256 85c481a245f23f79fbef161bee8d9b8437f1b1e672a8fdb2dbd20f10c7c69f7b SHA512 6c07e111ed731e33aa9072a2b9297020ded8a259da43d2910a576363055c772d3f8a735e435c6f3136b7e57d489b2ca164e24b490393add3a7c5b3a11e7da507 WHIRLPOOL c3d4674d072eb96840d34218341e427cec657d31392d484fedfa61b6da802ab1e1b7ffb4d8dbc1eb75980e203ce8415609fb733789674250ae7ed91eda2b674f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRy79EAAoJEKXdFCfdEflKzSoP/iE+YDPltklpxv3Qv1dn09H0
-T2/8Z5vmxI/nEptAIdf/UDqVpzsATzKepPzAZGzI20jadxK7jT74lI91o097KNLS
-uBEmugYNBB5Vhp6vglHNqM5C7VzumL1ENiAjMr/YZ0+I8RUdKqOvUJeQTrqHn300
-hgkoVLrymx4qOw62QwyAHNgmhFbCJcZNK1P2X/HH5adK5OGhiR1jCb+6egSfy64A
-8a0qGZX843xBLDoMUIMGsHIiWQO0NPfaM4jBSOTpUNM7MO3Kzvx/0wZDZy+E4SeE
-PQGGHjhE6oSFVfq8i3l854b0ot7WRlWx60y3HjUs8tQ4fa4Ja15xla3hHItQO1Vp
-gHrmU5zz96hhoZFms8LN6B0V4yGWhzyPXMYusVrh9OGQHyW6E1q+vcIF5j0ICH0W
-71Cxr27SdT5mLfm8TE8C4KZvuqcBKFtaOCwWQs6BmQg/KiCYtuQ/ZFZRgWeTDse7
-DJzGTVcXMAp90kmBAOhWvU5UXNHmPoBP3tVWZ/N9LXHjU2SLDr4R6PeBW7RSnC3q
-gtp9NeASeSTxRh3oj3hpG1F7U1QAuy+0aULPX3C9WUlaBvAe649CN/qtFJEhdT0v
-mRWnkAYo+xOZUQKsSmtqKEFP8qsgxxecjmykKTXM5dNtuvL7R80fq/lbxUeHoIEQ
-0UcwQJGqCOFWq8ut3RLw
-=GPe8
+iQIcBAEBCgAGBQJRzgr4AAoJEKXdFCfdEflKrTQP/11okjxpfsY1rGZfWvM36G/8
+qCa65xxw7rYVhzKjazUDS+p4t9BkRbTJg7pZuDMnyJTelHiYxYN2A+pqVaeuKSXe
+idvBfQdpg86lENhgt3IPI44TkTGAqNazlVlJESO2B3GncwinK0K6JlaCmFuvmMkj
+KWwUywyih28q+AdNICE0eg1C0+TT1DsyqNwaY/GxBAWHD5cBX7uGgupcmSs+Tm4d
+P0uDJMMj8yOp7i2DOAOtqHpW106STRpGSU1qJQdojJ5T3lXMvUZy1FovAlV7tQV9
+0Z73/hVOdmIHoBhMFyiBZ0e04myMUkeH4zTj/r/VISyMTHqebvyFJHTkSeE8DzpD
+z0nCsIymG4UNh5g0XEt0IYpV/Qn9zFrVB8mmB/+Bb1u9t1mkoTjiW3hB3C6FEFE1
+qWRIpSoj6IhjJoR++N83PuvNF6WMwAz9HKbbuI14tTIRYXu9D/tOX/1/HPSw9Tn6
+UwEqzxXaHCMve2IfjqXqBkcQkN4fMbyNu5fBamdmzuPtuOSndU2ofMnwip77Bep9
+ewiN0cpPj8LDhsv3I+R0pAYjIW9p2ccXYtGyseH+gPthv/PuLRDO0DIv0dhq9CJ+
+qxY9f882UqGsG/BJDceIimSKzNobV76n3urf3uXb1yAVEcvfqLxCudw3cZPNEZrE
+qOtD0OJE5hbADkEWmFb5
+=op84
 -----END PGP SIGNATURE-----
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
 }