Version bump.

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

20 files changed, 132 insertions, 235 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 3e3a20a4df88..263d3e98f3df 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.239 2013/06/09 23:05:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.240 2013/09/11 20:18:36 chithanh Exp $
+
+*xinit-1.3.3 (11 Sep 2013)
+*xinit-1.3.3 (11 Sep 2013)
+
+  11 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xinit-1.3.3.ebuild, +xinit-1.3.3.ebuild,
+  -files/xinit-1.3.1-prio-process.patch, -xinit-1.3.0-r2.ebuild,
+  -xinit-1.3.1-r1.ebuild, -xinit-1.3.1.ebuild:
+  Version bump.
 
   09 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 5404e240604d..21ece7164035 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,37 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 00-xhost 255 SHA256 780a53d697e5cdc8ae7cf24f97e554a9ff7b41d46f205774d7414cecfca3ab97 SHA512 ef9bc61b9af6723236e543dae1b7c92c739050dd3cb5acc59deaf2589a490323db7e1f52b890dc325e7e7b8db299cd50ad604456c1209ec761da124efd75cdf2 WHIRLPOOL 81de4d5fe95cf145e4ca72291d0bb0984993f165351d7dba78146ff9e2e2555abb4861a867f0962c1148aaac059c3489d52d1aee54c28faf6f0e228ffe38eb2f
 AUX 0001-Gentoo-customizations.patch 1508 SHA256 3b43514ca65c882def485497917c67e64c570fa0c1ef8d758bd949d41e0f9a9c SHA512 a58549e8b94df6d4f1cbde4b65cf6615f1ce7d054c51c0fdd35bbd746dfc8dd57478f437bb4d2c6616cb5d00f24d14658367bda90e82576b5fdbb554e810b6a6 WHIRLPOOL f0c60ea80be664a7ab638b5c20ff7c1d979f5245ec63288633aa7592ae0816ec6de770484e5a47678a15b074be3770ac62bc9efd54f72aeff79de35e77b111b4
 AUX Xsession 2187 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3 SHA512 a20e12f338ead48f4758268506fe899a0123c25babb1366678e643b4101ece8c913305b44c9395897a82e65ee0dd402edc0adf99adf74b3c6085bf39dd12f048 WHIRLPOOL 71669d591d60a6f5636f895471d94fee2dd1546c7561d3593e0d7b53211afed4860e4684d052e4f02913c7f98df1a11b9f64680fe85eb07daafc9263c0c3cddb
 AUX Xsession.desktop 244 SHA256 23eb4a681673217afae0ab7787a93ab7746ab0e8794eaf2564ea59894c36554c SHA512 bfd02f601afb251daba370e41ad5d8aa712d39ae15eabc5b371980e109eeee7b0cb9aac36b78870bfd681b7a71ef9f0f0685690cd9d7796dcc7ec32f04e84434 WHIRLPOOL b501f680d8518e9d4530014ba533d09b8e6555800278a9397fa86e0a1e4a8c373872106d59bef7ea7d73c580aa00c317e8156d7148e5622fb73133e097649c47
 AUX chooser.sh 1301 SHA256 6ca40e2f592a10357d3396240213f0ebd81dd34882bab18bad2e9e94ad4036f0 SHA512 e977e614769b126eac08e989057deb5375f4357de1383d17bd11ceb87eec1ab89c91cb992a89c5a09b8056c725f804838fdeffadcc06f7f6ca69c737b48f3206 WHIRLPOOL f87da2ccddf341261ff0d9565f04db0410d487a90ae447cbfbc5a3981865bdcd28487954657dbf70567ba65d8e0eec067d9efa6a717d89747eb06ea67de2dc3d
 AUX startDM.sh 923 SHA256 e7f2d95b3b4b6b5d711f926f8a3b7b0163b4d9e40b40489bcbd1316806e47499 SHA512 462090c2cbef56586018c8d6100e14002d4c74ee423cc66f6ce676ce7bb5a9ac8e17fd9b86bd66653aa266cef09106ab280b61e3d64ed0831eecd89b6715b890 WHIRLPOOL 709716dd54bda18538fd1b7d6b0e1d75fc5e51c9019dad9ff4bdc9a087cecba2d917b4fe820e2cfde029f34feca9ea556144a87381348c0483a1ea8dae9f17f8
-AUX xinit-1.3.1-prio-process.patch 357 SHA256 64588930bab42c8492e5f647c8261e5bd9efd6e4e4e99f94cac18ce2ddefba07 SHA512 245011480039107596ee978b1a67eb1bfda7ad27e692794f33478c575e743003458f2059a23235505f0365008f49d77c51d87b4b01a1b02f14632a64ff482bf7 WHIRLPOOL ffb561eb5c1b96ecd49ca5285d37b06dcbf9ad07093410610aa4ad6b787499c3b6c1ac14e1f29956324238c36d81547fe3d01a78cb2d9c1a2282da605bf1d36a
+AUX xinit-1.3.3.ebuild 1803 SHA256 9be3b9f01e5f02e43ba3210eca28c6f1407f760500691b9a4eb8fc263c6d74ad SHA512 a10c0e07336206990c3ec00abb80e225ce5b0f91fb7e442b5160571c5023702a7ca3da06e6668c0aa91134d41b4f560a5c257cdff1b8e4a545a24046e90ce114 WHIRLPOOL edc35c7016ca98aa6f683078c32722052352b7cf2798b6e3e27b13a294c1fef23df5cbe9b167e22d5a4562f6ec3309b7fb0fe54e6751b1e217f3e545c1e95b70
 AUX xserverrc 45 SHA256 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387 SHA512 f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b WHIRLPOOL d6b68b3b63995688dff5a52d246164860091b3d30517b1cee5ac7c7d791e3a6f3356bf4d494f209b783ba8266f213aff6684190c2592e0f729017a8870e492f4
