--- trunk/extras/xorg-server/xorg-server-1.20.0-r1.smage2	2018/05/29 12:13:31	31042
+++ trunk/extras/xorg-server/xorg-server-1.20.0-r1.smage2	2018/06/08 07:06:39	31142
@@ -4,13 +4,13 @@
 PVER="1.20.0"
 PBUILD="r1"
 
-SPLIT_PACKAGES="xorg-server kdrive xephyr xdmx xnest xvfb"
+SPLIT_PACKAGES="xorg-server xephyr xdmx xnest xvfb"
 
 PCAT="x11-base"
 HOMEPAGE="http://xorg.freedesktop.org"
 
 # mesa sources are needed to compile opengl extensions
-MESA_PVER="18.1.0"
+MESA_PVER="18.1.1"
 MESA_SRCFILE="mesa-${MESA_PVER/_/-}.tar.xz"
 MESA_SRCDIR="${BUILDDIR}/mesa-${MESA_PVER/_/-}"
 
@@ -18,7 +18,7 @@
 
 # see hw/xfree86/common/xf86Module.h for ABI versions
 # or installed pkg-config file
-XORG_SERVER_PROVIDE="virtual/X-ABI-VIDEODRV-23 virtual/X-ABI-XINPUT-24.1 virtual/X-ABI-EXTENSION-10.0"
+XORG_SERVER_PROVIDE="virtual/X-ABI-VIDEODRV-24.0 virtual/X-ABI-XINPUT-24.1 virtual/X-ABI-EXTENSION-10.0"
 
 # common depends
 COMMON_DEPEND=">= x11-libs/libXfont2-2.0
@@ -58,8 +58,6 @@
 	>= x11-base/opengl-update-2.3.12
 	>= x11-libs/libpciaccess-0.14"
 
-KDRIVE_DEPEND="${COMMON_DEPEND}"
-
 XEPHYR_DEPEND="${COMMON_DEPEND}
 	${LIBXEXT_DEPEND}
 	${LIBX11_DEPEND}
@@ -114,8 +112,6 @@
 	mirror://${PNAME}/xvfb-run
 	mirror://${PNAME}/xvfb-run.1
 	mirror://${PNAME}/${PNAME}-1.12.3-die-ugly-pattern-die-die-die.patch
-	mirror://${PNAME}/${PNAME}-1.12.3-kdrive-default-mode.patch
-	#mirror://${PNAME}/${PNAME}-1.12.3-kdrive-evdev-with-valid-mouse-devices.patch
 )
 
 split_info_xorg-server()
@@ -125,12 +121,6 @@
 	PROVIDE+=" ${XORG_SERVER_PROVIDE}"
 }
 
-split_info_kdrive()
-{
-	DESCRIPTION="Tiny X.Org X Server."
-	DEPEND="${KDRIVE_DEPEND}"
-}
-
 split_info_xephyr()
 {
 	DESCRIPTION="A nested X11 server with opengl support."
@@ -198,12 +188,6 @@
 	# adopted from redhat; use a black background
 	mpatch ${PNAME}-1.12.3-die-ugly-pattern-die-die-die.patch || die
 
-	# fix kdrive default mode -> use 640x480@60hz instead of 800x600@75hz
-	mpatch ${PNAME}-1.12.3-kdrive-default-mode.patch || die
-
-	# fix new evdev event devices (event4 and event5)
-	#mpatch ${PNAME}-1.12.3-kdrive-evdev-with-valid-mouse-devices.patch || die
-
 	# fix build issues, some wrapper files which should be generated
 	# at build time exist and the makefile doesn't whipe them. we patch
 	# the makefile to clean them and whipe these wrapper files
@@ -283,8 +267,6 @@
 	mlink Xorg /usr/bin/X || die
 
 	# remove stuff included in other packages
-	# xfbdev
-	mdelete /usr/bin/Xfbdev || die
 	# xephyr
 	mdelete /usr/bin/Xephyr || die
 	mdelete /usr/share/man/man1/Xephyr.1 || die
@@ -313,20 +295,6 @@
 	mdelete /usr/share/man/man1/Xvfb.1 || die
 }
 
-src_install_kdrive()
-{
-	cd ${SRCDIR}
-
-	minstallexec hw/kdrive/fbdev/Xfbdev || die
-	#minstallman hw/kdrive/fbdev/Xfbdev.1 || die
-
-#	# suid all tinyX servers
-#	mchmod 4755 /usr/bin/X\* || die
-
-	# needed directory
-	mkeepdir /usr/share/X11/xkb/compiled || die
-}
-
 src_install_xephyr()
 {
 	cd ${SRCDIR}