--- trunk/include/xorg.sminc	2013/08/14 10:14:47	18715
+++ trunk/include/xorg.sminc	2014/02/03 10:30:26	20669
@@ -72,35 +72,31 @@
 
 # get the right subdir
 case ${PCAT} in
-	app-doc)	URISUBDIR="doc" ;;
-	media-fonts)	URISUBDIR="font" ;;
-	x11-apps)	URISUBDIR="app" ;;
-	x11-base)	URISUBDIR="xserver" ;;
-	x11-drivers)	URISUBDIR="driver" ;;
-	x11-libs)	URISUBDIR="lib" ;;
-	x11-misc)	case ${PNAME} in
-				xbitmaps|xkbdata) URISUBDIR="data" ;;
-				xkeyboard-config) URISUBDIR="data/xkeyboard-config" ;;
-				*)  URISUBDIR="util" ;;
-			esac
+	app-doc) URISUBDIR="doc" ;;
+	media-fonts) URISUBDIR="font" ;;
+	x11-apps) URISUBDIR="app" ;;
+	x11-base) URISUBDIR="xserver" ;;
+	x11-drivers) URISUBDIR="driver" ;;
+	x11-libs)
+		case ${PNAME} in
+			glamor-egl) URISUBDIR="driver" ;;
+			*) URISUBDIR="lib" ;;
+		esac
+		;;
+	x11-misc)
+		case ${PNAME} in
+			xbitmaps|xkbdata) URISUBDIR="data" ;;
+			xkeyboard-config) URISUBDIR="data/xkeyboard-config" ;;
+			*)  URISUBDIR="util" ;;
+		esac
 			;;
-	x11-proto)	URISUBDIR="proto" ;;
-	x11-themes)	URISUBDIR="data" ;;
-	x11-wm)		URISUBDIR="app" ;;
+	x11-proto) URISUBDIR="proto" ;;
+	x11-themes) URISUBDIR="data" ;;
+	x11-wm) URISUBDIR="app" ;;
 esac
 
 SRC_URI=(
 	${SRC_URI[*]}
-#	${XORG_MIRROR}/individual/app/${SRCFILE}
-#	${XORG_MIRROR}/individual/data/${SRCFILE}
-#	${XORG_MIRROR}/individual/doc/${SRCFILE}
-#	${XORG_MIRROR}/individual/driver/${SRCFILE}
-#	${XORG_MIRROR}/individual/font/${SRCFILE}
-#	${XORG_MIRROR}/individual/lib/${SRCFILE}
-#	${XORG_MIRROR}/individual/proto/${SRCFILE}
-#	${XORG_MIRROR}/individual/testdir/${SRCFILE}
-#	${XORG_MIRROR}/individual/util/${SRCFILE}
-#	${XORG_MIRROR}/individual/xserver/${SRCFILE}
 	${XORG_MIRROR}/individual/${URISUBDIR}/${SRCFILE}
 	mirror://${PNAME}/${SRCFILE}
 )
@@ -160,9 +156,6 @@
 
 xorg_src_prepare()
 {
-	# check for old xorg installations
-	is_old_xorg_installed
-
 	munpack ${SRCFILE} || die
 }
 
@@ -228,15 +221,4 @@
 	fi
 }
 
-xorg_preinstall()
-{
-# run this in postinstall to cover --src-install builds
-# ( the is now package-dir at this moment, cause its not already builded :)
-#	if [[ -n ${XORG_FONT_PKG} ]]
-#	then
-#		xorg_discover_font_dirs
-#	fi
-	return 0
-}
-
-export_inherits xorg src_prepare src_compile src_check src_install preinstall
+export_inherits xorg src_prepare src_compile src_check src_install