Use more

(Portage version: 2.1.11.9/cvs/Linux x86_64)

2 files changed, 18 insertions, 15 deletions

diff --git a/net-wireless/wifi-radar/ChangeLog b/net-wireless/wifi-radar/ChangeLog
index 3164ee7b1e21..6dffc60f0686 100644
--- a/net-wireless/wifi-radar/ChangeLog
+++ b/net-wireless/wifi-radar/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-wireless/wifi-radar
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wifi-radar/ChangeLog,v 1.27 2012/10/04 20:56:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wifi-radar/ChangeLog,v 1.28 2012/10/05 17:32:21 ago Exp $
+
+  05 Oct 2012; Agostino Sarubbo <ago@gentoo.org> wifi-radar-2.0.8-r1.ebuild:
+  Use more
 
   04 Oct 2012; Agostino Sarubbo <ago@gentoo.org> wifi-radar-2.0.8-r1.ebuild:
   move sed to src_prepare
diff --git a/net-wireless/wifi-radar/wifi-radar-2.0.8-r1.ebuild b/net-wireless/wifi-radar/wifi-radar-2.0.8-r1.ebuild
index 298b21956e73..d6f868999b8b 100644
--- a/net-wireless/wifi-radar/wifi-radar-2.0.8-r1.ebuild
+++ b/net-wireless/wifi-radar/wifi-radar-2.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wifi-radar/wifi-radar-2.0.8-r1.ebuild,v 1.2 2012/10/04 20:56:52 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wifi-radar/wifi-radar-2.0.8-r1.ebuild,v 1.3 2012/10/05 17:32:21 ago Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ MY_PV="${MY_PV}.${MY_PL}"
 
 DESCRIPTION="WiFi Radar is a Python/PyGTK2 utility for managing WiFi profiles."
 HOMEPAGE="http://wifi-radar.berlios.de/"
-SRC_URI="mirror://berlios/wifi-radar/wifi-radar-${MY_PV}.tar.bz2"
+SRC_URI="mirror://berlios/${PN}/${PN}-${MY_PV}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
@@ -28,35 +28,35 @@ RDEPEND=">=dev-python/pygtk-2.16.0-r1
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_prepare() {
-	sed -i "s:/etc/wpa_supplicant.conf:/etc/wpa_supplicant/wpa_supplicant.conf:" wifi-radar || die
+	sed -i "s:/etc/wpa_supplicant.conf:/etc/wpa_supplicant/wpa_supplicant.conf:" ${PN} || die
 }
 
 src_install() {
 	python_convert_shebangs -r 2 .
-	dosbin wifi-radar
-	dobin wifi-radar.sh
-	doicon -s scalable pixmaps/wifi-radar.svg
+	dosbin ${PN}
+	dobin ${PN}.sh
+	doicon -s scalable pixmaps/${PN}.svg
 	doicon -s 32 pixmaps/wifi_radar_32x32.png
-	doicon pixmaps/wifi-radar.png
-	make_desktop_entry wifi-radar.sh "WiFi Radar" wifi-radar Network
+	doicon pixmaps/${PN}.png
+	make_desktop_entry ${PN}.sh "WiFi Radar" ${PN} Network
 
-	doman man/man1/wifi-radar.1 man/man5/wifi-radar.conf.5
+	doman man/man1/${PN}.1 man/man5/${PN}.conf.5
 
 	cd docs
 	dodoc BUGS CREDITS DEVELOPER_GUIDELINES HISTORY README README.WPA-Mini-HOWTO.txt TODO
-	keepdir /etc/wifi-radar
+	keepdir /etc/${PN}
 }
 
 pkg_postinst() {
-	einfo "Remember to edit configuration file /etc/wifi-radar.conf to suit your needs..."
+	einfo "Remember to edit configuration file /etc/${PN}.conf to suit your needs..."
 	echo
-	einfo "To use wifi-radar with a normal user (with sudo) add:"
-	einfo "%users   ALL = /usr/sbin/wifi-radar"
+	einfo "To use ${PN} with a normal user (with sudo) add:"
+	einfo "%users   ALL = /usr/sbin/${PN}"
 	einfo "in your /etc/sudoers. Also, find the line saying:"
 	einfo "Defaults      env_reset"
 	einfo "and modify it as follows:"
 	einfo "Defaults      env_keep=DISPLAY"
 	echo
-	einfo "Then launch wifi-radar.sh"
+	einfo "Then launch ${PN}.sh"
 	echo
 }