-DIST xinit-1.3.0.tar.bz2 138315 SHA256 ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c SHA512 afb525e8fce9e460f513926a7aeb3344b064834b1d5031ba30400fa2bcb5bddada57b4e42b49f839bbcd177b8ee8fd30b75844c69b5ec786508ab2b221fe528e WHIRLPOOL 10bb91af43379fe59a12f9f544006bf11cef088a4e770f0be17b17f96e3357a74c14474626981ecdd9bd940ff0f6da41e866628aa291f6ef1fd6b8a641df42db
-DIST xinit-1.3.1.tar.bz2 147067 SHA256 c7468dfae94bdb42785d79623c27156dc4bf379d8372992830482cb04d8439b0 SHA512 e62a576c860b722a988642ba14c20830cc218e042f36e10c881ed5afd3f45510875e32255a67265ffd4bfee0af3bf0d2b611cd258532f7ea502c11a499f4fc7d WHIRLPOOL 34717d551cca99f653005234ee9d8b4b93f860a3e5cae4974b9c9b4983d77154cfaf9b54b5f315c6374c6f560a37a763be5cd6a35bf6c355748a6dafb7503067
 DIST xinit-1.3.2.tar.bz2 148443 SHA256 a1867fdaa83f68750b12ba4305c3c62f5992d0f52cfeb98e96c27a8e690e0235 SHA512 bafe4706ee09b7980518af54dbc7d4cb971fcf4aaf4ea575d58c7102258e63a838c7e4acd6a4267d10fb8253dd779c1a008a8ab64164442b902bc0b19716197a WHIRLPOOL 0ba7b3a3aacbd8aa47e03e9346aca651dc00efc0420bc6d3fbb6dd388428af0ecfb3cdc7d91a495a0be6b8236fda4a229b0311dc6c037f435e95f2350dfcf1f8
-EBUILD xinit-1.3.0-r2.ebuild 1670 SHA256 6477c0a8deac0067f54ed00ebe3a6d13d0e10b99276b6a0673390017f9e3b38c SHA512 a260b52a449b6dfa8e81cbb805826c7cec5063228e046b220091871fa68d191737a2bd6180a98f4f67b46beb4f20062230b75bc71a0423b874eb74bbffaf1d14 WHIRLPOOL 5c70c86619b5779b2fcaf669287bd5111ce23c361283d3f06dd9a6f31f40165b80fb6958a042ff91840b9a795ee6d681e5f45efa0d8c48193477af4222778f1b
-EBUILD xinit-1.3.1-r1.ebuild 1778 SHA256 ec639d3c94add1d90843ce5e96a304e422c31b592f7fba95ceee669646359d66 SHA512 ad429a8fa130a9ad67228eb12b6154201a91f066a96bb21ef578b7fb10204a91aafe66b02597240dadcb043faeda1bceb032eeba2f8c08555d78f801092bc165 WHIRLPOOL dc25844ec072813968fe1c3a1128eecb39da65fd77164ad09088eba9473f47e3a31a12808b0e175edddd666b66c6fa84110cda8e55c8de14996d65e32a8def90
-EBUILD xinit-1.3.1.ebuild 1706 SHA256 3b1eb7bd90904ce81772cb231aa84307abd6c54906ab27d49a25a1a27614d4be SHA512 b7db69863e8895048595dcd2283ff62098d23934c78d0277b57bc454e0aa64d022fc315d97fdb8222c07f41d45bd3022c4f8af3380f252c5c6acd15ac7e59dfa WHIRLPOOL e941fd3ebe37288ef7081a093d1dadfe2ae0451b8181c1ff704e5d6925950ebd9bddfdcb87fe58570eb3a14981e1d20650bec0dab705daf2778cf77a0930d893
+DIST xinit-1.3.3.tar.bz2 163905 SHA256 74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af SHA512 345d9a00991e25df0a565f5b7edfbf504df9e019fc8ca2d31e4d2899e4765d7a18f0fffec0b4dda5eef99982cf8482925656a4e18576105f267393de51257d65 WHIRLPOOL 106656351391ff8de397394d56ea225f910f82be3cbacaf81c0735d2a259437632bd5428fc96900a0b88146fd11f8d8670f07f3dd2869b44ff6525c399b936f4
 EBUILD xinit-1.3.2.ebuild 1784 SHA256 90fc46f11bc86987d48074e76164f6408c781a30d2129076685cbf6b94e5c8c4 SHA512 20c4c9f8439da47cba8c112436bbdf6db3778abd87c0e325aee91b7f48ee965cbe7e607efbd74519f795df642ab8df306bba785d10f39195196487a9506986df WHIRLPOOL 1d52ae482fee4d5bad31a77f77c52486b3576041cfb94759510a783157c20db7b8f794504597bff03d259231d691cedb7ee208fdb3bd74de0624290fd8b6a814
-MISC ChangeLog 35905 SHA256 346c557a2169b6230a5e1f641fa033615c7cf944bcbf74356dc496dcca9f95af SHA512 b4d0e814d463fb9333d6c53ff1d6a9f9d5eae4c550d4a98e780c8902e3de6f5d376bf35954f55c407d8d1f11671093b69f5aa87075ab8f47a5e1aef4117b1ee0 WHIRLPOOL 8806356f23a1566da1ee1a8558497b508de3050509ab4b5ee646e2b0cd62078a350f817e2e56b81b13c2be83189ae51af488a91918ccb67ab0074848fae81455
+EBUILD xinit-1.3.3.ebuild 1797 SHA256 3663e85cfddb95832f80ec4ced03dedab0b8e18f17c9ca36d7953195c0597af4 SHA512 51af00deed4936ff250227341eaa6e54eb9aaf5ac32449cc3fe15e8243ff3f2e49f19d1a9000dac2de5549d0849224579bb0139cbc281264f6e492585c4a613c WHIRLPOOL 114c8223addeff7b4464a0976e3568b26c4bb6d367c0118fe5b7cb75b694fd6511e1e4eda8c1f3026b723065f85118354d414310f31eb3741fcceff4fb0b9aa7
+MISC ChangeLog 36210 SHA256 52fac518eafe1518fcfe2bef1fc11251fa919d3ab96783e0ffddfef98b486fd7 SHA512 507a2b7713c8ea8f3f6eb1041b58480ee89a3f721565a8d3d8a0ce58e7259b91523cd18a9d51563d36eb196410bef3b8130efaba8cea874db9feaffabea10303 WHIRLPOOL d7bc86be273395bae0455ded04d60996379537654338f3d7c39179662473edeb2bb88fd3383eb830e7b278925f872fc5bc4d01599179f86dfacd05a96d19eaa8
 MISC metadata.xml 403 SHA256 8b907c5c30247ef4cb17fcf9dbaead16f3e6fd3b112d331b686cd6accd410f08 SHA512 6d64681045ad9dfe42c54d9e625a7b2f120eadd223d753ac79483aef5f03b819104168b9b5124244ce825bbe2a69ca32b1bc8176b85d42694a7b0f94f840c915 WHIRLPOOL e6ece8bf3d45c1697a8ca62a34360f5966bb07d2f938a606fefbcf474c4ba9a94356f824f1b6bf8dd7be0c7be169eee163de8dc1b9f000822ea808b6d8d567e6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRtQpEAAoJELEHsLL7fEFWvysP/13bccCFSvLnuOOOQ8XKfDHU
