Add GTK+ patch similar to the IPv6 patch.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 54 insertions, 8 deletions

diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index a4438126f539..ed7876a51d48 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/mtr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.134 2013/07/11 14:53:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.135 2013/07/11 15:22:42 jer Exp $
+
+  11 Jul 2013; Jeroen Roovers <jer@gentoo.org> mtr-0.85.ebuild,
+  +files/0.85-gtk.patch:
+  Add GTK+ patch similar to the IPv6 patch.
 
   11 Jul 2013; Jeroen Roovers <jer@gentoo.org> mtr-0.85.ebuild,
   +files/0.85-ipv6.patch:
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 8593a80c6a27..3e3f920532ab 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -3,18 +3,19 @@ Hash: SHA256
 
 AUX 0.80-impl-dec.patch 226 SHA256 55f7f19bb3718ee18b25be15e2a85e432d2c5d044571f3a08d3b117b0fed7c4c SHA512 71c53c22f4ff99b29cd71f4e910e857ea0f4f497d25dcd59295ca2b59eb7be40d021d865489a53234d5fa4395f6baf011073d117653ad82aef78562a60898b1c WHIRLPOOL b9816c9b0b78c2d71be696b40aef762eab7006ff04e0efde7f0a03dd2cd0bdd0f157d71ecb5ac143fa8e24fbda7dbe88db2bceccfbdaa2d8ab970203ff25a50a
 AUX 0.82-tinfo.patch 990 SHA256 022d45b19e6ee8a59d6198c4c5ea9ecc3303906ad8b99a69b0d31071020f405c SHA512 9a502e251bdec96b7596aaa00429d582562f6f598e8a2a3ee59b552aa52381e88c4b83fdc9afb8202b3a8b8fbeb95a92fea6c3644594c3b67a4ef42d7a978069 WHIRLPOOL 5172afca4ca1be2cd0a42c49c0944709d2104fbd0a78c26bffca893112a5c6f0a0437d294413895fa1163a7d7c95b0e770fe7ef28ee66c132f403b6e96b7e5f9
+AUX 0.85-gtk.patch 729 SHA256 c03b416f160d1b7f09345277d4db2f3294f551fa54a10dea760d2d1a32b13d1e SHA512 69f51a337c2777adab6584b7574c860c4361d089d8448ff97d37ebaec50159a9f1d307eb32dccbb30c601f87df790f09837bed949805fb2c9949da71d60c2cf3 WHIRLPOOL 9f140951f592f8755c624d4f526e4500be67e65112a75d04de52a8fb96b81d963b05df9e21e69d2a98b535e403eb4d592c5110d3f49ce17c0ed8098e54bfc2e2
 AUX 0.85-ipv6.patch 381 SHA256 7a6b98a5d76a56b8d5d321f5bfaf18afdb7ac37dc1210305520cbf6c7d2e7b62 SHA512 e12ec2e4374712e525e26c1b59e613930188f72a523e0cce746b99f009820e956b2b44f951b28eaabb0f00e1ea9c8fab674f3d2f72c93a8ff05f8a4294981a2d WHIRLPOOL d3536f3418df97103a1adff84f30130572208d0761ea9c10cfe3cb3102310d3050c0815cb07bac976ac72c3afb17888780cd5832fceec76d16d61c58f37b2dba
 DIST gtk-2.0-for-mtr.m4.bz2 2508 SHA256 59152f9a4a1af5cf09f2aaa804c9071afe3eb6632162f1660d85c820db342eba SHA512 0f593b761d7a9399469f1f7bb3992133b391a2ce760ecfad96237561992802c192b810f4722763685d5f6e7a76bd2806abf08e1850bdce00e5cd3af4c810210f WHIRLPOOL 8bfa2cd70c2aba06473692cdf3e091a983aab69cdb5be3d0382b6b87c05bcc577ecb1afab26afc17ee16d07a1161fe84f17e3cc9ae0a150364f34667cfba5779
 DIST mtr-0.82.tar.gz 270245 SHA256 f3b457c9623ae03565688a7ffd49d4843a5e2505ccaf3ba8d9fbd86e3ce9b6a0 SHA512 122bc7aafe4441505046b331dcc42347e939fd974ece508dad04a7630904403eaec49ad6b2e483b5a94fc07726a14fad1405306c3729f1dc9b707ea66b529751 WHIRLPOOL da350fa3ee0a84f40a7cf84eec30eceab1583ec270748b593b2e262207147feae72f47d4df1ce1b90168d4b42d29b280c00117f0f244a22e0866f3e5d7aece80
 DIST mtr-0.85.tar.gz 534196 SHA256 cb2d62c9a2dc230f1c7a46c07116516d71e8bef94ce29fadf797829053dd5501 SHA512 bb918ce15de51d515a2dd9a03703efd8b3fac8d3a83e6370187c2aacdce0e68ac5972b3e0ff8d22fb1dac51bf7585174a527390101e6cf971fb91a058601e7ff WHIRLPOOL 1430bacbee92cc7feddb7c8431520e117b7f789843714655904b1ec62600d5aa8ef16764ecfa3b5b5cf7d4f28e5a328706ae274f126e6f7a3b16b667816b212a
 EBUILD mtr-0.82.ebuild 1552 SHA256 b11397a6152bd013ec6363789f42d2b9420b6a78f85ebcf91dbd4bb8eccc4967 SHA512 60481216104caee03553e0325209e3463a8db5e80f13e3b48dda3a764d6a1a63ed96e378b2f13f25d6481ca356a60a1339d404fee75b20cc1fafd58f90846efb WHIRLPOOL 37fda82954151d360388ddfdf23427b67020042c02b4da18df10c18e3299e9c9b5ad094416e2eb427d2a04baff74251e6bcd55d2fb93911d58d0b6bd3c69690c
