[x11-base/xorg-server] sync with portage and restore user xorg creating

3 files changed, 54 insertions, 27 deletions

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 9eab820..e9ed00e 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -6,7 +6,8 @@ AUX xdm.initd-5 5721 SHA256 de1a07296c7248a90fc39212f9b586816fd2f911af71624ad13e
 AUX xdm.initd-8 5702 SHA256 f5f97f5ac47738f352d172185b9256c78562a91510fd3d69dbc87bb3a5d0814f SHA512 daa949c3804d8480a0d6568c02ce2b9f2c3a51f4b630762e119e3faa9d03a4632c76589cb4e6eaca26dce73fe2cbfab9a7bf81726f9c4a65c65895f224b7a12c WHIRLPOOL d292e260d1fa1b85da01a44b009b7aa3d7ff534eabd5dd691a59f2548bcdb6d86218446fa99eca3810648abaa6f033b0299fdda364b232600d1cf4087ac2d4ea
 AUX xdm.initd-9 5700 SHA256 96b1fe826db2b46b08e055d57bffd9405616b7980d9e40e95f19e52bc49eef3f SHA512 a4f652aff6a03d902da7ce1c706396911e853e78031d3246b764cb67930f20935d5aa912834add9f839742e824c380d2793b6b62592a10ad1bde646623b419d3 WHIRLPOOL ebddb96a2552a76f1d2f13b25dd773c822e8a0a5135f950163426477c689d0c35a74946a3323103d604783244e3a2f0bee5f5009b50828c90227370b13c433a9
 AUX xorg-server-1.12-disable-acpi.patch 275 SHA256 1d3878d44e2b8690bb7d1595960d06acee7f86a6a4724236a09a74900404e953 SHA512 ca52ce0931819acf46a066116b8485c3a398a56d79826a5cdb2b3b8c7809e5163e17a5954de370805dc51a3be3c75a0333d5c17c30bf99139105d705de2fff95 WHIRLPOOL 048be09bad947a5ef02d5935534c47d08439f0ceccddcdb017908bf73aa0484a69b0e42e8e6630393323305b31a8008ef8a0f4655556082245bc5fcde254aa5b
+AUX xorg-server-1.13-ia64-asm.patch 1166 SHA256 525fc255734f062758877ad45a29862dfeb1fb8e7b3a476d9410a6f0d73420a2 SHA512 51b8695af30988f99a480d2ecadc6dbe7cb46d4d9461fa006d9001200dfc1bed7390025fd1ebbadc936aee90444bb5cfd892d41c5260d5c33347ee2bdc88e78e WHIRLPOOL 46d8b55b67c82118e2a36a01c739217c6e6dd02228b0a0e730b44372b77b476f4a76fcfa8a584550cdfc87db22c26839890b7719318678aaedba7db761a39c6c
 AUX xorg-server-non-root.patch 745 SHA256 80625533d841d021b79e4b4dfcb0555f9e1caeaffa0056193195c7717c835504 SHA512 e53f4ae7d343c9b4bd7fe820a9a256b3df3539d4f312be7a9c047b631f15c56ec1c99d6ef472239826329bb99e4845b51f535f9eca910e9fb372a3c23d32ffb9 WHIRLPOOL b90b5b239917fa01458eef90fd62ec159d3e6ae199fc42c39a705f97d9a2c5f950435f5e28f5a370431b60d5d6765704e115e418368ce7e3eff1403bc7044024
 AUX xorg-sets.conf 199 SHA256 1201d0337ac69d9715f4454a86dfb8a7bd1ae6f4c2578042fc08f283a997597c SHA512 910fe28f20909243044f079ff35136942b8790f4f28ac42ffc64a76b7f03cd22057087fa5e4e01192080b52c0d89000ea96d5a807c6f11f680d3f43312c5be41 WHIRLPOOL 4acac88e1688ea71df59a86a8a188b5369ad05f61e1369cd620eecd754511578e961a537ff6d0b22156f671d3485289cbc941dfe83bea24a27329b7bebb46c7d
 DIST xorg-server-1.13.1.tar.bz2 5480147 SHA256 b6c91f5156a5463443f0ca95e53eba145eeb431f09908253359934960b303a3f SHA512 a04131d3b504e240917929e9859ac12bce6a3df9879bf127d3e45436647f323c014fdc30a3af00f2922fc49095bb7ab76e6c6b830430fcb326006d1c510e6191 WHIRLPOOL 14311b9dd949a49a07f5909a0530673d65e9ae5aa00f18ac6a6e90d319cb2766fb874e1f6c24d07e6e14b0ba0f7609f15fe8fac1c33d8bf5dad312bae564babc
