From df79e2f3a9b520c3ae332bc31595adc59d012969 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Mon, 14 Nov 2011 19:06:22 +0000
Subject: [PATCH] <dbus-1.4.16-r2 blocker is not needed with
 glib-2.30.2-machine-id.patch. Thanks to gflohr in #gentoo-desktop for
 noticing.

Package-Manager: portage-2.2.0_alpha74/cvs/Linux x86_64
---
 dev-libs/glib/ChangeLog          |  6 +++++-
 dev-libs/glib/Manifest           | 10 +++++-----
 dev-libs/glib/glib-2.30.2.ebuild |  5 ++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index ba561da7142f..b29d2eefc8b3 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.492 2011/11/14 08:11:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.493 2011/11/14 19:06:22 tetromino Exp $
+
+  14 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org> glib-2.30.2.ebuild:
+  !<dbus-1.4.16-r2 blocker is not needed with glib-2.30.2-machine-id.patch.
+  Thanks to gflohr in #gentoo-desktop for noticing.
 
 *glib-2.30.2 (14 Nov 2011)
 
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 63a8eaa39db4..35f74827eff9 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -26,13 +26,13 @@ DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52
 EBUILD glib-1.2.10-r5.ebuild 1777 RMD160 eaf01d9d6f1ba55edb93e46f46110b9e9c2fb778 SHA1 dbedf2bc146dcbec47ad308621bf1077c9f735cb SHA256 9d9dd1ea44c25087918148c2ba1203f3b38be09996bd7e48a26f9b4f93405d36
 EBUILD glib-2.28.8.ebuild 7404 RMD160 df5a5f4ee06e7620b6b75a43ea6764e20626b022 SHA1 7a1418dbd1df2b8a6a511e781532a19ebdef6b63 SHA256 e21a8482d3ece513afb5620df8838f25e4b5adbd2c7e6d006e864e755d69d702
 EBUILD glib-2.30.1-r2.ebuild 8500 RMD160 cdd21e95f08c66519e465d1256a06598336ddce8 SHA1 6f5e61fe6db1bdee51ac41064a12595e97b7c863 SHA256 4f726a1fa65ba97ead4dad236729feaa78e14514de5c75d35cae0adc81af1e20
-EBUILD glib-2.30.2.ebuild 8538 RMD160 d94264260a41a510505928a41f90223bfcabd8b4 SHA1 2ab2b0b54c340d78432562ce3cc38c7aa1c42102 SHA256 4b8e8654da3f1926e36284a2d6b1abb23139ba2b0f0a3b78a0da701c252998a3
-MISC ChangeLog 65820 RMD160 8a633cfc3329cf65f4a9e8897625fe98b8ce9014 SHA1 7fc679874e0bf362d304a173a84d2b16cf91a7f9 SHA256 f8b881bb58199dc583ae4296e6ba5f7aa8672bf0e7564f1fae8eb92cf712785c
+EBUILD glib-2.30.2.ebuild 8511 RMD160 a6d0afad8446798eb4b0e9b9125cf3f7168420df SHA1 6e18d71dc515af6365df66cd47b2b73c85510645 SHA256 930bdaf2202228187aa7073551a5615c1e75332dbe08663a3dfc68be25377472
+MISC ChangeLog 66028 RMD160 143de17e3fd4e4ebd9f199c589c19bd0e07ea3e8 SHA1 056199427ad0343ef96d290b513b7092d15f4d45 SHA256 bd552b51aa570dac98b39fc40a0a0f59b680763812b29421ac783c7d1919e72a
 MISC metadata.xml 497 RMD160 447ae0d07ac529dbe1830e383d2ef4eae7359ea7 SHA1 4cb36fafa32d53a0dbeec978b0d75f4e7acb3fa0 SHA256 a1840f7e6af57edc9fe5b54deae9e2083858d27792fda3f4e1e8e04624b17d0d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7AzSYACgkQdjK8w9WeBnCNMgEAh5V6dCOjds3abwhpMA+mwEgn
-G0x6es7s1FRStkjPhksBAKtWyddV5ImM/zSrQjHCNfVuHEk1pKMmskYAn8kiBSTb
-=ps8V
+iF4EAREIAAYFAk7BZrQACgkQdjK8w9WeBnAVsQD+Jxx64lpbYD7iQvIoWmY3BKNs
++/LvanvsundHgs/LkusBAKzu3e6ilDvWjDgzuyqtCFC3wFPVqx/ec/9Grln02Fwo
+=A9g1
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.30.2.ebuild b/dev-libs/glib/glib-2.30.2.ebuild
index 1cd241938a05..95aae9df6a9a 100644
--- a/dev-libs/glib/glib-2.30.2.ebuild
+++ b/dev-libs/glib/glib-2.30.2.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/dev-libs/glib/glib-2.30.2.ebuild,v 1.1 2011/11/14 08:11:12 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.2.ebuild,v 1.2 2011/11/14 19:06:22 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="utils? 2"
@@ -38,8 +38,7 @@ DEPEND="${RDEPEND}
 		=dev-lang/python-2*
 		>=dev-util/gdbus-codegen-${PV}
 		>=sys-apps/dbus-1.2.14 )
-	!<dev-util/gtk-doc-1.15-r2
-	!<sys-apps/dbus-1.4.16-r2"
+	!<dev-util/gtk-doc-1.15-r2"
 PDEPEND="!<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib
 
 pkg_setup() {
-- 
2.26.2