Add USE=suid support by John Sheu from ChromiumOS #419485 by nzqr.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 22 insertions, 10 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 417102094991..a1c9fcbb3cb8 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.699 2012/12/17 20:38:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.700 2012/12/20 23:48:57 vapier Exp $
+
+  20 Dec 2012; Mike Frysinger <vapier@gentoo.org> xorg-server-1.13.0-r1.ebuild:
+  Add USE=suid support by John Sheu from ChromiumOS #419485 by nzqr.
 
   17 Dec 2012; Markus Meier <maekke@gentoo.org> xorg-server-1.13.0-r1.ebuild:
   arm stable, bug #440872
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index fa8a80f943ec..0322993e9a9e 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -33,16 +33,26 @@ EBUILD xorg-server-1.11.4-r1.ebuild 7332 SHA256 7270d4e37cd84cdd583fe8b2b5f36b5b
 EBUILD xorg-server-1.12.2.ebuild 7046 SHA256 62b3c7e9d4a0deb32a7fc640d2f2237eda38fb73bd7e63430661aff996b6f269 SHA512 1080d27be4e788b8313e0a494e9fb912064d6cd763664212782422ba4cec33fab890e40493a6a43d8c0acb29cdf520f55eb2896604193f93a5d68fbc9b3960e6 WHIRLPOOL 1aeb80dd08a682ca99f271f55f8b8d72f8b397e0e77d6c8b813b9bd6b8952dd1aaaf70cf207ec0daaf1af7b737c7f9d6b45d2f145bd880d7da23b15509e160d4
 EBUILD xorg-server-1.12.3.ebuild 7004 SHA256 4b7efe23c76990ec9666226110589360822205d37404792bf044f00fc78296de SHA512 2ee65bde5f15152c16aefcaa23e5ef0326546952a3409effb1965f6d2770062ec41542e5fd79227e76c0f134b48f7082e73d4de9c1438c4616d772c960ebf673 WHIRLPOOL ca8a090444a0f01e71ff3878fa1fe1e6d928a6644a7352337aebf467138712bde7a2bd6e2dd0601fb75c2a3e89fc5d392a98ec55368b9fb4aacf034b6b19da38
 EBUILD xorg-server-1.12.4.ebuild 6997 SHA256 ab1496e0d24a1834fc7cca6ed0466bcbcb012b78583802fb3823d4413a5c745b SHA512 115b38b000a26afa5f0ff8b60d8a1dd29179b4bfcf7d9d4ac0ce5f43296d825ca46c501755540b67f3918572c75fbf29e8e1a3b3a5cfdb1c053da3db4162ea80 WHIRLPOOL 726b82a0ef7409e3e751cfa3124a024943f7962fc4ef174c7dc883c7bdf647115f1dfc925bd5577c11c17bbf0b0390dba33824de1444d193947d069a83c2b69e
