Version bump. Remove old.

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

3 files changed, 43 insertions, 16 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 5e47ed6834ac..faafd57df17a 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.254 2014/03/14 14:38:55 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.255 2014/10/23 13:39:48 chithanh Exp $
+
+*xinit-1.3.4 (23 Oct 2014)
+
+  23 Oct 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +xinit-1.3.4.ebuild, -xinit-1.3.2.ebuild:
+  Version bump. Remove old.
 
   14 Mar 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   +files/xserverrc.1, files/xserverrc, xinit-1.3.3-r1.ebuild:
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 4a6126ff8aa8..db0ef599f4b8 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -7,10 +10,29 @@ AUX startDM.sh 923 SHA256 e7f2d95b3b4b6b5d711f926f8a3b7b0163b4d9e40b40489bcbd131
 AUX xinit-1.3.3-gentoo-customizations.patch 1494 SHA256 8405f913acc9a6654a979d55555cb67187b3bee881ef6a452acf943b56cdc429 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b WHIRLPOOL ed7d7d141c4c6a908f3f42cd6ae836b522b4e9a6598e2ec8a11b631d1d4f6494b9a54c60570b43ab55f10e67e52caff074f8f4848547666c33c3092476aa6b95
 AUX xserverrc 45 SHA256 86835010b5350c41035495b7b845db0eecf1e4b7eeaf152b12a881fa502e5387 SHA512 f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b WHIRLPOOL d6b68b3b63995688dff5a52d246164860091b3d30517b1cee5ac7c7d791e3a6f3356bf4d494f209b783ba8266f213aff6684190c2592e0f729017a8870e492f4
 AUX xserverrc.1 132 SHA256 5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f SHA512 3cc3b18cfc8076badcae62d098a0c3cc0b654ab691b9e7a64f456f5428f1afe1130c9c033b106cfa2e566de22cb75756d71368e3c0a7474b8a76f63c1f91a918 WHIRLPOOL 7e8fc7fd5c726f5cf4e80add93a97cfd48651db5383c2c5b02689ce3d49ead91579154320c77b7993f7d18b3b2718a9b90ad94c526f49fce5d8160bc4c62474c
-DIST xinit-1.3.2.tar.bz2 148443 SHA256 a1867fdaa83f68750b12ba4305c3c62f5992d0f52cfeb98e96c27a8e690e0235 SHA512 bafe4706ee09b7980518af54dbc7d4cb971fcf4aaf4ea575d58c7102258e63a838c7e4acd6a4267d10fb8253dd779c1a008a8ab64164442b902bc0b19716197a WHIRLPOOL 0ba7b3a3aacbd8aa47e03e9346aca651dc00efc0420bc6d3fbb6dd388428af0ecfb3cdc7d91a495a0be6b8236fda4a229b0311dc6c037f435e95f2350dfcf1f8
 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
+DIST xinit-1.3.4.tar.bz2 165881 SHA256 75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3 SHA512 ac31e4cac86fc5dd4c0e15cf37cb9ac470ef3ace4f86d0063c7e1091342fe64d41fcd12c1840bd8e1cef4cdd7f66bd2fa76bd4061641e9c70941d76d73d0df2e WHIRLPOOL 2362d69caffcaca6e6d284fcc7438fa6a81c36e79a20f23d32a67a5de9e6d64a9680d2f513e6718312d6e25117af90f28c17f70da0189595021198390eb12222
 EBUILD xinit-1.3.3-r1.ebuild 1813 SHA256 d0330e6e0bba6d1c60af4185c2666a1324dc2e3b286d470825f1c5079eed5b43 SHA512 a6ae23e94bd7de4bafa5679f248407ab57a1876049c7dc4815f895685843a45f56299ae90d293f79911af2b94759eac62ca16497427a96f4993b129b95d0e30e WHIRLPOOL f37815aec2e953195affb731b56d7de0681131550a42893b7030461552cdb8b7207bc6ef96fbb84c0887a6c4f7a5c5416982966a39cfc087b1e8beb39c32bf6a
 EBUILD xinit-1.3.3.ebuild 1784 SHA256 786de825478f286838c7f77e1359c1e12efdf6861a93fc6015ef8cc4507012e6 SHA512 de3a7423c8ea9d024924bad079d83f33516430cc9c0884904d75b48b985747b33ee7c9ddc59bec2dc97a68634936a14929490c4c830c87564e64aa8f7c058368 WHIRLPOOL 2bedc6740bb7b303b729ac2059eda91ab5242f705c57518e9dadd2cb23f5fba3a6f07e19d07af653e86c88cae9e68b47c7b2440c8309ca88ffba998ffe18f7b4
