Fixed build issue with gcc-3.4.6, bug #248800, thank barthek for report.

Package-Manager: portage-2.1.7.1/cvs/Linux x86_64

4 files changed, 42 insertions, 11 deletions

diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index 8eb542b4e12c..abb033b5186e 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/mtr
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.82 2008/11/16 14:40:13 pva Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.83 2009/10/22 09:24:57 pva Exp $
+
+  22 Oct 2009; Peter Volkov <pva@gentoo.org> mtr-0.75.ebuild,
+  +files/mtr-0.75--Wno-pointer-sign.patch:
+  Fixed build issue with gcc-3.4.6, bug #248800, thank barthek for report.
 
 *mtr-0.75 (16 Nov 2008)
 
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index ba5976c606c1..1840cc9e5b7d 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,10 +1,11 @@
 AUX mtr-0.73-CVE-2008-2357.patch 9729 RMD160 39385b3820dbee784678006f9d565d10ee1e7f35 SHA1 b0553d92af0750da30f6db984b672b6f5211e605 SHA256 9a6bbf7c5f825c9f81f622a7cd65a50ed051593beb4c53ae44494ecb5ad3d8ad
 AUX mtr-0.73-am_path_gtk.patch 728 RMD160 c2f4fe18a97033eac9ca74cd69017c7e85f69c38 SHA1 2eb9857c066a9add7d1bf12c12658c95836e55da SHA256 0a250cc9cb58340d2ecb29c1d1d209811e9956c7dc2ab6081702758651cf9f4b
+AUX mtr-0.75--Wno-pointer-sign.patch 752 RMD160 faae92c328f4b837b821ec1cd0da108573de25ce SHA1 bc1bf3e988021b5de90195b2b7ffd068557256df SHA256 e46b6f917e15cb24af26b29c1ccef87a0b08b14a66d15598f3b253501a4ddc93
 AUX mtr-ac-res_mkquery.patch 510 RMD160 6ee5bdf1e8b52779eb4288ffad6bae05d134d68b SHA1 a0d54a26a355d4ccc01703b726fc365f32750079 SHA256 2a369c93e2244967b75e89fb45541edafeb92f012cc78b9ee043685e0eb51785
 DIST gtk-2.0-for-mtr.m4.bz2 2508 RMD160 f5fc7a3a3c4fcfe03356170371113a1b0f18eda6 SHA1 c72993fdb224ffba6afeca43a60303ed0350c56f SHA256 59152f9a4a1af5cf09f2aaa804c9071afe3eb6632162f1660d85c820db342eba
 DIST mtr-0.73.tar.gz 558744 RMD160 09b9b2cea84b0596bf25a4055cdcb78e8faebc10 SHA1 52cf5bd1a1e6a8e14a0ebb70610bd2be9e597c15 SHA256 30bdf752ac048dd160aa28d5caff1ffe0986dd4df046c397087fa1d8c8e1ab51
 DIST mtr-0.75.tar.gz 179376 RMD160 d7df41c0c9b457eeff4034c9bc2f01456b8f6c68 SHA1 d9d3f849e32dda8aa5a7a297c25053e5d8504b27 SHA256 1d1a5de6b233289bf17a21e3bf83c82db47d22bb269af986229b788689e1f0f3
 EBUILD mtr-0.73-r2.ebuild 1454 RMD160 804da616e0787d9c8b8cebebfc7aab27334ca9e7 SHA1 7d9907bf5c17e5b7871124d079aae160be682feb SHA256 3c6569af6b667d4d8dd081b9fc2d004cf370984f2766d13d44229534da9dfb5b
