[patch] Kludge to get ati-driver to install things in the right places. SPECIFICALLY FOR MODULAR XORG ONLY

ati-driver.kludge (text/plain), 1.97 KB, created by Mike Auty (RETIRED) on 2005-11-03 14:49:30 UTC

--- /usr/portage/media-video/ati-drivers/ati-drivers-8.18.8.ebuild	2005-10-28 08:18:47.000000000 +0100
+++ /usr/local/overlays/personal/media-video/ati-drivers/ati-drivers-8.18.8.ebuild	2005-11-03 22:40:46.000000000 +0000
@@ -30,16 +30,21 @@
 
 
 choose_driver_folder() {
-	BASE_NAME="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
-
-	# Determine if we are facing X.org 6.8.99 aka 6.9
-	if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
-	   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
-	   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
+	if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 7 ] 
 	then
-		BASE_NAME="${BASE_NAME}90"
+		BASE_NAME="${WORKDIR}/x690"
 	else
-		BASE_NAME="${BASE_NAME}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
+		BASE_NAME="${WORKDIR}/x$(get_version_component_range 1 ${X11_IMPLEM_V})"
+
+		# Determine if we are facing X.org 6.8.99 aka 6.9
+		if [ "$(get_version_component_range 1 ${X11_IMPLEM_V})" = 6 ] &&
+		   [ "$(get_version_component_range 2 ${X11_IMPLEM_V})" = 8 ] &&
+		   [ "$(get_version_component_range 3 ${X11_IMPLEM_V})" = 99 ]
+		then
+			BASE_NAME="${BASE_NAME}90"
+		else
+			BASE_NAME="${BASE_NAME}$(get_version_component_range 2 ${X11_IMPLEM_V})0"
+		fi
 	fi
 
 	if use amd64 ; then
@@ -207,7 +212,7 @@
 
 src_install-libs() {
 	local pkglibdir=lib
-	local inslibdir=$(get_libdir)
+	local inslibdir=$(get_libdir)/xorg
 
 	if [ ${#} -eq 2 ]; then
 		pkglibdir=${1}
@@ -218,7 +223,7 @@
 
 	einfo "${pkglibdir} -> ${inslibdir}"
 
-	local ATI_ROOT="/usr/${inslibdir}/opengl/ati"
+	local ATI_ROOT="/usr/$(get_libdir)/opengl/ati"
 
 	# The GLX libraries
 	exeinto ${ATI_ROOT}/lib
@@ -234,7 +239,7 @@
 	#Workaround
 	if use opengl ; then
 	sed -e "s:libdir=.*:libdir=${ATI_ROOT}/lib:" \
-		/usr/${inslibdir}/opengl/${X11_IMPLEM}/lib/libGL.la \
+		/usr/$(get_libdir)/opengl/${X11_IMPLEM}/lib/libGL.la \
 		> $D/${ATI_ROOT}/lib/libGL.la
 	dosym ../${X11_IMPLEM}/include ${ATI_ROOT}/include
 	fi