-4VPlHbOWGPVk9A798bRR67zxoqKcfOCCX7hUHQf/h/TokBeFD3z0uhDOsO4Gby9f
-pso7Mbq4SBXQ6AiyEuTptFHUIVXmM1uvQiJFlqWC8IF7yoRtHJSoiBBMWveKIXkQ
-HmS8oGukPLMTy+b7IpSKTRuFZQofgTqAAMCg84fhurijyr/YRdOu5VZaPLfRAqQu
-iKO6/VfWx8yzni5qok1K6bp1MvyjFp/cvHfGcUN3Vmzq4daS6MqXvtPaivLe+3QR
-RZv9L7facyNxD3Yw78fM78KsDMcTRhBVzSF8o3P5E6uGu1+7P6HJuA7oGWNWvK3r
-OzWp+nkUC6znHEJHyWGg1pv9h/oK3E6GCeRfb3NR1nMafeHrf2GRbpg8y72lnScD
-8M0VvOuJEDi1WrTFfVHRByuUHcobJBrp0Ykup0CpHauDl//rWQYxLilFDh+zMGoR
-a/TUVXNhjsB9J8bbnX2DOk8SZ+Bczev958TY+N5Kl1er2AjzVlqxJfTIAy1W3Y+v
-dyWvgbGG5+iOOJGVz42AC9LDs9iCOi8uI8Ab14VTdliDrQ0PRoSzXj0pKHXEdMPE
-6IsIBWNzaW9L5eXtM2LBNw1wywLfBMmErIR4zoUV/4hmOICL5tGfTOxf8ZlGaTNO
-n/sl7LtByr7Fw/TqWYwi
-=lzbD
------END PGP SIGNATURE-----
diff --git a/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch b/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch
deleted file mode 100644
index 838171bb67f9..000000000000
--- a/x11-apps/xinit/files/xinit-1.3.1-prio-process.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/xinit.c b/xinit.c
-index 42ff008..2ab817f 100644
---- a/xinit.c
-+++ b/xinit.c
-@@ -49,10 +49,8 @@ in this Software without prior written authorization from The Open Group.
- #endif
- 
- /* For PRIO_PROCESS and setpriority() */
--#ifdef __DragonFly__
- #include <sys/time.h>
- #include <sys/resource.h>
--#endif /* __DragonFly__ */
- 
- #include <stdlib.h>
diff --git a/x11-apps/xinit/xinit-1.3.1.ebuild b/x11-apps/xinit/files/xinit-1.3.3.ebuild
index 048d0af7f632..1411770b3159 100644
--- a/x11-apps/xinit/xinit-1.3.1.ebuild
+++ b/x11-apps/xinit/files/xinit-1.3.3.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.1.ebuild,v 1.9 2011/10/03 17:55:53 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xinit-1.3.3.ebuild,v 1.1 2013/09/11 20:18:36 chithanh Exp $
 
-EAPI=4
+EAPI=5
 
 inherit xorg-2
 
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+minimal"
 
 RDEPEND="
@@ -28,16 +28,14 @@ PDEPEND="x11-apps/xrdb
 "
 
 PATCHES=(
-	"${FILESDIR}/0001-Gentoo-customizations.patch"
-	"${FILESDIR}/${P}-prio-process.patch"
+	"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
 )
 
-pkg_setup() {
-	xorg-2_pkg_setup
-
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		--with-xinitdir=/etc/X11/xinit
 	)
