Install icons in the correct place and provide a desktop entry for bug 81055. Thanks to Diego Petteno.

Package-Manager: portage-2.0.51.16

3 files changed, 31 insertions, 21 deletions

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index e7b1d36efcb8..288b602306fb 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/ethereal
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.105 2005/01/25 12:01:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.106 2005/02/15 15:41:04 ka0ttic Exp $
+
+  15 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> ethereal-0.10.9-r1.ebuild:
+  Install icons in the correct place and provide a desktop entry for bug
+  81055. Thanks to Diego Petteno.
 
   25 Jan 2005; Daniel Black <dragonheart@gentoo.org>
   +files/ethereal-0.10.9-mate.h-gcc2.patch, ethereal-0.10.9-r1.ebuild,
diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index 9f5c841b3425..a31f86ed7b11 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,26 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 98ca4cd64113888c4cc8d4d6e66bd1cb ChangeLog 6579
-MD5 9aacfb51126057fe6f272e9e68b04823 ethereal-0.10.5-r1.ebuild 2591
-MD5 90125878d2e9c146be8cd1513584c594 ethereal-0.10.5.ebuild 2577
-MD5 42646c10b255d7b2cc1abd0ff17a854a ethereal-0.10.6.ebuild 2482
 MD5 5873fa93022936b5fffa46b3a2877255 ethereal-0.10.8.ebuild 2419
-MD5 0b0155a2708a7ef22945516aaee8a24e ethereal-0.10.9-r1.ebuild 2392
+MD5 90125878d2e9c146be8cd1513584c594 ethereal-0.10.5.ebuild 2577
 MD5 561c7ef7a7548480bcade342d7766427 ethereal-0.10.9.ebuild 2516
+MD5 42646c10b255d7b2cc1abd0ff17a854a ethereal-0.10.6.ebuild 2482
+MD5 59b19e8af07ccc501d441ec06bab7db3 ethereal-0.10.9-r1.ebuild 2674
+MD5 16d81bd52d245a0010c9cc9e0eb8d899 ChangeLog 6759
+MD5 9aacfb51126057fe6f272e9e68b04823 ethereal-0.10.5-r1.ebuild 2591
 MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
+MD5 0810d71e423428b7aefa8ce2ecb95043 files/ethereal-0.10.9-mate.h-gcc2.patch 605
 MD5 5a73274ec255373b4e618388cd057275 files/0.10.4-gcc34.patch 458
-MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5 69
 MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5-r1 69
+MD5 ead2b5faadcb1443141a8a22e0e2a217 files/digest-ethereal-0.10.9-r1 69
+MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5 69
 MD5 5bc98004e6492e3349a16bf0591c743e files/digest-ethereal-0.10.6 69
 MD5 8f052b2e09156338ef122fbfd4cfa975 files/digest-ethereal-0.10.8 69
 MD5 ead2b5faadcb1443141a8a22e0e2a217 files/digest-ethereal-0.10.9 69
-MD5 ead2b5faadcb1443141a8a22e0e2a217 files/digest-ethereal-0.10.9-r1 69
-MD5 0810d71e423428b7aefa8ce2ecb95043 files/ethereal-0.10.9-mate.h-gcc2.patch 605
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB+/Z9mdTrptrqvGERAqhpAJ9PbLnukSGgDqLUhVrsZ6MhOxiQuwCeJbkg
-rUGJQxWhRiMbOngS0qLualc=
-=Iqmj
+iD8DBQFCEhgaEZCkKN40op4RAnJFAJsHQ80gXJac84QOhQX8zigmGA8xNQCfYsGi
+KonyVxbSs359+DmLQd/VjTo=
+=gDtV
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild b/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild
index 4500229a3931..26654418458e 100644
--- a/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild,v 1.4 2005/01/29 20:47:16 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.9-r1.ebuild,v 1.5 2005/02/15 15:41:04 ka0ttic Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -51,12 +51,7 @@ src_compile() {
 	# Fix gcc-3.4 segfault #49238
 	#[ "`gcc-version`" == "3.4" ] && append-flags -fno-unroll-loops
 
-	local myconf="
-		$(use_with ssl)
-		$(use_enable ipv6)
-		$(use_with adns)
-		$(use_with kerberos krb5)
-		$(use_with snmp net-snmp)"
+	local myconf
 
 	if use gtk; then
 		myconf="${myconf} $(use_enable gtk2)"
@@ -69,6 +64,11 @@ src_compile() {
 	fi
 
 	econf \
+		$(use_with ssl) \
+		$(use_enable ipv6) \
+		$(use_with adns) \
+		$(use_with kerberos krb5) \
+		$(use_with snmp net-snmp) \
 		--without-ucd-snmp \
 		--enable-dftest \
 		--enable-randpkt \
@@ -86,6 +86,12 @@ src_install() {
 	make DESTDIR=${D} install || die
 
 	dodoc AUTHORS ChangeLog INSTALL.* NEWS README* TODO
-	insinto "/usr/share/pixmaps/"
-	doins "image/hi48-app-ethereal.png"
+
+	insinto /usr/share/icons/hicolor/16x16/apps
+	newins ${S}/image/hi16-app-ethereal.png ethereal.png
+	insinto /usr/share/icons/hicolor/32x32/apps
+	newins ${S}/image/hi32-app-ethereal.png ethereal.png
+	insinto /usr/share/icons/hicolor/48x48/apps
+	newins ${S}/image/hi48-app-ethereal.png ethereal.png
+	make_desktop_entry ethereal "Ethereal" ethereal
 }