--- /usr/portage/x11-base/xorg-server/xorg-server-1.15.0.ebuild	2014-07-26 12:01:19.000000000 +0200
+++ xorg-server-1.15.0.ebuild	2014-09-20 00:07:58.772356785 +0200
@@ -33,6 +33,20 @@
 	>=x11-libs/xtrans-1.3.2
 	>=x11-misc/xbitmaps-1.0.1
 	>=x11-misc/xkeyboard-config-2.4.1-r3
+	>=x11-proto/dri3proto-1.0
+	>=x11-proto/fontsproto-2.0.2
+	>=x11-proto/glproto-1.4.17
+	>=x11-proto/inputproto-2.2.99.1
+	>=x11-proto/kbproto-1.0.3
+	>=x11-proto/presentproto-1.0
+	>=x11-proto/randrproto-1.4.0
+	>=x11-proto/renderproto-0.11
+	>=x11-proto/resourceproto-1.2.0
+	>=x11-proto/scrnsaverproto-1.1
+	>=x11-proto/videoproto-2.2.2
+	>=x11-proto/xextproto-7.2.99.901
+	>=x11-proto/xineramaproto-1.1.3
+	>=x11-proto/xproto-7.0.22
 	dmx? (
 		x11-libs/libXt
 		>=x11-libs/libdmx-1.0.99.1
@@ -51,9 +65,11 @@
 		x11-libs/libXv
 	)
 	!minimal? (
+		>=media-libs/mesa-9.2.0[nptl=]
 		>=x11-libs/libX11-1.1.5
 		>=x11-libs/libXext-1.0.5
-		>=media-libs/mesa-9.2.0[nptl=]
+		>=x11-proto/xf86driproto-2.1.0
+		>=x11-proto/dri2proto-2.8
 	)
 	tslib? ( >=x11-libs/tslib-1.0 )
 	udev? ( >=virtual/udev-150 )
@@ -67,26 +83,12 @@
 	>=x11-proto/compositeproto-0.4
 	>=x11-proto/damageproto-1.1
 	>=x11-proto/fixesproto-5.0
-	>=x11-proto/fontsproto-2.0.2
-	>=x11-proto/glproto-1.4.17
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/kbproto-1.0.3
-	>=x11-proto/randrproto-1.4.0
 	>=x11-proto/recordproto-1.13.99.1
-	>=x11-proto/renderproto-0.11
-	>=x11-proto/resourceproto-1.2.0
-	>=x11-proto/scrnsaverproto-1.1
 	>=x11-proto/trapproto-3.4.3
-	>=x11-proto/videoproto-2.2.2
 	>=x11-proto/xcmiscproto-1.2.0
-	>=x11-proto/xextproto-7.2.99.901
 	>=x11-proto/xf86dgaproto-2.0.99.1
 	>=x11-proto/xf86rushproto-1.1.2
 	>=x11-proto/xf86vidmodeproto-2.2.99.1
-	>=x11-proto/xineramaproto-1.1.3
-	>=x11-proto/xproto-7.0.22
-	>=x11-proto/presentproto-1.0
-	>=x11-proto/dri3proto-1.0
 	dmx? (
 		>=x11-proto/dmxproto-2.2.99.1
 		doc? (
@@ -96,10 +98,6 @@
 				www-client/w3m
 			)
 		)
-	)
-	!minimal? (
-		>=x11-proto/xf86driproto-2.1.0
-		>=x11-proto/dri2proto-2.8
 	)"
 
 PDEPEND="