-EBUILD xorg-server-1.13.1-r121.ebuild 7072 SHA256 c77e8e828410d643a9c5770772983c664bd3648496fda966fb6ac838cdeaf181 SHA512 e33c5164ccf1c040e3c3b0703bc8c048ae6c0bcd6b22998d7dd71a118df426555738bef6f88f5519e977a8e0240c3ada235437d06259eb27794f47ca2d95e924 WHIRLPOOL d9bad91e974844dc93ecd4213061d7c95f01230496bdf88b35ea142a7a3e28805003f9659827e2b649a237b1b46a305f31614fc1d587729bc32129ad55801d62
+EBUILD xorg-server-1.13.1-r131.ebuild 7179 SHA256 bd9a93038d11151a72458d9f587582a700b78d00b477ab93ab57e86255b132c8 SHA512 421534210cda3ddbdf2848a6df56f717b53559ff96981fb5bf42b8f11633338a79b3753d2ebaceacaa5e2a922c28d08e16a9aa03740e68083351daf3b2903ca7 WHIRLPOOL 719683b67fb62687518a7a2e5cd16bb92c39905accbdd263e07dff56b632298ac907c8759ce3ef4eeba64dc9fdf905501fb2fb349ce5668d935771e14a5e6e12
diff --git a/x11-base/xorg-server/files/xorg-server-1.13-ia64-asm.patch b/x11-base/xorg-server/files/xorg-server-1.13-ia64-asm.patch
new file mode 100644
index 0000000..0243704
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.13-ia64-asm.patch
@@ -0,0 +1,21 @@
+diff -ur a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
+--- a/hw/xfree86/common/compiler.h	2012-10-14 01:38:50.000000000 +0200
++++ b/hw/xfree86/common/compiler.h	2012-12-25 14:59:05.637854813 +0100
+@@ -1351,7 +1351,7 @@
+ #else                           /* ix86 */
+ 
+ #if !defined(__SUNPRO_C)
+-#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__)
++#if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__m32r__) && !defined(__ia64__)
+ #ifdef GCCUSESGAS
+ 
+ /*
+@@ -1453,7 +1453,7 @@
+ 
+ #endif                          /* GCCUSESGAS */
+ 
+-#else                           /* !defined(FAKEIT) && !defined(__mc68000__)  && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) */
++#else                           /* !defined(FAKEIT) && !defined(__mc68000__)  && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__m32r__) && !defined(__ia64__) */
+ 
+ static __inline__ void
+ outb(unsigned short port, unsigned char val)
diff --git a/x11-base/xorg-server/xorg-server-1.13.1-r121.ebuild b/x11-base/xorg-server/xorg-server-1.13.1-r131.ebuild
index 4aed366..678c4af 100644
--- a/x11-base/xorg-server/xorg-server-1.13.1-r121.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.13.1-r131.ebuild
@@ -1,18 +1,18 @@
-# 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-base/xorg-server/xorg-server-1.13.0-r1.ebuild,v 1.4 2012/11/16 16:29:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.13.1.ebuild,v 1.13 2013/01/07 09:40:45 chithanh Exp $
 
 EAPI=4
 
 XORG_DOC=doc
-inherit xorg-2 multilib versionator flag-o-matic
+inherit eutils xorg-2 multilib versionator flag-o-matic user
 EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
 
 DESCRIPTION="X.Org X servers"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+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
@@ -21,6 +21,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	>=x11-apps/rgb-1.0.3
 	>=x11-apps/xauth-1.0.3
 	x11-apps/xkbcomp
+	>=x11-libs/libdrm-2.4.20
 	>=x11-libs/libpciaccess-0.12.901
 	>=x11-libs/libXau-1.0.4
 	>=x11-libs/libXdmcp-1.0.2
