Fixes for .desktop file. Small cleanup.

svn path=/; revision=93

3 files changed, 28 insertions, 23 deletions

diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 2fee331..802fb9c 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -16,14 +16,14 @@ RMD160 2b61f03f5148975f6438351c11de18a500deabc5 files/wireshark-except-double-fr
 SHA256 dc02a5f3e4bdbd128a2ba08f38880358f747661a93ca0b3fe1918c67b255c369 files/wireshark-except-double-free.diff 664
 DIST wireshark-0.99.7.tar.bz2 13179467 RMD160 558611675aa23313acbdb46650cf471959204bd0 SHA1 3cb6e11410d5151734db19d4fc03b42ecb226277 SHA256 2cbb3360507d8da13fa108e2fe9a4407a89b61fc0ddb6505d60f906b6c15eb82
 DIST wireshark-0.99.7pre2.tar.gz 16697044 RMD160 a3b759c830a0e6e5ae5a85342d895f76e5a2901b SHA1 009906e9b0b93e7b3837850dbc999f9c8b222181 SHA256 5cbc540567d88d52df260857d735016ff2762c0a386aff847dc1eae13adb0ef5
-EBUILD wireshark-0.99.7.ebuild 4763 RMD160 7759e9a039a7f533a2efcdbea0b45083b996023e SHA1 7be5bd1a2e7a8199d8b1e28d7ea5af9c51dc5702 SHA256 529154f0017bdc1baf58f69b07042697ed09f93c04c50602626bd669e1449afc
-MD5 06e02b9b95060ce69fa55ec2bd59c62c wireshark-0.99.7.ebuild 4763
-RMD160 7759e9a039a7f533a2efcdbea0b45083b996023e wireshark-0.99.7.ebuild 4763
-SHA256 529154f0017bdc1baf58f69b07042697ed09f93c04c50602626bd669e1449afc wireshark-0.99.7.ebuild 4763
-EBUILD wireshark-0.99.7_rc2.ebuild 4850 RMD160 33be6f24c9ceb4b03369e558e37d40089ba94165 SHA1 5e77f6089c176c122841030f563ae5e7f8cbb4b8 SHA256 c3bdf932e128543d4c5fe790612c50ccf0d8009786fee868f21e4c1fd15f170d
-MD5 019b738f194382a70e4c29e87d75ca3b wireshark-0.99.7_rc2.ebuild 4850
-RMD160 33be6f24c9ceb4b03369e558e37d40089ba94165 wireshark-0.99.7_rc2.ebuild 4850
-SHA256 c3bdf932e128543d4c5fe790612c50ccf0d8009786fee868f21e4c1fd15f170d wireshark-0.99.7_rc2.ebuild 4850
+EBUILD wireshark-0.99.7.ebuild 4907 RMD160 ded94056a82ea3eda0cc0105a315703aa8259fb3 SHA1 522e60e4b249eda17caa6b1c64eeccdd8eb60807 SHA256 2b3dc2ed3d056ecdb9a8672ea7c475f47ee0ebbfc185f3cb46bbcb196d4b29c8
+MD5 0db525e7b1c6918f4890438b101edbcf wireshark-0.99.7.ebuild 4907
+RMD160 ded94056a82ea3eda0cc0105a315703aa8259fb3 wireshark-0.99.7.ebuild 4907
+SHA256 2b3dc2ed3d056ecdb9a8672ea7c475f47ee0ebbfc185f3cb46bbcb196d4b29c8 wireshark-0.99.7.ebuild 4907
+EBUILD wireshark-0.99.7_rc2.ebuild 4907 RMD160 ded94056a82ea3eda0cc0105a315703aa8259fb3 SHA1 522e60e4b249eda17caa6b1c64eeccdd8eb60807 SHA256 2b3dc2ed3d056ecdb9a8672ea7c475f47ee0ebbfc185f3cb46bbcb196d4b29c8
+MD5 0db525e7b1c6918f4890438b101edbcf wireshark-0.99.7_rc2.ebuild 4907
+RMD160 ded94056a82ea3eda0cc0105a315703aa8259fb3 wireshark-0.99.7_rc2.ebuild 4907
+SHA256 2b3dc2ed3d056ecdb9a8672ea7c475f47ee0ebbfc185f3cb46bbcb196d4b29c8 wireshark-0.99.7_rc2.ebuild 4907
 MISC ChangeLog 10042 RMD160 0c6d810c363b1627f2a0d6c55b574f2a1fe430b3 SHA1 919e66494cc6fa6b7d5d0fccdf56117210c31ffa SHA256 60331d10c97fca81657e997e64ed6dfe1a0d1fbe62b6ae3ed972535034be4d30
 MD5 a0304058aed8e615335aef6a3abb6c71 ChangeLog 10042
 RMD160 0c6d810c363b1627f2a0d6c55b574f2a1fe430b3 ChangeLog 10042
