Update xkbcomp dependency to >=1.2.1. Bug 375547.

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

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index 29c5cdd6aab0ec18a4b99aea8dc3e26765c0f6ff..b1843587323727e4966f06ef6bda6e98900d7e8d 100644 (file)
--- a/x11-misc/xkeyboard-config/ChangeLog
+++ b/x11-misc/xkeyboard-config/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xkeyboard-config
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.134 2011/07/15 17:02:49 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.135 2011/07/30 02:44:37 mattst88 Exp $
+
+  30 Jul 2011; Matt Turner <mattst88@gentoo.org> xkeyboard-config-2.1.ebuild,
+  xkeyboard-config-2.2.1-r1.ebuild, xkeyboard-config-2.3.ebuild:
+  Update xkbcomp dependency to >=1.2.1. Bug 375547.
 
   15 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
   xkeyboard-config-2.2.1-r1.ebuild:

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 16a488862a25d54aeb2683b862865f352a748d23..4b58f776c145449be0efdd394306decb9eb09d28 100644 (file)
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -4,17 +4,15 @@ Hash: SHA1
 DIST xkeyboard-config-2.1.tar.bz2 699368 RMD160 235b20c991666a45f1af6d76633679e6eae08d81 SHA1 4e96e0704b2a17b291f98b2240611390e7a99f9e SHA256 f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075
 DIST xkeyboard-config-2.2.1.tar.bz2 739766 RMD160 f9e6147e664a8834b49ddb36eb553c49c81ffd65 SHA1 3962f1e92e9defb0382ce46ec0cc86cc30ff897f SHA256 642feb6e39096be1e081c5ba952c93fdfd93d41355dd6f88c20458a8251c6bd0
 DIST xkeyboard-config-2.3.tar.bz2 771953 RMD160 a89d10bfbab88c8c1f1330bcfe82cb38f32918f8 SHA1 a49c4cce9cfb7003aa04a32114f369c6bd7a9077 SHA256 d8a5dd169adca52dea3f751b99c500608c05894d759102521fd4ea9e8e284c80
-EBUILD xkeyboard-config-2.1.ebuild 1096 RMD160 c5659abced30f58c52542455715d7ae02231d884 SHA1 cc4d14382573b669e7a7f0a03f8afb15b7547859 SHA256 96895129730c0e4032d703d5260ad204e91a505b755d217c642b07bf8ebccbb5
-EBUILD xkeyboard-config-2.2.1-r1.ebuild 1328 RMD160 bec0c2ed5c66fb87a57e1b397d8b03c5637ee1cf SHA1 01b551fa5e517df51105dce98d0b8b004475327e SHA256 e628b80b9a367d2780cdd692e421c8db1fefe6c86d43091a0bb4a81dbccfadea
-EBUILD xkeyboard-config-2.3.ebuild 1342 RMD160 c1ea58006a7abfb2c0655094b31a954e4ef8a7af SHA1 2245139cb3027fc01200e7e24477fc9c7b1b22db SHA256 0bcf124438485368602d7a91d2205a972ca4c9e5589115f1056d51c383ce3ff2
-MISC ChangeLog 18865 RMD160 259bbf4976c07251164c1a9b7c958b8a3b10e07e SHA1 373f8263a8b72b065fa4ccd355290a2768aee0a3 SHA256 036ef70af76b82a05654f3cb6e4661967bab96377f9a9291bea3d0d818624a62
+EBUILD xkeyboard-config-2.1.ebuild 1103 RMD160 155ae87d8c1f97ff4d1f32b842a5421ae7fc0e0c SHA1 ef50975ed8e526f9fead4d47b6ffa22714da5023 SHA256 e73a3bfd0f395673a779fd2dcb59379221eebb91d2451798d74865a27fc90020
+EBUILD xkeyboard-config-2.2.1-r1.ebuild 1334 RMD160 c7d1b60830c370e7d81b4ac1c20f925cbfb25d48 SHA1 e223aa5b78589a17df2499e08828792bdb0689a2 SHA256 5b62d2bc959ee5098cb1bc98a70cdb511b98e13997d4d0ff81dca609f81ab08d
+EBUILD xkeyboard-config-2.3.ebuild 1353 RMD160 103b477bed086268d912fcd61721283ed8773173 SHA1 2405c8f5b9c67614cdd42636410c02316771a6fb SHA256 a8d1ccd224dd351219c8b68e1f2dd8cc52592e78b43680cba736b8abb3a0aaa8
+MISC ChangeLog 19059 RMD160 624474ba389699660a6fcc1bbeaf05ead70498b5 SHA1 aa3d5cee439885096f22c72b4be00cf5e21c66b8 SHA256 701081257603a0bcf9c73d2b08a10987539df27e3786f3de5ef7a90fd44fccfe
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4gcsAACgkQIiMqcbOVdxSy8wP/cd1gPZXLHSZU6XxogObX4J0m
-KQdSUWqadGaMnJqsXLij422uD3BGU8ObKlChL7ak3ZCGu6v8OYXVNvRlgsjc3jGh
-u9K+FUSXyX9WyBxjGXz4TqrpWvNhHGFc5d05l0RIzZqWdZOrZ2aGhfZDg/FyE5CQ
-P6eDMIP5H2kpJIps1qc=
-=NA2o
+iEYEARECAAYFAk4zcBkACgkQTVUdg23rv53GkwCfS4eIsbTrBfoenPTBZ9YTmuRz
+gpwAnRV+0Npb6qJ2oum3nGZ7hoMmhdaS
+=Vxk2
 -----END PGP SIGNATURE-----

diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild
index 86cb397c92c6b5ed013a0e38abf4cc7222b9bd3f..5b4d16222d20a7965b563a54744c2a412cb913b9 100644 (file)
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.1.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/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild,v 1.11 2011/03/17 17:48:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild,v 1.12 2011/07/30 02:44:37 mattst88 Exp $
 
 EAPI=3
 
@@ -20,7 +20,7 @@ IUSE=""
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="x11-apps/xkbcomp"
+RDEPEND=">=x11-apps/xkbcomp-1.2.1"
 DEPEND="${RDEPEND}
        >=dev-util/intltool-0.30
        dev-perl/XML-Parser"

diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.2.1-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.2.1-r1.ebuild
index 737e44e4109bbf9634850366510d70cd9770d8eb..d5235a6c3335abd18e4e364326a96f3954a6deb4 100644 (file)
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.2.1-r1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.2.1-r1.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/x11-misc/xkeyboard-config/xkeyboard-config-2.2.1-r1.ebuild,v 1.8 2011/07/15 17:02:49 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.2.1-r1.ebuild,v 1.9 2011/07/30 02:44:37 mattst88 Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ IUSE=""
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="x11-apps/xkbcomp
+RDEPEND=">=x11-apps/xkbcomp-1.2.1
        >=x11-libs/libX11-1.4.3"
 DEPEND="${RDEPEND}
        x11-proto/xproto

diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.3.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.3.ebuild
index 6c4c4afc15acfd7457cd93beb3f6e684deac9ca3..f3f667988bbef83cc2abc2f593a3297cb5f9c28f 100644 (file)
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.3.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.3.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/x11-misc/xkeyboard-config/xkeyboard-config-2.3.ebuild,v 1.2 2011/06/14 07:14:38 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.3.ebuild,v 1.3 2011/07/30 02:44:37 mattst88 Exp $
 
 EAPI=4
 
@@ -19,7 +19,7 @@ IUSE=""
 LICENSE="MIT"
 SLOT="0"
 
-RDEPEND="x11-apps/xkbcomp
+RDEPEND=">=x11-apps/xkbcomp-1.2.1
        >=x11-libs/libX11-1.4.2"
 DEPEND="${RDEPEND}
        x11-proto/xproto