-EBUILD mtr-0.75.ebuild 1074 RMD160 229d1372f08111ce3dab5e9dc64531ab98853bfa SHA1 601ef607386db5715472c3f67c14a0b190bd1e52 SHA256 72cd099eb68a7f2fe6dc6926d380406f35d38763b39e6d16bedd7a48b1060026
-MISC ChangeLog 9753 RMD160 a91f8fa072e493eae2a3e8cfa15614771d9b8c88 SHA1 1b2bf27ede55fab2309c0542989a7ee1585a22e0 SHA256 1affa664cf1e43d260d5f5e463a163641424e99b072f4213885eddb42853c7c6
+EBUILD mtr-0.75.ebuild 1237 RMD160 939af670a8e317019edd3374e31af5c388a95fa0 SHA1 9067e2b0f270c3d38e65a7c58a9c651654151d26 SHA256 cb16f563e61ec3f8142bbe5c646e3424eaf18d7943ddc49b297d723a6202502a
+MISC ChangeLog 9934 RMD160 dc7ee4e557841d75cf3429229ccfcd981ec82c64 SHA1 c9f06ce70b4f0b40c15f7d98288c88b37a84d11d SHA256 ac77ddf5e26d8e6a3b93a991d58632c10d7f81fe15917991495930c3245d2d41
 MISC metadata.xml 244 RMD160 e017aaa0a93030fffb56cd11f8894d932ca77173 SHA1 6c242450f36154bb9453827b44e6c2dc99ddc634 SHA256 4b90774b23e03ba5cfff56d639ba013394dccf7597849fc010e54f69042b47d9
diff --git a/net-analyzer/mtr/files/mtr-0.75--Wno-pointer-sign.patch b/net-analyzer/mtr/files/mtr-0.75--Wno-pointer-sign.patch
new file mode 100644
index 000000000000..5c63bbe1fd6e
--- /dev/null
+++ b/net-analyzer/mtr/files/mtr-0.75--Wno-pointer-sign.patch
@@ -0,0 +1,20 @@
+=== modified file 'configure.in'
+--- configure.in	2009-05-24 15:45:58 +0000
++++ configure.in	2009-05-24 16:02:19 +0000
+@@ -107,8 +107,13 @@
+ AC_MSG_CHECKING(for C flags to get more warnings)
+ ac_save_CFLAGS="$CFLAGS"
+ if test "x$ac_cv_c_compiler_gnu" = "xyes" ; then
+-  dnl gcc is the easiest C compiler
+-  warning_CFLAGS="-Wall -Wno-pointer-sign"
++  warning_CFLAGS="-Wall"
++  # Check if compiler supports -Wno-pointer-sign and add it if supports
++  CFLAGS_saved="$CFLAGS"
++  CFLAGS="$CFLAGS -Wno-pointer-sign"
++  AC_COMPILE_IFELSE([ AC_LANG_SOURCE([[ int foo; ]])],
++                  [ warning_CFLAGS="${warning_CFLAGS} -Wno-pointer-sign" ],)
++  CFLAGS="$CFLAGS_saved"
+ else
+   dnl Vendor supplied C compilers are a bit tricky
+   case "$host_os" in
+
diff --git a/net-analyzer/mtr/mtr-0.75.ebuild b/net-analyzer/mtr/mtr-0.75.ebuild
index 4a8fd31d5524..20cf069b460d 100644
--- a/net-analyzer/mtr/mtr-0.75.ebuild
+++ b/net-analyzer/mtr/mtr-0.75.ebuild
@@ -1,6 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.75.ebuild,v 1.1 2008/11/16 14:40:13 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.75.ebuild,v 1.2 2009/10/22 09:24:57 pva Exp $
+
+EAPI="2"
+inherit eutils autotools
 
 DESCRIPTION="My TraceRoute. Excellent network diagnostic tool."
 HOMEPAGE="http://www.bitwizard.nl/mtr/"
@@ -17,14 +20,17 @@ RDEPEND="sys-libs/ncurses
 DEPEND="${RDEPEND}
 	gtk? ( dev-util/pkgconfig )"
 
-# I've kept gtk-2.0.m4 in SRC_URI but you'll have to mv it before autoreconf
-# mv "${WORKDIR}"/gtk-2.0-for-mtr.m4 gtk-2.0.m4 #222909
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}/${P}--Wno-pointer-sign.patch"
+	# Keep this comment and following move, even incase ebuild does not needs
+	# it: kept gtk-2.0.m4 in SRC_URI but you'll have to mv it before autoreconf
+	mv "${WORKDIR}"/gtk-2.0-for-mtr.m4 gtk-2.0.m4 #222909
+	eautoreconf
+}
+src_configure() {
 	econf \
 		$(use_with gtk) \
 		$(use_enable ipv6)
-
-	emake || die "emake failed"
 }
 
 src_install() {