-EBUILD xorg-server-1.13.0-r1.ebuild 7129 SHA256 249b525df6867d45877eaaf2521babafb5481a231c5ad4a2e8a6100270b64407 SHA512 4651bdd6f5e8c86be80a9ea536b453d980f680d72c6a9ad1f0306a80f1cb3c8fc75fa5614ff5f64af7ad6fecfd5ff2e80f0216beeffb12dfb0076ac7892aedf7 WHIRLPOOL 994ffbd2306cdbc0e595ccecf1b0aac6bfb1d70618df07354c2d436680da98fed6733293c434471328ef7134753d91336a8c8be56ef05687fafaa79ea38c6d24
+EBUILD xorg-server-1.13.0-r1.ebuild 7084 SHA256 027ad3142d5ee3eb9a035855dca044c99798b9100d2a452edbc0a6a77c155c63 SHA512 bdd6156489758b86e213591120ffd6a3e63ba69ed2fd7ad087fc2d5d1ce5e16a29d0fb9e7f2e8fc6abe0d80d0f20696720554ea7fdb77ffd6424dac1b3688f6d WHIRLPOOL 080c9615d73237fe4bbc0b7001558a2c35a86c2b8c60699faefdea9b89ea7acea479acc5116254776ccee54ed64743dda3f777f2d9168a536e2e14ed9eaaa2bf
 EBUILD xorg-server-1.13.0.ebuild 7027 SHA256 eac7dae27dca9f0c1d19c1841ecc18a1ed77c64a3ba9ff9dae4773cbe90c6ec7 SHA512 b35e4c55e4b9731bde44057623653585287745d653be6b003071c6a03ab444688434f08b7c5ebe45a6b042b07c42e2dbd573cdc59bdf8bd990bb7ec3e8beba18 WHIRLPOOL 3aeba2635a102a4d2cb93ac47e76708ebad82a5dfb6ac618b2c378f31acd4cf4545103fd36388e72d1d2a015e6b58fa568f0b49b2648844807df2225e6073aba
 EBUILD xorg-server-1.9.5-r1.ebuild 7865 SHA256 4e75f287de81b0e5ac59841964d55e3479e51c6fa7bf3882e665f25e3ed9c62e SHA512 56a0418baab28f111bec6a4c7377b50a7320c6af69793132c791b01988863c6da3bf3239f10651cfa2893f53075185cc403d925d280307b5b8113e54477a4f50 WHIRLPOOL 83d8ab8b50edf55ab6603d9424aebafc7fc15b3a71e62df0032c64a057f28ed15877683b8c8bfa2fcd8df4f48e2306c965dd4cfc3b4e30f5d24537dfd7866634