-MISC ChangeLog 38009 SHA256 37f290d385e88e95963d76726fe4adf4cb16b49bda8181a3528418d04dc3364f SHA512 fbad6767c47a9c0f5bd61b8136e36fc78b571a709f8127453725a69034c109745c178198173ca56e8f102738308ac9bc95cbf8ef63f913f7cdb171da230b24a6 WHIRLPOOL 336b786e9bb7aa8d222a78f5292657476d95f33ffd0453b85f5dc6cf87ea4cfed2769b28edcf13ef99bcbee0912c5548dac77d8ba16ad16d3d4b911c0d919b1e
+EBUILD xinit-1.3.4.ebuild 1810 SHA256 cab2e1290415a295cf98a807ffd6309d1fd9067793695d1037eabd3e851cb9a9 SHA512 10c274fadc8baf9d27ff5bb02496e7cd7f4719a72634db1054050ab3b97b35884d35936faf3c42382d5d36ee6b4dd779af2ba13ba55238819cc4db0ab7c07899 WHIRLPOOL 02d61ed9596a5e863aab33be0d08445a836a72b082e0ac5a5d4c789428e6cc35a5dbe0118bdc11f49c599c1120dd38f6d08b4b504640312b70b3582b91c712d8
+MISC ChangeLog 38179 SHA256 da4724bd083832b1e04674f947f4441353bf0d38b3ac10557eb70e58240c5301 SHA512 1edc3ac1be6a38b31ebdbaf0c1930b970b8446aa03406aeadb3db93a11c1a423ae38d60b50f906701e3513c540733404050e85eab4a4d3cc6950c818ec1df319 WHIRLPOOL 33fa3cfdd7750f6db62aa52c75ee3b0c8cfc2d6d690ae57fa18647f7c9a056fa86a5a5acb76bb85d7647605f1c7bdfbca9210abbfc9aa657bd32240550edb0ba
 MISC metadata.xml 403 SHA256 8b907c5c30247ef4cb17fcf9dbaead16f3e6fd3b112d331b686cd6accd410f08 SHA512 6d64681045ad9dfe42c54d9e625a7b2f120eadd223d753ac79483aef5f03b819104168b9b5124244ce825bbe2a69ca32b1bc8176b85d42694a7b0f94f840c915 WHIRLPOOL e6ece8bf3d45c1697a8ca62a34360f5966bb07d2f938a606fefbcf474c4ba9a94356f824f1b6bf8dd7be0c7be169eee163de8dc1b9f000822ea808b6d8d567e6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0
+
+iQJ8BAEBCABmBQJUSQUoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRZ+wQAJ1W7ZuD/ng8Eu/8klTv44Cz
+sP7JXj/uhI5miijp4cH0je6+uP6/m131YeOGWpJYfw9BSS1CMR1MA/D9xtn7erJS
+MPxLfBbqdpYifs2pzfX1YC9F66qH2YOxaUF3uAC5uN2r8VOkv3RRQ1FkL123oxLn
+hpZs/fmUhZpBMAW/GFzLf+GjIoe1y02hFNpg0HL6BKWSF6KQJsVw90PAuzDA1MWZ
+okQPa3MMNAya0V5cz5Mq49NaMRR54w5HR56aAewNeSIlf9MjyNpMevQhsYbJ4CZe
+YCE7EPda3M72g03H4OYf+6Yf2jfwMRSUKY6AeyueyyV+ad8CU3zSP/bGiKi82OW3
+SSn4I6p8LnbTpcGnRBpIONnnU1TZdHPcEptt0ZMwC4/Kay6Rl8WMBpm6OOHY1X5w
+NaZK/UjvodBXvucWy2GXmL0VxxHnT57MeB2VK518NKwP6XyPPgPaIAbYqharA/qh
+nlnbGpyt1igQCaah6XxpiJ8lqUHEoHB5Qrnlzjjg9/C+jxIuYovfOYgadn+ikR+y
+jdakzZy4DOKbG76uUFq4hYDRHFe5HB9Cv0Vy82jX7bvZG86F4m/keIG0ZW9w3Rla
+ZI1syoI/e9YbLi/UdXGwzO1sRjsh32XHMssGrO2LTR2B4XVJYiuZ1z4w17Z7HSuc
+VVEYfqrd8IWtemZH+qxJ
+=5K5n
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xinit/xinit-1.3.2.ebuild b/x11-apps/xinit/xinit-1.3.4.ebuild
index 1e22975a86ef..423168a03eb3 100644
--- a/x11-apps/xinit/xinit-1.3.2.ebuild
+++ b/x11-apps/xinit/xinit-1.3.4.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.2.ebuild,v 1.12 2013/02/27 06:12:46 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-1.3.4.ebuild,v 1.1 2014/10/23 13:39:48 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 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+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,15 +28,14 @@ PDEPEND="x11-apps/xrdb
 "
 
 PATCHES=(
-	"${FILESDIR}/0001-Gentoo-customizations.patch"
+	"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
 )
 
-pkg_setup() {
-	xorg-2_pkg_setup
-
+src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
-		--with-xinitdir="${EPREFIX}"/etc/X11/xinit
+		--with-xinitdir=/etc/X11/xinit
 	)
+	xorg-2_src_configure
 }
 
 src_install() {
@@ -47,12 +46,12 @@ src_install() {
 	exeinto /etc/X11/Sessions
 	doexe "${FILESDIR}"/Xsession
 	exeinto /etc/X11/xinit
-	doexe "${FILESDIR}"/xserverrc
+	newexe "${FILESDIR}"/xserverrc.1 xserverrc
 	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/00-xhost"
+	doexe "${FILESDIR}"/00-xhost
 
 	insinto /usr/share/xsessions
-	doins "${FILESDIR}/Xsession.desktop"
+	doins "${FILESDIR}"/Xsession.desktop
 }
 
 pkg_postinst() {