Fix USE=-gtk (where dev-libs/glib is still used, bug #456788).

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

3 files changed, 15 insertions, 8 deletions

diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index f77b080b40dc..b97499c787df 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,6 +1,9 @@
 # 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.128 2013/02/19 21:02:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.129 2013/02/20 13:55:00 jer Exp $
+
+  20 Feb 2013; Jeroen Roovers <jer@gentoo.org> mtr-0.83.ebuild:
+  Fix USE=-gtk (where dev-libs/glib is still used, bug #456788).
 
 *mtr-0.83 (19 Feb 2013)
 
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 83aa3bae87fc..7e77ddf02fc8 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -6,13 +6,13 @@ DIST gtk-2.0-for-mtr.m4.bz2 2508 SHA256 59152f9a4a1af5cf09f2aaa804c9071afe3eb663
 DIST mtr-0.82.tar.gz 270245 SHA256 f3b457c9623ae03565688a7ffd49d4843a5e2505ccaf3ba8d9fbd86e3ce9b6a0 SHA512 122bc7aafe4441505046b331dcc42347e939fd974ece508dad04a7630904403eaec49ad6b2e483b5a94fc07726a14fad1405306c3729f1dc9b707ea66b529751 WHIRLPOOL da350fa3ee0a84f40a7cf84eec30eceab1583ec270748b593b2e262207147feae72f47d4df1ce1b90168d4b42d29b280c00117f0f244a22e0866f3e5d7aece80
 DIST mtr-0.83.tar.gz 319462 SHA256 4ae16b1eacc4cdf9e635e68bdbb551129223009921bd1c5cc74fc6286338136c SHA512 0a731e593256b755b2a3d8443979ac07684fb910a91f178269ce25afa3f9aa19aad0b35690cbc446e1f757cb22b40aaaba2eece472b95e86c565b3f9e15c3303 WHIRLPOOL c02675d2fa80ebeefc7bb207829c7e06d81c18df47cd83fad0693c65b5ddd3259ea58b59ffc7a9d7f97613997e9adeeeeb776d441845d3700424cd085750e125
 EBUILD mtr-0.82.ebuild 1516 SHA256 979fa88c80572f85149cedeb2d10469de44e64305877d7fb9d2ae795cb01f947 SHA512 a00dc6b2961e82ab15504810282a16a5010e80541fcbe4ad299e0653e93c2147327e112ebf7f9db67185ab17704850c692e565097861a87d2c8556b6c5eade18 WHIRLPOOL 468030ffac6b7e4a8acf76736c50283a5a9252c6d949b6e78938f6487d7f709099f70e1e448bc9a95e24ef35ca5905b202281f7aca0e74357592d4309613f724
-EBUILD mtr-0.83.ebuild 1504 SHA256 a639603bf095781a330fecf5281a27a6015dabc36440da991f930f5c29fb4ddf SHA512 e58a3d8c2ee78e5526cb937a69bfdf206a1082a9d390dda671cd745f76f48d3611694e2d8a269621586ef8d2d3461d33f3a1abd4f9f178c59193ebfa66291b7b WHIRLPOOL a4c79138d1a82cdbe8ef485f7a0697311e0e2f96c146c8d6d5cc56a11696f2f4930338e6fde9148864300401512a4a0d84691b9efbffc865693556edddda8a1d
-MISC ChangeLog 14935 SHA256 9b30022bf845dcf9a9f06b57159a17386f20537215c7d5581512825dee2dad4d SHA512 6f6311287d7d3f6d8751879130b0e64eafbb75b5ccfde0664c9277919559123a8d78beaa97ce4155c27683eb8c57979a5ec32b25c7c32549d2cf7ae843e92765 WHIRLPOOL 33b550626a0203cf3d1fc85429842365a813210813c6331c334f6505bb76597f6ab9e383198e91d8d90809df5d048b335bccadedb7925feb33561df3743bf914
+EBUILD mtr-0.83.ebuild 1605 SHA256 181e4da5da3302f32f042a64603ca20ca7ea5e256d689deca40d99aff438035e SHA512 11b0e08d25349906374e3c639d214a3de051df5368c8580c16583125fa828b5a508790036956de68e44f0c91297d55666fd457d68f1d26b7feabf92d231cca17 WHIRLPOOL 1f81344eaeca59bdef8495522b81250a978df30f41b703096367c9d18ae4666343b8cc07d3769d5ecafbf51e2f4fbf23925aa15b16d3e7030f465b9114bc88a8
+MISC ChangeLog 15065 SHA256 985478b82746ef04302144907fbc1eb33fdfc75e848b5d9cd16a445cbec683d7 SHA512 a4ad592a33ee9d955e0129a78dd6769576040f4d3dbe7638cdd401a85b9f0b9e58a6e8c6302eac0e8fc56a218a72311fb2b955c59097bdc5622af2e9b8ee8413 WHIRLPOOL 2dd77c446b4d9745c4f49ea025ee1644ddb797f297e35d62d866cdc0498edcda66b5af472c31bc0881a96cc2753584bbfa71a2f7e059f648f3c96871c2d5d4c1
 MISC metadata.xml 244 SHA256 4b90774b23e03ba5cfff56d639ba013394dccf7597849fc010e54f69042b47d9 SHA512 1e6d38f1ed92a6771bc35aa6b0c9dd9d6b58308947c2e2ffe06a827cf1ae41c7c570b7e806112e21b14d4a549eeab9f63b8891de0a25f3f5f5c9d42199b025f9 WHIRLPOOL 758fb22a0c339694f8fee0784423405fc3b250ad2d76e37fb6bb0af1376ba6c1b4b55a2956c3b3beac378965c422a159278293f36042267c771785158a09c540
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEj6IIACgkQVWmRsqeSphMynQCdHl+eo3vd4o4XiBll9On5s59R
-6KgAniv7lvmsI3EsvPy00M7NAw3pYaV3
-=4Gi2
+iEYEAREIAAYFAlEk1bYACgkQVWmRsqeSphNAjgCeN+CtDJgmYyxYEAY4gYfPM7UZ
+h9gAoIDS+3dAB2oUroJ00LljLq8T8anQ
+=0fO+
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/mtr/mtr-0.83.ebuild b/net-analyzer/mtr/mtr-0.83.ebuild
index 545db37897cf..19a25fd4845a 100644
--- a/net-analyzer/mtr/mtr-0.83.ebuild
+++ b/net-analyzer/mtr/mtr-0.83.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.83.ebuild,v 1.1 2013/02/19 21:02:56 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.83.ebuild,v 1.2 2013/02/20 13:55:00 jer Exp $
 
 EAPI="4"
 
@@ -18,9 +18,10 @@ IUSE="gtk ipv6 suid"
 
 RDEPEND="
 	sys-libs/ncurses
+	dev-libs/glib:2
 	gtk? ( x11-libs/gtk+:2 )"
 DEPEND="${RDEPEND}
-	gtk? ( virtual/pkgconfig )"
+	virtual/pkgconfig"
 
 DOCS=( AUTHORS FORMATS NEWS README SECURITY TODO )
 
@@ -31,6 +32,9 @@ src_prepare() {
 	# 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
 	AT_M4DIR="." eautoreconf
+
+	append-cppflags $(pkg-config --cflags glib-2.0)
+	append-libs $(pkg-config --libs glib-2.0)
 }
 src_configure() {
 	# In the source's configure script -lresolv is commented out. Apparently it