Generalise Darwin fix, bug #361807

Package-Manager: portage-2.2.01.19074-prefix/cvs/Darwin i386

diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index f3418d4098a951e825535ac041cff10d4295dd6a..0d71ad3f05df6ee00de68bf9ca99dad51b8c5d0d 100644 (file)
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/mtr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.106 2011/07/15 15:20:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.107 2011/08/29 17:55:48 grobian Exp $
+
+  29 Aug 2011; Fabian Groffen <grobian@gentoo.org> mtr-0.80.ebuild:
+  Generalise Darwin fix, bug #361807
 
   15 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> mtr-0.80.ebuild:
   ppc/ppc64 stable wrt #362609

diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index c49cdacceb603bbce41f28f48bed96ab3e7a9c16..69ebbe8674286c1bd68c20bbfa248d9e83d52861 100644 (file)
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -6,15 +6,13 @@ DIST gtk-2.0-for-mtr.m4.bz2 2508 RMD160 f5fc7a3a3c4fcfe03356170371113a1b0f18eda6
 DIST mtr-0.79.tar.gz 272643 RMD160 dba8d5e6766e3961481efc2c0274659c3c1507c4 SHA1 eccd53d8b42b673b7e9fe68821900703f867e675 SHA256 92595db3aae89fea76a856d988eeb3935b6550ff43cfc7afd17dec910e1b0511
 DIST mtr-0.80.tar.gz 272750 RMD160 09c1e8cf68e9c14f7f441017f805b50b779082e0 SHA1 7753c60753ce8454c4f37fc527bc82e46f6bb5b3 SHA256 76bbdd97faf3b805933a50858549ddba895911d6891c6cc51db472567cff0ec0
 EBUILD mtr-0.79.ebuild 1249 RMD160 3056b90ac6d563898212934d9bbd2b4220901eb9 SHA1 ff0a9c9fff5a847e59d8c158880e40969643736f SHA256 ce21c79abff00f875ea2315e257d3149eebade8dbeaf1d6074042c20dfc0227c
-EBUILD mtr-0.80.ebuild 1518 RMD160 0c3e0e5928900174b5d8e2d5efff92d9d73e326f SHA1 e035813c7da9acac312006ed17ee2ecd75e5854a SHA256 d972d0be940ac79b3938626cec255543c519b26d72977fd4e4c24939198a8b4b
-MISC ChangeLog 12533 RMD160 574577a45448f3c86e3464624e0d1a51ae10331d SHA1 231816fb353b7ea9161a4e4593daf0dd61cdff88 SHA256 ff0034dd24a43b34ad0ebb0404b7d91f5be250a0f3d5d5553f7badb0022164e8
+EBUILD mtr-0.80.ebuild 1529 RMD160 0c868e0d1df7f98be5a72f67297e0199dabddbc5 SHA1 745d4e302a50b3cdaaa97e259dd8eee96b34295d SHA256 33cb6a4df5dec61f26de9c6a5555f1983bb6fb7fc61230f996058aa787b3fad0
+MISC ChangeLog 12636 RMD160 a2aa4c13be40a46b133c7dc620fb0f52e2a5618d SHA1 f241fe5c0d821c78a01e79adddafbd1eb0e1ded1 SHA256 8f18dfe2b31b4893b117b3e0e24967b3ad1f50d07abb7e3f5e1f8514d7bde0a6
 MISC metadata.xml 244 RMD160 e017aaa0a93030fffb56cd11f8894d932ca77173 SHA1 6c242450f36154bb9453827b44e6c2dc99ddc634 SHA256 4b90774b23e03ba5cfff56d639ba013394dccf7597849fc010e54f69042b47d9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iJwEAQECAAYFAk4gWsEACgkQIiMqcbOVdxSCcQP+IjJ53GdtBYf8LC+jqwMHn9Zq
-HdpUD+m/bDakkB78IYxKYcRtGupNhjVeZYXRhbvtB7/NWtGo23qtus0TBVmoJUBn
-ctH0VI5O4+FSVQokidnh7L4jCdimPTF25agkxO1V3C6mfaqU8cdgcDN3r8pDxRsE
-cG5HsMWA+i4pAR9lqMI=
-=Wl9z
+iEYEARECAAYFAk5b0qkACgkQX3X2B8XHTomKlACeL/9cogVLe5r4FfAn0MaSqtX/
+QFgAnj8oKtCDa98do/4YwRFVj4g43ZRj
+=sSL1
 -----END PGP SIGNATURE-----

diff --git a/net-analyzer/mtr/mtr-0.80.ebuild b/net-analyzer/mtr/mtr-0.80.ebuild
index 9d03e9117ddca7a8035420c5f496041e73e3c099..34ee389aeddf98cc585b9a2e87ae82824167d814 100644 (file)
--- a/net-analyzer/mtr/mtr-0.80.ebuild
+++ b/net-analyzer/mtr/mtr-0.80.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.80.ebuild,v 1.8 2011/07/15 15:20:25 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.80.ebuild,v 1.9 2011/08/29 17:55:48 grobian Exp $
 
 EAPI="4"
 
@@ -34,7 +34,7 @@ src_prepare() {
 src_configure() {
        # In the source's configure script -lresolv is commented out. Apparently it
        # is needed for 64bit macos still.
-       use x64-macos && append-libs -lresolv
+       [[ ${CHOST} == *-darwin* ]] && append-libs -lresolv
        econf \
                $(use_with gtk) \
                $(use_enable ipv6)