-MISC ChangeLog 36772 SHA256 18cb62e127c3215d4bd303ff2492e4f9e67541431f9350b8f0414e6b29860430 SHA512 b3002220ebed3f7b5c3668bafd96622410afb05a95c20b9fb0c744cd743d0533e3cd8eaf7f9183ce894b2e2c59b69848ddb8efe0d8112d41911c70115f81c761 WHIRLPOOL dec7a35228b1fb8ae6d23fe248303a804e0482cf743a406f8edfcf5d13e87238d030c5ab5b8676257164bd63d80fc9d325686ef01bd6c9a15dfc360c46f90d61
+MISC ChangeLog 36922 SHA256 b30f0314ba296536a96f6d3fbbb0e46beb5d9ada155bf6c3a0615c0b68e838b5 SHA512 3908e72df4e22a4c819cacd143ed67b177e0708357102e403141b270d1ed811b9bf6d5fb9138033212092bdef73b0befaee3da9ae1f4c090b41f7d8b5b1a3f44 WHIRLPOOL 812f331e4f5410ae756f8ac6eb3e5d3964eca92dda3d0163563df0ed6b06c79bd690da9749dcb17ff8711fa31a20e7e8450b8c88a9b5572ce350db81840855be
 MISC ChangeLog-2009 109242 SHA256 76119bd85f64b74b4f8129911eef944e8f1baa3ae38bbfb65bcd6197a6f58c88 SHA512 200b2a1f8d66bc4461de84a5b675ae9bdc1fd38ffea339cdc69afdb613d7a6d6ffe29175fba62b10c4f9d95e050035933f59e21172bf9c545d7a70137c8d04f4 WHIRLPOOL 1c084a461e803c1a6627986cb2444cd7a23743f409df5bb1ca5f55d1e7c3106670cfc2cd4f875a479e0c75513b7937ee35b591b4016b715f7fa45209e098cece
 MISC metadata.xml 537 SHA256 38cd6ed34cf5447cbc3e0a9c4a9e24d5af12e2a12b80b106821bb19e69d2281f SHA512 6b66fd87c679bd696c5b6f7c32026a2bdaf827f3ea375eb908965352c259354dc242321199cebfab72a8d7854e459798ee851feedc18fa36496aec965ca28676 WHIRLPOOL 751bb9c7446f7bfd44674256bee09d05252b03686be445538a1026c2075533660a3895a8d68f4b77cd3575f4cf589df2bcf9a6e1e493c13f169895f413ea6c78
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDPg9QACgkQkKaRLQcq0GKE4gCfRWMeMLbHoRrxU/94CX2KX9dH
-3/MAn1i/y+/ZjJ5WMZI5RJVfkJ14lxeQ
-=UW37
+iQIcBAEBCAAGBQJQ06PyAAoJELEHsLL7fEFWB/gP/i9kWqZuPm4ViSy9+lijWoBd
+Thqz8D9varDAx0gysfJD63DdseZ4om5mEVtF6KTIOacbfq3JNFI2nMPg9i1eKBpI
+lJhodIMq7tFL4cY8Rkq3yCIy0vRETewZ3rqxPDkC2YvFFtqbt3PkySNquVe+Vqkk
+TxByz/q/uMPWeV9w93/bmMwhVNroG+r3Ou16AT76iutt7VP+D2+KIz9AwFPug0PP
+P94MdeZQJbFafTBWjDcIQX9/pvEf8dsrtTCzuirs70m+azrTcx1k6PiLsZlxWRJA
+Lebanyy4sHeqlIt4vPKfJk/rPPK1cdNo04IUKN525MpxQ+x2xxiVVSyYe4KIptjp
+3wdhhau3ZCGkVnlsjUdWB5jSzijak/5R+UTvALwTvjV/YcHBkhk+rBFZhYrPwtIl
+zCABJuzz4IlR1fDzYewoIJbkZ1SDAami+0nXDJ9OQFFfsR3Gk83tn4q3lOBcaOHO
+S+GZ3k5yym4omoXAVolSA+xRaaF8rIZFy24YHPivtGwGwe7TTjFKqzbYTu3+10L7
+R8uYNH6Q+Dd+yBK66543Q6YBWr6O2PBgi1yr9iOZ918C2IGzxg+hq9GUbGmBANPd
+X9dfYa6AfTIhz5vnSnNGcxgfS3XhaFpx67ZB2TA/LSoveek7O55Sj5fk4ejpRIWy
+FjkWR9tY0o3kNcVpMakM
+=HTNI
 -----END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.13.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.13.0-r1.ebuild
index cb08befcd4ae..279226795fa8 100644
--- a/x11-base/xorg-server/xorg-server-1.13.0-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.13.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.13.0-r1.ebuild,v 1.11 2012/12/17 20:38:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.13.0-r1.ebuild,v 1.12 2012/12/20 23:48:57 vapier Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ DESCRIPTION="X.Org X servers"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
+IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev"
 
 RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	dev-libs/openssl
@@ -125,7 +125,6 @@ src_configure() {
 	# localstatedir is used for the log location; we need to override the default
 	#	from ebuild.sh
 	# sysconfdir is used for the xorg.conf location; same applies
-	#	--enable-install-setuid needed because sparcs default off
 	# NOTE: fop is used for doc generating ; and i have no idea if gentoo
 	#	package it somewhere
 	XORG_CONFIGURE_OPTIONS=(
@@ -135,6 +134,7 @@ src_configure() {
 		$(use_enable kdrive kdrive-kbd)
 		$(use_enable kdrive kdrive-mouse)
 		$(use_enable kdrive kdrive-evdev)
+		$(use_enable suid install-setuid)
 		$(use_enable tslib)
 		$(use_enable !minimal record)
 		$(use_enable !minimal xfree86-utils)
@@ -152,7 +152,6 @@ src_configure() {
 		--enable-libdrm
 		--sysconfdir=/etc/X11
 		--localstatedir=/var
-		--enable-install-setuid
 		--with-fontrootdir=/usr/share/fonts
 		--with-xkb-output=/var/lib/xkb
 		--disable-config-hal