+	xorg-2_src_configure
 }
 
 src_install() {
@@ -51,6 +49,9 @@ src_install() {
 	doexe "${FILESDIR}"/xserverrc
 	exeinto /etc/X11/xinit/xinitrc.d/
 	doexe "${FILESDIR}/00-xhost"
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}/Xsession.desktop"
 }
 
 pkg_postinst() {
diff --git a/x11-apps/xinit/xinit-1.3.0-r2.ebuild b/x11-apps/xinit/xinit-1.3.0-r2.ebuild
deleted file mode 100644
index c0bc82e9f2c3..000000000000
--- a/x11-apps/xinit/xinit-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.0-r2.ebuild,v 1.8 2011/09/05 07:14:05 naota Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="X Window System initializer"
-
-LICENSE="${LICENSE} GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="+minimal"
-
-RDEPEND="
-	!<x11-base/xorg-server-1.8.0
-	x11-apps/xauth
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-PDEPEND="x11-apps/xrdb
-	!minimal? (
-		x11-apps/xclock
-		x11-apps/xsm
-		x11-terms/xterm
-		x11-wm/twm
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/0001-Gentoo-customizations.patch"
-)
-
-pkg_setup() {
-	xorg-2_pkg_setup
-
-	CONFIGURE_OPTIONS="--with-xinitdir=/etc/X11/xinit"
-}
-
-src_install() {
-	xorg-2_src_install
-
-	exeinto /etc/X11
-	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh || die
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/Xsession || die
-	exeinto /etc/X11/xinit
-	doexe "${FILESDIR}"/xserverrc || die
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/00-xhost"
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-	ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
-	ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
-	ewarn "any executable. When you run startx, it will run this as the login session."
-	ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
-	ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
-	ewarn "Here's an example of setting it for the whole system:"
-	ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
-	ewarn "    env-update && source /etc/profile"
-}
diff --git a/x11-apps/xinit/xinit-1.3.1-r1.ebuild b/x11-apps/xinit/xinit-1.3.3.ebuild
index 6640c4c97b9d..00b22ce7ebc4 100644
--- a/x11-apps/xinit/xinit-1.3.1-r1.ebuild
+++ b/x11-apps/xinit/xinit-1.3.3.ebuild
@@ -1,15 +1,15 @@
-# 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-apps/xinit/xinit-1.3.1-r1.ebuild,v 1.8 2012/03/03 16:27:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.3.ebuild,v 1.1 2013/09/11 20:18:36 chithanh Exp $
 
-EAPI=4
+EAPI=5
 
 inherit xorg-2
 
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+minimal"
 
 RDEPEND="
@@ -28,16 +28,14 @@ PDEPEND="x11-apps/xrdb
 "
 
 PATCHES=(
-	"${FILESDIR}/0001-Gentoo-customizations.patch"
-	"${FILESDIR}/${P}-prio-process.patch"
+	"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
 )
 
-pkg_setup() {
-	xorg-2_pkg_setup
-
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		--with-xinitdir=/etc/X11/xinit
 	)
+	xorg-2_src_configure
 }
 
 src_install() {
diff --git a/x11-apps/xkill/ChangeLog b/x11-apps/xkill/ChangeLog
index c1681bc29bfc..fe51814044f6 100644
--- a/x11-apps/xkill/ChangeLog
+++ b/x11-apps/xkill/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xkill
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/ChangeLog,v 1.37 2012/05/15 14:20:25 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/ChangeLog,v 1.38 2013/09/11 20:18:54 chithanh Exp $
+
+*xkill-1.0.4 (11 Sep 2013)
+
+  11 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xkill-1.0.4.ebuild:
+  Version bump.
 
   15 May 2012; Alexis Ballier <aballier@gentoo.org> xkill-1.0.3.ebuild:
   keyword ~amd64-fbsd
@@ -130,4 +136,3 @@
 
   08 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; +xkill-0.99.0.ebuild:
   Initial commit for modular X.
-
diff --git a/x11-apps/xkill/Manifest b/x11-apps/xkill/Manifest
index 27e38cdf2294..e311633c20c5 100644
--- a/x11-apps/xkill/Manifest
+++ b/x11-apps/xkill/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST xkill-1.0.3.tar.bz2 107790 RMD160 58d4a613c2076fb376e8c5fc739adedb3f223d0c SHA1 bab7b9c7f3bc053d743eb339cf5fa496bace57e5 SHA256 bd8307272a648ca76a266e5c1111384c8ed9367c6a8f1a5be844a5b5300881a9
-EBUILD xkill-1.0.3.ebuild 514 RMD160 7ec5ba3b9f3ca4fb9a6c72d03746feb3f7ea2887 SHA1 ed24c336c602876885a5a654b6b98d6cc73ee761 SHA256 c81ec362de11bd9effab82207d88c934ffa7251ad94d21b66aaf781dc76fdc81
-MISC ChangeLog 4164 RMD160 75b1d87a628607fc2235e629303b168a56ecf931 SHA1 2aac016789f9fee28f8b96c2733a12b2d7bb2708 SHA256 fd611c435b71e1b23534af42d5c72508933ddc8e6e53053edbdcad7651f577cc
-MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk+yZioACgkQvFcC4BYPU0rf+gCeOvuo+IPys4rbkjgN0qWfgutT
-0HYAnRyW2lIAWt54C/1/sKibOd/sjZr7
-=pekz
------END PGP SIGNATURE-----
+DIST xkill-1.0.3.tar.bz2 107790 SHA256 bd8307272a648ca76a266e5c1111384c8ed9367c6a8f1a5be844a5b5300881a9
+DIST xkill-1.0.4.tar.bz2 124828 SHA256 88ef2a304f32f24b255e879f03c1dcd3a2be3e71d5562205414f267d919f812e SHA512 14d1fc0eff96a62d66307f09efc599639ee70be4bf580e2857569326881bfdcae7a8a21640509875218dd2b88575b4801ab0c43c4295550dc71141a579483545 WHIRLPOOL 680cd355eaaabe99d724056676f789a1ed24398179d98d4ee98a82264216e92a3cd0328b8f8f7164ae9690cc8cc768dea04b21be3715acc0cbe126a503fcf27a
+EBUILD xkill-1.0.3.ebuild 514 SHA256 c81ec362de11bd9effab82207d88c934ffa7251ad94d21b66aaf781dc76fdc81 SHA512 0180bf6705db8028eacc756201cf1d25cc389e39fa91c97ca25e8a35facd5755cba02f306d9d8c08d0ed9ae6424b0d5ed204bacb6760745c41f6e7fa25814eda WHIRLPOOL 55946dcfe19a34663d4ca0e4e774497852416d03ab02c562fc0699e344c270ef4a7d28589e413a76654c9668a78d7a3b779a1d0bf29c7a7fea24cc198c10791b
+EBUILD xkill-1.0.4.ebuild 525 SHA256 44c2f9e77c493f56b3bb4682b3ed369625a33cfe27213ccb434285846a52bcf7 SHA512 6b1dad2992af41de6a63643e176e2feda6c7a89504afb71de79fc46fa221bcb6c0be49785c4ef410ce86476cef43a17b3d81746663fd67f9b8c0fc6196ed1a61 WHIRLPOOL a207e38a722cc71e28707a97aacb52d02c0b9d53da812956bdf27448cd51fe72cd10d50f142cb204f6ea2e101d81182121db1b0a45d316853a97f61288e48e72
+MISC ChangeLog 4300 SHA256 3cf6e5990c2cbc2db87629270b0d26be0393c31cb7759a90e42a2f3736f9df14 SHA512 ee6a1f2d4ea6b74f5fc4a1756838bc27df3cc37c3617926c793f3184687a4ed6ec9e65dfba6e232a125a27565baa766f4aca2a981c82fd729a6d2d0d5ad019f4 WHIRLPOOL 8248b1a6be5449ed46f62e716395f9485761865a627ec29cfb629a4c251a52e781d88ed8d6c5f2aba84377e0afe86f7d1edce7ef71f23e60900d412d8de1c51b
+MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
diff --git a/x11-apps/xkill/xkill-1.0.4.ebuild b/x11-apps/xkill/xkill-1.0.4.ebuild
new file mode 100644
index 000000000000..3a9b417c71e3
--- /dev/null
+++ b/x11-apps/xkill/xkill-1.0.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/xkill-1.0.4.ebuild,v 1.1 2013/09/11 20:18:54 chithanh Exp $
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="kill a client by its X resource"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsclients/ChangeLog b/x11-apps/xlsclients/ChangeLog
index 46db902ff45c..4e953fd90c2a 100644
--- a/x11-apps/xlsclients/ChangeLog
+++ b/x11-apps/xlsclients/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xlsclients
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/ChangeLog,v 1.63 2012/05/15 14:20:40 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/ChangeLog,v 1.64 2013/09/11 20:19:11 chithanh Exp $
+
+*xlsclients-1.1.3 (11 Sep 2013)
+
+  11 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xlsclients-1.1.3.ebuild, -xlsclients-1.1.1.ebuild:
+  Version bump.
 
   15 May 2012; Alexis Ballier <aballier@gentoo.org> xlsclients-1.1.2.ebuild:
   keyword ~amd64-fbsd
@@ -237,4 +243,3 @@
   08 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
   +xlsclients-0.99.0.ebuild:
   Initial commit for modular X.
-
diff --git a/x11-apps/xlsclients/Manifest b/x11-apps/xlsclients/Manifest
index 9c78b7d13837..98e6a4eedfb7 100644
--- a/x11-apps/xlsclients/Manifest
+++ b/x11-apps/xlsclients/Manifest
@@ -1,16 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST xlsclients-1.1.1.tar.bz2 109742 RMD160 5da161d038782d3b2922defb33220749a76f0dab SHA1 67bfdcb089e8669df7ec5bc7a137e037047f2535 SHA256 453b5e13a61d4b2a2a52ba75d529c5d761bbb65ecd65fe5b7b0121402a0be859
-DIST xlsclients-1.1.2.tar.bz2 114703 RMD160 d084896124d564a30b342f09f42ca5a7434f57cb SHA1 c4051429c190444ae9ba327f0ad776a74eb7b27b SHA256 1ce5f3987b63ea79b3f8421fcb1dd9c739e99efa97f280eafd8e93574b9027d1
-EBUILD xlsclients-1.1.1.ebuild 456 RMD160 5826ef4166a2e77bc7ac61e96965b09fc1e0863c SHA1 c46f127996dfd39e13eaf8da4d5b7021f5ca9645 SHA256 5e67e926f71a2b59041b6cfeb70d54519ecb3b96a7b1dfcb2f5a33248758ab3e
-EBUILD xlsclients-1.1.2.ebuild 479 RMD160 a2913613ac9df66d671134d1746d253fbd7bcd7f SHA1 02c3fc65e2e26820e7de4aff808849530429ee4b SHA256 0878655d96dffbdaa84075c01d990ab1340b4d1600df8606476f04ba8594350d
-MISC ChangeLog 7418 RMD160 0169cf90e9b704848ff344a2c7be61f2d3d42d6d SHA1 54f713fc20366460f5733611bf8ea916eee8a49b SHA256 f420aaf27d428364058938d1765618833080244c8f843c3b973ec14cf7fbe75b
-MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEARECAAYFAk+yZj4ACgkQvFcC4BYPU0p8CACgqIuHsQnlPMHnd+KKyurYioT4
-BmAAn1pkJg0v96h/Cfdrw2G02clxC3l5
-=1KF9
------END PGP SIGNATURE-----
+DIST xlsclients-1.1.2.tar.bz2 114703 SHA256 1ce5f3987b63ea79b3f8421fcb1dd9c739e99efa97f280eafd8e93574b9027d1
+DIST xlsclients-1.1.3.tar.bz2 127324 SHA256 5d9666fcc6c3de210fc70d5a841a404955af709a616fde530fe4e8f7723e3d3d SHA512 4266068b96bb0bf565021fbda726511a387800fcc81b6b53f3fb847ca6a4de50811f66ca1423a56414619ad6f3b4d2dfb235106a1eacf9e5def8cf49c2b2ba85 WHIRLPOOL 6d37ebef099e8d2ca511442ef21cea9dd698f2a920abfc7e0549889f71df4b2a0608029daab8b547cba667933f321c6eb87507c501d0d8e3a5f5d83dea519d94
+EBUILD xlsclients-1.1.2.ebuild 479 SHA256 0878655d96dffbdaa84075c01d990ab1340b4d1600df8606476f04ba8594350d SHA512 ac6c7743a1456fcdaee5dd7545aca9c1348e32bedc75df324f790134636fae525e72cb6d7be35adde28d63223998710a878a891524ffc692a78928174bb7ce71 WHIRLPOOL 1fbc35139060ff1bae4d92d4f998c33e2900861277a9a3ff07fe0550494792df5352dda77e2a08f034e1fe461b8946d29be8652bfefcfda82b05c5dc80b05ebb
+EBUILD xlsclients-1.1.3.ebuild 490 SHA256 fa5c518db599df7269c7cb37fca978013bf5c7f1cc8a99568077a38853cdc184 SHA512 8c9880d2ea7ac028f403c381026f6c9a1cf4bb08f3df2bf04b736ef882e9cf234e4958bd9d8c8fa16632759cd09494c33a1f51f328411bfb957c2c6393c90954 WHIRLPOOL a7f8d641093a13ef0f1e8e831e88610d82821ecf387f87b4c916b322e003ec1c170caaeefe1190c8fb58f06110d748c2ba85c530bb14461d3e080b481493f0e8
+MISC ChangeLog 7590 SHA256 359cd53f24b38b4c5085bdbc512c29e4ca65707f71c6fb1974aa3d910deeb72b SHA512 49c3758dd8c7d7108f59d59d391145bff471f741ec82e136ea4ce5d05d89888d355981018f5c5e24c0a5b01e1a15919aa4ce535e9d12025c254a4c8b13a7b9da WHIRLPOOL bbaa9737832679ec570e997b33c5d636f7d389126d23764a00f1637e22103fcfda41bba086ea2a2f726c886a37fff38e739edbd75f6b34a5be82c36161183930
+MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
diff --git a/x11-apps/xlsclients/xlsclients-1.1.1.ebuild b/x11-apps/xlsclients/xlsclients-1.1.1.ebuild
deleted file mode 100644
index 43a269cdc253..000000000000
--- a/x11-apps/xlsclients/xlsclients-1.1.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/xlsclients-1.1.1.ebuild,v 1.10 2011/02/14 18:43:22 xarthisius Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xlsclients application"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libxcb
-	x11-libs/xcb-util
-"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsclients/xlsclients-1.1.3.ebuild b/x11-apps/xlsclients/xlsclients-1.1.3.ebuild
new file mode 100644
index 000000000000..01eedfcf798e
--- /dev/null
+++ b/x11-apps/xlsclients/xlsclients-1.1.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/xlsclients-1.1.3.ebuild,v 1.1 2013/09/11 20:19:11 chithanh Exp $
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xlsclients application"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	>=x11-libs/libxcb-1.7
+	>=x11-libs/xcb-util-0.3.8
+"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmodmap/ChangeLog b/x11-apps/xmodmap/ChangeLog
index f35ef54deafd..63145b7b6d72 100644
--- a/x11-apps/xmodmap/ChangeLog
+++ b/x11-apps/xmodmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xmodmap
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/ChangeLog,v 1.76 2012/08/26 17:03:54 armin76 Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/ChangeLog,v 1.77 2013/09/11 20:19:28 chithanh Exp $
+
+*xmodmap-1.0.8 (11 Sep 2013)
+
+  11 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xmodmap-1.0.8.ebuild, -xmodmap-1.0.5.ebuild, -xmodmap-1.0.6.ebuild:
+  Version bump.
 
   26 Aug 2012; Raúl Porcel <armin76@gentoo.org> xmodmap-1.0.7.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #419473
@@ -272,4 +278,3 @@
   08 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
   +xmodmap-0.99.0.ebuild:
   Initial commit for modular X.
-
diff --git a/x11-apps/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
index 08615f8f092b..50265d0416ce 100644
--- a/x11-apps/xmodmap/Manifest
+++ b/x11-apps/xmodmap/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xmodmap-1.0.7-_GNU_SOURCE.patch 1266 SHA256 8898c20c98aa4e7ea47ccbef820ba74447e5924168abffd45d7306cf81877f60 SHA512 1cf6326718ccb307b89f1e9e4766778cd201d31dc04d7fbac5245c6646b6564dd3b85f8cbe04034bf8efa6a31325729d0a8b04bb91d483686561fa0f06d65d5f WHIRLPOOL e890dab209d910178c6bf9eac7b0e7ca09cb9d66459ac0c88ce4545621e8ab0ea21279edc6c26cf277d3d313a09e1a4ee7278793a4e50016f47d7e5eca4923df
-DIST xmodmap-1.0.5.tar.bz2 124742 SHA256 421ee7a17b0cf559c4901225f70c497e3c5ca205ec7dcc84712055818d2f3402 SHA512 c07c1145a5bde9ed7801ef7c29aa38226ad92f1cf15f6471970aacf4b512483e1523eca47a3eeb148b2486e0d0742b3c0e21a8345d0861b31a8e3d9bb03a40c3 WHIRLPOOL f75d51a51f369f884d389b479470705ad6c1c1a4a02732688b65ff5fa48f5adbb013d8f10a0f29dbb2e9c24c1df86e3fbb395d25c49f473742ed4710a3e6630a
-DIST xmodmap-1.0.6.tar.bz2 133170 SHA256 c58bfc948b11877c399b03240a83571ae574779b9c531f258a17acadaa9f3a5d
 DIST xmodmap-1.0.7.tar.bz2 135223 SHA256 ef22ede9c4a3c720da539292c6911515a8408e618e0dec6aa2196ee2153de4b5
-EBUILD xmodmap-1.0.5.ebuild 540 SHA256 adbc16dd4e068aec78147361601d3b588dae5f71582987736a17c0c2ab84634a SHA512 6225e7c34307d0fd3905dfab91d4e3d0521784b5c2c76485235fcffab0d85b1a22225579086652fa5dd42d5c278303a0c3e698d5d81cd7c3237341544232de3b WHIRLPOOL 40343fdab6fbe9530e5280b27fa8e7194809e6a0f7de20223ff6c42c4917bb5ba9d11e0a98685d94e689a64ee8385229c404e911d41d02ac80e739f1cf298898
-EBUILD xmodmap-1.0.6.ebuild 549 SHA256 c5c21be30bfde8c6b2c9f1d079ad260bdc78e556bbc29cff67e782b2821bc27c SHA512 619a1baaf67335b8b9bda8acb4df98357932ad1821a35a11d1bcbc56452314f4a60c0bcd524a20a4007f8fc9f6e053e437f5bec16299eba001084fa2aa3bc285 WHIRLPOOL 364af87ac3432064a0f2288fca84c550fe2bafd79367a20ffc78026572993da8f8abee578a490d354243bceb4297ee7670e460d6b5800bb673509d2154555709
+DIST xmodmap-1.0.8.tar.bz2 141026 SHA256 efe2e3c89858a2db3bdcf969f55f55d0af4f5007789198344de0595249a99fc3 SHA512 716cd1ee2cdb1db31b84c018eb223fb3eb05d499a7e76e0bdf038b58a5f71dd17631c8ce39d8108f6c47fe11fad718016f2891baa813b35a9dc607d3a3946a63 WHIRLPOOL 2f33c7ceb879b13605f1d5d3a50c4896d58845477034a1cadc3a74938e4839ab4879db6c518861803efc8ba4d719c295b34c84bd70ee7e9d746d42bd837dac70
 EBUILD xmodmap-1.0.7.ebuild 600 SHA256 053d652b2edceda39008e697660c769518af4421fd292799a2b65994f46812e9 SHA512 fae290b1f6f1ff903be1f1996f0eeb0f553c458c2aca979ba71dbc03789b02597093c6eb9758463946d76ffc6d7dac09dda57b245e6a7f9f49f605953da6488e WHIRLPOOL 9075282454731d8d6c080cd19e5367385d046406657e2b12817181b803296e44bd64da1af62117beb61578b93c693770609038e7525f9579babf80f2747813b5
-MISC ChangeLog 8663 SHA256 880a68f190117d75c46d05ea38858bab58543965b4a08d4820d02fc36d36d482 SHA512 0741aff897d7283af9743d73d6f8b7ed9be8930add3dbb432cc502c52213a122ab71574e8d6eecdfaab8541065880914b263d5a5f6f22cd0c8b01e36fac0e7ff WHIRLPOOL 2567f531f5e963ff7c9ac31f53bef8961b216a8f39c71c7ae183be1c80f5be17cd568ba0e63e098ba23abdfda2846456f2de14efbe904816b0e88811e4e0af0e
+EBUILD xmodmap-1.0.8.ebuild 561 SHA256 4362d2e8e09b6c439a7ffd35db574387a539ea93194cda0fc0ef1014317e07f4 SHA512 870d7e15ac7e795b569c7636b596a767d0322fee2ce84d8d8b977393aadbc5a53f030418fa97700517777d83d904fa9fedacad4b71a33c1247b4f912fb6d781e WHIRLPOOL 59a0bdebdf1d0637601e3ec14b353dd2c234c503b8e5d5da90d765cdf08f43394a650eaa6d3e494b8ec7a801f1f65143c9cd38e48d0e253cacb52e380a07eb59
+MISC ChangeLog 8850 SHA256 5af48e2e5466f5cf905bc34aa0c240a3b33ad385c2a6270877536e14ab1222a6 SHA512 487e9788a056ddb288fc30cdd51cd23962412c496f1d5208cd0a1df14d396069f7d875422d868edf7c19fd16442a8b3d6244e198a099c200e51b7b0fbc4ca710 WHIRLPOOL 874e87f4fde5b0c5b47b3b0e9c2a1d0f48576a8b9787f0ab30369d9d363815471d73183e05ffd66ed0228d303dea9630ef91696a461c06767f20c83f5ed79ac2
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAlA6VwEACgkQuQc30/atMkB2awCgi1ktlMAgmPzZcnV5VvsWiJxB
-vWQAn1ZaVnL03mR0l3qq7ruOqm+EQ87u
-=ONqv
------END PGP SIGNATURE-----
diff --git a/x11-apps/xmodmap/xmodmap-1.0.5.ebuild b/x11-apps/xmodmap/xmodmap-1.0.5.ebuild
deleted file mode 100644
index 2877b2421ff4..000000000000
--- a/x11-apps/xmodmap/xmodmap-1.0.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-1.0.5.ebuild,v 1.9 2011/02/14 18:53:51 xarthisius Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmodmap/xmodmap-1.0.6.ebuild b/x11-apps/xmodmap/xmodmap-1.0.8.ebuild
index c4a9fe28f798..92dd3abd462c 100644
--- a/x11-apps/xmodmap/xmodmap-1.0.6.ebuild
+++ b/x11-apps/xmodmap/xmodmap-1.0.8.ebuild
@@ -1,14 +1,14 @@
-# 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-apps/xmodmap/xmodmap-1.0.6.ebuild,v 1.1 2012/03/23 15:36:22 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-1.0.8.ebuild,v 1.1 2013/09/11 20:19:28 chithanh Exp $
 
-EAPI=4
+EAPI=5
 
 inherit xorg-2
 
 DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libX11"
diff --git a/x11-apps/xrdb/ChangeLog b/x11-apps/xrdb/ChangeLog
index 7fed94e70869..8bd5bd8ae1a4 100644
--- a/x11-apps/xrdb/ChangeLog
+++ b/x11-apps/xrdb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xrdb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrdb/ChangeLog,v 1.93 2013/06/05 00:42:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrdb/ChangeLog,v 1.94 2013/09/11 20:19:46 chithanh Exp $
+
+*xrdb-1.1.0 (11 Sep 2013)
+
+  11 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xrdb-1.1.0.ebuild:
+  Version bump.
 
   05 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml:
   Add upstream CPE tag (security info) from ChromiumOS.
diff --git a/x11-apps/xrdb/Manifest b/x11-apps/xrdb/Manifest
index 1507770b9800..3b2c1cf38ef3 100644
--- a/x11-apps/xrdb/Manifest
+++ b/x11-apps/xrdb/Manifest
@@ -1,24 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST xrdb-1.0.9.tar.bz2 118971 SHA256 642401e12996efe3e5e5307a245e24c282b94a44c1f147e177c8484b862aeab7 SHA512 f8c9c09620d0002be1766de1c5c92b74263a9fdb40cce82b1b8db2c14f1ba1a561fa4a206730623f96b776b25e878154df3ad26bc00eb2535c60a17165d3bedf WHIRLPOOL d88b6bdac39ad119bab311f81e80fff05b03c1b1df4dbbb25278e645c618d61e327d650d2354c5475aaef4486167bb37b58d23afa24760e41c7bdeab9f3eb6b7
+DIST xrdb-1.1.0.tar.bz2 138035 SHA256 73827b6bbfc9d27ca287d95a1224c306d7053cd7b8156641698d7dc541ca565b SHA512 8e2a177653d5aa895c71ed3640e0f1dd9fe8bf5cd6f0c6ff7e372394a2a41c3aa2286905fd9c69e3d140024d235b81a1f32b5d4012b1ac5ac1ed945599dee407 WHIRLPOOL 8d595bd3ddffd8153c2dc6c0af2072eea9fa5ecb76782ea5dafc589395809c2e88b527e54ad551de2728691631cc7307c17290e46874254764ed6adc09ef9239
 EBUILD xrdb-1.0.9.ebuild 564 SHA256 c86ea114a9059f5a4f63350d7cfe6044a8a731dd84574512911c311504bbf3fb SHA512 8c7c8f33b4f2adde41c14c8065a961c97b61026a91a680abe16ec5dd77a26e1b51d69fb52b901d46e0ead7110bcd573149d3ad4f7dad28f9e09407ae80c6042e WHIRLPOOL 01de946fd99fe2c9c031285609468a6dc425499a010eccff646c8f0f0ebe5b76c3273ca17e7e9936bcbefb0e9de37f2dc062a0c07ea3fd49c66056227835a9b2
-MISC ChangeLog 9956 SHA256 56d720edd38b484bf80e3e2dc97f09220254ad579dfd37aab53d1a37c4159c78 SHA512 61211626ebccadc98a7bad93057dfe500d4440a93a208ad8cc28c82d898fcada5c2bb6892831a5d8e258c8992db5acc01b124683c8c18d874b759492db2c807f WHIRLPOOL 3e70b8bb2b79286b0d3637947eb971df7224c7bd987735c4f1a90ab5cb6d4f3a0d0464d2c50bb5bd9cef5625a87f7f0ca35c6f19939b50e9da00cca7d2bc4b40
+EBUILD xrdb-1.1.0.ebuild 576 SHA256 b386f598862a6cc16555cfcaa054e78422ba1638b69fa237bb4ea4ab5a6187a9 SHA512 8e49e8212dcff25e56bea1ae72d21df2b40d177f01303e35d3f8527a418828fe665f202f1e1f661566e8f6dc623f6a8c5e0ceafdffc716bca9b50207b9b88db0 WHIRLPOOL 039e2886ef9ebe4612eba32365afa30cd5c369db9480ccf7a40e0aa0e59fbbb6d5568610528fa8621f3e2dc6fd38109f7e88e7175f25ba019f7f541ee12c5c69
+MISC ChangeLog 10093 SHA256 5e5302018ee857464e458cfc2ee91b74501e79ca50307ec76f402db44c83e06d SHA512 ea883014f4dfbba2a9f9e81c74cdd34e4bea765034ec0025b3c69cb3e4413bda3b389abf52b52dced4acb0f3fdcec1c0d65bc29e12242a5df8693774c2c0be60 WHIRLPOOL 86f3d31b29b78e29f0d74ae7c7c8eafccbad7da217bc950bd67cdc17023a2a0e1cd1693ad7dd0f6b7c8a40c9e99f30da9ad8f7a0d697890cde7561ce4e279398
 MISC metadata.xml 241 SHA256 d05a2dfe45086fbf64d2fffbf092d348adafe383e4479b90161f32a44d788e92 SHA512 eb2c9278cf8bb041db1b0c5869bc3b23a921b2582382cff25460d4af163b9151cec8aafd002c296ac0f7669335c95cfadc16311c57fcf8b281d714ce97a7620a WHIRLPOOL 876737652bddb37de9995d1f0f9757aed094dd2697eed55cee87be4fcc3a893f2518f42d584e8d5f06989c954e51ff0dacc2f9abc0cc3f09e8b181c1e1f6eb5f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRromHAAoJELEHsLL7fEFWhicQAK1BTa3ceGp7e8VK+4Q1r2Zk
-pUuXlptA5xPJT+96jGnDTmo1oEl1ZCocnHokdtxFTUubSqdr1WB7ISXf8Y1LpXXD
-HaGmJ9f/NkcAPrylltUt65gxVtPF46+7R1nkzltmd/lvgj1KUNtn5e+LjPGh8s4d
-lSchJsXWwq15e9vzbB5gAMCoMREgarz6DAyOlvfXT1+/lUy1jhAY3zwYzPv40XqU
-zN3fYhKR0OxLS5DEacWkD5Nxy5yhF3HTkzCyeR4KlCquJke9P1bcFOHTHv7Z2dD1
-JL4iQyG3yBK9NyRohfD+uNYA+mpUjLzv1MYcqSxX5SUtqQAUddCixzlf+3LTeRH4
-MqaFu8WHfCFHNhfCOUuTLZAeOxFjUA7tnRK+5TbACH3i8GXdTwkSDcP2I0w19Tw/
-000yLSEBVVeT20aQ29ARzKt59zD2BX3Iu2u0CQE/sbPHhXDw75GYkvTP6+MasQug
-H/8K2OJTrBe6VBj+2bXTZEUgs8arJJ24kxOOo3hKfOdjLIweTjptNatkhPEYYo8P
-lCQP/AxwSe5OVlxrqj8/dGUR6h7bEVxSbZqp5CmWjpT5+gNMQ0NIc8tMtQgSzXTR
-FDSrOXQZ8/tBCtXyzG3QuxawcI2bpwBosdRLdz3cueT76LgB3l7LC5rQWqxTwYja
-8K/+hF0tK1KaX4Il2Z1d
-=ooNp
------END PGP SIGNATURE-----
diff --git a/x11-apps/xrdb/xrdb-1.1.0.ebuild b/x11-apps/xrdb/xrdb-1.1.0.ebuild
new file mode 100644
index 000000000000..d528a64d5c25
--- /dev/null
+++ b/x11-apps/xrdb/xrdb-1.1.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrdb/xrdb-1.1.0.ebuild,v 1.1 2013/09/11 20:19:46 chithanh Exp $
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X server resource database utility"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"