Add x11-misc/xkeyboard-config to dependencies, bug #538000. Remove old.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x2324E7B566DF2611!

4 files changed, 30 insertions, 30 deletions

diff --git a/x11-apps/setxkbmap/ChangeLog b/x11-apps/setxkbmap/ChangeLog
index e5464a6452f9..f78d8b3b1755 100644
--- a/x11-apps/setxkbmap/ChangeLog
+++ b/x11-apps/setxkbmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/setxkbmap
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.67 2014/08/10 20:07:25 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.68 2015/02/04 17:29:52 chithanh Exp $
+
+  04 Feb 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  -setxkbmap-1.2.0.ebuild, setxkbmap-1.3.0.ebuild:
+  Add x11-misc/xkeyboard-config to dependencies, bug #538000. Remove old.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> setxkbmap-1.2.0.ebuild,
   setxkbmap-1.3.0.ebuild:
diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
index 0bedd0faef77..37eaf534409d 100644
--- a/x11-apps/setxkbmap/Manifest
+++ b/x11-apps/setxkbmap/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST setxkbmap-1.2.0.tar.bz2 112465 SHA256 999591bf1ba8ca2a7d480b2c01702396e6c349d499fb583c0de136ec00dbae39
-DIST setxkbmap-1.3.0.tar.bz2 125844 SHA256 3d305c9d1f38224169b2e501ef0665cc3ab52d4dbc2b9a60c9dbb047f77ddec6
-EBUILD setxkbmap-1.2.0.ebuild 495 SHA256 1ab0d8cbb533677255aea8253bc363cd34c9c29ffecc49d7e74f20dcef845d63 SHA512 55c2211cf188c6e59d7cdd8588245488383f4f5d311c12a520bb91eb067d44f1b313a85853c3fcd47521dddd76c43352ee2b6d251109a078969c5efc3bef525c WHIRLPOOL 52fe7dde7f854558258bee4d90efebb0beacb47dbba823fe28d36aa1d9bcc19e17b495ffe830aebbb69f4c18eb27488bcbd1d8f64ea98e49c689754c8ec512f9
-EBUILD setxkbmap-1.3.0.ebuild 507 SHA256 53e5fff6b87676c7722c5b9d63f1a58af66b2413dd4685abf7547e0ab1f6c3e7 SHA512 9bf7511bdbc46d91eb1eedf45d30310c39aedf0c20ba52afbe7137d0b1f4d6ad08abb671356a44a256e7ef7e9028d0d55d2ce4eac0e569122f7643135f0794fb WHIRLPOOL 196e33d3f5a8bbbffa6a3e349b6d161cbf36acc6784709e728df40265154721ec867a71f2beb9effa5c06a0e24be879e29d95836c5534d70b6a13228a73bc983
-MISC ChangeLog 8057 SHA256 b7fe210d318e51d985cd304bd3d76bdcc8c4aed1e9fa2c43eab21657fa0c0a07 SHA512 e7bf81cc43b7bc6f5103044242745ec01807cd1c27a4b7070c28d26031ca24e6ef892dffa867cd666bbfebd31004112923f2985a819cc8ca35035d89c20d01b4 WHIRLPOOL fdd87b7afeac398e6c83b6a86e9a0333a3588cd9987da75c78bf60b730897648a4bb7fceb13bc3204f3e4c94203d2151ccff83dc0e6aba8ae4bafcb67b8cc7bb
+DIST setxkbmap-1.3.0.tar.bz2 125844 SHA256 3d305c9d1f38224169b2e501ef0665cc3ab52d4dbc2b9a60c9dbb047f77ddec6 SHA512 d4843485f44a9204d1aa8bf16b3ad661747be119b0b5f38ced74dc35773519765af07fd290ab0265766de6206138e085a775bfc6edae6a232f2da9c260c0b581 WHIRLPOOL cbe29496b115c0963cd44634640659921136f3a6372f1c7bc7cffebf67ee7be86471afaa4d80475eb9e12921a6ebfd3250b509cba4e5c0a1dd560105d06e5e20
+EBUILD setxkbmap-1.3.0.ebuild 536 SHA256 221e9bfec42651926112ccd45f9d3169128abfaf1d22fa1bb0c96cf0fa0ede0f SHA512 c6fa5b0fbc24766da0bc6b2a8bc0534915df3718a5b17cc1100a32eef33605416df68df4be3d6dc3dffd770dd20aabf165f7788da49588a2cf910f85e97afdee WHIRLPOOL 90fc72db5071f230047debcb4d3ab9bac2e511906b42d2fc479c634735c1386486b5cbd707d8638ff212eb32e1f6b85158aafc0cd4deb7b59b1601654cb96ace
+MISC ChangeLog 8254 SHA256 9557dcd88934665389ac88cc9116b73df1b142db7ad9e802045621701a2551a6 SHA512 82fcfc99f9836e75aa6150fbbd54072186620b18a0306a0a432e9353b0762b0866778da790b46bd3f5610a480f33032dc0dd2296e0892ded6d7140cf240d6950 WHIRLPOOL e3406c456fd386b52c7b6b659fcb555ce38c26c17afa35fec54d75be4c27eefba2acfc518d96667f4f9836d5bcdf7193a306a62277abca19a39f04ac1697ae32
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPn0P4ACgkQcaHudmEf86qepgCcDKxuZ7bDyIvfO40HBNUJ3Agm
-RwkAn3qsQtkC+llew9y2+OoQ66waHHHz
-=zXXn
+iQJ8BAEBCABmBQJU0lcdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRX6gP/iGemRUNzfK0tKKhOm3T7bQF
+3DOadkzIfqm8kF1MrYkhBO1pQQ7DB0gccVBFsM0yqxSWXMVy4KcF81F66UR6K6T2
+qAD855tymgKRJmSgo747iipl/4S8xEIbFwXqdfKKL1SCvAXrR7FCGN03npbRyCGj
+bdxxSvWcOxGaJ2WHFYk4a1zPjbRGY/A8BVyFrRnlyoMET4DtPZdQfUxspg/Bwg0n
+vEd6Jus3faQPgKqBO4f5zEkbDf2KCRzHER4LUUI3f4uOidCe5MQwJmVDjVc3dOH6
+rIMx4ov6zi7dBUOFCjkIhYbHqKI5qJtgOwBnR8Bz3Nd+PpfZFAhJEDBtuQln2SeA
+K3a4xfLlbvktSYBroRcLU3sUIuEpQvrRmApB2aXQN5TzMuMQHschYy/Y2kBsJx6X
+aBhOj9lRNsePBrS0U/yUDGGmkEUoDGlFHsUV7wlb9pTl+yAtVcPK6VQk+R0VwSn8
+xn2KOAt3yZ+TTuJj5jIAoapuZByJkHvOseWj+XfEMAB/CoFYfJ6F7ne6S4mggLBH
+Bq6xE6vyyYdiaqlpOyD9sysIvXyJwnd7IHujYOqH7eFIIxdULhObliRR+5zD12MP
+z8UmB5rclMidCLjESNBi8tyUa3BzIiRZQ8pzEMk0QLpAbHVz6X3JPYtUgPP3n9ps
+99iJdi7nM/+X9Fq+0kPn
+=q+QK
 -----END PGP SIGNATURE-----
diff --git a/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild b/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild
deleted file mode 100644
index 34c2f9f36f4c..000000000000
--- a/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.2.0.ebuild,v 1.10 2014/08/10 20:07:25 slyfox Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="Controls the keyboard layout of a running X server"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-RDEPEND="x11-libs/libxkbfile
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
index bcecf0133dd7..a3695915f16e 100644
--- a/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild,v 1.10 2014/08/10 20:07:25 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild,v 1.11 2015/02/04 17:29:52 chithanh Exp $
 
 EAPI=4
 
@@ -10,6 +10,7 @@ DESCRIPTION="Controls the keyboard layout of a running X server"
 
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE=""
-RDEPEND="x11-libs/libxkbfile
+DEPEND="x11-libs/libxkbfile
 	x11-libs/libX11"
-DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	x11-misc/xkeyboard-config"