-EBUILD mtr-0.85.ebuild 1640 SHA256 fc5c12c6c098c0b55bf820c2b99b640c7595d039b4629fcdad40fbe3b0b3bbee SHA512 37fc74c64f762268858ef272b37c113224571e98bb438e0266dcc8518f210da32d4ca3b7c4a6914617378f1b7f870763ed9af3b1bed253be4b3752b2f35f7816 WHIRLPOOL f2dd4483ef1cee4b0d645ce7353dc56474c610117502022d4c0890d9dc8bfe4d792a1ffce5c3e3507d76b3cc0c032539732529833f36a52cac8993627abe428d
-MISC ChangeLog 15787 SHA256 d79b078c878cca459623f140dfb8212d59af5abdc669dc07ca326803cbee44ae SHA512 d9a8098710cd946720b3dd525a9b3c56d985a0cfa5f508c2976f53b993d51717ab988d77f88ba22f0946e0a18326ba2ff06898690b757f95f9e626d02f708b81 WHIRLPOOL 08656ef3a4a844d39507bd276df47934ee0053213ce8e22a6992c8a987fe1f4692a09a5ba45d5246afd6a5ff5bdbdc703b7c81742e465959208662ecbf747614
+EBUILD mtr-0.85.ebuild 1673 SHA256 874b7c7eec962c42f2ab5a442321213581091f0ee3963525fe9bff8428b449ae SHA512 3f749976221a5d038c732c94ce49c19957545500f80e158574e151759aad2af008a8da1e380c25aca6196c061ac2b6b5fc2ff091e17d1aa3b1e6a2e96e3782ff WHIRLPOOL 692e3a6adf43edea1a6579015eb8bd6695a3d271419390360d8c2332894d89de1b8305b564aff409324d10317c107ffa9168a08ce4d04f4e229bb5181974fc62
+MISC ChangeLog 15921 SHA256 c69fb78e4e6ea3cf9e0a40bf67c2ad698b7a9c8a33867d884d0112d21b2b06c1 SHA512 32fe70baea3acd4bd5cfc0e25c4d631fbda2f57d6bf80919ba8d869f9bceefde5f8e5bd5d12b934d966fea2cf9f721e4e047a0a97f21e16db57242ce27629de7 WHIRLPOOL 2ba91249c1214d935abba3ff76345b6dc21971fdda8868a8944a0197e9904fbc56692a93bf396c7d1500d833340f888acae7d5f5598ade39434e838c59cd5e04
 MISC metadata.xml 244 SHA256 4b90774b23e03ba5cfff56d639ba013394dccf7597849fc010e54f69042b47d9 SHA512 1e6d38f1ed92a6771bc35aa6b0c9dd9d6b58308947c2e2ffe06a827cf1ae41c7c570b7e806112e21b14d4a549eeab9f63b8891de0a25f3f5f5c9d42199b025f9 WHIRLPOOL 758fb22a0c339694f8fee0784423405fc3b250ad2d76e37fb6bb0af1376ba6c1b4b55a2956c3b3beac378965c422a159278293f36042267c771785158a09c540
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHexuYACgkQVWmRsqeSphOYsQCdGYCSC/yA5ePaTBp+CB++ZYqR
-7q4An1WL3Go29fvdssOxqDcwOGkB8ZwM
-=v+zo
+iEYEAREIAAYFAlHezcMACgkQVWmRsqeSphPiRQCeKpUO5C2WiocA6v0tbtXLP5hF
+2zEAnRZ8ZGKqno0a380RuG0BBI4BX4ug
+=vV09
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/mtr/files/0.85-gtk.patch b/net-analyzer/mtr/files/0.85-gtk.patch
new file mode 100644
index 000000000000..f04d2419bed8
--- /dev/null
+++ b/net-analyzer/mtr/files/0.85-gtk.patch
@@ -0,0 +1,40 @@
+--- a/display.c
++++ b/display.c
+@@ -45,7 +45,7 @@
+ #include "mtr-curses.h"
+ #endif
+ 
+-#ifdef NO_GTK
++#if (NO_GTK == 1)
+ #define gtk_open()
+ #define gtk_close()
+ #define gtk_redraw()
+@@ -71,7 +71,7 @@
+   DisplayMode = DisplayCurses;
+ #endif
+ 
+-#ifndef NO_GTK
++#if (NO_GTK == 0)
+   if(gtk_detect(argc, argv)) {
+     DisplayMode = DisplayGTK;
+   }
+--- a/gtk.c
++++ b/gtk.c
+@@ -26,7 +26,7 @@
+ #include <sys/types.h>
+ #include <string.h>
+ 
+-#ifndef NO_GTK
++#if (NO_GTK == 0)
+ #include <string.h>
+ #include <sys/types.h>
+ #include <gtk/gtk.h>
+@@ -38,7 +38,7 @@
+ #include "version.h"
+ 
+ #include "img/mtr_icon.xpm"
+-#endif
++#endif /* NO_GTK == 0 */
+ 
+ gint gtk_ping(gpointer data);
+ gint Copy_activate(GtkWidget *widget, gpointer data);
diff --git a/net-analyzer/mtr/mtr-0.85.ebuild b/net-analyzer/mtr/mtr-0.85.ebuild
index ae6a60e58c07..b62961e98aaf 100644
--- a/net-analyzer/mtr/mtr-0.85.ebuild
+++ b/net-analyzer/mtr/mtr-0.85.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.85.ebuild,v 1.2 2013/07/11 14:53:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.85.ebuild,v 1.3 2013/07/11 15:22:42 jer Exp $
 
 EAPI=5
 inherit eutils autotools flag-o-matic
@@ -27,7 +27,8 @@ DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/0.80-impl-dec.patch \
-		"${FILESDIR}"/0.85-ipv6.patch
+		"${FILESDIR}"/0.85-ipv6.patch \
+		"${FILESDIR}"/0.85-gtk.patch
 
 	# Keep this comment and following mv, even in case ebuild does not need
 	# it: kept gtk-2.0.m4 in SRC_URI but you'll have to mv it before autoreconf