--- xorg-server-1.13.0-r1.ebuild.orig	2012-12-15 20:49:33.000000000 +0900
+++ xorg-server-1.13.0-r1.ebuild	2012-12-15 21:28:01.000000000 +0900
@@ -9,7 +9,7 @@
 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 ~amd64-linux ~x86-linux"
 
 IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
 IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux tslib +udev"
@@ -147,14 +147,14 @@
 		$(use_enable xvfb)
 		$(use_enable nptl glx-tls)
 		$(use_enable udev config-udev)
+		$(use_enable !prefix install-setuid)
 		$(use_with doc doxygen)
 		$(use_with doc xmlto)
 		--enable-libdrm
-		--sysconfdir=/etc/X11
-		--localstatedir=/var
-		--enable-install-setuid
-		--with-fontrootdir=/usr/share/fonts
-		--with-xkb-output=/var/lib/xkb
+		--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
@@ -221,8 +221,8 @@
 
 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
 }
 
@@ -231,9 +231,9 @@
 	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
@@ -241,9 +241,9 @@
 
 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
 }