Version bump. Switch to EAPI=5 and drop old.

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

12 files changed, 20 insertions, 651 deletions

diff --git a/x11-misc/xkeyboard-config/ChangeLog b/x11-misc/xkeyboard-config/ChangeLog
index 7705b58bb1ed..aa61b313c616 100644
--- a/x11-misc/xkeyboard-config/ChangeLog
+++ b/x11-misc/xkeyboard-config/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-misc/xkeyboard-config
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.179 2013/01/04 18:03:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/ChangeLog,v 1.180 2013/01/30 14:11:11 chithanh Exp $
+
+*xkeyboard-config-2.8 (30 Jan 2013)
+
+  30 Jan 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkeyboard-config-2.8.ebuild,
+  -files/xkeyboard-config-2.4.1-extended-function-keys.patch,
+  -files/xkeyboard-config-2.4.1-shift-backspace.patch,
+  -files/xorg-cve-2012-0064.patch, -xkeyboard-config-2.1.ebuild,
+  -xkeyboard-config-2.2.1-r1.ebuild, -xkeyboard-config-2.3.ebuild,
+  -xkeyboard-config-2.4.1-r2.ebuild, -xkeyboard-config-2.4.1-r3.ebuild,
+  -xkeyboard-config-2.5.1.ebuild, -xkeyboard-config-2.5.ebuild:
+  Version bump. Switch to EAPI=5 and drop old.
 
   04 Jan 2013; Jeroen Roovers <jer@gentoo.org> xkeyboard-config-2.7.ebuild:
   Stable for HPPA (bug #440872).
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 95c14e4ef659..8688f47a8d3b 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,32 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX xkeyboard-config-2.4.1-extended-function-keys.patch 8001 SHA256 04c46922f2b495016230dbe8f4b85e4e5f520eb0dc649ab170039fda85120497 SHA512 82c320ffcf4ba58fa2245ed87bf65e0987733bfbe64159ccbd6682de325bcd4a9e5a3d2d3e0c07faf354d7f7f7cf235d6c3cb4f870bed28e7fcc18fbeb66a729 WHIRLPOOL cecba18a4f1e8e96d72cc832f4969e3d77bbda375e43f2a7be3d6489302ad5d0cb0cf083da40882719db2d1cc762bcf7708a8468d1da5bde4289775bd0f9ee15
-AUX xkeyboard-config-2.4.1-shift-backspace.patch 1397 SHA256 b789e3fab3c4581f0b87a26ad4b38248cc6c69db48bd8a074b3289157f6b055e SHA512 9fd254d8905c7e6f67bebc5e2fb5a84172e6a68bac9ce2036615e36d9263d4d2ad9d97f8a43f21d8c577e075b56ddf732edda27cc072aab9d26fa587486f7025 WHIRLPOOL 408ec002b1d3c7734c9e0d07522aa6c20ee74ef2d6e726d1c88dcc3210cdaf8591cbbc14359ddcb0ccd41b987340acb66976dfe854a044203982dafad6023a39
-AUX xorg-cve-2012-0064.patch 2492 SHA256 4a06188c20f4707afaffd95663d0277541c790eb34907e7ac0cb96202c003afd SHA512 1c26d589165ec50619a107331902362797b3c3139eaecb2803d4bd7ee98a58279b39b61ef082258877b483e45ac5ab615b53391402798dda0d933fb2dedceed1 WHIRLPOOL fba8feb330cb242457377664a25026f5f23b727bf0b4f1289d6ee183c98ea3516c259958dd0bd33192f808d3fd6358fc9ccfae6b00ea7327e82349e3c70416eb
-DIST xkeyboard-config-2.1.tar.bz2 699368 SHA256 f9ee8340f2afadd2397aa4402eaf854da3738977accdbf147bc47c1cc99a3075 SHA512 2c3c310d21df4882ad2a25703a921577b81fe33433fc9e597b1ae72f8531b39e80014d3fcb165fa37e88a929a73f2dde9fc4b0c51e006d7253f4ce38bc87cdd2 WHIRLPOOL 002fdc275b2ba166c5ae2567f977332deb8bd12a3c5b4b72b0d3c8802c83fd8fe418b0fdcbc9d3b65b140e8c8728c5fb00ea79d723cc2c218c66f48f894897d5
-DIST xkeyboard-config-2.2.1.tar.bz2 739766 SHA256 642feb6e39096be1e081c5ba952c93fdfd93d41355dd6f88c20458a8251c6bd0 SHA512 ffcd5d6c65beb05c26244538d6d86b26527b484b41d6bcbef22fc153ba2e1c07d842fc6e4493f3969116f8a5897b42748d3d732361fe4f1b08949008e7e51414 WHIRLPOOL ed88a0eedccb1149b2d2d94a83ab1a5eace276916a50c17c65d44359b0958fc673530f45c7c2ab1c9b1501d5be399427dfee56f35c889e7674dce5ac2369efbf
-DIST xkeyboard-config-2.3.tar.bz2 771953 SHA256 d8a5dd169adca52dea3f751b99c500608c05894d759102521fd4ea9e8e284c80 SHA512 d6ffd14f45a98f6beae2fae7ce0d3457f6afe78621e7c01b7e2994a3dfaa42109eaa4073fda695e4568c8e33fb1b3c06da1336f9d1530e328305fe2c7cf1bb5a WHIRLPOOL 5161ca2095b346adc9b54258845589c9da88b2e5fb2719f4ffc57c9905127ae74af01f80e8afe80b93d9b6b328ea3ada2a267666138ed882fd4d156c6690fef0
-DIST xkeyboard-config-2.4.1.tar.bz2 813373 SHA256 f048bdd6e3d71c621b5a47a7ee72d691eda1922e0e07808b157b292e0c857a0a SHA512 3c4de68c7c2a7fd91b183198f59e8b0ed96770489531f72015a9c8fe42dc3d0a81002fd0f4f4ce1c616e4f1fdcf1868f4057f1e0f9d1685d4ec7b74148b9b9ea WHIRLPOOL a411a1b34a566127dada34f181ca60835194f9b2fb6d0024c0f476c2c449c74ef58238d0c259b63b09fb206a3355fecdd0ce9a30eaf01d5f12607b926612d8c8
-DIST xkeyboard-config-2.5.1.tar.bz2 833871 SHA256 eb80e8dc38c389728bfca1f041af7658e7dd67faca8c763de02d5014ffd2cc92 SHA512 13fca591b2f3e6d0d98477b250d8027e16164ffca0608189bda980869a5d182937dce690e341e4525184b52d912a6a54c09a81a7007caabb42ef61aaa1dce2f4 WHIRLPOOL 7de8e453a378e061662187e44f527257bd63186db8bf50451e3f8bfafe720d0171b1e3e672b149360dad50126a21eebd1ef77aa7dc599d66ad755e3e4f5b5a50
-DIST xkeyboard-config-2.5.tar.bz2 835731 SHA256 0f50579d34e56d817a1bf7ff26582984dd7262209e9e74862237cfae5a7a2961 SHA512 36691d609dca6dbc5eac75f80e81721dbfc869baabe50a3f2b81bc6b9f0d87404ab137799d6bb4dd8a69a46e2dd67f0f8e6ab46b3da0b76cea9db7905f974ec4 WHIRLPOOL 950c40e48ab2fd00322c5e90705cd6b11b168b01de917f181a732ac1ffe5347c5bc8a9d2233d4ac1e7cf4d0e1af7455ac60b9fa36a56fcfa0fadaaf0e77805b5
 DIST xkeyboard-config-2.6.tar.bz2 857799 SHA256 22a1594116bf0ee3165f48487bdca4e5f25b2a1436e35e188b3ee38c543dabda SHA512 bff7bfdf389f6a5818fddd53e0ea37ac5686797b9df2339c5dff444d240c389581cf817b09150445577eb6434a7b4a754801b386c1757750dde01008852f5995 WHIRLPOOL 3769834371c710d79d45af9c9085692f40186ebdc0bbabc84e4c8f7ef62d317ec7d6a5466b0451f1e2b4852d503cccf36f18f1a790580459f22cfa72153a0ca1
 DIST xkeyboard-config-2.7.tar.bz2 866845 SHA256 e43478a12fb0fe6757a7bad3a04fd3747ec53e53d5af22a9d9829dfb9aac8321 SHA512 c4f25256542c5bfb5959275b9fd822a32bc8a3d1470c025ce801e96c80bcfc733e6e41e2b04dab4988402d4fafb77cb811c653e937926cfea27bfd3a701be050 WHIRLPOOL 8fede211c26f2c0527d5b21d0e65e3275269414d38e81a10220ae23d3e415075c4bd0c550b7269e0031309490e3c427c12cb4e1f7f6c3ed584e7264dd27a5525
-EBUILD xkeyboard-config-2.1.ebuild 1103 SHA256 e73a3bfd0f395673a779fd2dcb59379221eebb91d2451798d74865a27fc90020 SHA512 15f9ee4f00314148fb602a25016eb2d3d63e06bbc9f5f315a8fe11c44ab4b36ce1d98dabaaf3424a619279fbac590d91fd1bdb98102e41d36bd3910d9b7461ac WHIRLPOOL 870945ddce3fe84897f997f27a4a1891c598bf9961648738b14c1ba3bc808d383d0fa5e8a2faa7862c653c621d2da9bfda8dd0d565d7eb09677b23bc1a530543
-EBUILD xkeyboard-config-2.2.1-r1.ebuild 1334 SHA256 5b62d2bc959ee5098cb1bc98a70cdb511b98e13997d4d0ff81dca609f81ab08d SHA512 88915bc27db0ca0a3cf36923384fe3346ff2926f829cd7d886897ec4cc2b664d0661b36f2e14c266fa9123984203e300fd58737c9b4d84e74b85eca82482617c WHIRLPOOL 89effb25838e732cda2069460eeef4c19568611f09cda91a05ae2afb446616a161cbacb01d6e7bfd7d2a60f67453b13d2f5581b1d067591443508fbcb752f170
-EBUILD xkeyboard-config-2.3.ebuild 1340 SHA256 57a04ac5d1a22c5e93bd93ffe1f91186969cd407039bab55145d5d86214b103d SHA512 f6b65cde09ce048f8475e8c01c470091fcc5e3f30b25da5abbd06b8ad0e56425e7709496150367e4ae3846dcfc04d6f439b406fa0c4162a93828a44ec2868ea2 WHIRLPOOL 60889c5bc5428aa84f9c08257ec95ccea6f95f6180a10663bc9b885ea7acccd8511ed186c5873a1a2604ecd0e3bc6b91a8a236e6dea6802107ce1320b56a0da8
-EBUILD xkeyboard-config-2.4.1-r2.ebuild 1452 SHA256 a2ead96add86dda72e9c0d74ea25d522ed5c8db6a04c8700c9b640bd8def181c SHA512 e0a18fa30d09648f48c1c8841df6825b01f5804713ce206161e0d045739516c22a28f01a73cf865534b5412fd8988fd73b8658f8ac1b29bab5a55dfd0638353d WHIRLPOOL 6763e5bf4c8652d7372439164f3d119ca62e9b66140862dfea423957555ce95bfd17e08764edc6c87b059263815a78c66d9be66da6f82ff411148ed7e8464b64
-EBUILD xkeyboard-config-2.4.1-r3.ebuild 1483 SHA256 48ddf55bb52aba5df24c1c3b26cca036a9ff0dde3bc320c601cbf4df9b3adff8 SHA512 3c95895813a2cd347aa6867f11b6bd571acf386b1c0a39a44a0c4512f5607e7310a07ced02db527c43b574dc7f623f21a08b11290bfa9f9ae9eb008ac4c7b4be WHIRLPOOL 9b2aa334af261d84ef5ae5dc300de7d9604d14ca67391ae811d3c73b0d8c1fa7a0c3b8c26d2651b3708f3e2709a7c0d72d92d8cdef3cdfbfbeed96929749620b
-EBUILD xkeyboard-config-2.5.1.ebuild 1342 SHA256 951a28517e3b8fec15ed2a3cb2dd7888292874b9996063cc896e58ab13db4583 SHA512 854469242317eb7479b655fc1a70b70c5588b0fe512ff7c19b1d863608502c56538eaa688cdb6641476b6feda7617ca831a197be786a77d14db742fb5ee29fe7 WHIRLPOOL c0929487c2f81be125740928133d8b430e87c351f43be1be191fe1efbea22e4c2345ac767198afbbff265666cb916808168210b9ab01828009f56435762d01cc
-EBUILD xkeyboard-config-2.5.ebuild 1329 SHA256 66525a716dff858defc11a89e59ca9570e3e7b81f129539dff2f1b888a3988f1 SHA512 8b7511ea1a3baaf2f7b7e6b31e012bf06df5210d16a9675ed829df1dfb88e2a8c850bbe43e03471985953aa893349711ba08a4d76c845da5a62ef8a9bdecc4bb WHIRLPOOL 764dc045b4785e9fc3f7520adc795c92ac69eddc6a782d1487880396e5dda070142885ed71e887d9deec5af74bc3805303f86f35a191256544f0189ad0b43ba2
+DIST xkeyboard-config-2.8.tar.bz2 862678 SHA256 4e1cf5468d488aaf320ddfd439e03cbda0b213550fd734026d23138e4b2078ae SHA512 506fd0706c715b19123052fb08ac7ba091aa5a8bdf76cdf0cf9e4e19d176eb86a1ef2b5fb6555b790dee94744150ee78f46acaa63e3cfa74e99f3ba7ca8cbe54 WHIRLPOOL e04bc55db62fb6dcd90fba171ad5adc301161ea59b9e142f7744ddcee3c4adb53e8092a8fc4195ae9df35ab331c374b53bdfeabfc603787d0864dd2663aa3b36
 EBUILD xkeyboard-config-2.6.ebuild 1334 SHA256 6b3125a188fa264f3ac3efdf74ea8680ff3b5014fd091cd48ee7d62370af9dde SHA512 fa4973e5b9640fe7dffe4a4b3959c5726bb7b9cf412d5794a606870faf8db3ad698df5d5a33910c6701a1583637467ec7a6b87c09c208680952070429121fc10 WHIRLPOOL ca882e43f4a858b0388d4ea5d158f1924fcac44626fa29cd5c14c1d33808d7aac4816d819747ec16141e15d8583e3ccb9fcd71e1696951bc1a05d3e439fde1e2
 EBUILD xkeyboard-config-2.7.ebuild 1331 SHA256 b650e6ad8b3435d630e852e451658b0c35fb4a1efd716953f724a2b3f7012cac SHA512 559a98039ffae3b99df85ff13c91d5c9059efd3a1e8296b5b1e2fc1466592bf96529ae0b112c09b0416aa0f1bc4c4950ad27666f1f8b91874f84cca346b9639f WHIRLPOOL 41c7c48ea46c1c91ed15e57e793ca1fed45a5f692a0b4351e6d712a32213ed210f1e4e85eba2b8a186e32b49437fc3c338a2c89b7b0f6a8a5986baefb4b5e949
-MISC ChangeLog 25154 SHA256 73480e5c49f98379ce42b2d8d3bb031597a6edcc132934b460c845dcc9bd4991 SHA512 73c6a3f75d4096a376929a86f8c1da32cabc68c403ac759f6dafad2b1fc6eda2d9ce02dfbea3801854a62ae4dbbeaaea44e7cbd2d76539cf3b933070d5abdbc1 WHIRLPOOL cdbc5289a461381b6bd9d5c5b55e8a53c41d1f9b883c65bdedc4d0f7e9c02cd5c78b5b4660b43c860ac2e01a19bf95a1b5340bd6d4b1921e10ed7415cc728312
+EBUILD xkeyboard-config-2.8.ebuild 1346 SHA256 175060fa44910a297a3ac36927f53d84c5fc5e56dc8577d14bde2861e8f9accb SHA512 0c0ba9004ee2e1b24242f34cd768bd1a3a4e2afac2360a662b922d807dd7bfd49c5ee64901a254a90d841bd82281ed80c1958fa1eadc9fffbdb287da05c7cd48 WHIRLPOOL 01211ecbb1c129ca6340f636e088d366ece3553d4a4937e3e53433216c256bdfa81074fb62dfe516438c1077bbfa2467ce20034ace2a8967a64f653282c6fdb1
+MISC ChangeLog 25730 SHA256 9bc580ebaa2de0029b5f257f20d5b040a4a0d2e46b65a6c0985288081b979912 SHA512 40136d39e0d79b44132345653434cd977590fdace957c4315ed981df43f8fc258fc54a8b6b97bea56afaf1dc0b4dd335ecea68f2dd92c68ebeabb71dfad392a7 WHIRLPOOL fb651d22311e298306fbeb444a34db4019a0f272b25a71fe2ec4ee0ed08f32549665c1e833cbad60d3ba2e9db648ed02fca3e65800c225d1eb8c53858ca18af7
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlDnGW8ACgkQVWmRsqeSphPN4ACbBkDfG37ptTCJKS3Lc5e8XsjP
-ZooAnRL8JTSIJYyd+paaEYnenV1Lo7hp
-=xhBo
------END PGP SIGNATURE-----
diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch
deleted file mode 100644
index dbf043133b0e..000000000000
--- a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-extended-function-keys.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 1d1338afa6aa555c5f6c83d07fceec43a4d87f0d Mon Sep 17 00:00:00 2001
-From: Sergey V. Udaltsov <svu@gnome.org>
-Date: Wed, 05 Oct 2011 21:26:26 +0000
-Subject: Levels 2-4 for CTRL+ALT are propagated from level 1
-
----
-diff --git a/symbols/keypad b/symbols/keypad
-index e85aaac..1bab391 100644
---- a/symbols/keypad
-+++ b/symbols/keypad
-@@ -84,19 +84,19 @@ xkb_symbols "x11" {
- // Ungrab cancels server/keyboard/pointer grabs
-     key <KPDV> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
-+        symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
-     };
- 
- // ClsGrb kills whichever client has a grab in effect
-     key <KPMU> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Multiply,	VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
-+        symbols[Group1]= [ KP_Multiply,	KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
-     };
- 
- // -VMode switches to the previous video mode
-     key <KPSU> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
-+        symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
-     };
- 
-     key  <KP7> {	[  KP_Home,	KP_7	]	};
-@@ -106,7 +106,7 @@ xkb_symbols "x11" {
- // +VMode switches to the next video mode
-     key <KPAD> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ]
-+        symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ]
-     };
- 
-     key  <KP4> {	[  KP_Left,	KP_4	]	};
-@@ -242,11 +242,11 @@ xkb_symbols "legacymath" {
- 
-     key.type[Group1]="CTRL+ALT" ;
- 
--    key <KPDV> { [   KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ] }; // / <XF86_Ungrab>
--    key <KPMU> { [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ] }; // * <XF86_ClearGrab>
--    key <KPSU> { [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode>
-+    key <KPDV> { [   KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ] }; // / <XF86_Ungrab>
-+    key <KPMU> { [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ] }; // * <XF86_ClearGrab>
-+    key <KPSU> { [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ] }; // - <XF86_Prev_VMode>
- 
--    key <KPAD> { [      KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ] }; // + <XF86_Next_VMode>
-+    key <KPAD> { [      KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ] }; // + <XF86_Next_VMode>
- 
- };
- 
-@@ -602,7 +602,7 @@ xkb_symbols "numoperdecsep" {
- // ClsGrb kills whichever client has a grab in effect
-     key <KOMU> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
-+        symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
-     };
- 
-     key  <KO4> {	[  KP_4	]	};
-@@ -611,7 +611,7 @@ xkb_symbols "numoperdecsep" {
- // -VMode switches to the previous video mode
-     key <KOSU> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
-+        symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
-     };
- 
-     key  <KO1> {	[  KP_1	]	};
-@@ -620,7 +620,7 @@ xkb_symbols "numoperdecsep" {
- // +VMode switches to the next video mode
-     key <KOAD> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode ]
-+        symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode ]
-     };
- 
-     key  <KO0> {	[  KP_0	]	};
-@@ -628,6 +628,6 @@ xkb_symbols "numoperdecsep" {
- // Ungrab cancels server/keyboard/pointer grabs
-     key <KODV> {
-         type="CTRL+ALT",
--        symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
-+        symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
-     };
- };
-diff --git a/symbols/srvr_ctrl b/symbols/srvr_ctrl
-index 7d47d66..73b5af2 100644
---- a/symbols/srvr_ctrl
-+++ b/symbols/srvr_ctrl
-@@ -12,25 +12,25 @@ xkb_symbols "stdkeypad" {
- // Ungrab cancels server/keyboard/pointer grabs
-     key <KPDV> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ KP_Divide, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Ungrab ]
-+	symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86_Ungrab ]
-     };
- 
- // ClsGrb kills whichever client has a grab in effect
-     key <KPMU> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ KP_Multiply, VoidSymbol, VoidSymbol, VoidSymbol, XF86_ClearGrab ]
-+	symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86_ClearGrab ]
-     };
- 
- // -VMode switches to the previous video mode
-     key <KPSU> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ KP_Subtract, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Prev_VMode ]
-+	symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86_Prev_VMode ]
-     };
- 
- // +VMode switches to the next video mode
-     key <KPAD> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ KP_Add, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Next_VMode]
-+	symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86_Next_VMode]
-     };
- 
- };
-@@ -40,62 +40,62 @@ xkb_symbols "fkey2vt" {
- 
-     key <FK01> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F1, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_1 ]
-+	symbols[Group1]= [ F1, F1, F1, F1, XF86_Switch_VT_1 ]
-     };
- 
-     key <FK02> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F2, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_2 ]
-+	symbols[Group1]= [ F2, F2, F2, F2, XF86_Switch_VT_2 ]
-     };
- 
-     key <FK03> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F3, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_3 ]
-+	symbols[Group1]= [ F3, F3, F3, F3, XF86_Switch_VT_3 ]
-     };
- 
-     key <FK04> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F4, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_4 ]
-+	symbols[Group1]= [ F4, F4, F4, F4, XF86_Switch_VT_4 ]
-     };
- 
-     key <FK05> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F5, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_5 ]
-+	symbols[Group1]= [ F5, F5, F5, F5, XF86_Switch_VT_5 ]
-     };
- 
-     key <FK06> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F6, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_6 ]
-+	symbols[Group1]= [ F6, F6, F6, F6, XF86_Switch_VT_6 ]
-     };
- 
-     key <FK07> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F7, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_7 ]
-+	symbols[Group1]= [ F7, F7, F7, F7, XF86_Switch_VT_7 ]
-     };
- 
-     key <FK08> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F8, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_8 ]
-+	symbols[Group1]= [ F8, F8, F8, F8, XF86_Switch_VT_8 ]
-     };
- 
-     key <FK09> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F9, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_9 ]
-+	symbols[Group1]= [ F9, F9, F9, F9, XF86_Switch_VT_9 ]
-     };
- 
-     key <FK10> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F10, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_10 ]
-+	symbols[Group1]= [ F10, F10, F10, F10, XF86_Switch_VT_10 ]
-     };
- 
-     key <FK11> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F11, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_11 ]
-+	symbols[Group1]= [ F11, F11, F11, F11, XF86_Switch_VT_11 ]
-     };
- 
-     key <FK12> {
- 	type="CTRL+ALT",
--	symbols[Group1]= [ F12, VoidSymbol, VoidSymbol, VoidSymbol, XF86_Switch_VT_12 ]
-+	symbols[Group1]= [ F12, F12, F12, F12, XF86_Switch_VT_12 ]
-     };
- 
- };
-diff --git a/symbols/terminate b/symbols/terminate
-index 96dd6e8..c74220b 100644
---- a/symbols/terminate
-+++ b/symbols/terminate
-@@ -2,6 +2,6 @@ partial default modifier_keys
- xkb_symbols "ctrl_alt_bksp" {
-     key <BKSP> {
-         type="CTRL+ALT",
--        symbols[Group1] = [ NoSymbol, VoidSymbol, VoidSymbol, VoidSymbol, Terminate_Server ]
-+        symbols[Group1] = [ NoSymbol, NoSymbol, NoSymbol, NoSymbol, Terminate_Server ]
-     };
- };
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch b/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch
deleted file mode 100644
index cfc5c3a6fcc8..000000000000
--- a/x11-misc/xkeyboard-config/files/xkeyboard-config-2.4.1-shift-backspace.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 81fc86a911b55481b9597bb9284b3beca460104c Mon Sep 17 00:00:00 2001
-From: Sergey V. Udaltsov <svu@gnome.org>
-Date: Sun, 20 Nov 2011 20:03:26 +0000
-Subject: Extend BackSpace to the 2nd group
-
-https://bugs.freedesktop.org/show_bug.cgi?id=43098
----
-diff --git a/symbols/pc b/symbols/pc
-index e1965ce..7e13ecb 100644
---- a/symbols/pc
-+++ b/symbols/pc
-@@ -14,7 +14,7 @@ xkb_symbols "pc105" {
-     include "pc(editing)"
-     include "keypad(x11)"
- 
--    key <BKSP> {	[ BackSpace	]	};
-+    key <BKSP> {	[ BackSpace, BackSpace	]	};
- 
-     key  <TAB> {	[ Tab,	ISO_Left_Tab	]	};
-     key <RTRN> {	[ Return	]	};
-diff --git a/symbols/us b/symbols/us
-index 1d8bdd0..7c3ee24 100644
---- a/symbols/us
-+++ b/symbols/us
-@@ -573,7 +573,7 @@ xkb_symbols "dvp" {
-     key <AE10> { [ bracketright,    6                                           ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
-     key <AE11> { [ exclam,          8,              exclamdown                  ], type[Group1] = "FOUR_LEVEL_ALPHABETIC" };
-     key <AE12> { [ numbersign,      grave,          dead_grave                  ] };
--    key <BKSP> { [ BackSpace                                                    ] };
-+    key <BKSP> { [ BackSpace,       BackSpace                                   ] };
- 
-     // upper row, left side
-     key <AD01> { [ semicolon,       colon,          dead_diaeresis              ] };
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch b/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch
deleted file mode 100644
index 9c526af13ab7..000000000000
--- a/x11-misc/xkeyboard-config/files/xorg-cve-2012-0064.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 9966d0a83ad7cf5ea76a04f31912e92908f3da63 Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniel@fooishbar.org>
-Date: Thu, 19 Jan 2012 16:36:16 +1100
-Subject: [PATCH] Hide ClearGrab/CloseGrabs actions behind an option
-
-Similar to how we put the Terminate mapping behind an option rather than
-enabling it by default, put the ClearGrab/CloseGrab action handlers
-behind an option too, so we don't ship 'break my screensaver'.  Oops.
-
-Signed-off-by: Daniel Stone <daniel@fooishbar.org>
----
- compat/xfree86      |   15 +++++++++------
- rules/base.o_c.part |    1 +
- rules/base.xml.in   |    6 ++++++
- 3 files changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/compat/xfree86 b/compat/xfree86
-index cf4a8b2..52e661d 100644
---- a/compat/xfree86
-+++ b/compat/xfree86
-@@ -41,12 +41,6 @@ default partial xkb_compatibility "basic"  {
-         action = SwitchScreen(Screen=12, !SameServer);
-     };
- 
--    interpret XF86_Ungrab {
--        action = Private(type=0x86, data="Ungrab");
--    };
--    interpret XF86_ClearGrab {
--        action = Private(type=0x86, data="ClsGrb");
--    };
-     interpret XF86LogGrabInfo {
-         action = Private(type=0x86, data="PrGrbs");
-     };
-@@ -61,3 +55,12 @@ default partial xkb_compatibility "basic"  {
-         action = Private(type=0x86, data="-VMode");
-     };
- };
-+
-+partial xkb_compatibility "grab_break" {
-+    interpret XF86_Ungrab {
-+        action = Private(type=0x86, data="Ungrab");
-+    };
-+    interpret XF86_ClearGrab {
-+        action = Private(type=0x86, data="ClsGrb");
-+    };
-+};
-diff --git a/rules/base.o_c.part b/rules/base.o_c.part
-index 352f8b3..b80ab6d 100644
---- a/rules/base.o_c.part
-+++ b/rules/base.o_c.part
-@@ -3,4 +3,5 @@
-   grp_led:scroll	=	+ledscroll(group_lock)
-   japan:kana_lock	=	+japan(kana_lock)
-   caps:shiftlock	=	+ledcaps(shift_lock)
-+  grab:break_actions    =       +xfree86(grab_break)
- 
-diff --git a/rules/base.xml.in b/rules/base.xml.in
-index 22b720f..6c17faa 100644
---- a/rules/base.xml.in
-+++ b/rules/base.xml.in
-@@ -6278,6 +6278,12 @@
-           <_description>Toggle PointerKeys with Shift + NumLock.</_description>
-         </configItem>
-       </option>
-+      <option>
-+        <configItem>
-+          <name>grab:break_actions</name>
-+          <_description>Allow breaking grabs with keyboard actions (warning: security risk)</_description>
-+        </configItem>
-+      </option>
-     </group>
-     <group allowMultipleSelection="true">
-       <!-- Special shortcuts for the Euro character -->
--- 
-1.7.8.3
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild
deleted file mode 100644
index 5b4d16222d20..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.12 2011/07/30 02:44:37 mattst88 Exp $
-
-EAPI=3
-
-XORG_STATIC=no
-
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=x11-apps/xkbcomp-1.2.1"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.30
-	dev-perl/XML-Parser"
-
-CONFIGURE_OPTIONS="
-	--with-xkb-base=\"${EPREFIX}/usr/share/X11/xkb\"
-	--enable-compat-rules
-	--with-xkb-rules-symlink=xorg"
-
-src_compile() {
-	# cleanup to make sure .dir files are regenerated
-	# bug #328455 c#26
-	xorg-2_src_compile clean
-	xorg-2_src_compile
-}
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
deleted file mode 100644
index d5235a6c3335..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.9 2011/07/30 02:44:37 mattst88 Exp $
-
-EAPI=4
-
-XORG_STATIC=no
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=x11-apps/xkbcomp-1.2.1
-	>=x11-libs/libX11-1.4.3"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	>=dev-util/intltool-0.30
-	dev-perl/XML-Parser"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-	--enable-compat-rules
-	# do not check for runtime deps
-	--disable-runtime-deps
-	--with-xkb-rules-symlink=xorg
-)
-
-src_prepare() {
-	xorg-2_src_prepare
-	if [[ ${XORG_EAUTORECONF} != no ]]; then
-		intltoolize --copy --automake || die
-	fi
-}
-
-src_compile() {
-	# cleanup to make sure .dir files are regenerated
-	# bug #328455 c#26
-	xorg-2_src_compile clean
-	xorg-2_src_compile
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.3.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.3.ebuild
deleted file mode 100644
index 795e8959ab8d..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.9 2011/10/03 18:07:33 josejx Exp $
-
-EAPI=4
-
-XORG_STATIC=no
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=x11-apps/xkbcomp-1.2.1
-	>=x11-libs/libX11-1.4.2"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	>=dev-util/intltool-0.30
-	dev-perl/XML-Parser"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-	--enable-compat-rules
-	# do not check for runtime deps
-	--disable-runtime-deps
-	--with-xkb-rules-symlink=xorg
-)
-
-src_prepare() {
-	xorg-2_src_prepare
-	if [[ ${XORG_EAUTORECONF} != no ]]; then
-		intltoolize --copy --automake || die
-	fi
-}
-
-src_compile() {
-	# cleanup to make sure .dir files are regenerated
-	# bug #328455 c#26
-	xorg-2_src_compile clean
-	xorg-2_src_compile
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild
deleted file mode 100644
index 8f1dd6275d92..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 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.4.1-r2.ebuild,v 1.6 2012/09/27 00:16:48 chithanh Exp $
-
-EAPI=4
-
-XORG_STATIC=no
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2"
-
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=x11-apps/xkbcomp-1.2.1
-	>=x11-libs/libX11-1.4.2"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	>=dev-util/intltool-0.30
-	dev-perl/XML-Parser"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-	--enable-compat-rules
-	# do not check for runtime deps
-	--disable-runtime-deps
-	--with-xkb-rules-symlink=xorg
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-extended-function-keys.patch
-	"${FILESDIR}"/${P}-shift-backspace.patch
-)
-
-src_prepare() {
-	xorg-2_src_prepare
-	if [[ ${XORG_EAUTORECONF} != no ]]; then
-		intltoolize --copy --automake || die
-	fi
-}
-
-src_compile() {
-	# cleanup to make sure .dir files are regenerated
-	# bug #328455 c#26
-	xorg-2_src_compile clean
-	xorg-2_src_compile
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r3.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r3.ebuild
deleted file mode 100644
index 86e79aa8e4de..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.4.1-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 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.4.1-r3.ebuild,v 1.8 2012/03/03 16:33:03 ranger Exp $
-
-EAPI=4
-
-XORG_STATIC=no
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=x11-apps/xkbcomp-1.2.1
-	>=x11-libs/libX11-1.4.2"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	>=dev-util/intltool-0.30
-	dev-perl/XML-Parser"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-	--enable-compat-rules
-	# do not check for runtime deps
-	--disable-runtime-deps
-	--with-xkb-rules-symlink=xorg
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-extended-function-keys.patch
-	"${FILESDIR}"/${P}-shift-backspace.patch
-	"${FILESDIR}"/xorg-cve-2012-0064.patch
-)
-
-src_prepare() {
-	xorg-2_src_prepare
-	if [[ ${XORG_EAUTORECONF} != no ]]; then
-		intltoolize --copy --automake || die
-	fi
-}
-
-src_compile() {
-	# cleanup to make sure .dir files are regenerated
-	# bug #328455 c#26
-	xorg-2_src_compile clean
-	xorg-2_src_compile
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.5.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.5.ebuild
deleted file mode 100644
index e9e8b2e76552..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2012 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.5.ebuild,v 1.2 2012/01/21 00:06:48 ssuominen Exp $
-
-EAPI=4
-
-XORG_STATIC=no
-inherit xorg-2
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=">=x11-apps/xkbcomp-1.2.3
-	>=x11-libs/libX11-1.4.3"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	>=x11-proto/xproto-7.0.20"
-
-XORG_CONFIGURE_OPTIONS=(
-	--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-	--enable-compat-rules
-	# do not check for runtime deps
-	--disable-runtime-deps
-	--with-xkb-rules-symlink=xorg
-)
-
-src_prepare() {
-	xorg-2_src_prepare
-	if [[ ${XORG_EAUTORECONF} != no ]]; then
-		intltoolize --copy --automake || die
-	fi
-}
-
-src_compile() {
-	# cleanup to make sure .dir files are regenerated
-	# bug #328455 c#26
-	xorg-2_src_compile clean
-	xorg-2_src_compile
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.5.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.8.ebuild
index d6341a2745b0..8097156c3e24 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.5.1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.5.1.ebuild,v 1.2 2012/05/10 17:12:32 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xkeyboard-config/xkeyboard-config-2.8.ebuild,v 1.1 2013/01/30 14:11:11 chithanh Exp $
 
-EAPI=4
+EAPI=5
 
 XORG_STATIC=no
 inherit xorg-2
@@ -11,7 +11,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xkeyboard-config"
 
 DESCRIPTION="X keyboard configuration database"
 HOMEPAGE="http://www.freedesktop.org/wiki/Software/XKeyboardConfig"
-[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${P}.tar.bz2"
+[[ ${PV} == *9999* ]] || SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/data/${PN}/${P}.tar.bz2"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""