diff --git a/net-analyzer/wireshark/wireshark-0.99.7.ebuild b/net-analyzer/wireshark/wireshark-0.99.7.ebuild
index 4b71bba..22b3d1a 100644
--- a/net-analyzer/wireshark/wireshark-0.99.7.ebuild
+++ b/net-analyzer/wireshark/wireshark-0.99.7.ebuild
@@ -142,12 +142,15 @@ src_install() {
 
 	if use gtk ; then
 		insinto /usr/share/icons/hicolor/16x16/apps
-		newins "${S}"/image/hi16-app-wireshark.png wireshark.png
+		newins image/hi16-app-wireshark.png wireshark.png
 		insinto /usr/share/icons/hicolor/32x32/apps
-		newins "${S}"/image/hi32-app-wireshark.png wireshark.png
+		newins image/hi32-app-wireshark.png wireshark.png
 		insinto /usr/share/icons/hicolor/48x48/apps
-		newins "${S}"/image/hi48-app-wireshark.png wireshark.png
+		newins image/hi48-app-wireshark.png wireshark.png
 		insinto /usr/share/applications
+		# Wireshark should not be ran as root in KDE.
+		# Bug: http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2127
+		sed -i '/X-KDE-SubstituteUID/d' wireshark.desktop
 		doins wireshark.desktop
 	fi
 }
diff --git a/net-analyzer/wireshark/wireshark-0.99.7_rc2.ebuild b/net-analyzer/wireshark/wireshark-0.99.7_rc2.ebuild
index f6d8eea..22b3d1a 100644
--- a/net-analyzer/wireshark/wireshark-0.99.7_rc2.ebuild
+++ b/net-analyzer/wireshark/wireshark-0.99.7_rc2.ebuild
@@ -129,28 +129,30 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
+	for file in /usr/bin/tshark /usr/bin/dumpcap
+	do
+		fowners 0:wireshark ${file}
+		fperms 6550 ${file}
+	done
+
 	insinto /usr/include/wiretap
 	doins wiretap/wtap.h
 
 	dodoc AUTHORS ChangeLog NEWS README*
 
-	for file in /usr/bin/tshark /usr/bin/dumpcap
-	do
-		fowners 0:wireshark "${D}"${file}
-		fperms 6550 "${D}"${file}
-	done
-
 	if use gtk ; then
 		insinto /usr/share/icons/hicolor/16x16/apps
-		newins "${S}"/image/hi16-app-wireshark.png wireshark.png
+		newins image/hi16-app-wireshark.png wireshark.png
 		insinto /usr/share/icons/hicolor/32x32/apps
-		newins "${S}"/image/hi32-app-wireshark.png wireshark.png
+		newins image/hi32-app-wireshark.png wireshark.png
 		insinto /usr/share/icons/hicolor/48x48/apps
-		newins "${S}"/image/hi48-app-wireshark.png wireshark.png
-		#make_desktop_entry wireshark "Wireshark" wireshark
+		newins image/hi48-app-wireshark.png wireshark.png
+		insinto /usr/share/applications
+		# Wireshark should not be ran as root in KDE.
+		# Bug: http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2127
+		sed -i '/X-KDE-SubstituteUID/d' wireshark.desktop
+		doins wireshark.desktop
 	fi
-	#dosym tshark /usr/bin/tethereal
-	#use gtk && dosym wireshark /usr/bin/ethereal
 }
 
 pkg_postinst() {