Fixed myconf overwriting. Closes bug #66747.

diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index 6254a5e96ac799ef33a7fb3949b2ac8052e3aed2..2d837e65e66f8ea4f72a9c559d3f4a86860b33ec 100644 (file)
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/ethereal
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.83 2004/09/03 21:52:59 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.84 2004/10/14 15:03:24 eldad Exp $
+
+  14 Oct 2004; Eldad Zack <eldad@gentoo.org> ethereal-0.10.6.ebuild:
+  Fixed myconf overwriting. Closes bug #66747.
 
   16 Aug 2004; Eldad Zack <eldad@gentoo.org> -files/0.10.3-gcc34.patch,
   -files/0.10.6-gcc34.patch, ethereal-0.10.6.ebuild:

diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index d1cf88c3213099f6310892d1402729831fe5e7f6..b0df9c9be9cfd23c2b7f0b93a844abdd80545793 100644 (file)
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 4b8447a4a8741c7d0ea83961f52a04bc ChangeLog 3901
-MD5 67fe3215c33eaf71089ce034d4716645 ethereal-0.10.6.ebuild 2402
 MD5 e70cd283dc61b8b8ffdaba5e82ceb873 ethereal-0.10.5.ebuild 2580
-MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
+MD5 869726c833dbbe3636d1463b1cbcbfe1 ethereal-0.10.6.ebuild 2422
+MD5 22d38477be2dd2484c4ea2a3efb404f3 ChangeLog 4018
 MD5 bb9946fe6df0695a2376909c6e3cbd2d ethereal-0.10.5-r1.ebuild 2595
+MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
+MD5 5a73274ec255373b4e618388cd057275 files/0.10.4-gcc34.patch 458
+MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5-r1 69
 MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5 69
 MD5 5bc98004e6492e3349a16bf0591c743e files/digest-ethereal-0.10.6 69
-MD5 56d5feedd5047dd2b7bcd4c9295addef files/digest-ethereal-0.10.5-r1 69
-MD5 5a73274ec255373b4e618388cd057275 files/0.10.4-gcc34.patch 458
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBUsx4HTu7gpaalycRAru4AJ4+iBscFsEhvPmb6PN43xwu6DuUhACfVZrk
-ZUxw3GS0U0pB0Xk1GHKzQvU=
-=VEqt
+iD8DBQFBbpT8T+MN7JbqCpMRAtWuAJ41JjdVBS6l6ufSICwd5LP6jDGENgCfRdne
+hWP38BR2wJ2tsdMTZ6OWwQA=
+=/FDE
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/ethereal/ethereal-0.10.6.ebuild b/net-analyzer/ethereal/ethereal-0.10.6.ebuild
index e94a8434cb20a471afa0dde7ec12a3da64816106..8626e6f1dabe1eddd4ca01290c3bda2b50c0c04e 100644 (file)
--- a/net-analyzer/ethereal/ethereal-0.10.6.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.6.ebuild,v 1.3 2004/08/16 07:35:32 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.6.ebuild,v 1.4 2004/10/14 15:03:24 eldad Exp $
 
 inherit libtool flag-o-matic gcc eutils
 
@@ -47,9 +47,9 @@ src_compile() {
                $(use_with adns)"
 
        if use gtk; then
-               myconf="$(use_enable gtk2)"
+               myconf="${myconf} $(use_enable gtk2)"
        else
-               myconf="--disable-gtk2"
+               myconf="${myconf} --disable-gtk2"
 
                # --disable-ethereal do not have an influence
                #myconf="${myconf} --disable-ethereal"