Import changes from Gentoo Prefix overlay, KEYWORDS, append-libs for osx, permission handling. No change for non prefix platforms

Package-Manager: portage-2.1.9.42/cvs/Linux i686

3 files changed, 20 insertions, 21 deletions

diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index f9b9bb961570..134700e9aab3 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,10 @@
 # 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.100 2011/04/08 15:07:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.101 2011/04/08 15:25:55 darkside Exp $
+
+  08 Apr 2011; Jeremy Olexa <darkside@gentoo.org> mtr-0.80.ebuild:
+  Import changes from Gentoo Prefix overlay, KEYWORDS, append-libs for osx,
+  permission handling. No change for non prefix platforms
 
   08 Apr 2011; Jeroen Roovers <jer@gentoo.org> mtr-0.80.ebuild:
   Stable for HPPA (bug #362609).
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 13929621caf8..e51a72ed033a 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.80-impl-dec.patch 226 RMD160 b9b2a0759c767ced61b3292ba5a79de1d0897941 SHA1 543deacf31f36e6342152f795d7b6dcdea78db4a SHA256 55f7f19bb3718ee18b25be15e2a85e432d2c5d044571f3a08d3b117b0fed7c4c
 DIST gtk-2.0-for-mtr.m4.bz2 2508 RMD160 f5fc7a3a3c4fcfe03356170371113a1b0f18eda6 SHA1 c72993fdb224ffba6afeca43a60303ed0350c56f SHA256 59152f9a4a1af5cf09f2aaa804c9071afe3eb6632162f1660d85c820db342eba
 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 1266 RMD160 3a1a1ba0a92b07950aa9041737f95931ccd231f3 SHA1 03e1e9607fb79d84c71e45e77b6c700d1968ab1e SHA256 9589133e3af87b0d6eddb50dca7456ebda705fe165245b0c05305b1031f6b809
-MISC ChangeLog 11809 RMD160 35ea5dc510d929bb671242c34be7ec48358282c3 SHA1 8e313c0abfa58a7c6f3dcacf53eb9c0c29ee4dc5 SHA256 2bee2c1d0d364fcf122d5f807131d14e0423df9f3869b7b4ce8bd8880370893e
+EBUILD mtr-0.80.ebuild 1526 RMD160 67431c2a807a6709c9483ce42d31ca183eb5622f SHA1 a45a46f8060f17af7474d95b2934e0ac68a5980b SHA256 9e76421b2e74a6c7dfef4b1c030f36ebea0874bd6e458a0d7809d3e4e0b47320
+MISC ChangeLog 12016 RMD160 badd0e0d4d42611030d0430aa868e6c577718918 SHA1 f17746d5c2cf7674deefd6edc2ff4013c4fae1e0 SHA256 301022548cc8475a294268a59376655a1e4bfab29441dfe2fed77c85302a610f
 MISC metadata.xml 244 RMD160 e017aaa0a93030fffb56cd11f8894d932ca77173 SHA1 6c242450f36154bb9453827b44e6c2dc99ddc634 SHA256 4b90774b23e03ba5cfff56d639ba013394dccf7597849fc010e54f69042b47d9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2fJK4ACgkQVWmRsqeSphMU8QCePzpfxNrF/aCXC7276f45RTj7
-6Y4AnR5b+RrHcy6GRCdOD+2p9J6AQHrM
-=xvCD
------END PGP SIGNATURE-----
diff --git a/net-analyzer/mtr/mtr-0.80.ebuild b/net-analyzer/mtr/mtr-0.80.ebuild
index 7adb0a40f3c1..dcff2a3683b2 100644
--- a/net-analyzer/mtr/mtr-0.80.ebuild
+++ b/net-analyzer/mtr/mtr-0.80.ebuild
@@ -1,10 +1,10 @@
 # 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.2 2011/04/08 15:07:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.80.ebuild,v 1.3 2011/04/08 15:25:55 darkside Exp $
 
 EAPI="4"
 
-inherit eutils autotools
+inherit eutils autotools flag-o-matic
 
 DESCRIPTION="My TraceRoute, an Excellent network diagnostic tool"
 HOMEPAGE="http://www.bitwizard.nl/mtr/"
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="gtk ipv6 suid"
 
 RDEPEND="
@@ -32,6 +32,9 @@ src_prepare() {
 	AT_M4DIR="." eautoreconf
 }
 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
 	econf \
 		$(use_with gtk) \
 		$(use_enable ipv6)
@@ -40,11 +43,13 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 
-	fowners root:0 /usr/sbin/mtr
-	if use suid; then
-		fperms 4711 /usr/sbin/mtr
-	else
-		fperms 0710 /usr/sbin/mtr
+	if use !prefix ; then
+		fowners root:0 /usr/sbin/mtr
+		if use suid; then
+			fperms 4711 /usr/sbin/mtr
+		else
+			fperms 0710 /usr/sbin/mtr
+		fi
 	fi
 	dodoc AUTHORS ChangeLog FORMATS NEWS README SECURITY TODO
 }