Version bump.

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

6 files changed, 31 insertions, 123 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() {