--- /usr/portage/x11-base/xorg-server/xorg-server-1.8.1.ebuild	2010-05-15 16:59:56.000000000 -0400
+++ /usr/local/portage/x11-base/xorg-server/xorg-server-1.8.1-r1.ebuild	2010-05-18 18:52:24.087287263 -0400
@@ -52,7 +52,7 @@
 		>=media-libs/mesa-7.8_rc[nptl=]
 	)
 	tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto )
-	udev? ( sys-fs/udev[extras] )"
+	udev? ( sys-fs/udev )"
 
 DEPEND="${RDEPEND}
 	!!net-dialup/dtrace
@@ -103,8 +103,6 @@
 PATCHES=(
 	"${UPSTREAMED_PATCHES[@]}"
 	"${FILESDIR}"/${PN}-disable-acpi.patch
-#	"${FILESDIR}/1.8.0-no-hardcoded-etc.patch"
-#	"${FILESDIR}/1.8.0-match-only-sane-devices.patch"
 	)
 
 pkg_setup() {
@@ -206,9 +204,9 @@
 
 	server_based_install
 
-	if ! use minimal &&	use xorg; then
+	if ! use minimal && use xorg; then
 		# Install xorg.conf.example (see bugs #151421 and #151670)
-		insinto /etc/X11
+		insinto /usr/share/doc/${PF}
 		doins hw/xfree86/xorg.conf.example \
 			|| die "couldn't install xorg.conf.example"
 	fi