From: Mart Raudsepp <leio@gentoo.org>
Date: Mon, 12 Mar 2007 19:35:08 +0000 (+0000)
Subject: Add glib dependency, bug 170563
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=501b1002fa6e6c76d9a047e2dff65212929e416c;p=gentoo.git

Add glib dependency, bug 170563
Package-Manager: portage-2.1.2.2
---

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 81e622ad2c02..5f5deab64983 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.87 2007/02/04 08:48:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.88 2007/03/12 19:35:08 leio Exp $
+
+  12 Mar 2007; Mart Raudsepp <leio@gentoo.org> libxklavier-3.1.ebuild:
+  Add glib dependency, bug 170563
 
   04 Feb 2007; Markus Rothe <corsair@gentoo.org> libxklavier-3.1.ebuild:
   Stable on ppc64; bug #164978
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 3f34ea69b87b..ee36eca2da48 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libxklavier-1.14-werror.patch 1189 RMD160 92529e908cb97926227ae1f9cf62e69b8d4c7b05 SHA1 2acbefd8a206e5df44ced85a4f7f60c8ff541a00 SHA256 1397df8a206d2f1ea1878694e7113831d040d8665ea0fbee6a291b31bc0cc7bb
 MD5 dd5b95ef05fbd2d67d79ce2053a1f4a2 files/libxklavier-1.14-werror.patch 1189
 RMD160 92529e908cb97926227ae1f9cf62e69b8d4c7b05 files/libxklavier-1.14-werror.patch 1189
@@ -38,14 +41,14 @@ EBUILD libxklavier-3.0.ebuild 1235 RMD160 87b706dc3b434845f7a1308555a2a991a96882
 MD5 875fbdb48d950ced35936b44e569460a libxklavier-3.0.ebuild 1235
 RMD160 87b706dc3b434845f7a1308555a2a991a9688244 libxklavier-3.0.ebuild 1235
 SHA256 dbb575a25af2acc77ba04ab58ca0aeefc8dd1c19c6010f3b68e121b1c0f1d8cb libxklavier-3.0.ebuild 1235
-EBUILD libxklavier-3.1.ebuild 1332 RMD160 391d63a061ff472ff862cf0ba942996cc2e4d26e SHA1 0b55942399d6d1f5205a5690fbebf210cfcd23a6 SHA256 68cdd417d743e85ea8761d4c6f97130fe7d93a54ec81b7b56916c1b496e402f6
-MD5 ab4ca56284498732da56b57871808dcf libxklavier-3.1.ebuild 1332
-RMD160 391d63a061ff472ff862cf0ba942996cc2e4d26e libxklavier-3.1.ebuild 1332
-SHA256 68cdd417d743e85ea8761d4c6f97130fe7d93a54ec81b7b56916c1b496e402f6 libxklavier-3.1.ebuild 1332
-MISC ChangeLog 9806 RMD160 7cb58cb008425f0590980eacd142b0aab39a6605 SHA1 41a2d2fd3cd70d90f0697dc66e73135b9d03ec95 SHA256 0c9d7666e6e8e1878ae73e3317cad9f419213fc7018a012b507516a1f1214652
-MD5 034f7ed54c0a1d63645ba5d2f923d7b6 ChangeLog 9806
-RMD160 7cb58cb008425f0590980eacd142b0aab39a6605 ChangeLog 9806
-SHA256 0c9d7666e6e8e1878ae73e3317cad9f419213fc7018a012b507516a1f1214652 ChangeLog 9806
+EBUILD libxklavier-3.1.ebuild 1351 RMD160 c755292c959dafae6ee6c5fd597e120281df71ac SHA1 f6b6557ef9483776de88f7037f1aeda1612778ea SHA256 4ab10c06ed5145742988d7ea99afa40a09af697b04ff1b5fa39a5c36201658e7
+MD5 f85d7891b521e1c077e25bb3473aabd7 libxklavier-3.1.ebuild 1351
+RMD160 c755292c959dafae6ee6c5fd597e120281df71ac libxklavier-3.1.ebuild 1351
+SHA256 4ab10c06ed5145742988d7ea99afa40a09af697b04ff1b5fa39a5c36201658e7 libxklavier-3.1.ebuild 1351
+MISC ChangeLog 9909 RMD160 2a4ec1676bf293119ff947677c96764006406adb SHA1 d1270063faca8e31483a27ab23a5ce59b56bf65a SHA256 7d45546b50cc822a0e49e6aae1bfa9214853bc8b47e3e25a76040e3940275cde
+MD5 5bfeb7f4fd819f5ca65858f137efec04 ChangeLog 9909
+RMD160 2a4ec1676bf293119ff947677c96764006406adb ChangeLog 9909
+SHA256 7d45546b50cc822a0e49e6aae1bfa9214853bc8b47e3e25a76040e3940275cde ChangeLog 9909
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
@@ -68,3 +71,10 @@ SHA256 5c7a38e1255f7b35228b7e8fe410e8b08607120bb4cd19ec0a990888c6d2c2e0 files/di
 MD5 d7e1ff7e54fae694010a6bf5117dbacc files/digest-libxklavier-3.1 247
 RMD160 82c316cc06e235f1f8d613f1d782a084659ed1da files/digest-libxklavier-3.1 247
 SHA256 aaa383a3cfc79cb33e1c78a05daffd7ec739cd88ace23b2700c6d808d767be2e files/digest-libxklavier-3.1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFF9asekeYb6olFHJcRAlHBAJ4o+AghzwlcNEjVFJp4mbWOygVWHACgktDm
+kSZk4wtXcIjyrGsZiMUwz4E=
+=bPkL
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/libxklavier/libxklavier-3.1.ebuild b/x11-libs/libxklavier/libxklavier-3.1.ebuild
index 9928bb15483c..01f7dd2b8be8 100644
--- a/x11-libs/libxklavier/libxklavier-3.1.ebuild
+++ b/x11-libs/libxklavier/libxklavier-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.1.ebuild,v 1.9 2007/02/04 08:48:24 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.1.ebuild,v 1.10 2007/03/12 19:35:08 leio Exp $
 
 inherit eutils
 
@@ -22,7 +22,8 @@ RDEPEND="||	(
 				)
 				virtual/x11
 			)
-		dev-libs/libxml2"
+		dev-libs/libxml2
+		>=dev-libs/glib-2.6"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -35,7 +36,6 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-3.0-libxml.diff"
 }
 
-
 src_compile() {
 	local xkbbase