@@ -50,10 +51,10 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
 	!minimal? (
 		>=x11-libs/libX11-1.1.5
 		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-7.8_rc[nptl=]
+		>=media-libs/mesa-8[nptl=]
 	)
 	tslib? ( >=x11-libs/tslib-1.0 )
-	udev? ( >=sys-fs/udev-150 )
+	udev? ( >=virtual/udev-150 )
 	>=x11-apps/xinit-1.3
 	selinux? ( sec-policy/selinux-xserver )"
 
@@ -70,7 +71,7 @@ DEPEND="${RDEPEND}
 	>=x11-proto/randrproto-1.4.0
 	>=x11-proto/recordproto-1.13.99.1
 	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.0.2
+	>=x11-proto/resourceproto-1.2.0
 	>=x11-proto/scrnsaverproto-1.1
 	>=x11-proto/trapproto-3.4.3
 	>=x11-proto/videoproto-2.2.2
@@ -94,7 +95,6 @@ DEPEND="${RDEPEND}
 	!minimal? (
 		>=x11-proto/xf86driproto-2.1.0
 		>=x11-proto/dri2proto-2.8
-		>=x11-libs/libdrm-2.4.20
 	)"
 
 PDEPEND="
@@ -111,6 +111,7 @@ REQUIRED_USE="!minimal? (
 PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
 	"${FILESDIR}"/${PN}-1.12-disable-acpi.patch
+	"${FILESDIR}"/${PN}-1.13-ia64-asm.patch
 	"${FILESDIR}"/xorg-server-non-root.patch
 )
 
@@ -120,11 +121,14 @@ pkg_pretend() {
 		die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
 }
 
+pkg_setup() {
+	enewuser xorg -1 /sbin/nologin /dev/null video
+}
+
 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=(
@@ -134,6 +138,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)
@@ -141,7 +146,6 @@ src_configure() {
 		$(use_enable !minimal dri)
 		$(use_enable !minimal dri2)
 		$(use_enable !minimal glx)
-		$(use_enable !minimal libdrm)
 		$(use_enable xnest)
 		$(use_enable xorg)
 		$(use_enable xvfb)
@@ -149,11 +153,11 @@ src_configure() {
 		$(use_enable udev config-udev)
 		$(use_with doc doxygen)
 		$(use_with doc xmlto)
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontrootdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
+		--enable-libdrm
+		--sysconfdir="${EPREFIX}"/etc/X11
+		--localstatedir="${EPREFIX}"/var
+		--with-fontrootdir="${EPREFIX}"/usr/share/fonts
+		--with-xkb-output="${EPREFIX}"/var/lib/xkb
 		--disable-config-hal
 		--without-dtrace
 		--without-fop
@@ -212,16 +216,16 @@ pkg_postinst() {
 		ewarn "	emerge @x11-module-rebuild"
 	fi
 
-	if use udev && has_version sys-fs/udev[-keymap]; then
-		ewarn "sys-fs/udev was built without keymap support. This may cause input device"
+	if use udev && has_version virtual/udev[-keymap]; then
+		ewarn "virtual/udev was built without keymap support. This may cause input device"
 		ewarn "autoconfiguration to fail."
 	fi
 }
 
 pkg_postrm() {
 	# Get rid of module dir to ensure opengl-update works properly
-	if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
-		rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
+	if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
+		rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
 	fi
 }
 
@@ -230,9 +234,9 @@ dynamic_libgl_install() {
 	ebegin "Moving GL files for dynamic switching"
 		dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
 		local x=""
-		for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
+		for x in "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
 			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
+				mv -f ${x} "${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
 			fi
 		done
 	eend 0
@@ -240,9 +244,10 @@ dynamic_libgl_install() {
 
 server_based_install() {
 	if ! use xorg; then
-		rm "${D}"/usr/share/man/man1/Xserver.1x \
-			"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
-			"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
-			"${D}"/usr/share/man/man1/Xserver.1x
+		rm "${ED}"/usr/share/man/man1/Xserver.1x \
+			"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
+			"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
+			"${ED}"/usr/share/man/man1/Xserver.1x
 	fi
 }
+